September 2016 - U-Boot

[U-Boot] Pull request: nand flash
by Scott Wood 06 Sep '16

06 Sep '16

The following changes since commit cb1cbdd96962931de2ac948a184874e2672f3f96: x86: qemu: efi: Add two boards for EFI 32-bit and 64-bit payload (2016-08-30 09:26:05 +0800) are available in the git repository at: git://git.denx.de/u-boot-nand-flash.git for you to fetch changes up to 8b7d51249eca113c4965a7c417f33d7eb569434b: nand: Fix some more NULL name tests (2016-09-01 20:08:48 -0500) ---------------------------------------------------------------- Chris Packham (1): mtd: nand: pxa3xx: use nand_set_controller_data Scott Wood (1): nand: Fix some more NULL name tests Tony Lindgren (1): nand: Fix nand info for no device cmd/nand.c | 8 ++++---- drivers/dfu/dfu_nand.c | 4 ++-- drivers/mtd/nand/omap_gpmc.c | 2 +- drivers/mtd/nand/pxa3xx_nand.c | 1 + 4 files changed, 8 insertions(+), 7 deletions(-)

2 1

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

06 Sep '16

T series boards use unified RCW for sd, api 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. 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 +- .../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 +- .../{t4rdb/t4_rcw.cfg => t4qds/t4_sd_rcw.cfg} | 6 +- 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 +- 42 files changed, 125 insertions(+), 58 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/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% 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/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/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] [PULL] Please pull u-boot-imx
by Stefano Babic 06 Sep '16

06 Sep '16

Hi Tom, please pull from u-boot-imx, thanks ! The following changes since commit 46fe9eb08812cc27a0d5cd97d97373c14d578fe9: Merge branch 'master' of git://git.denx.de/u-boot-net (2016-08-23 07:20:36 -0400) are available in the git repository at: git://www.denx.de/git/u-boot-imx.git master for you to fetch changes up to 19c6e9ac4a43d7e261220e2de4bb1045165558c0: mx6ul_14x14_ev: Enable the CCGR clocks earlier (2016-09-06 10:35:02 +0200) ---------------------------------------------------------------- Akshay Bhat (1): arm: imx: Add support for Advantech DMS-BA16 board Breno Lima (1): warp7: Modify fdt_file environment variable Christopher Spinrath (1): ARM: board: cm_fx6: fix mtd partition fixup Eric Nelson (1): mx6ul_14x14_evk: don't use array for SD2 card detect pad Fabio Estevam (9): mx7dsabresd: Print secure/non-secure mode info warp: Fix RAM size runtime detection pico-imx6ul: Directly write to register LDOGCTL mx7dsabresd: Directly write to register LDOGCTL mx7dsabresd: Directly write to register LDOGCTL mx6: ddr: Allow changing REFSEL and REFR fields mx6ul_14x14_evk: Pass refsel and refr fields to avoid hang mx6ul_14x14_evk: Adjust SPL DDR3 settings mx6ul_14x14_ev: Enable the CCGR clocks earlier Peng Fan (20): imx: mx6ull: add iomux header file imx: mx6ull: add mx6ull major cpu type imx-common: introduce is_mx6ull imx: ocotp: support i.MX6ULL imx: timer: update gpt driver for i.MX6ULL imx: mx6ull: skip setting ahb clock imx: mx6ul: using runtime check when configuring PMIC_STBY_REQ imx: mx6ull: misc soc update imx: mx6ull: adjust POR_B setting for i.MX6ULL imx: mx6ull: update clock settings and CCM register map imx: mx6ull: Update memory map address imx: mx6ull: Add AIPS3 initialization imx: imx6ull: adjust the ldo 1.2v bandgap voltage imx: iomux: fix snvs usage for i.MX6ULL pinctrl: imx6: support i.MX6ULL arm: dts: imx6ull: add pinctrl defines dt-bindings: add i.mx6ul clock header arm: dts: add device tree for i.MX6ULL dm: mmc: intialize dev when probe arm: imx: add i.MX6ULL 14x14 EVK board support Soeren Moch (2): board: tbs2910: always enable usbkbd board: tbs2910: fix HDMI pre-console buffer Stefan Agner (11): mtd: nand: mxs: fix cache alignment for cache lines >32 dm: imx: serial: support device tree pinctrl: imx: do not announce driver initialization arm: dts: imx7: add pinctrl defines arm: dts: imx7: add basic i.MX 7/Colibri iMX7 device tree colibri_imx7: remove legancy I2C support colibri_imx7: remove legancy UART platform data power: pmic: add Ricoh RN5T567 PMIC support arm: dts: imx7: add Ricoh RN5T567 PMIC node colibri_imx7: use Ricoh RN5T567 to reboot the board configs: enable device tree for Colibri iMX7 Stefano Babic (2): Merge branch 'master' of git://git.denx.de/u-boot Merge branch 'master' of git://git.denx.de/u-boot Tim Harvey (1): imx: ventana: enable splashscreen support Vanessa Maegima (1): warp7: Add PMIC support Ye Li (1): imx: mx6ull: add kconfig entry for MX6ULL arch/arm/cpu/armv7/mx6/Kconfig | 16 ++ arch/arm/cpu/armv7/mx6/clock.c | 59 +++-- arch/arm/cpu/armv7/mx6/ddr.c | 6 +- arch/arm/cpu/armv7/mx6/soc.c | 32 ++- arch/arm/dts/Makefile | 4 + arch/arm/dts/imx6ul-pinfunc.h | 938 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ arch/arm/dts/imx6ull-14x14-evk.dts | 527 +++++++++++++++++++++++++++++++++++++++++ arch/arm/dts/imx6ull-pinfunc-snvs.h | 29 +++ arch/arm/dts/imx6ull-pinfunc.h | 57 +++++ arch/arm/dts/imx6ull.dtsi | 1161 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ arch/arm/dts/imx7-colibri.dts | 97 ++++++++ arch/arm/dts/imx7.dtsi | 194 +++++++++++++++ arch/arm/dts/imx7d-pinfunc.h | 1151 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ arch/arm/imx-common/cpu.c | 2 + arch/arm/imx-common/init.c | 2 +- arch/arm/imx-common/iomux-v3.c | 11 +- arch/arm/imx-common/timer.c | 7 +- arch/arm/include/asm/arch-imx/cpu.h | 3 +- arch/arm/include/asm/arch-mx6/crm_regs.h | 60 ++++- arch/arm/include/asm/arch-mx6/imx-regs.h | 18 +- arch/arm/include/asm/arch-mx6/mx6-ddr.h | 2 + arch/arm/include/asm/arch-mx6/mx6-pins.h | 2 + arch/arm/include/asm/arch-mx6/mx6ull_pins.h | 1065 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ arch/arm/include/asm/imx-common/iomux-v3.h | 6 +- arch/arm/include/asm/imx-common/sys_proto.h | 1 + board/advantech/dms-ba16/Kconfig | 31 +++ board/advantech/dms-ba16/MAINTAINERS | 8 + board/advantech/dms-ba16/Makefile | 8 + board/advantech/dms-ba16/clocks.cfg | 25 ++ board/advantech/dms-ba16/ddr-setup.cfg | 39 +++ board/advantech/dms-ba16/dms-ba16.c | 570 ++++++++++++++++++++++++++++++++++++++++++++ board/advantech/dms-ba16/dms-ba16_1g.cfg | 25 ++ board/advantech/dms-ba16/dms-ba16_2g.cfg | 25 ++ board/advantech/dms-ba16/micron-1g.cfg | 63 +++++ board/advantech/dms-ba16/samsung-2g.cfg | 63 +++++ board/bachmann/ot1200/ot1200_spl.c | 2 + board/barco/platinum/spl_picon.c | 2 + board/barco/platinum/spl_titanium.c | 2 + board/ccv/xpress/spl.c | 2 + board/compulab/cm_fx6/cm_fx6.c | 6 +- board/compulab/cm_fx6/spl.c | 4 + board/congatec/cgtqmx6eval/cgtqmx6eval.c | 2 + board/el/el6x/el6x.c | 2 + board/freescale/mx6sabresd/mx6sabresd.c | 2 + board/freescale/mx6slevk/mx6slevk.c | 2 + board/freescale/mx6sxsabresd/mx6sxsabresd.c | 2 + board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c | 50 ++-- board/freescale/mx6ullevk/Kconfig | 12 + board/freescale/mx6ullevk/MAINTAINERS | 6 + board/freescale/mx6ullevk/Makefile | 6 + board/freescale/mx6ullevk/imximage.cfg | 116 +++++++++ board/freescale/mx6ullevk/mx6ullevk.c | 99 ++++++++ board/freescale/mx7dsabresd/mx7dsabresd.c | 13 +- board/gateworks/gw_ventana/gw_ventana_spl.c | 2 + board/kosagi/novena/novena_spl.c | 2 + board/phytec/pcm058/pcm058.c | 2 + board/solidrun/mx6cuboxi/mx6cuboxi.c | 2 + board/technexion/pico-imx6ul/pico-imx6ul.c | 4 +- board/toradex/colibri_imx7/colibri_imx7.c | 92 ++++---- board/udoo/udoo_spl.c | 2 + board/wandboard/spl.c | 6 + board/warp/imximage.cfg | 115 +++++++++ board/warp7/warp7.c | 57 +++++ configs/colibri_imx7_defconfig | 10 +- configs/dms-ba16-1g_defconfig | 34 +++ configs/dms-ba16_defconfig | 33 +++ configs/mx6ull_14x14_evk_defconfig | 30 +++ configs/warp_defconfig | 2 +- doc/device-tree-bindings/pmic/rn5t567.txt | 17 ++ doc/device-tree-bindings/serial/mxc-serial.txt | 8 + drivers/misc/mxc_ocotp.c | 52 +++- drivers/mmc/fsl_esdhc.c | 1 + drivers/mtd/nand/mxs_nand.c | 5 + drivers/pinctrl/nxp/pinctrl-imx.c | 2 +- drivers/pinctrl/nxp/pinctrl-imx6.c | 5 + drivers/power/pmic/Kconfig | 8 + drivers/power/pmic/Makefile | 1 + drivers/power/pmic/rn5t567.c | 64 +++++ drivers/serial/serial_mxc.c | 28 ++- include/configs/advantech_dms-ba16.h | 315 +++++++++++++++++++++++++ include/configs/colibri_imx7.h | 3 +- include/configs/gw_ventana.h | 7 +- include/configs/mx6ullevk.h | 180 ++++++++++++++ include/configs/tbs2910.h | 15 +- include/configs/warp7.h | 14 +- include/dt-bindings/clock/imx6ul-clock.h | 253 ++++++++++++++++++++ include/power/rn5t567_pmic.h | 113 +++++++++ tools/logos/gateworks.bmp | Bin 0 -> 56202 bytes 88 files changed, 7960 insertions(+), 161 deletions(-) create mode 100644 arch/arm/dts/imx6ul-pinfunc.h create mode 100644 arch/arm/dts/imx6ull-14x14-evk.dts create mode 100644 arch/arm/dts/imx6ull-pinfunc-snvs.h create mode 100644 arch/arm/dts/imx6ull-pinfunc.h create mode 100644 arch/arm/dts/imx6ull.dtsi create mode 100644 arch/arm/dts/imx7-colibri.dts create mode 100644 arch/arm/dts/imx7.dtsi create mode 100644 arch/arm/dts/imx7d-pinfunc.h create mode 100644 arch/arm/include/asm/arch-mx6/mx6ull_pins.h create mode 100644 board/advantech/dms-ba16/Kconfig create mode 100644 board/advantech/dms-ba16/MAINTAINERS create mode 100644 board/advantech/dms-ba16/Makefile create mode 100644 board/advantech/dms-ba16/clocks.cfg create mode 100644 board/advantech/dms-ba16/ddr-setup.cfg create mode 100644 board/advantech/dms-ba16/dms-ba16.c create mode 100644 board/advantech/dms-ba16/dms-ba16_1g.cfg create mode 100644 board/advantech/dms-ba16/dms-ba16_2g.cfg create mode 100644 board/advantech/dms-ba16/micron-1g.cfg create mode 100644 board/advantech/dms-ba16/samsung-2g.cfg create mode 100644 board/freescale/mx6ullevk/Kconfig create mode 100644 board/freescale/mx6ullevk/MAINTAINERS create mode 100644 board/freescale/mx6ullevk/Makefile create mode 100644 board/freescale/mx6ullevk/imximage.cfg create mode 100644 board/freescale/mx6ullevk/mx6ullevk.c create mode 100644 board/warp/imximage.cfg create mode 100644 configs/dms-ba16-1g_defconfig create mode 100644 configs/dms-ba16_defconfig create mode 100644 configs/mx6ull_14x14_evk_defconfig create mode 100644 doc/device-tree-bindings/pmic/rn5t567.txt create mode 100644 doc/device-tree-bindings/serial/mxc-serial.txt create mode 100644 drivers/power/pmic/rn5t567.c create mode 100644 include/configs/advantech_dms-ba16.h create mode 100644 include/configs/mx6ullevk.h create mode 100644 include/dt-bindings/clock/imx6ul-clock.h create mode 100644 include/power/rn5t567_pmic.h create mode 100644 tools/logos/gateworks.bmp -- ===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic(a)denx.de =====================================================================

2 2

[U-Boot] [PATCH v2 1/3] warp7: Add a secure mode target
by Fabio Estevam 06 Sep '16

06 Sep '16

From: Fabio Estevam <fabio.estevam(a)nxp.com> NXP kernel expects to boot in secure mode, so introduce warp7_secure_defconfig target which selects CONFIG_ARMV7_BOOT_SEC_DEFAULT. Signed-off-by: Fabio Estevam <fabio.estevam(a)nxp.com> --- Changes since v1: - None configs/warp7_secure_defconfig | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 configs/warp7_secure_defconfig diff --git a/configs/warp7_secure_defconfig b/configs/warp7_secure_defconfig new file mode 100644 index 0000000..34fcdea --- /dev/null +++ b/configs/warp7_secure_defconfig @@ -0,0 +1,36 @@ +CONFIG_ARM=y +CONFIG_ARCH_MX7=y +CONFIG_TARGET_WARP7=y +# CONFIG_ARMV7_VIRT is not set +CONFIG_IMX_RDC=y +CONFIG_IMX_BOOTAUX=y +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/warp7/imximage.cfg" +CONFIG_HUSH_PARSER=y +# CONFIG_CMD_BOOTD is not set +CONFIG_CMD_BOOTZ=y +# CONFIG_CMD_IMI is not set +# CONFIG_CMD_IMLS is not set +# CONFIG_CMD_XIMG is not set +CONFIG_CMD_MEMTEST=y +CONFIG_CMD_MMC=y +CONFIG_CMD_USB=y +CONFIG_CMD_DFU=y +CONFIG_CMD_USB_MASS_STORAGE=y +CONFIG_CMD_GPIO=y +# CONFIG_CMD_SETEXPR is not set +CONFIG_CMD_CACHE=y +CONFIG_CMD_EXT2=y +CONFIG_CMD_EXT4=y +CONFIG_CMD_EXT4_WRITE=y +CONFIG_CMD_FAT=y +CONFIG_USB=y +CONFIG_USB_GADGET=y +CONFIG_CI_UDC=y +CONFIG_USB_GADGET_DOWNLOAD=y +CONFIG_G_DNL_MANUFACTURER="FSL" +CONFIG_G_DNL_VENDOR_NUM=0x0525 +CONFIG_G_DNL_PRODUCT_NUM=0xa4a5 +CONFIG_USB_EHCI_HCD=y +CONFIG_MXC_USB_OTG_HACTIVE=y +CONFIG_OF_LIBFDT=y +CONFIG_ARMV7_BOOT_SEC_DEFAULT=y -- 1.9.1

2 9

[U-Boot] [PATCH] eth: asix88179: Reset device during probe with DM_ETH enabled
by Nikolaus Schulz 06 Sep '16

06 Sep '16

With the ethernet driver model enabled, reset the device before reading the MAC address, just like it's done for the non-device-model code path. This avoids a timeout when the interface is first used. Signed-off-by: Nikolaus Schulz <nikolaus.schulz(a)avionic-design.de> --- drivers/usb/eth/asix88179.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/usb/eth/asix88179.c b/drivers/usb/eth/asix88179.c index 7548269..0725940 100644 --- a/drivers/usb/eth/asix88179.c +++ b/drivers/usb/eth/asix88179.c @@ -878,6 +878,10 @@ static int ax88179_eth_probe(struct udevice *dev) usb_dev = priv->ueth.pusb_dev; priv->maxpacketsize = usb_dev->epmaxpacketout[AX_ENDPOINT_OUT]; + ret = asix_basic_reset(&priv->ueth, priv); + if (ret) + return ret; + /* Get the MAC address */ ret = asix_read_mac(&priv->ueth, pdata->enetaddr); if (ret) -- 2.1.4

4 5

[U-Boot] [PATCH 0/7] add pwm regulator driver
by Kever Yang 06 Sep '16

06 Sep '16

This patch set add pwm regulator driver and enable it on rk3399, also do some update and fix to make the regulator driver work properly. Kever Yang (7): rockchip: rk3399: update PPLL and pmu_pclk frequency rockchip: rkpwm: fix the register sequence power: regulator: add pwm regulator rockchip: evb_rk3399: init vdd_center regulator Kconfig: rockchip: enable DM_PWM and DM_REGULATOR dts: evb-rk3399: add init voltage node for vdd-center config: evb-rk3399: enable pwm regulator arch/arm/Kconfig | 2 + arch/arm/dts/rk3399-evb.dts | 1 + arch/arm/include/asm/arch-rockchip/cru_rk3399.h | 4 +- arch/arm/include/asm/arch-rockchip/pwm.h | 2 +- board/rockchip/evb_rk3399/evb-rk3399.c | 6 + configs/evb-rk3399_defconfig | 1 + drivers/power/regulator/Kconfig | 9 ++ drivers/power/regulator/Makefile | 1 + drivers/power/regulator/pwm_regulator.c | 157 ++++++++++++++++++++++++ 9 files changed, 180 insertions(+), 3 deletions(-) create mode 100644 drivers/power/regulator/pwm_regulator.c -- 1.9.1

2 19

[U-Boot] [PATCH 1/5] imx: mx6ul: Refactor common code as mx6ul
by Jagan Teki 06 Sep '16

06 Sep '16

Since most of the board along with the config code used for mx6ul boards are common and for improving code reusability refactor or group code as mx6ul notation. Hence for new board its simply add new defconfig with existing board or related configs. include/configs/mx6ul_14x14_evk.h -> include/configs/mx6ul.h board/freescale/mx6ul_14x14_evk -> board/freescale/mx6ul board/freescale/mx6ul/mx6ul_14x14_evk.c -> board/freescale/mx6ul/board.c Cc: Stefano Babic <sbabic(a)denx.de> Cc: Peng Fan <peng.fan(a)nxp.com> Cc: Michael Trimarchi <michael(a)amarulasolutions.com> Signed-off-by: Jagan Teki <jagan(a)amarulasolutions.com> --- arch/arm/cpu/armv7/mx6/Kconfig | 2 +- board/freescale/{mx6ul_14x14_evk => mx6ul}/Kconfig | 4 ++-- board/freescale/{mx6ul_14x14_evk => mx6ul}/MAINTAINERS | 4 ++-- board/freescale/{mx6ul_14x14_evk => mx6ul}/Makefile | 2 +- board/freescale/{mx6ul_14x14_evk => mx6ul}/README | 0 board/freescale/{mx6ul_14x14_evk/mx6ul_14x14_evk.c => mx6ul/board.c} | 0 include/configs/{mx6ul_14x14_evk.h => mx6ul.h} | 0 7 files changed, 6 insertions(+), 6 deletions(-) rename board/freescale/{mx6ul_14x14_evk => mx6ul}/Kconfig (72%) rename board/freescale/{mx6ul_14x14_evk => mx6ul}/MAINTAINERS (64%) rename board/freescale/{mx6ul_14x14_evk => mx6ul}/Makefile (76%) rename board/freescale/{mx6ul_14x14_evk => mx6ul}/README (100%) rename board/freescale/{mx6ul_14x14_evk/mx6ul_14x14_evk.c => mx6ul/board.c} (100%) rename include/configs/{mx6ul_14x14_evk.h => mx6ul.h} (100%) diff --git a/arch/arm/cpu/armv7/mx6/Kconfig b/arch/arm/cpu/armv7/mx6/Kconfig index 78383f0..0c1bc78 100644 --- a/arch/arm/cpu/armv7/mx6/Kconfig +++ b/arch/arm/cpu/armv7/mx6/Kconfig @@ -216,7 +216,7 @@ source "board/freescale/mx6sabresd/Kconfig" source "board/freescale/mx6slevk/Kconfig" source "board/freescale/mx6sxsabresd/Kconfig" source "board/freescale/mx6sxsabreauto/Kconfig" -source "board/freescale/mx6ul_14x14_evk/Kconfig" +source "board/freescale/mx6ul/Kconfig" source "board/phytec/pcm058/Kconfig" source "board/gateworks/gw_ventana/Kconfig" source "board/kosagi/novena/Kconfig" diff --git a/board/freescale/mx6ul_14x14_evk/Kconfig b/board/freescale/mx6ul/Kconfig similarity index 72% rename from board/freescale/mx6ul_14x14_evk/Kconfig rename to board/freescale/mx6ul/Kconfig index 8210cd3..f97b905 100644 --- a/board/freescale/mx6ul_14x14_evk/Kconfig +++ b/board/freescale/mx6ul/Kconfig @@ -1,12 +1,12 @@ if TARGET_MX6UL_14X14_EVK || TARGET_MX6UL_9X9_EVK config SYS_BOARD - default "mx6ul_14x14_evk" + default "mx6ul" config SYS_VENDOR default "freescale" config SYS_CONFIG_NAME - default "mx6ul_14x14_evk" + default "mx6ul" endif diff --git a/board/freescale/mx6ul_14x14_evk/MAINTAINERS b/board/freescale/mx6ul/MAINTAINERS similarity index 64% rename from board/freescale/mx6ul_14x14_evk/MAINTAINERS rename to board/freescale/mx6ul/MAINTAINERS index 7c7a196..20caeee 100644 --- a/board/freescale/mx6ul_14x14_evk/MAINTAINERS +++ b/board/freescale/mx6ul/MAINTAINERS @@ -1,7 +1,7 @@ MX6ULEVK BOARD M: Peng Fan <peng.fan(a)nxp.com> S: Maintained -F: board/freescale/mx6ul_14x14_evk/ -F: include/configs/mx6ul_14x14_evk.h +F: board/freescale/mx6ul/ +F: include/configs/mx6ul.h F: configs/mx6ul_14x14_evk_defconfig F: configs/mx6ul_9x9_evk_defconfig diff --git a/board/freescale/mx6ul_14x14_evk/Makefile b/board/freescale/mx6ul/Makefile similarity index 76% rename from board/freescale/mx6ul_14x14_evk/Makefile rename to board/freescale/mx6ul/Makefile index 61f6778..80ab4a5 100644 --- a/board/freescale/mx6ul_14x14_evk/Makefile +++ b/board/freescale/mx6ul/Makefile @@ -3,4 +3,4 @@ # SPDX-License-Identifier: GPL-2.0+ # -obj-y := mx6ul_14x14_evk.o +obj-y := board.o diff --git a/board/freescale/mx6ul_14x14_evk/README b/board/freescale/mx6ul/README similarity index 100% rename from board/freescale/mx6ul_14x14_evk/README rename to board/freescale/mx6ul/README diff --git a/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c b/board/freescale/mx6ul/board.c similarity index 100% rename from board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c rename to board/freescale/mx6ul/board.c diff --git a/include/configs/mx6ul_14x14_evk.h b/include/configs/mx6ul.h similarity index 100% rename from include/configs/mx6ul_14x14_evk.h rename to include/configs/mx6ul.h -- 2.7.4

6 17

[U-Boot] [PATCH] efi_loader: provide efi_mem_desc version
by Mian Yousaf Kaukab 06 Sep '16

06 Sep '16

Provide version of struct efi_mem_desc in efi_get_memory_map(). EFI_BOOT_SERVICES.GetMemoryMap() in UEFI specification v2.6 defines memory descriptor version to 1. Linux kernel also expects descriptor version to be 1 and prints following warning during boot if its not: Unexpected EFI_MEMORY_DESCRIPTOR version 0 Signed-off-by: Mian Yousaf Kaukab <yousaf.kaukab(a)gmail.com> --- Resending the patch as previous attempt was blocked for some reason. include/efi.h | 2 ++ lib/efi_loader/efi_memory.c | 3 +++ 2 files changed, 5 insertions(+) diff --git a/include/efi.h b/include/efi.h index 83de2d4..5a3b8cf 100644 --- a/include/efi.h +++ b/include/efi.h @@ -159,6 +159,8 @@ struct efi_mem_desc { u64 attribute; }; +#define EFI_MEMORY_DESCRIPTOR_VERSION 1 + /* Allocation types for calls to boottime->allocate_pages*/ #define EFI_ALLOCATE_ANY_PAGES 0 #define EFI_ALLOCATE_MAX_ADDRESS 1 diff --git a/lib/efi_loader/efi_memory.c b/lib/efi_loader/efi_memory.c index df3547c..80e4e26 100644 --- a/lib/efi_loader/efi_memory.c +++ b/lib/efi_loader/efi_memory.c @@ -339,6 +339,9 @@ efi_status_t efi_get_memory_map(unsigned long *memory_map_size, if (descriptor_size) *descriptor_size = sizeof(struct efi_mem_desc); + if (descriptor_version) + *descriptor_version = EFI_MEMORY_DESCRIPTOR_VERSION; + if (*memory_map_size < map_size) return EFI_BUFFER_TOO_SMALL; -- 2.6.6

1 0

[U-Boot] is it necessary to set "gd->env_valid = 0" in getenv_default()?
by Robert P. J. Day 06 Sep '16

06 Sep '16

still wandering through the bowels of u-boot environment manipulation code, and i see this in common/env_common.c: /* * Look up the variable from the default environment */ char *getenv_default(const char *name) { char *ret_val; unsigned long really_valid = gd->env_valid; unsigned long real_gd_flags = gd->flags; /* Pretend that the image is bad. */ gd->flags &= ~GD_FLG_ENV_READY; gd->env_valid = 0; <--- ????? ret_val = getenv(name); gd->env_valid = really_valid; gd->flags = real_gd_flags; return ret_val; } fair enough ... in order to read a variable explicitly from the (default) environment, temporarily fake that there is nothing in the hash table, so this statement makes sense: gd->flags &= ~GD_FLG_ENV_READY; but is this one immediately afterwards also necessary? gd->env_valid = 0; because once you get to getenv() as defined in cmd/nvedit.c: char *getenv(const char *name) { if (gd->flags & GD_FLG_ENV_READY) { /* after import into hashtable */ ENTRY e, *ep; WATCHDOG_RESET(); e.key = name; e.data = NULL; hsearch_r(e, FIND, &ep, &env_htab, 0); return ep ? ep->data : NULL; } /* restricted capabilities before import */ if (getenv_f(name, (char *)(gd->env_buf), sizeof(gd->env_buf)) > 0) return (char *)(gd->env_buf); return NULL; } it seems that the only test is for GD_ENV_FLG_READY, so setting gd->env_valid=0 seems unnecessary. but perhaps i'm not reading far enough. rday p.s. just to be clear, the meanings of those two gd members is: gd->flags & GD_FLG_ENV_READY means the environment has been imported into a hash table, and gd->env_valid means the CRC for the environment in persistent storage is correct. do i understand that correctly?

1 0

[U-Boot] [Patch v5 0/9] Add LS1046ARDB&QDS board support
by Gong Qianyu 06 Sep '16

06 Sep '16

Hi all, This is version 5 patchset mainly to add support for both LS1046ARDB&QDS board. It should be based on two DDR patches to work well on LS1046ARDB or LS1046AQDS. The two patches are: http://patchwork.ozlabs.org/patch/663534/ http://patchwork.ozlabs.org/patch/663535/ PCIe and USB are not supported yet due to lack of some driver patches and I'll send them to upstream once they're ready. Please help to review. Thanks very much! Changes in v5: - Add a new patch to remove BSS clearing and board_init_r in spl.c. - Fix SPL_PAD_TO size to block aligned value for NAND boot. - Adjust the SPL BSS and MALLOC address for future use. Changes in v4: - Extend SPL max size and pad_to size for SD boot. - Add LS1046AQDS board support patch. Changes in v3: - Remove redundant sd rcw .cfg files. - Adjust the format of memory map in readme. - Add emmc boot support. Changes in v2: - Add ERRATUM_A008511. - Use values directly instead of macros for SATA ECC. - Add >60 characters' paragraph for the board help. - Fix the memory map in readme. - Remove unused flash r/w functions. - Remove DDR3 defines. - Revise some commit messages. Gong Qianyu (1): armv8: fsl-layerscape: spl: remove BSS clearing and board_init_r Mingkai Hu (2): armv8: fsl-layerscape: Increase L2 Data RAM latency and L2 Tag RAM latency armv8: ls1046ardb: Add LS1046ARDB board support Shaohui Xie (5): ddr: fsl: fix a compile issue Export memset for standalone AQ FW load apps armv8: fsl-layerscape: add define CONFIG_STANDALONE_LOAD_ADDR for standalone app armv8: ls1046a: disable SATA ECC in DCSR armv8: ls1046aqds: Add LS1046AQDS board support Shengzhou Liu (1): armv8: ls1046a: Enable DDR erratum for ls1046a arch/arm/Kconfig | 24 + arch/arm/cpu/armv8/fsl-layerscape/lowlevel.S | 15 + arch/arm/cpu/armv8/fsl-layerscape/soc.c | 4 + arch/arm/cpu/armv8/fsl-layerscape/spl.c | 5 - arch/arm/dts/Makefile | 3 + arch/arm/dts/fsl-ls1046a-qds-duart.dts | 16 + arch/arm/dts/fsl-ls1046a-qds-lpuart.dts | 16 + arch/arm/dts/fsl-ls1046a-qds.dtsi | 81 ++++ arch/arm/dts/fsl-ls1046a-rdb.dts | 44 ++ arch/arm/dts/fsl-ls1046a.dtsi | 220 +++++++++ arch/arm/include/asm/arch-fsl-layerscape/config.h | 8 + board/freescale/common/vid.c | 8 +- board/freescale/ls1046aqds/Kconfig | 15 + board/freescale/ls1046aqds/MAINTAINERS | 11 + board/freescale/ls1046aqds/Makefile | 9 + board/freescale/ls1046aqds/README | 70 +++ board/freescale/ls1046aqds/ddr.c | 140 ++++++ board/freescale/ls1046aqds/ddr.h | 44 ++ board/freescale/ls1046aqds/eth.c | 415 +++++++++++++++++ board/freescale/ls1046aqds/ls1046aqds.c | 313 +++++++++++++ board/freescale/ls1046aqds/ls1046aqds_pbi.cfg | 17 + board/freescale/ls1046aqds/ls1046aqds_qixis.h | 39 ++ board/freescale/ls1046aqds/ls1046aqds_rcw_nand.cfg | 7 + .../freescale/ls1046aqds/ls1046aqds_rcw_sd_ifc.cfg | 8 + .../ls1046aqds/ls1046aqds_rcw_sd_qspi.cfg | 8 + board/freescale/ls1046ardb/Kconfig | 16 + board/freescale/ls1046ardb/MAINTAINERS | 9 + board/freescale/ls1046ardb/Makefile | 10 + board/freescale/ls1046ardb/README | 76 ++++ board/freescale/ls1046ardb/cpld.c | 158 +++++++ board/freescale/ls1046ardb/cpld.h | 49 ++ board/freescale/ls1046ardb/ddr.c | 140 ++++++ board/freescale/ls1046ardb/ddr.h | 44 ++ board/freescale/ls1046ardb/eth.c | 77 ++++ board/freescale/ls1046ardb/ls1046ardb.c | 136 ++++++ board/freescale/ls1046ardb/ls1046ardb_pbi.cfg | 22 + board/freescale/ls1046ardb/ls1046ardb_rcw_emmc.cfg | 7 + board/freescale/ls1046ardb/ls1046ardb_rcw_sd.cfg | 7 + configs/ls1046aqds_defconfig | 28 ++ configs/ls1046aqds_lpuart_defconfig | 29 ++ configs/ls1046aqds_nand_defconfig | 30 ++ configs/ls1046aqds_qspi_defconfig | 30 ++ configs/ls1046aqds_sdcard_ifc_defconfig | 30 ++ configs/ls1046aqds_sdcard_qspi_defconfig | 31 ++ configs/ls1046ardb_emmc_defconfig | 26 ++ configs/ls1046ardb_qspi_defconfig | 25 ++ configs/ls1046ardb_sdcard_defconfig | 26 ++ drivers/ddr/fsl/fsl_ddr_gen4.c | 7 +- include/_exports.h | 1 + include/configs/ls1046a_common.h | 211 +++++++++ include/configs/ls1046aqds.h | 494 +++++++++++++++++++++ include/configs/ls1046ardb.h | 242 ++++++++++ include/exports.h | 2 +- 53 files changed, 3492 insertions(+), 11 deletions(-) -- 2.1.0.27.g96db324 Regards, Qianyu

1 9