October 2016 - U-Boot

[U-Boot] [PATCH] arch: powerpc: Remove unused dts frequency fixup for lbc_clk
by Prabhakar Kushwaha 15 Oct '16

15 Oct '16

lbc_clk is used to fixup dts as "bus frequency". It is not being used by Linux IFC and eLBC driver. So remove unused "bus frqeuency" fix-up of devicre tree. Signed-off-by: Prabhakar Kushwaha <prabhakar.kushwaha(a)nxp.com> --- arch/powerpc/cpu/mpc85xx/fdt.c | 4 ---- arch/powerpc/cpu/mpc86xx/fdt.c | 7 ------- 2 files changed, 11 deletions(-) diff --git a/arch/powerpc/cpu/mpc85xx/fdt.c b/arch/powerpc/cpu/mpc85xx/fdt.c index ced216c..047c972 100644 --- a/arch/powerpc/cpu/mpc85xx/fdt.c +++ b/arch/powerpc/cpu/mpc85xx/fdt.c @@ -626,10 +626,6 @@ void ft_cpu_setup(void *blob, bd_t *bd) do_fixup_by_prop_u32(blob, "device_type", "soc", 4, "bus-frequency", bd->bi_busfreq, 1); - do_fixup_by_compat_u32(blob, "fsl,pq3-localbus", - "bus-frequency", gd->arch.lbc_clk, 1); - do_fixup_by_compat_u32(blob, "fsl,elbc", - "bus-frequency", gd->arch.lbc_clk, 1); #ifdef CONFIG_QE ft_qe_setup(blob); ft_fixup_qe_snum(blob); diff --git a/arch/powerpc/cpu/mpc86xx/fdt.c b/arch/powerpc/cpu/mpc86xx/fdt.c index dd99155..5f9ad6b 100644 --- a/arch/powerpc/cpu/mpc86xx/fdt.c +++ b/arch/powerpc/cpu/mpc86xx/fdt.c @@ -30,13 +30,6 @@ void ft_cpu_setup(void *blob, bd_t *bd) do_fixup_by_prop_u32(blob, "device_type", "soc", 4, "bus-frequency", bd->bi_busfreq, 1); -#if defined(CONFIG_MPC8641) - do_fixup_by_compat_u32(blob, "fsl,mpc8641-localbus", - "bus-frequency", gd->arch.lbc_clk, 1); -#endif - do_fixup_by_compat_u32(blob, "fsl,elbc", - "bus-frequency", gd->arch.lbc_clk, 1); - fdt_fixup_memory(blob, (u64)bd->bi_memstart, (u64)bd->bi_memsize); #if defined(CONFIG_HAS_ETH0) || defined(CONFIG_HAS_ETH1) \ -- 2.7.4

2 1

[U-Boot] [PATCH v5 1/2] Txxx/RCW: Split unified RCW to RCWs for sd, spi and nand.
by Zhao Qiang 15 Oct '16

15 Oct '16

T series boards use unified RCW for sd, spi and nand boot. Now split txxx_rcw.cfg to txxx_sd_rcw.cfg, txxx_spi_rcw.cfg and txxx_nand_rcw.cfg for SPI/NAND/SD boot. And modify RCW[PBI_SRC] for them: PBI_SRC=5 for SPI 24-bit addressing PBI_SRC=6 for SD boot PBI_SRC=14 for IFC NAND boot Signed-off-by: Zhao Qiang <qiang.zhao(a)nxp.com> --- Changes for v2: - split to two patches Changes for v3: - modify commit msg, explain why modify the PBI_SRC. Changes for v4: - modify commit msg Changes for v5: - modify commit msg .../t102xqds/{t1024_rcw.cfg => t1024_nand_rcw.cfg} | 0 .../t102xqds/{t1024_rcw.cfg => t1024_sd_rcw.cfg} | 2 +- .../t102xqds/{t1024_rcw.cfg => t1024_spi_rcw.cfg} | 2 +- .../t102xrdb/{t1023_rcw.cfg => t1023_nand_rcw.cfg} | 0 .../t102xrdb/{t1023_rcw.cfg => t1023_sd_rcw.cfg} | 2 +- .../t102xrdb/{t1023_rcw.cfg => t1023_spi_rcw.cfg} | 2 +- .../t102xrdb/{t1024_rcw.cfg => t1024_nand_rcw.cfg} | 0 .../t102xrdb/{t1024_rcw.cfg => t1024_sd_rcw.cfg} | 2 +- .../t102xrdb/{t1024_rcw.cfg => t1024_spi_rcw.cfg} | 2 +- .../t104xrdb/{t1040_rcw.cfg => t1040_nand_rcw.cfg} | 0 .../t104xrdb/{t1040_rcw.cfg => t1040_sd_rcw.cfg} | 2 +- .../t104xrdb/{t1040_rcw.cfg => t1040_spi_rcw.cfg} | 2 +- .../{t1040d4_rcw.cfg => t1040d4_nand_rcw.cfg} | 0 .../{t1040d4_rcw.cfg => t1040d4_sd_rcw.cfg} | 2 +- .../{t1040d4_rcw.cfg => t1040d4_spi_rcw.cfg} | 2 +- .../t104xrdb/{t1042_rcw.cfg => t1042_nand_rcw.cfg} | 0 .../{t1042_pi_rcw.cfg => t1042_pi_nand_rcw.cfg} | 0 .../{t1042_pi_rcw.cfg => t1042_pi_sd_rcw.cfg} | 2 +- .../{t1042_pi_rcw.cfg => t1042_pi_spi_rcw.cfg} | 2 +- .../t104xrdb/{t1042_rcw.cfg => t1042_sd_rcw.cfg} | 2 +- .../t104xrdb/{t1042_rcw.cfg => t1042_spi_rcw.cfg} | 2 +- .../{t1042d4_rcw.cfg => t1042d4_nand_rcw.cfg} | 0 .../{t1042d4_rcw.cfg => t1042d4_sd_rcw.cfg} | 2 +- .../{t1042d4_rcw.cfg => t1042d4_spi_rcw.cfg} | 2 +- .../t208xqds/{t2080_rcw.cfg => t2080_nand_rcw.cfg} | 0 .../t208xqds/{t2080_rcw.cfg => t2080_sd_rcw.cfg} | 2 +- .../t208xqds/{t2080_rcw.cfg => t2080_spi_rcw.cfg} | 2 +- .../t208xqds/{t2081_rcw.cfg => t2081_nand_rcw.cfg} | 0 .../t208xqds/{t2081_rcw.cfg => t2081_sd_rcw.cfg} | 2 +- .../t208xqds/{t2081_rcw.cfg => t2081_spi_rcw.cfg} | 2 +- .../t208xrdb/{t2080_rcw.cfg => t2080_nand_rcw.cfg} | 0 .../t208xrdb/{t2080_rcw.cfg => t2080_sd_rcw.cfg} | 2 +- .../t208xrdb/{t2080_rcw.cfg => t2080_spi_rcw.cfg} | 2 +- .../t4qds/{t4_rcw.cfg => t4_nand_rcw.cfg} | 2 +- .../freescale/t4qds/{t4_rcw.cfg => t4_sd_rcw.cfg} | 2 +- .../freescale/t4rdb/{t4_rcw.cfg => t4_sd_rcw.cfg} | 2 +- include/configs/T102xQDS.h | 4 +- include/configs/T102xRDB.h | 20 ++++-- include/configs/T104xRDB.h | 78 +++++++++++++++++----- include/configs/T208xQDS.h | 20 ++++-- include/configs/T208xRDB.h | 4 +- include/configs/T4240QDS.h | 3 +- include/configs/T4240RDB.h | 2 +- 43 files changed, 124 insertions(+), 57 deletions(-) copy board/freescale/t102xqds/{t1024_rcw.cfg => t1024_nand_rcw.cfg} (100%) copy board/freescale/t102xqds/{t1024_rcw.cfg => t1024_sd_rcw.cfg} (89%) rename board/freescale/t102xqds/{t1024_rcw.cfg => t1024_spi_rcw.cfg} (89%) copy board/freescale/t102xrdb/{t1023_rcw.cfg => t1023_nand_rcw.cfg} (100%) copy board/freescale/t102xrdb/{t1023_rcw.cfg => t1023_sd_rcw.cfg} (87%) rename board/freescale/t102xrdb/{t1023_rcw.cfg => t1023_spi_rcw.cfg} (87%) copy board/freescale/t102xrdb/{t1024_rcw.cfg => t1024_nand_rcw.cfg} (100%) copy board/freescale/t102xrdb/{t1024_rcw.cfg => t1024_sd_rcw.cfg} (87%) rename board/freescale/t102xrdb/{t1024_rcw.cfg => t1024_spi_rcw.cfg} (87%) copy board/freescale/t104xrdb/{t1040_rcw.cfg => t1040_nand_rcw.cfg} (100%) copy board/freescale/t104xrdb/{t1040_rcw.cfg => t1040_sd_rcw.cfg} (83%) rename board/freescale/t104xrdb/{t1040_rcw.cfg => t1040_spi_rcw.cfg} (83%) copy board/freescale/t104xrdb/{t1040d4_rcw.cfg => t1040d4_nand_rcw.cfg} (100%) copy board/freescale/t104xrdb/{t1040d4_rcw.cfg => t1040d4_sd_rcw.cfg} (83%) rename board/freescale/t104xrdb/{t1040d4_rcw.cfg => t1040d4_spi_rcw.cfg} (83%) copy board/freescale/t104xrdb/{t1042_rcw.cfg => t1042_nand_rcw.cfg} (100%) copy board/freescale/t104xrdb/{t1042_pi_rcw.cfg => t1042_pi_nand_rcw.cfg} (100%) copy board/freescale/t104xrdb/{t1042_pi_rcw.cfg => t1042_pi_sd_rcw.cfg} (83%) rename board/freescale/t104xrdb/{t1042_pi_rcw.cfg => t1042_pi_spi_rcw.cfg} (83%) copy board/freescale/t104xrdb/{t1042_rcw.cfg => t1042_sd_rcw.cfg} (83%) rename board/freescale/t104xrdb/{t1042_rcw.cfg => t1042_spi_rcw.cfg} (83%) copy board/freescale/t104xrdb/{t1042d4_rcw.cfg => t1042d4_nand_rcw.cfg} (100%) copy board/freescale/t104xrdb/{t1042d4_rcw.cfg => t1042d4_sd_rcw.cfg} (83%) rename board/freescale/t104xrdb/{t1042d4_rcw.cfg => t1042d4_spi_rcw.cfg} (83%) copy board/freescale/t208xqds/{t2080_rcw.cfg => t2080_nand_rcw.cfg} (100%) copy board/freescale/t208xqds/{t2080_rcw.cfg => t2080_sd_rcw.cfg} (92%) rename board/freescale/t208xqds/{t2080_rcw.cfg => t2080_spi_rcw.cfg} (92%) copy board/freescale/t208xqds/{t2081_rcw.cfg => t2081_nand_rcw.cfg} (100%) copy board/freescale/t208xqds/{t2081_rcw.cfg => t2081_sd_rcw.cfg} (85%) rename board/freescale/t208xqds/{t2081_rcw.cfg => t2081_spi_rcw.cfg} (85%) copy board/freescale/t208xrdb/{t2080_rcw.cfg => t2080_nand_rcw.cfg} (100%) copy board/freescale/t208xrdb/{t2080_rcw.cfg => t2080_sd_rcw.cfg} (93%) rename board/freescale/t208xrdb/{t2080_rcw.cfg => t2080_spi_rcw.cfg} (93%) copy board/freescale/t4qds/{t4_rcw.cfg => t4_nand_rcw.cfg} (83%) rename board/freescale/t4qds/{t4_rcw.cfg => t4_sd_rcw.cfg} (83%) rename board/freescale/t4rdb/{t4_rcw.cfg => t4_sd_rcw.cfg} (83%) diff --git a/board/freescale/t102xqds/t1024_rcw.cfg b/board/freescale/t102xqds/t1024_nand_rcw.cfg similarity index 100% copy from board/freescale/t102xqds/t1024_rcw.cfg copy to board/freescale/t102xqds/t1024_nand_rcw.cfg diff --git a/board/freescale/t102xqds/t1024_rcw.cfg b/board/freescale/t102xqds/t1024_sd_rcw.cfg similarity index 89% copy from board/freescale/t102xqds/t1024_rcw.cfg copy to board/freescale/t102xqds/t1024_sd_rcw.cfg index 4b8f719..3eca275 100644 --- a/board/freescale/t102xqds/t1024_rcw.cfg +++ b/board/freescale/t102xqds/t1024_sd_rcw.cfg @@ -5,6 +5,6 @@ aa55aa55 010e0100 # Serdes protocol 0x6F 0810000e 00000000 00000000 00000000 -37800001 00000012 e8104000 21000000 +37800001 00000012 68104000 21000000 00000000 00000000 00000000 00030810 00000000 036c5a00 00000000 00000006 diff --git a/board/freescale/t102xqds/t1024_rcw.cfg b/board/freescale/t102xqds/t1024_spi_rcw.cfg similarity index 89% rename from board/freescale/t102xqds/t1024_rcw.cfg rename to board/freescale/t102xqds/t1024_spi_rcw.cfg index 4b8f719..1601e35 100644 --- a/board/freescale/t102xqds/t1024_rcw.cfg +++ b/board/freescale/t102xqds/t1024_spi_rcw.cfg @@ -5,6 +5,6 @@ aa55aa55 010e0100 # Serdes protocol 0x6F 0810000e 00000000 00000000 00000000 -37800001 00000012 e8104000 21000000 +37800001 00000012 58104000 21000000 00000000 00000000 00000000 00030810 00000000 036c5a00 00000000 00000006 diff --git a/board/freescale/t102xrdb/t1023_rcw.cfg b/board/freescale/t102xrdb/t1023_nand_rcw.cfg similarity index 100% copy from board/freescale/t102xrdb/t1023_rcw.cfg copy to board/freescale/t102xrdb/t1023_nand_rcw.cfg diff --git a/board/freescale/t102xrdb/t1023_rcw.cfg b/board/freescale/t102xrdb/t1023_sd_rcw.cfg similarity index 87% copy from board/freescale/t102xrdb/t1023_rcw.cfg copy to board/freescale/t102xrdb/t1023_sd_rcw.cfg index f8f7282..dbf8fba 100644 --- a/board/freescale/t102xrdb/t1023_rcw.cfg +++ b/board/freescale/t102xrdb/t1023_sd_rcw.cfg @@ -3,6 +3,6 @@ aa55aa55 010e0100 #SerDes Protocol: 0x77 #Default Core=1200MHz, DDR=1600MT/s with single source clock 0810000c 00000000 00000000 00000000 -3b800003 00000012 e8104000 21000000 +3b800003 00000012 68104000 21000000 00000000 00000000 00000000 00022800 00000130 04020200 00000000 00000006 diff --git a/board/freescale/t102xrdb/t1023_rcw.cfg b/board/freescale/t102xrdb/t1023_spi_rcw.cfg similarity index 87% rename from board/freescale/t102xrdb/t1023_rcw.cfg rename to board/freescale/t102xrdb/t1023_spi_rcw.cfg index f8f7282..5edcdb5 100644 --- a/board/freescale/t102xrdb/t1023_rcw.cfg +++ b/board/freescale/t102xrdb/t1023_spi_rcw.cfg @@ -3,6 +3,6 @@ aa55aa55 010e0100 #SerDes Protocol: 0x77 #Default Core=1200MHz, DDR=1600MT/s with single source clock 0810000c 00000000 00000000 00000000 -3b800003 00000012 e8104000 21000000 +3b800003 00000012 58104000 21000000 00000000 00000000 00000000 00022800 00000130 04020200 00000000 00000006 diff --git a/board/freescale/t102xrdb/t1024_rcw.cfg b/board/freescale/t102xrdb/t1024_nand_rcw.cfg similarity index 100% copy from board/freescale/t102xrdb/t1024_rcw.cfg copy to board/freescale/t102xrdb/t1024_nand_rcw.cfg diff --git a/board/freescale/t102xrdb/t1024_rcw.cfg b/board/freescale/t102xrdb/t1024_sd_rcw.cfg similarity index 87% copy from board/freescale/t102xrdb/t1024_rcw.cfg copy to board/freescale/t102xrdb/t1024_sd_rcw.cfg index cd6f906..05b3f37 100644 --- a/board/freescale/t102xrdb/t1024_rcw.cfg +++ b/board/freescale/t102xrdb/t1024_sd_rcw.cfg @@ -3,6 +3,6 @@ aa55aa55 010e0100 #SerDes Protocol: 0x95 #Core/DDR: 1400Mhz/1600MT/s with single source clock 0810000c 00000000 00000000 00000000 -4a800003 80000012 ec027000 21000000 +4a800003 80000012 6c027000 21000000 00000000 00000000 00000000 00030810 00000000 0b005a08 00000000 00000006 diff --git a/board/freescale/t102xrdb/t1024_rcw.cfg b/board/freescale/t102xrdb/t1024_spi_rcw.cfg similarity index 87% rename from board/freescale/t102xrdb/t1024_rcw.cfg rename to board/freescale/t102xrdb/t1024_spi_rcw.cfg index cd6f906..8b695b4 100644 --- a/board/freescale/t102xrdb/t1024_rcw.cfg +++ b/board/freescale/t102xrdb/t1024_spi_rcw.cfg @@ -3,6 +3,6 @@ aa55aa55 010e0100 #SerDes Protocol: 0x95 #Core/DDR: 1400Mhz/1600MT/s with single source clock 0810000c 00000000 00000000 00000000 -4a800003 80000012 ec027000 21000000 +4a800003 80000012 5c027000 21000000 00000000 00000000 00000000 00030810 00000000 0b005a08 00000000 00000006 diff --git a/board/freescale/t104xrdb/t1040_rcw.cfg b/board/freescale/t104xrdb/t1040_nand_rcw.cfg similarity index 100% copy from board/freescale/t104xrdb/t1040_rcw.cfg copy to board/freescale/t104xrdb/t1040_nand_rcw.cfg diff --git a/board/freescale/t104xrdb/t1040_rcw.cfg b/board/freescale/t104xrdb/t1040_sd_rcw.cfg similarity index 83% copy from board/freescale/t104xrdb/t1040_rcw.cfg copy to board/freescale/t104xrdb/t1040_sd_rcw.cfg index 3300c18..fd3e8c5 100644 --- a/board/freescale/t104xrdb/t1040_rcw.cfg +++ b/board/freescale/t104xrdb/t1040_sd_rcw.cfg @@ -2,6 +2,6 @@ aa55aa55 010e0100 # serdes protocol 0x66 0c18000e 0e000000 00000000 00000000 -66000002 80000002 e8106000 01000000 +66000002 80000002 68106000 01000000 00000000 00000000 00000000 00032810 00000000 0342500f 00000000 00000000 diff --git a/board/freescale/t104xrdb/t1040_rcw.cfg b/board/freescale/t104xrdb/t1040_spi_rcw.cfg similarity index 83% rename from board/freescale/t104xrdb/t1040_rcw.cfg rename to board/freescale/t104xrdb/t1040_spi_rcw.cfg index 3300c18..fccde5e 100644 --- a/board/freescale/t104xrdb/t1040_rcw.cfg +++ b/board/freescale/t104xrdb/t1040_spi_rcw.cfg @@ -2,6 +2,6 @@ aa55aa55 010e0100 # serdes protocol 0x66 0c18000e 0e000000 00000000 00000000 -66000002 80000002 e8106000 01000000 +66000002 80000002 58106000 01000000 00000000 00000000 00000000 00032810 00000000 0342500f 00000000 00000000 diff --git a/board/freescale/t104xrdb/t1040d4_rcw.cfg b/board/freescale/t104xrdb/t1040d4_nand_rcw.cfg similarity index 100% copy from board/freescale/t104xrdb/t1040d4_rcw.cfg copy to board/freescale/t104xrdb/t1040d4_nand_rcw.cfg diff --git a/board/freescale/t104xrdb/t1040d4_rcw.cfg b/board/freescale/t104xrdb/t1040d4_sd_rcw.cfg similarity index 83% copy from board/freescale/t104xrdb/t1040d4_rcw.cfg copy to board/freescale/t104xrdb/t1040d4_sd_rcw.cfg index c1034b3..e6f7585 100644 --- a/board/freescale/t104xrdb/t1040d4_rcw.cfg +++ b/board/freescale/t104xrdb/t1040d4_sd_rcw.cfg @@ -2,6 +2,6 @@ aa55aa55 010e0100 # serdes protocol 0x66 0c18000e 0e000000 00000000 00000000 -66000002 40000002 ec027000 01000000 +66000002 40000002 6c027000 01000000 00000000 00000000 00000000 00030810 00000000 0342580f 00000000 00000000 diff --git a/board/freescale/t104xrdb/t1040d4_rcw.cfg b/board/freescale/t104xrdb/t1040d4_spi_rcw.cfg similarity index 83% rename from board/freescale/t104xrdb/t1040d4_rcw.cfg rename to board/freescale/t104xrdb/t1040d4_spi_rcw.cfg index c1034b3..cde862d 100644 --- a/board/freescale/t104xrdb/t1040d4_rcw.cfg +++ b/board/freescale/t104xrdb/t1040d4_spi_rcw.cfg @@ -2,6 +2,6 @@ aa55aa55 010e0100 # serdes protocol 0x66 0c18000e 0e000000 00000000 00000000 -66000002 40000002 ec027000 01000000 +66000002 40000002 5c027000 01000000 00000000 00000000 00000000 00030810 00000000 0342580f 00000000 00000000 diff --git a/board/freescale/t104xrdb/t1042_rcw.cfg b/board/freescale/t104xrdb/t1042_nand_rcw.cfg similarity index 100% copy from board/freescale/t104xrdb/t1042_rcw.cfg copy to board/freescale/t104xrdb/t1042_nand_rcw.cfg diff --git a/board/freescale/t104xrdb/t1042_pi_rcw.cfg b/board/freescale/t104xrdb/t1042_pi_nand_rcw.cfg similarity index 100% copy from board/freescale/t104xrdb/t1042_pi_rcw.cfg copy to board/freescale/t104xrdb/t1042_pi_nand_rcw.cfg diff --git a/board/freescale/t104xrdb/t1042_pi_rcw.cfg b/board/freescale/t104xrdb/t1042_pi_sd_rcw.cfg similarity index 83% copy from board/freescale/t104xrdb/t1042_pi_rcw.cfg copy to board/freescale/t104xrdb/t1042_pi_sd_rcw.cfg index 57de89a..bbce9a3 100644 --- a/board/freescale/t104xrdb/t1042_pi_rcw.cfg +++ b/board/freescale/t104xrdb/t1042_pi_sd_rcw.cfg @@ -2,6 +2,6 @@ aa55aa55 010e0100 # serdes protocol 0x06 0c18000e 0e000000 00000000 00000000 -06000002 00400002 e8106000 01000000 +06000002 00400002 68106000 01000000 00000000 00000000 00000000 00030810 00000000 01fe0a06 00000000 00000000 diff --git a/board/freescale/t104xrdb/t1042_pi_rcw.cfg b/board/freescale/t104xrdb/t1042_pi_spi_rcw.cfg similarity index 83% rename from board/freescale/t104xrdb/t1042_pi_rcw.cfg rename to board/freescale/t104xrdb/t1042_pi_spi_rcw.cfg index 57de89a..b1d8b4c 100644 --- a/board/freescale/t104xrdb/t1042_pi_rcw.cfg +++ b/board/freescale/t104xrdb/t1042_pi_spi_rcw.cfg @@ -2,6 +2,6 @@ aa55aa55 010e0100 # serdes protocol 0x06 0c18000e 0e000000 00000000 00000000 -06000002 00400002 e8106000 01000000 +06000002 00400002 58106000 01000000 00000000 00000000 00000000 00030810 00000000 01fe0a06 00000000 00000000 diff --git a/board/freescale/t104xrdb/t1042_rcw.cfg b/board/freescale/t104xrdb/t1042_sd_rcw.cfg similarity index 83% copy from board/freescale/t104xrdb/t1042_rcw.cfg copy to board/freescale/t104xrdb/t1042_sd_rcw.cfg index db4d52f..d77bf18 100644 --- a/board/freescale/t104xrdb/t1042_rcw.cfg +++ b/board/freescale/t104xrdb/t1042_sd_rcw.cfg @@ -2,6 +2,6 @@ aa55aa55 010e0100 # serdes protocol 0x86 0c18000e 0e000000 00000000 00000000 -86000002 80000002 ec027000 01000000 +86000002 80000002 6c027000 01000000 00000000 00000000 00000000 00032810 00000000 0342500f 00000000 00000000 diff --git a/board/freescale/t104xrdb/t1042_rcw.cfg b/board/freescale/t104xrdb/t1042_spi_rcw.cfg similarity index 83% rename from board/freescale/t104xrdb/t1042_rcw.cfg rename to board/freescale/t104xrdb/t1042_spi_rcw.cfg index db4d52f..e8a3ad1 100644 --- a/board/freescale/t104xrdb/t1042_rcw.cfg +++ b/board/freescale/t104xrdb/t1042_spi_rcw.cfg @@ -2,6 +2,6 @@ aa55aa55 010e0100 # serdes protocol 0x86 0c18000e 0e000000 00000000 00000000 -86000002 80000002 ec027000 01000000 +86000002 80000002 5c027000 01000000 00000000 00000000 00000000 00032810 00000000 0342500f 00000000 00000000 diff --git a/board/freescale/t104xrdb/t1042d4_rcw.cfg b/board/freescale/t104xrdb/t1042d4_nand_rcw.cfg similarity index 100% copy from board/freescale/t104xrdb/t1042d4_rcw.cfg copy to board/freescale/t104xrdb/t1042d4_nand_rcw.cfg diff --git a/board/freescale/t104xrdb/t1042d4_rcw.cfg b/board/freescale/t104xrdb/t1042d4_sd_rcw.cfg similarity index 83% copy from board/freescale/t104xrdb/t1042d4_rcw.cfg copy to board/freescale/t104xrdb/t1042d4_sd_rcw.cfg index 9e0ee27..9d9046d 100644 --- a/board/freescale/t104xrdb/t1042d4_rcw.cfg +++ b/board/freescale/t104xrdb/t1042d4_sd_rcw.cfg @@ -2,6 +2,6 @@ aa55aa55 010e0100 # serdes protocol 0x86 0c18000e 0e000000 00000000 00000000 -86000002 40000002 ec027000 01000000 +86000002 40000002 6c027000 01000000 00000000 00000000 00000000 00030810 00000000 0342500f 00000000 00000000 diff --git a/board/freescale/t104xrdb/t1042d4_rcw.cfg b/board/freescale/t104xrdb/t1042d4_spi_rcw.cfg similarity index 83% rename from board/freescale/t104xrdb/t1042d4_rcw.cfg rename to board/freescale/t104xrdb/t1042d4_spi_rcw.cfg index 9e0ee27..f1ec989 100644 --- a/board/freescale/t104xrdb/t1042d4_rcw.cfg +++ b/board/freescale/t104xrdb/t1042d4_spi_rcw.cfg @@ -2,6 +2,6 @@ aa55aa55 010e0100 # serdes protocol 0x86 0c18000e 0e000000 00000000 00000000 -86000002 40000002 ec027000 01000000 +86000002 40000002 5c027000 01000000 00000000 00000000 00000000 00030810 00000000 0342500f 00000000 00000000 diff --git a/board/freescale/t208xqds/t2080_rcw.cfg b/board/freescale/t208xqds/t2080_nand_rcw.cfg similarity index 100% copy from board/freescale/t208xqds/t2080_rcw.cfg copy to board/freescale/t208xqds/t2080_nand_rcw.cfg diff --git a/board/freescale/t208xqds/t2080_rcw.cfg b/board/freescale/t208xqds/t2080_sd_rcw.cfg similarity index 92% copy from board/freescale/t208xqds/t2080_rcw.cfg copy to board/freescale/t208xqds/t2080_sd_rcw.cfg index 52a1652..73f53fa 100644 --- a/board/freescale/t208xqds/t2080_rcw.cfg +++ b/board/freescale/t208xqds/t2080_sd_rcw.cfg @@ -11,6 +11,6 @@ aa55aa55 010e0100 #For T2080 v1.1 #SerDes=0x66_0x15, Core=1800MHz, DDR=1867MT/s 0c070012 0e000000 00000000 00000000 -66150002 00000000 e8104000 c1000000 +66150002 00000000 68104000 c1000000 00000000 00000000 00000000 000307fc 00000000 00000000 00000000 00000004 diff --git a/board/freescale/t208xqds/t2080_rcw.cfg b/board/freescale/t208xqds/t2080_spi_rcw.cfg similarity index 92% rename from board/freescale/t208xqds/t2080_rcw.cfg rename to board/freescale/t208xqds/t2080_spi_rcw.cfg index 52a1652..8474c8e 100644 --- a/board/freescale/t208xqds/t2080_rcw.cfg +++ b/board/freescale/t208xqds/t2080_spi_rcw.cfg @@ -11,6 +11,6 @@ aa55aa55 010e0100 #For T2080 v1.1 #SerDes=0x66_0x15, Core=1800MHz, DDR=1867MT/s 0c070012 0e000000 00000000 00000000 -66150002 00000000 e8104000 c1000000 +66150002 00000000 58104000 c1000000 00000000 00000000 00000000 000307fc 00000000 00000000 00000000 00000004 diff --git a/board/freescale/t208xqds/t2081_rcw.cfg b/board/freescale/t208xqds/t2081_nand_rcw.cfg similarity index 100% copy from board/freescale/t208xqds/t2081_rcw.cfg copy to board/freescale/t208xqds/t2081_nand_rcw.cfg diff --git a/board/freescale/t208xqds/t2081_rcw.cfg b/board/freescale/t208xqds/t2081_sd_rcw.cfg similarity index 85% copy from board/freescale/t208xqds/t2081_rcw.cfg copy to board/freescale/t208xqds/t2081_sd_rcw.cfg index a2d5ecf..daced67 100644 --- a/board/freescale/t208xqds/t2081_rcw.cfg +++ b/board/freescale/t208xqds/t2081_sd_rcw.cfg @@ -3,6 +3,6 @@ aa55aa55 010e0100 #Default SerDes Protocol: 0x6C #Core/DDR: 1533Mhz/2133MT/s 12100017 15000000 00000000 00000000 -6c000002 00008000 e8104000 c1000000 +6c000002 00008000 68104000 c1000000 00000000 00000000 00000000 000307fc 00000000 00000000 00000000 00000004 diff --git a/board/freescale/t208xqds/t2081_rcw.cfg b/board/freescale/t208xqds/t2081_spi_rcw.cfg similarity index 85% rename from board/freescale/t208xqds/t2081_rcw.cfg rename to board/freescale/t208xqds/t2081_spi_rcw.cfg index a2d5ecf..79ba1f1 100644 --- a/board/freescale/t208xqds/t2081_rcw.cfg +++ b/board/freescale/t208xqds/t2081_spi_rcw.cfg @@ -3,6 +3,6 @@ aa55aa55 010e0100 #Default SerDes Protocol: 0x6C #Core/DDR: 1533Mhz/2133MT/s 12100017 15000000 00000000 00000000 -6c000002 00008000 e8104000 c1000000 +6c000002 00008000 58104000 c1000000 00000000 00000000 00000000 000307fc 00000000 00000000 00000000 00000004 diff --git a/board/freescale/t208xrdb/t2080_rcw.cfg b/board/freescale/t208xrdb/t2080_nand_rcw.cfg similarity index 100% copy from board/freescale/t208xrdb/t2080_rcw.cfg copy to board/freescale/t208xrdb/t2080_nand_rcw.cfg diff --git a/board/freescale/t208xrdb/t2080_rcw.cfg b/board/freescale/t208xrdb/t2080_sd_rcw.cfg similarity index 93% copy from board/freescale/t208xrdb/t2080_rcw.cfg copy to board/freescale/t208xrdb/t2080_sd_rcw.cfg index 8096ff9..6309b1d 100644 --- a/board/freescale/t208xrdb/t2080_rcw.cfg +++ b/board/freescale/t208xrdb/t2080_sd_rcw.cfg @@ -14,6 +14,6 @@ aa55aa55 010e0100 #SerDes=0x66_0x15, Core:1800MHz, DDR:1867MT/s 1207001b 15000000 00000000 00000000 -66150002 00000000 e8104000 c1000000 +66150002 00000000 68104000 c1000000 00800000 00000000 00000000 000307fc 00000000 00000000 00000000 00000004 diff --git a/board/freescale/t208xrdb/t2080_rcw.cfg b/board/freescale/t208xrdb/t2080_spi_rcw.cfg similarity index 93% rename from board/freescale/t208xrdb/t2080_rcw.cfg rename to board/freescale/t208xrdb/t2080_spi_rcw.cfg index 8096ff9..f167495 100644 --- a/board/freescale/t208xrdb/t2080_rcw.cfg +++ b/board/freescale/t208xrdb/t2080_spi_rcw.cfg @@ -14,6 +14,6 @@ aa55aa55 010e0100 #SerDes=0x66_0x15, Core:1800MHz, DDR:1867MT/s 1207001b 15000000 00000000 00000000 -66150002 00000000 e8104000 c1000000 +66150002 00000000 58104000 c1000000 00800000 00000000 00000000 000307fc 00000000 00000000 00000000 00000004 diff --git a/board/freescale/t4qds/t4_rcw.cfg b/board/freescale/t4qds/t4_nand_rcw.cfg similarity index 83% copy from board/freescale/t4qds/t4_rcw.cfg copy to board/freescale/t4qds/t4_nand_rcw.cfg index 267494c..9386be0 100644 --- a/board/freescale/t4qds/t4_rcw.cfg +++ b/board/freescale/t4qds/t4_nand_rcw.cfg @@ -2,6 +2,6 @@ aa55aa55 010e0100 #serdes protocol 1_27_5_11 1607001b 18101b16 00000000 00000000 -04362858 30548c00 ec020000 f5000000 +04362858 30548c00 e8020000 f5000000 00000000 ee0000ee 00000000 000307fc 00000000 00000000 00000000 00000028 diff --git a/board/freescale/t4qds/t4_rcw.cfg b/board/freescale/t4qds/t4_sd_rcw.cfg similarity index 83% rename from board/freescale/t4qds/t4_rcw.cfg rename to board/freescale/t4qds/t4_sd_rcw.cfg index 267494c..54beb67 100644 --- a/board/freescale/t4qds/t4_rcw.cfg +++ b/board/freescale/t4qds/t4_sd_rcw.cfg @@ -2,6 +2,6 @@ aa55aa55 010e0100 #serdes protocol 1_27_5_11 1607001b 18101b16 00000000 00000000 -04362858 30548c00 ec020000 f5000000 +04362858 30548c00 68020000 f5000000 00000000 ee0000ee 00000000 000307fc 00000000 00000000 00000000 00000028 diff --git a/board/freescale/t4rdb/t4_rcw.cfg b/board/freescale/t4rdb/t4_sd_rcw.cfg similarity index 83% rename from board/freescale/t4rdb/t4_rcw.cfg rename to board/freescale/t4rdb/t4_sd_rcw.cfg index 282fea4..cc2bff6 100644 --- a/board/freescale/t4rdb/t4_rcw.cfg +++ b/board/freescale/t4rdb/t4_sd_rcw.cfg @@ -2,6 +2,6 @@ aa55aa55 010e0100 #serdes protocol 27_55_1_9 16070019 18101916 00000000 00000000 -6c6e0848 00448c00 ec020000 f5000000 +6c6e0848 00448c00 6c020000 f5000000 00000000 ee0000ee 00000000 000307fc 00000000 00000000 00000000 00000028 diff --git a/include/configs/T102xQDS.h b/include/configs/T102xQDS.h index b151963..2c6bbc6 100644 --- a/include/configs/T102xQDS.h +++ b/include/configs/T102xQDS.h @@ -43,7 +43,6 @@ #ifdef CONFIG_RAMBOOT_PBL #define CONFIG_SYS_FSL_PBL_PBI board/freescale/t102xqds/t1024_pbi.cfg -#define CONFIG_SYS_FSL_PBL_RCW board/freescale/t102xqds/t1024_rcw.cfg #define CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT #define CONFIG_SPL_ENV_SUPPORT #define CONFIG_SPL_SERIAL_SUPPORT @@ -74,6 +73,7 @@ #define CONFIG_SYS_NAND_U_BOOT_START 0x00200000 #define CONFIG_SYS_NAND_U_BOOT_OFFS (256 << 10) #define CONFIG_SYS_LDSCRIPT "arch/powerpc/cpu/mpc85xx/u-boot-nand.lds" +#define CONFIG_SYS_FSL_PBL_RCW board/freescale/t102xqds/t1024_nand_rcw.cfg #define CONFIG_SPL_NAND_BOOT #endif @@ -90,6 +90,7 @@ #ifndef CONFIG_SPL_BUILD #define CONFIG_SYS_MPC85XX_NO_RESETVEC #endif +#define CONFIG_SYS_FSL_PBL_RCW board/freescale/t102xqds/t1024_spi_rcw.cfg #define CONFIG_SPL_SPI_BOOT #endif @@ -105,6 +106,7 @@ #ifndef CONFIG_SPL_BUILD #define CONFIG_SYS_MPC85XX_NO_RESETVEC #endif +#define CONFIG_SYS_FSL_PBL_RCW board/freescale/t102xqds/t1024_sd_rcw.cfg #define CONFIG_SPL_MMC_BOOT #endif diff --git a/include/configs/T102xRDB.h b/include/configs/T102xRDB.h index 25a0652..9dbc1a2 100644 --- a/include/configs/T102xRDB.h +++ b/include/configs/T102xRDB.h @@ -46,11 +46,6 @@ #ifdef CONFIG_RAMBOOT_PBL #define CONFIG_SYS_FSL_PBL_PBI board/freescale/t102xrdb/t1024_pbi.cfg -#if defined(CONFIG_T1024RDB) -#define CONFIG_SYS_FSL_PBL_RCW board/freescale/t102xrdb/t1024_rcw.cfg -#elif defined(CONFIG_T1023RDB) -#define CONFIG_SYS_FSL_PBL_RCW board/freescale/t102xrdb/t1023_rcw.cfg -#endif #define CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT #define CONFIG_SPL_ENV_SUPPORT #define CONFIG_SPL_SERIAL_SUPPORT @@ -81,6 +76,11 @@ #define CONFIG_SYS_NAND_U_BOOT_START 0x30000000 #define CONFIG_SYS_NAND_U_BOOT_OFFS (256 << 10) #define CONFIG_SYS_LDSCRIPT "arch/powerpc/cpu/mpc85xx/u-boot-nand.lds" +#if defined(CONFIG_T1024RDB) +#define CONFIG_SYS_FSL_PBL_RCW board/freescale/t102xrdb/t1024_nand_rcw.cfg +#elif defined(CONFIG_T1023RDB) +#define CONFIG_SYS_FSL_PBL_RCW board/freescale/t102xrdb/t1023_nand_rcw.cfg +#endif #define CONFIG_SPL_NAND_BOOT #endif @@ -97,6 +97,11 @@ #ifndef CONFIG_SPL_BUILD #define CONFIG_SYS_MPC85XX_NO_RESETVEC #endif +#if defined(CONFIG_T1024RDB) +#define CONFIG_SYS_FSL_PBL_RCW board/freescale/t102xrdb/t1024_spi_rcw.cfg +#elif defined(CONFIG_T1023RDB) +#define CONFIG_SYS_FSL_PBL_RCW board/freescale/t102xrdb/t1023_spi_rcw.cfg +#endif #define CONFIG_SPL_SPI_BOOT #endif @@ -112,6 +117,11 @@ #ifndef CONFIG_SPL_BUILD #define CONFIG_SYS_MPC85XX_NO_RESETVEC #endif +#if defined(CONFIG_T1024RDB) +#define CONFIG_SYS_FSL_PBL_RCW board/freescale/t102xrdb/t1024_sd_rcw.cfg +#elif defined(CONFIG_T1023RDB) +#define CONFIG_SYS_FSL_PBL_RCW board/freescale/t102xrdb/t1023_sd_rcw.cfg +#endif #define CONFIG_SPL_MMC_BOOT #endif diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h index ae1acbd..ca92680 100644 --- a/include/configs/T104xRDB.h +++ b/include/configs/T104xRDB.h @@ -26,24 +26,6 @@ $(SRCTREE)/board/freescale/t104xrdb/t104x_pbi_sb.cfg #endif -#ifdef CONFIG_T1040RDB -#define CONFIG_SYS_FSL_PBL_RCW $(SRCTREE)/board/freescale/t104xrdb/t1040_rcw.cfg -#endif -#ifdef CONFIG_T1042RDB_PI -#define CONFIG_SYS_FSL_PBL_RCW $(SRCTREE)/board/freescale/t104xrdb/t1042_pi_rcw.cfg -#endif -#ifdef CONFIG_T1042RDB -#define CONFIG_SYS_FSL_PBL_RCW $(SRCTREE)/board/freescale/t104xrdb/t1042_rcw.cfg -#endif -#ifdef CONFIG_T1040D4RDB -#define CONFIG_SYS_FSL_PBL_RCW \ -$(SRCTREE)/board/freescale/t104xrdb/t1040d4_rcw.cfg -#endif -#ifdef CONFIG_T1042D4RDB -#define CONFIG_SYS_FSL_PBL_RCW \ -$(SRCTREE)/board/freescale/t104xrdb/t1042d4_rcw.cfg -#endif - #define CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT #define CONFIG_SPL_ENV_SUPPORT #define CONFIG_SPL_SERIAL_SUPPORT @@ -84,6 +66,26 @@ $(SRCTREE)/board/freescale/t104xrdb/t1042d4_rcw.cfg #define CONFIG_SYS_NAND_U_BOOT_START 0x30000000 #define CONFIG_SYS_NAND_U_BOOT_OFFS (256 << 10) #define CONFIG_SYS_LDSCRIPT "arch/powerpc/cpu/mpc85xx/u-boot-nand.lds" +#ifdef CONFIG_T1040RDB +#define CONFIG_SYS_FSL_PBL_RCW \ +$(SRCTREE)/board/freescale/t104xrdb/t1040_nand_rcw.cfg +#endif +#ifdef CONFIG_T1042RDB_PI +#define CONFIG_SYS_FSL_PBL_RCW \ +$(SRCTREE)/board/freescale/t104xrdb/t1042_pi_nand_rcw.cfg +#endif +#ifdef CONFIG_T1042RDB +#define CONFIG_SYS_FSL_PBL_RCW \ +$(SRCTREE)/board/freescale/t104xrdb/t1042_nand_rcw.cfg +#endif +#ifdef CONFIG_T1040D4RDB +#define CONFIG_SYS_FSL_PBL_RCW \ +$(SRCTREE)/board/freescale/t104xrdb/t1040d4_nand_rcw.cfg +#endif +#ifdef CONFIG_T1042D4RDB +#define CONFIG_SYS_FSL_PBL_RCW \ +$(SRCTREE)/board/freescale/t104xrdb/t1042d4_nand_rcw.cfg +#endif #define CONFIG_SPL_NAND_BOOT #endif @@ -100,6 +102,26 @@ $(SRCTREE)/board/freescale/t104xrdb/t1042d4_rcw.cfg #ifndef CONFIG_SPL_BUILD #define CONFIG_SYS_MPC85XX_NO_RESETVEC #endif +#ifdef CONFIG_T1040RDB +#define CONFIG_SYS_FSL_PBL_RCW \ +$(SRCTREE)/board/freescale/t104xrdb/t1040_spi_rcw.cfg +#endif +#ifdef CONFIG_T1042RDB_PI +#define CONFIG_SYS_FSL_PBL_RCW \ +$(SRCTREE)/board/freescale/t104xrdb/t1042_pi_spi_rcw.cfg +#endif +#ifdef CONFIG_T1042RDB +#define CONFIG_SYS_FSL_PBL_RCW \ +$(SRCTREE)/board/freescale/t104xrdb/t1042_spi_rcw.cfg +#endif +#ifdef CONFIG_T1040D4RDB +#define CONFIG_SYS_FSL_PBL_RCW \ +$(SRCTREE)/board/freescale/t104xrdb/t1040d4_spi_rcw.cfg +#endif +#ifdef CONFIG_T1042D4RDB +#define CONFIG_SYS_FSL_PBL_RCW \ +$(SRCTREE)/board/freescale/t104xrdb/t1042d4_spi_rcw.cfg +#endif #define CONFIG_SPL_SPI_BOOT #endif @@ -115,6 +137,26 @@ $(SRCTREE)/board/freescale/t104xrdb/t1042d4_rcw.cfg #ifndef CONFIG_SPL_BUILD #define CONFIG_SYS_MPC85XX_NO_RESETVEC #endif +#ifdef CONFIG_T1040RDB +#define CONFIG_SYS_FSL_PBL_RCW \ +$(SRCTREE)/board/freescale/t104xrdb/t1040_sd_rcw.cfg +#endif +#ifdef CONFIG_T1042RDB_PI +#define CONFIG_SYS_FSL_PBL_RCW \ +$(SRCTREE)/board/freescale/t104xrdb/t1042_pi_sd_rcw.cfg +#endif +#ifdef CONFIG_T1042RDB +#define CONFIG_SYS_FSL_PBL_RCW \ +$(SRCTREE)/board/freescale/t104xrdb/t1042_sd_rcw.cfg +#endif +#ifdef CONFIG_T1040D4RDB +#define CONFIG_SYS_FSL_PBL_RCW \ +$(SRCTREE)/board/freescale/t104xrdb/t1040d4_sd_rcw.cfg +#endif +#ifdef CONFIG_T1042D4RDB +#define CONFIG_SYS_FSL_PBL_RCW \ +$(SRCTREE)/board/freescale/t104xrdb/t1042d4_sd_rcw.cfg +#endif #define CONFIG_SPL_MMC_BOOT #endif diff --git a/include/configs/T208xQDS.h b/include/configs/T208xQDS.h index 6217555..f726b53 100644 --- a/include/configs/T208xQDS.h +++ b/include/configs/T208xQDS.h @@ -48,11 +48,6 @@ #ifdef CONFIG_RAMBOOT_PBL #define CONFIG_SYS_FSL_PBL_PBI board/freescale/t208xqds/t208x_pbi.cfg -#if defined(CONFIG_PPC_T2080) -#define CONFIG_SYS_FSL_PBL_RCW board/freescale/t208xqds/t2080_rcw.cfg -#elif defined(CONFIG_PPC_T2081) -#define CONFIG_SYS_FSL_PBL_RCW board/freescale/t208xqds/t2081_rcw.cfg -#endif #define CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT #define CONFIG_SPL_ENV_SUPPORT @@ -84,6 +79,11 @@ #define CONFIG_SYS_NAND_U_BOOT_START 0x00200000 #define CONFIG_SYS_NAND_U_BOOT_OFFS (256 << 10) #define CONFIG_SYS_LDSCRIPT "arch/powerpc/cpu/mpc85xx/u-boot-nand.lds" +#if defined(CONFIG_PPC_T2080) +#define CONFIG_SYS_FSL_PBL_RCW board/freescale/t208xqds/t2080_nand_rcw.cfg +#elif defined(CONFIG_PPC_T2081) +#define CONFIG_SYS_FSL_PBL_RCW board/freescale/t208xqds/t2081_nand_rcw.cfg +#endif #define CONFIG_SPL_NAND_BOOT #endif @@ -100,6 +100,11 @@ #ifndef CONFIG_SPL_BUILD #define CONFIG_SYS_MPC85XX_NO_RESETVEC #endif +#if defined(CONFIG_PPC_T2080) +#define CONFIG_SYS_FSL_PBL_RCW board/freescale/t208xqds/t2080_spi_rcw.cfg +#elif defined(CONFIG_PPC_T2081) +#define CONFIG_SYS_FSL_PBL_RCW board/freescale/t208xqds/t2081_spi_rcw.cfg +#endif #define CONFIG_SPL_SPI_BOOT #endif @@ -115,6 +120,11 @@ #ifndef CONFIG_SPL_BUILD #define CONFIG_SYS_MPC85XX_NO_RESETVEC #endif +#if defined(CONFIG_PPC_T2080) +#define CONFIG_SYS_FSL_PBL_RCW board/freescale/t208xqds/t2080_sd_rcw.cfg +#elif defined(CONFIG_PPC_T2081) +#define CONFIG_SYS_FSL_PBL_RCW board/freescale/t208xqds/t2081_sd_rcw.cfg +#endif #define CONFIG_SPL_MMC_BOOT #endif diff --git a/include/configs/T208xRDB.h b/include/configs/T208xRDB.h index 7a7de97..61f28a8 100644 --- a/include/configs/T208xRDB.h +++ b/include/configs/T208xRDB.h @@ -41,7 +41,6 @@ #ifdef CONFIG_RAMBOOT_PBL #define CONFIG_SYS_FSL_PBL_PBI board/freescale/t208xrdb/t2080_pbi.cfg -#define CONFIG_SYS_FSL_PBL_RCW board/freescale/t208xrdb/t2080_rcw.cfg #define CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT #define CONFIG_SPL_ENV_SUPPORT @@ -73,6 +72,7 @@ #define CONFIG_SYS_NAND_U_BOOT_START 0x00200000 #define CONFIG_SYS_NAND_U_BOOT_OFFS (256 << 10) #define CONFIG_SYS_LDSCRIPT "arch/powerpc/cpu/mpc85xx/u-boot-nand.lds" +#define CONFIG_SYS_FSL_PBL_RCW board/freescale/t208xrdb/t2080_nand_rcw.cfg #define CONFIG_SPL_NAND_BOOT #endif @@ -89,6 +89,7 @@ #ifndef CONFIG_SPL_BUILD #define CONFIG_SYS_MPC85XX_NO_RESETVEC #endif +#define CONFIG_SYS_FSL_PBL_RCW board/freescale/t208xrdb/t2080_spi_rcw.cfg #define CONFIG_SPL_SPI_BOOT #endif @@ -104,6 +105,7 @@ #ifndef CONFIG_SPL_BUILD #define CONFIG_SYS_MPC85XX_NO_RESETVEC #endif +#define CONFIG_SYS_FSL_PBL_RCW board/freescale/t208xrdb/t2080_sd_rcw.cfg #define CONFIG_SPL_MMC_BOOT #endif diff --git a/include/configs/T4240QDS.h b/include/configs/T4240QDS.h index 85aab18..85350b8 100644 --- a/include/configs/T4240QDS.h +++ b/include/configs/T4240QDS.h @@ -21,7 +21,6 @@ #ifdef CONFIG_RAMBOOT_PBL #define CONFIG_SYS_FSL_PBL_PBI board/freescale/t4qds/t4_pbi.cfg -#define CONFIG_SYS_FSL_PBL_RCW board/freescale/t4qds/t4_rcw.cfg #if !defined(CONFIG_NAND) && !defined(CONFIG_SDCARD) #define CONFIG_RAMBOOT_TEXT_BASE CONFIG_SYS_TEXT_BASE #define CONFIG_RESET_VECTOR_ADDRESS 0xfffffffc @@ -50,6 +49,7 @@ #define CONFIG_SYS_NAND_U_BOOT_START 0x00200000 #define CONFIG_SYS_NAND_U_BOOT_OFFS (256 << 10) #define CONFIG_SYS_LDSCRIPT "arch/powerpc/cpu/mpc85xx/u-boot-nand.lds" +#define CONFIG_SYS_FSL_PBL_RCW board/freescale/t4qds/t4_nand_rcw.cfg #define CONFIG_SPL_NAND_BOOT #endif @@ -65,6 +65,7 @@ #define CONFIG_SYS_MPC85XX_NO_RESETVEC #endif #define CONFIG_SYS_LDSCRIPT "arch/powerpc/cpu/mpc85xx/u-boot.lds" +#define CONFIG_SYS_FSL_PBL_RCW board/freescale/t4qds/t4_sd_rcw.cfg #define CONFIG_SPL_MMC_BOOT #endif diff --git a/include/configs/T4240RDB.h b/include/configs/T4240RDB.h index 4133165..4a05f73 100644 --- a/include/configs/T4240RDB.h +++ b/include/configs/T4240RDB.h @@ -21,7 +21,6 @@ #ifdef CONFIG_RAMBOOT_PBL #define CONFIG_SYS_FSL_PBL_PBI $(SRCTREE)/board/freescale/t4rdb/t4_pbi.cfg -#define CONFIG_SYS_FSL_PBL_RCW $(SRCTREE)/board/freescale/t4rdb/t4_rcw.cfg #ifndef CONFIG_SDCARD #define CONFIG_RAMBOOT_TEXT_BASE CONFIG_SYS_TEXT_BASE #define CONFIG_RESET_VECTOR_ADDRESS 0xfffffffc @@ -55,6 +54,7 @@ #define CONFIG_SYS_MPC85XX_NO_RESETVEC #endif #define CONFIG_SYS_LDSCRIPT "arch/powerpc/cpu/mpc85xx/u-boot.lds" +#define CONFIG_SYS_FSL_PBL_RCW $(SRCTREE)/board/freescale/t4rdb/t4_sd_rcw.cfg #define CONFIG_SPL_MMC_BOOT #endif -- 2.1.0.27.g96db324

2 3

[U-Boot] [PATCH] usb: host: Move CONFIG_USB_MAX_CONTROLLER_COUNT to non-dm
by Jagan Teki 15 Oct '16

15 Oct '16

CONFIG_USB_MAX_CONTROLLER_COUNT not used in DM_USB, hence moved to non-dm from global area. Cc: Simon Glass <sjg(a)chromium.org> Cc: Marek Vasut <marex(a)denx.de> Cc: Masahiro Yamada <yamada.masahiro(a)socionext.com> Signed-off-by: Jagan Teki <jteki(a)openedev.com> --- drivers/usb/host/ehci-hcd.c | 8 ++++---- drivers/usb/host/xhci.c | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c index 13aa70d..d8dc827 100644 --- a/drivers/usb/host/ehci-hcd.c +++ b/drivers/usb/host/ehci-hcd.c @@ -21,10 +21,6 @@ #include "ehci.h" -#ifndef CONFIG_USB_MAX_CONTROLLER_COUNT -#define CONFIG_USB_MAX_CONTROLLER_COUNT 1 -#endif - /* * EHCI spec page 20 says that the HC may take up to 16 uFrames (= 4ms) to halt. * Let's time out after 8 to have a little safety margin on top of that. @@ -32,6 +28,10 @@ #define HCHALT_TIMEOUT (8 * 1000) #ifndef CONFIG_DM_USB +# ifndef CONFIG_USB_MAX_CONTROLLER_COUNT +# define CONFIG_USB_MAX_CONTROLLER_COUNT 1 +# endif + static struct ehci_ctrl ehcic[CONFIG_USB_MAX_CONTROLLER_COUNT]; #endif diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c index 3201177..bb276da 100644 --- a/drivers/usb/host/xhci.c +++ b/drivers/usb/host/xhci.c @@ -31,10 +31,6 @@ #include <linux/errno.h> #include "xhci.h" -#ifndef CONFIG_USB_MAX_CONTROLLER_COUNT -#define CONFIG_USB_MAX_CONTROLLER_COUNT 1 -#endif - static struct descriptor { struct usb_hub_descriptor hub; struct usb_device_descriptor device; @@ -110,6 +106,10 @@ static struct descriptor { }; #ifndef CONFIG_DM_USB +# ifndef CONFIG_USB_MAX_CONTROLLER_COUNT +# define CONFIG_USB_MAX_CONTROLLER_COUNT 1 +# endif + static struct xhci_ctrl xhcic[CONFIG_USB_MAX_CONTROLLER_COUNT]; #endif -- 2.7.4

4 4

[U-Boot] CONFIG_USE_ARCH_MEMSET/MEMCPY and SPL not working
by Max Krummenacher 15 Oct '16

15 Oct '16

Hi I'm moving an i.MX6 based system to use SPL. With CONFIG_USE_ARCH_MEMSET/MEMCPY enabled the SPL build fails with undefined reference to `memset' undefined reference to `memcpy' The following RFC Patch should have made it in mainline by way of u -boot-arm, however it didn't. http://lists.denx.de/pipermail/u-boot/2015-February/203836.html http://lists.denx.de/pipermail/u-boot/2015-June/215848.html Is there a reason that the patch did not make it in mainline? Regards Max P.S.: The issue has been brought up earlier also, AFAIK without any response: http://lists.denx.de/pipermail/u-boot/2013-July/159045.html

1 0

[U-Boot] [PATCH] rk3288: kconfig: remove duplicate definition of SPL_MMC_SUPPORT
by Kever Yang 15 Oct '16

15 Oct '16

SPL_MMC_SUPPORT defined in rockchip top level Kconfig instead of inside rk3288 and default to disable if ROCKCHIP_SPL_BACK_TO_BROM defined. Signed-off-by: Kever Yang <kever.yang(a)rock-chips.com> --- arch/arm/mach-rockchip/rk3288/Kconfig | 3 --- 1 file changed, 3 deletions(-) diff --git a/arch/arm/mach-rockchip/rk3288/Kconfig b/arch/arm/mach-rockchip/rk3288/Kconfig index e30b007..ed8a5a5 100644 --- a/arch/arm/mach-rockchip/rk3288/Kconfig +++ b/arch/arm/mach-rockchip/rk3288/Kconfig @@ -81,9 +81,6 @@ config SPL_LIBCOMMON_SUPPORT config SPL_LIBGENERIC_SUPPORT default y -config SPL_MMC_SUPPORT - default y - config SPL_SERIAL_SUPPORT default y -- 1.9.1

2 2

[U-Boot] [PATCH] rk3288: fix reg address for GRF_SOC_CON2
by Kever Yang 15 Oct '16

15 Oct '16

The GRF base address is missing, fix it. Signed-off-by: Kever Yang <kever.yang(a)rock-chips.com> --- arch/arm/mach-rockchip/rk3288/rk3288.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/mach-rockchip/rk3288/rk3288.c b/arch/arm/mach-rockchip/rk3288/rk3288.c index 92f34bb..acc3b79 100644 --- a/arch/arm/mach-rockchip/rk3288/rk3288.c +++ b/arch/arm/mach-rockchip/rk3288/rk3288.c @@ -6,7 +6,7 @@ #include <asm/io.h> #include <asm/arch/hardware.h> -#define GRF_SOC_CON2 0x24c +#define GRF_SOC_CON2 0xff77024c int arch_cpu_init(void) { -- 1.9.1

2 2

[U-Boot] [PATCH v3 0/3] Add sdram capacity auto detect for rk3288
by Kever Yang 15 Oct '16

15 Oct '16

The rk3288 spl size is very close to 32KB while the rk3288 bootrom has the limitation of maximum size of SPL is 32KB. After apply this patch, the SPL size will exceed 32KB if we do not enable macro CONFIG_ROCKCHIP_SPL_BACK_TO_BROM and disable CONFIG_SPL_MMC_SUPPORT. This patch has test with 2GB DDR3 and 2GB/4GB LPDDR3. V2 add patch to clean some source code size for some rk3288 board to make the SPL size in the 32KB limitation. Changes in v3: - move the config into defconfig file - add error report and return value when error happen - add comments for stride and address bits. Changes in v2: - update code for OF_PLATDATA enabled - bug fix for ddrconfig Kever Yang (3): rk3288: config change for enable dram capacity auto-detect. rk3288: sdram: auto-detect the capacity dts: rk3288: remove node in dmc which not need anymore arch/arm/dts/rk3288-evb.dts | 3 - arch/arm/dts/rk3288-fennec.dts | 3 - arch/arm/dts/rk3288-firefly.dts | 2 - arch/arm/dts/rk3288-miniarm.dts | 3 - arch/arm/dts/rk3288-popmetal.dts | 3 - arch/arm/dts/rk3288-rock2-square.dts | 2 - arch/arm/dts/rk3288-veyron.dtsi | 2 - arch/arm/include/asm/arch-rockchip/sdram.h | 15 ++ arch/arm/mach-rockchip/rk3288/sdram_rk3288.c | 272 ++++++++++++++++++++++----- configs/evb-rk3288_defconfig | 1 + configs/fennec-rk3288_defconfig | 1 + configs/miniarm-rk3288_defconfig | 1 + configs/popmetal-rk3288_defconfig | 1 + 13 files changed, 249 insertions(+), 60 deletions(-) -- 1.9.1

3 10

[U-Boot] [PATCH] evb-rk3399: config: set emmc as default boot dev
by Kever Yang 15 Oct '16

15 Oct '16

rk3399 has two mmc dev controller: mmc 0: SD card; mmc 1: EMMC U-Boot will scan the mmc boot device configured by CONFIG_SYS_MMC_ENV_DEV, since evb has emmc on board, let's set the EMMC as default. Signed-off-by: Kever Yang <kever.yang(a)rock-chips.com> --- include/configs/evb_rk3399.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/configs/evb_rk3399.h b/include/configs/evb_rk3399.h index 047850a..a2af511 100644 --- a/include/configs/evb_rk3399.h +++ b/include/configs/evb_rk3399.h @@ -10,7 +10,7 @@ #include <configs/rk3399_common.h> #define CONFIG_ENV_IS_IN_MMC -#define CONFIG_SYS_MMC_ENV_DEV 0 +#define CONFIG_SYS_MMC_ENV_DEV 1 /* * SPL @ 32k for ~36k * ENV @ 96k -- 1.9.1

2 2

[U-Boot] [PATCH v3 1/2] rockchip: use rockchip linux partitions layout
by Jacob Chen 15 Oct '16

15 Oct '16

Unify the partitions of each chip then it will be more easy for us to write scripts, tools or guides for rockchip chips. Those extra partitions mostly are used to be compatible with our internal loaders (such as miniloader which was same as spl, or android loader then we can support dual boot) Signed-off-by: Jacob Chen <jacob2.chen(a)rock-chips.com> --- Changes in v3: - correct the copyright Changes in v2: - put macro in a rockchip_common.h include/configs/rk3036_common.h | 17 +---------------- include/configs/rk3288_common.h | 17 +---------------- include/configs/rk3399_common.h | 16 ++-------------- include/configs/rockchip-common.h | 35 +++++++++++++++++++++++++++++++++++ 4 files changed, 39 insertions(+), 46 deletions(-) create mode 100644 include/configs/rockchip-common.h diff --git a/include/configs/rk3036_common.h b/include/configs/rk3036_common.h index 73830e4..29d56ff 100644 --- a/include/configs/rk3036_common.h +++ b/include/configs/rk3036_common.h @@ -7,6 +7,7 @@ #define __CONFIG_RK3036_COMMON_H #include <asm/arch/hardware.h> +#include "rockchip-common.h" #define CONFIG_SYS_NO_FLASH #define CONFIG_NR_DRAM_BANKS 1 @@ -79,11 +80,6 @@ #define CONFIG_G_DNL_VENDOR_NUM 0x2207 #define CONFIG_G_DNL_PRODUCT_NUM 0x310a -/* Enable gpt partition table */ -#define CONFIG_CMD_GPT - -#include <config_distro_defaults.h> - #define ENV_MEM_LAYOUT_SETTINGS \ "scriptaddr=0x60000000\0" \ "pxefile_addr_r=0x60100000\0" \ @@ -91,17 +87,6 @@ "kernel_addr_r=0x62000000\0" \ "ramdisk_addr_r=0x64000000\0" -#define CONFIG_RANDOM_UUID -#define PARTS_DEFAULT \ - "uuid_disk=${uuid_gpt_disk};" \ - "name=boot,start=8M,size=64M,bootable,uuid=${uuid_gpt_boot};" \ - "name=rootfs,size=-,uuid=${uuid_gpt_rootfs};\0" \ - -/* First try to boot from SD (index 0), then eMMC (index 1 */ -#define BOOT_TARGET_DEVICES(func) \ - func(MMC, mmc, 0) \ - func(MMC, mmc, 1) - #include <config_distro_bootcmd.h> /* Linux fails to load the fdt if it's loaded above 512M on a evb-rk3036 board, diff --git a/include/configs/rk3288_common.h b/include/configs/rk3288_common.h index 9ddfe1d..630f218 100644 --- a/include/configs/rk3288_common.h +++ b/include/configs/rk3288_common.h @@ -8,6 +8,7 @@ #define __CONFIG_RK3288_COMMON_H #include <asm/arch/hardware.h> +#include "rockchip-common.h" #define CONFIG_SKIP_LOWLEVEL_INIT_ONLY #define CONFIG_SYS_NO_FLASH @@ -96,11 +97,6 @@ #define CONFIG_G_DNL_VENDOR_NUM 0x2207 #define CONFIG_G_DNL_PRODUCT_NUM 0x320a -/* Enable gpt partition table */ -#define CONFIG_CMD_GPT - -#include <config_distro_defaults.h> - #define ENV_MEM_LAYOUT_SETTINGS \ "scriptaddr=0x00000000\0" \ "pxefile_addr_r=0x00100000\0" \ @@ -108,17 +104,6 @@ "kernel_addr_r=0x02000000\0" \ "ramdisk_addr_r=0x04000000\0" -#define CONFIG_RANDOM_UUID -#define PARTS_DEFAULT \ - "uuid_disk=${uuid_gpt_disk};" \ - "name=boot,start=8M,size=64M,bootable,uuid=${uuid_gpt_boot};" \ - "name=rootfs,size=-,uuid=${uuid_gpt_rootfs};\0" \ - -/* First try to boot from SD (index 0), then eMMC (index 1 */ -#define BOOT_TARGET_DEVICES(func) \ - func(MMC, mmc, 0) \ - func(MMC, mmc, 1) - #include <config_distro_bootcmd.h> /* Linux fails to load the fdt if it's loaded above 512M on a Rock 2 board, so diff --git a/include/configs/rk3399_common.h b/include/configs/rk3399_common.h index b026122..68b9391 100644 --- a/include/configs/rk3399_common.h +++ b/include/configs/rk3399_common.h @@ -7,6 +7,8 @@ #ifndef __CONFIG_RK3399_COMMON_H #define __CONFIG_RK3399_COMMON_H +#include "rockchip-common.h" + #define CONFIG_SYS_NO_FLASH #define CONFIG_NR_DRAM_BANKS 1 #define CONFIG_ENV_SIZE 0x2000 @@ -53,7 +55,6 @@ #define CONFIG_SF_DEFAULT_SPEED 20000000 #ifndef CONFIG_SPL_BUILD -#include <config_distro_defaults.h> #define ENV_MEM_LAYOUT_SETTINGS \ "scriptaddr=0x00000000\0" \ @@ -62,19 +63,6 @@ "kernel_addr_r=0x02000000\0" \ "ramdisk_addr_r=0x04000000\0" -#define CONFIG_CMD_GPT -#define CONFIG_RANDOM_UUID -#define CONFIG_PARTITION_UUIDS -#define PARTS_DEFAULT \ - "uuid_disk=${uuid_gpt_disk};" \ - "name=boot,start=16M,size=32M,bootable;" \ - "name=rootfs,size=-,uuid=${uuid_gpt_rootfs};\0" \ - -/* First try to boot from SD (index 0), then eMMC (index 1) */ -#define BOOT_TARGET_DEVICES(func) \ - func(MMC, mmc, 0) \ - func(MMC, mmc, 1) - #include <config_distro_bootcmd.h> #define CONFIG_EXTRA_ENV_SETTINGS \ ENV_MEM_LAYOUT_SETTINGS \ diff --git a/include/configs/rockchip-common.h b/include/configs/rockchip-common.h new file mode 100644 index 0000000..7ca1696 --- /dev/null +++ b/include/configs/rockchip-common.h @@ -0,0 +1,35 @@ +/* + * (C) Copyright 2016 Rockchip Electronics Co., Ltd + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +#ifndef _ROCKCHIP_COMMON_H_ +#define _ROCKCHIP_COMMON_H_ +#include <linux/sizes.h> + +#ifndef CONFIG_SPL_BUILD +#include <config_distro_defaults.h> + +/* First try to boot from SD (index 0), then eMMC (index 1 */ +#define BOOT_TARGET_DEVICES(func) \ + func(MMC, mmc, 0) \ + func(MMC, mmc, 1) + + /* Enable gpt partition table */ +#define CONFIG_CMD_GPT +#define CONFIG_RANDOM_UUID +#define CONFIG_PARTITION_UUIDS +#define PARTS_DEFAULT \ + "uuid_disk=${uuid_gpt_disk};" \ + "name=loader1,start=32K,size=4000K,uuid=${uuid_gpt_loader1};" \ + "name=reserved1,size=64K,uuid=${uuid_gpt_reserved1};" \ + "name=reserved2,size=4M,uuid=${uuid_gpt_reserved2};" \ + "name=loader2,size=4MB,uuid=${uuid_gpt_loader2};" \ + "name=atf,size=4M,uuid=${uuid_gpt_atf};" \ + "name=boot,size=128M,bootable,uuid=${uuid_gpt_boot};" \ + "name=rootfs,size=-,uuid=${uuid_gpt_rootfs};\0" \ + +#endif + +#endif /* _ROCKCHIP_COMMON_H_ */ -- 1.9.1

3 6

[U-Boot] [PATCH] rk3399: disable the clock multiplier support when SoC init
by Kever Yang 15 Oct '16

15 Oct '16

The Clock Multiplier in rk3399 EMMC programmable clock generator is broken, we can remove its support from SoC GRF register. Without this patch, rk3399 emmc driver is not work after below patch applied: 6dffdbc mmc: sdhci: Add the programmable clock mode support Signed-off-by: Kever Yang <kever.yang(a)rock-chips.com> --- arch/arm/mach-rockchip/rk3399/rk3399.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/arch/arm/mach-rockchip/rk3399/rk3399.c b/arch/arm/mach-rockchip/rk3399/rk3399.c index b9d7629..8bb950e 100644 --- a/arch/arm/mach-rockchip/rk3399/rk3399.c +++ b/arch/arm/mach-rockchip/rk3399/rk3399.c @@ -6,6 +6,10 @@ #include <common.h> #include <asm/armv8/mmu.h> +#include <asm/io.h> +#include <asm/arch/hardware.h> + +#define GRF_EMMCCORE_CON11 0xff77f02c static struct mm_region rk3399_mem_map[] = { { @@ -28,3 +32,13 @@ static struct mm_region rk3399_mem_map[] = { }; struct mm_region *mem_map = rk3399_mem_map; + +int arch_cpu_init(void) +{ + /* We do some SoC one time setting here. */ + + /* Emmc clock generator: disable the clock multipilier */ + rk_clrreg(GRF_EMMCCORE_CON11, 0x0ff); + + return 0; +} -- 1.9.1

2 2