September 2016 - U-Boot

[U-Boot] [patch v2 1/2] pxe: Fix pxe boot with FIT image
by Wenbin song 01 Sep '16

01 Sep '16

From: York Sun <york.sun(a)nxp.com> When FIT image is used, a single image provides kernel, device tree and optionally ramdisk. Argc and argv need to be adjusted to support this. Test cases: 1. Booting with legacy images 2. Booting with legacy images without initrd 3. Booting with FIT image Test commands: 1. pxe get && pxe boot 2. sysboot Signed-off-by: York Sun <york.sun(a)nxp.com> Signed-off-by: Wenbin Song <wenbin.song(a)nxp.com> --- v2: Add test cases on submit message. --- cmd/pxe.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/cmd/pxe.c b/cmd/pxe.c index 9434a18..0a07f14 100644 --- a/cmd/pxe.c +++ b/cmd/pxe.c @@ -620,7 +620,7 @@ static int label_boot(cmd_tbl_t *cmdtp, struct pxe_label *label) char initrd_str[22]; char mac_str[29] = ""; char ip_str[68] = ""; - int bootm_argc = 3; + int bootm_argc = 2; int len = 0; ulong kernel_addr; void *buf; @@ -652,8 +652,6 @@ static int label_boot(cmd_tbl_t *cmdtp, struct pxe_label *label) strcpy(bootm_argv[2], getenv("ramdisk_addr_r")); strcat(bootm_argv[2], ":"); strcat(bootm_argv[2], getenv("filesize")); - } else { - bootm_argv[2] = "-"; } if (get_relfile_envaddr(cmdtp, label->kernel, "kernel_addr_r") < 0) { @@ -785,8 +783,11 @@ static int label_boot(cmd_tbl_t *cmdtp, struct pxe_label *label) if (!bootm_argv[3]) bootm_argv[3] = getenv("fdt_addr"); - if (bootm_argv[3]) + if (bootm_argv[3]) { + if (!bootm_argv[2]) + bootm_argv[2] = "-"; bootm_argc = 4; + } kernel_addr = genimg_get_kernel_addr(bootm_argv[1]); buf = map_sysmem(kernel_addr, 0); -- 2.1.0.27.g96db324

1 1

[U-Boot] [PATCH v1] mtd: nand: pxa3xx: use nand_set_controller_data
by Chris Packham 01 Sep '16

01 Sep '16

In commit 17cb4b8f327e ("mtd: nand: Add+use mtd_to/from_nand and nand_get/set_controller_data") the assignment of mtd->priv was removed but was not replaced. This adds the required nand_set_controller_data() call. Signed-off-by: Chris Packham <judge.packham(a)gmail.com> --- drivers/mtd/nand/pxa3xx_nand.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/mtd/nand/pxa3xx_nand.c b/drivers/mtd/nand/pxa3xx_nand.c index d3ac5391f156..b1d58e036a1d 100644 --- a/drivers/mtd/nand/pxa3xx_nand.c +++ b/drivers/mtd/nand/pxa3xx_nand.c @@ -1496,6 +1496,7 @@ static int alloc_nand_resource(struct pxa3xx_nand_info *info) host->read_id_bytes = 4; mtd->owner = THIS_MODULE; + nand_set_controller_data(chip, host); chip->ecc.read_page = pxa3xx_nand_read_page_hwecc; chip->ecc.write_page = pxa3xx_nand_write_page_hwecc; chip->controller = &info->controller; -- 2.9.2.518.ged577c6.dirty

1 1

[U-Boot] is there really a "CONFIG_RAMBOOT" config option?
by Robert P. J. Day 01 Sep '16

01 Sep '16

just tripped across this in master branch: $ grep -rw CONFIG_RAMBOOT * doc/README.ramboot-ppc85xx: #ifdef CONFIG_RAMBOOT include/configs/at91rm9200ek.h:#ifdef CONFIG_RAMBOOT README: CONFIG_RAMBOOT and CONFIG_NFSBOOT $ i have looked no further than this, so it might be perfectly valid, but it seems odd that there are so few references to that config option -- is it possible those should be CONFIG_SYS_RAMBOOT? rday -- ======================================================================== Robert P. J. Day Ottawa, Ontario, CANADA http://crashcourse.ca Twitter: http://twitter.com/rpjday LinkedIn: http://ca.linkedin.com/in/rpjday ========================================================================

2 1

[U-Boot] [PATCH] pbl: use "wait" command instead of "flush" command
by Zhao Qiang 01 Sep '16

01 Sep '16

FLUSH command is restricted to CCSR space. So use WAIT command in case of non-CCSR board. And split txxx_rcw.cfg to txxx_sd_rcw.cfg, txxx_spi_rcw.cfg and txxx_nand_rcw.cfg for SPI/NAND/SD boot. Signed-off-by: Zhao Qiang <qiang.zhao(a)nxp.com> --- .../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 +- board/freescale/t208xqds/t208x_pbi.cfg | 3 +- .../t208xrdb/{t2080_rcw.cfg => t2080_nand_rcw.cfg} | 0 board/freescale/t208xrdb/t2080_pbi.cfg | 3 +- .../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 +- board/freescale/t4qds/t4_pbi.cfg | 3 +- .../{t4rdb/t4_rcw.cfg => t4qds/t4_sd_rcw.cfg} | 6 +- board/freescale/t4rdb/t4_pbi.cfg | 3 +- 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 +- tools/pblimage.c | 2 +- 47 files changed, 130 insertions(+), 67 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%) rename board/freescale/t4qds/{t4_rcw.cfg => t4_nand_rcw.cfg} (83%) rename board/freescale/{t4rdb/t4_rcw.cfg => t4qds/t4_sd_rcw.cfg} (54%) 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/t208xqds/t208x_pbi.cfg b/board/freescale/t208xqds/t208x_pbi.cfg index e200d92..43be8a8 100644 --- a/board/freescale/t208xqds/t208x_pbi.cfg +++ b/board/freescale/t208xqds/t208x_pbi.cfg @@ -37,5 +37,4 @@ 09000014 ff000000 09000018 81000000 #Flush PBL data -09138000 00000000 -091380c0 00000000 +091380c0 00100000 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_pbi.cfg b/board/freescale/t208xrdb/t2080_pbi.cfg index e200d92..43be8a8 100644 --- a/board/freescale/t208xrdb/t2080_pbi.cfg +++ b/board/freescale/t208xrdb/t2080_pbi.cfg @@ -37,5 +37,4 @@ 09000014 ff000000 09000018 81000000 #Flush PBL data -09138000 00000000 -091380c0 00000000 +091380c0 00100000 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% rename from board/freescale/t4qds/t4_rcw.cfg rename 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_pbi.cfg b/board/freescale/t4qds/t4_pbi.cfg index 6126266..8d46003 100644 --- a/board/freescale/t4qds/t4_pbi.cfg +++ b/board/freescale/t4qds/t4_pbi.cfg @@ -18,5 +18,4 @@ 09000014 ff000000 09000018 81000000 #Flush PBL data -09138000 00000000 -091380c0 00000000 +091380c0 00100000 diff --git a/board/freescale/t4rdb/t4_rcw.cfg b/board/freescale/t4qds/t4_sd_rcw.cfg similarity index 54% rename from board/freescale/t4rdb/t4_rcw.cfg rename to board/freescale/t4qds/t4_sd_rcw.cfg index 282fea4..54beb67 100644 --- a/board/freescale/t4rdb/t4_rcw.cfg +++ b/board/freescale/t4qds/t4_sd_rcw.cfg @@ -1,7 +1,7 @@ #PBL preamble and RCW header aa55aa55 010e0100 -#serdes protocol 27_55_1_9 -16070019 18101916 00000000 00000000 -6c6e0848 00448c00 ec020000 f5000000 +#serdes protocol 1_27_5_11 +1607001b 18101b16 00000000 00000000 +04362858 30548c00 68020000 f5000000 00000000 ee0000ee 00000000 000307fc 00000000 00000000 00000000 00000028 diff --git a/board/freescale/t4rdb/t4_pbi.cfg b/board/freescale/t4rdb/t4_pbi.cfg index e7bb673..0b326fa 100644 --- a/board/freescale/t4rdb/t4_pbi.cfg +++ b/board/freescale/t4rdb/t4_pbi.cfg @@ -24,5 +24,4 @@ 09000014 ff000000 09000018 81000000 #Flush PBL data -09138000 00000000 -091380c0 00000000 +091380c0 00100000 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 diff --git a/tools/pblimage.c b/tools/pblimage.c index d74fde9..16d94c98 100644 --- a/tools/pblimage.c +++ b/tools/pblimage.c @@ -297,7 +297,7 @@ int pblimage_check_params(struct image_tool_params *params) pbi_crc_cmd1 = 0x13; pbi_crc_cmd2 = 0x80; pbl_cmd_initaddr = 0x82000000; - pbl_end_cmd[0] = 0x09138000; + pbl_end_cmd[0] = 0x091380c0; pbl_end_cmd[1] = 0x00000000; pbl_end_cmd[2] = 0x091380c0; pbl_end_cmd[3] = 0x00000000; -- 2.1.0.27.g96db324

3 2

[U-Boot] [PATCH v4 06/13] ext4: scan all directory blocks when looking up an entry
by Stefan Brüns 01 Sep '16

01 Sep '16

Scanning only the direct blocks of the directory file may falsely report an existing file as nonexisting, and worse can also lead to creation of a duplicate entry on file creation. Signed-off-by: Stefan Brüns <stefan.bruens(a)rwth-aachen.de> Reviewed-by: Lukasz Majewski <l.majewski(a)samsung.com> --- fs/ext4/ext4_common.c | 84 ++++++++++++++++++++++++--------------------------- 1 file changed, 40 insertions(+), 44 deletions(-) v2: unchanged v3: Added Reviewed-by use parent_inode instead of g_parent_inode when determining directory size v4: fix directory scan, direntname was advanced by offset instead of direntlen Problem reported by Thomas Schaefer <Thomas.Schaefer(a)kontron.com> diff --git a/fs/ext4/ext4_common.c b/fs/ext4/ext4_common.c index 96dc371..a20e405 100644 --- a/fs/ext4/ext4_common.c +++ b/fs/ext4/ext4_common.c @@ -518,64 +518,57 @@ static int search_dir(struct ext2_inode *parent_inode, char *dirname) { int status; int inodeno = 0; - int totalbytes; - int templength; - int direct_blk_idx; + int offset; + int blk_idx; long int blknr; - char *ptr = NULL; - unsigned char *block_buffer = NULL; + char *block_buffer = NULL; struct ext2_dirent *dir = NULL; struct ext_filesystem *fs = get_fs(); + uint32_t directory_blocks; + char *direntname; - /* read the block no allocated to a file */ - for (direct_blk_idx = 0; direct_blk_idx < INDIRECT_BLOCKS; - direct_blk_idx++) { - blknr = read_allocated_block(parent_inode, direct_blk_idx); - if (blknr == 0) - goto fail; + directory_blocks = le32_to_cpu(parent_inode->size) >> + LOG2_BLOCK_SIZE(ext4fs_root); - /* read the blocks of parent inode */ - block_buffer = zalloc(fs->blksz); - if (!block_buffer) + block_buffer = zalloc(fs->blksz); + if (!block_buffer) + goto fail; + + /* get the block no allocated to a file */ + for (blk_idx = 0; blk_idx < directory_blocks; blk_idx++) { + blknr = read_allocated_block(parent_inode, blk_idx); + if (blknr == 0) goto fail; + /* read the directory block */ status = ext4fs_devread((lbaint_t)blknr * fs->sect_perblk, 0, fs->blksz, (char *)block_buffer); if (status == 0) goto fail; - dir = (struct ext2_dirent *)block_buffer; - ptr = (char *)dir; - totalbytes = 0; - while (le16_to_cpu(dir->direntlen) >= 0) { - /* - * blocksize-totalbytes because last directory - * length i.e.,*dir->direntlen is free availble - * space in the block that means - * it is a last entry of directory entry - */ - if (dir->inode && (strlen(dirname) == dir->namelen)) { - if (strncmp(dirname, ptr + sizeof(struct ext2_dirent), dir->namelen) == 0) { - inodeno = le32_to_cpu(dir->inode); - break; - } - } + offset = 0; + do { + dir = (struct ext2_dirent *)(block_buffer + offset); + direntname = (char *)(dir) + sizeof(struct ext2_dirent); - if (fs->blksz - totalbytes == le16_to_cpu(dir->direntlen)) + int direntlen = le16_to_cpu(dir->direntlen); + if (direntlen < sizeof(struct ext2_dirent)) break; - /* traversing the each directory entry */ - templength = le16_to_cpu(dir->direntlen); - totalbytes = totalbytes + templength; - dir = (struct ext2_dirent *)((char *)dir + templength); - ptr = (char *)dir; - } + if (dir->inode && (strlen(dirname) == dir->namelen) && + (strncmp(dirname, direntname, dir->namelen) == 0)) { + inodeno = le32_to_cpu(dir->inode); + break; + } + + offset += direntlen; - free(block_buffer); - block_buffer = NULL; + } while (offset < fs->blksz); - if (inodeno > 0) + if (inodeno > 0) { + free(block_buffer); return inodeno; + } } fail: @@ -827,14 +820,17 @@ fail: int ext4fs_filename_unlink(char *filename) { - short direct_blk_idx = 0; + int blk_idx; long int blknr = -1; int inodeno = -1; + uint32_t directory_blocks; + + directory_blocks = le32_to_cpu(g_parent_inode->size) >> + LOG2_BLOCK_SIZE(ext4fs_root); /* read the block no allocated to a file */ - for (direct_blk_idx = 0; direct_blk_idx < INDIRECT_BLOCKS; - direct_blk_idx++) { - blknr = read_allocated_block(g_parent_inode, direct_blk_idx); + for (blk_idx = 0; blk_idx < directory_blocks; blk_idx++) { + blknr = read_allocated_block(g_parent_inode, blk_idx); if (blknr == 0) break; inodeno = unlink_filename(filename, blknr); -- 2.9.3

1 0