October 2018 - U-Boot

[U-Boot] [PATCH] configs: drop CONFIG_SYS_EXTRA_ENV_RELOC
by Simon Goldschmidt 07 Oct '18

07 Oct '18

Instead of manually specifying CONFIG_SYS_EXTRA_ENV_RELOC for every board that needs it, it shouldn't hurt to let initr_reloc_global_data() always relocate gd->env_addr unless we know this pointer is outside the initial binary. To achieve this, the relocation is omitted if CONFIG_ENV_ADDR is defined (and ENV_IS_EMBEDDED is not). Signed-off-by: Simon Goldschmidt <simon.k.r.goldschmidt(a)gmail.com> --- common/board_r.c | 11 ++++------- include/configs/B4860QDS.h | 3 --- include/configs/BSC9131RDB.h | 2 -- include/configs/BSC9132QDS.h | 3 --- include/configs/C29XPCIE.h | 1 - include/configs/MPC8536DS.h | 1 - include/configs/P1010RDB.h | 1 - include/configs/P2041RDB.h | 3 --- include/configs/T102xQDS.h | 3 --- include/configs/T102xRDB.h | 3 --- include/configs/T1040QDS.h | 3 --- include/configs/T104xRDB.h | 3 --- include/configs/T208xQDS.h | 3 --- include/configs/T208xRDB.h | 3 --- include/configs/T4240QDS.h | 3 --- include/configs/T4240RDB.h | 3 --- include/configs/UCP1020.h | 2 -- include/configs/controlcenterd.h | 2 -- include/configs/corenet_ds.h | 3 --- include/configs/cyrus.h | 1 - include/configs/km/kmp204x-common.h | 1 - include/configs/p1_twr.h | 1 - scripts/config_whitelist.txt | 1 - 23 files changed, 4 insertions(+), 56 deletions(-) diff --git a/common/board_r.c b/common/board_r.c index 9402c0ef21..c55e33eec2 100644 --- a/common/board_r.c +++ b/common/board_r.c @@ -140,15 +140,12 @@ static int initr_reloc_global_data(void) */ fixup_cpu(); #endif -#ifdef CONFIG_SYS_EXTRA_ENV_RELOC +#if !defined(CONFIG_ENV_ADDR) || defined(ENV_IS_EMBEDDED) /* - * Some systems need to relocate the env_addr pointer early because the - * location it points to will get invalidated before env_relocate is - * called. One example is on systems that might use a L2 or L3 cache - * in SRAM mode and initialize that cache from SRAM mode back to being - * a cache in cpu_init_r. + * Relocate the early env_addr pointer unless we know it is not inside + * the binary. Some systems need this and for the rest, it doesn't hurt. */ - gd->env_addr += gd->relocaddr - CONFIG_SYS_MONITOR_BASE; + gd->env_addr += gd->reloc_off; #endif #ifdef CONFIG_OF_EMBED /* diff --git a/include/configs/B4860QDS.h b/include/configs/B4860QDS.h index c37864c139..d086bd71f8 100644 --- a/include/configs/B4860QDS.h +++ b/include/configs/B4860QDS.h @@ -106,7 +106,6 @@ #endif #if defined(CONFIG_SPIFLASH) -#define CONFIG_SYS_EXTRA_ENV_RELOC #define CONFIG_ENV_SPI_BUS 0 #define CONFIG_ENV_SPI_CS 0 #define CONFIG_ENV_SPI_MAX_HZ 10000000 @@ -115,12 +114,10 @@ #define CONFIG_ENV_OFFSET 0x100000 /* 1MB */ #define CONFIG_ENV_SECT_SIZE 0x10000 #elif defined(CONFIG_SDCARD) -#define CONFIG_SYS_EXTRA_ENV_RELOC #define CONFIG_SYS_MMC_ENV_DEV 0 #define CONFIG_ENV_SIZE 0x2000 #define CONFIG_ENV_OFFSET (512 * 1097) #elif defined(CONFIG_NAND) -#define CONFIG_SYS_EXTRA_ENV_RELOC #define CONFIG_ENV_SIZE 0x2000 #define CONFIG_ENV_OFFSET (10 * CONFIG_SYS_NAND_BLOCK_SIZE) #elif defined(CONFIG_SRIO_PCIE_BOOT_SLAVE) diff --git a/include/configs/BSC9131RDB.h b/include/configs/BSC9131RDB.h index e6cbcf86c6..71e840a4b8 100644 --- a/include/configs/BSC9131RDB.h +++ b/include/configs/BSC9131RDB.h @@ -15,7 +15,6 @@ #ifdef CONFIG_SPIFLASH #define CONFIG_RAMBOOT_SPIFLASH #define CONFIG_SYS_RAMBOOT -#define CONFIG_SYS_EXTRA_ENV_RELOC #define CONFIG_RESET_VECTOR_ADDRESS 0x110bfffc #endif @@ -266,7 +265,6 @@ extern unsigned long get_sdram_size(void); #define CONFIG_ENV_SECT_SIZE 0x10000 #define CONFIG_ENV_SIZE 0x2000 #elif defined(CONFIG_NAND) -#define CONFIG_SYS_EXTRA_ENV_RELOC #define CONFIG_ENV_SIZE CONFIG_SYS_NAND_BLOCK_SIZE #define CONFIG_ENV_OFFSET ((768 * 1024) + CONFIG_SYS_NAND_BLOCK_SIZE) #define CONFIG_ENV_RANGE (3 * CONFIG_ENV_SIZE) diff --git a/include/configs/BSC9132QDS.h b/include/configs/BSC9132QDS.h index 7687588044..fb076b1199 100644 --- a/include/configs/BSC9132QDS.h +++ b/include/configs/BSC9132QDS.h @@ -13,19 +13,16 @@ #ifdef CONFIG_SDCARD #define CONFIG_RAMBOOT_SDCARD #define CONFIG_SYS_RAMBOOT -#define CONFIG_SYS_EXTRA_ENV_RELOC #define CONFIG_RESET_VECTOR_ADDRESS 0x110bfffc #endif #ifdef CONFIG_SPIFLASH #define CONFIG_RAMBOOT_SPIFLASH #define CONFIG_SYS_RAMBOOT -#define CONFIG_SYS_EXTRA_ENV_RELOC #define CONFIG_RESET_VECTOR_ADDRESS 0x110bfffc #endif #ifdef CONFIG_NAND_SECBOOT #define CONFIG_RAMBOOT_NAND #define CONFIG_SYS_RAMBOOT -#define CONFIG_SYS_EXTRA_ENV_RELOC #define CONFIG_RESET_VECTOR_ADDRESS 0x110bfffc #endif diff --git a/include/configs/C29XPCIE.h b/include/configs/C29XPCIE.h index 177110428b..8476e6be88 100644 --- a/include/configs/C29XPCIE.h +++ b/include/configs/C29XPCIE.h @@ -278,7 +278,6 @@ #if defined(CONFIG_RAMBOOT_SPIFLASH) #define CONFIG_SYS_RAMBOOT -#define CONFIG_SYS_EXTRA_ENV_RELOC #endif #define CONFIG_SYS_INIT_RAM_LOCK diff --git a/include/configs/MPC8536DS.h b/include/configs/MPC8536DS.h index 3625dfe3f6..943ad36496 100644 --- a/include/configs/MPC8536DS.h +++ b/include/configs/MPC8536DS.h @@ -181,7 +181,6 @@ #if defined(CONFIG_RAMBOOT_SDCARD) || defined(CONFIG_RAMBOOT_SPIFLASH) #define CONFIG_SYS_RAMBOOT -#define CONFIG_SYS_EXTRA_ENV_RELOC #else #undef CONFIG_SYS_RAMBOOT #endif diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h index 4990c8ece8..e14e8bda17 100644 --- a/include/configs/P1010RDB.h +++ b/include/configs/P1010RDB.h @@ -463,7 +463,6 @@ extern unsigned long get_sdram_size(void); #if defined(CONFIG_RAMBOOT_SDCARD) || defined(CONFIG_RAMBOOT_SPIFLASH) || \ defined(CONFIG_RAMBOOT_NAND) #define CONFIG_SYS_RAMBOOT -#define CONFIG_SYS_EXTRA_ENV_RELOC #else #undef CONFIG_SYS_RAMBOOT #endif diff --git a/include/configs/P2041RDB.h b/include/configs/P2041RDB.h index 1afaf2717d..2d4d56672f 100644 --- a/include/configs/P2041RDB.h +++ b/include/configs/P2041RDB.h @@ -56,7 +56,6 @@ #endif #if defined(CONFIG_SPIFLASH) - #define CONFIG_SYS_EXTRA_ENV_RELOC #define CONFIG_ENV_SPI_BUS 0 #define CONFIG_ENV_SPI_CS 0 #define CONFIG_ENV_SPI_MAX_HZ 10000000 @@ -65,13 +64,11 @@ #define CONFIG_ENV_OFFSET 0x100000 /* 1MB */ #define CONFIG_ENV_SECT_SIZE 0x10000 #elif defined(CONFIG_SDCARD) - #define CONFIG_SYS_EXTRA_ENV_RELOC #define CONFIG_FSL_FIXED_MMC_LOCATION #define CONFIG_SYS_MMC_ENV_DEV 0 #define CONFIG_ENV_SIZE 0x2000 #define CONFIG_ENV_OFFSET (512 * 1658) #elif defined(CONFIG_NAND) -#define CONFIG_SYS_EXTRA_ENV_RELOC #define CONFIG_ENV_SIZE CONFIG_SYS_NAND_BLOCK_SIZE #define CONFIG_ENV_OFFSET (7 * CONFIG_SYS_NAND_BLOCK_SIZE) #elif defined(CONFIG_SRIO_PCIE_BOOT_SLAVE) diff --git a/include/configs/T102xQDS.h b/include/configs/T102xQDS.h index 8a38c5e19c..fba96e68ec 100644 --- a/include/configs/T102xQDS.h +++ b/include/configs/T102xQDS.h @@ -135,7 +135,6 @@ #endif #if defined(CONFIG_SPIFLASH) -#define CONFIG_SYS_EXTRA_ENV_RELOC #define CONFIG_ENV_SPI_BUS 0 #define CONFIG_ENV_SPI_CS 0 #define CONFIG_ENV_SPI_MAX_HZ 10000000 @@ -144,12 +143,10 @@ #define CONFIG_ENV_OFFSET 0x100000 /* 1MB */ #define CONFIG_ENV_SECT_SIZE 0x10000 #elif defined(CONFIG_SDCARD) -#define CONFIG_SYS_EXTRA_ENV_RELOC #define CONFIG_SYS_MMC_ENV_DEV 0 #define CONFIG_ENV_SIZE 0x2000 #define CONFIG_ENV_OFFSET (512 * 0x800) #elif defined(CONFIG_NAND) -#define CONFIG_SYS_EXTRA_ENV_RELOC #define CONFIG_ENV_SIZE 0x2000 #define CONFIG_ENV_OFFSET (10 * CONFIG_SYS_NAND_BLOCK_SIZE) #elif defined(CONFIG_SRIO_PCIE_BOOT_SLAVE) diff --git a/include/configs/T102xRDB.h b/include/configs/T102xRDB.h index f7a54f7a97..9a7cb73611 100644 --- a/include/configs/T102xRDB.h +++ b/include/configs/T102xRDB.h @@ -150,7 +150,6 @@ #endif #if defined(CONFIG_SPIFLASH) -#define CONFIG_SYS_EXTRA_ENV_RELOC #define CONFIG_ENV_SPI_BUS 0 #define CONFIG_ENV_SPI_CS 0 #define CONFIG_ENV_SPI_MAX_HZ 10000000 @@ -163,12 +162,10 @@ #define CONFIG_ENV_SECT_SIZE 0x40000 #endif #elif defined(CONFIG_SDCARD) -#define CONFIG_SYS_EXTRA_ENV_RELOC #define CONFIG_SYS_MMC_ENV_DEV 0 #define CONFIG_ENV_SIZE 0x2000 #define CONFIG_ENV_OFFSET (512 * 0x800) #elif defined(CONFIG_NAND) -#define CONFIG_SYS_EXTRA_ENV_RELOC #define CONFIG_ENV_SIZE 0x2000 #if defined(CONFIG_TARGET_T1024RDB) #define CONFIG_ENV_OFFSET (2 * CONFIG_SYS_NAND_BLOCK_SIZE) diff --git a/include/configs/T1040QDS.h b/include/configs/T1040QDS.h index e890860b7e..fc8cd2cf43 100644 --- a/include/configs/T1040QDS.h +++ b/include/configs/T1040QDS.h @@ -66,7 +66,6 @@ #ifdef CONFIG_MTD_NOR_FLASH #if defined(CONFIG_SPIFLASH) -#define CONFIG_SYS_EXTRA_ENV_RELOC #define CONFIG_ENV_SPI_BUS 0 #define CONFIG_ENV_SPI_CS 0 #define CONFIG_ENV_SPI_MAX_HZ 10000000 @@ -75,12 +74,10 @@ #define CONFIG_ENV_OFFSET 0x100000 /* 1MB */ #define CONFIG_ENV_SECT_SIZE 0x10000 #elif defined(CONFIG_SDCARD) -#define CONFIG_SYS_EXTRA_ENV_RELOC #define CONFIG_SYS_MMC_ENV_DEV 0 #define CONFIG_ENV_SIZE 0x2000 #define CONFIG_ENV_OFFSET (512 * 1658) #elif defined(CONFIG_NAND) -#define CONFIG_SYS_EXTRA_ENV_RELOC #define CONFIG_ENV_SIZE CONFIG_SYS_NAND_BLOCK_SIZE #define CONFIG_ENV_OFFSET (7 * CONFIG_SYS_NAND_BLOCK_SIZE) #else diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h index 46b036f6f7..863907515c 100644 --- a/include/configs/T104xRDB.h +++ b/include/configs/T104xRDB.h @@ -170,12 +170,10 @@ $(SRCTREE)/board/freescale/t104xrdb/t1042d4_sd_rcw.cfg #endif #if defined(CONFIG_SPIFLASH) -#define CONFIG_SYS_EXTRA_ENV_RELOC #define CONFIG_ENV_SIZE 0x2000 /* 8KB */ #define CONFIG_ENV_OFFSET 0x100000 /* 1MB */ #define CONFIG_ENV_SECT_SIZE 0x10000 #elif defined(CONFIG_SDCARD) -#define CONFIG_SYS_EXTRA_ENV_RELOC #define CONFIG_SYS_MMC_ENV_DEV 0 #define CONFIG_ENV_SIZE 0x2000 #define CONFIG_ENV_OFFSET (512 * 0x800) @@ -184,7 +182,6 @@ $(SRCTREE)/board/freescale/t104xrdb/t1042d4_sd_rcw.cfg #define CONFIG_RAMBOOT_NAND #define CONFIG_BOOTSCRIPT_COPY_RAM #endif -#define CONFIG_SYS_EXTRA_ENV_RELOC #define CONFIG_ENV_SIZE 0x2000 #define CONFIG_ENV_OFFSET (3 * CONFIG_SYS_NAND_BLOCK_SIZE) #else diff --git a/include/configs/T208xQDS.h b/include/configs/T208xQDS.h index 7d9354b360..e4da26b0be 100644 --- a/include/configs/T208xQDS.h +++ b/include/configs/T208xQDS.h @@ -131,7 +131,6 @@ #endif #if defined(CONFIG_SPIFLASH) -#define CONFIG_SYS_EXTRA_ENV_RELOC #define CONFIG_ENV_SPI_BUS 0 #define CONFIG_ENV_SPI_CS 0 #define CONFIG_ENV_SPI_MAX_HZ 10000000 @@ -140,12 +139,10 @@ #define CONFIG_ENV_OFFSET 0x100000 /* 1MB */ #define CONFIG_ENV_SECT_SIZE 0x10000 #elif defined(CONFIG_SDCARD) -#define CONFIG_SYS_EXTRA_ENV_RELOC #define CONFIG_SYS_MMC_ENV_DEV 0 #define CONFIG_ENV_SIZE 0x2000 #define CONFIG_ENV_OFFSET (512 * 0x800) #elif defined(CONFIG_NAND) -#define CONFIG_SYS_EXTRA_ENV_RELOC #define CONFIG_ENV_SIZE 0x2000 #define CONFIG_ENV_OFFSET (10 * CONFIG_SYS_NAND_BLOCK_SIZE) #elif defined(CONFIG_SRIO_PCIE_BOOT_SLAVE) diff --git a/include/configs/T208xRDB.h b/include/configs/T208xRDB.h index ebee9083ed..958ac70f0e 100644 --- a/include/configs/T208xRDB.h +++ b/include/configs/T208xRDB.h @@ -116,7 +116,6 @@ #endif #if defined(CONFIG_SPIFLASH) -#define CONFIG_SYS_EXTRA_ENV_RELOC #define CONFIG_ENV_SPI_BUS 0 #define CONFIG_ENV_SPI_CS 0 #define CONFIG_ENV_SPI_MAX_HZ 10000000 @@ -125,12 +124,10 @@ #define CONFIG_ENV_OFFSET 0x100000 /* 1MB */ #define CONFIG_ENV_SECT_SIZE 0x10000 #elif defined(CONFIG_SDCARD) -#define CONFIG_SYS_EXTRA_ENV_RELOC #define CONFIG_SYS_MMC_ENV_DEV 0 #define CONFIG_ENV_SIZE 0x2000 #define CONFIG_ENV_OFFSET (512 * 0x800) #elif defined(CONFIG_NAND) -#define CONFIG_SYS_EXTRA_ENV_RELOC #define CONFIG_ENV_SIZE 0x2000 #define CONFIG_ENV_OFFSET (2 * CONFIG_SYS_NAND_BLOCK_SIZE) #elif defined(CONFIG_SRIO_PCIE_BOOT_SLAVE) diff --git a/include/configs/T4240QDS.h b/include/configs/T4240QDS.h index f85881fc3c..71fa722819 100644 --- a/include/configs/T4240QDS.h +++ b/include/configs/T4240QDS.h @@ -81,7 +81,6 @@ #endif #if defined(CONFIG_SPIFLASH) -#define CONFIG_SYS_EXTRA_ENV_RELOC #define CONFIG_ENV_SPI_BUS 0 #define CONFIG_ENV_SPI_CS 0 #define CONFIG_ENV_SPI_MAX_HZ 10000000 @@ -90,12 +89,10 @@ #define CONFIG_ENV_OFFSET 0x100000 /* 1MB */ #define CONFIG_ENV_SECT_SIZE 0x10000 #elif defined(CONFIG_SDCARD) -#define CONFIG_SYS_EXTRA_ENV_RELOC #define CONFIG_SYS_MMC_ENV_DEV 0 #define CONFIG_ENV_SIZE 0x2000 #define CONFIG_ENV_OFFSET (512 * 0x800) #elif defined(CONFIG_NAND) -#define CONFIG_SYS_EXTRA_ENV_RELOC #define CONFIG_ENV_SIZE 0x2000 #define CONFIG_ENV_OFFSET (10 * CONFIG_SYS_NAND_BLOCK_SIZE) #elif defined(CONFIG_SRIO_PCIE_BOOT_SLAVE) diff --git a/include/configs/T4240RDB.h b/include/configs/T4240RDB.h index 9d8834a3be..8f0bfdd5c6 100644 --- a/include/configs/T4240RDB.h +++ b/include/configs/T4240RDB.h @@ -288,7 +288,6 @@ #endif #if defined(CONFIG_SPIFLASH) -#define CONFIG_SYS_EXTRA_ENV_RELOC #define CONFIG_ENV_SPI_BUS 0 #define CONFIG_ENV_SPI_CS 0 #define CONFIG_ENV_SPI_MAX_HZ 10000000 @@ -297,12 +296,10 @@ #define CONFIG_ENV_OFFSET 0x100000 /* 1MB */ #define CONFIG_ENV_SECT_SIZE 0x10000 #elif defined(CONFIG_SDCARD) -#define CONFIG_SYS_EXTRA_ENV_RELOC #define CONFIG_SYS_MMC_ENV_DEV 0 #define CONFIG_ENV_SIZE 0x2000 #define CONFIG_ENV_OFFSET (512 * 0x800) #elif defined(CONFIG_NAND) -#define CONFIG_SYS_EXTRA_ENV_RELOC #define CONFIG_ENV_SIZE CONFIG_SYS_NAND_BLOCK_SIZE #define CONFIG_ENV_OFFSET (7 * CONFIG_SYS_NAND_BLOCK_SIZE) #elif defined(CONFIG_ENV_IS_NOWHERE) diff --git a/include/configs/UCP1020.h b/include/configs/UCP1020.h index 7bdc14e512..fca607cde8 100644 --- a/include/configs/UCP1020.h +++ b/include/configs/UCP1020.h @@ -77,14 +77,12 @@ #ifdef CONFIG_SDCARD #define CONFIG_RAMBOOT_SDCARD #define CONFIG_SYS_RAMBOOT -#define CONFIG_SYS_EXTRA_ENV_RELOC #define CONFIG_RESET_VECTOR_ADDRESS 0x1107fffc #endif #ifdef CONFIG_SPIFLASH #define CONFIG_RAMBOOT_SPIFLASH #define CONFIG_SYS_RAMBOOT -#define CONFIG_SYS_EXTRA_ENV_RELOC #define CONFIG_RESET_VECTOR_ADDRESS 0x1107fffc #endif diff --git a/include/configs/controlcenterd.h b/include/configs/controlcenterd.h index 54a381b682..4adcd956ef 100644 --- a/include/configs/controlcenterd.h +++ b/include/configs/controlcenterd.h @@ -298,8 +298,6 @@ #define CONFIG_SYS_MMC_ENV_DEV 0 #endif -#define CONFIG_SYS_EXTRA_ENV_RELOC - /* * Command line configuration. */ diff --git a/include/configs/corenet_ds.h b/include/configs/corenet_ds.h index aa7520473a..664ca12c00 100644 --- a/include/configs/corenet_ds.h +++ b/include/configs/corenet_ds.h @@ -67,7 +67,6 @@ #endif #if defined(CONFIG_SPIFLASH) -#define CONFIG_SYS_EXTRA_ENV_RELOC #define CONFIG_ENV_SPI_BUS 0 #define CONFIG_ENV_SPI_CS 0 #define CONFIG_ENV_SPI_MAX_HZ 10000000 @@ -76,13 +75,11 @@ #define CONFIG_ENV_OFFSET 0x100000 /* 1MB */ #define CONFIG_ENV_SECT_SIZE 0x10000 #elif defined(CONFIG_SDCARD) -#define CONFIG_SYS_EXTRA_ENV_RELOC #define CONFIG_FSL_FIXED_MMC_LOCATION #define CONFIG_SYS_MMC_ENV_DEV 0 #define CONFIG_ENV_SIZE 0x2000 #define CONFIG_ENV_OFFSET (512 * 1658) #elif defined(CONFIG_NAND) -#define CONFIG_SYS_EXTRA_ENV_RELOC #define CONFIG_ENV_SIZE CONFIG_SYS_NAND_BLOCK_SIZE #define CONFIG_ENV_OFFSET (7 * CONFIG_SYS_NAND_BLOCK_SIZE) #elif defined(CONFIG_SRIO_PCIE_BOOT_SLAVE) diff --git a/include/configs/cyrus.h b/include/configs/cyrus.h index 597012174d..007356bad9 100644 --- a/include/configs/cyrus.h +++ b/include/configs/cyrus.h @@ -49,7 +49,6 @@ #define CONFIG_ENV_OVERWRITE #if defined(CONFIG_SDCARD) -#define CONFIG_SYS_EXTRA_ENV_RELOC #define CONFIG_FSL_FIXED_MMC_LOCATION #define CONFIG_SYS_MMC_ENV_DEV 0 #define CONFIG_ENV_SIZE 0x2000 diff --git a/include/configs/km/kmp204x-common.h b/include/configs/km/kmp204x-common.h index 0592c9a699..08e08abb94 100644 --- a/include/configs/km/kmp204x-common.h +++ b/include/configs/km/kmp204x-common.h @@ -39,7 +39,6 @@ #define CONFIG_SYS_DPAA_RMAN /* RMan */ /* Environment in SPI Flash */ -#define CONFIG_SYS_EXTRA_ENV_RELOC #define CONFIG_ENV_SPI_BUS 0 #define CONFIG_ENV_SPI_CS 0 #define CONFIG_ENV_SPI_MAX_HZ 20000000 diff --git a/include/configs/p1_twr.h b/include/configs/p1_twr.h index 5a6c9e0d14..5c32952cfb 100644 --- a/include/configs/p1_twr.h +++ b/include/configs/p1_twr.h @@ -20,7 +20,6 @@ #ifdef CONFIG_SDCARD #define CONFIG_RAMBOOT_SDCARD #define CONFIG_SYS_RAMBOOT -#define CONFIG_SYS_EXTRA_ENV_RELOC #define CONFIG_RESET_VECTOR_ADDRESS 0x110bfffc #endif diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 81ba55034d..0d17bbfaaf 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -2543,7 +2543,6 @@ CONFIG_SYS_ETHOC_BASE CONFIG_SYS_ETHOC_BUFFER_ADDR CONFIG_SYS_ETVPE_CLK CONFIG_SYS_EXCEPTION_VECTORS_HIGH -CONFIG_SYS_EXTRA_ENV_RELOC CONFIG_SYS_FAST_CLK CONFIG_SYS_FAULT_ECHO_LINK_DOWN CONFIG_SYS_FAULT_MII_ADDR -- 2.17.1

2 1

[U-Boot] [PATCH 0/2] test/py: test_fs: follow up v3 of fat write patches
by Akashi, Takahiro 07 Oct '18

07 Oct '18

This patch set is a collection of trivial updates on my v3 of fat write patches[1]. No functionality changed. [1] https://lists.denx.de/pipermail/u-boot/2018-September/340652.html Akashi, Takahiro (2): test/py: test_fs: remove fs_type argument from umount_fs() test/py: test_fs: add docstring comments to helper functions test/py/tests/test_fs/conftest.py | 147 ++++++++++++++++++++++++++++-- 1 file changed, 140 insertions(+), 7 deletions(-) -- 2.18.0

3 6

[U-Boot] [PATCH V2] test/py: ignore console read exceptions after test failure
by Stephen Warren 07 Oct '18

07 Oct '18

From: Stephen Warren <swarren(a)nvidia.com> After a test has failed, test/py drains the U-Boot console log to ensure that any relevant output is captured. At this point, we don't care about detecting any additional errors, since the test is already known to have failed, and U-Boot will be restarted. To ensure that the test cleanup code is not interrupted, and can correctly terminate the log sections for the failed test, ignore any exception that occurs while reading the U-Boot console output during this limited period of time. Signed-off-by: Stephen Warren <swarren(a)nvidia.com> --- v2: * Combine the two except cases into one, since one was a superset of the other. * Fix TAB-vs-spaces issue in identation. --- test/py/u_boot_console_base.py | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/test/py/u_boot_console_base.py b/test/py/u_boot_console_base.py index a14bad6e8c50..326b2ac51fbf 100644 --- a/test/py/u_boot_console_base.py +++ b/test/py/u_boot_console_base.py @@ -304,7 +304,17 @@ class ConsoleBase(object): # Wait for something U-Boot will likely never send. This will # cause the console output to be read and logged. self.p.expect(['This should never match U-Boot output']) - except u_boot_spawn.Timeout: + except: + # We expect a timeout, since U-Boot won't print what we waited + # for. Squash it when it happens. + # + # Squash any other exception too. This function is only used to + # drain (and log) the U-Boot console output after a failed test. + # The U-Boot process will be restarted, or target board reset, once + # this function returns. So, we don't care about detecting any + # additional errors, so they're squashed so that the rest of the + # post-test-failure cleanup code can continue operation, and + # correctly terminate any log sections, etc. pass finally: self.p.timeout = orig_timeout -- 2.18.0

3 4

[U-Boot] [PATCH 0/8] dm: Various fixes in dm core/cpu/timer
by Bin Meng 06 Oct '18

06 Oct '18

This fixed several issues identified in dm core/cpu/timer codes. The issues were found during RISC-V cpu/timer driver development for QEMU RISC-V port. This series is available at u-boot-x86/dm-fixes for testing. Bin Meng (8): dm: cpu: Fix print_cpuinfo() output cpu: mpc83xx: Remove unnecessary characters in the description string dm: util: Add a livetree equivalent API of dm_fdt_pre_reloc() dm: core: Respect drivers with the DM_FLAG_PRE_RELOC flag in lists_bind_fdt() dm: Correct pre_reloc_only parameter description in several APIs' comments dm: core: Mirror the chosen node parse logic in the livetree scanning test: dm: core: Add a test case for driver marked with DM_FLAG_PRE_RELOC flag timer: Sort Kconfig driver entries arch/sandbox/dts/test.dts | 4 ++ common/board_f.c | 2 +- drivers/core/lists.c | 9 +++- drivers/core/root.c | 20 +++++--- drivers/core/util.c | 25 ++++++++++ drivers/cpu/mpc83xx_cpu.c | 2 +- drivers/serial/serial-uclass.c | 2 +- drivers/timer/Kconfig | 110 ++++++++++++++++++++--------------------- drivers/timer/timer-uclass.c | 2 +- include/dm/device-internal.h | 4 +- include/dm/lists.h | 9 ++-- include/dm/root.h | 17 ++++--- include/dm/util.h | 27 +++++++++- test/dm/bus.c | 2 +- test/dm/test-fdt.c | 29 +++++++++-- 15 files changed, 179 insertions(+), 85 deletions(-) -- 2.7.4

1 8

[U-Boot] [PULL] u-boot-sh/master
by Marek Vasut 06 Oct '18

06 Oct '18

The following changes since commit 592cd5defd4f71d34ffcbd8dd3326bc10f662e20: Merge branch 'master' of git://git.denx.de/u-boot-spi (2018-10-02 17:01:46 -0400) are available in the Git repository at: git://git.denx.de/u-boot-sh.git master for you to fetch changes up to 806df252c1dafea0bee40f70f7bae050c07ee0c9: ARM: rmobile: Enable PHY framework on Gen3 (2018-10-03 12:56:13 +0200) ---------------------------------------------------------------- Marek Vasut (5): ARM: dts: rmobile: Reinstate missing i2c6 on Porter ARM: rmobile: Repair TMU clock on Gen2 ARM: rmobile: Mark 4-64GiB as DRAM on Gen3 phy: rcar: Add R-Car Gen3 PHY driver ARM: rmobile: Enable PHY framework on Gen3 arch/arm/dts/r8a7791-porter.dts | 5 +++++ arch/arm/mach-rmobile/Kconfig | 1 + arch/arm/mach-rmobile/memmap-gen3.c | 6 ++++++ drivers/phy/Kconfig | 8 ++++++++ drivers/phy/Makefile | 1 + drivers/phy/phy-rcar-gen3.c | 161 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ include/configs/rcar-gen2-common.h | 2 +- 7 files changed, 183 insertions(+), 1 deletion(-) create mode 100644 drivers/phy/phy-rcar-gen3.c

2 1

[U-Boot] [PULL] u-boot-socfpga/master
by Marek Vasut 06 Oct '18

06 Oct '18

The following changes since commit 592cd5defd4f71d34ffcbd8dd3326bc10f662e20: Merge branch 'master' of git://git.denx.de/u-boot-spi (2018-10-02 17:01:46 -0400) are available in the Git repository at: git://git.denx.de/u-boot-socfpga.git master for you to fetch changes up to 8be11fb3c1d8d89ff6b60bd3937efcea2dc9c91d: arm: socfpga: stratix10: add sgmii in phymode setup (2018-10-03 12:56:50 +0200) ---------------------------------------------------------------- Atsushi Nemoto (1): tools: socfpga: fix sfp_verify_header Ley Foon Tan (2): gpio: dwapb_gpio: Change to use devm_kcalloc() arm: socfpga: Remove unused function socfpga_emac_manage_reset() Ooi, Joyce (1): arm: socfpga: stratix10: add sgmii in phymode setup arch/arm/mach-socfpga/include/mach/reset_manager_s10.h | 2 -- arch/arm/mach-socfpga/misc_s10.c | 5 +++-- arch/arm/mach-socfpga/reset_manager_s10.c | 35 ----------------------------------- drivers/gpio/dwapb_gpio.c | 11 ++--------- tools/socfpgaimage.c | 1 + 5 files changed, 6 insertions(+), 48 deletions(-)

2 1

[U-Boot] [PULL] rockchip patch-queue 2018-10-05
by Philipp Tomsich 06 Oct '18

06 Oct '18

Tom, Another set of fixes for u-boot-rockchip is ready for integration. A Travis-CI report is at https://travis-ci.org/ptomsich/u-boot-rockchip/builds/437333443 Thanks, Philipp. The following changes since commit a1588ac8228881f9fe65539fa8e31f0ee3556864: Merge tag 'rockchip-for-v2018.11' of git://git.denx.de/u-boot-rockchip (2018-10-03 12:09:19 -0400) are available in the git repository at: git://git.denx.de/u-boot-rockchip.git tags/rockchip-for-v2018.11-rc2 for you to fetch changes up to f25c1755a715d0d1794bd0827549367c20182501: rockchip: Fix rkimage format for SPL boot over USB (2018-10-04 22:55:47 +0200) ---------------------------------------------------------------- Rockchip-focused changes for v2018.11-rc2: - fixes to rkimage for SPL boot via USB - fixes to make_fit_atf.py, incl. entry-point calculation and python3 compatibility - OP-TEE support for ARMv7-based SoCs - fixes to RGMII/GMII selection on the RK3328 ---------------------------------------------------------------- Andreas Färber (1): rockchip: make_fit_atf.py depends on u-boot Daniel Gröber (1): rockchip: Fix rkimage format for SPL boot over USB Janine Hagemann (2): net: gmac_rockchip: Fix a register write in rk3328_gmac_set_to_rgmii net: gmac_rockchip: Add handling for RGMII_ID/RXID/TXID Kever Yang (3): rockchip: make_fit_atf: fix warning unit_address_vs_reg spl: add support to booting with OP-TEE rockchip: add fit source file for pack itb with op-tee Mian Yousaf Kaukab (2): rockchip: make_fit_atf: use elf entry point rockchip: make_fit_atf: make python3 compatible Makefile | 5 ++++- arch/arm/mach-rockchip/fit_spl_optee.its | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ arch/arm/mach-rockchip/make_fit_atf.py | 96 +++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------------------- common/spl/Kconfig | 7 +++++++ common/spl/Makefile | 1 + common/spl/spl.c | 7 +++++++ common/spl/spl_optee.S | 12 ++++++++++++ drivers/net/gmac_rockchip.c | 80 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------- include/spl.h | 13 +++++++++++++ tools/rkimage.c | 5 ++--- 10 files changed, 208 insertions(+), 68 deletions(-) create mode 100644 arch/arm/mach-rockchip/fit_spl_optee.its create mode 100644 common/spl/spl_optee.S

2 1

[U-Boot] Please pull ARC changes
by Alexey Brodkin 06 Oct '18

06 Oct '18

Hi Tom, he following changes since commit a1588ac8228881f9fe65539fa8e31f0ee3556864: Merge tag 'rockchip-for-v2018.11' of git://git.denx.de/u-boot-rockchip (2018-10-03 12:09:19 -0400) are available in the Git repository at: git://git.denx.de/u-boot-arc.git tags/arc-updates-for-2018.11-rc2 for you to fetch changes up to 5396e8b1dd0ad9741b04f506ef88b5fb49d4c82a: arc: Add support for IoT development kit (2018-10-05 16:57:00 +0300) ---------------------------------------------------------------- Here we do a couple of impovements for all ARC boards as well as introduce yet another developemnt board. 1. Now for ARC boards we print CPU and board info which is useful for users and helps with analysis of logs "post-mortem". 2. Synopsys IoT development kit support is added This one might be a bit too late as we're past RC1 but: 1) This doesn't affect any other arches etc as we change purely ARC code. 2) I've got a chance to talk about U-Boot on IoT platforms during ELCE (my proposal was on a wait list and only this week I've got an update and invitation to talk) so it would be good to have this board as a primer in upstream code-base by the time of ELCE 2018. 3) For complete support of IoT devkit I'm yet to significantly rework regmap subsystem in U-Boot but that's a different topic and hopefully it will be done sometime soon... though not this release cycle for sure. ---------------------------------------------------------------- Alexey Brodkin (5): ARC: Don't pre-define CROSS_COMPILE ARC: Add model property to boards .dts ARC: Implement print_cpuinfo() ARC: Enable DISPLAY_CPUINFO & DISPLAY_BOARDINFO arc: Add support for IoT development kit arch/arc/Kconfig | 5 +++++ arch/arc/config.mk | 6 ------ arch/arc/dts/Makefile | 1 + arch/arc/dts/abilis_tb100.dts | 2 ++ arch/arc/dts/axs101.dts | 2 ++ arch/arc/dts/axs103.dts | 2 ++ arch/arc/dts/emdk.dts | 2 ++ arch/arc/dts/hsdk.dts | 2 ++ arch/arc/dts/iot_devkit.dts | 45 ++++++++++++++++++++++++++++++++++++++++++++ arch/arc/dts/nsim.dts | 2 ++ arch/arc/lib/cpu.c | 35 ++++++++++++++++++++++++++++++++++- board/synopsys/iot_devkit/Kconfig | 12 ++++++++++++ board/synopsys/iot_devkit/MAINTAINERS | 5 +++++ board/synopsys/iot_devkit/Makefile | 7 +++++++ board/synopsys/iot_devkit/config.mk | 2 ++ board/synopsys/iot_devkit/iot_devkit.c | 168 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ +++++++++++++++ board/synopsys/iot_devkit/u-boot.lds | 77 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ common/Kconfig | 4 ++-- configs/iot_devkit_defconfig | 38 ++++++++++++++++++++++++++++++++++++++ include/configs/iot_devkit.h | 84 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 20 files changed, 492 insertions(+), 9 deletions(-) create mode 100644 arch/arc/dts/iot_devkit.dts create mode 100644 board/synopsys/iot_devkit/Kconfig create mode 100644 board/synopsys/iot_devkit/MAINTAINERS create mode 100644 board/synopsys/iot_devkit/Makefile create mode 100644 board/synopsys/iot_devkit/config.mk create mode 100644 board/synopsys/iot_devkit/iot_devkit.c create mode 100644 board/synopsys/iot_devkit/u-boot.lds create mode 100644 configs/iot_devkit_defconfig create mode 100644 include/configs/iot_devkit.h -Alexey

2 1

[U-Boot] [PATCH v1 0/4] Stratix10 FPGA reconfiguration support
by chee.hong.ang＠intel.com 05 Oct '18

05 Oct '18

From: "Ang, Chee Hong" <chee.hong.ang(a)intel.com> This patch enable FPGA reconfiguration for Stratix10 SoC. This patch works on top of: https://lists.denx.de/pipermail/u-boot/2018-September/342465.html Ang, Chee Hong (4): arm: socfpga: stratix10: Add macros for mailbox's arguments arm: socfpga: stratix10: Add Stratix 10 FPGA Reconfiguration Driver arm: socfpga: stratix10: Add Stratix10 FPGA into FPGA device table arm: socfpga: stratix10: Enable Stratix10 FPGA Reconfiguration arch/arm/mach-socfpga/include/mach/mailbox_s10.h | 6 + arch/arm/mach-socfpga/misc.c | 22 ++ arch/arm/mach-socfpga/misc_s10.c | 4 + configs/socfpga_stratix10_defconfig | 1 + drivers/fpga/Kconfig | 11 + drivers/fpga/Makefile | 1 + drivers/fpga/altera.c | 6 + drivers/fpga/stratix10.c | 290 +++++++++++++++++++++++ include/altera.h | 8 + 9 files changed, 349 insertions(+) create mode 100644 drivers/fpga/stratix10.c -- 2.7.4

2 7

[U-Boot] [PATCH v2] Add generic FPGA reconfig mailbox API for S10
by chee.hong.ang＠intel.com 05 Oct '18

05 Oct '18

From: "Ang, Chee Hong" <chee.hong.ang(a)intel.com> This patch is v2 for: https://lists.denx.de/pipermail/u-boot/2018-September/342465.html Ang, Chee Hong (1): arm: socfpga: stratix10: Add generic FPGA reconfig mailbox API for S10 arch/arm/mach-socfpga/include/mach/mailbox_s10.h | 3 +- arch/arm/mach-socfpga/mailbox_s10.c | 48 ++++++++++++++++++++++++ 2 files changed, 50 insertions(+), 1 deletion(-) -- 2.7.4

2 2