Fix memory init for WR720N v3 CH

diff --git a/u-boot/board/ar7240/ap121/ap121.c b/u-boot/board/ar7240/ap121/ap121.c
index af6125b998f75231aafa50524ad24e1bb8a9f941..f3882baf0a81dfb56ad3eedfb328c14b9ede74be 100755 (executable)
--- a/u-boot/board/ar7240/ap121/ap121.c
+++ b/u-boot/board/ar7240/ap121/ap121.c
@@ -406,6 +406,13 @@ int checkboard(void){
  * Returns a string with memory type preceded by a space sign
  */
 const char* print_mem_type(void){
+/*
+ * WR720N v3 (CH version) has wrong bootstrap configuration,
+ * so the memory type cannot be recognized automatically
+ */
+#if defined(CONFIG_FOR_TPLINK_WR720N_V3)
+       return " DDR 16-bit";
+#else
        unsigned int reg_val;
 
        reg_val = (ar7240_reg_rd(HORNET_BOOTSTRAP_STATUS) & HORNET_BOOTSTRAP_MEM_TYPE_MASK) >> HORNET_BOOTSTRAP_MEM_TYPE_SHIFT;
@@ -427,4 +434,5 @@ const char* print_mem_type(void){
                        return "";
                        break;
        }
+#endif /* defined(CONFIG_FOR_TPLINK_WR720N_V3) */
 }

diff --git a/u-boot/cpu/mips/ar7240/hornet_ddr_init.S b/u-boot/cpu/mips/ar7240/hornet_ddr_init.S
index c25f37436e2448cc474e5c896e205cd0cc186b32..49009d888fe3bf4d445849654119fb91a20cf8c9 100755 (executable)
--- a/u-boot/cpu/mips/ar7240/hornet_ddr_init.S
+++ b/u-boot/cpu/mips/ar7240/hornet_ddr_init.S
@@ -52,6 +52,11 @@ hornet_ddr_init:
        li t8, CFG_DDR_CONFIG2_VAL;
        set_mem(0xB8000004, t8);
 
+/*
+ * WR720N v3 (CH version) has wrong bootstrap configuration,
+ * so the memory type cannot be recognized automatically
+ */
+#if !defined(CONFIG_FOR_TPLINK_WR720N_V3)
 mem_type:
        // TODO: what about SDRAM?
        // 0x180600AC (BOOT_STRAP, p. 81)
@@ -178,6 +183,7 @@ ddr2_config:
 
        nop
        jr ra
+#endif /* !defined(CONFIG_FOR_TPLINK_WR720N_V3) */
 
 ddr1_config:
        // Precharge All