configs: Resync with savedefconfig

author Tom Rini <trini@konsulko.com>

Fri, 8 Apr 2022 17:36:51 +0000 (13:36 -0400)

committer Tom Rini <trini@konsulko.com>

Fri, 8 Apr 2022 17:36:51 +0000 (13:36 -0400)
author Tom Rini <trini@konsulko.com>
Fri, 8 Apr 2022 17:36:51 +0000 (13:36 -0400)
committer Tom Rini <trini@konsulko.com>
Fri, 8 Apr 2022 17:36:51 +0000 (13:36 -0400)
diff --git a/configs/10m50_defconfig b/configs/10m50_defconfig

index 5a4290aa46e57b28b95902e754af96839258a11d..6430e77da63c090a1e65e2ba1fc7a6ae7f5a6f05 100644 (file)
--- a/configs/10m50_defconfig
+++ b/configs/10m50_defconfig
@@ -7,6 +7,7 @@ CONFIG_ENV_SECT_SIZE=0x10000
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="10m50_devboard"
  CONFIG_SYS_LOAD_ADDR=0xcc000000
+CONFIG_ENV_ADDR=0xF4080000
  CONFIG_FIT=y
  CONFIG_SYS_MONITOR_BASE=0xCFF80000
  # CONFIG_AUTOBOOT is not set
@@ -25,7 +26,6 @@ CONFIG_CMD_MII=y
  CONFIG_CMD_PING=y
  CONFIG_ENV_OVERWRITE=y
  CONFIG_ENV_IS_IN_FLASH=y
-CONFIG_ENV_ADDR=0xF4080000
  CONFIG_VERSION_VARIABLE=y
  CONFIG_NET_RANDOM_ETHADDR=y
  CONFIG_SYS_FAULT_ECHO_LINK_DOWN=y
diff --git a/configs/3c120_defconfig b/configs/3c120_defconfig

index 651640e74ed06b6a5441d28223fb1e07f19d975d..b5017865e662db09391c7f842ca338d371f1fab8 100644 (file)
--- a/configs/3c120_defconfig
+++ b/configs/3c120_defconfig
@@ -7,6 +7,7 @@ CONFIG_ENV_SECT_SIZE=0x20000
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="3c120_devboard"
  CONFIG_SYS_LOAD_ADDR=0xd4000000
+CONFIG_ENV_ADDR=0xE2880000
  CONFIG_FIT=y
  CONFIG_SYS_MONITOR_BASE=0xD7F80000
  # CONFIG_AUTOBOOT is not set
@@ -25,7 +26,6 @@ CONFIG_CMD_MII=y
  CONFIG_CMD_PING=y
  CONFIG_ENV_OVERWRITE=y
  CONFIG_ENV_IS_IN_FLASH=y
-CONFIG_ENV_ADDR=0xE2880000
  CONFIG_VERSION_VARIABLE=y
  CONFIG_NET_RANDOM_ETHADDR=y
  CONFIG_SYS_FAULT_ECHO_LINK_DOWN=y
diff --git a/configs/M5208EVBE_defconfig b/configs/M5208EVBE_defconfig

index c94dab013e2049b640dd46fba920b682060aa1c3..bd2f31722111012b6338563e2b47a26b6874a7b5 100644 (file)
--- a/configs/M5208EVBE_defconfig
+++ b/configs/M5208EVBE_defconfig
@@ -4,9 +4,10 @@ CONFIG_SYS_MALLOC_LEN=0x20000
  CONFIG_ENV_SIZE=0x1000
  CONFIG_ENV_SECT_SIZE=0x2000
  CONFIG_DEFAULT_DEVICE_TREE="M5208EVBE"
+CONFIG_SYS_LOAD_ADDR=0x40010000
+CONFIG_ENV_ADDR=0x2000
  CONFIG_TARGET_M5208EVBE=y
  CONFIG_MCFTMR=y
-CONFIG_SYS_LOAD_ADDR=0x40010000
  CONFIG_SYS_MONITOR_BASE=0x00000400
  CONFIG_BOOTDELAY=1
  # CONFIG_DISPLAY_BOARDINFO is not set
@@ -20,7 +21,6 @@ CONFIG_MII_INIT=y
  CONFIG_CMD_PING=y
  CONFIG_CMD_CACHE=y
  CONFIG_ENV_IS_IN_FLASH=y
-CONFIG_ENV_ADDR=0x2000
  CONFIG_SYS_RELOC_GD_ENV_ADDR=y
  CONFIG_SYS_FAULT_ECHO_LINK_DOWN=y
  CONFIG_UDP_CHECKSUM=y
diff --git a/configs/M5235EVB_Flash32_defconfig b/configs/M5235EVB_Flash32_defconfig

index 73839789857d5bf7aa973593b5d916a5cb734249..e3b0146d84169364d503abe266cee6c209990942 100644 (file)
--- a/configs/M5235EVB_Flash32_defconfig
+++ b/configs/M5235EVB_Flash32_defconfig
@@ -4,10 +4,11 @@ CONFIG_SYS_MALLOC_LEN=0x20000
  CONFIG_ENV_SIZE=0x2000
  CONFIG_ENV_SECT_SIZE=0x2000
  CONFIG_DEFAULT_DEVICE_TREE="M5235EVB_Flash32"
+CONFIG_SYS_LOAD_ADDR=0x20000
+CONFIG_ENV_ADDR=0xFFE04000
  CONFIG_TARGET_M5235EVB=y
  CONFIG_NORFLASH_PS32BIT=y
  CONFIG_MCFTMR=y
-CONFIG_SYS_LOAD_ADDR=0x20000
  CONFIG_SYS_MONITOR_BASE=0xFFC00400
  CONFIG_BOOTDELAY=1
  # CONFIG_DISPLAY_BOARDINFO is not set
@@ -26,7 +27,6 @@ CONFIG_MII_INIT=y
  CONFIG_CMD_PING=y
  CONFIG_CMD_CACHE=y
  CONFIG_ENV_IS_IN_FLASH=y
-CONFIG_ENV_ADDR=0xFFE04000
  CONFIG_SYS_RELOC_GD_ENV_ADDR=y
  CONFIG_USE_BOOTFILE=y
  CONFIG_BOOTFILE="u-boot.bin"
diff --git a/configs/M5235EVB_defconfig b/configs/M5235EVB_defconfig

index cbb74ecd47dc08fe40aa4af329f309c8f0bdab89..d026400745b62d67ee83730f2c9f43d08a5ff104 100644 (file)
--- a/configs/M5235EVB_defconfig
+++ b/configs/M5235EVB_defconfig
@@ -4,9 +4,10 @@ CONFIG_SYS_MALLOC_LEN=0x20000
  CONFIG_ENV_SIZE=0x2000
  CONFIG_ENV_SECT_SIZE=0x2000
  CONFIG_DEFAULT_DEVICE_TREE="M5235EVB"
+CONFIG_SYS_LOAD_ADDR=0x20000
+CONFIG_ENV_ADDR=0xFFE04000
  CONFIG_TARGET_M5235EVB=y
  CONFIG_MCFTMR=y
-CONFIG_SYS_LOAD_ADDR=0x20000
  CONFIG_SYS_MONITOR_BASE=0xFFE00400
  CONFIG_BOOTDELAY=1
  # CONFIG_DISPLAY_BOARDINFO is not set
@@ -26,7 +27,6 @@ CONFIG_MII_INIT=y
  CONFIG_CMD_PING=y
  CONFIG_CMD_CACHE=y
  CONFIG_ENV_IS_IN_FLASH=y
-CONFIG_ENV_ADDR=0xFFE04000
  CONFIG_SYS_RELOC_GD_ENV_ADDR=y
  CONFIG_USE_BOOTFILE=y
  CONFIG_BOOTFILE="u-boot.bin"
diff --git a/configs/M5249EVB_defconfig b/configs/M5249EVB_defconfig

index 9e77119f4de3f319c9c05e8e3b076b971ecb14a0..9a360b0eae2fa9ed1ba0330fe0256bed721018ae 100644 (file)
--- a/configs/M5249EVB_defconfig
+++ b/configs/M5249EVB_defconfig
@@ -4,9 +4,10 @@ CONFIG_SYS_MALLOC_LEN=0x100000
  CONFIG_ENV_SIZE=0x2000
  CONFIG_ENV_SECT_SIZE=0x2000
  CONFIG_DEFAULT_DEVICE_TREE="M5249EVB"
+CONFIG_SYS_LOAD_ADDR=0x200000
+CONFIG_ENV_ADDR=0xFFE04000
  CONFIG_TARGET_M5249EVB=y
  CONFIG_MCFTMR=y
-CONFIG_SYS_LOAD_ADDR=0x200000
  CONFIG_SYS_MONITOR_BASE=0xFFE00400
  # CONFIG_AUTOBOOT is not set
  CONFIG_SYS_CONSOLE_INFO_QUIET=y
@@ -18,7 +19,6 @@ CONFIG_LOOPW=y
  CONFIG_CMD_MX_CYCLIC=y
  # CONFIG_CMD_SETEXPR is not set
  CONFIG_CMD_CACHE=y
-CONFIG_ENV_ADDR=0xFFE04000
  CONFIG_SYS_RELOC_GD_ENV_ADDR=y
  # CONFIG_NET is not set
  CONFIG_MTD_NOR_FLASH=y
diff --git a/configs/M5253DEMO_defconfig b/configs/M5253DEMO_defconfig

index d5a02cdeac61ab39210bb67e31aa82ceeeea770f..a072f9663e926d3448e536533d2f48d5fdb456d3 100644 (file)
--- a/configs/M5253DEMO_defconfig
+++ b/configs/M5253DEMO_defconfig
@@ -4,9 +4,10 @@ CONFIG_SYS_MALLOC_LEN=0x40000
  CONFIG_ENV_SIZE=0x1000
  CONFIG_ENV_SECT_SIZE=0x1000
  CONFIG_DEFAULT_DEVICE_TREE="M5253DEMO"
+CONFIG_SYS_LOAD_ADDR=0x100000
+CONFIG_ENV_ADDR=0xFF804000
  CONFIG_TARGET_M5253DEMO=y
  CONFIG_MCFTMR=y
-CONFIG_SYS_LOAD_ADDR=0x100000
  CONFIG_SYS_MONITOR_BASE=0xFF800400
  CONFIG_BOOTDELAY=5
  # CONFIG_DISPLAY_BOARDINFO is not set
@@ -20,7 +21,6 @@ CONFIG_CMD_CACHE=y
  CONFIG_CMD_EXT2=y
  CONFIG_CMD_FAT=y
  CONFIG_MAC_PARTITION=y
-CONFIG_ENV_ADDR=0xFF804000
  CONFIG_SYS_RELOC_GD_ENV_ADDR=y
  CONFIG_SYS_IDE_MAXBUS=1
  CONFIG_SYS_ATA_STRIDE=4
diff --git a/configs/M5272C3_defconfig b/configs/M5272C3_defconfig

index 11d4e5688dc98ee96b8ad4363a6d21b5d793682d..ed48264ed9ca6fc1a4dff305fa024d300dedf859 100644 (file)
--- a/configs/M5272C3_defconfig
+++ b/configs/M5272C3_defconfig
@@ -4,9 +4,10 @@ CONFIG_SYS_MALLOC_LEN=0x40000
  CONFIG_ENV_SIZE=0x2000
  CONFIG_ENV_SECT_SIZE=0x2000
  CONFIG_DEFAULT_DEVICE_TREE="M5272C3"
+CONFIG_SYS_LOAD_ADDR=0x20000
+CONFIG_ENV_ADDR=0xFFE04000
  CONFIG_TARGET_M5272C3=y
  CONFIG_MCFTMR=y
-CONFIG_SYS_LOAD_ADDR=0x20000
  CONFIG_SYS_MONITOR_BASE=0xFFE00400
  CONFIG_BOOTDELAY=5
  # CONFIG_DISPLAY_BOARDINFO is not set
@@ -22,7 +23,6 @@ CONFIG_CMD_MII=y
  CONFIG_MII_INIT=y
  CONFIG_CMD_PING=y
  CONFIG_CMD_CACHE=y
-CONFIG_ENV_ADDR=0xFFE04000
  CONFIG_SYS_RELOC_GD_ENV_ADDR=y
  CONFIG_SYS_FAULT_ECHO_LINK_DOWN=y
  CONFIG_SYS_RX_ETH_BUFFER=8
diff --git a/configs/M5275EVB_defconfig b/configs/M5275EVB_defconfig

index fe80671484448cfcf9f03052172cdacdb77e8989..2f517984b6304af25cfef4c0f43276e234bb877b 100644 (file)
--- a/configs/M5275EVB_defconfig
+++ b/configs/M5275EVB_defconfig
@@ -4,9 +4,10 @@ CONFIG_SYS_MALLOC_LEN=0x40000
  CONFIG_ENV_SIZE=0x2000
  CONFIG_ENV_SECT_SIZE=0x2000
  CONFIG_DEFAULT_DEVICE_TREE="M5275EVB"
+CONFIG_SYS_LOAD_ADDR=0x800000
+CONFIG_ENV_ADDR=0xFFE04000
  CONFIG_TARGET_M5275EVB=y
  CONFIG_MCFTMR=y
-CONFIG_SYS_LOAD_ADDR=0x800000
  CONFIG_SYS_MONITOR_BASE=0xFFE00400
  CONFIG_BOOTDELAY=5
  CONFIG_USE_BOOTCOMMAND=y
@@ -26,7 +27,6 @@ CONFIG_CMD_MII=y
  CONFIG_MII_INIT=y
  CONFIG_CMD_PING=y
  CONFIG_CMD_CACHE=y
-CONFIG_ENV_ADDR=0xFFE04000
  CONFIG_SYS_RELOC_GD_ENV_ADDR=y
  CONFIG_SYS_FAULT_ECHO_LINK_DOWN=y
  CONFIG_SYS_RX_ETH_BUFFER=8
diff --git a/configs/M5282EVB_defconfig b/configs/M5282EVB_defconfig

index 66f451169f596ba373efa458a080d222f317d4cf..850d027f0014814d340fe0da145d0532eaab2ea9 100644 (file)
--- a/configs/M5282EVB_defconfig
+++ b/configs/M5282EVB_defconfig
@@ -4,9 +4,10 @@ CONFIG_SYS_MALLOC_LEN=0x40000
  CONFIG_ENV_SIZE=0x2000
  CONFIG_ENV_SECT_SIZE=0x2000
  CONFIG_DEFAULT_DEVICE_TREE="M5282EVB"
+CONFIG_SYS_LOAD_ADDR=0x20000
+CONFIG_ENV_ADDR=0xFFE04000
  CONFIG_TARGET_M5282EVB=y
  CONFIG_MCFTMR=y
-CONFIG_SYS_LOAD_ADDR=0x20000
  CONFIG_SYS_MONITOR_BASE=0xFFE00400
  CONFIG_BOOTDELAY=5
  # CONFIG_DISPLAY_BOARDINFO is not set
@@ -22,7 +23,6 @@ CONFIG_CMD_MII=y
  CONFIG_MII_INIT=y
  CONFIG_CMD_PING=y
  CONFIG_CMD_CACHE=y
-CONFIG_ENV_ADDR=0xFFE04000
  CONFIG_SYS_RELOC_GD_ENV_ADDR=y
  CONFIG_SYS_FAULT_ECHO_LINK_DOWN=y
  CONFIG_SYS_RX_ETH_BUFFER=8
diff --git a/configs/M53017EVB_defconfig b/configs/M53017EVB_defconfig

index 21f3dc2f59461ce18ed616120c541b7d627c3833..005a3bcf08c8017673fa477365234533f421cdb8 100644 (file)
--- a/configs/M53017EVB_defconfig
+++ b/configs/M53017EVB_defconfig
@@ -4,9 +4,10 @@ CONFIG_SYS_MALLOC_LEN=0x20000
  CONFIG_ENV_SIZE=0x1000
  CONFIG_ENV_SECT_SIZE=0x8000
  CONFIG_DEFAULT_DEVICE_TREE="M53017EVB"
+CONFIG_SYS_LOAD_ADDR=0x40010000
+CONFIG_ENV_ADDR=0x40000
  CONFIG_TARGET_M53017EVB=y
  CONFIG_MCFTMR=y
-CONFIG_SYS_LOAD_ADDR=0x40010000
  CONFIG_SYS_MONITOR_BASE=0x00000400
  CONFIG_BOOTDELAY=1
  CONFIG_USE_BOOTARGS=y
@@ -23,7 +24,6 @@ CONFIG_CMD_PING=y
  CONFIG_CMD_CACHE=y
  CONFIG_CMD_DATE=y
  CONFIG_ENV_IS_IN_FLASH=y
-CONFIG_ENV_ADDR=0x40000
  CONFIG_SYS_FAULT_ECHO_LINK_DOWN=y
  CONFIG_UDP_CHECKSUM=y
  CONFIG_SYS_RX_ETH_BUFFER=8
diff --git a/configs/M5329AFEE_defconfig b/configs/M5329AFEE_defconfig

index a05f527fccd0912be5cae20b23c19757bb3653ee..83a3bb07aeb6790d3ca6902c9b61c95d097d7f6f 100644 (file)
--- a/configs/M5329AFEE_defconfig
+++ b/configs/M5329AFEE_defconfig
@@ -4,9 +4,10 @@ CONFIG_SYS_MALLOC_LEN=0x20000
  CONFIG_ENV_SIZE=0x2000
  CONFIG_ENV_SECT_SIZE=0x2000
  CONFIG_DEFAULT_DEVICE_TREE="M5329AFEE"
+CONFIG_SYS_LOAD_ADDR=0x40010000
+CONFIG_ENV_ADDR=0x4000
  CONFIG_TARGET_M5329EVB=y
  CONFIG_MCFTMR=y
-CONFIG_SYS_LOAD_ADDR=0x40010000
  CONFIG_SYS_MONITOR_BASE=0x00000400
  CONFIG_BOOTDELAY=1
  # CONFIG_DISPLAY_BOARDINFO is not set
@@ -21,7 +22,6 @@ CONFIG_MII_INIT=y
  CONFIG_CMD_PING=y
  CONFIG_CMD_CACHE=y
  CONFIG_CMD_DATE=y
-CONFIG_ENV_ADDR=0x4000
  CONFIG_SYS_RELOC_GD_ENV_ADDR=y
  CONFIG_SYS_FAULT_ECHO_LINK_DOWN=y
  CONFIG_UDP_CHECKSUM=y
diff --git a/configs/M5329BFEE_defconfig b/configs/M5329BFEE_defconfig

index d3b9575727989502ff2cc1a43e86b285781f0086..728f2b18e668167c903c2cb5d1202fc12006d990 100644 (file)
--- a/configs/M5329BFEE_defconfig
+++ b/configs/M5329BFEE_defconfig
@@ -4,9 +4,10 @@ CONFIG_SYS_MALLOC_LEN=0x20000
  CONFIG_ENV_SIZE=0x2000
  CONFIG_ENV_SECT_SIZE=0x2000
  CONFIG_DEFAULT_DEVICE_TREE="M5329BFEE"
+CONFIG_SYS_LOAD_ADDR=0x40010000
+CONFIG_ENV_ADDR=0x4000
  CONFIG_TARGET_M5329EVB=y
  CONFIG_MCFTMR=y
-CONFIG_SYS_LOAD_ADDR=0x40010000
  CONFIG_SYS_MONITOR_BASE=0x00000400
  CONFIG_BOOTDELAY=1
  # CONFIG_DISPLAY_BOARDINFO is not set
@@ -22,7 +23,6 @@ CONFIG_MII_INIT=y
  CONFIG_CMD_PING=y
  CONFIG_CMD_CACHE=y
  CONFIG_CMD_DATE=y
-CONFIG_ENV_ADDR=0x4000
  CONFIG_SYS_RELOC_GD_ENV_ADDR=y
  CONFIG_SYS_FAULT_ECHO_LINK_DOWN=y
  CONFIG_UDP_CHECKSUM=y
diff --git a/configs/M5373EVB_defconfig b/configs/M5373EVB_defconfig

index b7f3d3bbf250815e92b76f81343f197df507b49e..f61e344a51807819672a9622d9ec956f44d46929 100644 (file)
--- a/configs/M5373EVB_defconfig
+++ b/configs/M5373EVB_defconfig
@@ -4,9 +4,10 @@ CONFIG_SYS_MALLOC_LEN=0x20000
  CONFIG_ENV_SIZE=0x2000
  CONFIG_ENV_SECT_SIZE=0x2000
  CONFIG_DEFAULT_DEVICE_TREE="M5373EVB"
+CONFIG_SYS_LOAD_ADDR=0x40010000
+CONFIG_ENV_ADDR=0x4000
  CONFIG_TARGET_M5373EVB=y
  CONFIG_MCFTMR=y
-CONFIG_SYS_LOAD_ADDR=0x40010000
  CONFIG_SYS_MONITOR_BASE=0x00000400
  CONFIG_BOOTDELAY=1
  # CONFIG_DISPLAY_BOARDINFO is not set
@@ -22,7 +23,6 @@ CONFIG_MII_INIT=y
  CONFIG_CMD_PING=y
  CONFIG_CMD_CACHE=y
  CONFIG_CMD_DATE=y
-CONFIG_ENV_ADDR=0x4000
  CONFIG_SYS_RELOC_GD_ENV_ADDR=y
  CONFIG_SYS_FAULT_ECHO_LINK_DOWN=y
  CONFIG_UDP_CHECKSUM=y
diff --git a/configs/MCR3000_defconfig b/configs/MCR3000_defconfig

index 1c74e4ac2cb6341617dd18803222896ac3010233..f99a830b546a112b567e9e735d182bd664dda4df 100644 (file)
--- a/configs/MCR3000_defconfig
+++ b/configs/MCR3000_defconfig
@@ -3,6 +3,8 @@ CONFIG_SYS_TEXT_BASE=0x4000000
  CONFIG_ENV_SIZE=0x2000
  CONFIG_ENV_SECT_SIZE=0x2000
  CONFIG_DEFAULT_DEVICE_TREE="mcr3000"
+CONFIG_SYS_LOAD_ADDR=0x200000
+CONFIG_ENV_ADDR=0x4004000
  CONFIG_MPC8xx=y
  CONFIG_TARGET_MCR3000=y
  CONFIG_8xx_GCLK_FREQ=132000000
@@ -16,7 +18,6 @@ CONFIG_SYS_PLPRCR=0x00460004
  CONFIG_SYS_SCCR=0x00C20000
  CONFIG_SYS_SCCR_MASK=0x60000000
  CONFIG_SYS_DER=0x2002000F
-CONFIG_SYS_LOAD_ADDR=0x200000
  CONFIG_OF_BOARD_SETUP=y
  CONFIG_SYS_MONITOR_BASE=0x04000000
  CONFIG_BOOTDELAY=5
@@ -49,7 +50,6 @@ CONFIG_CMD_PING=y
  CONFIG_OF_CONTROL=y
  CONFIG_ENV_OVERWRITE=y
  CONFIG_ENV_IS_IN_FLASH=y
-CONFIG_ENV_ADDR=0x4004000
  CONFIG_SYS_RELOC_GD_ENV_ADDR=y
  CONFIG_DM=y
  CONFIG_SYS_BR0_PRELIM_BOOL=y
diff --git a/configs/MPC837XERDB_defconfig b/configs/MPC837XERDB_defconfig

index 32604fcefbaff52f92d88068b3e544d98d025fdd..4a9db732f92e303fd173e6ca9c6342648583720d 100644 (file)
--- a/configs/MPC837XERDB_defconfig
+++ b/configs/MPC837XERDB_defconfig
@@ -5,6 +5,7 @@ CONFIG_ENV_SIZE=0x4000
  CONFIG_ENV_SECT_SIZE=0x10000
  CONFIG_DEFAULT_DEVICE_TREE="mpc8379erdb"
  CONFIG_SYS_CLK_FREQ=66666667
+CONFIG_ENV_ADDR=0xFE080000
  # CONFIG_SYS_PCI_64BIT is not set
  CONFIG_MPC83xx=y
  CONFIG_HIGH_BATS=y
@@ -167,7 +168,6 @@ CONFIG_CMD_EXT2=y
  CONFIG_CMD_FAT=y
  CONFIG_OF_CONTROL=y
  CONFIG_ENV_OVERWRITE=y
-CONFIG_ENV_ADDR=0xFE080000
  CONFIG_USE_BOOTFILE=y
  CONFIG_BOOTFILE="uImage"
  CONFIG_USE_ETHPRIME=y
diff --git a/configs/MPC8548CDS_36BIT_defconfig b/configs/MPC8548CDS_36BIT_defconfig

index 703815ec01e1042655f3a034115396d8b9c1b166..6933699771fbab606a79b57ef83a4fd220cec793 100644 (file)
--- a/configs/MPC8548CDS_36BIT_defconfig
+++ b/configs/MPC8548CDS_36BIT_defconfig
@@ -5,6 +5,7 @@ CONFIG_SYS_MALLOC_LEN=0x100000
  CONFIG_ENV_SIZE=0x2000
  CONFIG_ENV_SECT_SIZE=0x20000
  CONFIG_DEFAULT_DEVICE_TREE="mpc8548cds_36b"
+CONFIG_ENV_ADDR=0xFFF60000
  CONFIG_MPC85xx=y
  # CONFIG_CMD_ERRATA is not set
  CONFIG_TARGET_MPC8548CDS=y
@@ -30,7 +31,6 @@ CONFIG_CMD_PING=y
  # CONFIG_CMD_HASH is not set
  CONFIG_OF_CONTROL=y
  CONFIG_ENV_OVERWRITE=y
-CONFIG_ENV_ADDR=0xFFF60000
  CONFIG_USE_BOOTFILE=y
  CONFIG_BOOTFILE="8548cds/uImage.uboot"
  CONFIG_USE_ETHPRIME=y
diff --git a/configs/MPC8548CDS_defconfig b/configs/MPC8548CDS_defconfig

index 187b21360a70c67e8a152d41ae91f59c4987b568..ee9c14880c6eab6c38c7fbf9a43938a39f568d4c 100644 (file)
--- a/configs/MPC8548CDS_defconfig
+++ b/configs/MPC8548CDS_defconfig
@@ -5,6 +5,7 @@ CONFIG_SYS_MALLOC_LEN=0x100000
  CONFIG_ENV_SIZE=0x2000
  CONFIG_ENV_SECT_SIZE=0x20000
  CONFIG_DEFAULT_DEVICE_TREE="mpc8548cds"
+CONFIG_ENV_ADDR=0xFFF60000
  CONFIG_MPC85xx=y
  # CONFIG_CMD_ERRATA is not set
  CONFIG_TARGET_MPC8548CDS=y
@@ -29,7 +30,6 @@ CONFIG_CMD_PING=y
  # CONFIG_CMD_HASH is not set
  CONFIG_OF_CONTROL=y
  CONFIG_ENV_OVERWRITE=y
-CONFIG_ENV_ADDR=0xFFF60000
  CONFIG_USE_BOOTFILE=y
  CONFIG_BOOTFILE="8548cds/uImage.uboot"
  CONFIG_USE_ETHPRIME=y
diff --git a/configs/MPC8548CDS_legacy_defconfig b/configs/MPC8548CDS_legacy_defconfig

index 22aa9b2c65d3d71ccb491ae3883c260cc88c6f53..97f641d71cdfe9f166f59bcc7d037edc27cac66e 100644 (file)
--- a/configs/MPC8548CDS_legacy_defconfig
+++ b/configs/MPC8548CDS_legacy_defconfig
@@ -5,6 +5,7 @@ CONFIG_SYS_MALLOC_LEN=0x100000
  CONFIG_ENV_SIZE=0x2000
  CONFIG_ENV_SECT_SIZE=0x20000
  CONFIG_DEFAULT_DEVICE_TREE="mpc8548cds"
+CONFIG_ENV_ADDR=0xFFF60000
  CONFIG_MPC85xx=y
  # CONFIG_CMD_ERRATA is not set
  CONFIG_TARGET_MPC8548CDS=y
@@ -29,7 +30,6 @@ CONFIG_CMD_PING=y
  # CONFIG_CMD_HASH is not set
  CONFIG_OF_CONTROL=y
  CONFIG_ENV_OVERWRITE=y
-CONFIG_ENV_ADDR=0xFFF60000
  CONFIG_USE_BOOTFILE=y
  CONFIG_BOOTFILE="8548cds/uImage.uboot"
  CONFIG_USE_ETHPRIME=y
diff --git a/configs/P1010RDB-PA_36BIT_NOR_defconfig b/configs/P1010RDB-PA_36BIT_NOR_defconfig

index 6cbc6a8d7083a25176ddabda30a75a1f6ffde178..bd5d7b652b4bd80aeb66c2dc0de6a3f5d46a0066 100644 (file)
--- a/configs/P1010RDB-PA_36BIT_NOR_defconfig
+++ b/configs/P1010RDB-PA_36BIT_NOR_defconfig
@@ -5,6 +5,7 @@ CONFIG_SYS_MALLOC_LEN=0x100000
  CONFIG_ENV_SIZE=0x2000
  CONFIG_ENV_SECT_SIZE=0x20000
  CONFIG_DEFAULT_DEVICE_TREE="p1010rdb-pa_36b"
+CONFIG_ENV_ADDR=0xEFF20000
  CONFIG_MPC85xx=y
  CONFIG_TARGET_P1010RDB_PA=y
  CONFIG_MPC85XX_HAVE_RESET_VECTOR=y
@@ -35,7 +36,6 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=ff800000.flash:2m(uboot-env),1m(dtb),5m(kernel
  CONFIG_OF_CONTROL=y
  CONFIG_ENV_OVERWRITE=y
  CONFIG_ENV_IS_IN_FLASH=y
-CONFIG_ENV_ADDR=0xEFF20000
  CONFIG_USE_BOOTFILE=y
  CONFIG_BOOTFILE="uImage"
  CONFIG_USE_ETHPRIME=y
diff --git a/configs/P1010RDB-PA_NOR_defconfig b/configs/P1010RDB-PA_NOR_defconfig

index 0f01049154d8fbe111a71d4b7484caa66160ee4c..510035739fdeef75a8d362e4fa9ca7a41130b7e1 100644 (file)
--- a/configs/P1010RDB-PA_NOR_defconfig
+++ b/configs/P1010RDB-PA_NOR_defconfig
@@ -5,6 +5,7 @@ CONFIG_SYS_MALLOC_LEN=0x100000
  CONFIG_ENV_SIZE=0x2000
  CONFIG_ENV_SECT_SIZE=0x20000
  CONFIG_DEFAULT_DEVICE_TREE="p1010rdb-pa"
+CONFIG_ENV_ADDR=0xEFF20000
  CONFIG_MPC85xx=y
  CONFIG_TARGET_P1010RDB_PA=y
  CONFIG_MPC85XX_HAVE_RESET_VECTOR=y
@@ -34,7 +35,6 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=ff800000.flash:2m(uboot-env),1m(dtb),5m(kernel
  CONFIG_OF_CONTROL=y
  CONFIG_ENV_OVERWRITE=y
  CONFIG_ENV_IS_IN_FLASH=y
-CONFIG_ENV_ADDR=0xEFF20000
  CONFIG_USE_BOOTFILE=y
  CONFIG_BOOTFILE="uImage"
  CONFIG_USE_ETHPRIME=y
diff --git a/configs/P1010RDB-PB_36BIT_NOR_defconfig b/configs/P1010RDB-PB_36BIT_NOR_defconfig

index fcc6e63e0a3b4d3cffede3c06ae72e3cc4fd1b59..228db54c22ce6c4dd548a48ff11930bb839bd2c2 100644 (file)
--- a/configs/P1010RDB-PB_36BIT_NOR_defconfig
+++ b/configs/P1010RDB-PB_36BIT_NOR_defconfig
@@ -5,6 +5,7 @@ CONFIG_SYS_MALLOC_LEN=0x100000
  CONFIG_ENV_SIZE=0x2000
  CONFIG_ENV_SECT_SIZE=0x20000
  CONFIG_DEFAULT_DEVICE_TREE="p1010rdb-pb_36b"
+CONFIG_ENV_ADDR=0xEFF20000
  CONFIG_MPC85xx=y
  CONFIG_TARGET_P1010RDB_PB=y
  CONFIG_MPC85XX_HAVE_RESET_VECTOR=y
@@ -36,7 +37,6 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=ff800000.flash:2m(uboot-env),1m(dtb),5m(kernel
  CONFIG_OF_CONTROL=y
  CONFIG_ENV_OVERWRITE=y
  CONFIG_ENV_IS_IN_FLASH=y
-CONFIG_ENV_ADDR=0xEFF20000
  CONFIG_USE_BOOTFILE=y
  CONFIG_BOOTFILE="uImage"
  CONFIG_USE_ETHPRIME=y
diff --git a/configs/P1010RDB-PB_NOR_defconfig b/configs/P1010RDB-PB_NOR_defconfig

index 11852da385b14d3b8497a4625e5d6b7557f39c19..21ef7a0d76f0c6324a544eb8ab51f84c6541904a 100644 (file)
--- a/configs/P1010RDB-PB_NOR_defconfig
+++ b/configs/P1010RDB-PB_NOR_defconfig
@@ -5,6 +5,7 @@ CONFIG_SYS_MALLOC_LEN=0x100000
  CONFIG_ENV_SIZE=0x2000
  CONFIG_ENV_SECT_SIZE=0x20000
  CONFIG_DEFAULT_DEVICE_TREE="p1010rdb-pb"
+CONFIG_ENV_ADDR=0xEFF20000
  CONFIG_MPC85xx=y
  CONFIG_TARGET_P1010RDB_PB=y
  CONFIG_MPC85XX_HAVE_RESET_VECTOR=y
@@ -35,7 +36,6 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=ff800000.flash:2m(uboot-env),1m(dtb),5m(kernel
  CONFIG_OF_CONTROL=y
  CONFIG_ENV_OVERWRITE=y
  CONFIG_ENV_IS_IN_FLASH=y
-CONFIG_ENV_ADDR=0xEFF20000
  CONFIG_USE_BOOTFILE=y
  CONFIG_BOOTFILE="uImage"
  CONFIG_USE_ETHPRIME=y
diff --git a/configs/P1020RDB-PC_36BIT_defconfig b/configs/P1020RDB-PC_36BIT_defconfig

index 35b6b86aa864bde7054c7c95fb26f87f8a005a70..bbfc4a5bcff98ce7970586654153b66a5f50000a 100644 (file)
--- a/configs/P1020RDB-PC_36BIT_defconfig
+++ b/configs/P1020RDB-PC_36BIT_defconfig
@@ -5,6 +5,7 @@ CONFIG_SYS_MALLOC_LEN=0x100000
  CONFIG_ENV_SIZE=0x2000
  CONFIG_ENV_SECT_SIZE=0x20000
  CONFIG_DEFAULT_DEVICE_TREE="p1020rdb-pc_36b"
+CONFIG_ENV_ADDR=0xEFF20000
  CONFIG_MPC85xx=y
  # CONFIG_CMD_ERRATA is not set
  CONFIG_TARGET_P1020RDB_PC=y
@@ -37,7 +38,6 @@ CONFIG_CMD_FAT=y
  CONFIG_OF_CONTROL=y
  CONFIG_ENV_OVERWRITE=y
  CONFIG_ENV_IS_IN_FLASH=y
-CONFIG_ENV_ADDR=0xEFF20000
  CONFIG_USE_BOOTFILE=y
  CONFIG_BOOTFILE="uImage"
  CONFIG_USE_ETHPRIME=y
diff --git a/configs/P1020RDB-PC_defconfig b/configs/P1020RDB-PC_defconfig

index 3ccd124fb32dc73f0de7c10c7125affb6dc40fe8..aec0d47acb7c1d298d3b9b1df90e2209398b1c4d 100644 (file)
--- a/configs/P1020RDB-PC_defconfig
+++ b/configs/P1020RDB-PC_defconfig
@@ -5,6 +5,7 @@ CONFIG_SYS_MALLOC_LEN=0x100000
  CONFIG_ENV_SIZE=0x2000
  CONFIG_ENV_SECT_SIZE=0x20000
  CONFIG_DEFAULT_DEVICE_TREE="p1020rdb-pc"
+CONFIG_ENV_ADDR=0xEFF20000
  CONFIG_MPC85xx=y
  # CONFIG_CMD_ERRATA is not set
  CONFIG_TARGET_P1020RDB_PC=y
@@ -36,7 +37,6 @@ CONFIG_CMD_FAT=y
  CONFIG_OF_CONTROL=y
  CONFIG_ENV_OVERWRITE=y
  CONFIG_ENV_IS_IN_FLASH=y
-CONFIG_ENV_ADDR=0xEFF20000
  CONFIG_USE_BOOTFILE=y
  CONFIG_BOOTFILE="uImage"
  CONFIG_USE_ETHPRIME=y
diff --git a/configs/P1020RDB-PD_defconfig b/configs/P1020RDB-PD_defconfig

index 71dbb542dc80f6bf920a1a5c835b2ccda2b01787..cbbdb0fb113a762592f97c5dd9456854f8c67f76 100644 (file)
--- a/configs/P1020RDB-PD_defconfig
+++ b/configs/P1020RDB-PD_defconfig
@@ -5,6 +5,7 @@ CONFIG_SYS_MALLOC_LEN=0x100000
  CONFIG_ENV_SIZE=0x2000
  CONFIG_ENV_SECT_SIZE=0x20000
  CONFIG_DEFAULT_DEVICE_TREE="p1020rdb-pd"
+CONFIG_ENV_ADDR=0xEFF20000
  CONFIG_MPC85xx=y
  # CONFIG_CMD_ERRATA is not set
  CONFIG_TARGET_P1020RDB_PD=y
@@ -39,7 +40,6 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=ec000000.nor:128k(dtb),6016k(kernel),57088k(fs
  CONFIG_OF_CONTROL=y
  CONFIG_ENV_OVERWRITE=y
  CONFIG_ENV_IS_IN_FLASH=y
-CONFIG_ENV_ADDR=0xEFF20000
  CONFIG_USE_BOOTFILE=y
  CONFIG_BOOTFILE="uImage"
  CONFIG_USE_ETHPRIME=y
diff --git a/configs/P2020RDB-PC_36BIT_defconfig b/configs/P2020RDB-PC_36BIT_defconfig

index 1638a18d2d3e5227d02f66dcc14e5f9960c58f07..bd189b965b00005ec9b2342408f3e0265eb6d21f 100644 (file)
--- a/configs/P2020RDB-PC_36BIT_defconfig
+++ b/configs/P2020RDB-PC_36BIT_defconfig
@@ -5,6 +5,7 @@ CONFIG_SYS_MALLOC_LEN=0x100000
  CONFIG_ENV_SIZE=0x2000
  CONFIG_ENV_SECT_SIZE=0x20000
  CONFIG_DEFAULT_DEVICE_TREE="p2020rdb-pc_36b"
+CONFIG_ENV_ADDR=0xEFF20000
  CONFIG_MPC85xx=y
  # CONFIG_CMD_ERRATA is not set
  CONFIG_TARGET_P2020RDB=y
@@ -41,7 +42,6 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=fef000000.nor:256k(vsc7385-firmware),256k(dtb)
  CONFIG_OF_CONTROL=y
  CONFIG_ENV_OVERWRITE=y
  CONFIG_ENV_IS_IN_FLASH=y
-CONFIG_ENV_ADDR=0xEFF20000
  CONFIG_USE_BOOTFILE=y
  CONFIG_BOOTFILE="uImage"
  CONFIG_USE_ETHPRIME=y
diff --git a/configs/P2020RDB-PC_defconfig b/configs/P2020RDB-PC_defconfig

index f85c1e0e3356d1f61eca36f01d1649178af2fd5f..eba11d340acbd1535a72580a4bade3436900bdb7 100644 (file)
--- a/configs/P2020RDB-PC_defconfig
+++ b/configs/P2020RDB-PC_defconfig
@@ -5,6 +5,7 @@ CONFIG_SYS_MALLOC_LEN=0x100000
  CONFIG_ENV_SIZE=0x2000
  CONFIG_ENV_SECT_SIZE=0x20000
  CONFIG_DEFAULT_DEVICE_TREE="p2020rdb-pc"
+CONFIG_ENV_ADDR=0xEFF20000
  CONFIG_MPC85xx=y
  # CONFIG_CMD_ERRATA is not set
  CONFIG_TARGET_P2020RDB=y
@@ -40,7 +41,6 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=ef000000.nor:256k(vsc7385-firmware),256k(dtb),
  CONFIG_OF_CONTROL=y
  CONFIG_ENV_OVERWRITE=y
  CONFIG_ENV_IS_IN_FLASH=y
-CONFIG_ENV_ADDR=0xEFF20000
  CONFIG_USE_BOOTFILE=y
  CONFIG_BOOTFILE="uImage"
  CONFIG_USE_ETHPRIME=y
diff --git a/configs/P2041RDB_defconfig b/configs/P2041RDB_defconfig

index 53868b115a5a1b9463b30c7c82ef7bdc21cf5495..212a29bc0aae5729dde190cb03799bae6c0f0a59 100644 (file)
--- a/configs/P2041RDB_defconfig
+++ b/configs/P2041RDB_defconfig
@@ -4,6 +4,7 @@ CONFIG_SYS_MALLOC_LEN=0x100000
  CONFIG_ENV_SIZE=0x2000
  CONFIG_ENV_SECT_SIZE=0x20000
  CONFIG_DEFAULT_DEVICE_TREE="p2041rdb"
+CONFIG_ENV_ADDR=0xEFF20000
  CONFIG_MPC85xx=y
  CONFIG_TARGET_P2041RDB=y
  CONFIG_MPC85XX_HAVE_RESET_VECTOR=y
@@ -35,7 +36,6 @@ CONFIG_CMD_FAT=y
  CONFIG_OF_CONTROL=y
  CONFIG_ENV_OVERWRITE=y
  CONFIG_ENV_IS_IN_FLASH=y
-CONFIG_ENV_ADDR=0xEFF20000
  CONFIG_USE_BOOTFILE=y
  CONFIG_BOOTFILE="uImage"
  CONFIG_USE_ETHPRIME=y
diff --git a/configs/P3041DS_defconfig b/configs/P3041DS_defconfig

index 63a7aef25979ca6ba672921514f0aed9a5127e33..19660fb2c3f53b09ef5e340c68ea3eaec38300bd 100644 (file)
--- a/configs/P3041DS_defconfig
+++ b/configs/P3041DS_defconfig
@@ -4,6 +4,7 @@ CONFIG_SYS_MALLOC_LEN=0x100000
  CONFIG_ENV_SIZE=0x2000
  CONFIG_ENV_SECT_SIZE=0x20000
  CONFIG_DEFAULT_DEVICE_TREE="p3041ds"
+CONFIG_ENV_ADDR=0xEFF20000
  CONFIG_MPC85xx=y
  CONFIG_TARGET_P3041DS=y
  CONFIG_MPC85XX_HAVE_RESET_VECTOR=y
@@ -33,7 +34,6 @@ CONFIG_CMD_FAT=y
  CONFIG_OF_CONTROL=y
  CONFIG_ENV_OVERWRITE=y
  CONFIG_ENV_IS_IN_FLASH=y
-CONFIG_ENV_ADDR=0xEFF20000
  CONFIG_USE_BOOTFILE=y
  CONFIG_BOOTFILE="uImage"
  CONFIG_USE_ETHPRIME=y
diff --git a/configs/P4080DS_defconfig b/configs/P4080DS_defconfig

index 713183ef8df406d19c9f8ee849959ffe66ff9c72..165745091b66c9f91c3be6d75ec2c16fe00622a3 100644 (file)
--- a/configs/P4080DS_defconfig
+++ b/configs/P4080DS_defconfig
@@ -4,6 +4,7 @@ CONFIG_SYS_MALLOC_LEN=0x100000
  CONFIG_ENV_SIZE=0x2000
  CONFIG_ENV_SECT_SIZE=0x20000
  CONFIG_DEFAULT_DEVICE_TREE="p4080ds"
+CONFIG_ENV_ADDR=0xEFF20000
  CONFIG_MPC85xx=y
  CONFIG_TARGET_P4080DS=y
  CONFIG_MPC85XX_HAVE_RESET_VECTOR=y
@@ -33,7 +34,6 @@ CONFIG_CMD_FAT=y
  CONFIG_OF_CONTROL=y
  CONFIG_ENV_OVERWRITE=y
  CONFIG_ENV_IS_IN_FLASH=y
-CONFIG_ENV_ADDR=0xEFF20000
  CONFIG_USE_BOOTFILE=y
  CONFIG_BOOTFILE="uImage"
  CONFIG_USE_ETHPRIME=y
diff --git a/configs/P5040DS_defconfig b/configs/P5040DS_defconfig

index a7ada440390fb7ec0a105d06efe3ad7c3bf17385..94878025769622665f006edefb681df4e075c719 100644 (file)
--- a/configs/P5040DS_defconfig
+++ b/configs/P5040DS_defconfig
@@ -4,6 +4,7 @@ CONFIG_SYS_MALLOC_LEN=0x100000
  CONFIG_ENV_SIZE=0x2000
  CONFIG_ENV_SECT_SIZE=0x20000
  CONFIG_DEFAULT_DEVICE_TREE="p5040ds"
+CONFIG_ENV_ADDR=0xEFF20000
  CONFIG_MPC85xx=y
  CONFIG_TARGET_P5040DS=y
  CONFIG_MPC85XX_HAVE_RESET_VECTOR=y
@@ -33,7 +34,6 @@ CONFIG_CMD_FAT=y
  CONFIG_OF_CONTROL=y
  CONFIG_ENV_OVERWRITE=y
  CONFIG_ENV_IS_IN_FLASH=y
-CONFIG_ENV_ADDR=0xEFF20000
  CONFIG_USE_BOOTFILE=y
  CONFIG_BOOTFILE="uImage"
  CONFIG_USE_ETHPRIME=y
diff --git a/configs/SBx81LIFKW_defconfig b/configs/SBx81LIFKW_defconfig

index 1a7f6cf5262ebb3693f20a0dd5c72ae2361c74e2..ef427490ff91f457d643a64e75e85d96134893cc 100644 (file)
--- a/configs/SBx81LIFKW_defconfig
+++ b/configs/SBx81LIFKW_defconfig
@@ -12,8 +12,8 @@ CONFIG_ENV_SECT_SIZE=0x40000
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="kirkwood-atl-sbx81lifkw"
  CONFIG_IDENT_STRING="\nSBx81LIFKW"
-# CONFIG_SYS_MALLOC_F is not set
  CONFIG_SYS_LOAD_ADDR=0x1000000
+# CONFIG_SYS_MALLOC_F is not set
  CONFIG_BOOTDELAY=3
  CONFIG_SILENT_CONSOLE=y
  CONFIG_SILENT_U_BOOT_ONLY=y
diff --git a/configs/SBx81LIFXCAT_defconfig b/configs/SBx81LIFXCAT_defconfig

index baa4b954943b0efc662fe87659c3fd9ad427c29c..687e064fa8fc2da6498df3d34363f08eb425484f 100644 (file)
--- a/configs/SBx81LIFXCAT_defconfig
+++ b/configs/SBx81LIFXCAT_defconfig
@@ -12,8 +12,8 @@ CONFIG_ENV_SECT_SIZE=0x40000
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="kirkwood-atl-sbx81lifxcat"
  CONFIG_IDENT_STRING="\nSBx81LIFXCAT"
-# CONFIG_SYS_MALLOC_F is not set
  CONFIG_SYS_LOAD_ADDR=0x1000000
+# CONFIG_SYS_MALLOC_F is not set
  CONFIG_BOOTDELAY=3
  CONFIG_SILENT_CONSOLE=y
  CONFIG_SILENT_U_BOOT_ONLY=y
diff --git a/configs/T1024RDB_defconfig b/configs/T1024RDB_defconfig

index 985fcb832776db795697c717b794c52587729639..ae969422a047d77f680a5465b18d424f6160a74a 100644 (file)
--- a/configs/T1024RDB_defconfig
+++ b/configs/T1024RDB_defconfig
@@ -4,6 +4,7 @@ CONFIG_SYS_MALLOC_LEN=0xa00000
  CONFIG_ENV_SIZE=0x2000
  CONFIG_ENV_SECT_SIZE=0x20000
  CONFIG_DEFAULT_DEVICE_TREE="t1024rdb"
+CONFIG_ENV_ADDR=0xEFF20000
  CONFIG_MPC85xx=y
  CONFIG_TARGET_T1024RDB=y
  CONFIG_MPC85XX_HAVE_RESET_VECTOR=y
@@ -44,7 +45,6 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=fe8000000.nor:1m(uboot),5m(kernel),128k(dtb),9
  CONFIG_OF_CONTROL=y
  CONFIG_ENV_OVERWRITE=y
  CONFIG_ENV_IS_IN_FLASH=y
-CONFIG_ENV_ADDR=0xEFF20000
  CONFIG_USE_BOOTFILE=y
  CONFIG_BOOTFILE="uImage"
  CONFIG_USE_ETHPRIME=y
diff --git a/configs/T1042D4RDB_defconfig b/configs/T1042D4RDB_defconfig

index 21e1c3d00d0e0c3a8971186463ab7adb244703c6..81288805c087a215eea2b812932a4041458240e9 100644 (file)
--- a/configs/T1042D4RDB_defconfig
+++ b/configs/T1042D4RDB_defconfig
@@ -3,6 +3,7 @@ CONFIG_SYS_TEXT_BASE=0xEFF40000
  CONFIG_ENV_SIZE=0x2000
  CONFIG_ENV_SECT_SIZE=0x20000
  CONFIG_DEFAULT_DEVICE_TREE="t1042d4rdb"
+CONFIG_ENV_ADDR=0xEFF20000
  CONFIG_MPC85xx=y
  CONFIG_TARGET_T1042D4RDB=y
  CONFIG_MPC85XX_HAVE_RESET_VECTOR=y
@@ -35,7 +36,6 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=fe8000000.nor:1m(uboot),5m(kernel),128k(dtb),9
  CONFIG_OF_CONTROL=y
  CONFIG_ENV_OVERWRITE=y
  CONFIG_ENV_IS_IN_FLASH=y
-CONFIG_ENV_ADDR=0xEFF20000
  CONFIG_USE_BOOTFILE=y
  CONFIG_BOOTFILE="uImage"
  CONFIG_USE_ETHPRIME=y
diff --git a/configs/T2080QDS_SRIO_PCIE_BOOT_defconfig b/configs/T2080QDS_SRIO_PCIE_BOOT_defconfig

index 3b96d2fde4cfb3cb7755ec323835a611b3f31ae9..11098cd275ed7d5aa4e5fa341801b7bd51e95374 100644 (file)
--- a/configs/T2080QDS_SRIO_PCIE_BOOT_defconfig
+++ b/configs/T2080QDS_SRIO_PCIE_BOOT_defconfig
@@ -9,6 +9,7 @@ CONFIG_VOL_MONITOR_IR36021_READ=y
  CONFIG_VOL_MONITOR_IR36021_SET=y
  CONFIG_FSL_QIXIS=y
  # CONFIG_QIXIS_I2C_ACCESS is not set
+CONFIG_ENV_ADDR=0xFFE20000
  CONFIG_MPC85xx=y
  CONFIG_TARGET_T2080QDS=y
  CONFIG_MPC85XX_HAVE_RESET_VECTOR=y
@@ -37,7 +38,6 @@ CONFIG_CMD_FAT=y
  CONFIG_OF_CONTROL=y
  CONFIG_ENV_OVERWRITE=y
  CONFIG_ENV_IS_IN_REMOTE=y
-CONFIG_ENV_ADDR=0xFFE20000
  CONFIG_USE_BOOTFILE=y
  CONFIG_BOOTFILE="uImage"
  CONFIG_USE_ETHPRIME=y
diff --git a/configs/T2080QDS_defconfig b/configs/T2080QDS_defconfig

index bb6df630601df1683562dc53424df41bf7b601bc..a9461b8172eb1227b556e80821ab014e5c9b12c4 100644 (file)
--- a/configs/T2080QDS_defconfig
+++ b/configs/T2080QDS_defconfig
@@ -10,6 +10,7 @@ CONFIG_VOL_MONITOR_IR36021_READ=y
  CONFIG_VOL_MONITOR_IR36021_SET=y
  CONFIG_FSL_QIXIS=y
  # CONFIG_QIXIS_I2C_ACCESS is not set
+CONFIG_ENV_ADDR=0xEFF20000
  CONFIG_MPC85xx=y
  CONFIG_TARGET_T2080QDS=y
  CONFIG_MPC85XX_HAVE_RESET_VECTOR=y
@@ -40,7 +41,6 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=fe8000000.nor:1m(uboot),5m(kernel),128k(dtb),9
  CONFIG_OF_CONTROL=y
  CONFIG_ENV_OVERWRITE=y
  CONFIG_ENV_IS_IN_FLASH=y
-CONFIG_ENV_ADDR=0xEFF20000
  CONFIG_USE_BOOTFILE=y
  CONFIG_BOOTFILE="uImage"
  CONFIG_USE_ETHPRIME=y
diff --git a/configs/T2080RDB_defconfig b/configs/T2080RDB_defconfig

index 218419bde1e3907f4a539d044a19c826d9af2e6c..89af1e3f072e9d4d3bbaa1b5164c53e7ddb6a212 100644 (file)
--- a/configs/T2080RDB_defconfig
+++ b/configs/T2080RDB_defconfig
@@ -7,6 +7,7 @@ CONFIG_VID=y
  CONFIG_VID_FLS_ENV="t208xrdb_vdd_mv"
  CONFIG_VOL_MONITOR_IR36021_READ=y
  CONFIG_VOL_MONITOR_IR36021_SET=y
+CONFIG_ENV_ADDR=0xEFF20000
  CONFIG_MPC85xx=y
  CONFIG_TARGET_T2080RDB=y
  CONFIG_MPC85XX_HAVE_RESET_VECTOR=y
@@ -42,7 +43,6 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=fe8000000.nor:1m(uboot),5m(kernel),128k(dtb),9
  CONFIG_OF_CONTROL=y
  CONFIG_ENV_OVERWRITE=y
  CONFIG_ENV_IS_IN_FLASH=y
-CONFIG_ENV_ADDR=0xEFF20000
  CONFIG_USE_BOOTFILE=y
  CONFIG_BOOTFILE="uImage"
  CONFIG_USE_ETHPRIME=y
diff --git a/configs/T2080RDB_revD_defconfig b/configs/T2080RDB_revD_defconfig

index 1612806be1503e8d49fe555e08a5d851164e0ec0..f84163eb3099aee7937107b682f568cd948e2833 100644 (file)
--- a/configs/T2080RDB_revD_defconfig
+++ b/configs/T2080RDB_revD_defconfig
@@ -7,6 +7,7 @@ CONFIG_VID=y
  CONFIG_VID_FLS_ENV="t208xrdb_vdd_mv"
  CONFIG_VOL_MONITOR_IR36021_READ=y
  CONFIG_VOL_MONITOR_IR36021_SET=y
+CONFIG_ENV_ADDR=0xEFF20000
  CONFIG_MPC85xx=y
  CONFIG_TARGET_T2080RDB=y
  CONFIG_MPC85XX_HAVE_RESET_VECTOR=y
@@ -43,7 +44,6 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=fe8000000.nor:1m(uboot),5m(kernel),128k(dtb),9
  CONFIG_OF_CONTROL=y
  CONFIG_ENV_OVERWRITE=y
  CONFIG_ENV_IS_IN_FLASH=y
-CONFIG_ENV_ADDR=0xEFF20000
  CONFIG_USE_BOOTFILE=y
  CONFIG_BOOTFILE="uImage"
  CONFIG_USE_ETHPRIME=y
diff --git a/configs/T4240RDB_defconfig b/configs/T4240RDB_defconfig

index 784a45fe2de936b0d42cbc13ca1a0b64e9818143..2558551efe0e6e786ceb658009b31d40ff6b50b3 100644 (file)
--- a/configs/T4240RDB_defconfig
+++ b/configs/T4240RDB_defconfig
@@ -7,6 +7,7 @@ CONFIG_VID=y
  CONFIG_VID_FLS_ENV="t4240rdb_vdd_mv"
  CONFIG_VOL_MONITOR_IR36021_READ=y
  CONFIG_VOL_MONITOR_IR36021_SET=y
+CONFIG_ENV_ADDR=0xEFF20000
  CONFIG_MPC85xx=y
  CONFIG_TARGET_T4240RDB=y
  CONFIG_MPC85XX_HAVE_RESET_VECTOR=y
@@ -34,7 +35,6 @@ CONFIG_CMD_FAT=y
  CONFIG_OF_CONTROL=y
  CONFIG_ENV_OVERWRITE=y
  CONFIG_ENV_IS_IN_FLASH=y
-CONFIG_ENV_ADDR=0xEFF20000
  CONFIG_USE_BOOTFILE=y
  CONFIG_BOOTFILE="uImage"
  CONFIG_USE_ETHPRIME=y
diff --git a/configs/adp-ae3xx_defconfig b/configs/adp-ae3xx_defconfig

index c353b840db05bd4cb41e2759dffbcb95fd782795..72702a7910c2c27b0090df93ed490c4bb0a88a2a 100644 (file)
--- a/configs/adp-ae3xx_defconfig
+++ b/configs/adp-ae3xx_defconfig
@@ -8,8 +8,8 @@ CONFIG_ENV_OFFSET=0x140000
  CONFIG_ENV_SECT_SIZE=0x1000
  CONFIG_DEFAULT_DEVICE_TREE="ae3xx"
  CONFIG_SYS_CLK_FREQ=39062500
-CONFIG_TARGET_ADP_AE3XX=y
  CONFIG_SYS_LOAD_ADDR=0x300000
+CONFIG_TARGET_ADP_AE3XX=y
  CONFIG_FIT=y
  CONFIG_SYS_MONITOR_BASE=0x88000000
  CONFIG_BOOTDELAY=3
diff --git a/configs/adp-ag101p_defconfig b/configs/adp-ag101p_defconfig

index b8cb8325e8e66ba79ae853dbe568abf2febecc21..18175b4dc236fb42fb1bef71f6118eec10d8fdbe 100644 (file)
--- a/configs/adp-ag101p_defconfig
+++ b/configs/adp-ag101p_defconfig
@@ -7,8 +7,9 @@ CONFIG_ENV_SIZE=0x2000
  CONFIG_ENV_SECT_SIZE=0x20000
  CONFIG_DEFAULT_DEVICE_TREE="ag101p"
  CONFIG_SYS_CLK_FREQ=39062500
-CONFIG_TARGET_ADP_AG101P=y
  CONFIG_SYS_LOAD_ADDR=0x300000
+CONFIG_ENV_ADDR=0x80140000
+CONFIG_TARGET_ADP_AG101P=y
  CONFIG_FIT=y
  CONFIG_SYS_MONITOR_BASE=0x80000000
  CONFIG_BOOTDELAY=3
@@ -27,7 +28,6 @@ CONFIG_OF_CONTROL=y
  CONFIG_OF_EMBED=y
  CONFIG_ENV_OVERWRITE=y
  CONFIG_ENV_IS_IN_FLASH=y
-CONFIG_ENV_ADDR=0x80140000
  CONFIG_BOOTP_SEND_HOSTNAME=y
  CONFIG_NET_RANDOM_ETHADDR=y
  CONFIG_BOOTP_SERVERIP=y
diff --git a/configs/ae350_rv32_defconfig b/configs/ae350_rv32_defconfig

index df926b44f00dd45c65944457e1450431a3378eab..8284feb773a199ea75ee2ec80f8c1cb0af377cf7 100644 (file)
--- a/configs/ae350_rv32_defconfig
+++ b/configs/ae350_rv32_defconfig
@@ -4,9 +4,9 @@ CONFIG_SYS_MALLOC_LEN=0x80000
  CONFIG_NR_DRAM_BANKS=2
  CONFIG_ENV_SECT_SIZE=0x1000
  CONFIG_DEFAULT_DEVICE_TREE="ae350_32"
+CONFIG_SYS_LOAD_ADDR=0x100000
  CONFIG_TARGET_AX25_AE350=y
  CONFIG_DISTRO_DEFAULTS=y
-CONFIG_SYS_LOAD_ADDR=0x100000
  CONFIG_FIT=y
  CONFIG_SYS_MONITOR_BASE=0x88000000
  CONFIG_BOOTDELAY=3
diff --git a/configs/ae350_rv32_spl_defconfig b/configs/ae350_rv32_spl_defconfig

index 2924c892f71aec68cb9079abf8ff18f66e0bf3a3..3a646e4222a1b301664f1d3cf4c6692d4068c1cd 100644 (file)
--- a/configs/ae350_rv32_spl_defconfig
+++ b/configs/ae350_rv32_spl_defconfig
@@ -6,10 +6,10 @@ CONFIG_ENV_SECT_SIZE=0x1000
  CONFIG_DEFAULT_DEVICE_TREE="ae350_32"
  CONFIG_SPL_SYS_MALLOC_F_LEN=0x100000
  CONFIG_SPL=y
+CONFIG_SYS_LOAD_ADDR=0x100000
  CONFIG_TARGET_AX25_AE350=y
  CONFIG_RISCV_SMODE=y
  CONFIG_DISTRO_DEFAULTS=y
-CONFIG_SYS_LOAD_ADDR=0x100000
  CONFIG_FIT=y
  CONFIG_SPL_LOAD_FIT_ADDRESS=0x00200000
  CONFIG_SYS_MONITOR_BASE=0x88000000
diff --git a/configs/ae350_rv32_spl_xip_defconfig b/configs/ae350_rv32_spl_xip_defconfig

index 91e88a3341dd17a0af7ef11cc6ac806ff80a854d..4ac90fbf73036c45e792fdd15135f7689c2b289f 100644 (file)
--- a/configs/ae350_rv32_spl_xip_defconfig
+++ b/configs/ae350_rv32_spl_xip_defconfig
@@ -7,11 +7,11 @@ CONFIG_DEFAULT_DEVICE_TREE="ae350_32"
  CONFIG_SPL_TEXT_BASE=0x80000000
  CONFIG_SPL_SYS_MALLOC_F_LEN=0x100000
  CONFIG_SPL=y
+CONFIG_SYS_LOAD_ADDR=0x100000
  CONFIG_TARGET_AX25_AE350=y
  CONFIG_RISCV_SMODE=y
  CONFIG_XIP=y
  CONFIG_DISTRO_DEFAULTS=y
-CONFIG_SYS_LOAD_ADDR=0x100000
  CONFIG_FIT=y
  CONFIG_SPL_LOAD_FIT_ADDRESS=0x80010000
  CONFIG_SYS_MONITOR_BASE=0x88000000
diff --git a/configs/ae350_rv32_xip_defconfig b/configs/ae350_rv32_xip_defconfig

index f84294e2a2e72756f51a219cfc562d25554fd670..d76118630beca0f42b93e94a8ed04a2c419301d2 100644 (file)
--- a/configs/ae350_rv32_xip_defconfig
+++ b/configs/ae350_rv32_xip_defconfig
@@ -4,10 +4,10 @@ CONFIG_SYS_MALLOC_LEN=0x80000
  CONFIG_NR_DRAM_BANKS=2
  CONFIG_ENV_SECT_SIZE=0x1000
  CONFIG_DEFAULT_DEVICE_TREE="ae350_32"
+CONFIG_SYS_LOAD_ADDR=0x100000
  CONFIG_TARGET_AX25_AE350=y
  CONFIG_XIP=y
  CONFIG_DISTRO_DEFAULTS=y
-CONFIG_SYS_LOAD_ADDR=0x100000
  CONFIG_FIT=y
  CONFIG_SYS_MONITOR_BASE=0x88000000
  CONFIG_BOOTDELAY=3
diff --git a/configs/ae350_rv64_defconfig b/configs/ae350_rv64_defconfig

index 22c0726555654b1ebe3da1a8fd20ae1c4903202c..860a45f7fbfcb1aaef89a43f63b13397f5315ca0 100644 (file)
--- a/configs/ae350_rv64_defconfig
+++ b/configs/ae350_rv64_defconfig
@@ -4,10 +4,10 @@ CONFIG_SYS_MALLOC_LEN=0x80000
  CONFIG_NR_DRAM_BANKS=2
  CONFIG_ENV_SECT_SIZE=0x1000
  CONFIG_DEFAULT_DEVICE_TREE="ae350_64"
+CONFIG_SYS_LOAD_ADDR=0x100000
  CONFIG_TARGET_AX25_AE350=y
  CONFIG_ARCH_RV64I=y
  CONFIG_DISTRO_DEFAULTS=y
-CONFIG_SYS_LOAD_ADDR=0x100000
  CONFIG_FIT=y
  CONFIG_SYS_MONITOR_BASE=0x88000000
  CONFIG_BOOTDELAY=3
diff --git a/configs/ae350_rv64_spl_defconfig b/configs/ae350_rv64_spl_defconfig

index 27ea0b72f712e9ac1fd85a45942ee527e298f3fe..1e682df8007ebbe98459843437b51184247ba00d 100644 (file)
--- a/configs/ae350_rv64_spl_defconfig
+++ b/configs/ae350_rv64_spl_defconfig
@@ -6,11 +6,11 @@ CONFIG_ENV_SECT_SIZE=0x1000
  CONFIG_DEFAULT_DEVICE_TREE="ae350_64"
  CONFIG_SPL_SYS_MALLOC_F_LEN=0x100000
  CONFIG_SPL=y
+CONFIG_SYS_LOAD_ADDR=0x100000
  CONFIG_TARGET_AX25_AE350=y
  CONFIG_ARCH_RV64I=y
  CONFIG_RISCV_SMODE=y
  CONFIG_DISTRO_DEFAULTS=y
-CONFIG_SYS_LOAD_ADDR=0x100000
  CONFIG_FIT=y
  CONFIG_SPL_LOAD_FIT_ADDRESS=0x00200000
  CONFIG_SYS_MONITOR_BASE=0x88000000
diff --git a/configs/ae350_rv64_spl_xip_defconfig b/configs/ae350_rv64_spl_xip_defconfig

index 1c1bda6ee9946ca092a27ffef17373e22cd88599..4f17d5ca1e25724eca0ec8f9b45f0569254638f9 100644 (file)
--- a/configs/ae350_rv64_spl_xip_defconfig
+++ b/configs/ae350_rv64_spl_xip_defconfig
@@ -7,12 +7,12 @@ CONFIG_DEFAULT_DEVICE_TREE="ae350_64"
  CONFIG_SPL_TEXT_BASE=0x80000000
  CONFIG_SPL_SYS_MALLOC_F_LEN=0x100000
  CONFIG_SPL=y
+CONFIG_SYS_LOAD_ADDR=0x100000
  CONFIG_TARGET_AX25_AE350=y
  CONFIG_ARCH_RV64I=y
  CONFIG_RISCV_SMODE=y
  CONFIG_XIP=y
  CONFIG_DISTRO_DEFAULTS=y
-CONFIG_SYS_LOAD_ADDR=0x100000
  CONFIG_FIT=y
  CONFIG_SPL_LOAD_FIT_ADDRESS=0x80010000
  CONFIG_SYS_MONITOR_BASE=0x88000000
diff --git a/configs/ae350_rv64_xip_defconfig b/configs/ae350_rv64_xip_defconfig

index 3a6b52f74fed0b689fbf888288fe71375c2c075e..3375cb69e645cc7e104b2f63c6ca05d4955c3dfa 100644 (file)
--- a/configs/ae350_rv64_xip_defconfig
+++ b/configs/ae350_rv64_xip_defconfig
@@ -4,11 +4,11 @@ CONFIG_SYS_MALLOC_LEN=0x80000
  CONFIG_NR_DRAM_BANKS=2
  CONFIG_ENV_SECT_SIZE=0x1000
  CONFIG_DEFAULT_DEVICE_TREE="ae350_64"
+CONFIG_SYS_LOAD_ADDR=0x100000
  CONFIG_TARGET_AX25_AE350=y
  CONFIG_ARCH_RV64I=y
  CONFIG_XIP=y
  CONFIG_DISTRO_DEFAULTS=y
-CONFIG_SYS_LOAD_ADDR=0x100000
  CONFIG_FIT=y
  CONFIG_SYS_MONITOR_BASE=0x88000000
  CONFIG_BOOTDELAY=3
diff --git a/configs/alt_defconfig b/configs/alt_defconfig

index 432f29cacae583e5801d55be0b9a272d667be276..6ab4fe7a818c7b1aa7268b067e3ae30c4e9401be 100644 (file)
--- a/configs/alt_defconfig
+++ b/configs/alt_defconfig
@@ -25,6 +25,7 @@ CONFIG_SPL=y
  CONFIG_SPL_SPI_FLASH_SUPPORT=y
  CONFIG_SPL_SPI=y
  CONFIG_SYS_LOAD_ADDR=0x50000000
+CONFIG_ENV_ADDR=0xC0000
  CONFIG_FIT=y
  CONFIG_BOOTDELAY=3
  CONFIG_SPL_BOARD_INIT=y
@@ -60,7 +61,6 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=spi0.0:256k(u-boot-spl),512k(u-boot-env1),512k
  CONFIG_OF_CONTROL=y
  CONFIG_ENV_OVERWRITE=y
  CONFIG_ENV_IS_IN_SPI_FLASH=y
-CONFIG_ENV_ADDR=0xC0000
  CONFIG_VERSION_VARIABLE=y
  CONFIG_CLK=y
  CONFIG_CLK_RENESAS=y
diff --git a/configs/am64x_evm_r5_defconfig b/configs/am64x_evm_r5_defconfig

index 985e7df4f78af50043b6367da020bd6032c512ed..952ac270cfa36f552e9c0c61630d813a596ce3f4 100644 (file)
--- a/configs/am64x_evm_r5_defconfig
+++ b/configs/am64x_evm_r5_defconfig
@@ -5,11 +5,11 @@ CONFIG_SYS_MALLOC_F_LEN=0x80000
  CONFIG_SPL_GPIO=y
  CONFIG_SPL_LIBCOMMON_SUPPORT=y
  CONFIG_SPL_LIBGENERIC_SUPPORT=y
+CONFIG_NR_DRAM_BANKS=2
  CONFIG_SOC_K3_AM642=y
  CONFIG_TARGET_AM642_R5_EVM=y
  CONFIG_ENV_SIZE=0x20000
  CONFIG_ENV_OFFSET=0x680000
-CONFIG_NR_DRAM_BANKS=2
  CONFIG_DM_GPIO=y
  CONFIG_SPL_DM_SPI=y
  CONFIG_DEFAULT_DEVICE_TREE="k3-am642-r5-evm"
@@ -104,8 +104,8 @@ CONFIG_DM_I2C=y
  CONFIG_SYS_I2C_OMAP24XX=y
  CONFIG_DM_MAILBOX=y
  CONFIG_K3_SEC_PROXY=y
-CONFIG_ESM_K3=y
  CONFIG_SPL_MISC=y
+CONFIG_ESM_K3=y
  CONFIG_MMC_SDHCI=y
  CONFIG_MMC_SDHCI_ADMA=y
  CONFIG_SPL_MMC_SDHCI_ADMA=y
diff --git a/configs/amcore_defconfig b/configs/amcore_defconfig

index b10479520c3e5f9747d154c6eaddc1bc41ca00d7..00620d4579f97ec8371bff9421fd02eeccd4e86e 100644 (file)
--- a/configs/amcore_defconfig
+++ b/configs/amcore_defconfig
@@ -5,9 +5,10 @@ CONFIG_SYS_MALLOC_F_LEN=0x800
  CONFIG_ENV_SIZE=0x1000
  CONFIG_ENV_SECT_SIZE=0x1000
  CONFIG_DEFAULT_DEVICE_TREE="amcore"
+CONFIG_SYS_LOAD_ADDR=0x20000
+CONFIG_ENV_ADDR=0xFFC1F000
  CONFIG_TARGET_AMCORE=y
  CONFIG_MCFTMR=y
-CONFIG_SYS_LOAD_ADDR=0x20000
  CONFIG_SYS_MONITOR_BASE=0xFFC00400
  CONFIG_BOOTDELAY=1
  CONFIG_USE_BOOTCOMMAND=y
@@ -27,7 +28,6 @@ CONFIG_CMD_CACHE=y
  CONFIG_CMD_TIMER=y
  CONFIG_CMD_DIAG=y
  CONFIG_ENV_IS_IN_FLASH=y
-CONFIG_ENV_ADDR=0xFFC1F000
  # CONFIG_NET is not set
  CONFIG_MTD_NOR_FLASH=y
  CONFIG_FLASH_CFI_DRIVER=y
diff --git a/configs/ap121_defconfig b/configs/ap121_defconfig

index ffbd19ffac948bed3141cf247e682d6aa3864cfa..98ebefbd107416e93ab9aae4c015cca7a3052bb7 100644 (file)
--- a/configs/ap121_defconfig
+++ b/configs/ap121_defconfig
@@ -9,11 +9,11 @@ CONFIG_DEFAULT_DEVICE_TREE="ap121"
  CONFIG_DEBUG_UART_BOARD_INIT=y
  CONFIG_DEBUG_UART_BASE=0xb8020000
  CONFIG_DEBUG_UART_CLOCK=25000000
+CONFIG_SYS_LOAD_ADDR=0x81000000
  CONFIG_ARCH_ATH79=y
  CONFIG_DEBUG_UART=y
  CONFIG_SYS_MEMTEST_START=0x80100000
  CONFIG_SYS_MEMTEST_END=0x83f00000
-CONFIG_SYS_LOAD_ADDR=0x81000000
  CONFIG_BOOTDELAY=3
  CONFIG_USE_BOOTARGS=y
  CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/mtdblock2 rootfstype=squashfs"
diff --git a/configs/ap143_defconfig b/configs/ap143_defconfig

index 237a86821bf2fd41f9e5cf3bd0c3fbddaaf1c6f5..2f1a9f3cc124fd959e32e8fa37dba2ad4021bd4d 100644 (file)
--- a/configs/ap143_defconfig
+++ b/configs/ap143_defconfig
@@ -9,12 +9,12 @@ CONFIG_DEFAULT_DEVICE_TREE="ap143"
  CONFIG_DEBUG_UART_BOARD_INIT=y
  CONFIG_DEBUG_UART_BASE=0xb8020000
  CONFIG_DEBUG_UART_CLOCK=25000000
+CONFIG_SYS_LOAD_ADDR=0x81000000
  CONFIG_ARCH_ATH79=y
  CONFIG_TARGET_AP143=y
  CONFIG_DEBUG_UART=y
  CONFIG_SYS_MEMTEST_START=0x80100000
  CONFIG_SYS_MEMTEST_END=0x83f00000
-CONFIG_SYS_LOAD_ADDR=0x81000000
  CONFIG_BOOTDELAY=3
  CONFIG_USE_BOOTARGS=y
  CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/mtdblock2 rootfstype=squashfs"
diff --git a/configs/ap152_defconfig b/configs/ap152_defconfig

index 8ddba4fa486a9862e375743451d16453ecc6fd78..ded583f398d450054d0195eed9a5369625e1c748 100644 (file)
--- a/configs/ap152_defconfig
+++ b/configs/ap152_defconfig
@@ -9,12 +9,12 @@ CONFIG_DEFAULT_DEVICE_TREE="ap152"
  CONFIG_DEBUG_UART_BOARD_INIT=y
  CONFIG_DEBUG_UART_BASE=0xb8020000
  CONFIG_DEBUG_UART_CLOCK=25000000
+CONFIG_SYS_LOAD_ADDR=0x81000000
  CONFIG_ARCH_ATH79=y
  CONFIG_TARGET_AP152=y
  CONFIG_DEBUG_UART=y
  CONFIG_SYS_MEMTEST_START=0x80100000
  CONFIG_SYS_MEMTEST_END=0x83f00000
-CONFIG_SYS_LOAD_ADDR=0x81000000
  CONFIG_BOOTDELAY=3
  CONFIG_USE_BOOTARGS=y
  CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/mtdblock2 rootfstype=squashfs"
diff --git a/configs/apalis-imx8_defconfig b/configs/apalis-imx8_defconfig

index f963dcdb19fbd2e87dc3fbf2c9968db33b6cc752..19edbbb69784ea252d12eac2472f30cf41ce5463 100644 (file)
--- a/configs/apalis-imx8_defconfig
+++ b/configs/apalis-imx8_defconfig
@@ -9,11 +9,11 @@ CONFIG_ENV_OFFSET=0xFFFFDE00
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="fsl-imx8qm-apalis"
  CONFIG_TARGET_APALIS_IMX8=y
+CONFIG_SYS_LOAD_ADDR=0x80280000
  CONFIG_SYS_MEMTEST_START=0x88000000
  CONFIG_SYS_MEMTEST_END=0x89000000
  CONFIG_DISTRO_DEFAULTS=y
  CONFIG_REMAKE_ELF=y
-CONFIG_SYS_LOAD_ADDR=0x80280000
  CONFIG_FIT=y
  CONFIG_OF_SYSTEM_SETUP=y
  CONFIG_LOG=y
diff --git a/configs/apalis-imx8x_defconfig b/configs/apalis-imx8x_defconfig

index 11f7a5897cf61a58df672c2ee0436fb96414b321..b67cdece71c6dc865270d1e5c751d56724410b79 100644 (file)
--- a/configs/apalis-imx8x_defconfig
+++ b/configs/apalis-imx8x_defconfig
@@ -9,11 +9,11 @@ CONFIG_ENV_OFFSET=0xFFFFDE00
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="fsl-imx8qxp-apalis"
  CONFIG_TARGET_APALIS_IMX8X=y
+CONFIG_SYS_LOAD_ADDR=0x89000000
  CONFIG_SYS_MEMTEST_START=0x88000000
  CONFIG_SYS_MEMTEST_END=0x89000000
  CONFIG_DISTRO_DEFAULTS=y
  CONFIG_REMAKE_ELF=y
-CONFIG_SYS_LOAD_ADDR=0x89000000
  CONFIG_FIT=y
  CONFIG_OF_SYSTEM_SETUP=y
  CONFIG_BOOTDELAY=1
diff --git a/configs/armadillo-800eva_defconfig b/configs/armadillo-800eva_defconfig

index d0e457f5f9285780e4a006cc3938fefcf500b8dd..e0a58b9208c851fd2cbbdcdcb7120bc0bced61db 100644 (file)
--- a/configs/armadillo-800eva_defconfig
+++ b/configs/armadillo-800eva_defconfig
@@ -13,6 +13,7 @@ CONFIG_R8A7740=y
  CONFIG_TARGET_ARMADILLO_800EVA=y
  CONFIG_SYS_CLK_FREQ=50000000
  CONFIG_SYS_LOAD_ADDR=0x44000000
+CONFIG_ENV_ADDR=0x40000
  CONFIG_SYS_MONITOR_BASE=0x00000000
  CONFIG_BOOTDELAY=3
  # CONFIG_CMDLINE_EDITING is not set
@@ -38,7 +39,6 @@ CONFIG_CMD_PING=y
  # CONFIG_CMD_SLEEP is not set
  CONFIG_ENV_OVERWRITE=y
  CONFIG_ENV_IS_IN_FLASH=y
-CONFIG_ENV_ADDR=0x40000
  CONFIG_VERSION_VARIABLE=y
  # CONFIG_MMC is not set
  CONFIG_BITBANGMII=y
diff --git a/configs/arndale_defconfig b/configs/arndale_defconfig

index 299923bdfe6444f5a0e4666574b514cfb3e8edac..7e1610abf5fa759b79a99b1bb09dc4173de4a932 100644 (file)
--- a/configs/arndale_defconfig
+++ b/configs/arndale_defconfig
@@ -14,8 +14,8 @@ CONFIG_DEFAULT_DEVICE_TREE="exynos5250-arndale"
  CONFIG_SPL_TEXT_BASE=0x02023400
  CONFIG_SPL=y
  CONFIG_IDENT_STRING=" for ARNDALE"
-CONFIG_DISTRO_DEFAULTS=y
  CONFIG_SYS_LOAD_ADDR=0x43e00000
+CONFIG_DISTRO_DEFAULTS=y
  CONFIG_FIT=y
  CONFIG_FIT_BEST_MATCH=y
  CONFIG_USE_PREBOOT=y
diff --git a/configs/astro_mcf5373l_defconfig b/configs/astro_mcf5373l_defconfig

index 729750c76f86cfe8065fdf59d0dcb872b4f26a34..1eea56b5ef29630418576ecb8ed0537cf8bf2cb3 100644 (file)
--- a/configs/astro_mcf5373l_defconfig
+++ b/configs/astro_mcf5373l_defconfig
@@ -4,9 +4,10 @@ CONFIG_SYS_MALLOC_LEN=0x20000
  CONFIG_ENV_SIZE=0x8000
  CONFIG_ENV_SECT_SIZE=0x8000
  CONFIG_DEFAULT_DEVICE_TREE="astro_mcf5373l"
+CONFIG_SYS_LOAD_ADDR=0x20000
+CONFIG_ENV_ADDR=0x1FF8000
  CONFIG_TARGET_ASTRO_MCF5373L=y
  CONFIG_MCFTMR=y
-CONFIG_SYS_LOAD_ADDR=0x20000
  CONFIG_SYS_MONITOR_BASE=0x00000400
  CONFIG_BOOTDELAY=1
  CONFIG_USE_BOOTARGS=y
@@ -25,7 +26,6 @@ CONFIG_CMD_I2C=y
  CONFIG_CMD_CACHE=y
  CONFIG_CMD_DATE=y
  CONFIG_CMD_JFFS2=y
-CONFIG_ENV_ADDR=0x1FF8000
  # CONFIG_NET is not set
  CONFIG_FPGA_ALTERA=y
  CONFIG_FPGA_CYCLON2=y
diff --git a/configs/at91sam9260ek_dataflash_cs0_defconfig b/configs/at91sam9260ek_dataflash_cs0_defconfig

index 2193c072de2a5af3743637df6e0c37ad358c809f..03a85d2a0b224febf8245ce73bd2edfc1ea43a0a 100644 (file)
--- a/configs/at91sam9260ek_dataflash_cs0_defconfig
+++ b/configs/at91sam9260ek_dataflash_cs0_defconfig
@@ -17,8 +17,8 @@ CONFIG_DEFAULT_DEVICE_TREE="at91sam9260ek"
  CONFIG_DEBUG_UART_BOARD_INIT=y
  CONFIG_DEBUG_UART_BASE=0xfffff200
  CONFIG_DEBUG_UART_CLOCK=132000000
-CONFIG_DEBUG_UART=y
  CONFIG_SYS_LOAD_ADDR=0x22000000
+CONFIG_DEBUG_UART=y
  CONFIG_BOOTDELAY=3
  CONFIG_USE_BOOTARGS=y
  CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/mtdblock0 mtdparts=atmel_nand:-(root) rw rootfstype=jffs2"
diff --git a/configs/at91sam9260ek_dataflash_cs1_defconfig b/configs/at91sam9260ek_dataflash_cs1_defconfig

index 25fc63d9cb747cbcbebeec77c0ea0a2479433c2f..178cf92fe34fc205fca36736f543b9782b8a38ac 100644 (file)
--- a/configs/at91sam9260ek_dataflash_cs1_defconfig
+++ b/configs/at91sam9260ek_dataflash_cs1_defconfig
@@ -17,8 +17,8 @@ CONFIG_DEFAULT_DEVICE_TREE="at91sam9260ek"
  CONFIG_DEBUG_UART_BOARD_INIT=y
  CONFIG_DEBUG_UART_BASE=0xfffff200
  CONFIG_DEBUG_UART_CLOCK=132000000
-CONFIG_DEBUG_UART=y
  CONFIG_SYS_LOAD_ADDR=0x22000000
+CONFIG_DEBUG_UART=y
  CONFIG_BOOTDELAY=3
  CONFIG_USE_BOOTARGS=y
  CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/mtdblock0 mtdparts=atmel_nand:-(root) rw rootfstype=jffs2"
diff --git a/configs/at91sam9260ek_nandflash_defconfig b/configs/at91sam9260ek_nandflash_defconfig

index 644a950ceae7ca79aa6316e2cd2ef6063c7157cc..376e28a9e6ad8ed7679036975a2a1cb6fa1949d8 100644 (file)
--- a/configs/at91sam9260ek_nandflash_defconfig
+++ b/configs/at91sam9260ek_nandflash_defconfig
@@ -15,8 +15,8 @@ CONFIG_DEBUG_UART_BOARD_INIT=y
  CONFIG_DEBUG_UART_BASE=0xfffff200
  CONFIG_DEBUG_UART_CLOCK=132000000
  CONFIG_ENV_OFFSET_REDUND=0x100000
-CONFIG_DEBUG_UART=y
  CONFIG_SYS_LOAD_ADDR=0x22000000
+CONFIG_DEBUG_UART=y
  CONFIG_NAND_BOOT=y
  CONFIG_BOOTDELAY=3
  CONFIG_USE_BOOTARGS=y
diff --git a/configs/at91sam9261ek_dataflash_cs0_defconfig b/configs/at91sam9261ek_dataflash_cs0_defconfig

index 76e9314d5f80d77ce529d5b0cae091fb0d468481..c43a8a58db721f5cb4a3948e02698d3f21db56e0 100644 (file)
--- a/configs/at91sam9261ek_dataflash_cs0_defconfig
+++ b/configs/at91sam9261ek_dataflash_cs0_defconfig
@@ -16,8 +16,8 @@ CONFIG_DEFAULT_DEVICE_TREE="at91sam9261ek"
  CONFIG_DEBUG_UART_BOARD_INIT=y
  CONFIG_DEBUG_UART_BASE=0xfffff200
  CONFIG_DEBUG_UART_CLOCK=100000000
-CONFIG_DEBUG_UART=y
  CONFIG_SYS_LOAD_ADDR=0x22000000
+CONFIG_DEBUG_UART=y
  CONFIG_BOOTDELAY=3
  CONFIG_USE_BOOTARGS=y
  CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/mtdblock0 mtdparts=atmel_nand:-(root) rw rootfstype=jffs2"
diff --git a/configs/at91sam9261ek_dataflash_cs3_defconfig b/configs/at91sam9261ek_dataflash_cs3_defconfig

index 2bdac9c19c07f53fa7bc65214dfda23905b77dea..baf527ff32d3761fd38721edd1148b31d1f722c6 100644 (file)
--- a/configs/at91sam9261ek_dataflash_cs3_defconfig
+++ b/configs/at91sam9261ek_dataflash_cs3_defconfig
@@ -16,8 +16,8 @@ CONFIG_DEFAULT_DEVICE_TREE="at91sam9261ek"
  CONFIG_DEBUG_UART_BOARD_INIT=y
  CONFIG_DEBUG_UART_BASE=0xfffff200
  CONFIG_DEBUG_UART_CLOCK=100000000
-CONFIG_DEBUG_UART=y
  CONFIG_SYS_LOAD_ADDR=0x22000000
+CONFIG_DEBUG_UART=y
  CONFIG_BOOTDELAY=3
  CONFIG_USE_BOOTARGS=y
  CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/mtdblock0 mtdparts=atmel_nand:-(root) rw rootfstype=jffs2"
diff --git a/configs/at91sam9261ek_nandflash_defconfig b/configs/at91sam9261ek_nandflash_defconfig

index 20909d86bd772bd3ce75680570503c3132e24a16..482a37d6a55fa35a055f2bd05b13f9246fcfd8e6 100644 (file)
--- a/configs/at91sam9261ek_nandflash_defconfig
+++ b/configs/at91sam9261ek_nandflash_defconfig
@@ -14,8 +14,8 @@ CONFIG_DEBUG_UART_BOARD_INIT=y
  CONFIG_DEBUG_UART_BASE=0xfffff200
  CONFIG_DEBUG_UART_CLOCK=100000000
  CONFIG_ENV_OFFSET_REDUND=0x100000
-CONFIG_DEBUG_UART=y
  CONFIG_SYS_LOAD_ADDR=0x22000000
+CONFIG_DEBUG_UART=y
  CONFIG_NAND_BOOT=y
  CONFIG_BOOTDELAY=3
  CONFIG_USE_BOOTARGS=y
diff --git a/configs/at91sam9263ek_dataflash_cs0_defconfig b/configs/at91sam9263ek_dataflash_cs0_defconfig

index 2250402192bfcc4fdeea70af4d6ee3d1bb9f839b..08b149b2e2a7cbd2e014efe15e1cd4de8eb1bf9f 100644 (file)
--- a/configs/at91sam9263ek_dataflash_cs0_defconfig
+++ b/configs/at91sam9263ek_dataflash_cs0_defconfig
@@ -16,8 +16,8 @@ CONFIG_DEFAULT_DEVICE_TREE="at91sam9263ek"
  CONFIG_DEBUG_UART_BOARD_INIT=y
  CONFIG_DEBUG_UART_BASE=0xffffee00
  CONFIG_DEBUG_UART_CLOCK=100000000
-CONFIG_DEBUG_UART=y
  CONFIG_SYS_LOAD_ADDR=0x22000000
+CONFIG_DEBUG_UART=y
  CONFIG_BOOTDELAY=3
  CONFIG_USE_BOOTARGS=y
  CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/mtdblock0 mtdparts=atmel_nand:-(root) rw rootfstype=jffs2"
diff --git a/configs/at91sam9263ek_dataflash_defconfig b/configs/at91sam9263ek_dataflash_defconfig

index 2250402192bfcc4fdeea70af4d6ee3d1bb9f839b..08b149b2e2a7cbd2e014efe15e1cd4de8eb1bf9f 100644 (file)
--- a/configs/at91sam9263ek_dataflash_defconfig
+++ b/configs/at91sam9263ek_dataflash_defconfig
@@ -16,8 +16,8 @@ CONFIG_DEFAULT_DEVICE_TREE="at91sam9263ek"
  CONFIG_DEBUG_UART_BOARD_INIT=y
  CONFIG_DEBUG_UART_BASE=0xffffee00
  CONFIG_DEBUG_UART_CLOCK=100000000
-CONFIG_DEBUG_UART=y
  CONFIG_SYS_LOAD_ADDR=0x22000000
+CONFIG_DEBUG_UART=y
  CONFIG_BOOTDELAY=3
  CONFIG_USE_BOOTARGS=y
  CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/mtdblock0 mtdparts=atmel_nand:-(root) rw rootfstype=jffs2"
diff --git a/configs/at91sam9263ek_nandflash_defconfig b/configs/at91sam9263ek_nandflash_defconfig

index 3ddadc43afa514522565e10d539fbc15f09aa572..6f6d392abe766cc2b4ab21856d9b4cdd36a0502c 100644 (file)
--- a/configs/at91sam9263ek_nandflash_defconfig
+++ b/configs/at91sam9263ek_nandflash_defconfig
@@ -14,8 +14,8 @@ CONFIG_DEBUG_UART_BOARD_INIT=y
  CONFIG_DEBUG_UART_BASE=0xffffee00
  CONFIG_DEBUG_UART_CLOCK=100000000
  CONFIG_ENV_OFFSET_REDUND=0x100000
-CONFIG_DEBUG_UART=y
  CONFIG_SYS_LOAD_ADDR=0x22000000
+CONFIG_DEBUG_UART=y
  CONFIG_NAND_BOOT=y
  CONFIG_BOOTDELAY=3
  CONFIG_USE_BOOTARGS=y
diff --git a/configs/at91sam9263ek_norflash_boot_defconfig b/configs/at91sam9263ek_norflash_boot_defconfig

index 382ca522fb52a8a510f1dd1d00bddeb7e5af2020..73ed064f146ad17bb18c085de2ab387b4ef568be 100644 (file)
--- a/configs/at91sam9263ek_norflash_boot_defconfig
+++ b/configs/at91sam9263ek_norflash_boot_defconfig
@@ -15,8 +15,9 @@ CONFIG_DEFAULT_DEVICE_TREE="at91sam9263ek"
  CONFIG_DEBUG_UART_BOARD_INIT=y
  CONFIG_DEBUG_UART_BASE=0xffffee00
  CONFIG_DEBUG_UART_CLOCK=100000000
-CONFIG_DEBUG_UART=y
  CONFIG_SYS_LOAD_ADDR=0x22000000
+CONFIG_ENV_ADDR=0x107E0000
+CONFIG_DEBUG_UART=y
  CONFIG_SYS_MONITOR_BASE=0x10000000
  CONFIG_BOOTDELAY=3
  CONFIG_SYS_CONSOLE_IS_IN_ENV=y
@@ -39,7 +40,6 @@ CONFIG_CMD_FAT=y
  CONFIG_OF_CONTROL=y
  CONFIG_ENV_IS_IN_FLASH=y
  CONFIG_SYS_REDUNDAND_ENVIRONMENT=y
-CONFIG_ENV_ADDR=0x107E0000
  CONFIG_ENV_ADDR_REDUND=0x107D0000
  CONFIG_DM=y
  CONFIG_CLK=y
diff --git a/configs/at91sam9263ek_norflash_defconfig b/configs/at91sam9263ek_norflash_defconfig

index fbdf01f69dacff1c37f4caf69900015ca7334d8e..4d841078e4076b4248815e4a2253be96309e45c7 100644 (file)
--- a/configs/at91sam9263ek_norflash_defconfig
+++ b/configs/at91sam9263ek_norflash_defconfig
@@ -16,8 +16,9 @@ CONFIG_DEFAULT_DEVICE_TREE="at91sam9263ek"
  CONFIG_DEBUG_UART_BOARD_INIT=y
  CONFIG_DEBUG_UART_BASE=0xffffee00
  CONFIG_DEBUG_UART_CLOCK=100000000
-CONFIG_DEBUG_UART=y
  CONFIG_SYS_LOAD_ADDR=0x22000000
+CONFIG_ENV_ADDR=0x107E0000
+CONFIG_DEBUG_UART=y
  CONFIG_SYS_MONITOR_BASE=0x10000000
  CONFIG_BOOTDELAY=3
  CONFIG_SYS_CONSOLE_IS_IN_ENV=y
@@ -40,7 +41,6 @@ CONFIG_CMD_FAT=y
  CONFIG_OF_CONTROL=y
  CONFIG_ENV_IS_IN_FLASH=y
  CONFIG_SYS_REDUNDAND_ENVIRONMENT=y
-CONFIG_ENV_ADDR=0x107E0000
  CONFIG_ENV_ADDR_REDUND=0x107D0000
  CONFIG_DM=y
  CONFIG_CLK=y
diff --git a/configs/at91sam9g10ek_dataflash_cs0_defconfig b/configs/at91sam9g10ek_dataflash_cs0_defconfig

index 0f767f2fb3809e20cc529be815762f965fd0d4ba..a6a139ea6a5e95e7b037faec9d109f977d7ba114 100644 (file)
--- a/configs/at91sam9g10ek_dataflash_cs0_defconfig
+++ b/configs/at91sam9g10ek_dataflash_cs0_defconfig
@@ -16,8 +16,8 @@ CONFIG_DEFAULT_DEVICE_TREE="at91sam9261ek"
  CONFIG_DEBUG_UART_BOARD_INIT=y
  CONFIG_DEBUG_UART_BASE=0xfffff200
  CONFIG_DEBUG_UART_CLOCK=100000000
-CONFIG_DEBUG_UART=y
  CONFIG_SYS_LOAD_ADDR=0x22000000
+CONFIG_DEBUG_UART=y
  CONFIG_BOOTDELAY=3
  CONFIG_USE_BOOTARGS=y
  CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/mtdblock0 mtdparts=atmel_nand:-(root) rw rootfstype=jffs2"
diff --git a/configs/at91sam9g10ek_dataflash_cs3_defconfig b/configs/at91sam9g10ek_dataflash_cs3_defconfig

index 6a12b0517d60777c09e98bfd834d3bf098c245d2..733823b04a572cc5cf126063358de30f6a638a64 100644 (file)
--- a/configs/at91sam9g10ek_dataflash_cs3_defconfig
+++ b/configs/at91sam9g10ek_dataflash_cs3_defconfig
@@ -16,8 +16,8 @@ CONFIG_DEFAULT_DEVICE_TREE="at91sam9261ek"
  CONFIG_DEBUG_UART_BOARD_INIT=y
  CONFIG_DEBUG_UART_BASE=0xfffff200
  CONFIG_DEBUG_UART_CLOCK=100000000
-CONFIG_DEBUG_UART=y
  CONFIG_SYS_LOAD_ADDR=0x22000000
+CONFIG_DEBUG_UART=y
  CONFIG_BOOTDELAY=3
  CONFIG_USE_BOOTARGS=y
  CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/mtdblock0 mtdparts=atmel_nand:-(root) rw rootfstype=jffs2"
diff --git a/configs/at91sam9g10ek_nandflash_defconfig b/configs/at91sam9g10ek_nandflash_defconfig

index 9b3274e443ce696f25de92920022ea215ddb5fbb..90fb18ae32ddf7b31e47fcdc36ce168514b64092 100644 (file)
--- a/configs/at91sam9g10ek_nandflash_defconfig
+++ b/configs/at91sam9g10ek_nandflash_defconfig
@@ -14,8 +14,8 @@ CONFIG_DEBUG_UART_BOARD_INIT=y
  CONFIG_DEBUG_UART_BASE=0xfffff200
  CONFIG_DEBUG_UART_CLOCK=100000000
  CONFIG_ENV_OFFSET_REDUND=0x100000
-CONFIG_DEBUG_UART=y
  CONFIG_SYS_LOAD_ADDR=0x22000000
+CONFIG_DEBUG_UART=y
  CONFIG_NAND_BOOT=y
  CONFIG_BOOTDELAY=3
  CONFIG_USE_BOOTARGS=y
diff --git a/configs/at91sam9g20ek_2mmc_defconfig b/configs/at91sam9g20ek_2mmc_defconfig

index c341b3673d2f7a53b3ee9fb8e26283740c0176c4..4b1eb775a3d556b834444e59856b9a925fcefacf 100644 (file)
--- a/configs/at91sam9g20ek_2mmc_defconfig
+++ b/configs/at91sam9g20ek_2mmc_defconfig
@@ -17,8 +17,8 @@ CONFIG_DEFAULT_DEVICE_TREE="at91sam9g20ek_2mmc"
  CONFIG_DEBUG_UART_BOARD_INIT=y
  CONFIG_DEBUG_UART_BASE=0xfffff200
  CONFIG_DEBUG_UART_CLOCK=132000000
-CONFIG_DEBUG_UART=y
  CONFIG_SYS_LOAD_ADDR=0x22000000
+CONFIG_DEBUG_UART=y
  CONFIG_SD_BOOT=y
  CONFIG_BOOTDELAY=3
  CONFIG_USE_BOOTARGS=y
diff --git a/configs/at91sam9g20ek_2mmc_nandflash_defconfig b/configs/at91sam9g20ek_2mmc_nandflash_defconfig

index e8bdae14e9022226456635555b5a543917b15916..db2eaf9c17774a3dcfa5108103bd58fe0dcef547 100644 (file)
--- a/configs/at91sam9g20ek_2mmc_nandflash_defconfig
+++ b/configs/at91sam9g20ek_2mmc_nandflash_defconfig
@@ -16,8 +16,8 @@ CONFIG_DEBUG_UART_BOARD_INIT=y
  CONFIG_DEBUG_UART_BASE=0xfffff200
  CONFIG_DEBUG_UART_CLOCK=132000000
  CONFIG_ENV_OFFSET_REDUND=0x100000
-CONFIG_DEBUG_UART=y
  CONFIG_SYS_LOAD_ADDR=0x22000000
+CONFIG_DEBUG_UART=y
  CONFIG_NAND_BOOT=y
  CONFIG_BOOTDELAY=3
  CONFIG_USE_BOOTARGS=y
diff --git a/configs/at91sam9g20ek_dataflash_cs0_defconfig b/configs/at91sam9g20ek_dataflash_cs0_defconfig

index 4b508cb7560bd1b82307f9c66434e0db0add1b47..a4968b0088b932cd02df3ac7abf9ddbb0384db64 100644 (file)
--- a/configs/at91sam9g20ek_dataflash_cs0_defconfig
+++ b/configs/at91sam9g20ek_dataflash_cs0_defconfig
@@ -17,8 +17,8 @@ CONFIG_DEFAULT_DEVICE_TREE="at91sam9g20ek"
  CONFIG_DEBUG_UART_BOARD_INIT=y
  CONFIG_DEBUG_UART_BASE=0xfffff200
  CONFIG_DEBUG_UART_CLOCK=132000000
-CONFIG_DEBUG_UART=y
  CONFIG_SYS_LOAD_ADDR=0x22000000
+CONFIG_DEBUG_UART=y
  CONFIG_BOOTDELAY=3
  CONFIG_USE_BOOTARGS=y
  CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/mtdblock0 mtdparts=atmel_nand:-(root) rw rootfstype=jffs2"
diff --git a/configs/at91sam9g20ek_dataflash_cs1_defconfig b/configs/at91sam9g20ek_dataflash_cs1_defconfig

index 17aefe408b232157d82e883e029b0e821bf9da54..f694345f56379b4fcd2155b86a446fca87722681 100644 (file)
--- a/configs/at91sam9g20ek_dataflash_cs1_defconfig
+++ b/configs/at91sam9g20ek_dataflash_cs1_defconfig
@@ -17,8 +17,8 @@ CONFIG_DEFAULT_DEVICE_TREE="at91sam9g20ek"
  CONFIG_DEBUG_UART_BOARD_INIT=y
  CONFIG_DEBUG_UART_BASE=0xfffff200
  CONFIG_DEBUG_UART_CLOCK=132000000
-CONFIG_DEBUG_UART=y
  CONFIG_SYS_LOAD_ADDR=0x22000000
+CONFIG_DEBUG_UART=y
  CONFIG_BOOTDELAY=3
  CONFIG_USE_BOOTARGS=y
  CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/mtdblock0 mtdparts=atmel_nand:-(root) rw rootfstype=jffs2"
diff --git a/configs/at91sam9g20ek_nandflash_defconfig b/configs/at91sam9g20ek_nandflash_defconfig

index e73af995511eb511df89e93556dd6cbd9aba6772..3bb109902701c9326ad07b205abfadc02971d18e 100644 (file)
--- a/configs/at91sam9g20ek_nandflash_defconfig
+++ b/configs/at91sam9g20ek_nandflash_defconfig
@@ -15,8 +15,8 @@ CONFIG_DEBUG_UART_BOARD_INIT=y
  CONFIG_DEBUG_UART_BASE=0xfffff200
  CONFIG_DEBUG_UART_CLOCK=132000000
  CONFIG_ENV_OFFSET_REDUND=0x100000
-CONFIG_DEBUG_UART=y
  CONFIG_SYS_LOAD_ADDR=0x22000000
+CONFIG_DEBUG_UART=y
  CONFIG_NAND_BOOT=y
  CONFIG_BOOTDELAY=3
  CONFIG_USE_BOOTARGS=y
diff --git a/configs/at91sam9m10g45ek_mmc_defconfig b/configs/at91sam9m10g45ek_mmc_defconfig

index 1f17336e9436d613c58d26e32b7d821b99e81757..eff93612b469154d65c2d67dbcf78d7684a83528 100644 (file)
--- a/configs/at91sam9m10g45ek_mmc_defconfig
+++ b/configs/at91sam9m10g45ek_mmc_defconfig
@@ -13,8 +13,8 @@ CONFIG_DEFAULT_DEVICE_TREE="at91sam9m10g45ek"
  CONFIG_DEBUG_UART_BOARD_INIT=y
  CONFIG_DEBUG_UART_BASE=0xffffee00
  CONFIG_DEBUG_UART_CLOCK=132000000
-CONFIG_DEBUG_UART=y
  CONFIG_SYS_LOAD_ADDR=0x22000000
+CONFIG_DEBUG_UART=y
  CONFIG_SD_BOOT=y
  CONFIG_BOOTDELAY=3
  CONFIG_USE_BOOTARGS=y
diff --git a/configs/at91sam9m10g45ek_nandflash_defconfig b/configs/at91sam9m10g45ek_nandflash_defconfig

index c595b9edadf39372754a09e5a33d62dc85353b75..2ce8a35c8aa2e683fbaebfbba9adb567e8420f5c 100644 (file)
--- a/configs/at91sam9m10g45ek_nandflash_defconfig
+++ b/configs/at91sam9m10g45ek_nandflash_defconfig
@@ -13,8 +13,8 @@ CONFIG_DEBUG_UART_BOARD_INIT=y
  CONFIG_DEBUG_UART_BASE=0xffffee00
  CONFIG_DEBUG_UART_CLOCK=132000000
  CONFIG_ENV_OFFSET_REDUND=0x100000
-CONFIG_DEBUG_UART=y
  CONFIG_SYS_LOAD_ADDR=0x22000000
+CONFIG_DEBUG_UART=y
  CONFIG_NAND_BOOT=y
  CONFIG_BOOTDELAY=3
  CONFIG_USE_BOOTARGS=y
diff --git a/configs/at91sam9n12ek_mmc_defconfig b/configs/at91sam9n12ek_mmc_defconfig

index b84f924a5d987bfcc34e3b81cda9aa4d87ba3e3c..6726774655caab37367dba6abaf75ff6c9674a2e 100644 (file)
--- a/configs/at91sam9n12ek_mmc_defconfig
+++ b/configs/at91sam9n12ek_mmc_defconfig
@@ -11,8 +11,8 @@ CONFIG_DEFAULT_DEVICE_TREE="at91sam9n12ek"
  CONFIG_DEBUG_UART_BOARD_INIT=y
  CONFIG_DEBUG_UART_BASE=0xfffff200
  CONFIG_DEBUG_UART_CLOCK=132000000
-CONFIG_DEBUG_UART=y
  CONFIG_SYS_LOAD_ADDR=0x22000000
+CONFIG_DEBUG_UART=y
  CONFIG_SD_BOOT=y
  CONFIG_BOOTDELAY=3
  CONFIG_USE_BOOTCOMMAND=y
diff --git a/configs/at91sam9n12ek_nandflash_defconfig b/configs/at91sam9n12ek_nandflash_defconfig

index b5964deb661dd7b5f3233a0cebda8fca4e05354b..81d2ac9cd3fb20de6ab10ecd5257daae6387c4c6 100644 (file)
--- a/configs/at91sam9n12ek_nandflash_defconfig
+++ b/configs/at91sam9n12ek_nandflash_defconfig
@@ -11,8 +11,8 @@ CONFIG_DEBUG_UART_BOARD_INIT=y
  CONFIG_DEBUG_UART_BASE=0xfffff200
  CONFIG_DEBUG_UART_CLOCK=132000000
  CONFIG_ENV_OFFSET_REDUND=0x100000
-CONFIG_DEBUG_UART=y
  CONFIG_SYS_LOAD_ADDR=0x22000000
+CONFIG_DEBUG_UART=y
  CONFIG_NAND_BOOT=y
  CONFIG_BOOTDELAY=3
  CONFIG_USE_BOOTCOMMAND=y
diff --git a/configs/at91sam9n12ek_spiflash_defconfig b/configs/at91sam9n12ek_spiflash_defconfig

index 852d6354d3ca11047a81f33e851f3e8b8a0b22fa..ead19aabf7ff3a688aa678c7a43b71b5dcfb122b 100644 (file)
--- a/configs/at91sam9n12ek_spiflash_defconfig
+++ b/configs/at91sam9n12ek_spiflash_defconfig
@@ -13,8 +13,8 @@ CONFIG_DEFAULT_DEVICE_TREE="at91sam9n12ek"
  CONFIG_DEBUG_UART_BOARD_INIT=y
  CONFIG_DEBUG_UART_BASE=0xfffff200
  CONFIG_DEBUG_UART_CLOCK=132000000
-CONFIG_DEBUG_UART=y
  CONFIG_SYS_LOAD_ADDR=0x22000000
+CONFIG_DEBUG_UART=y
  CONFIG_SPI_BOOT=y
  CONFIG_BOOTDELAY=3
  CONFIG_USE_BOOTCOMMAND=y
diff --git a/configs/at91sam9rlek_dataflash_defconfig b/configs/at91sam9rlek_dataflash_defconfig

index 796bf5c6585f919ae0798015ea8d3144f44b9489..b3598a35d190102e434d28cade6d176bce47d2f1 100644 (file)
--- a/configs/at91sam9rlek_dataflash_defconfig
+++ b/configs/at91sam9rlek_dataflash_defconfig
@@ -16,8 +16,8 @@ CONFIG_DEFAULT_DEVICE_TREE="at91sam9rlek"
  CONFIG_DEBUG_UART_BOARD_INIT=y
  CONFIG_DEBUG_UART_BASE=0xfffff200
  CONFIG_DEBUG_UART_CLOCK=100000000
-CONFIG_DEBUG_UART=y
  CONFIG_SYS_LOAD_ADDR=0x22000000
+CONFIG_DEBUG_UART=y
  CONFIG_BOOTDELAY=3
  CONFIG_USE_BOOTARGS=y
  CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/mtdblock0 mtdparts=atmel_nand:-(root) rw rootfstype=jffs2"
diff --git a/configs/at91sam9rlek_mmc_defconfig b/configs/at91sam9rlek_mmc_defconfig

index 69d97acaccc1eccbd9e3cd616366a1d1f677bb27..8e1693d5b75921cf20277ed0a3d157dad258c667 100644 (file)
--- a/configs/at91sam9rlek_mmc_defconfig
+++ b/configs/at91sam9rlek_mmc_defconfig
@@ -14,8 +14,8 @@ CONFIG_DEFAULT_DEVICE_TREE="at91sam9rlek"
  CONFIG_DEBUG_UART_BOARD_INIT=y
  CONFIG_DEBUG_UART_BASE=0xfffff200
  CONFIG_DEBUG_UART_CLOCK=100000000
-CONFIG_DEBUG_UART=y
  CONFIG_SYS_LOAD_ADDR=0x22000000
+CONFIG_DEBUG_UART=y
  CONFIG_SD_BOOT=y
  CONFIG_BOOTDELAY=3
  CONFIG_USE_BOOTARGS=y
diff --git a/configs/at91sam9rlek_nandflash_defconfig b/configs/at91sam9rlek_nandflash_defconfig

index 1547275619d92bbd059af3691d14db7e697a1c23..90b5e1b5ed55100d47148a78cbae4154091db567 100644 (file)
--- a/configs/at91sam9rlek_nandflash_defconfig
+++ b/configs/at91sam9rlek_nandflash_defconfig
@@ -14,8 +14,8 @@ CONFIG_DEBUG_UART_BOARD_INIT=y
  CONFIG_DEBUG_UART_BASE=0xfffff200
  CONFIG_DEBUG_UART_CLOCK=100000000
  CONFIG_ENV_OFFSET_REDUND=0x100000
-CONFIG_DEBUG_UART=y
  CONFIG_SYS_LOAD_ADDR=0x22000000
+CONFIG_DEBUG_UART=y
  CONFIG_NAND_BOOT=y
  CONFIG_BOOTDELAY=3
  CONFIG_USE_BOOTARGS=y
diff --git a/configs/at91sam9x5ek_dataflash_defconfig b/configs/at91sam9x5ek_dataflash_defconfig

index 7aaf21199d8f63f839158607b408a27c97f431cb..72f3ca5ac3ed2083edf7fc96c4ac8286a906089e 100644 (file)
--- a/configs/at91sam9x5ek_dataflash_defconfig
+++ b/configs/at91sam9x5ek_dataflash_defconfig
@@ -15,8 +15,8 @@ CONFIG_DEFAULT_DEVICE_TREE="at91sam9g35ek"
  CONFIG_DEBUG_UART_BOARD_INIT=y
  CONFIG_DEBUG_UART_BASE=0xfffff200
  CONFIG_DEBUG_UART_CLOCK=132000000
-CONFIG_DEBUG_UART=y
  CONFIG_SYS_LOAD_ADDR=0x22000000
+CONFIG_DEBUG_UART=y
  CONFIG_FIT=y
  CONFIG_BOOTDELAY=3
  CONFIG_USE_BOOTARGS=y
diff --git a/configs/at91sam9x5ek_mmc_defconfig b/configs/at91sam9x5ek_mmc_defconfig

index 5922f6c0f5106522f1c4d873889731b2a08143ae..98ca47bf606b3de33b4b0b8e11bfb20c3128654a 100644 (file)
--- a/configs/at91sam9x5ek_mmc_defconfig
+++ b/configs/at91sam9x5ek_mmc_defconfig
@@ -13,8 +13,8 @@ CONFIG_DEFAULT_DEVICE_TREE="at91sam9g35ek"
  CONFIG_DEBUG_UART_BOARD_INIT=y
  CONFIG_DEBUG_UART_BASE=0xfffff200
  CONFIG_DEBUG_UART_CLOCK=132000000
-CONFIG_DEBUG_UART=y
  CONFIG_SYS_LOAD_ADDR=0x22000000
+CONFIG_DEBUG_UART=y
  CONFIG_FIT=y
  CONFIG_SD_BOOT=y
  CONFIG_BOOTDELAY=3
diff --git a/configs/at91sam9x5ek_nandflash_defconfig b/configs/at91sam9x5ek_nandflash_defconfig

index 91a654d2589104bf5c8f88754315027ee47f79a3..a46d897024ea59f623b95f0eaa10e7455ea430c4 100644 (file)
--- a/configs/at91sam9x5ek_nandflash_defconfig
+++ b/configs/at91sam9x5ek_nandflash_defconfig
@@ -13,8 +13,8 @@ CONFIG_DEBUG_UART_BOARD_INIT=y
  CONFIG_DEBUG_UART_BASE=0xfffff200
  CONFIG_DEBUG_UART_CLOCK=132000000
  CONFIG_ENV_OFFSET_REDUND=0x100000
-CONFIG_DEBUG_UART=y
  CONFIG_SYS_LOAD_ADDR=0x22000000
+CONFIG_DEBUG_UART=y
  CONFIG_FIT=y
  CONFIG_NAND_BOOT=y
  CONFIG_BOOTDELAY=3
diff --git a/configs/at91sam9x5ek_spiflash_defconfig b/configs/at91sam9x5ek_spiflash_defconfig

index 59b010d0d858bafc871036ffa090fbf97c08f5d1..ea099f24b7ae44c76202e09af2bef0e57ef86e53 100644 (file)
--- a/configs/at91sam9x5ek_spiflash_defconfig
+++ b/configs/at91sam9x5ek_spiflash_defconfig
@@ -15,8 +15,8 @@ CONFIG_DEFAULT_DEVICE_TREE="at91sam9g35ek"
  CONFIG_DEBUG_UART_BOARD_INIT=y
  CONFIG_DEBUG_UART_BASE=0xfffff200
  CONFIG_DEBUG_UART_CLOCK=132000000
-CONFIG_DEBUG_UART=y
  CONFIG_SYS_LOAD_ADDR=0x22000000
+CONFIG_DEBUG_UART=y
  CONFIG_FIT=y
  CONFIG_SPI_BOOT=y
  CONFIG_BOOTDELAY=3
diff --git a/configs/at91sam9xeek_dataflash_cs0_defconfig b/configs/at91sam9xeek_dataflash_cs0_defconfig

index 2193c072de2a5af3743637df6e0c37ad358c809f..03a85d2a0b224febf8245ce73bd2edfc1ea43a0a 100644 (file)
--- a/configs/at91sam9xeek_dataflash_cs0_defconfig
+++ b/configs/at91sam9xeek_dataflash_cs0_defconfig
@@ -17,8 +17,8 @@ CONFIG_DEFAULT_DEVICE_TREE="at91sam9260ek"
  CONFIG_DEBUG_UART_BOARD_INIT=y
  CONFIG_DEBUG_UART_BASE=0xfffff200
  CONFIG_DEBUG_UART_CLOCK=132000000
-CONFIG_DEBUG_UART=y
  CONFIG_SYS_LOAD_ADDR=0x22000000
+CONFIG_DEBUG_UART=y
  CONFIG_BOOTDELAY=3
  CONFIG_USE_BOOTARGS=y
  CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/mtdblock0 mtdparts=atmel_nand:-(root) rw rootfstype=jffs2"
diff --git a/configs/at91sam9xeek_dataflash_cs1_defconfig b/configs/at91sam9xeek_dataflash_cs1_defconfig

index 25fc63d9cb747cbcbebeec77c0ea0a2479433c2f..178cf92fe34fc205fca36736f543b9782b8a38ac 100644 (file)
--- a/configs/at91sam9xeek_dataflash_cs1_defconfig
+++ b/configs/at91sam9xeek_dataflash_cs1_defconfig
@@ -17,8 +17,8 @@ CONFIG_DEFAULT_DEVICE_TREE="at91sam9260ek"
  CONFIG_DEBUG_UART_BOARD_INIT=y
  CONFIG_DEBUG_UART_BASE=0xfffff200
  CONFIG_DEBUG_UART_CLOCK=132000000
-CONFIG_DEBUG_UART=y
  CONFIG_SYS_LOAD_ADDR=0x22000000
+CONFIG_DEBUG_UART=y
  CONFIG_BOOTDELAY=3
  CONFIG_USE_BOOTARGS=y
  CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/mtdblock0 mtdparts=atmel_nand:-(root) rw rootfstype=jffs2"
diff --git a/configs/at91sam9xeek_nandflash_defconfig b/configs/at91sam9xeek_nandflash_defconfig

index 644a950ceae7ca79aa6316e2cd2ef6063c7157cc..376e28a9e6ad8ed7679036975a2a1cb6fa1949d8 100644 (file)
--- a/configs/at91sam9xeek_nandflash_defconfig
+++ b/configs/at91sam9xeek_nandflash_defconfig
@@ -15,8 +15,8 @@ CONFIG_DEBUG_UART_BOARD_INIT=y
  CONFIG_DEBUG_UART_BASE=0xfffff200
  CONFIG_DEBUG_UART_CLOCK=132000000
  CONFIG_ENV_OFFSET_REDUND=0x100000
-CONFIG_DEBUG_UART=y
  CONFIG_SYS_LOAD_ADDR=0x22000000
+CONFIG_DEBUG_UART=y
  CONFIG_NAND_BOOT=y
  CONFIG_BOOTDELAY=3
  CONFIG_USE_BOOTARGS=y
diff --git a/configs/avnet_ultrazedev_cc_v1_0_ultrazedev_som_v1_0_defconfig b/configs/avnet_ultrazedev_cc_v1_0_ultrazedev_som_v1_0_defconfig

index a7a7922a6130fc59c9dce4221dbb55e178434fc2..f27d92ab7852bb8ceb7c97275e8e420b60e406a2 100644 (file)
--- a/configs/avnet_ultrazedev_cc_v1_0_ultrazedev_som_v1_0_defconfig
+++ b/configs/avnet_ultrazedev_cc_v1_0_ultrazedev_som_v1_0_defconfig
@@ -13,12 +13,12 @@ CONFIG_SPL_SPI=y
  CONFIG_ZYNQ_MAC_IN_EEPROM=y
  CONFIG_ZYNQ_GEM_I2C_MAC_OFFSET=0xfa
  CONFIG_ZYNQMP_PSU_INIT_ENABLED=y
+CONFIG_SYS_LOAD_ADDR=0x8000000
  CONFIG_DEBUG_UART=y
  CONFIG_SYS_MEMTEST_START=0x00000000
  CONFIG_SYS_MEMTEST_END=0x00001000
  CONFIG_DISTRO_DEFAULTS=y
  CONFIG_REMAKE_ELF=y
-CONFIG_SYS_LOAD_ADDR=0x8000000
  CONFIG_FIT=y
  CONFIG_FIT_VERBOSE=y
  CONFIG_SPL_LOAD_FIT=y
diff --git a/configs/axm_defconfig b/configs/axm_defconfig

index 910c98a44c84d7471069589f734172578e8a9c89..a673cb63d1521fbbd20e43c7392c4d05fa612605 100644 (file)
--- a/configs/axm_defconfig
+++ b/configs/axm_defconfig
@@ -28,8 +28,8 @@ CONFIG_DEBUG_UART_CLOCK=18432000
  CONFIG_ENV_OFFSET_REDUND=0x180000
  CONFIG_SPL_SPI_FLASH_SUPPORT=y
  CONFIG_SPL_SPI=y
-CONFIG_DEBUG_UART=y
  CONFIG_SYS_LOAD_ADDR=0x22000000
+CONFIG_DEBUG_UART=y
  CONFIG_NAND_BOOT=y
  CONFIG_BOOTDELAY=3
  CONFIG_USE_BOOTCOMMAND=y
diff --git a/configs/axs101_defconfig b/configs/axs101_defconfig

index ff2e5e4b246303ab165df0adc268775969a6de44..f73fc1f615a22071a7fab504b20ddfb810060086 100644 (file)
--- a/configs/axs101_defconfig
+++ b/configs/axs101_defconfig
@@ -7,8 +7,8 @@ CONFIG_DEFAULT_DEVICE_TREE="axs101"
  CONFIG_DEBUG_UART_BASE=0xe0022000
  CONFIG_DEBUG_UART_CLOCK=33333333
  CONFIG_SYS_CLK_FREQ=750000000
-CONFIG_DEBUG_UART=y
  CONFIG_SYS_LOAD_ADDR=0x82000000
+CONFIG_DEBUG_UART=y
  CONFIG_BOOTDELAY=3
  CONFIG_USE_BOOTARGS=y
  CONFIG_BOOTARGS="console=ttyS3,115200n8"
diff --git a/configs/axs103_defconfig b/configs/axs103_defconfig

index 82bac6266021ba7fb30f5b9918a7959eb466f9ca..d838c8cc01f6893ca1d74ce2af5c2e36b44ef030 100644 (file)
--- a/configs/axs103_defconfig
+++ b/configs/axs103_defconfig
@@ -7,8 +7,8 @@ CONFIG_DEFAULT_DEVICE_TREE="axs103"
  CONFIG_DEBUG_UART_BASE=0xe0022000
  CONFIG_DEBUG_UART_CLOCK=33333333
  CONFIG_SYS_CLK_FREQ=100000000
-CONFIG_DEBUG_UART=y
  CONFIG_SYS_LOAD_ADDR=0x82000000
+CONFIG_DEBUG_UART=y
  CONFIG_BOOTDELAY=3
  CONFIG_USE_BOOTARGS=y
  CONFIG_BOOTARGS="console=ttyS3,115200n8"
diff --git a/configs/bananapi-m5_defconfig b/configs/bananapi-m5_defconfig

index e61cc90c7cba018816e1faa26bf9498612f74e97..798564e1730cbdd402a723304c719303535af0ea 100644 (file)
--- a/configs/bananapi-m5_defconfig
+++ b/configs/bananapi-m5_defconfig
@@ -9,9 +9,9 @@ CONFIG_MESON_G12A=y
  CONFIG_DEBUG_UART_BASE=0xff803000
  CONFIG_DEBUG_UART_CLOCK=24000000
  CONFIG_IDENT_STRING="bpi-m5"
+CONFIG_SYS_LOAD_ADDR=0x1000000
  CONFIG_DEBUG_UART=y
  CONFIG_REMAKE_ELF=y
-CONFIG_SYS_LOAD_ADDR=0x1000000
  CONFIG_OF_BOARD_SETUP=y
  # CONFIG_DISPLAY_CPUINFO is not set
  CONFIG_MISC_INIT_R=y
diff --git a/configs/bcm963158_ram_defconfig b/configs/bcm963158_ram_defconfig

index 4b3cb3a07fc8e0650ff85482a20283c07f71041b..642faf511f5aa6d33c2951952454be9272f1a8ac 100644 (file)
--- a/configs/bcm963158_ram_defconfig
+++ b/configs/bcm963158_ram_defconfig
@@ -9,9 +9,9 @@ CONFIG_NR_DRAM_BANKS=1
  CONFIG_ENV_SIZE=0x2000
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="bcm963158"
+CONFIG_SYS_LOAD_ADDR=0x10000000
  CONFIG_TARGET_BCM963158=y
  CONFIG_ENV_VARS_UBOOT_CONFIG=y
-CONFIG_SYS_LOAD_ADDR=0x10000000
  CONFIG_FIT=y
  CONFIG_FIT_SIGNATURE=y
  CONFIG_FIT_RSASSA_PSS=y
diff --git a/configs/bcm96753ref_ram_defconfig b/configs/bcm96753ref_ram_defconfig

index 2c4408313a98674ec0b5f6ffd3f3eae19f933a09..9a72c75000bd7d03aa85bc392dc7cdcd647e535f 100644 (file)
--- a/configs/bcm96753ref_ram_defconfig
+++ b/configs/bcm96753ref_ram_defconfig
@@ -10,9 +10,9 @@ CONFIG_ENV_SIZE=0x20000
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="bcm96753ref"
  CONFIG_ARMV7_LPAE=y
+CONFIG_SYS_LOAD_ADDR=0x1000000
  CONFIG_TARGET_BCM96753REF=y
  CONFIG_ENV_VARS_UBOOT_CONFIG=y
-CONFIG_SYS_LOAD_ADDR=0x1000000
  CONFIG_FIT=y
  CONFIG_FIT_SIGNATURE=y
  CONFIG_FIT_CIPHER=y
diff --git a/configs/bcm968360bg_ram_defconfig b/configs/bcm968360bg_ram_defconfig

index 22d26772aee421a197454b281e700963e57a4ece..cde18125633bca4bc991cf312ed7ec5a2f18d300 100644 (file)
--- a/configs/bcm968360bg_ram_defconfig
+++ b/configs/bcm968360bg_ram_defconfig
@@ -8,9 +8,9 @@ CONFIG_NR_DRAM_BANKS=1
  CONFIG_ENV_SIZE=0x2000
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="bcm968360bg"
+CONFIG_SYS_LOAD_ADDR=0x10000000
  CONFIG_TARGET_BCM968360BG=y
  CONFIG_ENV_VARS_UBOOT_CONFIG=y
-CONFIG_SYS_LOAD_ADDR=0x10000000
  CONFIG_FIT=y
  CONFIG_FIT_SIGNATURE=y
  CONFIG_FIT_VERBOSE=y
diff --git a/configs/bcm968380gerg_ram_defconfig b/configs/bcm968380gerg_ram_defconfig

index 95cce92e9263e000e40d6bdec5b5a1963a2a674d..b6181a2e10e9bdf40c890b1473b5ec57eeadd976 100644 (file)
--- a/configs/bcm968380gerg_ram_defconfig
+++ b/configs/bcm968380gerg_ram_defconfig
@@ -5,6 +5,7 @@ CONFIG_NR_DRAM_BANKS=1
  CONFIG_ENV_SIZE=0x2000
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="brcm,bcm968380gerg"
+CONFIG_SYS_LOAD_ADDR=0x80100000
  CONFIG_ARCH_BMIPS=y
  CONFIG_SOC_BMIPS_BCM6838=y
  CONFIG_MIPS_CACHE_SETUP=y
@@ -13,7 +14,6 @@ CONFIG_MIPS_CACHE_DISABLE=y
  # CONFIG_MIPS_BOOT_ENV_LEGACY is not set
  CONFIG_MIPS_BOOT_FDT=y
  # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
-CONFIG_SYS_LOAD_ADDR=0x80100000
  CONFIG_OF_STDOUT_VIA_ALIAS=y
  CONFIG_DISPLAY_CPUINFO=y
  CONFIG_HUSH_PARSER=y
diff --git a/configs/bcm968580xref_ram_defconfig b/configs/bcm968580xref_ram_defconfig

index 003920526c029dbfa13471b086bab01904fb4f72..d1a17c758fc8b98885f2ea6e8e85428830151eee 100644 (file)
--- a/configs/bcm968580xref_ram_defconfig
+++ b/configs/bcm968580xref_ram_defconfig
@@ -8,9 +8,9 @@ CONFIG_NR_DRAM_BANKS=1
  CONFIG_ENV_SIZE=0x2000
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="bcm968580xref"
+CONFIG_SYS_LOAD_ADDR=0x10000000
  CONFIG_TARGET_BCM968580XREF=y
  CONFIG_ENV_VARS_UBOOT_CONFIG=y
-CONFIG_SYS_LOAD_ADDR=0x10000000
  CONFIG_FIT=y
  CONFIG_FIT_SIGNATURE=y
  CONFIG_FIT_VERBOSE=y
diff --git a/configs/beelink-gsking-x_defconfig b/configs/beelink-gsking-x_defconfig

index 178afa61ab3fb2526fffbaa2e15b99b63fcf68a3..841a482602f5cd985f0dd5179946cb1bcc250de8 100644 (file)
--- a/configs/beelink-gsking-x_defconfig
+++ b/configs/beelink-gsking-x_defconfig
@@ -10,9 +10,9 @@ CONFIG_MESON_G12A=y
  CONFIG_DEBUG_UART_BASE=0xff803000
  CONFIG_DEBUG_UART_CLOCK=24000000
  CONFIG_IDENT_STRING=" beelink"
+CONFIG_SYS_LOAD_ADDR=0x1000000
  CONFIG_DEBUG_UART=y
  CONFIG_REMAKE_ELF=y
-CONFIG_SYS_LOAD_ADDR=0x1000000
  CONFIG_OF_BOARD_SETUP=y
  # CONFIG_DISPLAY_CPUINFO is not set
  CONFIG_MISC_INIT_R=y
diff --git a/configs/beelink-gtking_defconfig b/configs/beelink-gtking_defconfig

index 4d6aaa542664d6f0cb044e8a97ddbc818919e3c5..f0500411c704d2f35dcfaef8cf5b90590b5e8491 100644 (file)
--- a/configs/beelink-gtking_defconfig
+++ b/configs/beelink-gtking_defconfig
@@ -10,9 +10,9 @@ CONFIG_MESON_G12A=y
  CONFIG_DEBUG_UART_BASE=0xff803000
  CONFIG_DEBUG_UART_CLOCK=24000000
  CONFIG_IDENT_STRING=" beelink"
+CONFIG_SYS_LOAD_ADDR=0x1000000
  CONFIG_DEBUG_UART=y
  CONFIG_REMAKE_ELF=y
-CONFIG_SYS_LOAD_ADDR=0x1000000
  CONFIG_OF_BOARD_SETUP=y
  # CONFIG_DISPLAY_CPUINFO is not set
  CONFIG_MISC_INIT_R=y
diff --git a/configs/beelink-gtkingpro_defconfig b/configs/beelink-gtkingpro_defconfig

index 65dab874a838a941c736c9c5561f08e715c5fc85..86c1d3f67346390ab66efbcee179ff8ec127c1fa 100644 (file)
--- a/configs/beelink-gtkingpro_defconfig
+++ b/configs/beelink-gtkingpro_defconfig
@@ -10,9 +10,9 @@ CONFIG_MESON_G12A=y
  CONFIG_DEBUG_UART_BASE=0xff803000
  CONFIG_DEBUG_UART_CLOCK=24000000
  CONFIG_IDENT_STRING=" beelink"
+CONFIG_SYS_LOAD_ADDR=0x1000000
  CONFIG_DEBUG_UART=y
  CONFIG_REMAKE_ELF=y
-CONFIG_SYS_LOAD_ADDR=0x1000000
  CONFIG_OF_BOARD_SETUP=y
  # CONFIG_DISPLAY_CPUINFO is not set
  CONFIG_MISC_INIT_R=y
diff --git a/configs/bitmain_antminer_s9_defconfig b/configs/bitmain_antminer_s9_defconfig

index 9775ee19737876642c40aedd9b5d8fd6567fb909..721deb37ea23823ee9b8ecd718a6691ca1599012 100644 (file)
--- a/configs/bitmain_antminer_s9_defconfig
+++ b/configs/bitmain_antminer_s9_defconfig
@@ -14,11 +14,11 @@ CONFIG_SYS_BOOTCOUNT_ADDR=0xEFFFFF0
  CONFIG_SPL=y
  CONFIG_DEBUG_UART_BASE=0xe0001000
  CONFIG_DEBUG_UART_CLOCK=50000000
+CONFIG_SYS_LOAD_ADDR=0x0
  CONFIG_DEBUG_UART=y
  CONFIG_REMAKE_ELF=y
  CONFIG_SYS_CUSTOM_LDSCRIPT=y
  CONFIG_SYS_LDSCRIPT="arch/arm/mach-zynq/u-boot.lds"
-CONFIG_SYS_LOAD_ADDR=0x0
  CONFIG_FIT=y
  CONFIG_FIT_SIGNATURE=y
  CONFIG_FIT_VERBOSE=y
diff --git a/configs/bk4r1_defconfig b/configs/bk4r1_defconfig

index d00333995a46e2301f99cef72510e990f50a363d..324a80e4af15b50c9811f4530f07181999d4e1e5 100644 (file)
--- a/configs/bk4r1_defconfig
+++ b/configs/bk4r1_defconfig
@@ -15,11 +15,11 @@ CONFIG_SYS_BOOTCOUNT_ADDR=0x4006e02c
  CONFIG_SYS_BOOTCOUNT_SINGLEWORD=y
  CONFIG_ENV_OFFSET_REDUND=0x220000
  CONFIG_TARGET_BK4R1=y
+CONFIG_SYS_LOAD_ADDR=0x82000000
  CONFIG_SYS_MEMTEST_START=0x80010000
  CONFIG_SYS_MEMTEST_END=0x87c00000
  CONFIG_HAS_BOARD_SIZE_LIMIT=y
  CONFIG_BOARD_SIZE_LIMIT=520192
-CONFIG_SYS_LOAD_ADDR=0x82000000
  CONFIG_FIT=y
  CONFIG_BOOTDELAY=3
  CONFIG_AUTOBOOT_KEYED=y
diff --git a/configs/blanche_defconfig b/configs/blanche_defconfig

index 82d54debb3dbf8851a0f3641baa11c4666865bcc..1ab40d617ab2e4dcb522f967277ac1d0cd4d1f7e 100644 (file)
--- a/configs/blanche_defconfig
+++ b/configs/blanche_defconfig
@@ -15,6 +15,7 @@ CONFIG_ARCH_RMOBILE_BOARD_STRING="Blanche"
  CONFIG_R8A7792=y
  CONFIG_TARGET_BLANCHE=y
  CONFIG_SYS_LOAD_ADDR=0x50000000
+CONFIG_ENV_ADDR=0x40000
  CONFIG_FIT=y
  CONFIG_BOOTDELAY=3
  CONFIG_HUSH_PARSER=y
@@ -41,7 +42,6 @@ CONFIG_OF_CONTROL=y
  CONFIG_ENV_OVERWRITE=y
  CONFIG_ENV_IS_IN_FLASH=y
  CONFIG_ENV_IS_IN_SPI_FLASH=y
-CONFIG_ENV_ADDR=0x40000
  CONFIG_VERSION_VARIABLE=y
  CONFIG_CLK=y
  CONFIG_CLK_RENESAS=y
diff --git a/configs/boston32r2_defconfig b/configs/boston32r2_defconfig

index 10b60c4f5930d0abead9c555f1ec0487d601516a..a4991c6450aa63bb4d13d619f9da267996b643c0 100644 (file)
--- a/configs/boston32r2_defconfig
+++ b/configs/boston32r2_defconfig
@@ -4,6 +4,8 @@ CONFIG_SYS_MALLOC_LEN=0x40000
  CONFIG_ENV_SIZE=0x20000
  CONFIG_ENV_SECT_SIZE=0x20000
  CONFIG_DEFAULT_DEVICE_TREE="img,boston"
+CONFIG_SYS_LOAD_ADDR=0x88000000
+CONFIG_ENV_ADDR=0xBFFE0000
  CONFIG_TARGET_BOSTON=y
  # CONFIG_MIPS_BOOT_CMDLINE_LEGACY is not set
  # CONFIG_MIPS_BOOT_ENV_LEGACY is not set
@@ -11,7 +13,6 @@ CONFIG_MIPS_BOOT_FDT=y
  CONFIG_SYS_MEMTEST_START=0x80000000
  CONFIG_SYS_MEMTEST_END=0x90000000
  CONFIG_DISTRO_DEFAULTS=y
-CONFIG_SYS_LOAD_ADDR=0x88000000
  CONFIG_FIT=y
  CONFIG_FIT_VERBOSE=y
  CONFIG_FIT_BEST_MATCH=y
@@ -31,7 +32,6 @@ CONFIG_CMD_EXT4_WRITE=y
  # CONFIG_DOS_PARTITION is not set
  # CONFIG_ISO_PARTITION is not set
  CONFIG_ENV_IS_IN_FLASH=y
-CONFIG_ENV_ADDR=0xBFFE0000
  CONFIG_NET_RANDOM_ETHADDR=y
  CONFIG_CLK=y
  CONFIG_MTD=y
diff --git a/configs/boston32r2el_defconfig b/configs/boston32r2el_defconfig

index 91e0d2d74b391c93c29b2d2658afbd6feae032f5..44716be702516ce7822a1fe1cbcb212ea4569650 100644 (file)
--- a/configs/boston32r2el_defconfig
+++ b/configs/boston32r2el_defconfig
@@ -4,6 +4,8 @@ CONFIG_SYS_MALLOC_LEN=0x40000
  CONFIG_ENV_SIZE=0x20000
  CONFIG_ENV_SECT_SIZE=0x20000
  CONFIG_DEFAULT_DEVICE_TREE="img,boston"
+CONFIG_SYS_LOAD_ADDR=0x88000000
+CONFIG_ENV_ADDR=0xBFFE0000
  CONFIG_TARGET_BOSTON=y
  CONFIG_SYS_LITTLE_ENDIAN=y
  # CONFIG_MIPS_BOOT_CMDLINE_LEGACY is not set
@@ -12,7 +14,6 @@ CONFIG_MIPS_BOOT_FDT=y
  CONFIG_SYS_MEMTEST_START=0x80000000
  CONFIG_SYS_MEMTEST_END=0x90000000
  CONFIG_DISTRO_DEFAULTS=y
-CONFIG_SYS_LOAD_ADDR=0x88000000
  CONFIG_FIT=y
  CONFIG_FIT_VERBOSE=y
  CONFIG_FIT_BEST_MATCH=y
@@ -32,7 +33,6 @@ CONFIG_CMD_EXT4_WRITE=y
  # CONFIG_DOS_PARTITION is not set
  # CONFIG_ISO_PARTITION is not set
  CONFIG_ENV_IS_IN_FLASH=y
-CONFIG_ENV_ADDR=0xBFFE0000
  CONFIG_NET_RANDOM_ETHADDR=y
  CONFIG_CLK=y
  CONFIG_MTD=y
diff --git a/configs/boston32r6_defconfig b/configs/boston32r6_defconfig

index 3e1d57310b3439e1ddefd33c3109dea3ad765f39..d001ee93204181aa8790daac2e5d812da52b66a5 100644 (file)
--- a/configs/boston32r6_defconfig
+++ b/configs/boston32r6_defconfig
@@ -4,6 +4,8 @@ CONFIG_SYS_MALLOC_LEN=0x40000
  CONFIG_ENV_SIZE=0x20000
  CONFIG_ENV_SECT_SIZE=0x20000
  CONFIG_DEFAULT_DEVICE_TREE="img,boston"
+CONFIG_SYS_LOAD_ADDR=0x88000000
+CONFIG_ENV_ADDR=0xBFFE0000
  CONFIG_TARGET_BOSTON=y
  CONFIG_CPU_MIPS32_R6=y
  # CONFIG_MIPS_BOOT_CMDLINE_LEGACY is not set
@@ -12,7 +14,6 @@ CONFIG_MIPS_BOOT_FDT=y
  CONFIG_SYS_MEMTEST_START=0x80000000
  CONFIG_SYS_MEMTEST_END=0x90000000
  CONFIG_DISTRO_DEFAULTS=y
-CONFIG_SYS_LOAD_ADDR=0x88000000
  CONFIG_FIT=y
  CONFIG_FIT_VERBOSE=y
  CONFIG_FIT_BEST_MATCH=y
@@ -32,7 +33,6 @@ CONFIG_CMD_EXT4_WRITE=y
  # CONFIG_DOS_PARTITION is not set
  # CONFIG_ISO_PARTITION is not set
  CONFIG_ENV_IS_IN_FLASH=y
-CONFIG_ENV_ADDR=0xBFFE0000
  CONFIG_NET_RANDOM_ETHADDR=y
  CONFIG_CLK=y
  CONFIG_MTD=y
diff --git a/configs/boston32r6el_defconfig b/configs/boston32r6el_defconfig

index 7f7933eb329c5231df57dc8b19ef29307c98d77a..a95a4b58f5a15daafdc36849f85892a5d47435f3 100644 (file)
--- a/configs/boston32r6el_defconfig
+++ b/configs/boston32r6el_defconfig
@@ -4,6 +4,8 @@ CONFIG_SYS_MALLOC_LEN=0x40000
  CONFIG_ENV_SIZE=0x20000
  CONFIG_ENV_SECT_SIZE=0x20000
  CONFIG_DEFAULT_DEVICE_TREE="img,boston"
+CONFIG_SYS_LOAD_ADDR=0x88000000
+CONFIG_ENV_ADDR=0xBFFE0000
  CONFIG_TARGET_BOSTON=y
  CONFIG_SYS_LITTLE_ENDIAN=y
  CONFIG_CPU_MIPS32_R6=y
@@ -13,7 +15,6 @@ CONFIG_MIPS_BOOT_FDT=y
  CONFIG_SYS_MEMTEST_START=0x80000000
  CONFIG_SYS_MEMTEST_END=0x90000000
  CONFIG_DISTRO_DEFAULTS=y
-CONFIG_SYS_LOAD_ADDR=0x88000000
  CONFIG_FIT=y
  CONFIG_FIT_VERBOSE=y
  CONFIG_FIT_BEST_MATCH=y
@@ -33,7 +34,6 @@ CONFIG_CMD_EXT4_WRITE=y
  # CONFIG_DOS_PARTITION is not set
  # CONFIG_ISO_PARTITION is not set
  CONFIG_ENV_IS_IN_FLASH=y
-CONFIG_ENV_ADDR=0xBFFE0000
  CONFIG_NET_RANDOM_ETHADDR=y
  CONFIG_CLK=y
  CONFIG_MTD=y
diff --git a/configs/boston64r2_defconfig b/configs/boston64r2_defconfig

index 1c06dbea4e4aaa9ba214f492161d9914733eef07..0d50ce57c7640f1d1f58df77a9d26a654d231029 100644 (file)
--- a/configs/boston64r2_defconfig
+++ b/configs/boston64r2_defconfig
@@ -4,6 +4,8 @@ CONFIG_SYS_MALLOC_LEN=0x40000
  CONFIG_ENV_SIZE=0x20000
  CONFIG_ENV_SECT_SIZE=0x20000
  CONFIG_DEFAULT_DEVICE_TREE="img,boston"
+CONFIG_SYS_LOAD_ADDR=0xffffffff88000000
+CONFIG_ENV_ADDR=0xFFFFFFFFBFFE0000
  CONFIG_TARGET_BOSTON=y
  CONFIG_CPU_MIPS64_R2=y
  # CONFIG_MIPS_BOOT_CMDLINE_LEGACY is not set
@@ -12,7 +14,6 @@ CONFIG_MIPS_BOOT_FDT=y
  CONFIG_SYS_MEMTEST_START=0x80000000
  CONFIG_SYS_MEMTEST_END=0x90000000
  CONFIG_DISTRO_DEFAULTS=y
-CONFIG_SYS_LOAD_ADDR=0xffffffff88000000
  CONFIG_FIT=y
  CONFIG_FIT_VERBOSE=y
  CONFIG_FIT_BEST_MATCH=y
@@ -32,7 +33,6 @@ CONFIG_CMD_EXT4_WRITE=y
  # CONFIG_DOS_PARTITION is not set
  # CONFIG_ISO_PARTITION is not set
  CONFIG_ENV_IS_IN_FLASH=y
-CONFIG_ENV_ADDR=0xFFFFFFFFBFFE0000
  CONFIG_NET_RANDOM_ETHADDR=y
  CONFIG_CLK=y
  CONFIG_MTD=y
diff --git a/configs/boston64r2el_defconfig b/configs/boston64r2el_defconfig

index eb6e4bf9c0a5bf33005aa90fe59fde7a3f8f35fa..0546f5d578b99ee6876802ecc272154ccd1fe40b 100644 (file)
--- a/configs/boston64r2el_defconfig
+++ b/configs/boston64r2el_defconfig
@@ -4,6 +4,8 @@ CONFIG_SYS_MALLOC_LEN=0x40000
  CONFIG_ENV_SIZE=0x20000
  CONFIG_ENV_SECT_SIZE=0x20000
  CONFIG_DEFAULT_DEVICE_TREE="img,boston"
+CONFIG_SYS_LOAD_ADDR=0xffffffff88000000
+CONFIG_ENV_ADDR=0xFFFFFFFFBFFE0000
  CONFIG_TARGET_BOSTON=y
  CONFIG_SYS_LITTLE_ENDIAN=y
  CONFIG_CPU_MIPS64_R2=y
@@ -13,7 +15,6 @@ CONFIG_MIPS_BOOT_FDT=y
  CONFIG_SYS_MEMTEST_START=0x80000000
  CONFIG_SYS_MEMTEST_END=0x90000000
  CONFIG_DISTRO_DEFAULTS=y
-CONFIG_SYS_LOAD_ADDR=0xffffffff88000000
  CONFIG_FIT=y
  CONFIG_FIT_VERBOSE=y
  CONFIG_FIT_BEST_MATCH=y
@@ -33,7 +34,6 @@ CONFIG_CMD_EXT4_WRITE=y
  # CONFIG_DOS_PARTITION is not set
  # CONFIG_ISO_PARTITION is not set
  CONFIG_ENV_IS_IN_FLASH=y
-CONFIG_ENV_ADDR=0xFFFFFFFFBFFE0000
  CONFIG_NET_RANDOM_ETHADDR=y
  CONFIG_CLK=y
  CONFIG_MTD=y
diff --git a/configs/boston64r6_defconfig b/configs/boston64r6_defconfig

index d141b2cda8e61fcd072e7856a368583d39e550c0..98e940f0e52055173ab846645546314697d50276 100644 (file)
--- a/configs/boston64r6_defconfig
+++ b/configs/boston64r6_defconfig
@@ -4,6 +4,8 @@ CONFIG_SYS_MALLOC_LEN=0x40000
  CONFIG_ENV_SIZE=0x20000
  CONFIG_ENV_SECT_SIZE=0x20000
  CONFIG_DEFAULT_DEVICE_TREE="img,boston"
+CONFIG_SYS_LOAD_ADDR=0xffffffff88000000
+CONFIG_ENV_ADDR=0xFFFFFFFFBFFE0000
  CONFIG_TARGET_BOSTON=y
  CONFIG_CPU_MIPS64_R6=y
  # CONFIG_MIPS_BOOT_CMDLINE_LEGACY is not set
@@ -12,7 +14,6 @@ CONFIG_MIPS_BOOT_FDT=y
  CONFIG_SYS_MEMTEST_START=0x80000000
  CONFIG_SYS_MEMTEST_END=0x90000000
  CONFIG_DISTRO_DEFAULTS=y
-CONFIG_SYS_LOAD_ADDR=0xffffffff88000000
  CONFIG_FIT=y
  CONFIG_FIT_VERBOSE=y
  CONFIG_FIT_BEST_MATCH=y
@@ -32,7 +33,6 @@ CONFIG_CMD_EXT4_WRITE=y
  # CONFIG_DOS_PARTITION is not set
  # CONFIG_ISO_PARTITION is not set
  CONFIG_ENV_IS_IN_FLASH=y
-CONFIG_ENV_ADDR=0xFFFFFFFFBFFE0000
  CONFIG_NET_RANDOM_ETHADDR=y
  CONFIG_CLK=y
  CONFIG_MTD=y
diff --git a/configs/boston64r6el_defconfig b/configs/boston64r6el_defconfig

index 60c5a620de3059a9966160ebc5aadaf45953e46f..e6998ec66036e2ebb1fd80014cdf12f5ede51969 100644 (file)
--- a/configs/boston64r6el_defconfig
+++ b/configs/boston64r6el_defconfig
@@ -4,6 +4,8 @@ CONFIG_SYS_MALLOC_LEN=0x40000
  CONFIG_ENV_SIZE=0x20000
  CONFIG_ENV_SECT_SIZE=0x20000
  CONFIG_DEFAULT_DEVICE_TREE="img,boston"
+CONFIG_SYS_LOAD_ADDR=0xffffffff88000000
+CONFIG_ENV_ADDR=0xFFFFFFFFBFFE0000
  CONFIG_TARGET_BOSTON=y
  CONFIG_SYS_LITTLE_ENDIAN=y
  CONFIG_CPU_MIPS64_R6=y
@@ -13,7 +15,6 @@ CONFIG_MIPS_BOOT_FDT=y
  CONFIG_SYS_MEMTEST_START=0x80000000
  CONFIG_SYS_MEMTEST_END=0x90000000
  CONFIG_DISTRO_DEFAULTS=y
-CONFIG_SYS_LOAD_ADDR=0xffffffff88000000
  CONFIG_FIT=y
  CONFIG_FIT_VERBOSE=y
  CONFIG_FIT_BEST_MATCH=y
@@ -33,7 +34,6 @@ CONFIG_CMD_EXT4_WRITE=y
  # CONFIG_DOS_PARTITION is not set
  # CONFIG_ISO_PARTITION is not set
  CONFIG_ENV_IS_IN_FLASH=y
-CONFIG_ENV_ADDR=0xFFFFFFFFBFFE0000
  CONFIG_NET_RANDOM_ETHADDR=y
  CONFIG_CLK=y
  CONFIG_MTD=y
diff --git a/configs/brppt1_mmc_defconfig b/configs/brppt1_mmc_defconfig

index 1c72c79c3d19ce38e0409dc6d852a6da8d0ca83c..dac5f25a01513899021bbb4c13f6e3288762ec13 100644 (file)
--- a/configs/brppt1_mmc_defconfig
+++ b/configs/brppt1_mmc_defconfig
@@ -16,8 +16,8 @@ CONFIG_SPL_MMC=y
  CONFIG_SPL_SERIAL=y
  CONFIG_SPL=y
  CONFIG_ENV_OFFSET_REDUND=0x50000
-# CONFIG_EXPERT is not set
  CONFIG_SYS_LOAD_ADDR=0x80000000
+# CONFIG_EXPERT is not set
  # CONFIG_FIT is not set
  CONFIG_OF_BOARD_SETUP=y
  CONFIG_BOOTDELAY=0
diff --git a/configs/brppt1_nand_defconfig b/configs/brppt1_nand_defconfig

index 267cdf41b6eb510d0348b7893d8c5603b173315f..08496e794a6337bbcfaa2805aaa48255753cd7c5 100644 (file)
--- a/configs/brppt1_nand_defconfig
+++ b/configs/brppt1_nand_defconfig
@@ -14,8 +14,8 @@ CONFIG_AM33XX=y
  CONFIG_TARGET_BRPPT1=y
  CONFIG_SPL_SERIAL=y
  CONFIG_SPL=y
-# CONFIG_EXPERT is not set
  CONFIG_SYS_LOAD_ADDR=0x80000000
+# CONFIG_EXPERT is not set
  # CONFIG_FIT is not set
  CONFIG_OF_BOARD_SETUP=y
  CONFIG_BOOTDELAY=0
diff --git a/configs/brppt1_spi_defconfig b/configs/brppt1_spi_defconfig

index e39294f6bff4d61124b5ce00e724312b9abd33a5..972f166fced099167e0734294e057d20d2f4ea43 100644 (file)
--- a/configs/brppt1_spi_defconfig
+++ b/configs/brppt1_spi_defconfig
@@ -19,8 +19,8 @@ CONFIG_SPL=y
  CONFIG_ENV_OFFSET_REDUND=0x30000
  CONFIG_SPL_SPI_FLASH_SUPPORT=y
  CONFIG_SPL_SPI=y
-# CONFIG_EXPERT is not set
  CONFIG_SYS_LOAD_ADDR=0x80000000
+# CONFIG_EXPERT is not set
  # CONFIG_FIT is not set
  CONFIG_OF_BOARD_SETUP=y
  CONFIG_SPI_BOOT=y
diff --git a/configs/brppt2_defconfig b/configs/brppt2_defconfig

index 38eedb4de48da016d53cf4090a0fad28dc5cd8e5..ab767ab737ef07973d4ceea26a3a39e2b5ae13b2 100644 (file)
--- a/configs/brppt2_defconfig
+++ b/configs/brppt2_defconfig
@@ -23,8 +23,8 @@ CONFIG_SYS_BOOTCOUNT_SINGLEWORD=y
  CONFIG_SPL_SPI_FLASH_SUPPORT=y
  CONFIG_SPL_SPI=y
  # CONFIG_CMD_BMODE is not set
-# CONFIG_EXPERT is not set
  CONFIG_SYS_LOAD_ADDR=0x10700000
+# CONFIG_EXPERT is not set
  CONFIG_OF_BOARD_SETUP=y
  CONFIG_SPI_BOOT=y
  CONFIG_BOOTDELAY=0
diff --git a/configs/brsmarc1_defconfig b/configs/brsmarc1_defconfig

index 8e8f471a7043fb81bc41ca8a0a10661baf6dcb9d..ca96d171cb7cfcb9e36b2b74e2bcd3223aa20b3c 100644 (file)
--- a/configs/brsmarc1_defconfig
+++ b/configs/brsmarc1_defconfig
@@ -20,8 +20,8 @@ CONFIG_SPL=y
  CONFIG_ENV_OFFSET_REDUND=0x30000
  CONFIG_SPL_SPI_FLASH_SUPPORT=y
  CONFIG_SPL_SPI=y
-# CONFIG_EXPERT is not set
  CONFIG_SYS_LOAD_ADDR=0x80000000
+# CONFIG_EXPERT is not set
  # CONFIG_FIT is not set
  CONFIG_OF_BOARD_SETUP=y
  CONFIG_BOOTDELAY=0
diff --git a/configs/brxre1_defconfig b/configs/brxre1_defconfig

index e1c81d1cdfd4e9958898ce36b23534a0d574c209..534f5ee77cd6617dd249faf75c4e3e2d8a349ce9 100644 (file)
--- a/configs/brxre1_defconfig
+++ b/configs/brxre1_defconfig
@@ -17,8 +17,8 @@ CONFIG_SPL_SERIAL=y
  CONFIG_SPL_SYS_MALLOC_F_LEN=0x4000
  CONFIG_SPL=y
  CONFIG_ENV_OFFSET_REDUND=0x50000
-# CONFIG_EXPERT is not set
  CONFIG_SYS_LOAD_ADDR=0x80000000
+# CONFIG_EXPERT is not set
  # CONFIG_FIT is not set
  CONFIG_OF_BOARD_SETUP=y
  CONFIG_BOOTDELAY=0
diff --git a/configs/bubblegum_96_defconfig b/configs/bubblegum_96_defconfig

index 4ba6c009d78fabdb8fda6e4504119fdbe703ec67..f4e6abc4110bb0fd7fc7bf82f79f549fcac8cf5f 100644 (file)
--- a/configs/bubblegum_96_defconfig
+++ b/configs/bubblegum_96_defconfig
@@ -5,8 +5,8 @@ CONFIG_ENV_SIZE=0x2000
  CONFIG_DEFAULT_DEVICE_TREE="bubblegum_96"
  CONFIG_MACH_S900=y
  CONFIG_IDENT_STRING="\nBubblegum-96"
-CONFIG_DISTRO_DEFAULTS=y
  CONFIG_SYS_LOAD_ADDR=0x7ffc0
+CONFIG_DISTRO_DEFAULTS=y
  CONFIG_BOOTDELAY=5
  CONFIG_USE_BOOTARGS=y
  CONFIG_BOOTARGS="console=ttyOWL5,115200n8"
diff --git a/configs/cgtqmx8_defconfig b/configs/cgtqmx8_defconfig

index 54b2d20c6167e27f1a3e77993ae83453574f17e3..094cb41c038cc87f5c17f4a7abe9a52b79f2f3ae 100644 (file)
--- a/configs/cgtqmx8_defconfig
+++ b/configs/cgtqmx8_defconfig
@@ -17,8 +17,8 @@ CONFIG_SPL_MMC=y
  CONFIG_SPL_SERIAL=y
  CONFIG_SPL_DRIVERS_MISC=y
  CONFIG_SPL=y
-CONFIG_REMAKE_ELF=y
  CONFIG_SYS_LOAD_ADDR=0x80280000
+CONFIG_REMAKE_ELF=y
  CONFIG_FIT=y
  CONFIG_SPL_LOAD_FIT=y
  CONFIG_SPL_FIT_GENERATOR="arch/arm/mach-imx/mkimage_fit_atf.sh"
diff --git a/configs/chromebit_mickey_defconfig b/configs/chromebit_mickey_defconfig

index 091b060c5bb09f31a94e4cf62b501c822c12bd3f..b6456b431ef34ac305918d6fc2aabb6046057191 100644 (file)
--- a/configs/chromebit_mickey_defconfig
+++ b/configs/chromebit_mickey_defconfig
@@ -15,9 +15,9 @@ CONFIG_DEBUG_UART_BASE=0xff690000
  CONFIG_DEBUG_UART_CLOCK=24000000
  CONFIG_SPL_SPI_FLASH_SUPPORT=y
  CONFIG_SPL_SPI=y
+CONFIG_SYS_LOAD_ADDR=0x800800
  CONFIG_SPL_PAYLOAD="u-boot.img"
  CONFIG_DEBUG_UART=y
-CONFIG_SYS_LOAD_ADDR=0x800800
  CONFIG_USE_PREBOOT=y
  CONFIG_DEFAULT_FDT_FILE="rk3288-veyron-mickey.dtb"
  # CONFIG_DISPLAY_CPUINFO is not set
diff --git a/configs/chromebook_bob_defconfig b/configs/chromebook_bob_defconfig

index 3366e76e78c99f5b26d26d2c54b99a6e23f2cb8a..638c65d79a9ac59602770fe306ade70e2c5812e8 100644 (file)
--- a/configs/chromebook_bob_defconfig
+++ b/configs/chromebook_bob_defconfig
@@ -15,8 +15,8 @@ CONFIG_DEBUG_UART_BASE=0xff1a0000
  CONFIG_DEBUG_UART_CLOCK=24000000
  CONFIG_SPL_SPI_FLASH_SUPPORT=y
  CONFIG_SPL_SPI=y
-CONFIG_DEBUG_UART=y
  CONFIG_SYS_LOAD_ADDR=0x800800
+CONFIG_DEBUG_UART=y
  CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-gru-bob.dtb"
  # CONFIG_DISPLAY_CPUINFO is not set
  CONFIG_DISPLAY_BOARDINFO_LATE=y
diff --git a/configs/chromebook_jerry_defconfig b/configs/chromebook_jerry_defconfig

index 521795dc6603651c174bb3b81e9473edac26ac00..5e23e96ecae12d62b9aaa90546fe54788f5fa5eb 100644 (file)
--- a/configs/chromebook_jerry_defconfig
+++ b/configs/chromebook_jerry_defconfig
@@ -14,9 +14,9 @@ CONFIG_DEBUG_UART_BASE=0xff690000
  CONFIG_DEBUG_UART_CLOCK=24000000
  CONFIG_SPL_SPI_FLASH_SUPPORT=y
  CONFIG_SPL_SPI=y
+CONFIG_SYS_LOAD_ADDR=0x800800
  CONFIG_SPL_PAYLOAD="u-boot.img"
  CONFIG_DEBUG_UART=y
-CONFIG_SYS_LOAD_ADDR=0x800800
  CONFIG_USE_PREBOOT=y
  CONFIG_DEFAULT_FDT_FILE="rk3288-veyron-jerry.dtb"
  CONFIG_SILENT_CONSOLE=y
diff --git a/configs/chromebook_kevin_defconfig b/configs/chromebook_kevin_defconfig

index 2fa0fb90a640c088074cce9b1687dab155228e59..38c1403b994112ed31d6d9e49ec1b5d22b39b043 100644 (file)
--- a/configs/chromebook_kevin_defconfig
+++ b/configs/chromebook_kevin_defconfig
@@ -16,8 +16,8 @@ CONFIG_DEBUG_UART_BASE=0xff1a0000
  CONFIG_DEBUG_UART_CLOCK=24000000
  CONFIG_SPL_SPI_FLASH_SUPPORT=y
  CONFIG_SPL_SPI=y
-CONFIG_DEBUG_UART=y
  CONFIG_SYS_LOAD_ADDR=0x800800
+CONFIG_DEBUG_UART=y
  CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-gru-kevin.dtb"
  # CONFIG_DISPLAY_CPUINFO is not set
  CONFIG_DISPLAY_BOARDINFO_LATE=y
diff --git a/configs/chromebook_minnie_defconfig b/configs/chromebook_minnie_defconfig

index 41a9e7f37a35d179fd6e3b9473353b802407fc61..a347ae96bfccd020fe702752d45e887fb3d71274 100644 (file)
--- a/configs/chromebook_minnie_defconfig
+++ b/configs/chromebook_minnie_defconfig
@@ -15,9 +15,9 @@ CONFIG_DEBUG_UART_BASE=0xff690000
  CONFIG_DEBUG_UART_CLOCK=24000000
  CONFIG_SPL_SPI_FLASH_SUPPORT=y
  CONFIG_SPL_SPI=y
+CONFIG_SYS_LOAD_ADDR=0x800800
  CONFIG_SPL_PAYLOAD="u-boot.img"
  CONFIG_DEBUG_UART=y
-CONFIG_SYS_LOAD_ADDR=0x800800
  CONFIG_USE_PREBOOT=y
  CONFIG_DEFAULT_FDT_FILE="rk3288-veyron-minnie.dtb"
  CONFIG_SILENT_CONSOLE=y
diff --git a/configs/chromebook_speedy_defconfig b/configs/chromebook_speedy_defconfig

index 03dfc6825ab78d9f4354563490ae1f983df50dfe..9ff423fe991c9ea878b2136470bc912b217691f6 100644 (file)
--- a/configs/chromebook_speedy_defconfig
+++ b/configs/chromebook_speedy_defconfig
@@ -15,9 +15,9 @@ CONFIG_DEBUG_UART_BASE=0xff690000
  CONFIG_DEBUG_UART_CLOCK=24000000
  CONFIG_SPL_SPI_FLASH_SUPPORT=y
  CONFIG_SPL_SPI=y
+CONFIG_SYS_LOAD_ADDR=0x800800
  CONFIG_SPL_PAYLOAD="u-boot.img"
  CONFIG_DEBUG_UART=y
-CONFIG_SYS_LOAD_ADDR=0x800800
  CONFIG_USE_PREBOOT=y
  CONFIG_DEFAULT_FDT_FILE="rk3288-veyron-speedy.dtb"
  CONFIG_SILENT_CONSOLE=y
diff --git a/configs/ci20_mmc_defconfig b/configs/ci20_mmc_defconfig

index 962215701560ee26d4d50743ab85537aa6019bd7..ed1ca2c7cdb44d9b8b84238cf429563a6d1cc951 100644 (file)
--- a/configs/ci20_mmc_defconfig
+++ b/configs/ci20_mmc_defconfig
@@ -12,8 +12,8 @@ CONFIG_DEFAULT_DEVICE_TREE="ci20"
  CONFIG_SPL_TEXT_BASE=0xf4000a00
  CONFIG_SPL_MMC=y
  CONFIG_SPL=y
-CONFIG_ARCH_JZ47XX=y
  CONFIG_SYS_LOAD_ADDR=0x81000000
+CONFIG_ARCH_JZ47XX=y
  CONFIG_FIT=y
  CONFIG_USE_BOOTARGS=y
  CONFIG_BOOTARGS="console=ttyS4,115200 rw rootwait root=/dev/mmcblk0p1"
diff --git a/configs/clearfog_defconfig b/configs/clearfog_defconfig

index 5a97ef563f815bd463509fba543a2195f3fec555..e7910db084aa0a2e4ad42261d4a6273ad053394f 100644 (file)
--- a/configs/clearfog_defconfig
+++ b/configs/clearfog_defconfig
@@ -16,10 +16,10 @@ CONFIG_SPL_SERIAL=y
  CONFIG_SPL=y
  CONFIG_DEBUG_UART_BASE=0xd0012000
  CONFIG_DEBUG_UART_CLOCK=250000000
+CONFIG_SYS_LOAD_ADDR=0x800000
  CONFIG_DEBUG_UART=y
  CONFIG_AHCI=y
  CONFIG_DISTRO_DEFAULTS=y
-CONFIG_SYS_LOAD_ADDR=0x800000
  CONFIG_BOOTDELAY=3
  CONFIG_USE_PREBOOT=y
  CONFIG_SYS_CONSOLE_INFO_QUIET=y
diff --git a/configs/clearfog_gt_8k_defconfig b/configs/clearfog_gt_8k_defconfig

index f5c960b9654130ee58e1def777619c2bfc484b3b..cb34f0164ae74a4e998c20b8565512f4a5a014d2 100644 (file)
--- a/configs/clearfog_gt_8k_defconfig
+++ b/configs/clearfog_gt_8k_defconfig
@@ -12,11 +12,11 @@ CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="armada-8040-clearfog-gt-8k"
  CONFIG_DEBUG_UART_BASE=0xf0512000
  CONFIG_DEBUG_UART_CLOCK=200000000
+CONFIG_SYS_LOAD_ADDR=0x800000
  CONFIG_DEBUG_UART=y
  CONFIG_AHCI=y
  CONFIG_DISTRO_DEFAULTS=y
  # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
-CONFIG_SYS_LOAD_ADDR=0x800000
  CONFIG_USE_PREBOOT=y
  CONFIG_SYS_CONSOLE_INFO_QUIET=y
  # CONFIG_DISPLAY_CPUINFO is not set
diff --git a/configs/cobra5272_defconfig b/configs/cobra5272_defconfig

index 54a1a8f6d04857871bdd3842be8017e11aa2976e..eacfc661433900ea7c7da51d1d7072a79434f2e0 100644 (file)
--- a/configs/cobra5272_defconfig
+++ b/configs/cobra5272_defconfig
@@ -4,9 +4,10 @@ CONFIG_SYS_MALLOC_LEN=0x40000
  CONFIG_ENV_SIZE=0x2000
  CONFIG_ENV_SECT_SIZE=0x2000
  CONFIG_DEFAULT_DEVICE_TREE="cobra5272"
+CONFIG_SYS_LOAD_ADDR=0x20000
+CONFIG_ENV_ADDR=0xFFE04000
  CONFIG_TARGET_COBRA5272=y
  CONFIG_MCFTMR=y
-CONFIG_SYS_LOAD_ADDR=0x20000
  CONFIG_SYS_MONITOR_BASE=0xFFE00400
  CONFIG_BOOTDELAY=5
  # CONFIG_DISPLAY_BOARDINFO is not set
@@ -19,7 +20,6 @@ CONFIG_CMD_IMLS=y
  # CONFIG_CMD_SETEXPR is not set
  CONFIG_BOOTP_BOOTFILESIZE=y
  CONFIG_CMD_PING=y
-CONFIG_ENV_ADDR=0xFFE04000
  CONFIG_SYS_RELOC_GD_ENV_ADDR=y
  CONFIG_SYS_FAULT_ECHO_LINK_DOWN=y
  CONFIG_SYS_RX_ETH_BUFFER=8
diff --git a/configs/colibri-imx8x_defconfig b/configs/colibri-imx8x_defconfig

index 1f6456eb4f1c4b21cdb8648affd4445abfe42654..80bc27b1881fa095f3ce6e40daec5e79a331529e 100644 (file)
--- a/configs/colibri-imx8x_defconfig
+++ b/configs/colibri-imx8x_defconfig
@@ -9,11 +9,11 @@ CONFIG_ENV_OFFSET=0xFFFFDE00
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="fsl-imx8qxp-colibri"
  CONFIG_TARGET_COLIBRI_IMX8X=y
+CONFIG_SYS_LOAD_ADDR=0x80280000
  CONFIG_SYS_MEMTEST_START=0x88000000
  CONFIG_SYS_MEMTEST_END=0x89000000
  CONFIG_DISTRO_DEFAULTS=y
  CONFIG_REMAKE_ELF=y
-CONFIG_SYS_LOAD_ADDR=0x80280000
  CONFIG_FIT=y
  CONFIG_LOG=y
  # CONFIG_DISPLAY_BOARDINFO is not set
diff --git a/configs/colibri_pxa270_defconfig b/configs/colibri_pxa270_defconfig

index e629c318576aec2b77c93ae622cc15b3e64964c7..9ce65861046c9e7b878722b35df32d4792229d35 100644 (file)
--- a/configs/colibri_pxa270_defconfig
+++ b/configs/colibri_pxa270_defconfig
@@ -8,10 +8,11 @@ CONFIG_SYS_MALLOC_F_LEN=0x2000
  CONFIG_NR_DRAM_BANKS=1
  CONFIG_ENV_SIZE=0x40000
  CONFIG_ENV_SECT_SIZE=0x40000
+CONFIG_SYS_LOAD_ADDR=0xa0000000
+CONFIG_ENV_ADDR=0x80000
  CONFIG_ENV_VARS_UBOOT_CONFIG=y
  CONFIG_HAS_BOARD_SIZE_LIMIT=y
  CONFIG_BOARD_SIZE_LIMIT=262144
-CONFIG_SYS_LOAD_ADDR=0xa0000000
  CONFIG_TIMESTAMP=y
  CONFIG_SYS_MONITOR_BASE=0x00000000
  CONFIG_USE_BOOTARGS=y
@@ -40,7 +41,6 @@ CONFIG_CMD_EXT2=y
  CONFIG_CMD_FAT=y
  CONFIG_ENV_OVERWRITE=y
  CONFIG_ENV_IS_IN_FLASH=y
-CONFIG_ENV_ADDR=0x80000
  CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
  CONFIG_NET_RETRY_COUNT=10
  CONFIG_DM=y
diff --git a/configs/colibri_vf_defconfig b/configs/colibri_vf_defconfig

index 43d8023426d0aecfd9b8799c34e5ae891629d0d3..44f370f57d756611db769c41dfe324c3430acf9e 100644 (file)
--- a/configs/colibri_vf_defconfig
+++ b/configs/colibri_vf_defconfig
@@ -11,12 +11,12 @@ CONFIG_ENV_OFFSET=0x180000
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="vf610-colibri"
  CONFIG_TARGET_COLIBRI_VF=y
+CONFIG_SYS_LOAD_ADDR=0x80008000
  CONFIG_SYS_MEMTEST_START=0x80010000
  CONFIG_SYS_MEMTEST_END=0x87c00000
  CONFIG_ENV_VARS_UBOOT_CONFIG=y
  CONFIG_HAS_BOARD_SIZE_LIMIT=y
  CONFIG_BOARD_SIZE_LIMIT=520192
-CONFIG_SYS_LOAD_ADDR=0x80008000
  CONFIG_BOOTDELAY=1
  CONFIG_USE_BOOTCOMMAND=y
  CONFIG_BOOTCOMMAND="run ubiboot || run distro_bootcmd;"
diff --git a/configs/comtrend_ar5315u_ram_defconfig b/configs/comtrend_ar5315u_ram_defconfig

index 9268aea02ab17bff40976b2ad92edad5b4e96d56..b2eb24d2e8081c56f9f3b3fa52e4eab465f9b2e5 100644 (file)
--- a/configs/comtrend_ar5315u_ram_defconfig
+++ b/configs/comtrend_ar5315u_ram_defconfig
@@ -5,6 +5,7 @@ CONFIG_NR_DRAM_BANKS=1
  CONFIG_ENV_SIZE=0x2000
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="comtrend,ar-5315u"
+CONFIG_SYS_LOAD_ADDR=0x80100000
  CONFIG_ARCH_BMIPS=y
  CONFIG_SOC_BMIPS_BCM6318=y
  CONFIG_MIPS_CACHE_SETUP=y
@@ -14,7 +15,6 @@ CONFIG_MIPS_CACHE_DISABLE=y
  CONFIG_MIPS_BOOT_FDT=y
  # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
  CONFIG_REMAKE_ELF=y
-CONFIG_SYS_LOAD_ADDR=0x80100000
  CONFIG_OF_STDOUT_VIA_ALIAS=y
  CONFIG_DISPLAY_CPUINFO=y
  CONFIG_HUSH_PARSER=y
diff --git a/configs/comtrend_ar5387un_ram_defconfig b/configs/comtrend_ar5387un_ram_defconfig

index 9d2fc0cbf1c3603ef5aefc84117c5fc5f6c3b8b5..bebb4b299813e67b3554f7e1a58cb31f0f9f2ced 100644 (file)
--- a/configs/comtrend_ar5387un_ram_defconfig
+++ b/configs/comtrend_ar5387un_ram_defconfig
@@ -5,6 +5,7 @@ CONFIG_NR_DRAM_BANKS=1
  CONFIG_ENV_SIZE=0x2000
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="comtrend,ar-5387un"
+CONFIG_SYS_LOAD_ADDR=0x80100000
  CONFIG_ARCH_BMIPS=y
  CONFIG_SOC_BMIPS_BCM6328=y
  CONFIG_MIPS_CACHE_SETUP=y
@@ -14,7 +15,6 @@ CONFIG_MIPS_CACHE_DISABLE=y
  CONFIG_MIPS_BOOT_FDT=y
  # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
  CONFIG_REMAKE_ELF=y
-CONFIG_SYS_LOAD_ADDR=0x80100000
  CONFIG_OF_STDOUT_VIA_ALIAS=y
  CONFIG_DISPLAY_CPUINFO=y
  CONFIG_HUSH_PARSER=y
diff --git a/configs/comtrend_ct5361_ram_defconfig b/configs/comtrend_ct5361_ram_defconfig

index ddb12508bf803bd367f05f21dd603614c6e1f300..a2011b9663e8fa41ef895c8eb57f3b479b3297d3 100644 (file)
--- a/configs/comtrend_ct5361_ram_defconfig
+++ b/configs/comtrend_ct5361_ram_defconfig
@@ -5,6 +5,7 @@ CONFIG_NR_DRAM_BANKS=1
  CONFIG_ENV_SIZE=0x2000
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="comtrend,ct-5361"
+CONFIG_SYS_LOAD_ADDR=0x80100000
  CONFIG_ARCH_BMIPS=y
  CONFIG_SOC_BMIPS_BCM6348=y
  CONFIG_MIPS_CACHE_SETUP=y
@@ -14,7 +15,6 @@ CONFIG_MIPS_CACHE_DISABLE=y
  CONFIG_MIPS_BOOT_FDT=y
  # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
  CONFIG_REMAKE_ELF=y
-CONFIG_SYS_LOAD_ADDR=0x80100000
  CONFIG_OF_STDOUT_VIA_ALIAS=y
  CONFIG_DISPLAY_CPUINFO=y
  CONFIG_HUSH_PARSER=y
diff --git a/configs/comtrend_vr3032u_ram_defconfig b/configs/comtrend_vr3032u_ram_defconfig

index b2973fa0f34020ddbe288ca078c4b260646a7774..8d5646167f75572898f0b89d44fc9b64b9ee7d4d 100644 (file)
--- a/configs/comtrend_vr3032u_ram_defconfig
+++ b/configs/comtrend_vr3032u_ram_defconfig
@@ -5,6 +5,7 @@ CONFIG_NR_DRAM_BANKS=1
  CONFIG_ENV_SIZE=0x2000
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="comtrend,vr-3032u"
+CONFIG_SYS_LOAD_ADDR=0x80100000
  CONFIG_ARCH_BMIPS=y
  CONFIG_SOC_BMIPS_BCM63268=y
  CONFIG_MIPS_CACHE_SETUP=y
@@ -14,7 +15,6 @@ CONFIG_MIPS_CACHE_DISABLE=y
  CONFIG_MIPS_BOOT_FDT=y
  # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
  CONFIG_REMAKE_ELF=y
-CONFIG_SYS_LOAD_ADDR=0x80100000
  CONFIG_OF_STDOUT_VIA_ALIAS=y
  CONFIG_DISPLAY_CPUINFO=y
  CONFIG_HUSH_PARSER=y
diff --git a/configs/comtrend_wap5813n_ram_defconfig b/configs/comtrend_wap5813n_ram_defconfig

index 5ad85b10f500c7bc130d25959d5c1a3042f6569e..a8004d8af8eee6d57c815cb674ce452ec22fefc7 100644 (file)
--- a/configs/comtrend_wap5813n_ram_defconfig
+++ b/configs/comtrend_wap5813n_ram_defconfig
@@ -5,6 +5,7 @@ CONFIG_NR_DRAM_BANKS=1
  CONFIG_ENV_SIZE=0x2000
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="comtrend,wap-5813n"
+CONFIG_SYS_LOAD_ADDR=0x80100000
  CONFIG_ARCH_BMIPS=y
  CONFIG_SOC_BMIPS_BCM6368=y
  CONFIG_MIPS_CACHE_SETUP=y
@@ -14,7 +15,6 @@ CONFIG_MIPS_CACHE_DISABLE=y
  CONFIG_MIPS_BOOT_FDT=y
  # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
  CONFIG_REMAKE_ELF=y
-CONFIG_SYS_LOAD_ADDR=0x80100000
  CONFIG_OF_STDOUT_VIA_ALIAS=y
  CONFIG_DISPLAY_CPUINFO=y
  CONFIG_HUSH_PARSER=y
diff --git a/configs/controlcenterdc_defconfig b/configs/controlcenterdc_defconfig

index 953364f7416e0aac5bb6ac4ad8f3eaabee1fdbb6..304a4f9565ea75aa5fb523283507fc8ae89c7ec7 100644 (file)
--- a/configs/controlcenterdc_defconfig
+++ b/configs/controlcenterdc_defconfig
@@ -19,10 +19,10 @@ CONFIG_SPL_SERIAL=y
  CONFIG_SPL=y
  CONFIG_DEBUG_UART_BASE=0xd0012000
  CONFIG_DEBUG_UART_CLOCK=250000000
+CONFIG_SYS_LOAD_ADDR=0x800000
  CONFIG_DEBUG_UART=y
  CONFIG_AHCI=y
  CONFIG_OF_BOARD_FIXUP=y
-CONFIG_SYS_LOAD_ADDR=0x800000
  CONFIG_FIT=y
  CONFIG_FIT_SIGNATURE=y
  CONFIG_FIT_VERBOSE=y
diff --git a/configs/cortina_presidio-asic-base_defconfig b/configs/cortina_presidio-asic-base_defconfig

index b8614ff66bff165ebe4a770bc745826800aa18f1..f102b75c355aeeb90beda0cb62d50b3d06cbf143 100644 (file)
--- a/configs/cortina_presidio-asic-base_defconfig
+++ b/configs/cortina_presidio-asic-base_defconfig
@@ -8,8 +8,8 @@ CONFIG_ENV_SIZE=0x20000
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="ca-presidio-engboard"
  CONFIG_IDENT_STRING="Presidio-SoC"
-CONFIG_REMAKE_ELF=y
  CONFIG_SYS_LOAD_ADDR=0x10000000
+CONFIG_REMAKE_ELF=y
  CONFIG_SUPPORT_RAW_INITRD=y
  CONFIG_SHOW_BOOT_PROGRESS=y
  CONFIG_BOOTDELAY=3
diff --git a/configs/cortina_presidio-asic-emmc_defconfig b/configs/cortina_presidio-asic-emmc_defconfig

index 00ea238162e58902ab323e053172855bfef0eb64..c22dcef7ec05b512060b8f094e2e2415f86cbd44 100644 (file)
--- a/configs/cortina_presidio-asic-emmc_defconfig
+++ b/configs/cortina_presidio-asic-emmc_defconfig
@@ -8,8 +8,8 @@ CONFIG_ENV_SIZE=0x20000
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="ca-presidio-engboard"
  CONFIG_IDENT_STRING="Presidio-SoC"
-CONFIG_REMAKE_ELF=y
  CONFIG_SYS_LOAD_ADDR=0x10000000
+CONFIG_REMAKE_ELF=y
  CONFIG_SUPPORT_RAW_INITRD=y
  CONFIG_SHOW_BOOT_PROGRESS=y
  CONFIG_BOOTDELAY=3
diff --git a/configs/cortina_presidio-asic-pnand_defconfig b/configs/cortina_presidio-asic-pnand_defconfig

index ccc519a61c5f4492d5f01c4b6637e274e70e1207..a20b99f4bffabb3fe50675373bbb74bcfdc2aed1 100644 (file)
--- a/configs/cortina_presidio-asic-pnand_defconfig
+++ b/configs/cortina_presidio-asic-pnand_defconfig
@@ -8,8 +8,8 @@ CONFIG_ENV_SIZE=0x20000
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="ca-presidio-engboard"
  CONFIG_IDENT_STRING="Presidio-SoC"
-CONFIG_REMAKE_ELF=y
  CONFIG_SYS_LOAD_ADDR=0x10000000
+CONFIG_REMAKE_ELF=y
  CONFIG_SUPPORT_RAW_INITRD=y
  CONFIG_SHOW_BOOT_PROGRESS=y
  CONFIG_BOOTDELAY=3
diff --git a/configs/crs305-1g-4s-bit_defconfig b/configs/crs305-1g-4s-bit_defconfig

index a5f0a218e13fb2ff2b6e920d2fe8302e2ca88697..c9c23024a4ef0ca9fc101f730c8d4832957cf1b5 100644 (file)
--- a/configs/crs305-1g-4s-bit_defconfig
+++ b/configs/crs305-1g-4s-bit_defconfig
@@ -10,8 +10,8 @@ CONFIG_ENV_OFFSET=0x1F0000
  CONFIG_ENV_SECT_SIZE=0x10000
  CONFIG_DEFAULT_DEVICE_TREE="armada-xp-crs305-1g-4s-bit"
  CONFIG_BOOTCOUNT_BOOTLIMIT=3
-CONFIG_BUILD_TARGET="u-boot.kwb"
  CONFIG_SYS_LOAD_ADDR=0x800000
+CONFIG_BUILD_TARGET="u-boot.kwb"
  CONFIG_FIT=y
  CONFIG_FIT_VERBOSE=y
  CONFIG_FIT_BEST_MATCH=y
diff --git a/configs/crs305-1g-4s_defconfig b/configs/crs305-1g-4s_defconfig

index b75c9f26d36b9e6b2db60fd4a33c3e46bea1db09..6739ac1fddccab639eaa91d40f7e55b1e862c589 100644 (file)
--- a/configs/crs305-1g-4s_defconfig
+++ b/configs/crs305-1g-4s_defconfig
@@ -10,8 +10,8 @@ CONFIG_ENV_OFFSET=0x1F0000
  CONFIG_ENV_SECT_SIZE=0x10000
  CONFIG_DEFAULT_DEVICE_TREE="armada-xp-crs305-1g-4s"
  CONFIG_BOOTCOUNT_BOOTLIMIT=3
-CONFIG_BUILD_TARGET="u-boot.kwb"
  CONFIG_SYS_LOAD_ADDR=0x800000
+CONFIG_BUILD_TARGET="u-boot.kwb"
  CONFIG_FIT=y
  CONFIG_FIT_VERBOSE=y
  CONFIG_FIT_BEST_MATCH=y
diff --git a/configs/crs326-24g-2s-bit_defconfig b/configs/crs326-24g-2s-bit_defconfig

index 98a23d243e22d603d4b1cce074b04ce6e2a3a40d..d2eb3038f5128c0b15300585dc4687fb8a2d5c4a 100644 (file)
--- a/configs/crs326-24g-2s-bit_defconfig
+++ b/configs/crs326-24g-2s-bit_defconfig
@@ -10,8 +10,8 @@ CONFIG_ENV_OFFSET=0x1F0000
  CONFIG_ENV_SECT_SIZE=0x10000
  CONFIG_DEFAULT_DEVICE_TREE="armada-xp-crs326-24g-2s-bit"
  CONFIG_BOOTCOUNT_BOOTLIMIT=3
-CONFIG_BUILD_TARGET="u-boot.kwb"
  CONFIG_SYS_LOAD_ADDR=0x800000
+CONFIG_BUILD_TARGET="u-boot.kwb"
  CONFIG_FIT=y
  CONFIG_FIT_VERBOSE=y
  CONFIG_FIT_BEST_MATCH=y
diff --git a/configs/crs326-24g-2s_defconfig b/configs/crs326-24g-2s_defconfig

index adaa1fc34b900f78779e774cb8bd166001adae8f..c4c6d940ad277600be6b148cc9d2a16f1d83a8da 100644 (file)
--- a/configs/crs326-24g-2s_defconfig
+++ b/configs/crs326-24g-2s_defconfig
@@ -10,8 +10,8 @@ CONFIG_ENV_OFFSET=0x1F0000
  CONFIG_ENV_SECT_SIZE=0x10000
  CONFIG_DEFAULT_DEVICE_TREE="armada-xp-crs326-24g-2s"
  CONFIG_BOOTCOUNT_BOOTLIMIT=3
-CONFIG_BUILD_TARGET="u-boot.kwb"
  CONFIG_SYS_LOAD_ADDR=0x800000
+CONFIG_BUILD_TARGET="u-boot.kwb"
  CONFIG_FIT=y
  CONFIG_FIT_VERBOSE=y
  CONFIG_FIT_BEST_MATCH=y
diff --git a/configs/crs328-4c-20s-4s-bit_defconfig b/configs/crs328-4c-20s-4s-bit_defconfig

index 7ec902ee986877064c69fd4f17ad9146e16225b3..5ce94b56aa1d9a7845154cde9feb39b083c9b726 100644 (file)
--- a/configs/crs328-4c-20s-4s-bit_defconfig
+++ b/configs/crs328-4c-20s-4s-bit_defconfig
@@ -10,8 +10,8 @@ CONFIG_ENV_OFFSET=0x1F0000
  CONFIG_ENV_SECT_SIZE=0x10000
  CONFIG_DEFAULT_DEVICE_TREE="armada-xp-crs328-4c-20s-4s-bit"
  CONFIG_BOOTCOUNT_BOOTLIMIT=3
-CONFIG_BUILD_TARGET="u-boot.kwb"
  CONFIG_SYS_LOAD_ADDR=0x800000
+CONFIG_BUILD_TARGET="u-boot.kwb"
  CONFIG_FIT=y
  CONFIG_FIT_VERBOSE=y
  CONFIG_FIT_BEST_MATCH=y
diff --git a/configs/crs328-4c-20s-4s_defconfig b/configs/crs328-4c-20s-4s_defconfig

index 18e3082213225b1818714996f67dba7c928b8f17..1a023f36b34262a5a68ab14c534c031bfb0dcab5 100644 (file)
--- a/configs/crs328-4c-20s-4s_defconfig
+++ b/configs/crs328-4c-20s-4s_defconfig
@@ -10,8 +10,8 @@ CONFIG_ENV_OFFSET=0x1F0000
  CONFIG_ENV_SECT_SIZE=0x10000
  CONFIG_DEFAULT_DEVICE_TREE="armada-xp-crs328-4c-20s-4s"
  CONFIG_BOOTCOUNT_BOOTLIMIT=3
-CONFIG_BUILD_TARGET="u-boot.kwb"
  CONFIG_SYS_LOAD_ADDR=0x800000
+CONFIG_BUILD_TARGET="u-boot.kwb"
  CONFIG_FIT=y
  CONFIG_FIT_VERBOSE=y
  CONFIG_FIT_BEST_MATCH=y
diff --git a/configs/cubieboard7_defconfig b/configs/cubieboard7_defconfig

index 4c48237168466a06c00d149480196b46c16ef0f5..e73d8d8ed763f51223381885de8efacd7ba9f9f9 100644 (file)
--- a/configs/cubieboard7_defconfig
+++ b/configs/cubieboard7_defconfig
@@ -4,8 +4,8 @@ CONFIG_SYS_MALLOC_LEN=0x2000000
  CONFIG_DEFAULT_DEVICE_TREE="s700-cubieboard7"
  CONFIG_MACH_S700=y
  CONFIG_IDENT_STRING="\ncubieboard7"
-CONFIG_DISTRO_DEFAULTS=y
  CONFIG_SYS_LOAD_ADDR=0x7ffc0
+CONFIG_DISTRO_DEFAULTS=y
  CONFIG_BOOTDELAY=5
  CONFIG_USE_BOOTARGS=y
  CONFIG_BOOTARGS="console=ttyOWL3,115200n8"
diff --git a/configs/d2net_v2_defconfig b/configs/d2net_v2_defconfig

index 3f0546e5056fb6d7a5b4cadc5a080c0383de1cef..897c00e523c5092b9255eee546d6ee5984526849 100644 (file)
--- a/configs/d2net_v2_defconfig
+++ b/configs/d2net_v2_defconfig
@@ -12,8 +12,9 @@ CONFIG_ENV_OFFSET=0x70000
  CONFIG_ENV_SECT_SIZE=0x10000
  CONFIG_DEFAULT_DEVICE_TREE="kirkwood-d2net"
  CONFIG_IDENT_STRING=" D2 v2"
-# CONFIG_SYS_MALLOC_F is not set
  CONFIG_SYS_LOAD_ADDR=0x800000
+CONFIG_ENV_ADDR=0x70000
+# CONFIG_SYS_MALLOC_F is not set
  CONFIG_BOOTDELAY=3
  CONFIG_USE_BOOTARGS=y
  CONFIG_BOOTARGS="console=ttyS0,115200"
@@ -44,7 +45,6 @@ CONFIG_OF_CONTROL=y
  CONFIG_ENV_OVERWRITE=y
  CONFIG_ENV_IS_IN_SPI_FLASH=y
  CONFIG_ENV_SPI_MAX_HZ=20000000
-CONFIG_ENV_ADDR=0x70000
  CONFIG_NETCONSOLE=y
  CONFIG_SYS_FAULT_ECHO_LINK_DOWN=y
  CONFIG_DM=y
diff --git a/configs/da850evm_defconfig b/configs/da850evm_defconfig

index 13e7f930d4cc8923b0f5c0f0e79005a103b3d796..6785daa47c29e721c155fd3611c8ae9f7d97cfcd 100644 (file)
--- a/configs/da850evm_defconfig
+++ b/configs/da850evm_defconfig
@@ -21,8 +21,8 @@ CONFIG_SPL_SERIAL=y
  CONFIG_SPL=y
  CONFIG_SPL_SPI_FLASH_SUPPORT=y
  CONFIG_SPL_SPI=y
-CONFIG_LTO=y
  CONFIG_SYS_LOAD_ADDR=0xc0700000
+CONFIG_LTO=y
  CONFIG_DYNAMIC_SYS_CLK_FREQ=y
  CONFIG_BOOTDELAY=3
  CONFIG_USE_BOOTCOMMAND=y
diff --git a/configs/da850evm_direct_nor_defconfig b/configs/da850evm_direct_nor_defconfig

index b71cc424cc17474e9bffee4968a1bd0167fa088e..b1d84f1594ea08acc55762ed7ea6087041f4bc5d 100644 (file)
--- a/configs/da850evm_direct_nor_defconfig
+++ b/configs/da850evm_direct_nor_defconfig
@@ -13,8 +13,9 @@ CONFIG_ENV_SIZE=0x2800
  CONFIG_ENV_SECT_SIZE=0x20000
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="da850-evm"
-CONFIG_LTO=y
  CONFIG_SYS_LOAD_ADDR=0xc0700000
+CONFIG_ENV_ADDR=0x60100000
+CONFIG_LTO=y
  CONFIG_DYNAMIC_SYS_CLK_FREQ=y
  CONFIG_BOOTDELAY=3
  CONFIG_USE_BOOTARGS=y
@@ -47,7 +48,6 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=physmap-flash.2:1m(u-boot),128k(u-boot-env),-(
  CONFIG_CMD_DIAG=y
  CONFIG_OF_CONTROL=y
  CONFIG_ENV_IS_IN_FLASH=y
-CONFIG_ENV_ADDR=0x60100000
  CONFIG_USE_BOOTFILE=y
  CONFIG_BOOTFILE="uImage"
  CONFIG_VERSION_VARIABLE=y
diff --git a/configs/da850evm_nand_defconfig b/configs/da850evm_nand_defconfig

index e647e1a73eb0750bb5090d247f59d19703c178ae..013ea64a66c9c2810fb891d261fdcf39e3d8f8aa 100644 (file)
--- a/configs/da850evm_nand_defconfig
+++ b/configs/da850evm_nand_defconfig
@@ -19,8 +19,8 @@ CONFIG_SPL_SERIAL=y
  CONFIG_SPL=y
  CONFIG_SPL_SPI_FLASH_SUPPORT=y
  CONFIG_SPL_SPI=y
-CONFIG_LTO=y
  CONFIG_SYS_LOAD_ADDR=0xc0700000
+CONFIG_LTO=y
  CONFIG_DYNAMIC_SYS_CLK_FREQ=y
  CONFIG_BOOTDELAY=3
  CONFIG_USE_BOOTCOMMAND=y
diff --git a/configs/db-88f6720_defconfig b/configs/db-88f6720_defconfig

index 363674594d8da20280a0304f1037a8a8749bd536..88c957d7d15dd2721652705adb925c1a27a0eec8 100644 (file)
--- a/configs/db-88f6720_defconfig
+++ b/configs/db-88f6720_defconfig
@@ -16,9 +16,9 @@ CONFIG_SPL_SERIAL=y
  CONFIG_SPL=y
  CONFIG_DEBUG_UART_BASE=0xf1012000
  CONFIG_DEBUG_UART_CLOCK=250000000
+CONFIG_SYS_LOAD_ADDR=0x800000
  CONFIG_DEBUG_UART=y
  # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
-CONFIG_SYS_LOAD_ADDR=0x800000
  CONFIG_BOOTDELAY=3
  CONFIG_USE_PREBOOT=y
  CONFIG_SYS_CONSOLE_INFO_QUIET=y
diff --git a/configs/db-88f6820-amc_defconfig b/configs/db-88f6820-amc_defconfig

index 000e7f0667908fcf8ce7c64170d8713579f30cfb..ad5e02d01cf082f9bc02fc17c93869238c73c0a9 100644 (file)
--- a/configs/db-88f6820-amc_defconfig
+++ b/configs/db-88f6820-amc_defconfig
@@ -16,8 +16,8 @@ CONFIG_SPL_SERIAL=y
  CONFIG_SPL=y
  CONFIG_DEBUG_UART_BASE=0xd0012000
  CONFIG_DEBUG_UART_CLOCK=200000000
-CONFIG_DEBUG_UART=y
  CONFIG_SYS_LOAD_ADDR=0x800000
+CONFIG_DEBUG_UART=y
  CONFIG_FIT=y
  CONFIG_FIT_VERBOSE=y
  CONFIG_BOOTDELAY=3
diff --git a/configs/db-88f6820-gp_defconfig b/configs/db-88f6820-gp_defconfig

index e7fd1a2fccbe4bf9a76a88fd55f36a2a650acfca..dae67dc68811b93ddcb2b646b24d7cce77321536 100644 (file)
--- a/configs/db-88f6820-gp_defconfig
+++ b/configs/db-88f6820-gp_defconfig
@@ -16,9 +16,9 @@ CONFIG_SPL_SERIAL=y
  CONFIG_SPL=y
  CONFIG_DEBUG_UART_BASE=0xd0012000
  CONFIG_DEBUG_UART_CLOCK=250000000
+CONFIG_SYS_LOAD_ADDR=0x800000
  CONFIG_DEBUG_UART=y
  CONFIG_AHCI=y
-CONFIG_SYS_LOAD_ADDR=0x800000
  CONFIG_BOOTDELAY=3
  CONFIG_USE_PREBOOT=y
  CONFIG_SYS_CONSOLE_INFO_QUIET=y
diff --git a/configs/db-mv784mp-gp_defconfig b/configs/db-mv784mp-gp_defconfig

index 594555c5a953a5f6d762e297adf4f8be023eb7db..d319b84a8e14db82966618d4580e45dc16698d02 100644 (file)
--- a/configs/db-mv784mp-gp_defconfig
+++ b/configs/db-mv784mp-gp_defconfig
@@ -16,9 +16,9 @@ CONFIG_SPL_SERIAL=y
  CONFIG_SPL=y
  CONFIG_DEBUG_UART_BASE=0xd0012000
  CONFIG_DEBUG_UART_CLOCK=250000000
+CONFIG_SYS_LOAD_ADDR=0x800000
  CONFIG_DEBUG_UART=y
  # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
-CONFIG_SYS_LOAD_ADDR=0x800000
  CONFIG_BOOTDELAY=3
  CONFIG_USE_PREBOOT=y
  CONFIG_SYS_CONSOLE_INFO_QUIET=y
diff --git a/configs/db-xc3-24g4xg_defconfig b/configs/db-xc3-24g4xg_defconfig

index b64ecc148a48193fe7a91ce4dd2dbbf7287c7814..e54a95a4268011daa11fdb1b6bbb2c21b53dbd92 100644 (file)
--- a/configs/db-xc3-24g4xg_defconfig
+++ b/configs/db-xc3-24g4xg_defconfig
@@ -9,10 +9,10 @@ CONFIG_ENV_SIZE=0x10000
  CONFIG_ENV_OFFSET=0x100000
  CONFIG_ENV_SECT_SIZE=0x40000
  CONFIG_DEFAULT_DEVICE_TREE="armada-xp-db-xc3-24g4xg"
+CONFIG_SYS_LOAD_ADDR=0x800000
  CONFIG_BUILD_TARGET="u-boot.kwb"
  CONFIG_SYS_MEMTEST_START=0x00800000
  CONFIG_SYS_MEMTEST_END=0x00ffffff
-CONFIG_SYS_LOAD_ADDR=0x800000
  CONFIG_FIT=y
  CONFIG_FIT_VERBOSE=y
  CONFIG_FIT_BEST_MATCH=y
diff --git a/configs/deneb_defconfig b/configs/deneb_defconfig

index adf4755275284dd70e33c3ab884b03d46a623e99..55034ad5fb567044750202e10e407d3ebb71be1f 100644 (file)
--- a/configs/deneb_defconfig
+++ b/configs/deneb_defconfig
@@ -21,8 +21,8 @@ CONFIG_ENV_OFFSET_REDUND=0x2000
  CONFIG_IDENT_STRING=" ##v01.06"
  CONFIG_SPL_LOAD_IMX_CONTAINER=y
  CONFIG_IMX_CONTAINER_CFG="board/siemens/capricorn/uboot-container.cfg"
-CONFIG_REMAKE_ELF=y
  CONFIG_SYS_LOAD_ADDR=0x80280000
+CONFIG_REMAKE_ELF=y
  CONFIG_OF_BOARD_SETUP=y
  CONFIG_OF_SYSTEM_SETUP=y
  CONFIG_BOOTDELAY=3
diff --git a/configs/dns325_defconfig b/configs/dns325_defconfig

index b8dec683e2b6588aec3fdf2e899b8a0268b40920..96088a177a8d7389410329731e83eb5b81a116df 100644 (file)
--- a/configs/dns325_defconfig
+++ b/configs/dns325_defconfig
@@ -11,8 +11,8 @@ CONFIG_ENV_SIZE=0x20000
  CONFIG_ENV_OFFSET=0xE0000
  CONFIG_DEFAULT_DEVICE_TREE="kirkwood-dns325"
  CONFIG_IDENT_STRING="\nD-Link DNS-325"
-# CONFIG_SYS_MALLOC_F is not set
  CONFIG_SYS_LOAD_ADDR=0x800000
+# CONFIG_SYS_MALLOC_F is not set
  CONFIG_BOOTDELAY=3
  CONFIG_USE_BOOTCOMMAND=y
  CONFIG_BOOTCOMMAND="if test -n ${bootenv} && usb start; then if run loadbootenv; then echo Loaded environment ${bootenv} from usb;run importbootenv;fi;if test -n ${bootenvcmd}; then echo Running bootenvcmd ...;run bootenvcmd;fi;fi;run setnandbootenv subbootcmd;"
diff --git a/configs/dockstar_defconfig b/configs/dockstar_defconfig

index 683c7a5e6014eba4d59ac235843fe9dbec5f18e9..a740da9fc0d890febf678d53b7a9bcf3f2566a46 100644 (file)
--- a/configs/dockstar_defconfig
+++ b/configs/dockstar_defconfig
@@ -12,8 +12,8 @@ CONFIG_ENV_SIZE=0x20000
  CONFIG_ENV_OFFSET=0x80000
  CONFIG_DEFAULT_DEVICE_TREE="kirkwood-dockstar"
  CONFIG_IDENT_STRING="\nSeagate FreeAgent DockStar"
-# CONFIG_SYS_MALLOC_F is not set
  CONFIG_SYS_LOAD_ADDR=0x800000
+# CONFIG_SYS_MALLOC_F is not set
  CONFIG_BOOTDELAY=3
  CONFIG_USE_BOOTCOMMAND=y
  CONFIG_BOOTCOMMAND="setenv bootargs ${console} ${mtdparts} ${bootargs_root}; ubi part root; ubifsmount ubi:root; ubifsload 0x800000 ${kernel}; ubifsload 0x1100000 ${initrd}; bootm 0x800000 0x1100000"
diff --git a/configs/draco_defconfig b/configs/draco_defconfig

index 096224f0f070d491af77e7a7d6affde0c77c33a1..0c50b3741f271b278f5c01120332246198218af8 100644 (file)
--- a/configs/draco_defconfig
+++ b/configs/draco_defconfig
@@ -22,8 +22,8 @@ CONFIG_SPL_FS_FAT=y
  CONFIG_SPL_LIBDISK_SUPPORT=y
  CONFIG_SPL_SPI_FLASH_SUPPORT=y
  CONFIG_SPL_SPI=y
-CONFIG_ENV_VARS_UBOOT_CONFIG=y
  CONFIG_SYS_LOAD_ADDR=0x81000000
+CONFIG_ENV_VARS_UBOOT_CONFIG=y
  CONFIG_BOOTDELAY=3
  CONFIG_AUTOBOOT_KEYED=y
  CONFIG_AUTOBOOT_PROMPT="Autobooting in %d seconds, press \"<Esc><Esc>\" to stop\n"
diff --git a/configs/dragonboard410c_defconfig b/configs/dragonboard410c_defconfig

index ce90b7fe02b1af02619019f9b22b8736569f829b..33cb31c72514032ceefafc0e946943fc47a4c68e 100644 (file)
--- a/configs/dragonboard410c_defconfig
+++ b/configs/dragonboard410c_defconfig
@@ -7,9 +7,9 @@ CONFIG_ENV_SIZE=0x2000
  CONFIG_ENV_OFFSET=0x0
  CONFIG_DEFAULT_DEVICE_TREE="dragonboard410c"
  CONFIG_IDENT_STRING="\nQualcomm-DragonBoard 410C"
+CONFIG_SYS_LOAD_ADDR=0x80080000
  CONFIG_DISTRO_DEFAULTS=y
  CONFIG_REMAKE_ELF=y
-CONFIG_SYS_LOAD_ADDR=0x80080000
  # CONFIG_ANDROID_BOOT_IMAGE is not set
  CONFIG_FIT=y
  CONFIG_OF_BOARD_SETUP=y
diff --git a/configs/dragonboard820c_defconfig b/configs/dragonboard820c_defconfig

index b780a32710c6bed07c6f034ce34d6fae6dba7bc8..4797153968eb5669ccd32ae592e3742b49bf2edf 100644 (file)
--- a/configs/dragonboard820c_defconfig
+++ b/configs/dragonboard820c_defconfig
@@ -7,8 +7,8 @@ CONFIG_ENV_SIZE=0x4000
  CONFIG_DEFAULT_DEVICE_TREE="dragonboard820c"
  CONFIG_TARGET_DRAGONBOARD820C=y
  CONFIG_IDENT_STRING="\nQualcomm-DragonBoard 820C"
-CONFIG_DISTRO_DEFAULTS=y
  CONFIG_SYS_LOAD_ADDR=0x80080000
+CONFIG_DISTRO_DEFAULTS=y
  CONFIG_USE_BOOTARGS=y
  CONFIG_BOOTARGS="console=ttyMSM0,115200n8"
  # CONFIG_USE_BOOTCOMMAND is not set
diff --git a/configs/dreamplug_defconfig b/configs/dreamplug_defconfig

index 962a166b720aabaac93aece0204a54a7c155701f..5f9073d2e62870224cf9ef847b32d1d9aac469b9 100644 (file)
--- a/configs/dreamplug_defconfig
+++ b/configs/dreamplug_defconfig
@@ -12,8 +12,9 @@ CONFIG_ENV_OFFSET=0x100000
  CONFIG_ENV_SECT_SIZE=0x10000
  CONFIG_DEFAULT_DEVICE_TREE="kirkwood-dreamplug"
  CONFIG_IDENT_STRING="\nMarvell-DreamPlug"
-# CONFIG_SYS_MALLOC_F is not set
  CONFIG_SYS_LOAD_ADDR=0x800000
+CONFIG_ENV_ADDR=0x100000
+# CONFIG_SYS_MALLOC_F is not set
  CONFIG_BOOTDELAY=3
  CONFIG_USE_BOOTCOMMAND=y
  CONFIG_BOOTCOMMAND="setenv ethact ethernet-controller@72000; ${x_bootcmd_ethernet}; setenv ethact ethernet-controller@76000; ${x_bootcmd_ethernet}; ${x_bootcmd_usb}; ${x_bootcmd_kernel}; setenv bootargs ${x_bootargs} ${x_bootargs_root}; bootm 0x6400000;"
@@ -36,7 +37,6 @@ CONFIG_OF_CONTROL=y
  CONFIG_ENV_OVERWRITE=y
  CONFIG_ENV_IS_IN_SPI_FLASH=y
  CONFIG_ENV_SPI_MAX_HZ=50000000
-CONFIG_ENV_ADDR=0x100000
  CONFIG_NET_RANDOM_ETHADDR=y
  CONFIG_NETCONSOLE=y
  CONFIG_SYS_FAULT_ECHO_LINK_DOWN=y
diff --git a/configs/ds109_defconfig b/configs/ds109_defconfig

index 8152964838619176c51d304d07a1609b9d0ddbcd..07d5dce51be5b86917a13b6bafa36d84e10dab94 100644 (file)
--- a/configs/ds109_defconfig
+++ b/configs/ds109_defconfig
@@ -16,8 +16,9 @@ CONFIG_ENV_SIZE=0x10000
  CONFIG_ENV_OFFSET=0x3D0000
  CONFIG_ENV_SECT_SIZE=0x10000
  CONFIG_DEFAULT_DEVICE_TREE="kirkwood-ds109"
-# CONFIG_SYS_MALLOC_F is not set
  CONFIG_SYS_LOAD_ADDR=0x800000
+CONFIG_ENV_ADDR=0x3D0000
+# CONFIG_SYS_MALLOC_F is not set
  CONFIG_USE_BOOTCOMMAND=y
  CONFIG_BOOTCOMMAND="setenv ethact egiga0; ${x_bootcmd_ethernet}; ${x_bootcmd_usb}; ${x_bootcmd_kernel}; setenv bootargs ${x_bootargs} ${x_bootargs_root}; bootm 0x6400000;"
  CONFIG_USE_PREBOOT=y
@@ -37,7 +38,6 @@ CONFIG_OF_CONTROL=y
  CONFIG_ENV_OVERWRITE=y
  CONFIG_ENV_IS_IN_SPI_FLASH=y
  CONFIG_ENV_SPI_MAX_HZ=50000000
-CONFIG_ENV_ADDR=0x3D0000
  CONFIG_NETCONSOLE=y
  CONFIG_SYS_FAULT_ECHO_LINK_DOWN=y
  CONFIG_DM=y
diff --git a/configs/ds414_defconfig b/configs/ds414_defconfig

index 41fa2cd7fe2d6519698f5b2bc0805767627fa0d7..43ba3069d1bdbbe2c1c5f7af47d66c13548cb6e3 100644 (file)
--- a/configs/ds414_defconfig
+++ b/configs/ds414_defconfig
@@ -22,8 +22,8 @@ CONFIG_SPL_SERIAL=y
  CONFIG_SPL=y
  CONFIG_DEBUG_UART_BASE=0xd0012000
  CONFIG_DEBUG_UART_CLOCK=250000000
-CONFIG_DEBUG_UART=y
  CONFIG_SYS_LOAD_ADDR=0x800000
+CONFIG_DEBUG_UART=y
  CONFIG_BOOTDELAY=3
  CONFIG_USE_BOOTARGS=y
  CONFIG_BOOTARGS="console=ttyS0,115200 ip=off initrd=0x8000040,8M root=/dev/md0 rw syno_hw_version=DS414r1 ihd_num=4 netif_num=2 flash_size=8 SataLedSpecial=1 HddHotplug=1"
diff --git a/configs/durian_defconfig b/configs/durian_defconfig

index b44fd90df53c2f1b5a988a8f1c935c5a7372e1c4..56b29c47698b20ba86e382ef644b251a205f6e30 100644 (file)
--- a/configs/durian_defconfig
+++ b/configs/durian_defconfig
@@ -7,10 +7,10 @@ CONFIG_NR_DRAM_BANKS=1
  CONFIG_ENV_SIZE=0x1000
  CONFIG_DEFAULT_DEVICE_TREE="phytium-durian"
  # CONFIG_PSCI_RESET is not set
+CONFIG_SYS_LOAD_ADDR=0x90000000
  CONFIG_SYS_PCI_64BIT=y
  CONFIG_AHCI=y
  CONFIG_DISTRO_DEFAULTS=y
-CONFIG_SYS_LOAD_ADDR=0x90000000
  CONFIG_USE_BOOTARGS=y
  CONFIG_BOOTARGS="console=ttyAMA0,115200 earlycon=pl011,0x28001000 root=/dev/sda2 rw"
  # CONFIG_DISPLAY_CPUINFO is not set
diff --git a/configs/ea-lpc3250devkitv2_defconfig b/configs/ea-lpc3250devkitv2_defconfig

index ba8c796686057c393dcab3cddbd17393f6309eff..00a46fde4195c90cec296273607a4910dc9c0bbf 100644 (file)
--- a/configs/ea-lpc3250devkitv2_defconfig
+++ b/configs/ea-lpc3250devkitv2_defconfig
@@ -8,10 +8,10 @@ CONFIG_SYS_TEXT_BASE=0x83000000
  CONFIG_NR_DRAM_BANKS=1
  CONFIG_TARGET_EA_LPC3250DEVKITV2=y
  CONFIG_DEFAULT_DEVICE_TREE="lpc3250-ea3250"
+CONFIG_SYS_LOAD_ADDR=0x80100000
  CONFIG_DISTRO_DEFAULTS=y
  CONFIG_HAS_BOARD_SIZE_LIMIT=y
  CONFIG_BOARD_SIZE_LIMIT=1048575
-CONFIG_SYS_LOAD_ADDR=0x80100000
  # CONFIG_ARCH_FIXUP_FDT_MEMORY is not set
  # CONFIG_AUTOBOOT is not set
  # CONFIG_USE_BOOTCOMMAND is not set
diff --git a/configs/eb_cpu5282_defconfig b/configs/eb_cpu5282_defconfig

index 0effe0a451647b4ba166cfc8d38e77fab14041c3..dc649f213fae731a49ab59aa19133725e7f0a9ff 100644 (file)
--- a/configs/eb_cpu5282_defconfig
+++ b/configs/eb_cpu5282_defconfig
@@ -3,9 +3,10 @@ CONFIG_SYS_TEXT_BASE=0xFF000000
  CONFIG_ENV_SIZE=0x20000
  CONFIG_ENV_SECT_SIZE=0x20000
  CONFIG_DEFAULT_DEVICE_TREE="eb_cpu5282"
+CONFIG_SYS_LOAD_ADDR=0x20000
+CONFIG_ENV_ADDR=0xFF040000
  CONFIG_TARGET_EB_CPU5282=y
  CONFIG_MCFTMR=y
-CONFIG_SYS_LOAD_ADDR=0x20000
  CONFIG_SYS_MONITOR_BASE=0xFF000400
  CONFIG_BOOTDELAY=5
  CONFIG_BOOT_RETRY=y
@@ -26,7 +27,6 @@ CONFIG_BOOTP_BOOTFILESIZE=y
  CONFIG_CMD_MII=y
  CONFIG_MII_INIT=y
  CONFIG_CMD_DATE=y
-CONFIG_ENV_ADDR=0xFF040000
  CONFIG_SYS_FAULT_ECHO_LINK_DOWN=y
  CONFIG_SYS_RX_ETH_BUFFER=8
  CONFIG_SYS_I2C_LEGACY=y
diff --git a/configs/eb_cpu5282_internal_defconfig b/configs/eb_cpu5282_internal_defconfig

index bb7854df0ad12dabc9975f9769d50f71dd143dc4..2f2692340f2c2fb2741b1f94488b99191b785537 100644 (file)
--- a/configs/eb_cpu5282_internal_defconfig
+++ b/configs/eb_cpu5282_internal_defconfig
@@ -3,9 +3,10 @@ CONFIG_SYS_TEXT_BASE=0xF0000000
  CONFIG_ENV_SIZE=0x20000
  CONFIG_ENV_SECT_SIZE=0x20000
  CONFIG_DEFAULT_DEVICE_TREE="eb_cpu5282_internal"
+CONFIG_SYS_LOAD_ADDR=0x20000
+CONFIG_ENV_ADDR=0xFF040000
  CONFIG_TARGET_EB_CPU5282=y
  CONFIG_MCFTMR=y
-CONFIG_SYS_LOAD_ADDR=0x20000
  CONFIG_SYS_MONITOR_BASE=0xF0000418
  CONFIG_BOOTDELAY=5
  CONFIG_BOOT_RETRY=y
@@ -25,7 +26,6 @@ CONFIG_BOOTP_BOOTFILESIZE=y
  CONFIG_CMD_MII=y
  CONFIG_MII_INIT=y
  CONFIG_CMD_DATE=y
-CONFIG_ENV_ADDR=0xFF040000
  CONFIG_SYS_FAULT_ECHO_LINK_DOWN=y
  CONFIG_SYS_RX_ETH_BUFFER=8
  CONFIG_SYS_I2C_LEGACY=y
diff --git a/configs/edison_defconfig b/configs/edison_defconfig

index 3af97d85023f9c54f329286878967182a4da2efc..a9479e54a960123340841467940dcb61a0c23b42 100644 (file)
--- a/configs/edison_defconfig
+++ b/configs/edison_defconfig
@@ -6,10 +6,10 @@ CONFIG_ENV_SIZE=0x10000
  CONFIG_ENV_OFFSET=0x300000
  CONFIG_DEFAULT_DEVICE_TREE="edison"
  CONFIG_ENV_OFFSET_REDUND=0x600000
+CONFIG_SYS_LOAD_ADDR=0x100000
  CONFIG_VENDOR_INTEL=y
  CONFIG_TARGET_EDISON=y
  CONFIG_SMP=y
-CONFIG_SYS_LOAD_ADDR=0x100000
  CONFIG_SYS_MONITOR_BASE=0x01101000
  CONFIG_BOARD_EARLY_INIT_R=y
  CONFIG_LAST_STAGE_INIT=y
diff --git a/configs/edminiv2_defconfig b/configs/edminiv2_defconfig

index bbc7b41c57ab6167b351a0a30c2090717f5957b6..4987e0946592a354b9516163242cd77dacbf4e6b 100644 (file)
--- a/configs/edminiv2_defconfig
+++ b/configs/edminiv2_defconfig
@@ -15,6 +15,7 @@ CONFIG_SPL_SERIAL=y
  CONFIG_SPL=y
  CONFIG_IDENT_STRING=" EDMiniV2"
  CONFIG_SYS_LOAD_ADDR=0x800000
+CONFIG_ENV_ADDR=0xFFF84000
  CONFIG_BOOTDELAY=3
  # CONFIG_DISPLAY_BOARDINFO is not set
  CONFIG_ARCH_MISC_INIT=y
@@ -32,7 +33,6 @@ CONFIG_CMD_EXT2=y
  CONFIG_ISO_PARTITION=y
  CONFIG_ENV_OVERWRITE=y
  CONFIG_ENV_IS_IN_FLASH=y
-CONFIG_ENV_ADDR=0xFFF84000
  CONFIG_NETCONSOLE=y
  CONFIG_SYS_FAULT_ECHO_LINK_DOWN=y
  CONFIG_SYS_IDE_MAXBUS=1
diff --git a/configs/elgin-rv1108_defconfig b/configs/elgin-rv1108_defconfig

index e600978f5702db3f0ecfb74b8ce77b4115d70879..113b7c8cfe0623ccc8b1417eff891d08552963c1 100644 (file)
--- a/configs/elgin-rv1108_defconfig
+++ b/configs/elgin-rv1108_defconfig
@@ -11,8 +11,8 @@ CONFIG_TARGET_ELGIN_RV1108=y
  # CONFIG_DEBUG_UART_BOARD_INIT is not set
  CONFIG_DEBUG_UART_BASE=0x10210000
  CONFIG_DEBUG_UART_CLOCK=24000000
-CONFIG_DEBUG_UART=y
  CONFIG_SYS_LOAD_ADDR=0x62000000
+CONFIG_DEBUG_UART=y
  # CONFIG_USE_BOOTCOMMAND is not set
  CONFIG_DEFAULT_FDT_FILE="rv1108-elgin-r1.dtb"
  # CONFIG_DISPLAY_CPUINFO is not set
diff --git a/configs/etamin_defconfig b/configs/etamin_defconfig

index 8bb4ce0629bf239a3841bf4e3b8a94eb1802ecd1..c7598ec9c88acf98bf59e4542dc58a36d828f6a3 100644 (file)
--- a/configs/etamin_defconfig
+++ b/configs/etamin_defconfig
@@ -23,8 +23,8 @@ CONFIG_SPL_FS_FAT=y
  CONFIG_SPL_LIBDISK_SUPPORT=y
  CONFIG_SPL_SPI_FLASH_SUPPORT=y
  CONFIG_SPL_SPI=y
-CONFIG_ENV_VARS_UBOOT_CONFIG=y
  CONFIG_SYS_LOAD_ADDR=0x81000000
+CONFIG_ENV_VARS_UBOOT_CONFIG=y
  CONFIG_BOOTDELAY=3
  CONFIG_AUTOBOOT_KEYED=y
  CONFIG_AUTOBOOT_PROMPT="Autobooting in %d seconds, press \"<Esc><Esc>\" to stop\n"
diff --git a/configs/evb-ast2600_defconfig b/configs/evb-ast2600_defconfig

index f541c69b3b4ad57fb6136629ff02a82c53c47f3a..ea757629260cbac1880221a6d0c40af0dce4f50a 100644 (file)
--- a/configs/evb-ast2600_defconfig
+++ b/configs/evb-ast2600_defconfig
@@ -18,8 +18,8 @@ CONFIG_SPL_STACK_R_ADDR=0x83000000
  CONFIG_SPL_SIZE_LIMIT=0x10000
  CONFIG_SPL=y
  # CONFIG_ARMV7_NONSEC is not set
-# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
  CONFIG_SYS_LOAD_ADDR=0x83000000
+# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
  CONFIG_FIT=y
  CONFIG_SPL_FIT_SIGNATURE=y
  CONFIG_SPL_LOAD_FIT=y
diff --git a/configs/evb-px30_defconfig b/configs/evb-px30_defconfig

index 7d7e7f469ab47c89202a7e47da7f39686c723e36..061d76e86a3590747aa1081c2097c5060623bf8a 100644 (file)
--- a/configs/evb-px30_defconfig
+++ b/configs/evb-px30_defconfig
@@ -15,9 +15,9 @@ CONFIG_SPL_DRIVERS_MISC=y
  CONFIG_SPL_STACK_R_ADDR=0x600000
  CONFIG_DEBUG_UART_BASE=0xFF160000
  CONFIG_DEBUG_UART_CLOCK=24000000
+CONFIG_SYS_LOAD_ADDR=0x800800
  CONFIG_DEBUG_UART=y
  CONFIG_TPL_SYS_MALLOC_F_LEN=0x600
-CONFIG_SYS_LOAD_ADDR=0x800800
  # CONFIG_ANDROID_BOOT_IMAGE is not set
  CONFIG_FIT=y
  CONFIG_FIT_VERBOSE=y
diff --git a/configs/evb-px5_defconfig b/configs/evb-px5_defconfig

index 0cca4164be2e2117cd7405804bd8d4b1eefcce6c..581b8cdfada6d13025f6d4ff79c5a3a085eee5db 100644 (file)
--- a/configs/evb-px5_defconfig
+++ b/configs/evb-px5_defconfig
@@ -17,8 +17,8 @@ CONFIG_DEBUG_UART_BASE=0xFF1c0000
  CONFIG_DEBUG_UART_CLOCK=24000000
  CONFIG_SPL_SPI_FLASH_SUPPORT=y
  CONFIG_SPL_SPI=y
-CONFIG_DEBUG_UART=y
  CONFIG_SYS_LOAD_ADDR=0x800800
+CONFIG_DEBUG_UART=y
  CONFIG_ANDROID_BOOT_IMAGE=y
  CONFIG_FIT=y
  CONFIG_FIT_VERBOSE=y
diff --git a/configs/evb-rk3036_defconfig b/configs/evb-rk3036_defconfig

index f94e5cbd61512ed191b7e35ae58089a2703a56dd..848d0a5cb25ec0713ea1d9430b544a0d992f1bb5 100644 (file)
--- a/configs/evb-rk3036_defconfig
+++ b/configs/evb-rk3036_defconfig
@@ -15,8 +15,8 @@ CONFIG_SPL_STACK_R_ADDR=0x80000
  CONFIG_SPL_SYS_MALLOC_F_LEN=0x0
  CONFIG_DEBUG_UART_BASE=0x20068000
  CONFIG_DEBUG_UART_CLOCK=24000000
-CONFIG_DEBUG_UART=y
  CONFIG_SYS_LOAD_ADDR=0x60800800
+CONFIG_DEBUG_UART=y
  # CONFIG_ANDROID_BOOT_IMAGE is not set
  CONFIG_USE_PREBOOT=y
  CONFIG_DEFAULT_FDT_FILE="rk3036-evb.dtb"
diff --git a/configs/evb-rk3128_defconfig b/configs/evb-rk3128_defconfig

index c2f15f18308642447461e8238dc7498aa2b5a411..d232d78d6e571fea64824d5d9621e15c3240fe59 100644 (file)
--- a/configs/evb-rk3128_defconfig
+++ b/configs/evb-rk3128_defconfig
@@ -10,8 +10,8 @@ CONFIG_ROCKCHIP_RK3128=y
  # CONFIG_DEBUG_UART_BOARD_INIT is not set
  CONFIG_DEBUG_UART_BASE=0x20068000
  CONFIG_DEBUG_UART_CLOCK=24000000
-CONFIG_DEBUG_UART=y
  CONFIG_SYS_LOAD_ADDR=0x60800800
+CONFIG_DEBUG_UART=y
  CONFIG_FIT=y
  CONFIG_DEFAULT_FDT_FILE="rk3128-evb.dtb"
  # CONFIG_DISPLAY_CPUINFO is not set
diff --git a/configs/evb-rk3229_defconfig b/configs/evb-rk3229_defconfig

index 5dc6d9577e6c95ee71ec41feb4c5d83ece42b94e..8eda765fb373b797cd3656482b6d4aa32040450b 100644 (file)
--- a/configs/evb-rk3229_defconfig
+++ b/configs/evb-rk3229_defconfig
@@ -16,8 +16,8 @@ CONFIG_TARGET_EVB_RK3229=y
  CONFIG_SPL_STACK_R_ADDR=0x60600000
  CONFIG_DEBUG_UART_BASE=0x11030000
  CONFIG_DEBUG_UART_CLOCK=24000000
-CONFIG_DEBUG_UART=y
  CONFIG_SYS_LOAD_ADDR=0x61800800
+CONFIG_DEBUG_UART=y
  CONFIG_FIT=y
  CONFIG_FIT_VERBOSE=y
  CONFIG_SPL_LOAD_FIT=y
diff --git a/configs/evb-rk3288_defconfig b/configs/evb-rk3288_defconfig

index 97d4c14f659f2638b56a1e2428b98fad755b8ac8..be1ca146dde59529f706d024084c79cc8d81c57c 100644 (file)
--- a/configs/evb-rk3288_defconfig
+++ b/configs/evb-rk3288_defconfig
@@ -13,8 +13,8 @@ CONFIG_SPL_STACK_R_ADDR=0x04000000
  CONFIG_SPL_SIZE_LIMIT=0x4b000
  CONFIG_DEBUG_UART_BASE=0xff690000
  CONFIG_DEBUG_UART_CLOCK=24000000
-CONFIG_DEBUG_UART=y
  CONFIG_SYS_LOAD_ADDR=0x800800
+CONFIG_DEBUG_UART=y
  # CONFIG_ANDROID_BOOT_IMAGE is not set
  CONFIG_FIT=y
  CONFIG_FIT_VERBOSE=y
diff --git a/configs/evb-rk3308_defconfig b/configs/evb-rk3308_defconfig

index a3a319f4c247a8a9107c8d5151d758b6dea5b979..26d124827ed458c03cd790b03fb6799380f22301 100644 (file)
--- a/configs/evb-rk3308_defconfig
+++ b/configs/evb-rk3308_defconfig
@@ -13,8 +13,8 @@ CONFIG_TARGET_EVB_RK3308=y
  CONFIG_SPL_STACK_R_ADDR=0xc00000
  CONFIG_DEBUG_UART_BASE=0xFF0C0000
  CONFIG_DEBUG_UART_CLOCK=24000000
-CONFIG_DEBUG_UART=y
  CONFIG_SYS_LOAD_ADDR=0xc00800
+CONFIG_DEBUG_UART=y
  CONFIG_ANDROID_BOOT_IMAGE=y
  CONFIG_FIT=y
  CONFIG_FIT_VERBOSE=y
diff --git a/configs/evb-rk3328_defconfig b/configs/evb-rk3328_defconfig

index 8b59b8c11866a68474bb15018a2f68ccf3bbd4b0..78fb93bf97855a323eddd58ebfa0bcf03850eac6 100644 (file)
--- a/configs/evb-rk3328_defconfig
+++ b/configs/evb-rk3328_defconfig
@@ -14,9 +14,9 @@ CONFIG_SPL_STACK_R_ADDR=0x4000000
  CONFIG_SPL_SYS_MALLOC_F_LEN=0x4000
  CONFIG_DEBUG_UART_BASE=0xFF130000
  CONFIG_DEBUG_UART_CLOCK=24000000
+CONFIG_SYS_LOAD_ADDR=0x800800
  CONFIG_DEBUG_UART=y
  CONFIG_TPL_SYS_MALLOC_F_LEN=0x800
-CONFIG_SYS_LOAD_ADDR=0x800800
  # CONFIG_ANDROID_BOOT_IMAGE is not set
  CONFIG_FIT=y
  CONFIG_FIT_VERBOSE=y
diff --git a/configs/evb-rk3399_defconfig b/configs/evb-rk3399_defconfig

index 4aa49102bf3e19cfba84af576a765066dfc85d19..a18e6225800cd616e3222cac0c2d468cef866ad4 100644 (file)
--- a/configs/evb-rk3399_defconfig
+++ b/configs/evb-rk3399_defconfig
@@ -9,8 +9,8 @@ CONFIG_ROCKCHIP_RK3399=y
  CONFIG_TARGET_EVB_RK3399=y
  CONFIG_DEBUG_UART_BASE=0xFF1A0000
  CONFIG_DEBUG_UART_CLOCK=24000000
-CONFIG_DEBUG_UART=y
  CONFIG_SYS_LOAD_ADDR=0x800800
+CONFIG_DEBUG_UART=y
  CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-evb.dtb"
  CONFIG_DISPLAY_BOARDINFO_LATE=y
  # CONFIG_SPL_RAW_IMAGE_SUPPORT is not set
diff --git a/configs/evb-rk3568_defconfig b/configs/evb-rk3568_defconfig

index 435be99edfb91b570db5ba374a7f7e1c8f26fee8..a4720435838f28625a7e011402069452a13cb0a0 100644 (file)
--- a/configs/evb-rk3568_defconfig
+++ b/configs/evb-rk3568_defconfig
@@ -15,8 +15,8 @@ CONFIG_SPL_STACK_R_ADDR=0x600000
  CONFIG_TARGET_EVB_RK3568=y
  CONFIG_DEBUG_UART_BASE=0xFE660000
  CONFIG_DEBUG_UART_CLOCK=24000000
-CONFIG_DEBUG_UART=y
  CONFIG_SYS_LOAD_ADDR=0xc00800
+CONFIG_DEBUG_UART=y
  CONFIG_FIT=y
  CONFIG_FIT_VERBOSE=y
  CONFIG_SPL_LOAD_FIT=y
diff --git a/configs/evb-rv1108_defconfig b/configs/evb-rv1108_defconfig

index 06ad04b921b2d22db0c8b122f930695139321dd3..fcdef1d35492cf2c70a6e2ed21ae644186829af3 100644 (file)
--- a/configs/evb-rv1108_defconfig
+++ b/configs/evb-rv1108_defconfig
@@ -8,8 +8,8 @@ CONFIG_ROCKCHIP_RV1108=y
  # CONFIG_DEBUG_UART_BOARD_INIT is not set
  CONFIG_DEBUG_UART_BASE=0x10210000
  CONFIG_DEBUG_UART_CLOCK=24000000
-CONFIG_DEBUG_UART=y
  CONFIG_SYS_LOAD_ADDR=0x62000000
+CONFIG_DEBUG_UART=y
  CONFIG_BOOTCOMMAND="sf probe;sf read 0x62000000 0x140800 0x500000;dcache off;go 0x62000000"
  CONFIG_DEFAULT_FDT_FILE="rv1108-evb.dtb"
  # CONFIG_DISPLAY_CPUINFO is not set
diff --git a/configs/ficus-rk3399_defconfig b/configs/ficus-rk3399_defconfig

index 61c5602a3d080215881eedf92794e1fc0b9ff467..33d67818ac24abb7e82dd57f33b6354ff94e7329 100644 (file)
--- a/configs/ficus-rk3399_defconfig
+++ b/configs/ficus-rk3399_defconfig
@@ -10,8 +10,8 @@ CONFIG_ROCKCHIP_SPL_RESERVE_IRAM=0x4000
  CONFIG_TARGET_ROCK960_RK3399=y
  CONFIG_DEBUG_UART_BASE=0xFF1A0000
  CONFIG_DEBUG_UART_CLOCK=24000000
-CONFIG_DEBUG_UART=y
  CONFIG_SYS_LOAD_ADDR=0x800800
+CONFIG_DEBUG_UART=y
  CONFIG_DISPLAY_BOARDINFO_LATE=y
  # CONFIG_SPL_RAW_IMAGE_SUPPORT is not set
  CONFIG_SPL_STACK_R=y
diff --git a/configs/firefly-px30_defconfig b/configs/firefly-px30_defconfig

index 0a84ccef2678bb8f5298bb84a17f8e995486ac20..873b34b792c455b24b2c879fc493fbaa24a635c6 100644 (file)
--- a/configs/firefly-px30_defconfig
+++ b/configs/firefly-px30_defconfig
@@ -16,9 +16,9 @@ CONFIG_SPL_DRIVERS_MISC=y
  CONFIG_SPL_STACK_R_ADDR=0x600000
  CONFIG_DEBUG_UART_BASE=0xFF160000
  CONFIG_DEBUG_UART_CLOCK=24000000
+CONFIG_SYS_LOAD_ADDR=0x800800
  CONFIG_DEBUG_UART=y
  CONFIG_TPL_SYS_MALLOC_F_LEN=0x600
-CONFIG_SYS_LOAD_ADDR=0x800800
  # CONFIG_ANDROID_BOOT_IMAGE is not set
  CONFIG_FIT=y
  CONFIG_FIT_VERBOSE=y
diff --git a/configs/firefly-rk3288_defconfig b/configs/firefly-rk3288_defconfig

index 2f722082a3816c58bb4cc53888fc2f450e759b51..c66d3a410f53d7f3d72b9609fbb09e24e8ec78dd 100644 (file)
--- a/configs/firefly-rk3288_defconfig
+++ b/configs/firefly-rk3288_defconfig
@@ -13,8 +13,8 @@ CONFIG_SPL_STACK_R_ADDR=0x80000
  CONFIG_SPL_SIZE_LIMIT=0x40000
  CONFIG_DEBUG_UART_BASE=0xff690000
  CONFIG_DEBUG_UART_CLOCK=24000000
-CONFIG_DEBUG_UART=y
  CONFIG_SYS_LOAD_ADDR=0x800800
+CONFIG_DEBUG_UART=y
  # CONFIG_ANDROID_BOOT_IMAGE is not set
  CONFIG_USE_PREBOOT=y
  CONFIG_DEFAULT_FDT_FILE="rk3288-firefly.dtb"
diff --git a/configs/firefly-rk3399_defconfig b/configs/firefly-rk3399_defconfig

index fe1c019f1dbf294e207c6bee4a0d2a2c2a18ceb3..2858c35d1047a44ccfc1e03be99c3428c2357b65 100644 (file)
--- a/configs/firefly-rk3399_defconfig
+++ b/configs/firefly-rk3399_defconfig
@@ -9,8 +9,8 @@ CONFIG_ROCKCHIP_RK3399=y
  CONFIG_TARGET_EVB_RK3399=y
  CONFIG_DEBUG_UART_BASE=0xFF1A0000
  CONFIG_DEBUG_UART_CLOCK=24000000
-CONFIG_DEBUG_UART=y
  CONFIG_SYS_LOAD_ADDR=0x800800
+CONFIG_DEBUG_UART=y
  CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-firefly.dtb"
  CONFIG_DISPLAY_BOARDINFO_LATE=y
  CONFIG_MISC_INIT_R=y
diff --git a/configs/gardena-smart-gateway-at91sam_defconfig b/configs/gardena-smart-gateway-at91sam_defconfig

index 450ff86a370b739a43621cb9401d12c7c3663d10..15cf66b730009a15f4a22346c7d47c3cd0a855c2 100644 (file)
--- a/configs/gardena-smart-gateway-at91sam_defconfig
+++ b/configs/gardena-smart-gateway-at91sam_defconfig
@@ -22,8 +22,8 @@ CONFIG_SPL=y
  CONFIG_DEBUG_UART_BOARD_INIT=y
  CONFIG_DEBUG_UART_BASE=0xfffff200
  CONFIG_DEBUG_UART_CLOCK=132000000
-CONFIG_DEBUG_UART=y
  CONFIG_SYS_LOAD_ADDR=0x22000000
+CONFIG_DEBUG_UART=y
  CONFIG_FIT=y
  CONFIG_NAND_BOOT=y
  CONFIG_BOOTDELAY=0
diff --git a/configs/gardena-smart-gateway-mt7688_defconfig b/configs/gardena-smart-gateway-mt7688_defconfig

index 2b8ede6745a9dcc9661814f0fe90d791a3e79cb9..314ab9fddfd0d953056198ed9e52ffa3eb7a0d6b 100644 (file)
--- a/configs/gardena-smart-gateway-mt7688_defconfig
+++ b/configs/gardena-smart-gateway-mt7688_defconfig
@@ -14,6 +14,7 @@ CONFIG_SPL_SYS_MALLOC_F_LEN=0x80000
  CONFIG_SPL=y
  CONFIG_SYS_BOOTCOUNT_SINGLEWORD=y
  CONFIG_ENV_OFFSET_REDUND=0xB0000
+CONFIG_SYS_LOAD_ADDR=0x80100000
  CONFIG_ARCH_MTMIPS=y
  CONFIG_SOC_MT7628=y
  CONFIG_MIPS_CACHE_SETUP=y
@@ -24,7 +25,6 @@ CONFIG_MIPS_BOOT_FDT=y
  CONFIG_ENV_VARS_UBOOT_CONFIG=y
  CONFIG_HAS_BOARD_SIZE_LIMIT=y
  CONFIG_BOARD_SIZE_LIMIT=655360
-CONFIG_SYS_LOAD_ADDR=0x80100000
  CONFIG_FIT=y
  CONFIG_FIT_SIGNATURE=y
  CONFIG_LEGACY_IMAGE_FORMAT=y
diff --git a/configs/gazerbeam_defconfig b/configs/gazerbeam_defconfig

index 726d7880fe72ba55e57c948e845a266459fe338f..f2f0257071c293a8de46a47b7f8716551cb10958 100644 (file)
--- a/configs/gazerbeam_defconfig
+++ b/configs/gazerbeam_defconfig
@@ -8,6 +8,7 @@ CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="gazerbeam"
  CONFIG_IDENT_STRING=" gazerbeam 0.01"
  CONFIG_SYS_CLK_FREQ=33333333
+CONFIG_ENV_ADDR=0xFE080000
  CONFIG_MPC83xx=y
  CONFIG_TARGET_GAZERBEAM=y
  CONFIG_SYSTEM_PLL_VCO_DIV_2=y
@@ -150,7 +151,6 @@ CONFIG_OF_CONTROL=y
  CONFIG_OF_LIVE=y
  CONFIG_ENV_OVERWRITE=y
  CONFIG_SYS_REDUNDAND_ENVIRONMENT=y
-CONFIG_ENV_ADDR=0xFE080000
  CONFIG_ENV_ADDR_REDUND=0xFE090000
  CONFIG_USE_BOOTFILE=y
  CONFIG_BOOTFILE="uImage"
diff --git a/configs/geekbox_defconfig b/configs/geekbox_defconfig

index 719c6c7c65e314ae913fb8787e90484a0189a795..e211176f1014009238d80a9b74573c4b7155e0c1 100644 (file)
--- a/configs/geekbox_defconfig
+++ b/configs/geekbox_defconfig
@@ -9,8 +9,8 @@ CONFIG_ROCKCHIP_RK3368=y
  CONFIG_TARGET_GEEKBOX=y
  CONFIG_DEBUG_UART_BASE=0xFF690000
  CONFIG_DEBUG_UART_CLOCK=24000000
-CONFIG_DEBUG_UART=y
  CONFIG_SYS_LOAD_ADDR=0x800800
+CONFIG_DEBUG_UART=y
  CONFIG_DEFAULT_FDT_FILE="rockchip/rk3368-geekbox.dtb"
  # CONFIG_DISPLAY_CPUINFO is not set
  CONFIG_DISPLAY_BOARDINFO_LATE=y
diff --git a/configs/giedi_defconfig b/configs/giedi_defconfig

index 1abe7686e5f456adbc55a6a31230161a7f2cf35d..07443258ad1e5b1ea8f7fcc6fe3696554024739b 100644 (file)
--- a/configs/giedi_defconfig
+++ b/configs/giedi_defconfig
@@ -21,8 +21,8 @@ CONFIG_ENV_OFFSET_REDUND=0x2000
  CONFIG_IDENT_STRING=" ##v01.07"
  CONFIG_SPL_LOAD_IMX_CONTAINER=y
  CONFIG_IMX_CONTAINER_CFG="board/siemens/capricorn/uboot-container.cfg"
-CONFIG_REMAKE_ELF=y
  CONFIG_SYS_LOAD_ADDR=0x80280000
+CONFIG_REMAKE_ELF=y
  CONFIG_OF_BOARD_SETUP=y
  CONFIG_OF_SYSTEM_SETUP=y
  CONFIG_BOOTDELAY=3
diff --git a/configs/goflexhome_defconfig b/configs/goflexhome_defconfig

index a1bbe17d4a88f09810004075f7781d27b5757380..3d5fd830ebea43499ce33250e4cf081c755ca18e 100644 (file)
--- a/configs/goflexhome_defconfig
+++ b/configs/goflexhome_defconfig
@@ -12,8 +12,8 @@ CONFIG_ENV_SIZE=0x20000
  CONFIG_ENV_OFFSET=0xC0000
  CONFIG_DEFAULT_DEVICE_TREE="kirkwood-goflexnet"
  CONFIG_IDENT_STRING="\nSeagate GoFlex Home"
-# CONFIG_SYS_MALLOC_F is not set
  CONFIG_SYS_LOAD_ADDR=0x800000
+# CONFIG_SYS_MALLOC_F is not set
  CONFIG_BOOTDELAY=3
  CONFIG_USE_BOOTCOMMAND=y
  CONFIG_BOOTCOMMAND="setenv bootargs ${console} ${mtdparts} ${bootargs_root}; ubi part root; ubifsmount ubi:root; ubifsload 0x800000 ${kernel}; bootm 0x800000"
diff --git a/configs/gose_defconfig b/configs/gose_defconfig

index 1200f728e4cb939698f3a11bb80ba2a73d8766ae..a81dacdcaba5ff8070155c1338fed31cdadc6103 100644 (file)
--- a/configs/gose_defconfig
+++ b/configs/gose_defconfig
@@ -25,6 +25,7 @@ CONFIG_SPL=y
  CONFIG_SPL_SPI_FLASH_SUPPORT=y
  CONFIG_SPL_SPI=y
  CONFIG_SYS_LOAD_ADDR=0x50000000
+CONFIG_ENV_ADDR=0xC0000
  CONFIG_FIT=y
  CONFIG_BOOTDELAY=3
  CONFIG_SPL_BOARD_INIT=y
@@ -60,7 +61,6 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=spi0.0:256k(u-boot-spl),512k(u-boot-env1),512k
  CONFIG_OF_CONTROL=y
  CONFIG_ENV_OVERWRITE=y
  CONFIG_ENV_IS_IN_SPI_FLASH=y
-CONFIG_ENV_ADDR=0xC0000
  CONFIG_VERSION_VARIABLE=y
  CONFIG_CLK=y
  CONFIG_CLK_RENESAS=y
diff --git a/configs/guruplug_defconfig b/configs/guruplug_defconfig

index 4f7e39cfa571f53f6003449c28b37be3dd3019fd..89d78cfc175ce9fc786ae7e98c0338124c7dcba9 100644 (file)
--- a/configs/guruplug_defconfig
+++ b/configs/guruplug_defconfig
@@ -11,10 +11,10 @@ CONFIG_ENV_SIZE=0x20000
  CONFIG_ENV_OFFSET=0xE0000
  CONFIG_DEFAULT_DEVICE_TREE="kirkwood-guruplug-server-plus"
  CONFIG_IDENT_STRING="\nMarvell-GuruPlug"
+CONFIG_SYS_LOAD_ADDR=0x800000
  # CONFIG_SYS_MALLOC_F is not set
  CONFIG_HAS_BOARD_SIZE_LIMIT=y
  CONFIG_BOARD_SIZE_LIMIT=917504
-CONFIG_SYS_LOAD_ADDR=0x800000
  CONFIG_BOOTDELAY=3
  CONFIG_USE_BOOTCOMMAND=y
  CONFIG_BOOTCOMMAND="setenv bootargs ${console} ${mtdparts} ${bootargs_root}; ubi part root; ubifsmount ubi:rootfs; ubifsload 0x800000 ${kernel}; ubifsload 0x700000 ${fdt}; ubifsumount; fdt addr 0x700000; fdt resize; fdt chosen; bootz 0x800000 - 0x700000"
diff --git a/configs/helios4_defconfig b/configs/helios4_defconfig

index 62965a41fd42a04d963bd13b38fa77e75917db41..2aea48d5ecdf6d5ac0e9fc587e21404abd40fc75 100644 (file)
--- a/configs/helios4_defconfig
+++ b/configs/helios4_defconfig
@@ -16,10 +16,10 @@ CONFIG_SPL_SERIAL=y
  CONFIG_SPL=y
  CONFIG_DEBUG_UART_BASE=0xd0012000
  CONFIG_DEBUG_UART_CLOCK=250000000
+CONFIG_SYS_LOAD_ADDR=0x800000
  CONFIG_DEBUG_UART=y
  CONFIG_AHCI=y
  CONFIG_DISTRO_DEFAULTS=y
-CONFIG_SYS_LOAD_ADDR=0x800000
  CONFIG_BOOTDELAY=3
  CONFIG_USE_PREBOOT=y
  CONFIG_SYS_CONSOLE_INFO_QUIET=y
diff --git a/configs/highbank_defconfig b/configs/highbank_defconfig

index f8cf18e6d3b8e85b1b275ae3bd82a69b00666941..587edd446378edf02ef1c493cce672d953a0478a 100644 (file)
--- a/configs/highbank_defconfig
+++ b/configs/highbank_defconfig
@@ -10,8 +10,9 @@ CONFIG_ENV_SIZE=0x2000
  CONFIG_DEFAULT_DEVICE_TREE="highbank"
  CONFIG_SYS_BOOTCOUNT_ADDR=0xfff3cf0c
  CONFIG_SYS_BOOTCOUNT_SINGLEWORD=y
-CONFIG_DISTRO_DEFAULTS=y
  CONFIG_SYS_LOAD_ADDR=0x800000
+CONFIG_ENV_ADDR=0xFFF88000
+CONFIG_DISTRO_DEFAULTS=y
  CONFIG_FIT=y
  CONFIG_OF_BOARD_SETUP=y
  CONFIG_AUTOBOOT_KEYED=y
@@ -26,7 +27,6 @@ CONFIG_RESET_TO_RETRY=y
  CONFIG_MISC_INIT_R=y
  # CONFIG_CMD_SETEXPR is not set
  CONFIG_ENV_IS_IN_NVRAM=y
-CONFIG_ENV_ADDR=0xFFF88000
  CONFIG_SCSI_AHCI=y
  CONFIG_BOOTCOUNT_LIMIT=y
  # CONFIG_MMC is not set
diff --git a/configs/hihope_rzg2_defconfig b/configs/hihope_rzg2_defconfig

index 03534a078d3df3b8017b3a95104f8560fdd40203..05dd00a45fde82eaa9732ed549480a9ee2f6cf9b 100644 (file)
--- a/configs/hihope_rzg2_defconfig
+++ b/configs/hihope_rzg2_defconfig
@@ -10,8 +10,8 @@ CONFIG_DEFAULT_DEVICE_TREE="r8a774a1-hihope-rzg2m-u-boot"
  CONFIG_RCAR_GEN3=y
  CONFIG_TARGET_HIHOPE_RZG2=y
  # CONFIG_SPL is not set
-CONFIG_REMAKE_ELF=y
  CONFIG_SYS_LOAD_ADDR=0x58000000
+CONFIG_REMAKE_ELF=y
  CONFIG_FIT=y
  CONFIG_SUPPORT_RAW_INITRD=y
  CONFIG_USE_BOOTARGS=y
diff --git a/configs/hikey960_defconfig b/configs/hikey960_defconfig

index 0fc0c5cdb02f835accc16fcd15eebbce74b3d592..cb03c6f4b0083b6bcda4452f0731079a9a6103d1 100644 (file)
--- a/configs/hikey960_defconfig
+++ b/configs/hikey960_defconfig
@@ -7,8 +7,8 @@ CONFIG_NR_DRAM_BANKS=1
  CONFIG_ENV_SIZE=0x1000
  CONFIG_DEFAULT_DEVICE_TREE="hi3660-hikey960"
  CONFIG_IDENT_STRING="\nHikey960"
-CONFIG_DISTRO_DEFAULTS=y
  CONFIG_SYS_LOAD_ADDR=0x80000
+CONFIG_DISTRO_DEFAULTS=y
  CONFIG_BOOTDELAY=3
  CONFIG_USE_BOOTARGS=y
  CONFIG_BOOTARGS="console=ttyAMA6,115200n8 root=/dev/mmcblk0p2 rw"
diff --git a/configs/hikey_defconfig b/configs/hikey_defconfig

index 3bf235d3b11e02154e79c71e16687ba5829b9dcc..6f929037fdbfdef8ae9311716ebb346bc0e3f674 100644 (file)
--- a/configs/hikey_defconfig
+++ b/configs/hikey_defconfig
@@ -7,9 +7,9 @@ CONFIG_ENV_SIZE=0x1000
  CONFIG_ENV_OFFSET=0x0
  CONFIG_DEFAULT_DEVICE_TREE="hi6220-hikey"
  CONFIG_IDENT_STRING="hikey"
+CONFIG_SYS_LOAD_ADDR=0x80000
  CONFIG_DISTRO_DEFAULTS=y
  CONFIG_REMAKE_ELF=y
-CONFIG_SYS_LOAD_ADDR=0x80000
  CONFIG_BOOTDELAY=10
  CONFIG_USE_BOOTARGS=y
  CONFIG_BOOTARGS="console=ttyAMA0,115200n8 root=/dev/mmcblk0p9 rw"
diff --git a/configs/hsdk_4xd_defconfig b/configs/hsdk_4xd_defconfig

index d78261f423d4dbf0fc889b204dfd197475cc973b..9acbd18fcaf42409f18b600e51317bf49fdeb55f 100644 (file)
--- a/configs/hsdk_4xd_defconfig
+++ b/configs/hsdk_4xd_defconfig
@@ -9,8 +9,8 @@ CONFIG_DEFAULT_DEVICE_TREE="hsdk-4xd"
  CONFIG_DEBUG_UART_BASE=0xf0005000
  CONFIG_DEBUG_UART_CLOCK=33333333
  CONFIG_SYS_CLK_FREQ=500000000
-CONFIG_DEBUG_UART=y
  CONFIG_SYS_LOAD_ADDR=0x82000000
+CONFIG_DEBUG_UART=y
  CONFIG_USE_BOOTARGS=y
  CONFIG_BOOTARGS="console=ttyS0,115200n8"
  CONFIG_BOARD_EARLY_INIT_F=y
diff --git a/configs/hsdk_defconfig b/configs/hsdk_defconfig

index cd9f69721bc859a1ed6421d0bdcd6d19a41955fa..bd0c924a715a602d8a968e90618e09db7b9b4606 100644 (file)
--- a/configs/hsdk_defconfig
+++ b/configs/hsdk_defconfig
@@ -8,8 +8,8 @@ CONFIG_DEFAULT_DEVICE_TREE="hsdk"
  CONFIG_DEBUG_UART_BASE=0xf0005000
  CONFIG_DEBUG_UART_CLOCK=33333333
  CONFIG_SYS_CLK_FREQ=500000000
-CONFIG_DEBUG_UART=y
  CONFIG_SYS_LOAD_ADDR=0x82000000
+CONFIG_DEBUG_UART=y
  CONFIG_USE_BOOTARGS=y
  CONFIG_BOOTARGS="console=ttyS0,115200n8"
  CONFIG_BOARD_EARLY_INIT_F=y
diff --git a/configs/huawei_hg556a_ram_defconfig b/configs/huawei_hg556a_ram_defconfig

index 261e1bf693df5752184572d5bfbe4f2de6ad5438..fcded41eac58df760b90dcdf144b0c93d407b7d5 100644 (file)
--- a/configs/huawei_hg556a_ram_defconfig
+++ b/configs/huawei_hg556a_ram_defconfig
@@ -5,6 +5,7 @@ CONFIG_NR_DRAM_BANKS=1
  CONFIG_ENV_SIZE=0x2000
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="huawei,hg556a"
+CONFIG_SYS_LOAD_ADDR=0x80100000
  CONFIG_ARCH_BMIPS=y
  CONFIG_SOC_BMIPS_BCM6358=y
  CONFIG_MIPS_CACHE_SETUP=y
@@ -14,7 +15,6 @@ CONFIG_MIPS_CACHE_DISABLE=y
  CONFIG_MIPS_BOOT_FDT=y
  # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
  CONFIG_REMAKE_ELF=y
-CONFIG_SYS_LOAD_ADDR=0x80100000
  CONFIG_OF_STDOUT_VIA_ALIAS=y
  CONFIG_DISPLAY_CPUINFO=y
  CONFIG_HUSH_PARSER=y
diff --git a/configs/ib62x0_defconfig b/configs/ib62x0_defconfig

index 40be266556f02a2b03a74886cd807f36f63f10e4..61c5649f0960eaf37bf9140febbd59425fac5d56 100644 (file)
--- a/configs/ib62x0_defconfig
+++ b/configs/ib62x0_defconfig
@@ -11,8 +11,8 @@ CONFIG_ENV_SIZE=0x20000
  CONFIG_ENV_OFFSET=0xE0000
  CONFIG_DEFAULT_DEVICE_TREE="kirkwood-ib62x0"
  CONFIG_IDENT_STRING=" RaidSonic ICY BOX IB-NAS62x0"
-# CONFIG_SYS_MALLOC_F is not set
  CONFIG_SYS_LOAD_ADDR=0x800000
+# CONFIG_SYS_MALLOC_F is not set
  CONFIG_BOOTDELAY=3
  CONFIG_USE_BOOTCOMMAND=y
  CONFIG_BOOTCOMMAND="setenv bootargs ${console} ${mtdparts} ${bootargs_root}; ubi part root; ubifsmount ubi:rootfs; ubifsload 0x800000 ${kernel}; ubifsload 0x700000 ${fdt}; ubifsumount; fdt addr 0x700000; fdt resize; fdt chosen; bootz 0x800000 - 0x700000"
diff --git a/configs/iconnect_defconfig b/configs/iconnect_defconfig

index 1849732d31479764563da440cd7c0bd6b692f857..193160f8087d782c255067bf90d63c0627c2cd62 100644 (file)
--- a/configs/iconnect_defconfig
+++ b/configs/iconnect_defconfig
@@ -12,8 +12,8 @@ CONFIG_ENV_SIZE=0x20000
  CONFIG_ENV_OFFSET=0x80000
  CONFIG_DEFAULT_DEVICE_TREE="kirkwood-iconnect"
  CONFIG_IDENT_STRING=" Iomega iConnect"
-# CONFIG_SYS_MALLOC_F is not set
  CONFIG_SYS_LOAD_ADDR=0x800000
+# CONFIG_SYS_MALLOC_F is not set
  CONFIG_BOOTDELAY=3
  CONFIG_USE_BOOTCOMMAND=y
  CONFIG_BOOTCOMMAND="setenv bootargs ${console} ${mtdparts} ${bootargs_root}; ubi part rootfs; ubifsmount ubi:rootfs; ubifsload 0x800000 ${kernel}; bootm 0x800000"
diff --git a/configs/ids8313_defconfig b/configs/ids8313_defconfig

index e2785cb96f840bb48dd4abd7ca6f94114940c8a1..7415b1158c6ae8da61a1a80eb23b0bb686cdce64 100644 (file)
--- a/configs/ids8313_defconfig
+++ b/configs/ids8313_defconfig
@@ -5,6 +5,8 @@ CONFIG_ENV_SIZE=0x20000
  CONFIG_ENV_SECT_SIZE=0x20000
  CONFIG_SYS_BOOTCOUNT_ADDR=0x9
  CONFIG_SYS_CLK_FREQ=66000000
+CONFIG_SYS_LOAD_ADDR=0x100000
+CONFIG_ENV_ADDR=0xFFFC0000
  CONFIG_MPC83xx=y
  CONFIG_HIGH_BATS=y
  CONFIG_TARGET_IDS8313=y
@@ -117,7 +119,6 @@ CONFIG_ACR_PIPE_DEP_4=y
  CONFIG_ACR_RPTCNT_4=y
  CONFIG_LCRR_EADC_1=y
  CONFIG_LCRR_CLKDIV_2=y
-CONFIG_SYS_LOAD_ADDR=0x100000
  CONFIG_FIT=y
  CONFIG_FIT_SIGNATURE=y
  CONFIG_LEGACY_IMAGE_FORMAT=y
@@ -157,7 +158,6 @@ CONFIG_MTDIDS_DEFAULT="nor0=ff800000.flash,nand0=e1000000.flash"
  CONFIG_MTDPARTS_DEFAULT="mtdparts=ff800000.flash:7m(dum),768k(BOOT-BIN),128k(BOOT-ENV),128k(BOOT-REDENV);e1000000.flash:-(ubi)"
  CONFIG_CMD_UBI=y
  CONFIG_SYS_REDUNDAND_ENVIRONMENT=y
-CONFIG_ENV_ADDR=0xFFFC0000
  CONFIG_ENV_ADDR_REDUND=0xFFFE0000
  CONFIG_USE_BOOTFILE=y
  CONFIG_BOOTFILE="ids8313/uImage"
diff --git a/configs/imgtec_xilfpga_defconfig b/configs/imgtec_xilfpga_defconfig

index 576d68cdaec3b7158626c89e72f9813b118f9983..cc79f99330a5ceb0709f30c093be841c34188cac 100644 (file)
--- a/configs/imgtec_xilfpga_defconfig
+++ b/configs/imgtec_xilfpga_defconfig
@@ -4,12 +4,12 @@ CONFIG_SYS_MALLOC_LEN=0x40000
  CONFIG_SYS_MALLOC_F_LEN=0x600
  CONFIG_ENV_SIZE=0x4000
  CONFIG_DEFAULT_DEVICE_TREE="nexys4ddr"
+CONFIG_SYS_LOAD_ADDR=0x80500000
  CONFIG_TARGET_XILFPGA=y
  CONFIG_MIPS_CACHE_SETUP=y
  CONFIG_MIPS_CACHE_DISABLE=y
  # CONFIG_MIPS_BOOT_ENV_LEGACY is not set
  CONFIG_MIPS_BOOT_FDT=y
-CONFIG_SYS_LOAD_ADDR=0x80500000
  CONFIG_TIMESTAMP=y
  CONFIG_BOOTDELAY=5
  # CONFIG_DISPLAY_BOARDINFO is not set
diff --git a/configs/imx28_xea_defconfig b/configs/imx28_xea_defconfig

index 418bd06836a9d22eac1ef13cb70ae58d152d66ba..63d6101bb893996b448ef42a427d19400055885b 100644 (file)
--- a/configs/imx28_xea_defconfig
+++ b/configs/imx28_xea_defconfig
@@ -20,8 +20,8 @@ CONFIG_SPL=y
  CONFIG_ENV_OFFSET_REDUND=0x90000
  CONFIG_SPL_SPI_FLASH_SUPPORT=y
  CONFIG_SPL_SPI=y
-CONFIG_SPL_PAYLOAD="u-boot.img"
  CONFIG_SYS_LOAD_ADDR=0x42000000
+CONFIG_SPL_PAYLOAD="u-boot.img"
  CONFIG_FIT=y
  CONFIG_TIMESTAMP=y
  CONFIG_OF_BOARD_SETUP=y
diff --git a/configs/imx28_xea_sb_defconfig b/configs/imx28_xea_sb_defconfig

index 7c777a579d72a5c46cee86a2ede5f3524646f86c..97c7db04e12927472ea0e636a7dfa4004c9c47d9 100644 (file)
--- a/configs/imx28_xea_sb_defconfig
+++ b/configs/imx28_xea_sb_defconfig
@@ -14,8 +14,8 @@ CONFIG_TARGET_XEA=y
  CONFIG_SPL_SYS_MALLOC_F_LEN=0x1000
  CONFIG_SPL=y
  CONFIG_ENV_OFFSET_REDUND=0x90000
-CONFIG_SPL_PAYLOAD="u-boot.img"
  CONFIG_SYS_LOAD_ADDR=0x42000000
+CONFIG_SPL_PAYLOAD="u-boot.img"
  CONFIG_FIT=y
  CONFIG_OF_BOARD_SETUP=y
  CONFIG_USE_BOOTARGS=y
diff --git a/configs/imx8mm-cl-iot-gate-optee_defconfig b/configs/imx8mm-cl-iot-gate-optee_defconfig

index 064cc160e20241dcca503f6ac972cdf5f98f2fbe..2014509ed52de0e73af4e1f4ecd20d72026407b7 100644 (file)
--- a/configs/imx8mm-cl-iot-gate-optee_defconfig
+++ b/configs/imx8mm-cl-iot-gate-optee_defconfig
@@ -3,7 +3,6 @@ CONFIG_SPL_SYS_ICACHE_OFF=y
  CONFIG_SPL_SYS_DCACHE_OFF=y
  CONFIG_ARCH_IMX8M=y
  CONFIG_SYS_TEXT_BASE=0x40200000
-CONFIG_SYS_MALLOC_F_LEN=0x10000
  CONFIG_SPL_GPIO=y
  CONFIG_SPL_LIBCOMMON_SUPPORT=y
  CONFIG_SPL_LIBGENERIC_SUPPORT=y
@@ -17,8 +16,8 @@ CONFIG_SPL_MMC=y
  CONFIG_SPL_SERIAL=y
  CONFIG_SPL_DRIVERS_MISC=y
  CONFIG_SPL=y
-CONFIG_DISTRO_DEFAULTS=y
  CONFIG_SYS_LOAD_ADDR=0x40480000
+CONFIG_DISTRO_DEFAULTS=y
  CONFIG_FIT=y
  CONFIG_FIT_EXTERNAL_OFFSET=0x3000
  CONFIG_FIT_SIGNATURE=y
diff --git a/configs/imx8mm-cl-iot-gate_defconfig b/configs/imx8mm-cl-iot-gate_defconfig

index 98c1d420a9c7bb30c7e676d588124c4de506b66e..0ef9e2548e993b6f86a1dfab089c000f5ad08594 100644 (file)
--- a/configs/imx8mm-cl-iot-gate_defconfig
+++ b/configs/imx8mm-cl-iot-gate_defconfig
@@ -4,7 +4,6 @@ CONFIG_SPL_SYS_DCACHE_OFF=y
  CONFIG_ARCH_IMX8M=y
  CONFIG_SYS_TEXT_BASE=0x40200000
  CONFIG_SYS_MALLOC_LEN=0x2000000
-CONFIG_SYS_MALLOC_F_LEN=0x10000
  CONFIG_SPL_GPIO=y
  CONFIG_SPL_LIBCOMMON_SUPPORT=y
  CONFIG_SPL_LIBGENERIC_SUPPORT=y
@@ -18,8 +17,8 @@ CONFIG_SPL_MMC=y
  CONFIG_SPL_SERIAL=y
  CONFIG_SPL_DRIVERS_MISC=y
  CONFIG_SPL=y
-CONFIG_DISTRO_DEFAULTS=y
  CONFIG_SYS_LOAD_ADDR=0x40480000
+CONFIG_DISTRO_DEFAULTS=y
  CONFIG_FIT=y
  CONFIG_FIT_EXTERNAL_OFFSET=0x3000
  CONFIG_FIT_SIGNATURE=y
diff --git a/configs/imx8mm-icore-mx8mm-ctouch2_defconfig b/configs/imx8mm-icore-mx8mm-ctouch2_defconfig

index 9c8dd246a572cb97a0b262e0c7fbec06dceb46f5..c8acc2e54dc6e6646bb83ff66382f5c4ef9b2884 100644 (file)
--- a/configs/imx8mm-icore-mx8mm-ctouch2_defconfig
+++ b/configs/imx8mm-icore-mx8mm-ctouch2_defconfig
@@ -2,7 +2,6 @@ CONFIG_ARM=y
  CONFIG_ARCH_IMX8M=y
  CONFIG_SYS_TEXT_BASE=0x40200000
  CONFIG_SYS_MALLOC_LEN=0x2000000
-CONFIG_SYS_MALLOC_F_LEN=0x10000
  CONFIG_SPL_GPIO=y
  CONFIG_SPL_LIBCOMMON_SUPPORT=y
  CONFIG_SPL_LIBGENERIC_SUPPORT=y
@@ -16,8 +15,8 @@ CONFIG_SPL_MMC=y
  CONFIG_SPL_SERIAL=y
  CONFIG_SPL_DRIVERS_MISC=y
  CONFIG_SPL=y
-CONFIG_DISTRO_DEFAULTS=y
  CONFIG_SYS_LOAD_ADDR=0x40480000
+CONFIG_DISTRO_DEFAULTS=y
  CONFIG_FIT=y
  CONFIG_FIT_EXTERNAL_OFFSET=0x3000
  CONFIG_SPL_LOAD_FIT=y
diff --git a/configs/imx8mm-icore-mx8mm-edimm2.2_defconfig b/configs/imx8mm-icore-mx8mm-edimm2.2_defconfig

index 98ac1c32b1eaeae2dea0d2e25f9b0684331085b8..6dd82755c71fbe32354b29956477bdfab2682a49 100644 (file)
--- a/configs/imx8mm-icore-mx8mm-edimm2.2_defconfig
+++ b/configs/imx8mm-icore-mx8mm-edimm2.2_defconfig
@@ -2,7 +2,6 @@ CONFIG_ARM=y
  CONFIG_ARCH_IMX8M=y
  CONFIG_SYS_TEXT_BASE=0x40200000
  CONFIG_SYS_MALLOC_LEN=0x2000000
-CONFIG_SYS_MALLOC_F_LEN=0x10000
  CONFIG_SPL_GPIO=y
  CONFIG_SPL_LIBCOMMON_SUPPORT=y
  CONFIG_SPL_LIBGENERIC_SUPPORT=y
@@ -16,8 +15,8 @@ CONFIG_SPL_MMC=y
  CONFIG_SPL_SERIAL=y
  CONFIG_SPL_DRIVERS_MISC=y
  CONFIG_SPL=y
-CONFIG_DISTRO_DEFAULTS=y
  CONFIG_SYS_LOAD_ADDR=0x40480000
+CONFIG_DISTRO_DEFAULTS=y
  CONFIG_FIT=y
  CONFIG_FIT_EXTERNAL_OFFSET=0x3000
  CONFIG_SPL_LOAD_FIT=y
diff --git a/configs/imx8mm_beacon_defconfig b/configs/imx8mm_beacon_defconfig

index 8c2c22edc5a568fd9fe6088c8198c47b51e117a7..403934a1ac65b09862e5ee9c4320638ac3ff339e 100644 (file)
--- a/configs/imx8mm_beacon_defconfig
+++ b/configs/imx8mm_beacon_defconfig
@@ -2,7 +2,6 @@ CONFIG_ARM=y
  CONFIG_ARCH_IMX8M=y
  CONFIG_SYS_TEXT_BASE=0x40200000
  CONFIG_SYS_MALLOC_LEN=0x2000000
-CONFIG_SYS_MALLOC_F_LEN=0x10000
  CONFIG_SPL_GPIO=y
  CONFIG_SPL_LIBCOMMON_SUPPORT=y
  CONFIG_SPL_LIBGENERIC_SUPPORT=y
@@ -16,8 +15,8 @@ CONFIG_SPL_MMC=y
  CONFIG_SPL_SERIAL=y
  CONFIG_SPL_DRIVERS_MISC=y
  CONFIG_SPL=y
-CONFIG_LTO=y
  CONFIG_SYS_LOAD_ADDR=0x40480000
+CONFIG_LTO=y
  CONFIG_FIT=y
  CONFIG_FIT_EXTERNAL_OFFSET=0x3000
  CONFIG_SPL_LOAD_FIT=y
diff --git a/configs/imx8mm_evk_defconfig b/configs/imx8mm_evk_defconfig

index b865a31f3ed3b4d3090101ed0de25d20e631d037..81268788fa14315ce99a5eef5e3381eccfab970d 100644 (file)
--- a/configs/imx8mm_evk_defconfig
+++ b/configs/imx8mm_evk_defconfig
@@ -2,7 +2,6 @@ CONFIG_ARM=y
  CONFIG_ARCH_IMX8M=y
  CONFIG_SYS_TEXT_BASE=0x40200000
  CONFIG_SYS_MALLOC_LEN=0x2000000
-CONFIG_SYS_MALLOC_F_LEN=0x10000
  CONFIG_SPL_GPIO=y
  CONFIG_SPL_LIBCOMMON_SUPPORT=y
  CONFIG_SPL_LIBGENERIC_SUPPORT=y
@@ -16,8 +15,8 @@ CONFIG_SPL_MMC=y
  CONFIG_SPL_SERIAL=y
  CONFIG_SPL_DRIVERS_MISC=y
  CONFIG_SPL=y
-CONFIG_DISTRO_DEFAULTS=y
  CONFIG_SYS_LOAD_ADDR=0x40480000
+CONFIG_DISTRO_DEFAULTS=y
  CONFIG_FIT=y
  CONFIG_FIT_EXTERNAL_OFFSET=0x3000
  CONFIG_SPL_LOAD_FIT=y
diff --git a/configs/imx8mm_venice_defconfig b/configs/imx8mm_venice_defconfig

index da063a74c7b75c5df1ad65c7ef5d9b867fe6a889..1722aa37bec8236dd6ee43403869f1729c8e7184 100644 (file)
--- a/configs/imx8mm_venice_defconfig
+++ b/configs/imx8mm_venice_defconfig
@@ -2,7 +2,6 @@ CONFIG_ARM=y
  CONFIG_ARCH_IMX8M=y
  CONFIG_SYS_TEXT_BASE=0x40200000
  CONFIG_SYS_MALLOC_LEN=0x2000000
-CONFIG_SYS_MALLOC_F_LEN=0x10000
  CONFIG_SPL_GPIO=y
  CONFIG_SPL_LIBCOMMON_SUPPORT=y
  CONFIG_SPL_LIBGENERIC_SUPPORT=y
@@ -17,11 +16,11 @@ CONFIG_SPL_SERIAL=y
  CONFIG_SPL_DRIVERS_MISC=y
  CONFIG_SPL=y
  CONFIG_ENV_OFFSET_REDUND=0xff8000
+CONFIG_SYS_LOAD_ADDR=0x40480000
  CONFIG_SYS_MEMTEST_START=0x40000000
  CONFIG_SYS_MEMTEST_END=0x80000000
  CONFIG_LTO=y
  CONFIG_DISTRO_DEFAULTS=y
-CONFIG_SYS_LOAD_ADDR=0x40480000
  CONFIG_FIT=y
  CONFIG_FIT_EXTERNAL_OFFSET=0x3000
  CONFIG_SPL_LOAD_FIT=y
diff --git a/configs/imx8mn_beacon_2g_defconfig b/configs/imx8mn_beacon_2g_defconfig

index 08c968c1616b3194a5d1dd2cfb2e51fdc39d2761..b9426075b0c3c8acb28d91892c8ced20828984ff 100644 (file)
--- a/configs/imx8mn_beacon_2g_defconfig
+++ b/configs/imx8mn_beacon_2g_defconfig
@@ -2,7 +2,6 @@ CONFIG_ARM=y
  CONFIG_ARCH_IMX8M=y
  CONFIG_SYS_TEXT_BASE=0x40200000
  CONFIG_SYS_MALLOC_LEN=0x2000000
-CONFIG_SYS_MALLOC_F_LEN=0x10000
  CONFIG_SPL_GPIO=y
  CONFIG_SPL_LIBCOMMON_SUPPORT=y
  CONFIG_SPL_LIBGENERIC_SUPPORT=y
@@ -19,11 +18,11 @@ CONFIG_SPL_DRIVERS_MISC=y
  CONFIG_SPL_SYS_MALLOC_F_LEN=0x2000
  CONFIG_SPL=y
  CONFIG_SPL_IMX_ROMAPI_LOADADDR=0x48000000
+CONFIG_SYS_LOAD_ADDR=0x40480000
  CONFIG_SYS_MEMTEST_START=0x40000000
  CONFIG_SYS_MEMTEST_END=0x44000000
  CONFIG_LTO=y
  CONFIG_REMAKE_ELF=y
-CONFIG_SYS_LOAD_ADDR=0x40480000
  CONFIG_FIT=y
  CONFIG_FIT_EXTERNAL_OFFSET=0x3000
  CONFIG_SPL_LOAD_FIT=y
diff --git a/configs/imx8mn_beacon_defconfig b/configs/imx8mn_beacon_defconfig

index 5c53604c0e19ea61a2ddf685fd19d0630bf889c7..fdd9590e7f0c04a7cb9cc3fed0daf2df6e280124 100644 (file)
--- a/configs/imx8mn_beacon_defconfig
+++ b/configs/imx8mn_beacon_defconfig
@@ -2,7 +2,6 @@ CONFIG_ARM=y
  CONFIG_ARCH_IMX8M=y
  CONFIG_SYS_TEXT_BASE=0x40200000
  CONFIG_SYS_MALLOC_LEN=0x2000000
-CONFIG_SYS_MALLOC_F_LEN=0x10000
  CONFIG_SPL_GPIO=y
  CONFIG_SPL_LIBCOMMON_SUPPORT=y
  CONFIG_SPL_LIBGENERIC_SUPPORT=y
@@ -18,11 +17,11 @@ CONFIG_SPL_DRIVERS_MISC=y
  CONFIG_SPL_SYS_MALLOC_F_LEN=0x2000
  CONFIG_SPL=y
  CONFIG_SPL_IMX_ROMAPI_LOADADDR=0x48000000
+CONFIG_SYS_LOAD_ADDR=0x40480000
  CONFIG_SYS_MEMTEST_START=0x40000000
  CONFIG_SYS_MEMTEST_END=0x44000000
  CONFIG_LTO=y
  CONFIG_REMAKE_ELF=y
-CONFIG_SYS_LOAD_ADDR=0x40480000
  CONFIG_FIT=y
  CONFIG_FIT_EXTERNAL_OFFSET=0x3000
  CONFIG_SPL_LOAD_FIT=y
diff --git a/configs/imx8mn_ddr4_evk_defconfig b/configs/imx8mn_ddr4_evk_defconfig

index 27bf5ec05a2ab2e3218927e9fa75e7ac44a60c63..917cdb5aa9d939a6dc34456dcaed6db8b8936ad9 100644 (file)
--- a/configs/imx8mn_ddr4_evk_defconfig
+++ b/configs/imx8mn_ddr4_evk_defconfig
@@ -2,7 +2,6 @@ CONFIG_ARM=y
  CONFIG_ARCH_IMX8M=y
  CONFIG_SYS_TEXT_BASE=0x40200000
  CONFIG_SYS_MALLOC_LEN=0x2000000
-CONFIG_SYS_MALLOC_F_LEN=0x10000
  CONFIG_SPL_GPIO=y
  CONFIG_SPL_LIBCOMMON_SUPPORT=y
  CONFIG_SPL_LIBGENERIC_SUPPORT=y
@@ -17,8 +16,8 @@ CONFIG_SPL_SERIAL=y
  CONFIG_SPL_DRIVERS_MISC=y
  CONFIG_SPL=y
  CONFIG_SPL_IMX_ROMAPI_LOADADDR=0x48000000
-CONFIG_DISTRO_DEFAULTS=y
  CONFIG_SYS_LOAD_ADDR=0x40480000
+CONFIG_DISTRO_DEFAULTS=y
  CONFIG_FIT=y
  CONFIG_FIT_EXTERNAL_OFFSET=0x3000
  CONFIG_SPL_LOAD_FIT=y
diff --git a/configs/imx8mn_evk_defconfig b/configs/imx8mn_evk_defconfig

index 807d126b21e6abe84630cadfc1122a41d00f773f..7749ebe537ee2a244b79d20fafda1d5f3cf31c58 100644 (file)
--- a/configs/imx8mn_evk_defconfig
+++ b/configs/imx8mn_evk_defconfig
@@ -4,7 +4,6 @@ CONFIG_SPL_SYS_DCACHE_OFF=y
  CONFIG_ARCH_IMX8M=y
  CONFIG_SYS_TEXT_BASE=0x40200000
  CONFIG_SYS_MALLOC_LEN=0x2000000
-CONFIG_SYS_MALLOC_F_LEN=0x10000
  CONFIG_SPL_GPIO=y
  CONFIG_SPL_LIBCOMMON_SUPPORT=y
  CONFIG_SPL_LIBGENERIC_SUPPORT=y
@@ -19,8 +18,8 @@ CONFIG_SPL_SERIAL=y
  CONFIG_SPL_DRIVERS_MISC=y
  CONFIG_SPL=y
  CONFIG_SPL_IMX_ROMAPI_LOADADDR=0x48000000
-CONFIG_DISTRO_DEFAULTS=y
  CONFIG_SYS_LOAD_ADDR=0x40480000
+CONFIG_DISTRO_DEFAULTS=y
  CONFIG_FIT=y
  CONFIG_FIT_EXTERNAL_OFFSET=0x3000
  CONFIG_SPL_LOAD_FIT=y
diff --git a/configs/imx8mn_var_som_defconfig b/configs/imx8mn_var_som_defconfig

index 56c75400f8da0351c0473011d97a1183f910c187..707c58f12fd731a02794677f46510e07f942f620 100644 (file)
--- a/configs/imx8mn_var_som_defconfig
+++ b/configs/imx8mn_var_som_defconfig
@@ -2,7 +2,6 @@ CONFIG_ARM=y
  CONFIG_ARCH_IMX8M=y
  CONFIG_SYS_TEXT_BASE=0x40200000
  CONFIG_SYS_MALLOC_LEN=0x2000000
-CONFIG_SYS_MALLOC_F_LEN=0x10000
  CONFIG_SPL_GPIO=y
  CONFIG_SPL_LIBCOMMON_SUPPORT=y
  CONFIG_SPL_LIBGENERIC_SUPPORT=y
@@ -19,8 +18,8 @@ CONFIG_SPL_DRIVERS_MISC=y
  CONFIG_SPL_SYS_MALLOC_F_LEN=0x2000
  CONFIG_SPL=y
  CONFIG_SPL_IMX_ROMAPI_LOADADDR=0x48000000
-CONFIG_DISTRO_DEFAULTS=y
  CONFIG_SYS_LOAD_ADDR=0x40480000
+CONFIG_DISTRO_DEFAULTS=y
  CONFIG_FIT=y
  CONFIG_FIT_EXTERNAL_OFFSET=0x3000
  CONFIG_SPL_LOAD_FIT=y
diff --git a/configs/imx8mn_venice_defconfig b/configs/imx8mn_venice_defconfig

index 04a1099c751d8670c9d7eb748d5b31a74f3bd5f7..02d79fb479037ef3686a4db944e7728e37debd33 100644 (file)
--- a/configs/imx8mn_venice_defconfig
+++ b/configs/imx8mn_venice_defconfig
@@ -2,7 +2,6 @@ CONFIG_ARM=y
  CONFIG_ARCH_IMX8M=y
  CONFIG_SYS_TEXT_BASE=0x40200000
  CONFIG_SYS_MALLOC_LEN=0x2000000
-CONFIG_SYS_MALLOC_F_LEN=0x10000
  CONFIG_SPL_GPIO=y
  CONFIG_SPL_LIBCOMMON_SUPPORT=y
  CONFIG_SPL_LIBGENERIC_SUPPORT=y
@@ -17,11 +16,11 @@ CONFIG_SPL_SERIAL=y
  CONFIG_SPL=y
  CONFIG_ENV_OFFSET_REDUND=0xff8000
  CONFIG_SPL_IMX_ROMAPI_LOADADDR=0x48000000
+CONFIG_SYS_LOAD_ADDR=0x40480000
  CONFIG_SYS_MEMTEST_START=0x40000000
  CONFIG_SYS_MEMTEST_END=0x80000000
  CONFIG_LTO=y
  CONFIG_DISTRO_DEFAULTS=y
-CONFIG_SYS_LOAD_ADDR=0x40480000
  CONFIG_FIT=y
  CONFIG_FIT_EXTERNAL_OFFSET=0x3000
  CONFIG_SPL_LOAD_FIT=y
diff --git a/configs/imx8mp_evk_defconfig b/configs/imx8mp_evk_defconfig

index 9a8bd0203436e3edcaa306c26887432b2e6ff43a..c64b699e1053d0d040c379727a66602fdb85aa17 100644 (file)
--- a/configs/imx8mp_evk_defconfig
+++ b/configs/imx8mp_evk_defconfig
@@ -2,7 +2,6 @@ CONFIG_ARM=y
  CONFIG_ARCH_IMX8M=y
  CONFIG_SYS_TEXT_BASE=0x40200000
  CONFIG_SYS_MALLOC_LEN=0x2000000
-CONFIG_SYS_MALLOC_F_LEN=0x10000
  CONFIG_SPL_GPIO=y
  CONFIG_SPL_LIBCOMMON_SUPPORT=y
  CONFIG_SPL_LIBGENERIC_SUPPORT=y
@@ -20,8 +19,8 @@ CONFIG_SPL_SERIAL=y
  CONFIG_SPL_DRIVERS_MISC=y
  CONFIG_SPL=y
  CONFIG_SPL_IMX_ROMAPI_LOADADDR=0x48000000
-CONFIG_DISTRO_DEFAULTS=y
  CONFIG_SYS_LOAD_ADDR=0x40480000
+CONFIG_DISTRO_DEFAULTS=y
  CONFIG_FIT=y
  CONFIG_FIT_EXTERNAL_OFFSET=0x3000
  CONFIG_SPL_LOAD_FIT=y
diff --git a/configs/imx8mp_rsb3720a1_4G_defconfig b/configs/imx8mp_rsb3720a1_4G_defconfig

index a035cbdafdf560e9fa7743770e5ccedb4d613d01..c7d5b257e9c643d4dea2b57c53d656c6964e11b3 100644 (file)
--- a/configs/imx8mp_rsb3720a1_4G_defconfig
+++ b/configs/imx8mp_rsb3720a1_4G_defconfig
@@ -4,7 +4,6 @@ CONFIG_SPL_SYS_DCACHE_OFF=y
  CONFIG_ARCH_IMX8M=y
  CONFIG_SYS_TEXT_BASE=0x40200000
  CONFIG_SYS_MALLOC_LEN=0x2000000
-CONFIG_SYS_MALLOC_F_LEN=0x10000
  CONFIG_SPL_GPIO=y
  CONFIG_SPL_LIBCOMMON_SUPPORT=y
  CONFIG_SPL_LIBGENERIC_SUPPORT=y
@@ -23,9 +22,9 @@ CONFIG_SPL_DRIVERS_MISC=y
  CONFIG_SPL=y
  CONFIG_IMX_BOOTAUX=y
  CONFIG_SPL_IMX_ROMAPI_LOADADDR=0x48000000
+CONFIG_SYS_LOAD_ADDR=0x40480000
  CONFIG_DISTRO_DEFAULTS=y
  CONFIG_REMAKE_ELF=y
-CONFIG_SYS_LOAD_ADDR=0x40480000
  CONFIG_FIT=y
  CONFIG_FIT_EXTERNAL_OFFSET=0x3000
  CONFIG_FIT_SIGNATURE=y
diff --git a/configs/imx8mp_rsb3720a1_6G_defconfig b/configs/imx8mp_rsb3720a1_6G_defconfig

index e9d4fbf366be4bb7feb74d94c2f8f2f253823bf8..5e36be88ae54327730977f5853cabc0288a47c0c 100644 (file)
--- a/configs/imx8mp_rsb3720a1_6G_defconfig
+++ b/configs/imx8mp_rsb3720a1_6G_defconfig
@@ -4,7 +4,6 @@ CONFIG_SPL_SYS_DCACHE_OFF=y
  CONFIG_ARCH_IMX8M=y
  CONFIG_SYS_TEXT_BASE=0x40200000
  CONFIG_SYS_MALLOC_LEN=0x2000000
-CONFIG_SYS_MALLOC_F_LEN=0x10000
  CONFIG_SPL_GPIO=y
  CONFIG_SPL_LIBCOMMON_SUPPORT=y
  CONFIG_SPL_LIBGENERIC_SUPPORT=y
@@ -23,9 +22,9 @@ CONFIG_SPL_DRIVERS_MISC=y
  CONFIG_SPL=y
  CONFIG_IMX_BOOTAUX=y
  CONFIG_SPL_IMX_ROMAPI_LOADADDR=0x48000000
+CONFIG_SYS_LOAD_ADDR=0x40480000
  CONFIG_DISTRO_DEFAULTS=y
  CONFIG_REMAKE_ELF=y
-CONFIG_SYS_LOAD_ADDR=0x40480000
  CONFIG_FIT=y
  CONFIG_FIT_EXTERNAL_OFFSET=0x3000
  CONFIG_FIT_SIGNATURE=y
diff --git a/configs/imx8mq_cm_defconfig b/configs/imx8mq_cm_defconfig

index 04edd54d2b49ada3658a0ea38b07a359185d967f..c95934704f8d68d4788b106ea6ef01e3f822cf0f 100644 (file)
--- a/configs/imx8mq_cm_defconfig
+++ b/configs/imx8mq_cm_defconfig
@@ -18,9 +18,9 @@ CONFIG_SPL_MMC=y
  CONFIG_SPL_SERIAL=y
  CONFIG_SPL=y
  CONFIG_IMX_BOOTAUX=y
+CONFIG_SYS_LOAD_ADDR=0x40480000
  CONFIG_DISTRO_DEFAULTS=y
  CONFIG_REMAKE_ELF=y
-CONFIG_SYS_LOAD_ADDR=0x40480000
  CONFIG_FIT=y
  CONFIG_SPL_FIT_PRINT=y
  CONFIG_SPL_LOAD_FIT=y
diff --git a/configs/imx8mq_evk_defconfig b/configs/imx8mq_evk_defconfig

index 7e928c2e5c6a2368bf4ee6b946db3580d378fecc..df7a259f35a8eca9d83ff5592fbc1394a1eff8d5 100644 (file)
--- a/configs/imx8mq_evk_defconfig
+++ b/configs/imx8mq_evk_defconfig
@@ -19,9 +19,9 @@ CONFIG_SPL_SERIAL=y
  CONFIG_SPL_DRIVERS_MISC=y
  CONFIG_SPL=y
  CONFIG_IMX_BOOTAUX=y
+CONFIG_SYS_LOAD_ADDR=0x40480000
  CONFIG_DISTRO_DEFAULTS=y
  CONFIG_REMAKE_ELF=y
-CONFIG_SYS_LOAD_ADDR=0x40480000
  CONFIG_FIT=y
  CONFIG_FIT_EXTERNAL_OFFSET=0x3000
  CONFIG_SPL_LOAD_FIT=y
diff --git a/configs/imx8mq_phanbell_defconfig b/configs/imx8mq_phanbell_defconfig

index 4adf7e4f1a89f7ca3f477dd03adeb14d918769f6..a86311b7cc52f197283dfec71df0b381f67da9a1 100644 (file)
--- a/configs/imx8mq_phanbell_defconfig
+++ b/configs/imx8mq_phanbell_defconfig
@@ -20,8 +20,8 @@ CONFIG_SPL_SERIAL=y
  CONFIG_SPL_DRIVERS_MISC=y
  CONFIG_SPL=y
  CONFIG_IMX_BOOTAUX=y
-CONFIG_REMAKE_ELF=y
  CONFIG_SYS_LOAD_ADDR=0x40480000
+CONFIG_REMAKE_ELF=y
  CONFIG_FIT=y
  CONFIG_FIT_EXTERNAL_OFFSET=0x3000
  CONFIG_SPL_LOAD_FIT=y
diff --git a/configs/imx8qm_mek_defconfig b/configs/imx8qm_mek_defconfig

index 6a593f8480b7e8f0a33435a9653d884809b44be1..090bd3c85e5d6cf5946ba8d7ff5da83b1698d389 100644 (file)
--- a/configs/imx8qm_mek_defconfig
+++ b/configs/imx8qm_mek_defconfig
@@ -19,8 +19,8 @@ CONFIG_SPL_DRIVERS_MISC=y
  CONFIG_SPL=y
  CONFIG_SPL_LOAD_IMX_CONTAINER=y
  CONFIG_IMX_CONTAINER_CFG="board/freescale/imx8qm_mek/uboot-container.cfg"
-CONFIG_REMAKE_ELF=y
  CONFIG_SYS_LOAD_ADDR=0x80280000
+CONFIG_REMAKE_ELF=y
  CONFIG_OF_BOARD_SETUP=y
  CONFIG_OF_SYSTEM_SETUP=y
  CONFIG_BOOTDELAY=3
diff --git a/configs/imx8qm_rom7720_a1_4G_defconfig b/configs/imx8qm_rom7720_a1_4G_defconfig

index 7d6c12c960955d51cd858ff392d2ee55dca6861b..fa1968b356bdb6cbea18c08bd97bdac52422cbe4 100644 (file)
--- a/configs/imx8qm_rom7720_a1_4G_defconfig
+++ b/configs/imx8qm_rom7720_a1_4G_defconfig
@@ -15,8 +15,8 @@ CONFIG_SPL_MMC=y
  CONFIG_SPL_SERIAL=y
  CONFIG_SPL_DRIVERS_MISC=y
  CONFIG_SPL=y
-CONFIG_REMAKE_ELF=y
  CONFIG_SYS_LOAD_ADDR=0x80280000
+CONFIG_REMAKE_ELF=y
  CONFIG_FIT=y
  CONFIG_SPL_LOAD_FIT=y
  CONFIG_SPL_FIT_GENERATOR="arch/arm/mach-imx/mkimage_fit_atf.sh"
diff --git a/configs/imx8qxp_mek_defconfig b/configs/imx8qxp_mek_defconfig

index 0d5c3f5a7a51f39607a91b50fc40794e05dadacb..36cf67e7e12237f155fba6a9546064030931e8e2 100644 (file)
--- a/configs/imx8qxp_mek_defconfig
+++ b/configs/imx8qxp_mek_defconfig
@@ -19,8 +19,8 @@ CONFIG_SPL_DRIVERS_MISC=y
  CONFIG_SPL=y
  CONFIG_SPL_LOAD_IMX_CONTAINER=y
  CONFIG_IMX_CONTAINER_CFG="board/freescale/imx8qxp_mek/uboot-container.cfg"
-CONFIG_REMAKE_ELF=y
  CONFIG_SYS_LOAD_ADDR=0x80280000
+CONFIG_REMAKE_ELF=y
  CONFIG_OF_BOARD_SETUP=y
  CONFIG_OF_SYSTEM_SETUP=y
  CONFIG_BOOTDELAY=3
diff --git a/configs/imx8ulp_evk_defconfig b/configs/imx8ulp_evk_defconfig

index dafb817f9f3e5b3b21828055b3bfe1b22f41590a..cf0a3691536324c47e5cfae996cf695aef17c225 100644 (file)
--- a/configs/imx8ulp_evk_defconfig
+++ b/configs/imx8ulp_evk_defconfig
@@ -18,9 +18,9 @@ CONFIG_SPL_DRIVERS_MISC=y
  CONFIG_SPL=y
  CONFIG_SPL_IMX_ROMAPI_LOADADDR=0x88000000
  CONFIG_SPL_LOAD_IMX_CONTAINER=y
+CONFIG_SYS_LOAD_ADDR=0x80480000
  CONFIG_DISTRO_DEFAULTS=y
  CONFIG_REMAKE_ELF=y
-CONFIG_SYS_LOAD_ADDR=0x80480000
  CONFIG_FIT=y
  CONFIG_FIT_VERBOSE=y
  CONFIG_BOOTDELAY=0
diff --git a/configs/imxrt1020-evk_defconfig b/configs/imxrt1020-evk_defconfig

index dafa4a505adce35a722be58fa73ca34a83a6e242..5bef665bc0cc894c4df505d0b29f6ac12c028beb 100644 (file)
--- a/configs/imxrt1020-evk_defconfig
+++ b/configs/imxrt1020-evk_defconfig
@@ -16,8 +16,8 @@ CONFIG_SPL_MMC=y
  CONFIG_SPL_SERIAL=y
  CONFIG_SPL_SIZE_LIMIT=0x20000
  CONFIG_SPL=y
-CONFIG_DISTRO_DEFAULTS=y
  CONFIG_SYS_LOAD_ADDR=0x20209000
+CONFIG_DISTRO_DEFAULTS=y
  CONFIG_SD_BOOT=y
  # CONFIG_USE_BOOTCOMMAND is not set
  # CONFIG_DISPLAY_CPUINFO is not set
diff --git a/configs/imxrt1050-evk_defconfig b/configs/imxrt1050-evk_defconfig

index 09dcc9e6e38d373d4e58c08b2646bb7b5a1519d3..118e7177a203a452a63afeaf22d120174350f321 100644 (file)
--- a/configs/imxrt1050-evk_defconfig
+++ b/configs/imxrt1050-evk_defconfig
@@ -18,8 +18,8 @@ CONFIG_SPL_MMC=y
  CONFIG_SPL_SERIAL=y
  CONFIG_SPL_SIZE_LIMIT=0x20000
  CONFIG_SPL=y
-CONFIG_DISTRO_DEFAULTS=y
  CONFIG_SYS_LOAD_ADDR=0x20209000
+CONFIG_DISTRO_DEFAULTS=y
  CONFIG_SD_BOOT=y
  # CONFIG_USE_BOOTCOMMAND is not set
  CONFIG_SYS_CONSOLE_ENV_OVERWRITE=y
diff --git a/configs/inetspace_v2_defconfig b/configs/inetspace_v2_defconfig

index 1082444cf3d9c289443541cc58f09dd4e0c610a8..2b41fc1ba1961fbd6ff0193e07f9a589fca743db 100644 (file)
--- a/configs/inetspace_v2_defconfig
+++ b/configs/inetspace_v2_defconfig
@@ -12,8 +12,9 @@ CONFIG_ENV_OFFSET=0x70000
  CONFIG_ENV_SECT_SIZE=0x10000
  CONFIG_DEFAULT_DEVICE_TREE="kirkwood-is2"
  CONFIG_IDENT_STRING=" IS v2"
-# CONFIG_SYS_MALLOC_F is not set
  CONFIG_SYS_LOAD_ADDR=0x800000
+CONFIG_ENV_ADDR=0x70000
+# CONFIG_SYS_MALLOC_F is not set
  CONFIG_BOOTDELAY=3
  CONFIG_USE_BOOTARGS=y
  CONFIG_BOOTARGS="console=ttyS0,115200"
@@ -44,7 +45,6 @@ CONFIG_OF_CONTROL=y
  CONFIG_ENV_OVERWRITE=y
  CONFIG_ENV_IS_IN_SPI_FLASH=y
  CONFIG_ENV_SPI_MAX_HZ=20000000
-CONFIG_ENV_ADDR=0x70000
  CONFIG_NETCONSOLE=y
  CONFIG_SYS_FAULT_ECHO_LINK_DOWN=y
  CONFIG_DM=y
diff --git a/configs/integratorcp_cm1136_defconfig b/configs/integratorcp_cm1136_defconfig

index d0bcac9d631b3d5b98c1ac9558e08d20ec0269bf..8bafa694db445677b8ac214b64c746273668a484 100644 (file)
--- a/configs/integratorcp_cm1136_defconfig
+++ b/configs/integratorcp_cm1136_defconfig
@@ -8,6 +8,7 @@ CONFIG_NR_DRAM_BANKS=1
  CONFIG_ENV_SIZE=0x2000
  CONFIG_ENV_SECT_SIZE=0x40000
  CONFIG_SYS_LOAD_ADDR=0x7fc0
+CONFIG_ENV_ADDR=0x24F00000
  CONFIG_SYS_MONITOR_BASE=0x27F40000
  CONFIG_USE_BOOTARGS=y
  CONFIG_BOOTARGS="root=/dev/mtdblock0 console=ttyAMA0 console=tty ip=dhcp netdev=27,0,0xfc800000,0xfc800010,eth0 video=clcdfb:0"
@@ -23,7 +24,6 @@ CONFIG_SYS_PROMPT="Integrator-CP # "
  CONFIG_CMD_IMLS=y
  CONFIG_CMD_ARMFLASH=y
  # CONFIG_CMD_SETEXPR is not set
-CONFIG_ENV_ADDR=0x24F00000
  CONFIG_USE_BOOTFILE=y
  CONFIG_BOOTFILE="uImage"
  # CONFIG_MMC is not set
diff --git a/configs/integratorcp_cm920t_defconfig b/configs/integratorcp_cm920t_defconfig

index 788464104ffee1282a60d333590dfedbc730dcc0..59bee63e6138629eabbb8a9f8975ebc888ead45c 100644 (file)
--- a/configs/integratorcp_cm920t_defconfig
+++ b/configs/integratorcp_cm920t_defconfig
@@ -8,6 +8,7 @@ CONFIG_NR_DRAM_BANKS=1
  CONFIG_ENV_SIZE=0x2000
  CONFIG_ENV_SECT_SIZE=0x40000
  CONFIG_SYS_LOAD_ADDR=0x7fc0
+CONFIG_ENV_ADDR=0x24F00000
  CONFIG_SYS_MONITOR_BASE=0x27F40000
  CONFIG_USE_BOOTARGS=y
  CONFIG_BOOTARGS="root=/dev/mtdblock0 console=ttyAMA0 console=tty ip=dhcp netdev=27,0,0xfc800000,0xfc800010,eth0 video=clcdfb:0"
@@ -23,7 +24,6 @@ CONFIG_SYS_PROMPT="Integrator-CP # "
  CONFIG_CMD_IMLS=y
  CONFIG_CMD_ARMFLASH=y
  # CONFIG_CMD_SETEXPR is not set
-CONFIG_ENV_ADDR=0x24F00000
  CONFIG_USE_BOOTFILE=y
  CONFIG_BOOTFILE="uImage"
  # CONFIG_MMC is not set
diff --git a/configs/integratorcp_cm926ejs_defconfig b/configs/integratorcp_cm926ejs_defconfig

index 2ea7229b06b0ee056bd2b5a0fb1430e9d4e4566e..e4c91956651fcc6511a2d28935817b8d9cf8adae 100644 (file)
--- a/configs/integratorcp_cm926ejs_defconfig
+++ b/configs/integratorcp_cm926ejs_defconfig
@@ -8,6 +8,7 @@ CONFIG_NR_DRAM_BANKS=1
  CONFIG_ENV_SIZE=0x2000
  CONFIG_ENV_SECT_SIZE=0x40000
  CONFIG_SYS_LOAD_ADDR=0x7fc0
+CONFIG_ENV_ADDR=0x24F00000
  CONFIG_SYS_MONITOR_BASE=0x27F40000
  CONFIG_USE_BOOTARGS=y
  CONFIG_BOOTARGS="root=/dev/mtdblock0 console=ttyAMA0 console=tty ip=dhcp netdev=27,0,0xfc800000,0xfc800010,eth0 video=clcdfb:0"
@@ -23,7 +24,6 @@ CONFIG_SYS_PROMPT="Integrator-CP # "
  CONFIG_CMD_IMLS=y
  CONFIG_CMD_ARMFLASH=y
  # CONFIG_CMD_SETEXPR is not set
-CONFIG_ENV_ADDR=0x24F00000
  CONFIG_USE_BOOTFILE=y
  CONFIG_BOOTFILE="uImage"
  # CONFIG_MMC is not set
diff --git a/configs/integratorcp_cm946es_defconfig b/configs/integratorcp_cm946es_defconfig

index ef451a6d288475499bec9ee84247e3e98eff10e7..d228c8ad554a57192c1566ccfafda52db58aa1d1 100644 (file)
--- a/configs/integratorcp_cm946es_defconfig
+++ b/configs/integratorcp_cm946es_defconfig
@@ -8,6 +8,7 @@ CONFIG_NR_DRAM_BANKS=1
  CONFIG_ENV_SIZE=0x2000
  CONFIG_ENV_SECT_SIZE=0x40000
  CONFIG_SYS_LOAD_ADDR=0x7fc0
+CONFIG_ENV_ADDR=0x24F00000
  CONFIG_SYS_MONITOR_BASE=0x27F40000
  CONFIG_USE_BOOTARGS=y
  CONFIG_BOOTARGS="root=/dev/mtdblock0 console=ttyAMA0 console=tty ip=dhcp netdev=27,0,0xfc800000,0xfc800010,eth0 video=clcdfb:0"
@@ -23,7 +24,6 @@ CONFIG_SYS_PROMPT="Integrator-CP # "
  CONFIG_CMD_IMLS=y
  CONFIG_CMD_ARMFLASH=y
  # CONFIG_CMD_SETEXPR is not set
-CONFIG_ENV_ADDR=0x24F00000
  CONFIG_USE_BOOTFILE=y
  CONFIG_BOOTFILE="uImage"
  # CONFIG_MMC is not set
diff --git a/configs/iot_devkit_defconfig b/configs/iot_devkit_defconfig

index 14a30e3b1b7b5e8548f28c2785274bd01ea7fae8..3cf315eae628607c77898092465a239be3c15e37 100644 (file)
--- a/configs/iot_devkit_defconfig
+++ b/configs/iot_devkit_defconfig
@@ -9,8 +9,8 @@ CONFIG_SYS_MALLOC_LEN=0x10000
  CONFIG_ENV_SIZE=0x1000
  CONFIG_DEFAULT_DEVICE_TREE="iot_devkit"
  CONFIG_SYS_CLK_FREQ=16000000
-CONFIG_LOCALVERSION="-iotdk-1.0"
  CONFIG_SYS_LOAD_ADDR=0x30000000
+CONFIG_LOCALVERSION="-iotdk-1.0"
  # CONFIG_ARCH_FIXUP_FDT_MEMORY is not set
  CONFIG_SYS_PROMPT="IoTDK# "
  # CONFIG_CMD_BOOTD is not set
diff --git a/configs/jethub_j100_defconfig b/configs/jethub_j100_defconfig

index b1953e3307be8b89113d000429309244ce350477..1c6db9f6a0d74115538fd0d6e9a4d9ff877a65ae 100644 (file)
--- a/configs/jethub_j100_defconfig
+++ b/configs/jethub_j100_defconfig
@@ -11,9 +11,9 @@ CONFIG_MESON_AXG=y
  CONFIG_DEBUG_UART_BASE=0xff803000
  CONFIG_DEBUG_UART_CLOCK=24000000
  CONFIG_IDENT_STRING=" jethubj100"
+CONFIG_SYS_LOAD_ADDR=0x01000000
  CONFIG_DEBUG_UART=y
  CONFIG_REMAKE_ELF=y
-CONFIG_SYS_LOAD_ADDR=0x01000000
  CONFIG_OF_BOARD_SETUP=y
  # CONFIG_DISPLAY_CPUINFO is not set
  CONFIG_MISC_INIT_R=y
diff --git a/configs/jethub_j80_defconfig b/configs/jethub_j80_defconfig

index f3a2325d68f154a94111adb526ff44ef787d4e9c..8746ed9c80fdcc844dd2e2c30b87060d7ce84df6 100644 (file)
--- a/configs/jethub_j80_defconfig
+++ b/configs/jethub_j80_defconfig
@@ -11,9 +11,9 @@ CONFIG_MESON_GXL=y
  CONFIG_DEBUG_UART_BASE=0xc81004c0
  CONFIG_DEBUG_UART_CLOCK=24000000
  CONFIG_IDENT_STRING=" jethubj80"
+CONFIG_SYS_LOAD_ADDR=0x01000000
  CONFIG_DEBUG_UART=y
  CONFIG_REMAKE_ELF=y
-CONFIG_SYS_LOAD_ADDR=0x01000000
  CONFIG_OF_BOARD_SETUP=y
  CONFIG_CONSOLE_MUX=y
  # CONFIG_DISPLAY_CPUINFO is not set
diff --git a/configs/khadas-edge-captain-rk3399_defconfig b/configs/khadas-edge-captain-rk3399_defconfig

index 6b9df2a230e77ba050d05a4b8643fc5626b95bec..fffdc61e0fc065ee31c16f688ae180cdd150db69 100644 (file)
--- a/configs/khadas-edge-captain-rk3399_defconfig
+++ b/configs/khadas-edge-captain-rk3399_defconfig
@@ -9,8 +9,8 @@ CONFIG_ROCKCHIP_RK3399=y
  CONFIG_TARGET_EVB_RK3399=y
  CONFIG_DEBUG_UART_BASE=0xFF1A0000
  CONFIG_DEBUG_UART_CLOCK=24000000
-CONFIG_DEBUG_UART=y
  CONFIG_SYS_LOAD_ADDR=0x800800
+CONFIG_DEBUG_UART=y
  CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-khadas-edge-captain.dtb"
  CONFIG_DISPLAY_BOARDINFO_LATE=y
  # CONFIG_SPL_RAW_IMAGE_SUPPORT is not set
diff --git a/configs/khadas-edge-rk3399_defconfig b/configs/khadas-edge-rk3399_defconfig

index 47b2b34bf0faeea0677e432894e220d8befc2fd6..2c6f32e27cfd3d02c7e19e2a5c2485644ddf7c3c 100644 (file)
--- a/configs/khadas-edge-rk3399_defconfig
+++ b/configs/khadas-edge-rk3399_defconfig
@@ -9,8 +9,8 @@ CONFIG_ROCKCHIP_RK3399=y
  CONFIG_TARGET_EVB_RK3399=y
  CONFIG_DEBUG_UART_BASE=0xFF1A0000
  CONFIG_DEBUG_UART_CLOCK=24000000
-CONFIG_DEBUG_UART=y
  CONFIG_SYS_LOAD_ADDR=0x800800
+CONFIG_DEBUG_UART=y
  CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-khadas-edge.dtb"
  CONFIG_DISPLAY_BOARDINFO_LATE=y
  # CONFIG_SPL_RAW_IMAGE_SUPPORT is not set
diff --git a/configs/khadas-edge-v-rk3399_defconfig b/configs/khadas-edge-v-rk3399_defconfig

index 1caadb0c8280823e23ccbb57e042f0bcad9b5da7..3f3cf7d2cdae3d838899152bc341788904cfacf6 100644 (file)
--- a/configs/khadas-edge-v-rk3399_defconfig
+++ b/configs/khadas-edge-v-rk3399_defconfig
@@ -9,8 +9,8 @@ CONFIG_ROCKCHIP_RK3399=y
  CONFIG_TARGET_EVB_RK3399=y
  CONFIG_DEBUG_UART_BASE=0xFF1A0000
  CONFIG_DEBUG_UART_CLOCK=24000000
-CONFIG_DEBUG_UART=y
  CONFIG_SYS_LOAD_ADDR=0x800800
+CONFIG_DEBUG_UART=y
  CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-khadas-edge-v.dtb"
  CONFIG_DISPLAY_BOARDINFO_LATE=y
  # CONFIG_SPL_RAW_IMAGE_SUPPORT is not set
diff --git a/configs/khadas-vim2_defconfig b/configs/khadas-vim2_defconfig

index 9fbb0396cf9271dc249a03426f5f007004bc066e..8345e47bddbc50ffb50fc9c04b58ce45284b62c0 100644 (file)
--- a/configs/khadas-vim2_defconfig
+++ b/configs/khadas-vim2_defconfig
@@ -9,9 +9,9 @@ CONFIG_MESON_GXM=y
  CONFIG_DEBUG_UART_BASE=0xc81004c0
  CONFIG_DEBUG_UART_CLOCK=24000000
  CONFIG_IDENT_STRING=" khadas-vim2"
+CONFIG_SYS_LOAD_ADDR=0x1000000
  CONFIG_DEBUG_UART=y
  CONFIG_REMAKE_ELF=y
-CONFIG_SYS_LOAD_ADDR=0x1000000
  CONFIG_OF_BOARD_SETUP=y
  CONFIG_CONSOLE_MUX=y
  # CONFIG_DISPLAY_CPUINFO is not set
diff --git a/configs/khadas-vim3_android_ab_defconfig b/configs/khadas-vim3_android_ab_defconfig

index 45cefd85e0a626cd1e15c818f7ccd2e7eac2159f..df97c519fecfb05b038f52b4df1afc3bac365068 100644 (file)
--- a/configs/khadas-vim3_android_ab_defconfig
+++ b/configs/khadas-vim3_android_ab_defconfig
@@ -11,9 +11,9 @@ CONFIG_MESON_G12A=y
  CONFIG_DEBUG_UART_BASE=0xff803000
  CONFIG_DEBUG_UART_CLOCK=24000000
  CONFIG_IDENT_STRING=" khadas-vim3"
+CONFIG_SYS_LOAD_ADDR=0x1000000
  CONFIG_DEBUG_UART=y
  CONFIG_REMAKE_ELF=y
-CONFIG_SYS_LOAD_ADDR=0x1000000
  CONFIG_OF_BOARD_SETUP=y
  # CONFIG_DISPLAY_CPUINFO is not set
  CONFIG_MISC_INIT_R=y
diff --git a/configs/khadas-vim3_android_defconfig b/configs/khadas-vim3_android_defconfig

index 0c3fd6ddb3888374874cc628ae17842661157bf1..299150cf207126029e748d9c1a8522c8c8a99163 100644 (file)
--- a/configs/khadas-vim3_android_defconfig
+++ b/configs/khadas-vim3_android_defconfig
@@ -11,9 +11,9 @@ CONFIG_MESON_G12A=y
  CONFIG_DEBUG_UART_BASE=0xff803000
  CONFIG_DEBUG_UART_CLOCK=24000000
  CONFIG_IDENT_STRING=" khadas-vim3"
+CONFIG_SYS_LOAD_ADDR=0x1000000
  CONFIG_DEBUG_UART=y
  CONFIG_REMAKE_ELF=y
-CONFIG_SYS_LOAD_ADDR=0x1000000
  CONFIG_OF_BOARD_SETUP=y
  # CONFIG_DISPLAY_CPUINFO is not set
  CONFIG_MISC_INIT_R=y
diff --git a/configs/khadas-vim3_defconfig b/configs/khadas-vim3_defconfig

index f85e2eebe78d47b331ff1aa11d53e8b0809d57bd..75ccfba2aeaf9b7dda54fc6f12e8afb486c801e8 100644 (file)
--- a/configs/khadas-vim3_defconfig
+++ b/configs/khadas-vim3_defconfig
@@ -10,9 +10,9 @@ CONFIG_MESON_G12A=y
  CONFIG_DEBUG_UART_BASE=0xff803000
  CONFIG_DEBUG_UART_CLOCK=24000000
  CONFIG_IDENT_STRING=" khadas-vim3"
+CONFIG_SYS_LOAD_ADDR=0x1000000
  CONFIG_DEBUG_UART=y
  CONFIG_REMAKE_ELF=y
-CONFIG_SYS_LOAD_ADDR=0x1000000
  CONFIG_OF_BOARD_SETUP=y
  # CONFIG_DISPLAY_CPUINFO is not set
  CONFIG_MISC_INIT_R=y
diff --git a/configs/khadas-vim3l_android_ab_defconfig b/configs/khadas-vim3l_android_ab_defconfig

index b2bdf9692278f2cde7f0ae4607569d15c415751b..615f2d9b6c07bf38a8e6c9bada2cee478d92d5cc 100644 (file)
--- a/configs/khadas-vim3l_android_ab_defconfig
+++ b/configs/khadas-vim3l_android_ab_defconfig
@@ -11,9 +11,9 @@ CONFIG_MESON_G12A=y
  CONFIG_DEBUG_UART_BASE=0xff803000
  CONFIG_DEBUG_UART_CLOCK=24000000
  CONFIG_IDENT_STRING=" khadas-vim3l"
+CONFIG_SYS_LOAD_ADDR=0x1000000
  CONFIG_DEBUG_UART=y
  CONFIG_REMAKE_ELF=y
-CONFIG_SYS_LOAD_ADDR=0x1000000
  CONFIG_OF_BOARD_SETUP=y
  # CONFIG_DISPLAY_CPUINFO is not set
  CONFIG_MISC_INIT_R=y
diff --git a/configs/khadas-vim3l_android_defconfig b/configs/khadas-vim3l_android_defconfig

index 085919b9741ab567e98a30d6cc57b14069c85fc0..ad4eb281f159d9b14f87f9244c56c3762fc237b2 100644 (file)
--- a/configs/khadas-vim3l_android_defconfig
+++ b/configs/khadas-vim3l_android_defconfig
@@ -11,9 +11,9 @@ CONFIG_MESON_G12A=y
  CONFIG_DEBUG_UART_BASE=0xff803000
  CONFIG_DEBUG_UART_CLOCK=24000000
  CONFIG_IDENT_STRING=" khadas-vim3l"
+CONFIG_SYS_LOAD_ADDR=0x1000000
  CONFIG_DEBUG_UART=y
  CONFIG_REMAKE_ELF=y
-CONFIG_SYS_LOAD_ADDR=0x1000000
  CONFIG_OF_BOARD_SETUP=y
  # CONFIG_DISPLAY_CPUINFO is not set
  CONFIG_MISC_INIT_R=y
diff --git a/configs/khadas-vim3l_defconfig b/configs/khadas-vim3l_defconfig

index c41624502548dee268dbab033b60063886f2d3b0..2e1eabca6524028ee4f2babfbc0d543998bdd8cc 100644 (file)
--- a/configs/khadas-vim3l_defconfig
+++ b/configs/khadas-vim3l_defconfig
@@ -10,9 +10,9 @@ CONFIG_MESON_G12A=y
  CONFIG_DEBUG_UART_BASE=0xff803000
  CONFIG_DEBUG_UART_CLOCK=24000000
  CONFIG_IDENT_STRING=" khadas-vim3l"
+CONFIG_SYS_LOAD_ADDR=0x1000000
  CONFIG_DEBUG_UART=y
  CONFIG_REMAKE_ELF=y
-CONFIG_SYS_LOAD_ADDR=0x1000000
  CONFIG_OF_BOARD_SETUP=y
  # CONFIG_DISPLAY_CPUINFO is not set
  CONFIG_MISC_INIT_R=y
diff --git a/configs/khadas-vim_defconfig b/configs/khadas-vim_defconfig

index 93b0fb00dcee81596e76e758da9844d719805e48..e450d27244aae4247de71f602d933b7862d5d27e 100644 (file)
--- a/configs/khadas-vim_defconfig
+++ b/configs/khadas-vim_defconfig
@@ -9,9 +9,9 @@ CONFIG_MESON_GXL=y
  CONFIG_DEBUG_UART_BASE=0xc81004c0
  CONFIG_DEBUG_UART_CLOCK=24000000
  CONFIG_IDENT_STRING=" khadas-vim"
+CONFIG_SYS_LOAD_ADDR=0x1000000
  CONFIG_DEBUG_UART=y
  CONFIG_REMAKE_ELF=y
-CONFIG_SYS_LOAD_ADDR=0x1000000
  CONFIG_OF_BOARD_SETUP=y
  CONFIG_CONSOLE_MUX=y
  # CONFIG_DISPLAY_CPUINFO is not set
diff --git a/configs/km_kirkwood_128m16_defconfig b/configs/km_kirkwood_128m16_defconfig

index be8468318d3cc5e5fb85fce56d98fd79b07d0370..830dc2e39bb0b88fc05417221ad8fdeb70db5732 100644 (file)
--- a/configs/km_kirkwood_128m16_defconfig
+++ b/configs/km_kirkwood_128m16_defconfig
@@ -12,8 +12,8 @@ CONFIG_DEFAULT_DEVICE_TREE="kirkwood-km_kirkwood"
  CONFIG_BOOTCOUNT_BOOTLIMIT=3
  CONFIG_ENV_OFFSET_REDUND=0x2000
  CONFIG_IDENT_STRING="\nHitachi Power Grids Kirkwood 128M16"
-CONFIG_KM_KIRKWOOD_128M16=y
  CONFIG_SYS_LOAD_ADDR=0x800000
+CONFIG_KM_KIRKWOOD_128M16=y
  CONFIG_AUTOBOOT_KEYED=y
  CONFIG_AUTOBOOT_PROMPT="Hit <SPACE> key to stop autoboot in %2ds\n"
  CONFIG_AUTOBOOT_STOP_STR=" "
diff --git a/configs/km_kirkwood_defconfig b/configs/km_kirkwood_defconfig

index 540a5e00a7bab8a08e1115dd305d988d4929ecf3..fa155443496648f62673cdf938036f2c6f91f076 100644 (file)
--- a/configs/km_kirkwood_defconfig
+++ b/configs/km_kirkwood_defconfig
@@ -12,8 +12,8 @@ CONFIG_DEFAULT_DEVICE_TREE="kirkwood-km_kirkwood"
  CONFIG_BOOTCOUNT_BOOTLIMIT=3
  CONFIG_ENV_OFFSET_REDUND=0x2000
  CONFIG_IDENT_STRING="\nHitachi Power Grids Kirkwood"
-CONFIG_KM_KIRKWOOD=y
  CONFIG_SYS_LOAD_ADDR=0x800000
+CONFIG_KM_KIRKWOOD=y
  CONFIG_AUTOBOOT_KEYED=y
  CONFIG_AUTOBOOT_PROMPT="Hit <SPACE> key to stop autoboot in %2ds\n"
  CONFIG_AUTOBOOT_STOP_STR=" "
diff --git a/configs/km_kirkwood_pci_defconfig b/configs/km_kirkwood_pci_defconfig

index 8c2b5f4b0fabd3bf8e9d449a31942dc7e0c411e0..bc2568e06813d1797694a8b201e3117e51acbf08 100644 (file)
--- a/configs/km_kirkwood_pci_defconfig
+++ b/configs/km_kirkwood_pci_defconfig
@@ -12,9 +12,9 @@ CONFIG_DEFAULT_DEVICE_TREE="kirkwood-km_kirkwood"
  CONFIG_BOOTCOUNT_BOOTLIMIT=3
  CONFIG_ENV_OFFSET_REDUND=0x2000
  CONFIG_IDENT_STRING="\nHitachi Power Grids Kirkwood PCI"
+CONFIG_SYS_LOAD_ADDR=0x800000
  CONFIG_KM_FPGA_CONFIG=y
  CONFIG_KM_KIRKWOOD_PCI=y
-CONFIG_SYS_LOAD_ADDR=0x800000
  CONFIG_AUTOBOOT_KEYED=y
  CONFIG_AUTOBOOT_PROMPT="Hit <SPACE> key to stop autoboot in %2ds\n"
  CONFIG_AUTOBOOT_STOP_STR=" "
diff --git a/configs/kmcent2_defconfig b/configs/kmcent2_defconfig

index aebe78fbf53d519d9449c8ada6a26cdeab3aaf35..e90c23879010f6233769c4116a490691bda00fb9 100644 (file)
--- a/configs/kmcent2_defconfig
+++ b/configs/kmcent2_defconfig
@@ -6,6 +6,7 @@ CONFIG_ENV_SECT_SIZE=0x20000
  CONFIG_DEFAULT_DEVICE_TREE="kmcent2"
  CONFIG_SYS_BOOTCOUNT_ADDR=0xFB000020
  CONFIG_SYS_CLK_FREQ=66666666
+CONFIG_ENV_ADDR=0xebf20000
  CONFIG_MPC85xx=y
  CONFIG_TARGET_KMCENT2=y
  CONFIG_MPC85XX_HAVE_RESET_VECTOR=y
@@ -43,7 +44,6 @@ CONFIG_OF_CONTROL=y
  CONFIG_ENV_OVERWRITE=y
  CONFIG_ENV_IS_IN_FLASH=y
  CONFIG_SYS_REDUNDAND_ENVIRONMENT=y
-CONFIG_ENV_ADDR=0xebf20000
  CONFIG_ENV_ADDR_REDUND=0xebf00000
  CONFIG_USE_ETHPRIME=y
  CONFIG_ETHPRIME="fm1-mac5"
diff --git a/configs/kmcoge5ne_defconfig b/configs/kmcoge5ne_defconfig

index 4ca2fdccf8289865280b9e2f33057d48545c6f09..00c98483b303c46c155eae088e2fc3cfe9f77263 100644 (file)
--- a/configs/kmcoge5ne_defconfig
+++ b/configs/kmcoge5ne_defconfig
@@ -5,6 +5,8 @@ CONFIG_ENV_SECT_SIZE=0x20000
  CONFIG_DEFAULT_DEVICE_TREE="kmcoge5ne"
  CONFIG_BOOTCOUNT_BOOTLIMIT=3
  CONFIG_SYS_CLK_FREQ=66000000
+CONFIG_SYS_LOAD_ADDR=0x100000
+CONFIG_ENV_ADDR=0xF00C0000
  CONFIG_MPC83xx=y
  CONFIG_HIGH_BATS=y
  CONFIG_TARGET_KMCOGE5NE=y
@@ -157,7 +159,6 @@ CONFIG_LCRR_EADC_2=y
  CONFIG_LCRR_CLKDIV_4=y
  CONFIG_83XX_PCICLK=0x3ef1480
  CONFIG_KM_DEF_NETDEV="eth1"
-CONFIG_SYS_LOAD_ADDR=0x100000
  CONFIG_OF_BOARD_SETUP=y
  CONFIG_OF_STDOUT_VIA_ALIAS=y
  CONFIG_AUTOBOOT_KEYED=y
@@ -189,7 +190,6 @@ CONFIG_CMD_UBI=y
  # CONFIG_CMD_UBIFS is not set
  CONFIG_ENV_OVERWRITE=y
  CONFIG_SYS_REDUNDAND_ENVIRONMENT=y
-CONFIG_ENV_ADDR=0xF00C0000
  CONFIG_ENV_ADDR_REDUND=0xF00E0000
  CONFIG_USE_ETHPRIME=y
  CONFIG_ETHPRIME="UEC0"
diff --git a/configs/kmcoge5un_defconfig b/configs/kmcoge5un_defconfig

index 9d6cf1c39532a5b9d6fcefb2cbb415d072c3a2f5..ae9d6d97993bf039ae24ff9a55c3de6a45cf0eda 100644 (file)
--- a/configs/kmcoge5un_defconfig
+++ b/configs/kmcoge5un_defconfig
@@ -13,10 +13,10 @@ CONFIG_DEFAULT_DEVICE_TREE="kirkwood-km_kirkwood"
  CONFIG_BOOTCOUNT_BOOTLIMIT=3
  CONFIG_ENV_OFFSET_REDUND=0xD0000
  CONFIG_IDENT_STRING="\nHitachi Power Grids COGE5UN"
+CONFIG_SYS_LOAD_ADDR=0x800000
  CONFIG_PIGGY_MAC_ADDRESS_OFFSET=3
  CONFIG_KM_ENV_IS_IN_SPI_NOR=y
  CONFIG_KM_PIGGY4_88E6352=y
-CONFIG_SYS_LOAD_ADDR=0x800000
  CONFIG_AUTOBOOT_KEYED=y
  CONFIG_AUTOBOOT_PROMPT="Hit <SPACE> key to stop autoboot in %2ds\n"
  CONFIG_AUTOBOOT_STOP_STR=" "
diff --git a/configs/kmeter1_defconfig b/configs/kmeter1_defconfig

index 96756581103dc73c4fb37126d32063ccc7729650..ae29991c492d7a8e8f06c4a270ca1b6d252e6eee 100644 (file)
--- a/configs/kmeter1_defconfig
+++ b/configs/kmeter1_defconfig
@@ -6,6 +6,8 @@ CONFIG_ENV_SECT_SIZE=0x20000
  CONFIG_DEFAULT_DEVICE_TREE="kmeter1"
  CONFIG_BOOTCOUNT_BOOTLIMIT=3
  CONFIG_SYS_CLK_FREQ=66000000
+CONFIG_SYS_LOAD_ADDR=0x100000
+CONFIG_ENV_ADDR=0xF00C0000
  CONFIG_MPC83xx=y
  CONFIG_HIGH_BATS=y
  CONFIG_TARGET_KMETER1=y
@@ -127,7 +129,6 @@ CONFIG_LCRR_DBYP_PLL_BYPASSED=y
  CONFIG_LCRR_EADC_2=y
  CONFIG_LCRR_CLKDIV_4=y
  CONFIG_KM_DEF_NETDEV="eth2"
-CONFIG_SYS_LOAD_ADDR=0x100000
  CONFIG_OF_BOARD_SETUP=y
  CONFIG_OF_STDOUT_VIA_ALIAS=y
  CONFIG_AUTOBOOT_KEYED=y
@@ -158,7 +159,6 @@ CONFIG_CMD_UBI=y
  # CONFIG_CMD_UBIFS is not set
  CONFIG_ENV_OVERWRITE=y
  CONFIG_SYS_REDUNDAND_ENVIRONMENT=y
-CONFIG_ENV_ADDR=0xF00C0000
  CONFIG_ENV_ADDR_REDUND=0xF00E0000
  CONFIG_USE_ETHPRIME=y
  CONFIG_ETHPRIME="UEC0"
diff --git a/configs/kmnusa_defconfig b/configs/kmnusa_defconfig

index 6380351e12dc344a3364a310f281ba8273f99320..3fc6413dd4f34033375c7d0d615b26a42655616d 100644 (file)
--- a/configs/kmnusa_defconfig
+++ b/configs/kmnusa_defconfig
@@ -13,11 +13,11 @@ CONFIG_DEFAULT_DEVICE_TREE="kirkwood-km_kirkwood"
  CONFIG_BOOTCOUNT_BOOTLIMIT=3
  CONFIG_ENV_OFFSET_REDUND=0xD0000
  CONFIG_IDENT_STRING="\nHitachi Power Grids Kirkwood"
+CONFIG_SYS_LOAD_ADDR=0x800000
  CONFIG_KM_FPGA_CONFIG=y
  CONFIG_KM_ENV_IS_IN_SPI_NOR=y
  CONFIG_KM_PIGGY4_88E6352=y
  CONFIG_KM_NUSA=y
-CONFIG_SYS_LOAD_ADDR=0x800000
  CONFIG_AUTOBOOT_KEYED=y
  CONFIG_AUTOBOOT_PROMPT="Hit <SPACE> key to stop autoboot in %2ds\n"
  CONFIG_AUTOBOOT_STOP_STR=" "
diff --git a/configs/kmopti2_defconfig b/configs/kmopti2_defconfig

index 254c9fe3b6f1d820fb06492a43cbbb6d987aaa05..45bc3eb3b4d57913b911d358bb55d442e9c5b802 100644 (file)
--- a/configs/kmopti2_defconfig
+++ b/configs/kmopti2_defconfig
@@ -5,6 +5,8 @@ CONFIG_ENV_SECT_SIZE=0x20000
  CONFIG_DEFAULT_DEVICE_TREE="kmopti2"
  CONFIG_BOOTCOUNT_BOOTLIMIT=3
  CONFIG_SYS_CLK_FREQ=66000000
+CONFIG_SYS_LOAD_ADDR=0x100000
+CONFIG_ENV_ADDR=0xF00C0000
  CONFIG_MPC83xx=y
  CONFIG_HIGH_BATS=y
  CONFIG_TARGET_KMOPTI2=y
@@ -140,7 +142,6 @@ CONFIG_ACR_PARKM_USB_I2C1_BOOT=y
  CONFIG_LCRR_EADC_1=y
  CONFIG_LCRR_CLKDIV_2=y
  CONFIG_83XX_PCICLK=0x3ef1480
-CONFIG_SYS_LOAD_ADDR=0x100000
  CONFIG_OF_BOARD_SETUP=y
  CONFIG_OF_STDOUT_VIA_ALIAS=y
  CONFIG_AUTOBOOT_KEYED=y
@@ -170,7 +171,6 @@ CONFIG_CMD_UBI=y
  # CONFIG_CMD_UBIFS is not set
  CONFIG_ENV_OVERWRITE=y
  CONFIG_SYS_REDUNDAND_ENVIRONMENT=y
-CONFIG_ENV_ADDR=0xF00C0000
  CONFIG_ENV_ADDR_REDUND=0xF00E0000
  CONFIG_USE_ETHPRIME=y
  CONFIG_ETHPRIME="UEC0"
diff --git a/configs/kmsupx5_defconfig b/configs/kmsupx5_defconfig

index c041ac0db1e30c8297413161921b91ea69f261fb..08d217986d74b296dcfca5ba538c59b768b3308c 100644 (file)
--- a/configs/kmsupx5_defconfig
+++ b/configs/kmsupx5_defconfig
@@ -5,6 +5,8 @@ CONFIG_ENV_SECT_SIZE=0x20000
  CONFIG_DEFAULT_DEVICE_TREE="kmsupm5"
  CONFIG_BOOTCOUNT_BOOTLIMIT=3
  CONFIG_SYS_CLK_FREQ=66000000
+CONFIG_SYS_LOAD_ADDR=0x100000
+CONFIG_ENV_ADDR=0xF00C0000
  CONFIG_MPC83xx=y
  CONFIG_HIGH_BATS=y
  CONFIG_TARGET_KMSUPX5=y
@@ -120,7 +122,6 @@ CONFIG_ACR_PARKM_USB_I2C1_BOOT=y
  CONFIG_LCRR_EADC_1=y
  CONFIG_LCRR_CLKDIV_2=y
  CONFIG_83XX_PCICLK=0x3ef1480
-CONFIG_SYS_LOAD_ADDR=0x100000
  CONFIG_OF_BOARD_SETUP=y
  CONFIG_OF_STDOUT_VIA_ALIAS=y
  CONFIG_AUTOBOOT_KEYED=y
@@ -149,7 +150,6 @@ CONFIG_CMD_UBI=y
  # CONFIG_CMD_UBIFS is not set
  CONFIG_ENV_OVERWRITE=y
  CONFIG_SYS_REDUNDAND_ENVIRONMENT=y
-CONFIG_ENV_ADDR=0xF00C0000
  CONFIG_ENV_ADDR_REDUND=0xF00E0000
  CONFIG_USE_ETHPRIME=y
  CONFIG_ETHPRIME="UEC0"
diff --git a/configs/kmsuse2_defconfig b/configs/kmsuse2_defconfig

index 579bf0dc07e957d71d70a07092787a1b5650115d..f0a8b28c08b81e91959823e5c278cf53e197770b 100644 (file)
--- a/configs/kmsuse2_defconfig
+++ b/configs/kmsuse2_defconfig
@@ -13,12 +13,12 @@ CONFIG_DEFAULT_DEVICE_TREE="kirkwood-km_kirkwood"
  CONFIG_BOOTCOUNT_BOOTLIMIT=3
  CONFIG_ENV_OFFSET_REDUND=0xD0000
  CONFIG_IDENT_STRING="\nHitachi Power Grids Kirkwood"
+CONFIG_SYS_LOAD_ADDR=0x800000
  CONFIG_KM_FPGA_CONFIG=y
  CONFIG_KM_FPGA_FORCE_CONFIG=y
  CONFIG_KM_FPGA_NO_RESET=y
  CONFIG_KM_ENV_IS_IN_SPI_NOR=y
  CONFIG_KM_SUSE2=y
-CONFIG_SYS_LOAD_ADDR=0x800000
  CONFIG_AUTOBOOT_KEYED=y
  CONFIG_AUTOBOOT_PROMPT="Hit <SPACE> key to stop autoboot in %2ds\n"
  CONFIG_AUTOBOOT_STOP_STR=" "
diff --git a/configs/kmtegr1_defconfig b/configs/kmtegr1_defconfig

index c9cad08f2802d92ad11c448175cfca96fb05c7ea..a752672ead196821015bbdc7c22846c698146941 100644 (file)
--- a/configs/kmtegr1_defconfig
+++ b/configs/kmtegr1_defconfig
@@ -5,6 +5,8 @@ CONFIG_ENV_SECT_SIZE=0x20000
  CONFIG_DEFAULT_DEVICE_TREE="kmtegr1"
  CONFIG_BOOTCOUNT_BOOTLIMIT=3
  CONFIG_SYS_CLK_FREQ=66000000
+CONFIG_SYS_LOAD_ADDR=0x100000
+CONFIG_ENV_ADDR=0xF0100000
  CONFIG_MPC83xx=y
  CONFIG_HIGH_BATS=y
  CONFIG_TARGET_KMTEGR1=y
@@ -119,7 +121,6 @@ CONFIG_LCRR_EADC_1=y
  CONFIG_LCRR_CLKDIV_2=y
  CONFIG_83XX_PCICLK=0x3ef1480
  CONFIG_KM_DEF_NETDEV="eth1"
-CONFIG_SYS_LOAD_ADDR=0x100000
  CONFIG_OF_BOARD_SETUP=y
  CONFIG_OF_STDOUT_VIA_ALIAS=y
  CONFIG_AUTOBOOT_KEYED=y
@@ -150,7 +151,6 @@ CONFIG_CMD_UBI=y
  # CONFIG_CMD_UBIFS is not set
  CONFIG_ENV_OVERWRITE=y
  CONFIG_SYS_REDUNDAND_ENVIRONMENT=y
-CONFIG_ENV_ADDR=0xF0100000
  CONFIG_ENV_ADDR_REDUND=0xF0120000
  CONFIG_USE_ETHPRIME=y
  CONFIG_ETHPRIME="UEC0"
diff --git a/configs/kmtepr2_defconfig b/configs/kmtepr2_defconfig

index 48c1a720f960f1f2c854757b7fa0cc1731ea86b7..a0cca5b9f280e1d5a356b1f2a80dcc526339ecbc 100644 (file)
--- a/configs/kmtepr2_defconfig
+++ b/configs/kmtepr2_defconfig
@@ -5,6 +5,8 @@ CONFIG_ENV_SECT_SIZE=0x20000
  CONFIG_DEFAULT_DEVICE_TREE="kmtepr2"
  CONFIG_BOOTCOUNT_BOOTLIMIT=3
  CONFIG_SYS_CLK_FREQ=66000000
+CONFIG_SYS_LOAD_ADDR=0x100000
+CONFIG_ENV_ADDR=0xF00C0000
  CONFIG_MPC83xx=y
  CONFIG_HIGH_BATS=y
  CONFIG_TARGET_KMTEPR2=y
@@ -140,7 +142,6 @@ CONFIG_ACR_PARKM_USB_I2C1_BOOT=y
  CONFIG_LCRR_EADC_1=y
  CONFIG_LCRR_CLKDIV_2=y
  CONFIG_83XX_PCICLK=0x3ef1480
-CONFIG_SYS_LOAD_ADDR=0x100000
  CONFIG_OF_BOARD_SETUP=y
  CONFIG_OF_STDOUT_VIA_ALIAS=y
  CONFIG_AUTOBOOT_KEYED=y
@@ -169,7 +170,6 @@ CONFIG_CMD_UBI=y
  # CONFIG_CMD_UBIFS is not set
  CONFIG_ENV_OVERWRITE=y
  CONFIG_SYS_REDUNDAND_ENVIRONMENT=y
-CONFIG_ENV_ADDR=0xF00C0000
  CONFIG_ENV_ADDR_REDUND=0xF00E0000
  CONFIG_USE_ETHPRIME=y
  CONFIG_ETHPRIME="UEC0"
diff --git a/configs/koelsch_defconfig b/configs/koelsch_defconfig

index 145e7bbd523f1543c91a98bd52ff3a3933d3b01b..c3a88f692672daa5873dbbd239b2ef19acf2a2c1 100644 (file)
--- a/configs/koelsch_defconfig
+++ b/configs/koelsch_defconfig
@@ -25,6 +25,7 @@ CONFIG_SPL=y
  CONFIG_SPL_SPI_FLASH_SUPPORT=y
  CONFIG_SPL_SPI=y
  CONFIG_SYS_LOAD_ADDR=0x50000000
+CONFIG_ENV_ADDR=0xC0000
  CONFIG_FIT=y
  CONFIG_BOOTDELAY=3
  CONFIG_SPL_BOARD_INIT=y
@@ -60,7 +61,6 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=spi0.0:256k(u-boot-spl),512k(u-boot-env1),512k
  CONFIG_OF_CONTROL=y
  CONFIG_ENV_OVERWRITE=y
  CONFIG_ENV_IS_IN_SPI_FLASH=y
-CONFIG_ENV_ADDR=0xC0000
  CONFIG_VERSION_VARIABLE=y
  CONFIG_CLK=y
  CONFIG_CLK_RENESAS=y
diff --git a/configs/kontron-sl-mx8mm_defconfig b/configs/kontron-sl-mx8mm_defconfig

index 030e2251e71818a565c70f4da631045234ff5304..fa612aa04ebe646b531408d42108c51607be3033 100644 (file)
--- a/configs/kontron-sl-mx8mm_defconfig
+++ b/configs/kontron-sl-mx8mm_defconfig
@@ -2,7 +2,6 @@ CONFIG_ARM=y
  CONFIG_ARCH_IMX8M=y
  CONFIG_SYS_TEXT_BASE=0x40200000
  CONFIG_SYS_MALLOC_LEN=0x4000000
-CONFIG_SYS_MALLOC_F_LEN=0x10000
  CONFIG_SPL_GPIO=y
  CONFIG_SPL_LIBCOMMON_SUPPORT=y
  CONFIG_SPL_LIBGENERIC_SUPPORT=y
@@ -19,8 +18,8 @@ CONFIG_SPL_MMC=y
  CONFIG_SPL_SERIAL=y
  CONFIG_BOOTCOUNT_BOOTLIMIT=3
  CONFIG_SPL=y
-CONFIG_DISTRO_DEFAULTS=y
  CONFIG_SYS_LOAD_ADDR=0x42000000
+CONFIG_DISTRO_DEFAULTS=y
  CONFIG_FIT=y
  CONFIG_FIT_EXTERNAL_OFFSET=0x3000
  CONFIG_SPL_LOAD_FIT=y
diff --git a/configs/kontron_pitx_imx8m_defconfig b/configs/kontron_pitx_imx8m_defconfig

index eaf838944737a4ba84420e2410834a516edb1c7f..8443f02313d6d649964d359dbdd595ad56165f81 100644 (file)
--- a/configs/kontron_pitx_imx8m_defconfig
+++ b/configs/kontron_pitx_imx8m_defconfig
@@ -19,9 +19,9 @@ CONFIG_SPL_SERIAL=y
  CONFIG_SPL_DRIVERS_MISC=y
  CONFIG_SPL=y
  CONFIG_IMX_BOOTAUX=y
+CONFIG_SYS_LOAD_ADDR=0x40480000
  CONFIG_DISTRO_DEFAULTS=y
  CONFIG_REMAKE_ELF=y
-CONFIG_SYS_LOAD_ADDR=0x40480000
  CONFIG_FIT=y
  CONFIG_SPL_FIT_PRINT=y
  CONFIG_SPL_LOAD_FIT=y
diff --git a/configs/kontron_sl28_defconfig b/configs/kontron_sl28_defconfig

index 2ee1a17cf558aeb61f94a1478c7e2da836bc8055..2f91d5532843cf9a1e3492bee2bcf9897c69fd63 100644 (file)
--- a/configs/kontron_sl28_defconfig
+++ b/configs/kontron_sl28_defconfig
@@ -19,9 +19,9 @@ CONFIG_ENV_OFFSET_REDUND=0x3f0000
  CONFIG_SPL_SPI_FLASH_SUPPORT=y
  CONFIG_SPL_SPI=y
  # CONFIG_PSCI_RESET is not set
+CONFIG_SYS_LOAD_ADDR=0x82000000
  CONFIG_AHCI=y
  CONFIG_DISTRO_DEFAULTS=y
-CONFIG_SYS_LOAD_ADDR=0x82000000
  CONFIG_MP=y
  CONFIG_FIT=y
  CONFIG_SPL_LOAD_FIT=y
diff --git a/configs/kylin-rk3036_defconfig b/configs/kylin-rk3036_defconfig

index 6c7df1e24dd86c33315adc5c6d9cef20185471c0..0111f30e14d7c1c056b58200a1bffaef8d999e0c 100644 (file)
--- a/configs/kylin-rk3036_defconfig
+++ b/configs/kylin-rk3036_defconfig
@@ -17,8 +17,8 @@ CONFIG_SPL_STACK_R_ADDR=0x80000
  CONFIG_SPL_SYS_MALLOC_F_LEN=0x0
  CONFIG_DEBUG_UART_BASE=0x20068000
  CONFIG_DEBUG_UART_CLOCK=24000000
-CONFIG_DEBUG_UART=y
  CONFIG_SYS_LOAD_ADDR=0x60800800
+CONFIG_DEBUG_UART=y
  # CONFIG_ANDROID_BOOT_IMAGE is not set
  CONFIG_USE_PREBOOT=y
  CONFIG_DEFAULT_FDT_FILE="rk3036-kylin.dtb"
diff --git a/configs/kzm9g_defconfig b/configs/kzm9g_defconfig

index e790072e539f541f24c2b2c0502060e30f8a3125..5da371587d17b52b5fe666c07624a69f820b9e2d 100644 (file)
--- a/configs/kzm9g_defconfig
+++ b/configs/kzm9g_defconfig
@@ -10,6 +10,7 @@ CONFIG_ENV_SECT_SIZE=0x40000
  CONFIG_ARCH_RMOBILE_BOARD_STRING="KMC KZM-A9-GT"
  CONFIG_TARGET_KZM9G=y
  CONFIG_SYS_LOAD_ADDR=0x43000000
+CONFIG_ENV_ADDR=0x40000
  CONFIG_BOOTDELAY=3
  CONFIG_USE_BOOTARGS=y
  CONFIG_BOOTARGS="root=/dev/null console=ttySC4,115200"
@@ -25,7 +26,6 @@ CONFIG_NFS_TIMEOUT=10000
  CONFIG_CMD_PING=y
  CONFIG_CMD_FAT=y
  CONFIG_ENV_IS_IN_FLASH=y
-CONFIG_ENV_ADDR=0x40000
  CONFIG_VERSION_VARIABLE=y
  CONFIG_SYS_I2C_LEGACY=y
  CONFIG_SYS_I2C_SH=y
diff --git a/configs/lager_defconfig b/configs/lager_defconfig

index 5185169a9af6a62a1073a6dcae19b03ba0790a60..503c7e05dfbe5bf9a112501b854b6edc56ce82bc 100644 (file)
--- a/configs/lager_defconfig
+++ b/configs/lager_defconfig
@@ -25,6 +25,7 @@ CONFIG_SPL=y
  CONFIG_SPL_SPI_FLASH_SUPPORT=y
  CONFIG_SPL_SPI=y
  CONFIG_SYS_LOAD_ADDR=0x50000000
+CONFIG_ENV_ADDR=0xC0000
  CONFIG_FIT=y
  CONFIG_BOOTDELAY=3
  CONFIG_SPL_BOARD_INIT=y
@@ -60,7 +61,6 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=spi0.0:256k(u-boot-spl),512k(u-boot-env1),512k
  CONFIG_OF_CONTROL=y
  CONFIG_ENV_OVERWRITE=y
  CONFIG_ENV_IS_IN_SPI_FLASH=y
-CONFIG_ENV_ADDR=0xC0000
  CONFIG_VERSION_VARIABLE=y
  CONFIG_CLK=y
  CONFIG_CLK_RENESAS=y
diff --git a/configs/leez-rk3399_defconfig b/configs/leez-rk3399_defconfig

index 0f8a795d2a1e4996c5920b490149e83e0b74c327..e2bb140bb882b7c27e7637d6178922de00388d79 100644 (file)
--- a/configs/leez-rk3399_defconfig
+++ b/configs/leez-rk3399_defconfig
@@ -9,8 +9,8 @@ CONFIG_ROCKCHIP_RK3399=y
  CONFIG_TARGET_EVB_RK3399=y
  CONFIG_DEBUG_UART_BASE=0xFF1A0000
  CONFIG_DEBUG_UART_CLOCK=24000000
-CONFIG_DEBUG_UART=y
  CONFIG_SYS_LOAD_ADDR=0x800800
+CONFIG_DEBUG_UART=y
  CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-leez-p710.dtb"
  CONFIG_DISPLAY_BOARDINFO_LATE=y
  CONFIG_SPL_STACK_R=y
diff --git a/configs/libretech-ac_defconfig b/configs/libretech-ac_defconfig

index be6fbe881ad45fec61ed7a262413e46c6ab997f2..1e51b7a6537900de005c6b1a5cf20a39c2659331 100644 (file)
--- a/configs/libretech-ac_defconfig
+++ b/configs/libretech-ac_defconfig
@@ -12,9 +12,9 @@ CONFIG_MESON_GXL=y
  CONFIG_DEBUG_UART_BASE=0xc81004c0
  CONFIG_DEBUG_UART_CLOCK=24000000
  CONFIG_IDENT_STRING=" libretech-ac"
+CONFIG_SYS_LOAD_ADDR=0x1000000
  CONFIG_DEBUG_UART=y
  CONFIG_REMAKE_ELF=y
-CONFIG_SYS_LOAD_ADDR=0x1000000
  CONFIG_OF_BOARD_SETUP=y
  CONFIG_USE_PREBOOT=y
  # CONFIG_DISPLAY_CPUINFO is not set
diff --git a/configs/libretech-cc_defconfig b/configs/libretech-cc_defconfig

index fe678d6d273165fe62446c2d0e04802b8c400fe3..5506f386f2ee09be8f2abed763a464e555ea3e3b 100644 (file)
--- a/configs/libretech-cc_defconfig
+++ b/configs/libretech-cc_defconfig
@@ -9,9 +9,9 @@ CONFIG_MESON_GXL=y
  CONFIG_DEBUG_UART_BASE=0xc81004c0
  CONFIG_DEBUG_UART_CLOCK=24000000
  CONFIG_IDENT_STRING=" libretech-cc"
+CONFIG_SYS_LOAD_ADDR=0x1000000
  CONFIG_DEBUG_UART=y
  CONFIG_REMAKE_ELF=y
-CONFIG_SYS_LOAD_ADDR=0x1000000
  CONFIG_OF_BOARD_SETUP=y
  # CONFIG_DISPLAY_CPUINFO is not set
  CONFIG_MISC_INIT_R=y
diff --git a/configs/libretech-cc_v2_defconfig b/configs/libretech-cc_v2_defconfig

index 4dd668f3c305784204610ce118d34eefe357300d..a3fb6bbbda29c3fb06f0bfddc8cc2672855493b7 100644 (file)
--- a/configs/libretech-cc_v2_defconfig
+++ b/configs/libretech-cc_v2_defconfig
@@ -11,9 +11,9 @@ CONFIG_MESON_GXL=y
  CONFIG_DEBUG_UART_BASE=0xc81004c0
  CONFIG_DEBUG_UART_CLOCK=24000000
  CONFIG_IDENT_STRING=" libretech-cc-v2"
+CONFIG_SYS_LOAD_ADDR=0x1000000
  CONFIG_DEBUG_UART=y
  CONFIG_REMAKE_ELF=y
-CONFIG_SYS_LOAD_ADDR=0x1000000
  CONFIG_OF_BOARD_SETUP=y
  CONFIG_USE_PREBOOT=y
  # CONFIG_DISPLAY_CPUINFO is not set
diff --git a/configs/libretech-s905d-pc_defconfig b/configs/libretech-s905d-pc_defconfig

index 0ef70287603ba8e6e84e319d8c0e716bf11aff23..8ee69ca5ec818f962e7e16d53e7e2ffcf8934446 100644 (file)
--- a/configs/libretech-s905d-pc_defconfig
+++ b/configs/libretech-s905d-pc_defconfig
@@ -12,9 +12,9 @@ CONFIG_MESON_GXL=y
  CONFIG_DEBUG_UART_BASE=0xc81004c0
  CONFIG_DEBUG_UART_CLOCK=24000000
  CONFIG_IDENT_STRING=" libretech-s905d-pc"
+CONFIG_SYS_LOAD_ADDR=0x1000000
  CONFIG_DEBUG_UART=y
  CONFIG_REMAKE_ELF=y
-CONFIG_SYS_LOAD_ADDR=0x1000000
  CONFIG_OF_BOARD_SETUP=y
  CONFIG_USE_PREBOOT=y
  # CONFIG_DISPLAY_CPUINFO is not set
diff --git a/configs/libretech-s912-pc_defconfig b/configs/libretech-s912-pc_defconfig

index a4f6d54fa5bb72b6211b23a6eb1c75d55e1d453c..224a3fb02fc207641e856442164be343acef25d9 100644 (file)
--- a/configs/libretech-s912-pc_defconfig
+++ b/configs/libretech-s912-pc_defconfig
@@ -11,9 +11,9 @@ CONFIG_MESON_GXM=y
  CONFIG_DEBUG_UART_BASE=0xc81004c0
  CONFIG_DEBUG_UART_CLOCK=24000000
  CONFIG_IDENT_STRING=" libretech-s912-pc"
+CONFIG_SYS_LOAD_ADDR=0x1000000
  CONFIG_DEBUG_UART=y
  CONFIG_REMAKE_ELF=y
-CONFIG_SYS_LOAD_ADDR=0x1000000
  CONFIG_OF_BOARD_SETUP=y
  CONFIG_USE_PREBOOT=y
  # CONFIG_DISPLAY_CPUINFO is not set
diff --git a/configs/linkit-smart-7688_defconfig b/configs/linkit-smart-7688_defconfig

index a68b3ba8a0246a960682778acf213c973ee340c5..52e5524726fa2bdba245fb12d47cde5d4e2dd5bc 100644 (file)
--- a/configs/linkit-smart-7688_defconfig
+++ b/configs/linkit-smart-7688_defconfig
@@ -11,6 +11,7 @@ CONFIG_DEFAULT_DEVICE_TREE="linkit-smart-7688"
  CONFIG_SPL_SERIAL=y
  CONFIG_SPL_SYS_MALLOC_F_LEN=0x40000
  CONFIG_SPL=y
+CONFIG_SYS_LOAD_ADDR=0x80100000
  CONFIG_ARCH_MTMIPS=y
  CONFIG_SOC_MT7628=y
  CONFIG_BOARD_LINKIT_SMART_7688=y
@@ -21,7 +22,6 @@ CONFIG_RESTORE_EXCEPTION_VECTOR_BASE=y
  CONFIG_MIPS_BOOT_FDT=y
  CONFIG_HAS_BOARD_SIZE_LIMIT=y
  CONFIG_BOARD_SIZE_LIMIT=524288
-CONFIG_SYS_LOAD_ADDR=0x80100000
  CONFIG_FIT=y
  CONFIG_FIT_SIGNATURE=y
  CONFIG_LEGACY_IMAGE_FORMAT=y
diff --git a/configs/lion-rk3368_defconfig b/configs/lion-rk3368_defconfig

index 7f62811909dfed6e1870add2b27bd0d555d4f5d8..2a7cf0d8b71e642bca4d088f234bcd12033a8c35 100644 (file)
--- a/configs/lion-rk3368_defconfig
+++ b/configs/lion-rk3368_defconfig
@@ -16,8 +16,8 @@ CONFIG_DEBUG_UART_BASE=0xFF180000
  CONFIG_DEBUG_UART_CLOCK=24000000
  CONFIG_SPL_SPI_FLASH_SUPPORT=y
  CONFIG_SPL_SPI=y
-CONFIG_DEBUG_UART=y
  CONFIG_SYS_LOAD_ADDR=0x800800
+CONFIG_DEBUG_UART=y
  CONFIG_FIT=y
  CONFIG_FIT_VERBOSE=y
  CONFIG_SPL_LOAD_FIT=y
diff --git a/configs/ls1012afrwy_qspi_defconfig b/configs/ls1012afrwy_qspi_defconfig

index 3ada93a961dbd12e1835a2090a77e6ca7a618c29..36583d75b1c1e235068aba8ef279b2e7d5ab6f4d 100644 (file)
--- a/configs/ls1012afrwy_qspi_defconfig
+++ b/configs/ls1012afrwy_qspi_defconfig
@@ -9,6 +9,7 @@ CONFIG_ENV_SECT_SIZE=0x10000
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1012a-frwy"
  CONFIG_FSL_LS_PPA=y
+CONFIG_ENV_ADDR=0x401D0000
  CONFIG_AHCI=y
  CONFIG_SYS_MEMTEST_START=0x80000000
  CONFIG_SYS_MEMTEST_END=0x9fffffff
@@ -38,7 +39,6 @@ CONFIG_CMD_CACHE=y
  CONFIG_OF_CONTROL=y
  CONFIG_ENV_OVERWRITE=y
  CONFIG_ENV_IS_IN_SPI_FLASH=y
-CONFIG_ENV_ADDR=0x401D0000
  CONFIG_SYS_RELOC_GD_ENV_ADDR=y
  CONFIG_NET_RANDOM_ETHADDR=y
  CONFIG_DM=y
diff --git a/configs/ls1012ardb_qspi_defconfig b/configs/ls1012ardb_qspi_defconfig

index 982d6b6e5a563066dc8fb9382342ff19fd90dc6a..3087e6ec79c6db63078a7aeec9ec5a850595397c 100644 (file)
--- a/configs/ls1012ardb_qspi_defconfig
+++ b/configs/ls1012ardb_qspi_defconfig
@@ -10,6 +10,7 @@ CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1012a-rdb"
  CONFIG_FSL_LS_PPA=y
  CONFIG_QSPI_AHB_INIT=y
+CONFIG_ENV_ADDR=0x40300000
  CONFIG_AHCI=y
  CONFIG_SYS_MEMTEST_START=0x80000000
  CONFIG_SYS_MEMTEST_END=0x9fffffff
@@ -39,7 +40,6 @@ CONFIG_CMD_CACHE=y
  CONFIG_OF_CONTROL=y
  CONFIG_ENV_OVERWRITE=y
  CONFIG_ENV_IS_IN_SPI_FLASH=y
-CONFIG_ENV_ADDR=0x40300000
  CONFIG_SYS_RELOC_GD_ENV_ADDR=y
  CONFIG_NET_RANDOM_ETHADDR=y
  CONFIG_DM=y
diff --git a/configs/ls1021aiot_qspi_defconfig b/configs/ls1021aiot_qspi_defconfig

index b6e418ccd06304e9d23c42c4472c3ba9ccd26759..e0e72217d9a0833a2812104864a8f7b2032727bb 100644 (file)
--- a/configs/ls1021aiot_qspi_defconfig
+++ b/configs/ls1021aiot_qspi_defconfig
@@ -12,8 +12,8 @@ CONFIG_SYS_I2C_MXC_I2C3=y
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="ls1021a-iot-duart"
  # CONFIG_DEEP_SLEEP is not set
-CONFIG_AHCI=y
  CONFIG_SYS_LOAD_ADDR=0x82000000
+CONFIG_AHCI=y
  CONFIG_OF_BOARD_SETUP=y
  CONFIG_OF_STDOUT_VIA_ALIAS=y
  CONFIG_QSPI_BOOT=y
diff --git a/configs/ls1021aiot_sdcard_defconfig b/configs/ls1021aiot_sdcard_defconfig

index 74043f6c97044f4ff0d2e54f9aad59206ec13796..2a84f2d08674a58ef48dc24df7e4acdd11e02655 100644 (file)
--- a/configs/ls1021aiot_sdcard_defconfig
+++ b/configs/ls1021aiot_sdcard_defconfig
@@ -17,8 +17,8 @@ CONFIG_SPL_TEXT_BASE=0x10000000
  CONFIG_SPL_MMC=y
  CONFIG_SPL_SERIAL=y
  CONFIG_SPL=y
-CONFIG_AHCI=y
  CONFIG_SYS_LOAD_ADDR=0x82000000
+CONFIG_AHCI=y
  CONFIG_OF_BOARD_SETUP=y
  CONFIG_OF_STDOUT_VIA_ALIAS=y
  CONFIG_RAMBOOT_PBL=y
diff --git a/configs/ls1021aqds_ddr4_nor_defconfig b/configs/ls1021aqds_ddr4_nor_defconfig

index 7e08224baf086ddf90c8147460836c518c137a45..500e277afc145411d512c2be32c6846a28bb57cb 100644 (file)
--- a/configs/ls1021aqds_ddr4_nor_defconfig
+++ b/configs/ls1021aqds_ddr4_nor_defconfig
@@ -14,10 +14,11 @@ CONFIG_DEFAULT_DEVICE_TREE="ls1021a-qds-duart"
  CONFIG_FSL_USE_PCA9547_MUX=y
  CONFIG_FSL_QIXIS=y
  # CONFIG_QIXIS_I2C_ACCESS is not set
+CONFIG_SYS_LOAD_ADDR=0x82000000
+CONFIG_ENV_ADDR=0x60300000
  CONFIG_AHCI=y
  CONFIG_SYS_MEMTEST_START=0x80000000
  CONFIG_SYS_MEMTEST_END=0x9fffffff
-CONFIG_SYS_LOAD_ADDR=0x82000000
  CONFIG_FIT=y
  CONFIG_FIT_VERBOSE=y
  CONFIG_OF_BOARD_SETUP=y
@@ -50,7 +51,6 @@ CONFIG_CMD_FAT=y
  CONFIG_OF_CONTROL=y
  CONFIG_ENV_OVERWRITE=y
  CONFIG_ENV_IS_IN_FLASH=y
-CONFIG_ENV_ADDR=0x60300000
  CONFIG_USE_ETHPRIME=y
  CONFIG_ETHPRIME="eTSEC1"
  CONFIG_DM=y
diff --git a/configs/ls1021aqds_ddr4_nor_lpuart_defconfig b/configs/ls1021aqds_ddr4_nor_lpuart_defconfig

index 64e5ce90bb641e1efe79e3fcfeeb8508b27a47b9..706d2a53532c28fae35d0ec3fd1f3106818d4af9 100644 (file)
--- a/configs/ls1021aqds_ddr4_nor_lpuart_defconfig
+++ b/configs/ls1021aqds_ddr4_nor_lpuart_defconfig
@@ -14,10 +14,11 @@ CONFIG_DEFAULT_DEVICE_TREE="ls1021a-qds-lpuart"
  CONFIG_FSL_USE_PCA9547_MUX=y
  CONFIG_FSL_QIXIS=y
  # CONFIG_QIXIS_I2C_ACCESS is not set
+CONFIG_SYS_LOAD_ADDR=0x82000000
+CONFIG_ENV_ADDR=0x60300000
  CONFIG_AHCI=y
  CONFIG_SYS_MEMTEST_START=0x80000000
  CONFIG_SYS_MEMTEST_END=0x9fffffff
-CONFIG_SYS_LOAD_ADDR=0x82000000
  CONFIG_FIT=y
  CONFIG_FIT_VERBOSE=y
  CONFIG_OF_BOARD_SETUP=y
@@ -50,7 +51,6 @@ CONFIG_CMD_FAT=y
  CONFIG_OF_CONTROL=y
  CONFIG_ENV_OVERWRITE=y
  CONFIG_ENV_IS_IN_FLASH=y
-CONFIG_ENV_ADDR=0x60300000
  CONFIG_USE_ETHPRIME=y
  CONFIG_ETHPRIME="eTSEC1"
  CONFIG_DM=y
diff --git a/configs/ls1021aqds_nand_defconfig b/configs/ls1021aqds_nand_defconfig

index 79e8fbb33f45f3dae3f5d1adbcf9614732f0419e..14082281ff85195dbbdb3accf71d12a0312ac91c 100644 (file)
--- a/configs/ls1021aqds_nand_defconfig
+++ b/configs/ls1021aqds_nand_defconfig
@@ -21,10 +21,10 @@ CONFIG_FSL_QIXIS=y
  CONFIG_SPL_SERIAL=y
  CONFIG_SPL_DRIVERS_MISC=y
  CONFIG_SPL=y
+CONFIG_SYS_LOAD_ADDR=0x82000000
  CONFIG_AHCI=y
  CONFIG_SYS_MEMTEST_START=0x80000000
  CONFIG_SYS_MEMTEST_END=0x9fffffff
-CONFIG_SYS_LOAD_ADDR=0x82000000
  CONFIG_FIT=y
  CONFIG_FIT_VERBOSE=y
  CONFIG_OF_BOARD_SETUP=y
diff --git a/configs/ls1021aqds_nor_SECURE_BOOT_defconfig b/configs/ls1021aqds_nor_SECURE_BOOT_defconfig

index 874bdc73df97e03b8db1ad3b0143a8a726666f0c..32daccab5e0257e1b7c630d4a600014b7d2d9c20 100644 (file)
--- a/configs/ls1021aqds_nor_SECURE_BOOT_defconfig
+++ b/configs/ls1021aqds_nor_SECURE_BOOT_defconfig
@@ -14,11 +14,11 @@ CONFIG_DEFAULT_DEVICE_TREE="ls1021a-qds-duart"
  CONFIG_FSL_USE_PCA9547_MUX=y
  CONFIG_FSL_QIXIS=y
  # CONFIG_QIXIS_I2C_ACCESS is not set
+CONFIG_SYS_LOAD_ADDR=0x82000000
  CONFIG_AHCI=y
  CONFIG_SYS_MEMTEST_START=0x80000000
  CONFIG_SYS_MEMTEST_END=0x9fffffff
  # CONFIG_SYS_MALLOC_F is not set
-CONFIG_SYS_LOAD_ADDR=0x82000000
  CONFIG_FIT=y
  CONFIG_FIT_VERBOSE=y
  CONFIG_OF_BOARD_SETUP=y
diff --git a/configs/ls1021aqds_nor_defconfig b/configs/ls1021aqds_nor_defconfig

index 9e23936e7992364eea8b9653b6c4dd5c1a30b3b5..8a98782e6b54b6029ea4049f57e75e1a1f4986fc 100644 (file)
--- a/configs/ls1021aqds_nor_defconfig
+++ b/configs/ls1021aqds_nor_defconfig
@@ -14,10 +14,11 @@ CONFIG_DEFAULT_DEVICE_TREE="ls1021a-qds-duart"
  CONFIG_FSL_USE_PCA9547_MUX=y
  CONFIG_FSL_QIXIS=y
  # CONFIG_QIXIS_I2C_ACCESS is not set
+CONFIG_SYS_LOAD_ADDR=0x82000000
+CONFIG_ENV_ADDR=0x60300000
  CONFIG_AHCI=y
  CONFIG_SYS_MEMTEST_START=0x80000000
  CONFIG_SYS_MEMTEST_END=0x9fffffff
-CONFIG_SYS_LOAD_ADDR=0x82000000
  CONFIG_FIT=y
  CONFIG_FIT_VERBOSE=y
  CONFIG_OF_BOARD_SETUP=y
@@ -50,7 +51,6 @@ CONFIG_CMD_FAT=y
  CONFIG_OF_CONTROL=y
  CONFIG_ENV_OVERWRITE=y
  CONFIG_ENV_IS_IN_FLASH=y
-CONFIG_ENV_ADDR=0x60300000
  CONFIG_USE_ETHPRIME=y
  CONFIG_ETHPRIME="eTSEC1"
  CONFIG_DM=y
diff --git a/configs/ls1021aqds_nor_lpuart_defconfig b/configs/ls1021aqds_nor_lpuart_defconfig

index b64f2b0729306ccad114de29ad255972dd0cb04d..807c8a3b3b90cc04145ee4f0e1dda29aa8d76f2e 100644 (file)
--- a/configs/ls1021aqds_nor_lpuart_defconfig
+++ b/configs/ls1021aqds_nor_lpuart_defconfig
@@ -14,10 +14,11 @@ CONFIG_DEFAULT_DEVICE_TREE="ls1021a-qds-lpuart"
  CONFIG_FSL_USE_PCA9547_MUX=y
  CONFIG_FSL_QIXIS=y
  # CONFIG_QIXIS_I2C_ACCESS is not set
+CONFIG_SYS_LOAD_ADDR=0x82000000
+CONFIG_ENV_ADDR=0x60300000
  CONFIG_AHCI=y
  CONFIG_SYS_MEMTEST_START=0x80000000
  CONFIG_SYS_MEMTEST_END=0x9fffffff
-CONFIG_SYS_LOAD_ADDR=0x82000000
  CONFIG_FIT=y
  CONFIG_FIT_VERBOSE=y
  CONFIG_OF_BOARD_SETUP=y
@@ -50,7 +51,6 @@ CONFIG_CMD_FAT=y
  CONFIG_OF_CONTROL=y
  CONFIG_ENV_OVERWRITE=y
  CONFIG_ENV_IS_IN_FLASH=y
-CONFIG_ENV_ADDR=0x60300000
  CONFIG_USE_ETHPRIME=y
  CONFIG_ETHPRIME="eTSEC1"
  CONFIG_DM=y
diff --git a/configs/ls1021aqds_qspi_defconfig b/configs/ls1021aqds_qspi_defconfig

index 5d03eeeaa121709e1490f6de6a12e4e5bf134dee..241627b7fc5d9e43dcdddd656d72ee7554a2e4f7 100644 (file)
--- a/configs/ls1021aqds_qspi_defconfig
+++ b/configs/ls1021aqds_qspi_defconfig
@@ -14,10 +14,10 @@ CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="ls1021a-qds-duart"
  CONFIG_FSL_USE_PCA9547_MUX=y
  CONFIG_FSL_QIXIS=y
+CONFIG_SYS_LOAD_ADDR=0x82000000
  CONFIG_AHCI=y
  CONFIG_SYS_MEMTEST_START=0x80000000
  CONFIG_SYS_MEMTEST_END=0x9fffffff
-CONFIG_SYS_LOAD_ADDR=0x82000000
  CONFIG_FIT=y
  CONFIG_FIT_VERBOSE=y
  CONFIG_OF_BOARD_SETUP=y
diff --git a/configs/ls1021aqds_sdcard_ifc_defconfig b/configs/ls1021aqds_sdcard_ifc_defconfig

index 263f8b2af20825b09ae09aa9136779fbbd9d0fda..5de980d1a3e0d3bc1363ca2129d07802ffb434ea 100644 (file)
--- a/configs/ls1021aqds_sdcard_ifc_defconfig
+++ b/configs/ls1021aqds_sdcard_ifc_defconfig
@@ -22,10 +22,10 @@ CONFIG_SPL_MMC=y
  CONFIG_SPL_SERIAL=y
  CONFIG_SPL_DRIVERS_MISC=y
  CONFIG_SPL=y
+CONFIG_SYS_LOAD_ADDR=0x82000000
  CONFIG_AHCI=y
  CONFIG_SYS_MEMTEST_START=0x80000000
  CONFIG_SYS_MEMTEST_END=0x9fffffff
-CONFIG_SYS_LOAD_ADDR=0x82000000
  CONFIG_FIT=y
  CONFIG_FIT_VERBOSE=y
  CONFIG_DYNAMIC_SYS_CLK_FREQ=y
diff --git a/configs/ls1021aqds_sdcard_qspi_defconfig b/configs/ls1021aqds_sdcard_qspi_defconfig

index e037e327c16b4ab195f585b82cf199b8c05879ed..8706d68d976894a7a9a76b3c5528a59277aff90f 100644 (file)
--- a/configs/ls1021aqds_sdcard_qspi_defconfig
+++ b/configs/ls1021aqds_sdcard_qspi_defconfig
@@ -21,10 +21,10 @@ CONFIG_SPL_MMC=y
  CONFIG_SPL_SERIAL=y
  CONFIG_SPL_DRIVERS_MISC=y
  CONFIG_SPL=y
+CONFIG_SYS_LOAD_ADDR=0x82000000
  CONFIG_AHCI=y
  CONFIG_SYS_MEMTEST_START=0x80000000
  CONFIG_SYS_MEMTEST_END=0x9fffffff
-CONFIG_SYS_LOAD_ADDR=0x82000000
  CONFIG_FIT=y
  CONFIG_FIT_VERBOSE=y
  CONFIG_RAMBOOT_PBL=y
diff --git a/configs/ls1021atsn_qspi_defconfig b/configs/ls1021atsn_qspi_defconfig

index 45b05adbb491775c736c31e1773dec560e03970d..f12c223bd1f203fc2d6d5dac2b6de9dafc312ef4 100644 (file)
--- a/configs/ls1021atsn_qspi_defconfig
+++ b/configs/ls1021atsn_qspi_defconfig
@@ -11,9 +11,9 @@ CONFIG_SYS_I2C_MXC_I2C2=y
  CONFIG_SYS_I2C_MXC_I2C3=y
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="ls1021a-tsn"
+CONFIG_SYS_LOAD_ADDR=0x82000000
  CONFIG_AHCI=y
  CONFIG_DISTRO_DEFAULTS=y
-CONFIG_SYS_LOAD_ADDR=0x82000000
  CONFIG_FIT=y
  CONFIG_OF_BOARD_SETUP=y
  CONFIG_OF_STDOUT_VIA_ALIAS=y
diff --git a/configs/ls1021atsn_sdcard_defconfig b/configs/ls1021atsn_sdcard_defconfig

index adb4a03701ebc711a249fec9a453d5bf109baa1e..5845017d66e19d2a87b280f81510337fb1e761b8 100644 (file)
--- a/configs/ls1021atsn_sdcard_defconfig
+++ b/configs/ls1021atsn_sdcard_defconfig
@@ -16,9 +16,9 @@ CONFIG_SPL_TEXT_BASE=0x10000000
  CONFIG_SPL_MMC=y
  CONFIG_SPL_SERIAL=y
  CONFIG_SPL=y
+CONFIG_SYS_LOAD_ADDR=0x82000000
  CONFIG_AHCI=y
  CONFIG_DISTRO_DEFAULTS=y
-CONFIG_SYS_LOAD_ADDR=0x82000000
  CONFIG_FIT=y
  CONFIG_OF_BOARD_SETUP=y
  CONFIG_OF_STDOUT_VIA_ALIAS=y
diff --git a/configs/ls1021atwr_nor_SECURE_BOOT_defconfig b/configs/ls1021atwr_nor_SECURE_BOOT_defconfig

index ee41e534bd976866e316acab08468146680946b8..6e6f4744657a6d4198db8edec66364f449936501 100644 (file)
--- a/configs/ls1021atwr_nor_SECURE_BOOT_defconfig
+++ b/configs/ls1021atwr_nor_SECURE_BOOT_defconfig
@@ -11,12 +11,12 @@ CONFIG_SYS_I2C_MXC_I2C2=y
  CONFIG_SYS_I2C_MXC_I2C3=y
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="ls1021a-twr-duart"
+CONFIG_SYS_LOAD_ADDR=0x82000000
  CONFIG_AHCI=y
  CONFIG_SYS_MEMTEST_START=0x80000000
  CONFIG_SYS_MEMTEST_END=0x9fffffff
  CONFIG_DISTRO_DEFAULTS=y
  # CONFIG_SYS_MALLOC_F is not set
-CONFIG_SYS_LOAD_ADDR=0x82000000
  CONFIG_FIT=y
  CONFIG_FIT_VERBOSE=y
  CONFIG_OF_BOARD_SETUP=y
diff --git a/configs/ls1021atwr_nor_defconfig b/configs/ls1021atwr_nor_defconfig

index 05ccc598b2ccc2acd57d4a611073b74cf62ca3a7..e9c3a8aba288f65986b6aa8ee5a1d4a5ebea6d71 100644 (file)
--- a/configs/ls1021atwr_nor_defconfig
+++ b/configs/ls1021atwr_nor_defconfig
@@ -11,11 +11,12 @@ CONFIG_SYS_I2C_MXC_I2C2=y
  CONFIG_SYS_I2C_MXC_I2C3=y
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="ls1021a-twr-duart"
+CONFIG_SYS_LOAD_ADDR=0x82000000
+CONFIG_ENV_ADDR=0x60300000
  CONFIG_AHCI=y
  CONFIG_SYS_MEMTEST_START=0x80000000
  CONFIG_SYS_MEMTEST_END=0x9fffffff
  CONFIG_DISTRO_DEFAULTS=y
-CONFIG_SYS_LOAD_ADDR=0x82000000
  CONFIG_FIT=y
  CONFIG_FIT_VERBOSE=y
  CONFIG_OF_BOARD_SETUP=y
@@ -42,7 +43,6 @@ CONFIG_CMD_USB=y
  CONFIG_OF_CONTROL=y
  CONFIG_ENV_OVERWRITE=y
  CONFIG_ENV_IS_IN_FLASH=y
-CONFIG_ENV_ADDR=0x60300000
  CONFIG_USE_ETHPRIME=y
  CONFIG_ETHPRIME="ethernet@2d10000"
  CONFIG_DM=y
diff --git a/configs/ls1021atwr_nor_lpuart_defconfig b/configs/ls1021atwr_nor_lpuart_defconfig

index 353dadb2897aaf49e600e968a2fd4e9ec8cd503f..0d9009e8fab4ebd1ed3215a34692e19109914d6d 100644 (file)
--- a/configs/ls1021atwr_nor_lpuart_defconfig
+++ b/configs/ls1021atwr_nor_lpuart_defconfig
@@ -11,11 +11,12 @@ CONFIG_SYS_I2C_MXC_I2C2=y
  CONFIG_SYS_I2C_MXC_I2C3=y
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="ls1021a-twr-lpuart"
+CONFIG_SYS_LOAD_ADDR=0x82000000
+CONFIG_ENV_ADDR=0x60300000
  CONFIG_AHCI=y
  CONFIG_SYS_MEMTEST_START=0x80000000
  CONFIG_SYS_MEMTEST_END=0x9fffffff
  CONFIG_DISTRO_DEFAULTS=y
-CONFIG_SYS_LOAD_ADDR=0x82000000
  CONFIG_FIT=y
  CONFIG_FIT_VERBOSE=y
  CONFIG_OF_BOARD_SETUP=y
@@ -42,7 +43,6 @@ CONFIG_CMD_USB=y
  CONFIG_OF_CONTROL=y
  CONFIG_ENV_OVERWRITE=y
  CONFIG_ENV_IS_IN_FLASH=y
-CONFIG_ENV_ADDR=0x60300000
  CONFIG_USE_ETHPRIME=y
  CONFIG_ETHPRIME="ethernet@2d10000"
  CONFIG_DM=y
diff --git a/configs/ls1021atwr_qspi_defconfig b/configs/ls1021atwr_qspi_defconfig

index d65a2c51c4d60504490d2385ebdb423b0dd948db..63534af160a8bbf98fce455ab5f15156ae7bafdb 100644 (file)
--- a/configs/ls1021atwr_qspi_defconfig
+++ b/configs/ls1021atwr_qspi_defconfig
@@ -12,11 +12,11 @@ CONFIG_SYS_I2C_MXC_I2C2=y
  CONFIG_SYS_I2C_MXC_I2C3=y
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="ls1021a-twr-duart"
+CONFIG_SYS_LOAD_ADDR=0x82000000
  CONFIG_AHCI=y
  CONFIG_SYS_MEMTEST_START=0x80000000
  CONFIG_SYS_MEMTEST_END=0x9fffffff
  CONFIG_DISTRO_DEFAULTS=y
-CONFIG_SYS_LOAD_ADDR=0x82000000
  CONFIG_FIT=y
  CONFIG_FIT_VERBOSE=y
  CONFIG_OF_BOARD_SETUP=y
diff --git a/configs/ls1021atwr_sdcard_ifc_SECURE_BOOT_defconfig b/configs/ls1021atwr_sdcard_ifc_SECURE_BOOT_defconfig

index 16007025cc031f7c83c0d0ec9598dbf995931512..3286196c50faf8e8cfbe2d9536132307c6962077 100644 (file)
--- a/configs/ls1021atwr_sdcard_ifc_SECURE_BOOT_defconfig
+++ b/configs/ls1021atwr_sdcard_ifc_SECURE_BOOT_defconfig
@@ -19,10 +19,10 @@ CONFIG_SPL_MMC=y
  CONFIG_SPL_SERIAL=y
  CONFIG_SPL_DRIVERS_MISC=y
  CONFIG_SPL=y
+CONFIG_SYS_LOAD_ADDR=0x82000000
  CONFIG_SYS_MEMTEST_START=0x80000000
  CONFIG_SYS_MEMTEST_END=0x9fffffff
  CONFIG_DISTRO_DEFAULTS=y
-CONFIG_SYS_LOAD_ADDR=0x82000000
  CONFIG_FIT=y
  CONFIG_FIT_VERBOSE=y
  CONFIG_OF_BOARD_SETUP=y
diff --git a/configs/ls1021atwr_sdcard_ifc_defconfig b/configs/ls1021atwr_sdcard_ifc_defconfig

index 81f8e1fd14622a18a0def30280a80166185d4bea..c59486067917ce4eb5cb41e3a7b719276877540b 100644 (file)
--- a/configs/ls1021atwr_sdcard_ifc_defconfig
+++ b/configs/ls1021atwr_sdcard_ifc_defconfig
@@ -18,11 +18,11 @@ CONFIG_SPL_TEXT_BASE=0x10000000
  CONFIG_SPL_MMC=y
  CONFIG_SPL_SERIAL=y
  CONFIG_SPL=y
+CONFIG_SYS_LOAD_ADDR=0x82000000
  CONFIG_AHCI=y
  CONFIG_SYS_MEMTEST_START=0x80000000
  CONFIG_SYS_MEMTEST_END=0x9fffffff
  CONFIG_DISTRO_DEFAULTS=y
-CONFIG_SYS_LOAD_ADDR=0x82000000
  CONFIG_FIT=y
  CONFIG_FIT_VERBOSE=y
  CONFIG_OF_BOARD_SETUP=y
diff --git a/configs/ls1021atwr_sdcard_qspi_defconfig b/configs/ls1021atwr_sdcard_qspi_defconfig

index b95dc97063d6fd600e3137f3449220f71c61015e..148fcb9753bff0fb49ce8c82324d87a930cd78c7 100644 (file)
--- a/configs/ls1021atwr_sdcard_qspi_defconfig
+++ b/configs/ls1021atwr_sdcard_qspi_defconfig
@@ -18,11 +18,11 @@ CONFIG_SPL_TEXT_BASE=0x10000000
  CONFIG_SPL_MMC=y
  CONFIG_SPL_SERIAL=y
  CONFIG_SPL=y
+CONFIG_SYS_LOAD_ADDR=0x82000000
  CONFIG_AHCI=y
  CONFIG_SYS_MEMTEST_START=0x80000000
  CONFIG_SYS_MEMTEST_END=0x9fffffff
  CONFIG_DISTRO_DEFAULTS=y
-CONFIG_SYS_LOAD_ADDR=0x82000000
  CONFIG_FIT=y
  CONFIG_FIT_VERBOSE=y
  CONFIG_OF_BOARD_SETUP=y
diff --git a/configs/ls1028aqds_tfa_defconfig b/configs/ls1028aqds_tfa_defconfig

index 6d58513467f5c5f6e98c90b595c987cedb31e306..7a8d2952709ccf3ec007afbade9ecaa14d9fe3aa 100644 (file)
--- a/configs/ls1028aqds_tfa_defconfig
+++ b/configs/ls1028aqds_tfa_defconfig
@@ -15,6 +15,7 @@ CONFIG_FSL_QIXIS=y
  CONFIG_FSPI_AHB_EN_4BYTE=y
  CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT=y
  CONFIG_SEC_FIRMWARE_ARMV8_PSCI=y
+CONFIG_ENV_ADDR=0x20500000
  CONFIG_AHCI=y
  CONFIG_SYS_MEMTEST_START=0x80000000
  CONFIG_SYS_MEMTEST_END=0x9fffffff
@@ -46,7 +47,6 @@ CONFIG_OF_CONTROL=y
  CONFIG_ENV_OVERWRITE=y
  CONFIG_ENV_IS_IN_MMC=y
  CONFIG_ENV_IS_IN_SPI_FLASH=y
-CONFIG_ENV_ADDR=0x20500000
  CONFIG_NET_RANDOM_ETHADDR=y
  CONFIG_NETCONSOLE=y
  CONFIG_SYS_RX_ETH_BUFFER=8
diff --git a/configs/ls1028aqds_tfa_lpuart_defconfig b/configs/ls1028aqds_tfa_lpuart_defconfig

index 7531644142fd904b654d241e25d8bb86dc51995d..8190d18a1b495e1721e72a3992562bc7a9ded9e1 100644 (file)
--- a/configs/ls1028aqds_tfa_lpuart_defconfig
+++ b/configs/ls1028aqds_tfa_lpuart_defconfig
@@ -14,6 +14,7 @@ CONFIG_FSL_QIXIS=y
  CONFIG_FSPI_AHB_EN_4BYTE=y
  CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT=y
  CONFIG_SEC_FIRMWARE_ARMV8_PSCI=y
+CONFIG_ENV_ADDR=0x20500000
  CONFIG_AHCI=y
  CONFIG_SYS_MEMTEST_START=0x80000000
  CONFIG_SYS_MEMTEST_END=0x9fffffff
@@ -45,7 +46,6 @@ CONFIG_OF_CONTROL=y
  CONFIG_ENV_OVERWRITE=y
  CONFIG_ENV_IS_IN_MMC=y
  CONFIG_ENV_IS_IN_SPI_FLASH=y
-CONFIG_ENV_ADDR=0x20500000
  CONFIG_NET_RANDOM_ETHADDR=y
  CONFIG_NETCONSOLE=y
  CONFIG_SYS_RX_ETH_BUFFER=8
diff --git a/configs/ls1028ardb_tfa_defconfig b/configs/ls1028ardb_tfa_defconfig

index 99a73c998629dbdb7d1099ef81a23c055d8f8915..f28efd287ba7f397afcc7f95e3d3e0d0c8e40a94 100644 (file)
--- a/configs/ls1028ardb_tfa_defconfig
+++ b/configs/ls1028ardb_tfa_defconfig
@@ -15,6 +15,7 @@ CONFIG_FSL_QIXIS=y
  CONFIG_FSPI_AHB_EN_4BYTE=y
  CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT=y
  CONFIG_SEC_FIRMWARE_ARMV8_PSCI=y
+CONFIG_ENV_ADDR=0x20500000
  CONFIG_AHCI=y
  CONFIG_SYS_MEMTEST_START=0x80000000
  CONFIG_SYS_MEMTEST_END=0x9fffffff
@@ -45,7 +46,6 @@ CONFIG_OF_CONTROL=y
  CONFIG_ENV_OVERWRITE=y
  CONFIG_ENV_IS_IN_MMC=y
  CONFIG_ENV_IS_IN_SPI_FLASH=y
-CONFIG_ENV_ADDR=0x20500000
  CONFIG_NET_RANDOM_ETHADDR=y
  CONFIG_NETCONSOLE=y
  CONFIG_SYS_RX_ETH_BUFFER=8
diff --git a/configs/ls1043aqds_defconfig b/configs/ls1043aqds_defconfig

index 45fc5be0d25956618bbb6e66c1da0de376d56b06..24eb2706e27c9008eb55c17a53ee2b2a4a7ed9c1 100644 (file)
--- a/configs/ls1043aqds_defconfig
+++ b/configs/ls1043aqds_defconfig
@@ -19,6 +19,7 @@ CONFIG_VOL_MONITOR_IR36021_SET=y
  CONFIG_FSL_QIXIS=y
  # CONFIG_QIXIS_I2C_ACCESS is not set
  CONFIG_FSL_LS_PPA=y
+CONFIG_ENV_ADDR=0x60300000
  CONFIG_AHCI=y
  CONFIG_SYS_MEMTEST_START=0x80000000
  CONFIG_SYS_MEMTEST_END=0x9fffffff
@@ -50,7 +51,6 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=60000000.nor:2m@0x100000(nor_bank0_uboot),40m@
  CONFIG_OF_CONTROL=y
  CONFIG_ENV_OVERWRITE=y
  CONFIG_ENV_IS_IN_FLASH=y
-CONFIG_ENV_ADDR=0x60300000
  CONFIG_DM=y
  CONFIG_SATA=y
  CONFIG_SATA_CEVA=y
diff --git a/configs/ls1043aqds_lpuart_defconfig b/configs/ls1043aqds_lpuart_defconfig

index cbc27d4a938228247da41bd1cde3822e03cebfb9..013b776919b6aa718d2f54cbe1e0342982d208e2 100644 (file)
--- a/configs/ls1043aqds_lpuart_defconfig
+++ b/configs/ls1043aqds_lpuart_defconfig
@@ -19,6 +19,7 @@ CONFIG_VOL_MONITOR_IR36021_SET=y
  CONFIG_FSL_QIXIS=y
  # CONFIG_QIXIS_I2C_ACCESS is not set
  CONFIG_FSL_LS_PPA=y
+CONFIG_ENV_ADDR=0x60300000
  CONFIG_AHCI=y
  CONFIG_SYS_MEMTEST_START=0x80000000
  CONFIG_SYS_MEMTEST_END=0x9fffffff
@@ -50,7 +51,6 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=60000000.nor:2m@0x100000(nor_bank0_uboot),40m@
  CONFIG_OF_CONTROL=y
  CONFIG_ENV_OVERWRITE=y
  CONFIG_ENV_IS_IN_FLASH=y
-CONFIG_ENV_ADDR=0x60300000
  CONFIG_DM=y
  CONFIG_SATA=y
  CONFIG_SATA_CEVA=y
diff --git a/configs/ls1043aqds_nor_ddr3_defconfig b/configs/ls1043aqds_nor_ddr3_defconfig

index d5f48ae660538b4d8775d67fea238dc1511444df..fd6a4945c88bdf3a06959fe7868b0c7b0e23fef5 100644 (file)
--- a/configs/ls1043aqds_nor_ddr3_defconfig
+++ b/configs/ls1043aqds_nor_ddr3_defconfig
@@ -19,6 +19,7 @@ CONFIG_VOL_MONITOR_IR36021_SET=y
  CONFIG_FSL_QIXIS=y
  # CONFIG_QIXIS_I2C_ACCESS is not set
  CONFIG_FSL_LS_PPA=y
+CONFIG_ENV_ADDR=0x60300000
  CONFIG_AHCI=y
  CONFIG_SYS_MEMTEST_START=0x80000000
  CONFIG_SYS_MEMTEST_END=0x9fffffff
@@ -50,7 +51,6 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=60000000.nor:2m@0x100000(nor_bank0_uboot),40m@
  CONFIG_OF_CONTROL=y
  CONFIG_ENV_OVERWRITE=y
  CONFIG_ENV_IS_IN_FLASH=y
-CONFIG_ENV_ADDR=0x60300000
  CONFIG_DM=y
  CONFIG_SATA=y
  CONFIG_SATA_CEVA=y
diff --git a/configs/ls1043aqds_qspi_defconfig b/configs/ls1043aqds_qspi_defconfig

index 8d1edec57599d8437dd180a05f5afc27af625398..5d0743083378b6de81d030358740faf41a0db959 100644 (file)
--- a/configs/ls1043aqds_qspi_defconfig
+++ b/configs/ls1043aqds_qspi_defconfig
@@ -19,6 +19,7 @@ CONFIG_VOL_MONITOR_INA220=y
  CONFIG_VOL_MONITOR_IR36021_SET=y
  CONFIG_FSL_QIXIS=y
  CONFIG_FSL_LS_PPA=y
+CONFIG_ENV_ADDR=0x40300000
  CONFIG_AHCI=y
  CONFIG_SYS_MEMTEST_START=0x80000000
  CONFIG_SYS_MEMTEST_END=0x9fffffff
@@ -49,7 +50,6 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=spi0.0:1m(uboot),5m(kernel),1m(dtb),9m(file_sy
  CONFIG_OF_CONTROL=y
  CONFIG_ENV_OVERWRITE=y
  CONFIG_ENV_IS_IN_SPI_FLASH=y
-CONFIG_ENV_ADDR=0x40300000
  CONFIG_SYS_RELOC_GD_ENV_ADDR=y
  CONFIG_DM=y
  CONFIG_SATA=y
diff --git a/configs/ls1043aqds_tfa_defconfig b/configs/ls1043aqds_tfa_defconfig

index 66408ae753bbdf7ad0d8785df4bec5351c48d7fa..3ed054fd4ee62fad6acbcf22635ce150b476c2d2 100644 (file)
--- a/configs/ls1043aqds_tfa_defconfig
+++ b/configs/ls1043aqds_tfa_defconfig
@@ -21,6 +21,7 @@ CONFIG_VOL_MONITOR_IR36021_SET=y
  CONFIG_FSL_QIXIS=y
  CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT=y
  CONFIG_SEC_FIRMWARE_ARMV8_PSCI=y
+CONFIG_ENV_ADDR=0x60500000
  CONFIG_AHCI=y
  CONFIG_SYS_MEMTEST_START=0x80000000
  CONFIG_SYS_MEMTEST_END=0x9fffffff
@@ -56,7 +57,6 @@ CONFIG_ENV_IS_IN_MMC=y
  CONFIG_ENV_IS_IN_NAND=y
  CONFIG_ENV_IS_IN_SPI_FLASH=y
  CONFIG_ENV_SPI_BUS=0
-CONFIG_ENV_ADDR=0x60500000
  CONFIG_SYS_RELOC_GD_ENV_ADDR=y
  CONFIG_DM=y
  CONFIG_SATA=y
diff --git a/configs/ls1043ardb_defconfig b/configs/ls1043ardb_defconfig

index 3fa35c5b77075672523962a6341da98eedcdea5e..4fb9d9395d091d2386c658adbbec56b1c6fb484d 100644 (file)
--- a/configs/ls1043ardb_defconfig
+++ b/configs/ls1043ardb_defconfig
@@ -12,6 +12,7 @@ CONFIG_SYS_I2C_MXC_I2C4=y
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1043a-rdb"
  CONFIG_FSL_LS_PPA=y
+CONFIG_ENV_ADDR=0x60300000
  CONFIG_DISTRO_DEFAULTS=y
  CONFIG_REMAKE_ELF=y
  CONFIG_MP=y
@@ -36,7 +37,6 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=60000000.nor:2m@0x100000(nor_bank0_uboot),40m@
  CONFIG_OF_CONTROL=y
  CONFIG_ENV_OVERWRITE=y
  CONFIG_ENV_IS_IN_FLASH=y
-CONFIG_ENV_ADDR=0x60300000
  CONFIG_USE_ETHPRIME=y
  CONFIG_ETHPRIME="FM1@DTSEC3"
  CONFIG_DM=y
diff --git a/configs/ls1043ardb_tfa_defconfig b/configs/ls1043ardb_tfa_defconfig

index ecb5dfbea6aeea5f8258fd4a4f1595fdc43d33f2..afcbe7032481a1b0323bff0df29a3101c9982cb7 100644 (file)
--- a/configs/ls1043ardb_tfa_defconfig
+++ b/configs/ls1043ardb_tfa_defconfig
@@ -15,6 +15,7 @@ CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1043a-rdb"
  CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT=y
  CONFIG_SEC_FIRMWARE_ARMV8_PSCI=y
+CONFIG_ENV_ADDR=0x60500000
  CONFIG_DISTRO_DEFAULTS=y
  CONFIG_REMAKE_ELF=y
  CONFIG_MP=y
@@ -40,7 +41,6 @@ CONFIG_ENV_OVERWRITE=y
  CONFIG_ENV_IS_IN_FLASH=y
  CONFIG_ENV_IS_IN_MMC=y
  CONFIG_ENV_IS_IN_NAND=y
-CONFIG_ENV_ADDR=0x60500000
  CONFIG_USE_ETHPRIME=y
  CONFIG_ETHPRIME="FM1@DTSEC3"
  CONFIG_DM=y
diff --git a/configs/ls1046afrwy_tfa_defconfig b/configs/ls1046afrwy_tfa_defconfig

index f09d999e9ec60254d8d9c9297301dc58dc2132ef..7cddc0c7d1ef3d8e89ced4ee15333732f9e4b682 100644 (file)
--- a/configs/ls1046afrwy_tfa_defconfig
+++ b/configs/ls1046afrwy_tfa_defconfig
@@ -13,6 +13,7 @@ CONFIG_FSL_USE_PCA9547_MUX=y
  CONFIG_QSPI_AHB_INIT=y
  CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT=y
  CONFIG_SEC_FIRMWARE_ARMV8_PSCI=y
+CONFIG_ENV_ADDR=0x40500000
  CONFIG_AHCI=y
  CONFIG_DISTRO_DEFAULTS=y
  CONFIG_REMAKE_ELF=y
@@ -36,7 +37,6 @@ CONFIG_OF_CONTROL=y
  CONFIG_ENV_OVERWRITE=y
  CONFIG_ENV_IS_IN_MMC=y
  CONFIG_ENV_IS_IN_SPI_FLASH=y
-CONFIG_ENV_ADDR=0x40500000
  CONFIG_SYS_RELOC_GD_ENV_ADDR=y
  CONFIG_USE_ETHPRIME=y
  CONFIG_ETHPRIME="FM1@DTSEC3"
diff --git a/configs/ls1046aqds_defconfig b/configs/ls1046aqds_defconfig

index 89d61d7813ab843898fb85ef87673175f34e1be2..7d7afc751c13d3297027c38589570f082b9a4bbf 100644 (file)
--- a/configs/ls1046aqds_defconfig
+++ b/configs/ls1046aqds_defconfig
@@ -19,6 +19,7 @@ CONFIG_VOL_MONITOR_IR36021_SET=y
  CONFIG_FSL_QIXIS=y
  # CONFIG_QIXIS_I2C_ACCESS is not set
  CONFIG_FSL_LS_PPA=y
+CONFIG_ENV_ADDR=0x60300000
  CONFIG_AHCI=y
  CONFIG_SYS_MEMTEST_START=0x80000000
  CONFIG_SYS_MEMTEST_END=0x9fffffff
@@ -51,7 +52,6 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=60000000.nor:2m@0x100000(nor_bank0_uboot),40m@
  CONFIG_OF_CONTROL=y
  CONFIG_ENV_OVERWRITE=y
  CONFIG_ENV_IS_IN_FLASH=y
-CONFIG_ENV_ADDR=0x60300000
  CONFIG_DM=y
  CONFIG_SATA=y
  CONFIG_SATA_CEVA=y
diff --git a/configs/ls1046aqds_lpuart_defconfig b/configs/ls1046aqds_lpuart_defconfig

index 4a96160d64d3d72e35f012f5b7834ae0e0d25523..cf767342b64e3dbfeb6cd4f9f8f6b404fa1b1d5f 100644 (file)
--- a/configs/ls1046aqds_lpuart_defconfig
+++ b/configs/ls1046aqds_lpuart_defconfig
@@ -19,6 +19,7 @@ CONFIG_VOL_MONITOR_IR36021_SET=y
  CONFIG_FSL_QIXIS=y
  # CONFIG_QIXIS_I2C_ACCESS is not set
  CONFIG_FSL_LS_PPA=y
+CONFIG_ENV_ADDR=0x60300000
  CONFIG_AHCI=y
  CONFIG_SYS_MEMTEST_START=0x80000000
  CONFIG_SYS_MEMTEST_END=0x9fffffff
@@ -51,7 +52,6 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=60000000.nor:2m@0x100000(nor_bank0_uboot),40m@
  CONFIG_OF_CONTROL=y
  CONFIG_ENV_OVERWRITE=y
  CONFIG_ENV_IS_IN_FLASH=y
-CONFIG_ENV_ADDR=0x60300000
  CONFIG_DM=y
  CONFIG_SATA=y
  CONFIG_SATA_CEVA=y
diff --git a/configs/ls1046aqds_qspi_defconfig b/configs/ls1046aqds_qspi_defconfig

index 58d3121cf177149168db06820f2837bef7e01677..b5afc9757bcc894388572fb306a2ecbe00053b0e 100644 (file)
--- a/configs/ls1046aqds_qspi_defconfig
+++ b/configs/ls1046aqds_qspi_defconfig
@@ -19,6 +19,7 @@ CONFIG_VOL_MONITOR_INA220=y
  CONFIG_VOL_MONITOR_IR36021_SET=y
  CONFIG_FSL_QIXIS=y
  CONFIG_FSL_LS_PPA=y
+CONFIG_ENV_ADDR=0x40300000
  CONFIG_AHCI=y
  CONFIG_SYS_MEMTEST_START=0x80000000
  CONFIG_SYS_MEMTEST_END=0x9fffffff
@@ -50,7 +51,6 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=1550000.spi-0:2m(uboot),14m(free)"
  CONFIG_OF_CONTROL=y
  CONFIG_ENV_OVERWRITE=y
  CONFIG_ENV_IS_IN_SPI_FLASH=y
-CONFIG_ENV_ADDR=0x40300000
  CONFIG_SYS_RELOC_GD_ENV_ADDR=y
  CONFIG_DM=y
  CONFIG_SATA=y
diff --git a/configs/ls1046aqds_tfa_defconfig b/configs/ls1046aqds_tfa_defconfig

index 8f0242348685c9ab03baa3ba384d23347672199a..c6fa99c240c777dda2317819ea316a17514f15be 100644 (file)
--- a/configs/ls1046aqds_tfa_defconfig
+++ b/configs/ls1046aqds_tfa_defconfig
@@ -21,6 +21,7 @@ CONFIG_VOL_MONITOR_IR36021_SET=y
  CONFIG_FSL_QIXIS=y
  CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT=y
  CONFIG_SEC_FIRMWARE_ARMV8_PSCI=y
+CONFIG_ENV_ADDR=0x60500000
  CONFIG_AHCI=y
  CONFIG_SYS_MEMTEST_START=0x80000000
  CONFIG_SYS_MEMTEST_END=0x9fffffff
@@ -57,7 +58,6 @@ CONFIG_ENV_IS_IN_MMC=y
  CONFIG_ENV_IS_IN_NAND=y
  CONFIG_ENV_IS_IN_SPI_FLASH=y
  CONFIG_ENV_SPI_BUS=0
-CONFIG_ENV_ADDR=0x60500000
  CONFIG_SYS_RELOC_GD_ENV_ADDR=y
  CONFIG_DM=y
  CONFIG_SATA=y
diff --git a/configs/ls1046ardb_qspi_defconfig b/configs/ls1046ardb_qspi_defconfig

index d4ed56a9f24f579230416efd730b42c268b66739..b21db08a84693bf8dbe939f611a2ce5e709f8a2b 100644 (file)
--- a/configs/ls1046ardb_qspi_defconfig
+++ b/configs/ls1046ardb_qspi_defconfig
@@ -14,6 +14,7 @@ CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1046a-rdb"
  CONFIG_FSL_LS_PPA=y
  CONFIG_QSPI_AHB_INIT=y
+CONFIG_ENV_ADDR=0x40300000
  CONFIG_AHCI=y
  CONFIG_DISTRO_DEFAULTS=y
  CONFIG_REMAKE_ELF=y
@@ -43,7 +44,6 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=1550000.spi-0:1m(rcw),15m(u-boot),48m(kernel.i
  CONFIG_OF_CONTROL=y
  CONFIG_ENV_OVERWRITE=y
  CONFIG_ENV_IS_IN_SPI_FLASH=y
-CONFIG_ENV_ADDR=0x40300000
  CONFIG_SYS_RELOC_GD_ENV_ADDR=y
  CONFIG_USE_ETHPRIME=y
  CONFIG_ETHPRIME="FM1@DTSEC3"
diff --git a/configs/ls1046ardb_tfa_defconfig b/configs/ls1046ardb_tfa_defconfig

index 3712c5eccc9607663dc647c3d5189b097ec6e896..451c82235d24f8ef0814b80ca3cd70398aa422e0 100644 (file)
--- a/configs/ls1046ardb_tfa_defconfig
+++ b/configs/ls1046ardb_tfa_defconfig
@@ -16,6 +16,7 @@ CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1046a-rdb"
  CONFIG_QSPI_AHB_INIT=y
  CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT=y
  CONFIG_SEC_FIRMWARE_ARMV8_PSCI=y
+CONFIG_ENV_ADDR=0x40500000
  CONFIG_AHCI=y
  CONFIG_DISTRO_DEFAULTS=y
  CONFIG_REMAKE_ELF=y
@@ -41,7 +42,6 @@ CONFIG_OF_CONTROL=y
  CONFIG_ENV_OVERWRITE=y
  CONFIG_ENV_IS_IN_MMC=y
  CONFIG_ENV_IS_IN_SPI_FLASH=y
-CONFIG_ENV_ADDR=0x40500000
  CONFIG_SYS_RELOC_GD_ENV_ADDR=y
  CONFIG_USE_ETHPRIME=y
  CONFIG_ETHPRIME="FM1@DTSEC3"
diff --git a/configs/ls1088aqds_defconfig b/configs/ls1088aqds_defconfig

index 211c42b24fdc6d60dcef56a9ef341bd24a521431..d1a6dc5ac451f90fc81c94ad916f1d7d72934b99 100644 (file)
--- a/configs/ls1088aqds_defconfig
+++ b/configs/ls1088aqds_defconfig
@@ -16,6 +16,7 @@ CONFIG_VOL_MONITOR_LTC3882_READ=y
  CONFIG_VOL_MONITOR_LTC3882_SET=y
  CONFIG_FSL_QIXIS=y
  CONFIG_FSL_LS_PPA=y
+CONFIG_ENV_ADDR=0x80300000
  CONFIG_AHCI=y
  CONFIG_SYS_MEMTEST_START=0x80000000
  CONFIG_SYS_MEMTEST_END=0x9fffffff
@@ -51,7 +52,6 @@ CONFIG_CMD_CACHE=y
  CONFIG_OF_CONTROL=y
  CONFIG_ENV_OVERWRITE=y
  CONFIG_ENV_IS_IN_FLASH=y
-CONFIG_ENV_ADDR=0x80300000
  CONFIG_USE_ETHPRIME=y
  CONFIG_ETHPRIME="DPMAC1@xgmii"
  CONFIG_NET_RANDOM_ETHADDR=y
diff --git a/configs/ls1088aqds_qspi_defconfig b/configs/ls1088aqds_qspi_defconfig

index 9f9f23f8254334795c8ab27c5de8fcd0c60adaef..eb3e51343e8ed3ac594413962948452576283078 100644 (file)
--- a/configs/ls1088aqds_qspi_defconfig
+++ b/configs/ls1088aqds_qspi_defconfig
@@ -18,6 +18,7 @@ CONFIG_VOL_MONITOR_LTC3882_SET=y
  CONFIG_FSL_QIXIS=y
  CONFIG_FSL_LS_PPA=y
  CONFIG_QSPI_AHB_INIT=y
+CONFIG_ENV_ADDR=0x20300000
  CONFIG_AHCI=y
  CONFIG_SYS_MEMTEST_START=0x80000000
  CONFIG_SYS_MEMTEST_END=0x9fffffff
@@ -50,7 +51,6 @@ CONFIG_CMD_CACHE=y
  CONFIG_OF_CONTROL=y
  CONFIG_ENV_OVERWRITE=y
  CONFIG_ENV_IS_IN_SPI_FLASH=y
-CONFIG_ENV_ADDR=0x20300000
  CONFIG_USE_ETHPRIME=y
  CONFIG_ETHPRIME="DPMAC1@xgmii"
  CONFIG_NET_RANDOM_ETHADDR=y
diff --git a/configs/ls1088aqds_tfa_defconfig b/configs/ls1088aqds_tfa_defconfig

index 6688ac28a9f6018ac5feb55c7d46a665159eccaf..fcd4757ab2e5a529c1169bd75458c0cffe4e1e53 100644 (file)
--- a/configs/ls1088aqds_tfa_defconfig
+++ b/configs/ls1088aqds_tfa_defconfig
@@ -21,6 +21,7 @@ CONFIG_FSL_QIXIS=y
  CONFIG_QSPI_AHB_INIT=y
  CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT=y
  CONFIG_SEC_FIRMWARE_ARMV8_PSCI=y
+CONFIG_ENV_ADDR=0x20500000
  CONFIG_AHCI=y
  CONFIG_SYS_MEMTEST_START=0x80000000
  CONFIG_SYS_MEMTEST_END=0x9fffffff
@@ -58,7 +59,6 @@ CONFIG_ENV_IS_IN_FLASH=y
  CONFIG_ENV_IS_IN_MMC=y
  CONFIG_ENV_IS_IN_NAND=y
  CONFIG_ENV_IS_IN_SPI_FLASH=y
-CONFIG_ENV_ADDR=0x20500000
  CONFIG_SYS_RELOC_GD_ENV_ADDR=y
  CONFIG_USE_ETHPRIME=y
  CONFIG_ETHPRIME="DPMAC1@xgmii"
diff --git a/configs/ls1088ardb_qspi_defconfig b/configs/ls1088ardb_qspi_defconfig

index eee74db682a8ccd2559e0c919ebbb0a718ad9837..7d6340997f5939b46d664a2baf4cec8839832c9e 100644 (file)
--- a/configs/ls1088ardb_qspi_defconfig
+++ b/configs/ls1088ardb_qspi_defconfig
@@ -18,6 +18,7 @@ CONFIG_VOL_MONITOR_LTC3882_SET=y
  CONFIG_FSL_QIXIS=y
  CONFIG_FSL_LS_PPA=y
  CONFIG_QSPI_AHB_INIT=y
+CONFIG_ENV_ADDR=0x20300000
  CONFIG_AHCI=y
  CONFIG_SYS_MEMTEST_START=0x80000000
  CONFIG_SYS_MEMTEST_END=0x9fffffff
@@ -52,7 +53,6 @@ CONFIG_CMD_CACHE=y
  CONFIG_OF_CONTROL=y
  CONFIG_ENV_OVERWRITE=y
  CONFIG_ENV_IS_IN_SPI_FLASH=y
-CONFIG_ENV_ADDR=0x20300000
  CONFIG_USE_ETHPRIME=y
  CONFIG_ETHPRIME="DPMAC1@xgmii"
  CONFIG_NET_RANDOM_ETHADDR=y
diff --git a/configs/ls1088ardb_tfa_defconfig b/configs/ls1088ardb_tfa_defconfig

index 4468c5b8100b13afecedf6f024ed5b3d8df6d67e..364fe1882eeb1c711a073f91ea43ebf9c7ed5a40 100644 (file)
--- a/configs/ls1088ardb_tfa_defconfig
+++ b/configs/ls1088ardb_tfa_defconfig
@@ -21,6 +21,7 @@ CONFIG_FSL_QIXIS=y
  CONFIG_QSPI_AHB_INIT=y
  CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT=y
  CONFIG_SEC_FIRMWARE_ARMV8_PSCI=y
+CONFIG_ENV_ADDR=0x20500000
  CONFIG_AHCI=y
  CONFIG_SYS_MEMTEST_START=0x80000000
  CONFIG_SYS_MEMTEST_END=0x9fffffff
@@ -54,7 +55,6 @@ CONFIG_OF_CONTROL=y
  CONFIG_ENV_OVERWRITE=y
  CONFIG_ENV_IS_IN_MMC=y
  CONFIG_ENV_IS_IN_SPI_FLASH=y
-CONFIG_ENV_ADDR=0x20500000
  CONFIG_SYS_RELOC_GD_ENV_ADDR=y
  CONFIG_USE_ETHPRIME=y
  CONFIG_ETHPRIME="DPMAC1@xgmii"
diff --git a/configs/ls2080aqds_defconfig b/configs/ls2080aqds_defconfig

index 82f8454b34c3a70eb2f8f346dfbf3fffe933fd38..09ec59d87c55064484b19d991ce7376fda09e9ac 100644 (file)
--- a/configs/ls2080aqds_defconfig
+++ b/configs/ls2080aqds_defconfig
@@ -11,6 +11,7 @@ CONFIG_FSL_USE_PCA9547_MUX=y
  CONFIG_FSL_QIXIS=y
  # CONFIG_QIXIS_I2C_ACCESS is not set
  CONFIG_FSL_LS_PPA=y
+CONFIG_ENV_ADDR=0x80300000
  CONFIG_AHCI=y
  # CONFIG_SYS_MALLOC_F is not set
  CONFIG_REMAKE_ELF=y
@@ -42,7 +43,6 @@ CONFIG_CMD_DATE=y
  CONFIG_OF_CONTROL=y
  CONFIG_ENV_OVERWRITE=y
  CONFIG_ENV_IS_IN_FLASH=y
-CONFIG_ENV_ADDR=0x80300000
  CONFIG_USE_ETHPRIME=y
  CONFIG_ETHPRIME="DPMAC1@xgmii"
  CONFIG_NET_RANDOM_ETHADDR=y
diff --git a/configs/ls2080ardb_defconfig b/configs/ls2080ardb_defconfig

index 86649849ab9332c944925c9476de0e461f09ac42..a978b8b2ac0cf1f06030ff9b5f9593e8e1d8b271 100644 (file)
--- a/configs/ls2080ardb_defconfig
+++ b/configs/ls2080ardb_defconfig
@@ -15,6 +15,7 @@ CONFIG_VOL_MONITOR_IR36021_SET=y
  CONFIG_FSL_QIXIS=y
  # CONFIG_QIXIS_I2C_ACCESS is not set
  CONFIG_FSL_LS_PPA=y
+CONFIG_ENV_ADDR=0x80300000
  CONFIG_AHCI=y
  # CONFIG_SYS_MALLOC_F is not set
  CONFIG_REMAKE_ELF=y
@@ -46,7 +47,6 @@ CONFIG_CMD_DATE=y
  CONFIG_OF_CONTROL=y
  CONFIG_ENV_OVERWRITE=y
  CONFIG_ENV_IS_IN_FLASH=y
-CONFIG_ENV_ADDR=0x80300000
  CONFIG_USE_ETHPRIME=y
  CONFIG_ETHPRIME="DPMAC1@xgmii"
  CONFIG_NET_RANDOM_ETHADDR=y
diff --git a/configs/ls2088aqds_tfa_defconfig b/configs/ls2088aqds_tfa_defconfig

index 6b7c69119d39bd0d89e6f25619dc52f7fa3a4058..7d57f7aa609e755c1523b78aedc28444abb7be35 100644 (file)
--- a/configs/ls2088aqds_tfa_defconfig
+++ b/configs/ls2088aqds_tfa_defconfig
@@ -15,6 +15,7 @@ CONFIG_FSL_QIXIS=y
  # CONFIG_QIXIS_I2C_ACCESS is not set
  CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT=y
  CONFIG_SEC_FIRMWARE_ARMV8_PSCI=y
+CONFIG_ENV_ADDR=0x580500000
  CONFIG_AHCI=y
  # CONFIG_SYS_MALLOC_F is not set
  CONFIG_REMAKE_ELF=y
@@ -50,7 +51,6 @@ CONFIG_ENV_OVERWRITE=y
  CONFIG_ENV_IS_IN_FLASH=y
  CONFIG_ENV_IS_IN_MMC=y
  CONFIG_ENV_IS_IN_SPI_FLASH=y
-CONFIG_ENV_ADDR=0x580500000
  CONFIG_SYS_RELOC_GD_ENV_ADDR=y
  CONFIG_USE_ETHPRIME=y
  CONFIG_ETHPRIME="DPMAC1@xgmii"
diff --git a/configs/ls2088ardb_qspi_defconfig b/configs/ls2088ardb_qspi_defconfig

index 9636559c8bfee0499b23cff9344fa2edb844b47f..d58a8431df56fca6b1016fd8552746e61beed87a 100644 (file)
--- a/configs/ls2088ardb_qspi_defconfig
+++ b/configs/ls2088ardb_qspi_defconfig
@@ -16,6 +16,7 @@ CONFIG_VOL_MONITOR_IR36021_READ=y
  CONFIG_VOL_MONITOR_IR36021_SET=y
  CONFIG_FSL_LS_PPA=y
  CONFIG_QSPI_AHB_INIT=y
+CONFIG_ENV_ADDR=0x20300000
  CONFIG_AHCI=y
  # CONFIG_SYS_MALLOC_F is not set
  CONFIG_REMAKE_ELF=y
@@ -45,7 +46,6 @@ CONFIG_CMD_CACHE=y
  CONFIG_OF_CONTROL=y
  CONFIG_ENV_OVERWRITE=y
  CONFIG_ENV_IS_IN_SPI_FLASH=y
-CONFIG_ENV_ADDR=0x20300000
  CONFIG_SYS_RELOC_GD_ENV_ADDR=y
  CONFIG_USE_ETHPRIME=y
  CONFIG_ETHPRIME="DPMAC1@xgmii"
diff --git a/configs/ls2088ardb_tfa_defconfig b/configs/ls2088ardb_tfa_defconfig

index 4e0ebbd3b83c31c9cba1c8e140ee71c7906cd9c7..e9d3c56909e48f1a3d9e96bb63089e4fafdf4d20 100644 (file)
--- a/configs/ls2088ardb_tfa_defconfig
+++ b/configs/ls2088ardb_tfa_defconfig
@@ -21,6 +21,7 @@ CONFIG_FSL_QIXIS=y
  CONFIG_QSPI_AHB_INIT=y
  CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT=y
  CONFIG_SEC_FIRMWARE_ARMV8_PSCI=y
+CONFIG_ENV_ADDR=0x580500000
  CONFIG_AHCI=y
  CONFIG_REMAKE_ELF=y
  CONFIG_MP=y
@@ -53,7 +54,6 @@ CONFIG_ENV_OVERWRITE=y
  CONFIG_ENV_IS_IN_FLASH=y
  CONFIG_ENV_IS_IN_MMC=y
  CONFIG_ENV_IS_IN_SPI_FLASH=y
-CONFIG_ENV_ADDR=0x580500000
  CONFIG_USE_ETHPRIME=y
  CONFIG_ETHPRIME="DPMAC1@xgmii"
  CONFIG_NET_RANDOM_ETHADDR=y
diff --git a/configs/lschlv2_defconfig b/configs/lschlv2_defconfig

index 080e5836f2cd8ac105a47dc283ae1d6f8b1fd105..38d25c42b3711579b07502759370169c241f0626 100644 (file)
--- a/configs/lschlv2_defconfig
+++ b/configs/lschlv2_defconfig
@@ -12,8 +12,8 @@ CONFIG_ENV_OFFSET=0x70000
  CONFIG_ENV_SECT_SIZE=0x10000
  CONFIG_DEFAULT_DEVICE_TREE="kirkwood-lschlv2"
  CONFIG_IDENT_STRING=" LS-CHLv2"
-CONFIG_DISTRO_DEFAULTS=y
  CONFIG_SYS_LOAD_ADDR=0x800000
+CONFIG_DISTRO_DEFAULTS=y
  CONFIG_API=y
  CONFIG_SHOW_BOOT_PROGRESS=y
  CONFIG_BOOTDELAY=3
diff --git a/configs/lsxhl_defconfig b/configs/lsxhl_defconfig

index 0de6fc55c6afefcd09ee3259bd5170c1d55db3d3..c90999794b1ad48c3bcc2b00a174b4465d153a3c 100644 (file)
--- a/configs/lsxhl_defconfig
+++ b/configs/lsxhl_defconfig
@@ -13,8 +13,8 @@ CONFIG_ENV_OFFSET=0x70000
  CONFIG_ENV_SECT_SIZE=0x10000
  CONFIG_DEFAULT_DEVICE_TREE="kirkwood-lsxhl"
  CONFIG_IDENT_STRING=" LS-XHL"
-CONFIG_DISTRO_DEFAULTS=y
  CONFIG_SYS_LOAD_ADDR=0x800000
+CONFIG_DISTRO_DEFAULTS=y
  CONFIG_API=y
  CONFIG_SHOW_BOOT_PROGRESS=y
  CONFIG_BOOTDELAY=3
diff --git a/configs/lx2160aqds_tfa_defconfig b/configs/lx2160aqds_tfa_defconfig

index 72a8a8d97f0af39b4b5b4ec4522c9bef52e337a8..32ea3cb387d0fedbf5f6e2b2f80febc424621b2f 100644 (file)
--- a/configs/lx2160aqds_tfa_defconfig
+++ b/configs/lx2160aqds_tfa_defconfig
@@ -22,6 +22,7 @@ CONFIG_FSL_QIXIS=y
  CONFIG_FSPI_AHB_EN_4BYTE=y
  CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT=y
  CONFIG_SEC_FIRMWARE_ARMV8_PSCI=y
+CONFIG_ENV_ADDR=0x20500000
  CONFIG_AHCI=y
  CONFIG_OF_BOARD_FIXUP=y
  CONFIG_REMAKE_ELF=y
@@ -55,7 +56,6 @@ CONFIG_MULTI_DTB_FIT=y
  CONFIG_ENV_OVERWRITE=y
  CONFIG_ENV_IS_IN_MMC=y
  CONFIG_ENV_IS_IN_SPI_FLASH=y
-CONFIG_ENV_ADDR=0x20500000
  CONFIG_USE_ETHPRIME=y
  CONFIG_ETHPRIME="DPMAC17@rgmii-id"
  CONFIG_NET_RANDOM_ETHADDR=y
diff --git a/configs/lx2160ardb_tfa_defconfig b/configs/lx2160ardb_tfa_defconfig

index 1448cf412142063b375f61bb5a266ab3ee246b55..ee63ccdf4607d7a31e825d10f4530f1226a95ee1 100644 (file)
--- a/configs/lx2160ardb_tfa_defconfig
+++ b/configs/lx2160ardb_tfa_defconfig
@@ -23,6 +23,7 @@ CONFIG_EMC2305=y
  CONFIG_FSPI_AHB_EN_4BYTE=y
  CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT=y
  CONFIG_SEC_FIRMWARE_ARMV8_PSCI=y
+CONFIG_ENV_ADDR=0x20500000
  CONFIG_AHCI=y
  CONFIG_OF_BOARD_FIXUP=y
  CONFIG_REMAKE_ELF=y
@@ -54,7 +55,6 @@ CONFIG_OF_CONTROL=y
  CONFIG_ENV_OVERWRITE=y
  CONFIG_ENV_IS_IN_MMC=y
  CONFIG_ENV_IS_IN_SPI_FLASH=y
-CONFIG_ENV_ADDR=0x20500000
  CONFIG_USE_ETHPRIME=y
  CONFIG_ETHPRIME="DPMAC1@xgmii"
  CONFIG_NET_RANDOM_ETHADDR=y
diff --git a/configs/lx2160ardb_tfa_stmm_defconfig b/configs/lx2160ardb_tfa_stmm_defconfig

index 453867b5caa0918b359762e0abd0e986a40d9fe8..ce106fb018f2c4043047612167180369f187965b 100644 (file)
--- a/configs/lx2160ardb_tfa_stmm_defconfig
+++ b/configs/lx2160ardb_tfa_stmm_defconfig
@@ -23,6 +23,7 @@ CONFIG_EMC2305=y
  CONFIG_FSPI_AHB_EN_4BYTE=y
  CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT=y
  CONFIG_SEC_FIRMWARE_ARMV8_PSCI=y
+CONFIG_ENV_ADDR=0x20500000
  CONFIG_AHCI=y
  CONFIG_OF_BOARD_FIXUP=y
  CONFIG_REMAKE_ELF=y
@@ -54,7 +55,6 @@ CONFIG_OF_CONTROL=y
  CONFIG_ENV_OVERWRITE=y
  CONFIG_ENV_IS_IN_MMC=y
  CONFIG_ENV_IS_IN_SPI_FLASH=y
-CONFIG_ENV_ADDR=0x20500000
  CONFIG_USE_ETHPRIME=y
  CONFIG_ETHPRIME="DPMAC1@xgmii"
  CONFIG_NET_RANDOM_ETHADDR=y
diff --git a/configs/lx2162aqds_tfa_defconfig b/configs/lx2162aqds_tfa_defconfig

index 314d02351c5c949a327a19378dc84c0061eb6dc1..a13abd29a7634254636d78e28fee9a870a56d974 100644 (file)
--- a/configs/lx2162aqds_tfa_defconfig
+++ b/configs/lx2162aqds_tfa_defconfig
@@ -22,6 +22,7 @@ CONFIG_FSL_QIXIS=y
  CONFIG_FSPI_AHB_EN_4BYTE=y
  CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT=y
  CONFIG_SEC_FIRMWARE_ARMV8_PSCI=y
+CONFIG_ENV_ADDR=0x20500000
  CONFIG_AHCI=y
  CONFIG_OF_BOARD_FIXUP=y
  CONFIG_REMAKE_ELF=y
@@ -57,7 +58,6 @@ CONFIG_MULTI_DTB_FIT=y
  CONFIG_ENV_OVERWRITE=y
  CONFIG_ENV_IS_IN_MMC=y
  CONFIG_ENV_IS_IN_SPI_FLASH=y
-CONFIG_ENV_ADDR=0x20500000
  CONFIG_USE_ETHPRIME=y
  CONFIG_ETHPRIME="DPMAC17@rgmii-id"
  CONFIG_NET_RANDOM_ETHADDR=y
diff --git a/configs/lx2162aqds_tfa_verified_boot_defconfig b/configs/lx2162aqds_tfa_verified_boot_defconfig

index dbf5484ca09331e4c80f9cf1228dcbc535cb98bc..114bc6ee728dd7502d68fe45e5c724888e4f9f78 100644 (file)
--- a/configs/lx2162aqds_tfa_verified_boot_defconfig
+++ b/configs/lx2162aqds_tfa_verified_boot_defconfig
@@ -22,6 +22,7 @@ CONFIG_FSL_QIXIS=y
  CONFIG_FSPI_AHB_EN_4BYTE=y
  CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT=y
  CONFIG_SEC_FIRMWARE_ARMV8_PSCI=y
+CONFIG_ENV_ADDR=0x20500000
  CONFIG_AHCI=y
  CONFIG_OF_BOARD_FIXUP=y
  CONFIG_REMAKE_ELF=y
@@ -58,7 +59,6 @@ CONFIG_MULTI_DTB_FIT=y
  CONFIG_ENV_OVERWRITE=y
  CONFIG_ENV_IS_IN_MMC=y
  CONFIG_ENV_IS_IN_SPI_FLASH=y
-CONFIG_ENV_ADDR=0x20500000
  CONFIG_USE_ETHPRIME=y
  CONFIG_ETHPRIME="DPMAC17@rgmii-id"
  CONFIG_NET_RANDOM_ETHADDR=y
diff --git a/configs/malta64_defconfig b/configs/malta64_defconfig

index 1c1bc4e4cd47a0e577357c9f5375fdc08ea15867..722d2e363dd9d947d10ea2f9908d6b10c9311d54 100644 (file)
--- a/configs/malta64_defconfig
+++ b/configs/malta64_defconfig
@@ -4,9 +4,10 @@ CONFIG_SYS_MALLOC_LEN=0x20000
  CONFIG_ENV_SIZE=0x20000
  CONFIG_ENV_SECT_SIZE=0x20000
  CONFIG_DEFAULT_DEVICE_TREE="mti,malta"
+CONFIG_SYS_LOAD_ADDR=0xffffffff81000000
+CONFIG_ENV_ADDR=0xFFFFFFFFBE3E0000
  CONFIG_TARGET_MALTA=y
  CONFIG_CPU_MIPS64_R2=y
-CONFIG_SYS_LOAD_ADDR=0xffffffff81000000
  # CONFIG_AUTOBOOT is not set
  CONFIG_BOARD_EARLY_INIT_F=y
  CONFIG_MISC_INIT_R=y
@@ -24,7 +25,6 @@ CONFIG_CMD_PING=y
  CONFIG_CMD_DATE=y
  # CONFIG_ISO_PARTITION is not set
  CONFIG_ENV_IS_IN_FLASH=y
-CONFIG_ENV_ADDR=0xFFFFFFFFBE3E0000
  CONFIG_SYS_IDE_MAXBUS=1
  CONFIG_SYS_ATA_DATA_OFFSET=0
  CONFIG_SYS_ATA_REG_OFFSET=0
diff --git a/configs/malta64el_defconfig b/configs/malta64el_defconfig

index 756138daafda8ef1b328c26ce1937dd8468a370d..c693f7ccdd9be740d1abe0088b38ff571d012e7b 100644 (file)
--- a/configs/malta64el_defconfig
+++ b/configs/malta64el_defconfig
@@ -4,11 +4,12 @@ CONFIG_SYS_MALLOC_LEN=0x20000
  CONFIG_ENV_SIZE=0x20000
  CONFIG_ENV_SECT_SIZE=0x20000
  CONFIG_DEFAULT_DEVICE_TREE="mti,malta"
+CONFIG_SYS_LOAD_ADDR=0xffffffff81000000
+CONFIG_ENV_ADDR=0xFFFFFFFFBE3E0000
  CONFIG_TARGET_MALTA=y
  CONFIG_BUILD_TARGET="u-boot-swap.bin"
  CONFIG_SYS_LITTLE_ENDIAN=y
  CONFIG_CPU_MIPS64_R2=y
-CONFIG_SYS_LOAD_ADDR=0xffffffff81000000
  # CONFIG_AUTOBOOT is not set
  CONFIG_BOARD_EARLY_INIT_F=y
  CONFIG_MISC_INIT_R=y
@@ -26,7 +27,6 @@ CONFIG_CMD_PING=y
  CONFIG_CMD_DATE=y
  # CONFIG_ISO_PARTITION is not set
  CONFIG_ENV_IS_IN_FLASH=y
-CONFIG_ENV_ADDR=0xFFFFFFFFBE3E0000
  CONFIG_SYS_IDE_MAXBUS=1
  CONFIG_SYS_ATA_DATA_OFFSET=0
  CONFIG_SYS_ATA_REG_OFFSET=0
diff --git a/configs/malta_defconfig b/configs/malta_defconfig

index 802cc370e9a7eb8d99cc30253501260e1baa4d72..5c5bdd00e6a95a87a3f03dbc72252deab4e49652 100644 (file)
--- a/configs/malta_defconfig
+++ b/configs/malta_defconfig
@@ -4,8 +4,9 @@ CONFIG_SYS_MALLOC_LEN=0x20000
  CONFIG_ENV_SIZE=0x20000
  CONFIG_ENV_SECT_SIZE=0x20000
  CONFIG_DEFAULT_DEVICE_TREE="mti,malta"
-CONFIG_TARGET_MALTA=y
  CONFIG_SYS_LOAD_ADDR=0x81000000
+CONFIG_ENV_ADDR=0xBE3E0000
+CONFIG_TARGET_MALTA=y
  # CONFIG_AUTOBOOT is not set
  CONFIG_BOARD_EARLY_INIT_F=y
  CONFIG_MISC_INIT_R=y
@@ -23,7 +24,6 @@ CONFIG_CMD_PING=y
  CONFIG_CMD_DATE=y
  # CONFIG_ISO_PARTITION is not set
  CONFIG_ENV_IS_IN_FLASH=y
-CONFIG_ENV_ADDR=0xBE3E0000
  CONFIG_SYS_IDE_MAXBUS=1
  CONFIG_SYS_ATA_DATA_OFFSET=0
  CONFIG_SYS_ATA_REG_OFFSET=0
diff --git a/configs/maltael_defconfig b/configs/maltael_defconfig

index f929fc82d26b39d7cbc2edadd8c2daef27067192..af27d4eb0ab80575ac5cfc5524450f5493abe002 100644 (file)
--- a/configs/maltael_defconfig
+++ b/configs/maltael_defconfig
@@ -4,10 +4,11 @@ CONFIG_SYS_MALLOC_LEN=0x20000
  CONFIG_ENV_SIZE=0x20000
  CONFIG_ENV_SECT_SIZE=0x20000
  CONFIG_DEFAULT_DEVICE_TREE="mti,malta"
+CONFIG_SYS_LOAD_ADDR=0x81000000
+CONFIG_ENV_ADDR=0xBE3E0000
  CONFIG_TARGET_MALTA=y
  CONFIG_BUILD_TARGET="u-boot-swap.bin"
  CONFIG_SYS_LITTLE_ENDIAN=y
-CONFIG_SYS_LOAD_ADDR=0x81000000
  # CONFIG_AUTOBOOT is not set
  CONFIG_BOARD_EARLY_INIT_F=y
  CONFIG_MISC_INIT_R=y
@@ -25,7 +26,6 @@ CONFIG_CMD_PING=y
  CONFIG_CMD_DATE=y
  # CONFIG_ISO_PARTITION is not set
  CONFIG_ENV_IS_IN_FLASH=y
-CONFIG_ENV_ADDR=0xBE3E0000
  CONFIG_SYS_IDE_MAXBUS=1
  CONFIG_SYS_ATA_DATA_OFFSET=0
  CONFIG_SYS_ATA_REG_OFFSET=0
diff --git a/configs/maxbcm_defconfig b/configs/maxbcm_defconfig

index b9e133e4ba44bb2e6ae5578cd2442d5240c1f1f8..d7ae56cb3874e9889922599413171b55ccc0d242 100644 (file)
--- a/configs/maxbcm_defconfig
+++ b/configs/maxbcm_defconfig
@@ -16,8 +16,8 @@ CONFIG_SPL_SERIAL=y
  CONFIG_SPL=y
  CONFIG_DEBUG_UART_BASE=0xd0012000
  CONFIG_DEBUG_UART_CLOCK=250000000
-CONFIG_DEBUG_UART=y
  CONFIG_SYS_LOAD_ADDR=0x800000
+CONFIG_DEBUG_UART=y
  CONFIG_BOOTDELAY=3
  CONFIG_USE_PREBOOT=y
  CONFIG_SYS_CONSOLE_INFO_QUIET=y
diff --git a/configs/mccmon6_nor_defconfig b/configs/mccmon6_nor_defconfig

index 179a945fe3b3a7c247e71a11663264e125d32af0..44c97c15a3ff1c12e30a2aee10d534ef81c54153 100644 (file)
--- a/configs/mccmon6_nor_defconfig
+++ b/configs/mccmon6_nor_defconfig
@@ -16,6 +16,7 @@ CONFIG_SPL_TEXT_BASE=0x00908000
  CONFIG_SPL_SERIAL=y
  CONFIG_SPL=y
  # CONFIG_CMD_BMODE is not set
+CONFIG_ENV_ADDR=0x8040000
  CONFIG_DISTRO_DEFAULTS=y
  CONFIG_FIT=y
  CONFIG_SPL_LOAD_FIT=y
@@ -47,7 +48,6 @@ CONFIG_OF_CONTROL=y
  CONFIG_ENV_OVERWRITE=y
  CONFIG_ENV_IS_IN_FLASH=y
  CONFIG_SYS_REDUNDAND_ENVIRONMENT=y
-CONFIG_ENV_ADDR=0x8040000
  CONFIG_ENV_ADDR_REDUND=0x8060000
  CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
  CONFIG_BOUNCE_BUFFER=y
diff --git a/configs/mccmon6_sd_defconfig b/configs/mccmon6_sd_defconfig

index 5ff3f2372746d61e21ab562fe2232ca9d19768f4..4c719337eeaa8f1a9a28f75ebd94a812f5d78336 100644 (file)
--- a/configs/mccmon6_sd_defconfig
+++ b/configs/mccmon6_sd_defconfig
@@ -17,6 +17,7 @@ CONFIG_SPL_MMC=y
  CONFIG_SPL_SERIAL=y
  CONFIG_SPL=y
  # CONFIG_CMD_BMODE is not set
+CONFIG_ENV_ADDR=0x8040000
  CONFIG_DISTRO_DEFAULTS=y
  CONFIG_FIT=y
  CONFIG_SPL_LOAD_FIT=y
@@ -45,7 +46,6 @@ CONFIG_OF_CONTROL=y
  CONFIG_ENV_OVERWRITE=y
  CONFIG_ENV_IS_IN_FLASH=y
  CONFIG_SYS_REDUNDAND_ENVIRONMENT=y
-CONFIG_ENV_ADDR=0x8040000
  CONFIG_ENV_ADDR_REDUND=0x8060000
  CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
  CONFIG_BOUNCE_BUFFER=y
diff --git a/configs/microblaze-generic_defconfig b/configs/microblaze-generic_defconfig

index 98c4287f0072dedf3e8a5ef4bd44fa528d4c660f..a92fc0f6eeba18a4876210d3547f47e2a02e632c 100644 (file)
--- a/configs/microblaze-generic_defconfig
+++ b/configs/microblaze-generic_defconfig
@@ -6,13 +6,13 @@ CONFIG_ENV_SIZE=0x20000
  CONFIG_DEFAULT_DEVICE_TREE="microblaze-generic"
  CONFIG_SPL_SERIAL=y
  CONFIG_SPL=y
+CONFIG_SYS_LOAD_ADDR=0x0
  CONFIG_TARGET_MICROBLAZE_GENERIC=y
  CONFIG_XILINX_MICROBLAZE0_USE_MSR_INSTR=1
  CONFIG_XILINX_MICROBLAZE0_USE_BARREL=1
  CONFIG_XILINX_MICROBLAZE0_USE_DIV=1
  CONFIG_XILINX_MICROBLAZE0_USE_HW_MUL=1
  CONFIG_DISTRO_DEFAULTS=y
-CONFIG_SYS_LOAD_ADDR=0x0
  CONFIG_FIT=y
  CONFIG_FIT_VERBOSE=y
  CONFIG_BOOTDELAY=-1
diff --git a/configs/microchip_mpfs_icicle_defconfig b/configs/microchip_mpfs_icicle_defconfig

index e51afc17e29e0edffdf66829afb2b3ed130dc6f7..6cae07a1d1a4817f92bc735b0288dae09560858a 100644 (file)
--- a/configs/microchip_mpfs_icicle_defconfig
+++ b/configs/microchip_mpfs_icicle_defconfig
@@ -3,11 +3,11 @@ CONFIG_SYS_MALLOC_LEN=0x800000
  CONFIG_SYS_MALLOC_F_LEN=0x2000
  CONFIG_ENV_SIZE=0x2000
  CONFIG_DEFAULT_DEVICE_TREE="microchip-mpfs-icicle-kit"
+CONFIG_SYS_LOAD_ADDR=0x80200000
  CONFIG_TARGET_MICROCHIP_ICICLE=y
  CONFIG_ARCH_RV64I=y
  CONFIG_RISCV_SMODE=y
  CONFIG_DISTRO_DEFAULTS=y
-CONFIG_SYS_LOAD_ADDR=0x80200000
  CONFIG_FIT=y
  CONFIG_DISPLAY_CPUINFO=y
  CONFIG_DISPLAY_BOARDINFO=y
diff --git a/configs/miqi-rk3288_defconfig b/configs/miqi-rk3288_defconfig

index f85292d5b17d96a0d0e1129bee6decab53ea2c78..0bb194d5243798e4be9f38fb00e7cd24172bed98 100644 (file)
--- a/configs/miqi-rk3288_defconfig
+++ b/configs/miqi-rk3288_defconfig
@@ -13,8 +13,8 @@ CONFIG_TARGET_MIQI_RK3288=y
  CONFIG_SPL_STACK_R_ADDR=0x80000
  CONFIG_DEBUG_UART_BASE=0xff690000
  CONFIG_DEBUG_UART_CLOCK=24000000
-CONFIG_DEBUG_UART=y
  CONFIG_SYS_LOAD_ADDR=0x800800
+CONFIG_DEBUG_UART=y
  # CONFIG_ANDROID_BOOT_IMAGE is not set
  CONFIG_USE_PREBOOT=y
  CONFIG_DEFAULT_FDT_FILE="rk3288-miqi.dtb"
diff --git a/configs/mscc_jr2_defconfig b/configs/mscc_jr2_defconfig

index 1d511776c6984f69c1e056273d7354efa03163f2..54f0fc128aaaa93ca7a7866c6a29bca867772196 100644 (file)
--- a/configs/mscc_jr2_defconfig
+++ b/configs/mscc_jr2_defconfig
@@ -11,13 +11,13 @@ CONFIG_DEBUG_UART_BOARD_INIT=y
  CONFIG_DEBUG_UART_BASE=0x70100000
  CONFIG_DEBUG_UART_CLOCK=250000000
  CONFIG_ENV_OFFSET_REDUND=0x140000
+CONFIG_SYS_LOAD_ADDR=0x100000
  CONFIG_ARCH_MSCC=y
  CONFIG_SOC_JR2=y
  CONFIG_SYS_LITTLE_ENDIAN=y
  CONFIG_DEBUG_UART=y
  CONFIG_SYS_MEMTEST_START=0x80000000
  CONFIG_SYS_MEMTEST_END=0x9fc00000
-CONFIG_SYS_LOAD_ADDR=0x100000
  CONFIG_FIT=y
  CONFIG_BOOTDELAY=3
  CONFIG_USE_BOOTARGS=y
diff --git a/configs/mscc_luton_defconfig b/configs/mscc_luton_defconfig

index 0033e57016e690241556da6a40588b232618353d..3a9b87b07797bb6fdf1029750e98fa57557b3ab9 100644 (file)
--- a/configs/mscc_luton_defconfig
+++ b/configs/mscc_luton_defconfig
@@ -11,6 +11,7 @@ CONFIG_DEBUG_UART_BOARD_INIT=y
  CONFIG_DEBUG_UART_BASE=0x70100000
  CONFIG_DEBUG_UART_CLOCK=208333333
  CONFIG_ENV_OFFSET_REDUND=0x140000
+CONFIG_SYS_LOAD_ADDR=0x100000
  CONFIG_ARCH_MSCC=y
  CONFIG_SOC_LUTON=y
  CONFIG_DDRTYPE_MT47H128M8HQ=y
@@ -19,7 +20,6 @@ CONFIG_MIPS_BOOT_FDT=y
  CONFIG_DEBUG_UART=y
  CONFIG_SYS_MEMTEST_START=0x80000000
  CONFIG_SYS_MEMTEST_END=0x87c00000
-CONFIG_SYS_LOAD_ADDR=0x100000
  CONFIG_FIT=y
  CONFIG_BOOTDELAY=3
  CONFIG_USE_BOOTARGS=y
diff --git a/configs/mscc_ocelot_defconfig b/configs/mscc_ocelot_defconfig

index c6eb91142e583e9a87e48754cc626bbc26672ad2..5b1d7919918f02537bf5b889b402c71893f64cb5 100644 (file)
--- a/configs/mscc_ocelot_defconfig
+++ b/configs/mscc_ocelot_defconfig
@@ -11,12 +11,12 @@ CONFIG_DEBUG_UART_BOARD_INIT=y
  CONFIG_DEBUG_UART_BASE=0x70100000
  CONFIG_DEBUG_UART_CLOCK=250000000
  CONFIG_ENV_OFFSET_REDUND=0x140000
+CONFIG_SYS_LOAD_ADDR=0x100000
  CONFIG_ARCH_MSCC=y
  CONFIG_SYS_LITTLE_ENDIAN=y
  CONFIG_DEBUG_UART=y
  CONFIG_SYS_MEMTEST_START=0x80000000
  CONFIG_SYS_MEMTEST_END=0x9fc00000
-CONFIG_SYS_LOAD_ADDR=0x100000
  CONFIG_FIT=y
  CONFIG_BOOTDELAY=3
  CONFIG_USE_BOOTARGS=y
diff --git a/configs/mscc_serval_defconfig b/configs/mscc_serval_defconfig

index 6356fdfaaafb1998ce5ab7229becb9f21867f930..3e8340abfc4ecb9eaa9c5d1dcd2017f069e1b2d1 100644 (file)
--- a/configs/mscc_serval_defconfig
+++ b/configs/mscc_serval_defconfig
@@ -8,13 +8,13 @@ CONFIG_ENV_SECT_SIZE=0x40000
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="serval_pcb106"
  CONFIG_ENV_OFFSET_REDUND=0x140000
+CONFIG_SYS_LOAD_ADDR=0x100000
  CONFIG_ARCH_MSCC=y
  CONFIG_SOC_SERVAL=y
  CONFIG_DDRTYPE_H5TQ1G63BFA=y
  CONFIG_SYS_LITTLE_ENDIAN=y
  CONFIG_SYS_MEMTEST_START=0x80000000
  CONFIG_SYS_MEMTEST_END=0x87c00000
-CONFIG_SYS_LOAD_ADDR=0x100000
  CONFIG_FIT=y
  CONFIG_BOOTDELAY=3
  CONFIG_USE_BOOTARGS=y
diff --git a/configs/mscc_servalt_defconfig b/configs/mscc_servalt_defconfig

index bee1b27a0d01c7a07964ccbe5d40d9e3e74b702c..ee5f26df0bf249743f5a7896d4a2bc70202bd928 100644 (file)
--- a/configs/mscc_servalt_defconfig
+++ b/configs/mscc_servalt_defconfig
@@ -8,12 +8,12 @@ CONFIG_ENV_SECT_SIZE=0x40000
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="servalt_pcb116"
  CONFIG_ENV_OFFSET_REDUND=0x140000
+CONFIG_SYS_LOAD_ADDR=0x100000
  CONFIG_ARCH_MSCC=y
  CONFIG_SOC_SERVALT=y
  CONFIG_SYS_LITTLE_ENDIAN=y
  CONFIG_SYS_MEMTEST_START=0x80000000
  CONFIG_SYS_MEMTEST_END=0x9fc00000
-CONFIG_SYS_LOAD_ADDR=0x100000
  CONFIG_FIT=y
  CONFIG_BOOTDELAY=3
  CONFIG_USE_BOOTARGS=y
diff --git a/configs/mt7620_mt7530_rfb_defconfig b/configs/mt7620_mt7530_rfb_defconfig

index 2a21384838338ef297289819bd3b9a92e46957f5..7a0f72e3242626133f8d0545c594f819e056386e 100644 (file)
--- a/configs/mt7620_mt7530_rfb_defconfig
+++ b/configs/mt7620_mt7530_rfb_defconfig
@@ -13,6 +13,7 @@ CONFIG_SPL_SYS_MALLOC_F_LEN=0x40000
  CONFIG_SPL=y
  CONFIG_DEBUG_UART_BASE=0xb0000c00
  CONFIG_DEBUG_UART_CLOCK=40000000
+CONFIG_SYS_LOAD_ADDR=0x80010000
  CONFIG_ARCH_MTMIPS=y
  CONFIG_BOARD_MT7620_MT7530_RFB=y
  CONFIG_MIPS_CACHE_SETUP=y
@@ -20,7 +21,6 @@ CONFIG_MIPS_CACHE_DISABLE=y
  CONFIG_RESTORE_EXCEPTION_VECTOR_BASE=y
  CONFIG_MIPS_BOOT_FDT=y
  CONFIG_DEBUG_UART=y
-CONFIG_SYS_LOAD_ADDR=0x80010000
  CONFIG_FIT=y
  # CONFIG_ARCH_FIXUP_FDT_MEMORY is not set
  CONFIG_SPL_SYS_MALLOC_SIMPLE=y
diff --git a/configs/mt7620_rfb_defconfig b/configs/mt7620_rfb_defconfig

index d8e400cd6056ec469a51e0cf390a86c7d77f6989..ac7a56ef1eada0e2e401efd4e1019052fd2b5a80 100644 (file)
--- a/configs/mt7620_rfb_defconfig
+++ b/configs/mt7620_rfb_defconfig
@@ -13,13 +13,13 @@ CONFIG_SPL_SYS_MALLOC_F_LEN=0x40000
  CONFIG_SPL=y
  CONFIG_DEBUG_UART_BASE=0xb0000c00
  CONFIG_DEBUG_UART_CLOCK=40000000
+CONFIG_SYS_LOAD_ADDR=0x80010000
  CONFIG_ARCH_MTMIPS=y
  CONFIG_MIPS_CACHE_SETUP=y
  CONFIG_MIPS_CACHE_DISABLE=y
  CONFIG_RESTORE_EXCEPTION_VECTOR_BASE=y
  CONFIG_MIPS_BOOT_FDT=y
  CONFIG_DEBUG_UART=y
-CONFIG_SYS_LOAD_ADDR=0x80010000
  CONFIG_FIT=y
  # CONFIG_ARCH_FIXUP_FDT_MEMORY is not set
  CONFIG_SPL_SYS_MALLOC_SIMPLE=y
diff --git a/configs/mt7622_rfb_defconfig b/configs/mt7622_rfb_defconfig

index bb4e58fe811c8aeb0425a7270366dbeb1b6e5e92..90e8d774ce6b312367a0ea29e83209264a0bda90 100644 (file)
--- a/configs/mt7622_rfb_defconfig
+++ b/configs/mt7622_rfb_defconfig
@@ -7,8 +7,8 @@ CONFIG_NR_DRAM_BANKS=1
  CONFIG_DEFAULT_DEVICE_TREE="mt7622-rfb"
  CONFIG_DEBUG_UART_BASE=0x11002000
  CONFIG_DEBUG_UART_CLOCK=25000000
-CONFIG_DEBUG_UART=y
  CONFIG_SYS_LOAD_ADDR=0x4007ff28
+CONFIG_DEBUG_UART=y
  CONFIG_FIT=y
  CONFIG_DEFAULT_FDT_FILE="mt7622-rfb"
  CONFIG_LOGLEVEL=7
diff --git a/configs/mt7623a_unielec_u7623_02_defconfig b/configs/mt7623a_unielec_u7623_02_defconfig

index c846dcebc853ce8957a56e20f42f0e939aa86138..8b21afb06d822be3194aa19356c7e78480cc6ec9 100644 (file)
--- a/configs/mt7623a_unielec_u7623_02_defconfig
+++ b/configs/mt7623a_unielec_u7623_02_defconfig
@@ -8,8 +8,8 @@ CONFIG_ENV_SIZE=0x1000
  CONFIG_ENV_OFFSET=0x100000
  CONFIG_DEFAULT_DEVICE_TREE="mt7623a-unielec-u7623-02-emmc"
  CONFIG_TARGET_MT7623=y
-CONFIG_DISTRO_DEFAULTS=y
  CONFIG_SYS_LOAD_ADDR=0x84000000
+CONFIG_DISTRO_DEFAULTS=y
  CONFIG_FIT=y
  CONFIG_FIT_VERBOSE=y
  CONFIG_BOOTDELAY=3
diff --git a/configs/mt7623n_bpir2_defconfig b/configs/mt7623n_bpir2_defconfig

index d5c10822d860c29c447c1a2bc5555409b262e465..677e192bcb425f40015e5d5c1cce870a81d1f27e 100644 (file)
--- a/configs/mt7623n_bpir2_defconfig
+++ b/configs/mt7623n_bpir2_defconfig
@@ -8,8 +8,8 @@ CONFIG_ENV_SIZE=0x1000
  CONFIG_ENV_OFFSET=0x100000
  CONFIG_DEFAULT_DEVICE_TREE="mt7623n-bananapi-bpi-r2"
  CONFIG_TARGET_MT7623=y
-CONFIG_DISTRO_DEFAULTS=y
  CONFIG_SYS_LOAD_ADDR=0x84000000
+CONFIG_DISTRO_DEFAULTS=y
  CONFIG_FIT=y
  CONFIG_FIT_VERBOSE=y
  CONFIG_BOOTDELAY=3
diff --git a/configs/mt7628_rfb_defconfig b/configs/mt7628_rfb_defconfig

index 9a16baf9760778ae7dd69b8b8bf544527d3a9f35..6c74efb137957a27c4a75060aa9090c174fbc6ed 100644 (file)
--- a/configs/mt7628_rfb_defconfig
+++ b/configs/mt7628_rfb_defconfig
@@ -11,6 +11,7 @@ CONFIG_DEFAULT_DEVICE_TREE="mediatek,mt7628-rfb"
  CONFIG_SPL_SERIAL=y
  CONFIG_SPL_SYS_MALLOC_F_LEN=0x40000
  CONFIG_SPL=y
+CONFIG_SYS_LOAD_ADDR=0x80010000
  CONFIG_ARCH_MTMIPS=y
  CONFIG_SOC_MT7628=y
  CONFIG_BOARD_MT7628_RFB=y
@@ -18,7 +19,6 @@ CONFIG_MIPS_CACHE_SETUP=y
  CONFIG_MIPS_CACHE_DISABLE=y
  CONFIG_RESTORE_EXCEPTION_VECTOR_BASE=y
  CONFIG_MIPS_BOOT_FDT=y
-CONFIG_SYS_LOAD_ADDR=0x80010000
  CONFIG_FIT=y
  # CONFIG_ARCH_FIXUP_FDT_MEMORY is not set
  CONFIG_SYS_CONSOLE_INFO_QUIET=y
diff --git a/configs/mt7629_rfb_defconfig b/configs/mt7629_rfb_defconfig

index cd993bc53259152ceb2678c3ef703ed8d3850e7e..4d47b47be493c9f8a930cb63938ea26a36db73f0 100644 (file)
--- a/configs/mt7629_rfb_defconfig
+++ b/configs/mt7629_rfb_defconfig
@@ -12,10 +12,10 @@ CONFIG_TARGET_MT7629=y
  CONFIG_SPL_SERIAL=y
  CONFIG_SPL_DRIVERS_MISC=y
  CONFIG_SPL_STACK_R_ADDR=0x40800000
+CONFIG_SYS_LOAD_ADDR=0x42007f1c
  CONFIG_SPL_PAYLOAD="u-boot-lzma.img"
  CONFIG_BUILD_TARGET="u-boot-mtk.bin"
  CONFIG_SPL_IMAGE="spl/u-boot-spl-mtk.bin"
-CONFIG_SYS_LOAD_ADDR=0x42007f1c
  CONFIG_FIT=y
  CONFIG_FIT_VERBOSE=y
  CONFIG_BOOTDELAY=3
diff --git a/configs/mt8183_pumpkin_defconfig b/configs/mt8183_pumpkin_defconfig

index 8e43acd51996df81066d915b6d410c1114af6cf2..42627a2538b5dd2facb394c09112c1f111d40c1c 100644 (file)
--- a/configs/mt8183_pumpkin_defconfig
+++ b/configs/mt8183_pumpkin_defconfig
@@ -12,8 +12,8 @@ CONFIG_TARGET_MT8183=y
  CONFIG_DEBUG_UART_BASE=0x11002000
  CONFIG_DEBUG_UART_CLOCK=26000000
  # CONFIG_PSCI_RESET is not set
-CONFIG_DEBUG_UART=y
  CONFIG_SYS_LOAD_ADDR=0x4c000000
+CONFIG_DEBUG_UART=y
  # CONFIG_ANDROID_BOOT_IMAGE is not set
  CONFIG_FIT=y
  # CONFIG_ARCH_FIXUP_FDT_MEMORY is not set
diff --git a/configs/mt8516_pumpkin_defconfig b/configs/mt8516_pumpkin_defconfig

index 53ea0508232c22add0e20aab3c9c8412fbfe1b7f..458b4fb0846cc24a4c7f34871e8a5d2c9b54b3cf 100644 (file)
--- a/configs/mt8516_pumpkin_defconfig
+++ b/configs/mt8516_pumpkin_defconfig
@@ -11,8 +11,8 @@ CONFIG_TARGET_MT8516=y
  CONFIG_DEBUG_UART_BASE=0x11005000
  CONFIG_DEBUG_UART_CLOCK=26000000
  # CONFIG_PSCI_RESET is not set
-CONFIG_DEBUG_UART=y
  CONFIG_SYS_LOAD_ADDR=0x4c000000
+CONFIG_DEBUG_UART=y
  CONFIG_FIT=y
  # CONFIG_ARCH_FIXUP_FDT_MEMORY is not set
  CONFIG_USE_BOOTCOMMAND=y
diff --git a/configs/mvebu_crb_cn9130_defconfig b/configs/mvebu_crb_cn9130_defconfig

index ceb53c764a9b8524512752f32d58e986eea9ae61..2abbb297d93df72618d5f2238f3b7aadbc47cc69 100644 (file)
--- a/configs/mvebu_crb_cn9130_defconfig
+++ b/configs/mvebu_crb_cn9130_defconfig
@@ -10,11 +10,11 @@ CONFIG_ENV_OFFSET=0x3f0000
  CONFIG_DEFAULT_DEVICE_TREE="cn9130-crb-A"
  CONFIG_DEBUG_UART_BASE=0xf0512000
  CONFIG_DEBUG_UART_CLOCK=200000000
+CONFIG_SYS_LOAD_ADDR=0x800000
  CONFIG_DEBUG_UART=y
  CONFIG_AHCI=y
  CONFIG_DISTRO_DEFAULTS=y
  # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
-CONFIG_SYS_LOAD_ADDR=0x800000
  CONFIG_USE_PREBOOT=y
  CONFIG_SYS_CONSOLE_INFO_QUIET=y
  # CONFIG_DISPLAY_CPUINFO is not set
diff --git a/configs/mvebu_db-88f3720_defconfig b/configs/mvebu_db-88f3720_defconfig

index b4434187c0c0e96bc12bb5ce7060d7e3fc19f3e0..39dec12ee18698cfa1cfaae4bdc657f184516760 100644 (file)
--- a/configs/mvebu_db-88f3720_defconfig
+++ b/configs/mvebu_db-88f3720_defconfig
@@ -11,11 +11,11 @@ CONFIG_ENV_SECT_SIZE=0x10000
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="armada-3720-db"
  CONFIG_DEBUG_UART_BASE=0xd0012000
+CONFIG_SYS_LOAD_ADDR=0x6000000
  CONFIG_DEBUG_UART=y
  CONFIG_AHCI=y
  CONFIG_DISTRO_DEFAULTS=y
  # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
-CONFIG_SYS_LOAD_ADDR=0x6000000
  CONFIG_USE_PREBOOT=y
  CONFIG_SYS_CONSOLE_INFO_QUIET=y
  # CONFIG_DISPLAY_CPUINFO is not set
diff --git a/configs/mvebu_db_armada8k_defconfig b/configs/mvebu_db_armada8k_defconfig

index 7548597619cfbc3ecae2dfcf829136c853691bd7..62493bde0bd763ee240b615fb02eac1c8b572508 100644 (file)
--- a/configs/mvebu_db_armada8k_defconfig
+++ b/configs/mvebu_db_armada8k_defconfig
@@ -11,11 +11,11 @@ CONFIG_ENV_SECT_SIZE=0x10000
  CONFIG_DEFAULT_DEVICE_TREE="armada-8040-db"
  CONFIG_DEBUG_UART_BASE=0xf0512000
  CONFIG_DEBUG_UART_CLOCK=200000000
+CONFIG_SYS_LOAD_ADDR=0x800000
  CONFIG_DEBUG_UART=y
  CONFIG_AHCI=y
  CONFIG_DISTRO_DEFAULTS=y
  # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
-CONFIG_SYS_LOAD_ADDR=0x800000
  CONFIG_USE_PREBOOT=y
  CONFIG_SYS_CONSOLE_INFO_QUIET=y
  # CONFIG_DISPLAY_CPUINFO is not set
diff --git a/configs/mvebu_db_cn9130_defconfig b/configs/mvebu_db_cn9130_defconfig

index f9efe482ab14e0b2d3cfdc7a0c529920643770a4..b2c7c6a59700468d80789fbc433caa557c6f379d 100644 (file)
--- a/configs/mvebu_db_cn9130_defconfig
+++ b/configs/mvebu_db_cn9130_defconfig
@@ -12,11 +12,11 @@ CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="cn9130-db-A"
  CONFIG_DEBUG_UART_BASE=0xf0512000
  CONFIG_DEBUG_UART_CLOCK=200000000
+CONFIG_SYS_LOAD_ADDR=0x800000
  CONFIG_DEBUG_UART=y
  CONFIG_AHCI=y
  CONFIG_DISTRO_DEFAULTS=y
  # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
-CONFIG_SYS_LOAD_ADDR=0x800000
  CONFIG_USE_PREBOOT=y
  CONFIG_SYS_CONSOLE_INFO_QUIET=y
  # CONFIG_DISPLAY_CPUINFO is not set
diff --git a/configs/mvebu_espressobin-88f3720_defconfig b/configs/mvebu_espressobin-88f3720_defconfig

index 9dadfc9d44fedf5d6289517c88417f7fbf425789..aaa6b7360a2685dc9726ed9fe55fc995b2adf6a2 100644 (file)
--- a/configs/mvebu_espressobin-88f3720_defconfig
+++ b/configs/mvebu_espressobin-88f3720_defconfig
@@ -11,11 +11,11 @@ CONFIG_ENV_SECT_SIZE=0x10000
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="armada-3720-espressobin"
  CONFIG_DEBUG_UART_BASE=0xd0012000
+CONFIG_SYS_LOAD_ADDR=0x6000000
  CONFIG_DEBUG_UART=y
  CONFIG_AHCI=y
  CONFIG_DISTRO_DEFAULTS=y
  # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
-CONFIG_SYS_LOAD_ADDR=0x6000000
  CONFIG_OF_BOARD_SETUP=y
  CONFIG_USE_PREBOOT=y
  CONFIG_SYS_CONSOLE_INFO_QUIET=y
diff --git a/configs/mvebu_mcbin-88f8040_defconfig b/configs/mvebu_mcbin-88f8040_defconfig

index 0bc3d7b66dccae886fabdd607e387482bc077102..31e075b673d57853c5c9cb251ee6a5dc98714f95 100644 (file)
--- a/configs/mvebu_mcbin-88f8040_defconfig
+++ b/configs/mvebu_mcbin-88f8040_defconfig
@@ -12,11 +12,11 @@ CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="armada-8040-mcbin"
  CONFIG_DEBUG_UART_BASE=0xf0512000
  CONFIG_DEBUG_UART_CLOCK=200000000
+CONFIG_SYS_LOAD_ADDR=0x800000
  CONFIG_DEBUG_UART=y
  CONFIG_AHCI=y
  CONFIG_DISTRO_DEFAULTS=y
  # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
-CONFIG_SYS_LOAD_ADDR=0x800000
  CONFIG_USE_PREBOOT=y
  CONFIG_SYS_CONSOLE_INFO_QUIET=y
  # CONFIG_DISPLAY_CPUINFO is not set
diff --git a/configs/mvebu_puzzle-m801-88f8040_defconfig b/configs/mvebu_puzzle-m801-88f8040_defconfig

index 9b7902bf30949e878b4dd35ec3b6ea1276459049..305822bec813a0ed508a5059945557b093778a47 100644 (file)
--- a/configs/mvebu_puzzle-m801-88f8040_defconfig
+++ b/configs/mvebu_puzzle-m801-88f8040_defconfig
@@ -12,11 +12,11 @@ CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="armada-8040-puzzle-m801"
  CONFIG_DEBUG_UART_BASE=0xf0512000
  CONFIG_DEBUG_UART_CLOCK=200000000
+CONFIG_SYS_LOAD_ADDR=0x800000
  CONFIG_DEBUG_UART=y
  CONFIG_AHCI=y
  CONFIG_DISTRO_DEFAULTS=y
  # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
-CONFIG_SYS_LOAD_ADDR=0x800000
  CONFIG_AUTOBOOT_KEYED=y
  CONFIG_AUTOBOOT_PROMPT="Autoboot in %d seconds, to stop use 's' key\n"
  CONFIG_AUTOBOOT_STOP_STR="s"
diff --git a/configs/mx23_olinuxino_defconfig b/configs/mx23_olinuxino_defconfig

index 062d9226ecbad819e2a35269faea299ff5194ddf..ff656c5efd1cd09c99030d60b753ab47bb0cae4c 100644 (file)
--- a/configs/mx23_olinuxino_defconfig
+++ b/configs/mx23_olinuxino_defconfig
@@ -13,8 +13,8 @@ CONFIG_SPL_TEXT_BASE=0x00001000
  CONFIG_TARGET_MX23_OLINUXINO=y
  CONFIG_SPL_SERIAL=y
  CONFIG_SPL=y
-# CONFIG_SYS_MALLOC_F is not set
  CONFIG_SYS_LOAD_ADDR=0x42000000
+# CONFIG_SYS_MALLOC_F is not set
  CONFIG_BOOTDELAY=3
  CONFIG_USE_BOOTCOMMAND=y
  CONFIG_BOOTCOMMAND="mmc dev ${mmcdev}; if mmc rescan; then if run loadbootscript; then run bootscript; else if run loaduimage; then run mmcboot; else run netboot; fi; fi; else run netboot; fi"
diff --git a/configs/mx51evk_defconfig b/configs/mx51evk_defconfig

index 134cb0cf35b17c0b68390b04d128e8604a8180bc..e3b6c64c087a144cd4998a585d4cb090d51a727d 100644 (file)
--- a/configs/mx51evk_defconfig
+++ b/configs/mx51evk_defconfig
@@ -9,9 +9,9 @@ CONFIG_TARGET_MX51EVK=y
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="imx51-babbage"
  # CONFIG_CMD_BMODE is not set
+CONFIG_SYS_LOAD_ADDR=0x92000000
  CONFIG_HAS_BOARD_SIZE_LIMIT=y
  CONFIG_BOARD_SIZE_LIMIT=785408
-CONFIG_SYS_LOAD_ADDR=0x92000000
  CONFIG_USE_BOOTCOMMAND=y
  CONFIG_BOOTCOMMAND="mmc dev ${mmcdev}; if mmc rescan; then if run loadbootscript; then run bootscript; else if run loadimage; then run mmcboot; else run netboot; fi; fi; else run netboot; fi"
  CONFIG_USE_PREBOOT=y
diff --git a/configs/mx53cx9020_defconfig b/configs/mx53cx9020_defconfig

index 4798510352f48bb928eab39cf6d94e8c1b0ddd9e..f79595db6886a58d6bf54c7c178a9e2295378e61 100644 (file)
--- a/configs/mx53cx9020_defconfig
+++ b/configs/mx53cx9020_defconfig
@@ -9,8 +9,8 @@ CONFIG_TARGET_MX53CX9020=y
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="imx53-cx9020"
  # CONFIG_CMD_BMODE is not set
-CONFIG_DISTRO_DEFAULTS=y
  CONFIG_SYS_LOAD_ADDR=0x70010000
+CONFIG_DISTRO_DEFAULTS=y
  CONFIG_BOOTDELAY=1
  CONFIG_USE_PREBOOT=y
  CONFIG_CMD_MMC=y
diff --git a/configs/mx53loco_defconfig b/configs/mx53loco_defconfig

index 9b70a55a2b7c6ea07899d5bc31ea4014ce8b7b7d..7cf959beec7cce556c8bee937df772a75b7dd9b8 100644 (file)
--- a/configs/mx53loco_defconfig
+++ b/configs/mx53loco_defconfig
@@ -13,9 +13,9 @@ CONFIG_SYS_I2C_MXC_I2C3=y
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="imx53-qsb"
  # CONFIG_CMD_BMODE is not set
+CONFIG_SYS_LOAD_ADDR=0x72000000
  CONFIG_HAS_BOARD_SIZE_LIMIT=y
  CONFIG_BOARD_SIZE_LIMIT=785408
-CONFIG_SYS_LOAD_ADDR=0x72000000
  CONFIG_SUPPORT_RAW_INITRD=y
  CONFIG_USE_BOOTCOMMAND=y
  CONFIG_BOOTCOMMAND="mmc dev ${mmcdev}; if mmc rescan; then if run loadbootscript; then run bootscript; else if run loadimage; then run mmcboot; else run netboot; fi; fi; else run netboot; fi"
diff --git a/configs/mx7ulp_com_defconfig b/configs/mx7ulp_com_defconfig

index 4e51a791a437c0fc8ec84e178f45bcc0155d70c6..b9154a9e3c6d0d6eb4a55d14d7da31f3256385e7 100644 (file)
--- a/configs/mx7ulp_com_defconfig
+++ b/configs/mx7ulp_com_defconfig
@@ -9,9 +9,9 @@ CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="imx7ulp-com"
  CONFIG_LDO_ENABLED_MODE=y
  CONFIG_TARGET_MX7ULP_COM=y
+CONFIG_SYS_LOAD_ADDR=0x60800000
  CONFIG_HAS_BOARD_SIZE_LIMIT=y
  CONFIG_BOARD_SIZE_LIMIT=785408
-CONFIG_SYS_LOAD_ADDR=0x60800000
  CONFIG_USE_BOOTCOMMAND=y
  CONFIG_BOOTCOMMAND="if run loadimage; then run mmcboot; fi"
  CONFIG_DEFAULT_FDT_FILE="imx7ulp-com"
diff --git a/configs/mx7ulp_evk_defconfig b/configs/mx7ulp_evk_defconfig

index abe01559fdb0fe40e32a6e7ae0afbc4ebf4c45c7..12c89b5be962e1130a9a24f787841884ba92b69b 100644 (file)
--- a/configs/mx7ulp_evk_defconfig
+++ b/configs/mx7ulp_evk_defconfig
@@ -9,9 +9,9 @@ CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="imx7ulp-evk"
  CONFIG_TARGET_MX7ULP_EVK=y
  # CONFIG_HAS_ARMV7_SECURE_BASE is not set
+CONFIG_SYS_LOAD_ADDR=0x60800000
  CONFIG_SYS_MEMTEST_START=0x60000000
  CONFIG_SYS_MEMTEST_END=0x9e000000
-CONFIG_SYS_LOAD_ADDR=0x60800000
  CONFIG_OF_BOARD_SETUP=y
  CONFIG_USE_BOOTCOMMAND=y
  CONFIG_BOOTCOMMAND="mmc dev ${mmcdev}; if mmc rescan; then if run loadbootscript; then run bootscript; else if run loadimage; then run mmcboot; fi; fi; fi"
diff --git a/configs/mx7ulp_evk_plugin_defconfig b/configs/mx7ulp_evk_plugin_defconfig

index 2366f52c267f2d5ab439e1b38ccb7e69f00ac832..cec1a878714c26b83d72977dc8ffda97c9bb3a5c 100644 (file)
--- a/configs/mx7ulp_evk_plugin_defconfig
+++ b/configs/mx7ulp_evk_plugin_defconfig
@@ -9,9 +9,9 @@ CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="imx7ulp-evk"
  CONFIG_TARGET_MX7ULP_EVK=y
  # CONFIG_HAS_ARMV7_SECURE_BASE is not set
+CONFIG_SYS_LOAD_ADDR=0x60800000
  CONFIG_SYS_MEMTEST_START=0x60000000
  CONFIG_SYS_MEMTEST_END=0x9e000000
-CONFIG_SYS_LOAD_ADDR=0x60800000
  CONFIG_USE_BOOTCOMMAND=y
  CONFIG_BOOTCOMMAND="mmc dev ${mmcdev}; if mmc rescan; then if run loadbootscript; then run bootscript; else if run loadimage; then run mmcboot; fi; fi; fi"
  CONFIG_BOARD_EARLY_INIT_F=y
diff --git a/configs/nanopc-t4-rk3399_defconfig b/configs/nanopc-t4-rk3399_defconfig

index 3b3da3870b2b761f8ba98cd99fbb102a34f9a43d..164b066b9165fea43e2d91d35535f4861c8cccad 100644 (file)
--- a/configs/nanopc-t4-rk3399_defconfig
+++ b/configs/nanopc-t4-rk3399_defconfig
@@ -9,8 +9,8 @@ CONFIG_ROCKCHIP_RK3399=y
  CONFIG_TARGET_EVB_RK3399=y
  CONFIG_DEBUG_UART_BASE=0xFF1A0000
  CONFIG_DEBUG_UART_CLOCK=24000000
-CONFIG_DEBUG_UART=y
  CONFIG_SYS_LOAD_ADDR=0x800800
+CONFIG_DEBUG_UART=y
  CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-nanopc-t4.dtb"
  CONFIG_DISPLAY_BOARDINFO_LATE=y
  # CONFIG_SPL_RAW_IMAGE_SUPPORT is not set
diff --git a/configs/nanopi-k2_defconfig b/configs/nanopi-k2_defconfig

index 6b2ea3f95411a103b1a0b7ab82a667cc47abb632..f7d8f788c69b71bfab4fe4417ae51ec7f80d1873 100644 (file)
--- a/configs/nanopi-k2_defconfig
+++ b/configs/nanopi-k2_defconfig
@@ -8,9 +8,9 @@ CONFIG_DEFAULT_DEVICE_TREE="meson-gxbb-nanopi-k2"
  CONFIG_DEBUG_UART_BASE=0xc81004c0
  CONFIG_DEBUG_UART_CLOCK=24000000
  CONFIG_IDENT_STRING=" nanopi-k2"
+CONFIG_SYS_LOAD_ADDR=0x1000000
  CONFIG_DEBUG_UART=y
  CONFIG_REMAKE_ELF=y
-CONFIG_SYS_LOAD_ADDR=0x1000000
  CONFIG_OF_BOARD_SETUP=y
  # CONFIG_DISPLAY_CPUINFO is not set
  CONFIG_MISC_INIT_R=y
diff --git a/configs/nanopi-m4-2gb-rk3399_defconfig b/configs/nanopi-m4-2gb-rk3399_defconfig

index 100cd336cd29747b6d0b928b30f23cc0aecdf32c..d3075e6a4a3652854a439156e62c5d4e50fefbad 100644 (file)
--- a/configs/nanopi-m4-2gb-rk3399_defconfig
+++ b/configs/nanopi-m4-2gb-rk3399_defconfig
@@ -9,8 +9,8 @@ CONFIG_ROCKCHIP_RK3399=y
  CONFIG_TARGET_EVB_RK3399=y
  CONFIG_DEBUG_UART_BASE=0xFF1A0000
  CONFIG_DEBUG_UART_CLOCK=24000000
-CONFIG_DEBUG_UART=y
  CONFIG_SYS_LOAD_ADDR=0x800800
+CONFIG_DEBUG_UART=y
  CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-nanopi-m4-2gb.dtb"
  CONFIG_DISPLAY_BOARDINFO_LATE=y
  # CONFIG_SPL_RAW_IMAGE_SUPPORT is not set
diff --git a/configs/nanopi-m4-rk3399_defconfig b/configs/nanopi-m4-rk3399_defconfig

index ba02b6e6dffef77e69ff84e891596fd91d851fb9..957879b14b852440d6eb9df5a58d496566cf2d0f 100644 (file)
--- a/configs/nanopi-m4-rk3399_defconfig
+++ b/configs/nanopi-m4-rk3399_defconfig
@@ -9,8 +9,8 @@ CONFIG_ROCKCHIP_RK3399=y
  CONFIG_TARGET_EVB_RK3399=y
  CONFIG_DEBUG_UART_BASE=0xFF1A0000
  CONFIG_DEBUG_UART_CLOCK=24000000
-CONFIG_DEBUG_UART=y
  CONFIG_SYS_LOAD_ADDR=0x800800
+CONFIG_DEBUG_UART=y
  CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-nanopi-m4.dtb"
  CONFIG_DISPLAY_BOARDINFO_LATE=y
  # CONFIG_SPL_RAW_IMAGE_SUPPORT is not set
diff --git a/configs/nanopi-m4b-rk3399_defconfig b/configs/nanopi-m4b-rk3399_defconfig

index 7916307b071a3046944528f9816767d9d41ca412..805549bf3b3f01b00e128e1cafef73ac1ad2c960 100644 (file)
--- a/configs/nanopi-m4b-rk3399_defconfig
+++ b/configs/nanopi-m4b-rk3399_defconfig
@@ -9,8 +9,8 @@ CONFIG_ROCKCHIP_RK3399=y
  CONFIG_TARGET_EVB_RK3399=y
  CONFIG_DEBUG_UART_BASE=0xFF1A0000
  CONFIG_DEBUG_UART_CLOCK=24000000
-CONFIG_DEBUG_UART=y
  CONFIG_SYS_LOAD_ADDR=0x800800
+CONFIG_DEBUG_UART=y
  CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-nanopi-m4b.dtb"
  CONFIG_DISPLAY_BOARDINFO_LATE=y
  # CONFIG_SPL_RAW_IMAGE_SUPPORT is not set
diff --git a/configs/nanopi-neo4-rk3399_defconfig b/configs/nanopi-neo4-rk3399_defconfig

index 5aa226a6cfeeb6a516c35fd6392ef988e199b03f..c9d7be19db329c46a9d4272166603028eba1fb33 100644 (file)
--- a/configs/nanopi-neo4-rk3399_defconfig
+++ b/configs/nanopi-neo4-rk3399_defconfig
@@ -9,8 +9,8 @@ CONFIG_ROCKCHIP_RK3399=y
  CONFIG_TARGET_EVB_RK3399=y
  CONFIG_DEBUG_UART_BASE=0xFF1A0000
  CONFIG_DEBUG_UART_CLOCK=24000000
-CONFIG_DEBUG_UART=y
  CONFIG_SYS_LOAD_ADDR=0x800800
+CONFIG_DEBUG_UART=y
  CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-nanopi-neo4.dtb"
  CONFIG_DISPLAY_BOARDINFO_LATE=y
  # CONFIG_SPL_RAW_IMAGE_SUPPORT is not set
diff --git a/configs/nanopi-r2s-rk3328_defconfig b/configs/nanopi-r2s-rk3328_defconfig

index cafb38ffcee772ceebbca17d4a7c9ac8c9cc857f..899b14caa0d40ffa1eb52d6975f4421a343e6c5b 100644 (file)
--- a/configs/nanopi-r2s-rk3328_defconfig
+++ b/configs/nanopi-r2s-rk3328_defconfig
@@ -14,9 +14,9 @@ CONFIG_SPL_DRIVERS_MISC=y
  CONFIG_SPL_STACK_R_ADDR=0x600000
  CONFIG_DEBUG_UART_BASE=0xFF130000
  CONFIG_DEBUG_UART_CLOCK=24000000
+CONFIG_SYS_LOAD_ADDR=0x800800
  CONFIG_DEBUG_UART=y
  CONFIG_TPL_SYS_MALLOC_F_LEN=0x800
-CONFIG_SYS_LOAD_ADDR=0x800800
  # CONFIG_ANDROID_BOOT_IMAGE is not set
  CONFIG_FIT=y
  CONFIG_FIT_VERBOSE=y
diff --git a/configs/nanopi-r4s-rk3399_defconfig b/configs/nanopi-r4s-rk3399_defconfig

index 7d176ce28e26a10edc2e0861f5613dbbe7bdac46..359673fe603ed1d0c0d029c6503cd9175cee360f 100644 (file)
--- a/configs/nanopi-r4s-rk3399_defconfig
+++ b/configs/nanopi-r4s-rk3399_defconfig
@@ -9,8 +9,8 @@ CONFIG_ROCKCHIP_RK3399=y
  CONFIG_TARGET_EVB_RK3399=y
  CONFIG_DEBUG_UART_BASE=0xFF1A0000
  CONFIG_DEBUG_UART_CLOCK=24000000
-CONFIG_DEBUG_UART=y
  CONFIG_SYS_LOAD_ADDR=0x800800
+CONFIG_DEBUG_UART=y
  CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-nanopi-r4s.dtb"
  CONFIG_DISPLAY_BOARDINFO_LATE=y
  # CONFIG_SPL_RAW_IMAGE_SUPPORT is not set
diff --git a/configs/nas220_defconfig b/configs/nas220_defconfig

index 413e342dc0ea1558a6418212100a6a1eadd92a9b..924061da99f6b2412acb4e072e19d0555fcfd9a1 100644 (file)
--- a/configs/nas220_defconfig
+++ b/configs/nas220_defconfig
@@ -11,8 +11,8 @@ CONFIG_ENV_SIZE=0x10000
  CONFIG_ENV_OFFSET=0xA0000
  CONFIG_DEFAULT_DEVICE_TREE="kirkwood-blackarmor-nas220"
  CONFIG_IDENT_STRING="\nNAS 220"
-# CONFIG_SYS_MALLOC_F is not set
  CONFIG_SYS_LOAD_ADDR=0x800000
+# CONFIG_SYS_MALLOC_F is not set
  CONFIG_BOOTDELAY=3
  CONFIG_USE_BOOTCOMMAND=y
  CONFIG_USE_PREBOOT=y
diff --git a/configs/net2big_v2_defconfig b/configs/net2big_v2_defconfig

index f03832783916ef01ed74f11608fe0216f12a10d2..522d8adfa7b4e3aafec03b3879b780f6bd40cee4 100644 (file)
--- a/configs/net2big_v2_defconfig
+++ b/configs/net2big_v2_defconfig
@@ -13,8 +13,9 @@ CONFIG_ENV_OFFSET=0x70000
  CONFIG_ENV_SECT_SIZE=0x10000
  CONFIG_DEFAULT_DEVICE_TREE="kirkwood-net2big"
  CONFIG_IDENT_STRING=" 2Big v2"
-# CONFIG_SYS_MALLOC_F is not set
  CONFIG_SYS_LOAD_ADDR=0x800000
+CONFIG_ENV_ADDR=0x70000
+# CONFIG_SYS_MALLOC_F is not set
  CONFIG_BOOTDELAY=3
  CONFIG_USE_BOOTARGS=y
  CONFIG_BOOTARGS="console=ttyS0,115200"
@@ -45,7 +46,6 @@ CONFIG_OF_CONTROL=y
  CONFIG_ENV_OVERWRITE=y
  CONFIG_ENV_IS_IN_SPI_FLASH=y
  CONFIG_ENV_SPI_MAX_HZ=20000000
-CONFIG_ENV_ADDR=0x70000
  CONFIG_NETCONSOLE=y
  CONFIG_SYS_FAULT_ECHO_LINK_DOWN=y
  CONFIG_DM=y
diff --git a/configs/netgear_cg3100d_ram_defconfig b/configs/netgear_cg3100d_ram_defconfig

index 869d4c8e4e33de06c519bd9cd3696ad7346a0240..b126bd382edfcd9d4033b24bf7ab66ef1319e4aa 100644 (file)
--- a/configs/netgear_cg3100d_ram_defconfig
+++ b/configs/netgear_cg3100d_ram_defconfig
@@ -5,6 +5,7 @@ CONFIG_NR_DRAM_BANKS=1
  CONFIG_ENV_SIZE=0x2000
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="netgear,cg3100d"
+CONFIG_SYS_LOAD_ADDR=0x80100000
  CONFIG_ARCH_BMIPS=y
  CONFIG_MIPS_CACHE_SETUP=y
  CONFIG_MIPS_CACHE_DISABLE=y
@@ -12,7 +13,6 @@ CONFIG_MIPS_CACHE_DISABLE=y
  # CONFIG_MIPS_BOOT_ENV_LEGACY is not set
  CONFIG_MIPS_BOOT_FDT=y
  # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
-CONFIG_SYS_LOAD_ADDR=0x80100000
  CONFIG_OF_STDOUT_VIA_ALIAS=y
  CONFIG_DISPLAY_CPUINFO=y
  CONFIG_HUSH_PARSER=y
diff --git a/configs/netgear_dgnd3700v2_ram_defconfig b/configs/netgear_dgnd3700v2_ram_defconfig

index 8649f0ecd9ff03945c53a99f9a1acaea6dc8ac76..d04e73f847ce9ad05a3f6270976b63ffccc70b2f 100644 (file)
--- a/configs/netgear_dgnd3700v2_ram_defconfig
+++ b/configs/netgear_dgnd3700v2_ram_defconfig
@@ -5,6 +5,7 @@ CONFIG_NR_DRAM_BANKS=1
  CONFIG_ENV_SIZE=0x2000
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="netgear,dgnd3700v2"
+CONFIG_SYS_LOAD_ADDR=0x80100000
  CONFIG_ARCH_BMIPS=y
  CONFIG_SOC_BMIPS_BCM6362=y
  CONFIG_MIPS_CACHE_SETUP=y
@@ -14,7 +15,6 @@ CONFIG_MIPS_CACHE_DISABLE=y
  CONFIG_MIPS_BOOT_FDT=y
  # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
  CONFIG_REMAKE_ELF=y
-CONFIG_SYS_LOAD_ADDR=0x80100000
  CONFIG_OF_STDOUT_VIA_ALIAS=y
  CONFIG_DISPLAY_CPUINFO=y
  CONFIG_BOARD_EARLY_INIT_F=y
diff --git a/configs/netspace_lite_v2_defconfig b/configs/netspace_lite_v2_defconfig

index 0e6b323830f47a34816ae61c1edd26aac1651def..153ae76a10b4d188a91c0b7e0c42eb54fac61b12 100644 (file)
--- a/configs/netspace_lite_v2_defconfig
+++ b/configs/netspace_lite_v2_defconfig
@@ -13,8 +13,9 @@ CONFIG_ENV_OFFSET=0x70000
  CONFIG_ENV_SECT_SIZE=0x10000
  CONFIG_DEFAULT_DEVICE_TREE="kirkwood-ns2lite"
  CONFIG_IDENT_STRING=" NS v2 Lite"
-# CONFIG_SYS_MALLOC_F is not set
  CONFIG_SYS_LOAD_ADDR=0x800000
+CONFIG_ENV_ADDR=0x70000
+# CONFIG_SYS_MALLOC_F is not set
  CONFIG_BOOTDELAY=3
  CONFIG_USE_BOOTARGS=y
  CONFIG_BOOTARGS="console=ttyS0,115200"
@@ -45,7 +46,6 @@ CONFIG_OF_CONTROL=y
  CONFIG_ENV_OVERWRITE=y
  CONFIG_ENV_IS_IN_SPI_FLASH=y
  CONFIG_ENV_SPI_MAX_HZ=20000000
-CONFIG_ENV_ADDR=0x70000
  CONFIG_NETCONSOLE=y
  CONFIG_SYS_FAULT_ECHO_LINK_DOWN=y
  CONFIG_DM=y
diff --git a/configs/netspace_max_v2_defconfig b/configs/netspace_max_v2_defconfig

index 06cb00dab3ffbc6b237da08aa4d212acb3523c70..b5d77fa5918c2a1f5dfb4af0957260103666b07c 100644 (file)
--- a/configs/netspace_max_v2_defconfig
+++ b/configs/netspace_max_v2_defconfig
@@ -13,8 +13,9 @@ CONFIG_ENV_OFFSET=0x70000
  CONFIG_ENV_SECT_SIZE=0x10000
  CONFIG_DEFAULT_DEVICE_TREE="kirkwood-ns2max"
  CONFIG_IDENT_STRING=" NS Max v2"
-# CONFIG_SYS_MALLOC_F is not set
  CONFIG_SYS_LOAD_ADDR=0x800000
+CONFIG_ENV_ADDR=0x70000
+# CONFIG_SYS_MALLOC_F is not set
  CONFIG_BOOTDELAY=3
  CONFIG_USE_BOOTARGS=y
  CONFIG_BOOTARGS="console=ttyS0,115200"
@@ -45,7 +46,6 @@ CONFIG_OF_CONTROL=y
  CONFIG_ENV_OVERWRITE=y
  CONFIG_ENV_IS_IN_SPI_FLASH=y
  CONFIG_ENV_SPI_MAX_HZ=20000000
-CONFIG_ENV_ADDR=0x70000
  CONFIG_NETCONSOLE=y
  CONFIG_SYS_FAULT_ECHO_LINK_DOWN=y
  CONFIG_DM=y
diff --git a/configs/netspace_mini_v2_defconfig b/configs/netspace_mini_v2_defconfig

index f19bf0863cc065a1b20e14b607b1d2bcea3cb08a..ac92f42911d8577a1be346946843a1a313267ac5 100644 (file)
--- a/configs/netspace_mini_v2_defconfig
+++ b/configs/netspace_mini_v2_defconfig
@@ -13,8 +13,9 @@ CONFIG_ENV_OFFSET=0x70000
  CONFIG_ENV_SECT_SIZE=0x10000
  CONFIG_DEFAULT_DEVICE_TREE="kirkwood-ns2mini"
  CONFIG_IDENT_STRING=" NS v2 Mini"
-# CONFIG_SYS_MALLOC_F is not set
  CONFIG_SYS_LOAD_ADDR=0x800000
+CONFIG_ENV_ADDR=0x70000
+# CONFIG_SYS_MALLOC_F is not set
  CONFIG_BOOTDELAY=3
  CONFIG_USE_BOOTARGS=y
  CONFIG_BOOTARGS="console=ttyS0,115200"
@@ -43,7 +44,6 @@ CONFIG_OF_CONTROL=y
  CONFIG_ENV_OVERWRITE=y
  CONFIG_ENV_IS_IN_SPI_FLASH=y
  CONFIG_ENV_SPI_MAX_HZ=20000000
-CONFIG_ENV_ADDR=0x70000
  CONFIG_NETCONSOLE=y
  CONFIG_SYS_FAULT_ECHO_LINK_DOWN=y
  CONFIG_DM=y
diff --git a/configs/netspace_v2_defconfig b/configs/netspace_v2_defconfig

index bdd438238e50c52ffa766bd21cdaf30e5bc65245..00c19f55c95b4ef3b57220061e083c8e4351469d 100644 (file)
--- a/configs/netspace_v2_defconfig
+++ b/configs/netspace_v2_defconfig
@@ -13,8 +13,9 @@ CONFIG_ENV_OFFSET=0x70000
  CONFIG_ENV_SECT_SIZE=0x10000
  CONFIG_DEFAULT_DEVICE_TREE="kirkwood-ns2"
  CONFIG_IDENT_STRING=" NS v2"
-# CONFIG_SYS_MALLOC_F is not set
  CONFIG_SYS_LOAD_ADDR=0x800000
+CONFIG_ENV_ADDR=0x70000
+# CONFIG_SYS_MALLOC_F is not set
  CONFIG_BOOTDELAY=3
  CONFIG_USE_BOOTARGS=y
  CONFIG_BOOTARGS="console=ttyS0,115200"
@@ -45,7 +46,6 @@ CONFIG_OF_CONTROL=y
  CONFIG_ENV_OVERWRITE=y
  CONFIG_ENV_IS_IN_SPI_FLASH=y
  CONFIG_ENV_SPI_MAX_HZ=20000000
-CONFIG_ENV_ADDR=0x70000
  CONFIG_NETCONSOLE=y
  CONFIG_SYS_FAULT_ECHO_LINK_DOWN=y
  CONFIG_DM=y
diff --git a/configs/nokia_rx51_defconfig b/configs/nokia_rx51_defconfig

index cd81b90e54a66bb5ebe40043000d05916f6984ad..d5688c7a212b754f1a8395bb85ed776b75228962 100644 (file)
--- a/configs/nokia_rx51_defconfig
+++ b/configs/nokia_rx51_defconfig
@@ -13,10 +13,10 @@ CONFIG_SYS_TEXT_BASE=0x80008000
  CONFIG_SYS_MALLOC_LEN=0xc0000
  CONFIG_NR_DRAM_BANKS=2
  CONFIG_TARGET_NOKIA_RX51=y
+CONFIG_SYS_LOAD_ADDR=0x80000000
  CONFIG_OPTIMIZE_INLINING=y
  CONFIG_LTO=y
  # CONFIG_SYS_MALLOC_F is not set
-CONFIG_SYS_LOAD_ADDR=0x80000000
  # CONFIG_FIT is not set
  CONFIG_BOOTDELAY=30
  CONFIG_AUTOBOOT_KEYED=y
diff --git a/configs/nsim_700_defconfig b/configs/nsim_700_defconfig

index 71d6fe5cf38a674a6eb5bee9450f5ab77ece5caa..e67023e97e412e2eb4a88487cd4d51eadd8b2621 100644 (file)
--- a/configs/nsim_700_defconfig
+++ b/configs/nsim_700_defconfig
@@ -7,8 +7,8 @@ CONFIG_DEFAULT_DEVICE_TREE="nsim"
  CONFIG_DEBUG_UART_BASE=0xf0000000
  CONFIG_DEBUG_UART_CLOCK=70000000
  CONFIG_SYS_CLK_FREQ=70000000
-CONFIG_DEBUG_UART=y
  CONFIG_SYS_LOAD_ADDR=0x82000000
+CONFIG_DEBUG_UART=y
  CONFIG_BOOTDELAY=3
  CONFIG_USE_BOOTARGS=y
  CONFIG_BOOTARGS="console=ttyS0,115200n8"
diff --git a/configs/nsim_700be_defconfig b/configs/nsim_700be_defconfig

index 954ea42db27affaa7f6416bee0ed6595cc1c642f..af03b17395a79d76aa9f5c1f31fc709c4b458366 100644 (file)
--- a/configs/nsim_700be_defconfig
+++ b/configs/nsim_700be_defconfig
@@ -8,8 +8,8 @@ CONFIG_DEFAULT_DEVICE_TREE="nsim"
  CONFIG_DEBUG_UART_BASE=0xf0000000
  CONFIG_DEBUG_UART_CLOCK=70000000
  CONFIG_SYS_CLK_FREQ=70000000
-CONFIG_DEBUG_UART=y
  CONFIG_SYS_LOAD_ADDR=0x82000000
+CONFIG_DEBUG_UART=y
  CONFIG_BOOTDELAY=3
  CONFIG_USE_BOOTARGS=y
  CONFIG_BOOTARGS="console=ttyS0,115200n8"
diff --git a/configs/nsim_hs38_defconfig b/configs/nsim_hs38_defconfig

index 60b7a01286dbd6db7a2f8126e737c6c62103ee17..12dae0aa6aae18523219f424a81749fadc86d5d9 100644 (file)
--- a/configs/nsim_hs38_defconfig
+++ b/configs/nsim_hs38_defconfig
@@ -8,8 +8,8 @@ CONFIG_DEFAULT_DEVICE_TREE="nsim"
  CONFIG_DEBUG_UART_BASE=0xf0000000
  CONFIG_DEBUG_UART_CLOCK=70000000
  CONFIG_SYS_CLK_FREQ=70000000
-CONFIG_DEBUG_UART=y
  CONFIG_SYS_LOAD_ADDR=0x82000000
+CONFIG_DEBUG_UART=y
  CONFIG_BOOTDELAY=3
  CONFIG_USE_BOOTARGS=y
  CONFIG_BOOTARGS="console=ttyS0,115200n8"
diff --git a/configs/nsim_hs38be_defconfig b/configs/nsim_hs38be_defconfig

index bd1cdf33b51e71fc416bd484e14f5cc34711467b..8a590a5f9afc59b26756412f2518589a569337ef 100644 (file)
--- a/configs/nsim_hs38be_defconfig
+++ b/configs/nsim_hs38be_defconfig
@@ -9,8 +9,8 @@ CONFIG_DEFAULT_DEVICE_TREE="nsim"
  CONFIG_DEBUG_UART_BASE=0xf0000000
  CONFIG_DEBUG_UART_CLOCK=70000000
  CONFIG_SYS_CLK_FREQ=70000000
-CONFIG_DEBUG_UART=y
  CONFIG_SYS_LOAD_ADDR=0x82000000
+CONFIG_DEBUG_UART=y
  CONFIG_BOOTDELAY=3
  CONFIG_USE_BOOTARGS=y
  CONFIG_BOOTARGS="console=ttyS0,115200n8"
diff --git a/configs/nyan-big_defconfig b/configs/nyan-big_defconfig

index a5bd3e8798ca2933713a44ea11c785b19737c312..f82bace9e750e9d8fe878b2adcbee1642aa8c527 100644 (file)
--- a/configs/nyan-big_defconfig
+++ b/configs/nyan-big_defconfig
@@ -13,8 +13,8 @@ CONFIG_DEBUG_UART_BASE=0x70006000
  CONFIG_DEBUG_UART_CLOCK=408000000
  CONFIG_TEGRA124=y
  CONFIG_TARGET_NYAN_BIG=y
-CONFIG_DEBUG_UART=y
  CONFIG_SYS_LOAD_ADDR=0x82408000
+CONFIG_DEBUG_UART=y
  CONFIG_FIT=y
  CONFIG_FIT_BEST_MATCH=y
  CONFIG_OF_SYSTEM_SETUP=y
diff --git a/configs/octeon_ebb7304_defconfig b/configs/octeon_ebb7304_defconfig

index 9824f8b97ae5a3740abf6d8cf07fbe4d67200bb0..e907144cf773d066e47a18595e519c546bd5ae9d 100644 (file)
--- a/configs/octeon_ebb7304_defconfig
+++ b/configs/octeon_ebb7304_defconfig
@@ -7,13 +7,14 @@ CONFIG_ENV_SIZE=0x2000
  CONFIG_ENV_SECT_SIZE=0x2000
  CONFIG_DEBUG_UART_BASE=0x8001180000000800
  CONFIG_DEBUG_UART_CLOCK=1200000000
+CONFIG_SYS_LOAD_ADDR=0xffffffff80100000
+CONFIG_ENV_ADDR=0x800000001FBFE000
  CONFIG_ARCH_OCTEON=y
  # CONFIG_MIPS_CACHE_SETUP is not set
  # CONFIG_MIPS_CACHE_DISABLE is not set
  CONFIG_MIPS_RELOCATION_TABLE_SIZE=0xc000
  CONFIG_DEBUG_UART=y
  CONFIG_OF_BOARD_FIXUP=y
-CONFIG_SYS_LOAD_ADDR=0xffffffff80100000
  CONFIG_SYS_CONSOLE_INFO_QUIET=y
  CONFIG_BOARD_LATE_INIT=y
  CONFIG_HUSH_PARSER=y
@@ -35,7 +36,6 @@ CONFIG_AMIGA_PARTITION=y
  CONFIG_EFI_PARTITION=y
  CONFIG_PARTITION_TYPE_GUID=y
  CONFIG_ENV_IS_IN_FLASH=y
-CONFIG_ENV_ADDR=0x800000001FBFE000
  CONFIG_CLK=y
  # CONFIG_INPUT is not set
  CONFIG_MISC=y
diff --git a/configs/octeon_nic23_defconfig b/configs/octeon_nic23_defconfig

index 5427a9970a7173122a892fc521e4c17ee97d8cc2..1a1718a063863b96c8b32e7d1b3c27855caadf54 100644 (file)
--- a/configs/octeon_nic23_defconfig
+++ b/configs/octeon_nic23_defconfig
@@ -8,6 +8,8 @@ CONFIG_ENV_OFFSET=0xe000
  CONFIG_ENV_SECT_SIZE=0x100
  CONFIG_DEBUG_UART_BASE=0x8001180000000800
  CONFIG_DEBUG_UART_CLOCK=800000000
+CONFIG_SYS_LOAD_ADDR=0xffffffff80100000
+CONFIG_ENV_ADDR=0xe000
  CONFIG_ARCH_OCTEON=y
  CONFIG_TARGET_OCTEON_NIC23=y
  # CONFIG_MIPS_CACHE_SETUP is not set
@@ -15,7 +17,6 @@ CONFIG_TARGET_OCTEON_NIC23=y
  CONFIG_DEBUG_UART=y
  CONFIG_AHCI=y
  CONFIG_OF_BOARD_FIXUP=y
-CONFIG_SYS_LOAD_ADDR=0xffffffff80100000
  CONFIG_SYS_CONSOLE_ENV_OVERWRITE=y
  # CONFIG_SYS_DEVICE_NULLDEV is not set
  CONFIG_ARCH_MISC_INIT=y
@@ -36,7 +37,6 @@ CONFIG_CMD_FAT=y
  CONFIG_CMD_FS_GENERIC=y
  CONFIG_EFI_PARTITION=y
  CONFIG_ENV_IS_IN_SPI_FLASH=y
-CONFIG_ENV_ADDR=0xe000
  CONFIG_SATA=y
  CONFIG_AHCI_MVEBU=y
  CONFIG_CLK=y
diff --git a/configs/octeontx2_95xx_defconfig b/configs/octeontx2_95xx_defconfig

index de86a85d08abb9caa3cd5af3c3cce2529f42c389..46a28e1b2061523ac88e00482de366a03c55f677 100644 (file)
--- a/configs/octeontx2_95xx_defconfig
+++ b/configs/octeontx2_95xx_defconfig
@@ -13,10 +13,10 @@ CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="octeontx"
  CONFIG_DEBUG_UART_BASE=0x87e028000000
  CONFIG_DEBUG_UART_CLOCK=24000000
+CONFIG_SYS_LOAD_ADDR=0x4000000
  CONFIG_DEBUG_UART=y
  CONFIG_SYS_MEMTEST_START=0x04000000
  CONFIG_SYS_MEMTEST_END=0x040f0000
-CONFIG_SYS_LOAD_ADDR=0x4000000
  CONFIG_FIT=y
  CONFIG_FIT_SIGNATURE=y
  CONFIG_SUPPORT_RAW_INITRD=y
diff --git a/configs/octeontx2_96xx_defconfig b/configs/octeontx2_96xx_defconfig

index 0c91ce28cb6e27df681b3539a74fb2b0da9c7470..9d8cc4b7be42a69e9ce70065e8d4ba6ec2fc87ea 100644 (file)
--- a/configs/octeontx2_96xx_defconfig
+++ b/configs/octeontx2_96xx_defconfig
@@ -13,10 +13,10 @@ CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="octeontx"
  CONFIG_DEBUG_UART_BASE=0x87e028000000
  CONFIG_DEBUG_UART_CLOCK=24000000
+CONFIG_SYS_LOAD_ADDR=0x4000000
  CONFIG_DEBUG_UART=y
  CONFIG_AHCI=y
  # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
-CONFIG_SYS_LOAD_ADDR=0x4000000
  CONFIG_FIT=y
  CONFIG_FIT_SIGNATURE=y
  CONFIG_SUPPORT_RAW_INITRD=y
diff --git a/configs/octeontx_81xx_defconfig b/configs/octeontx_81xx_defconfig

index 621b53c75ee0fd5d940796ff1eb029dd23993546..d14e121b6ed223867b4345c3836d6bdf212a609c 100644 (file)
--- a/configs/octeontx_81xx_defconfig
+++ b/configs/octeontx_81xx_defconfig
@@ -13,11 +13,11 @@ CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="octeontx"
  CONFIG_DEBUG_UART_BASE=0x87e028000000
  CONFIG_DEBUG_UART_CLOCK=24000000
+CONFIG_SYS_LOAD_ADDR=0x2800000
  CONFIG_DEBUG_UART=y
  CONFIG_AHCI=y
  CONFIG_SYS_MEMTEST_START=0x2800000
  CONFIG_SYS_MEMTEST_END=0x28f0000
-CONFIG_SYS_LOAD_ADDR=0x2800000
  CONFIG_FIT=y
  CONFIG_FIT_SIGNATURE=y
  CONFIG_SUPPORT_RAW_INITRD=y
diff --git a/configs/octeontx_83xx_defconfig b/configs/octeontx_83xx_defconfig

index 6069201fec4ef03727e9894c5c94c3790ccd27b3..f1d482afb62531a1edbe25ec1ccd44db760bfc11 100644 (file)
--- a/configs/octeontx_83xx_defconfig
+++ b/configs/octeontx_83xx_defconfig
@@ -13,9 +13,9 @@ CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="octeontx"
  CONFIG_DEBUG_UART_BASE=0x87e028000000
  CONFIG_DEBUG_UART_CLOCK=24000000
+CONFIG_SYS_LOAD_ADDR=0x2800000
  CONFIG_DEBUG_UART=y
  CONFIG_AHCI=y
-CONFIG_SYS_LOAD_ADDR=0x2800000
  CONFIG_FIT=y
  CONFIG_FIT_SIGNATURE=y
  CONFIG_SUPPORT_RAW_INITRD=y
diff --git a/configs/odroid-c2_defconfig b/configs/odroid-c2_defconfig

index 43478717d3a338ccb66a2fdd7ced24590d83f485..f9b0c79eff7abd630909becac01faa98e9fabf6e 100644 (file)
--- a/configs/odroid-c2_defconfig
+++ b/configs/odroid-c2_defconfig
@@ -8,9 +8,9 @@ CONFIG_DEFAULT_DEVICE_TREE="meson-gxbb-odroidc2"
  CONFIG_DEBUG_UART_BASE=0xc81004c0
  CONFIG_DEBUG_UART_CLOCK=24000000
  CONFIG_IDENT_STRING=" odroid-c2"
+CONFIG_SYS_LOAD_ADDR=0x1000000
  CONFIG_DEBUG_UART=y
  CONFIG_REMAKE_ELF=y
-CONFIG_SYS_LOAD_ADDR=0x1000000
  CONFIG_OF_BOARD_SETUP=y
  # CONFIG_DISPLAY_CPUINFO is not set
  CONFIG_MISC_INIT_R=y
diff --git a/configs/odroid-c4_defconfig b/configs/odroid-c4_defconfig

index 0003756ca8a926521df3157b2f7b4cd7f54c7d65..f3ea892b5eb298ffb92ebcc0dc3e120ce8b23642 100644 (file)
--- a/configs/odroid-c4_defconfig
+++ b/configs/odroid-c4_defconfig
@@ -10,9 +10,9 @@ CONFIG_MESON_G12A=y
  CONFIG_DEBUG_UART_BASE=0xff803000
  CONFIG_DEBUG_UART_CLOCK=24000000
  CONFIG_IDENT_STRING=" odroid-c4/hc4"
+CONFIG_SYS_LOAD_ADDR=0x1000000
  CONFIG_DEBUG_UART=y
  CONFIG_REMAKE_ELF=y
-CONFIG_SYS_LOAD_ADDR=0x1000000
  CONFIG_OF_BOARD_SETUP=y
  # CONFIG_DISPLAY_CPUINFO is not set
  CONFIG_MISC_INIT_R=y
diff --git a/configs/odroid-go2_defconfig b/configs/odroid-go2_defconfig

index b0b4bcfa30769b107ed9cc1105133509dc441b5b..33fd076e14413ef1a26293f2217284409c1c8fa7 100644 (file)
--- a/configs/odroid-go2_defconfig
+++ b/configs/odroid-go2_defconfig
@@ -18,9 +18,9 @@ CONFIG_SPL_DRIVERS_MISC=y
  CONFIG_SPL_STACK_R_ADDR=0x600000
  CONFIG_DEBUG_UART_BASE=0xFF160000
  CONFIG_DEBUG_UART_CLOCK=24000000
+CONFIG_SYS_LOAD_ADDR=0x800800
  CONFIG_DEBUG_UART=y
  CONFIG_TPL_SYS_MALLOC_F_LEN=0x600
-CONFIG_SYS_LOAD_ADDR=0x800800
  # CONFIG_ANDROID_BOOT_IMAGE is not set
  CONFIG_FIT=y
  CONFIG_FIT_VERBOSE=y
diff --git a/configs/odroid-hc4_defconfig b/configs/odroid-hc4_defconfig

index c325b24db70d2d1462e561aa904a2b7fb10c364d..4be838314a86b2b470f4a6c2dd4e15f329e7f963 100644 (file)
--- a/configs/odroid-hc4_defconfig
+++ b/configs/odroid-hc4_defconfig
@@ -10,10 +10,10 @@ CONFIG_MESON_G12A=y
  CONFIG_DEBUG_UART_BASE=0xff803000
  CONFIG_DEBUG_UART_CLOCK=24000000
  CONFIG_IDENT_STRING=" odroid-hc4"
+CONFIG_SYS_LOAD_ADDR=0x1000000
  CONFIG_DEBUG_UART=y
  CONFIG_AHCI=y
  CONFIG_REMAKE_ELF=y
-CONFIG_SYS_LOAD_ADDR=0x1000000
  CONFIG_OF_BOARD_SETUP=y
  # CONFIG_DISPLAY_CPUINFO is not set
  CONFIG_MISC_INIT_R=y
diff --git a/configs/odroid-n2_defconfig b/configs/odroid-n2_defconfig

index 964b78563bae6248ba88f827e6c05313d387d6f3..b19f98585cffe705b07df4a4ccfc6f5dd796ccc7 100644 (file)
--- a/configs/odroid-n2_defconfig
+++ b/configs/odroid-n2_defconfig
@@ -10,9 +10,9 @@ CONFIG_MESON_G12A=y
  CONFIG_DEBUG_UART_BASE=0xff803000
  CONFIG_DEBUG_UART_CLOCK=24000000
  CONFIG_IDENT_STRING=" odroid-n2/n2-plus"
+CONFIG_SYS_LOAD_ADDR=0x1000000
  CONFIG_DEBUG_UART=y
  CONFIG_REMAKE_ELF=y
-CONFIG_SYS_LOAD_ADDR=0x1000000
  CONFIG_OF_BOARD_SETUP=y
  # CONFIG_DISPLAY_CPUINFO is not set
  CONFIG_MISC_INIT_R=y
diff --git a/configs/odroid-xu3_defconfig b/configs/odroid-xu3_defconfig

index 8a507904be9f905c387b0fedebe38755d9893547..d7f9c208bb0c58816c9b9d68ffde72919d53725c 100644 (file)
--- a/configs/odroid-xu3_defconfig
+++ b/configs/odroid-xu3_defconfig
@@ -10,9 +10,9 @@ CONFIG_ENV_SIZE=0x4000
  CONFIG_ENV_OFFSET=0x310000
  CONFIG_DEFAULT_DEVICE_TREE="exynos5422-odroidxu3"
  CONFIG_IDENT_STRING=" for ODROID-XU3/XU4/HC1/HC2"
+CONFIG_SYS_LOAD_ADDR=0x43e00000
  CONFIG_DISTRO_DEFAULTS=y
  # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
-CONFIG_SYS_LOAD_ADDR=0x43e00000
  CONFIG_FIT=y
  CONFIG_FIT_BEST_MATCH=y
  CONFIG_SILENT_CONSOLE=y
diff --git a/configs/odroid_defconfig b/configs/odroid_defconfig

index 54ff5799cb73b1ce957e1bf352ae0fb9e6c1dcd8..9f5688e039dee4cb2ba2fe3d56084f830b25701b 100644 (file)
--- a/configs/odroid_defconfig
+++ b/configs/odroid_defconfig
@@ -11,9 +11,9 @@ CONFIG_NR_DRAM_BANKS=8
  CONFIG_ENV_SIZE=0x4000
  CONFIG_ENV_OFFSET=0x140000
  CONFIG_DEFAULT_DEVICE_TREE="exynos4412-odroid"
+CONFIG_SYS_LOAD_ADDR=0x43e00000
  CONFIG_DISTRO_DEFAULTS=y
  # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
-CONFIG_SYS_LOAD_ADDR=0x43e00000
  CONFIG_FIT=y
  CONFIG_FIT_VERBOSE=y
  CONFIG_USE_BOOTARGS=y
diff --git a/configs/openpiton_riscv64_defconfig b/configs/openpiton_riscv64_defconfig

index 6dbb0799d8481ab3bab47c8d56af6b275f9fd9df..78f31a2155bfe9dc04523ccac2f276cbb11f9bf2 100644 (file)
--- a/configs/openpiton_riscv64_defconfig
+++ b/configs/openpiton_riscv64_defconfig
@@ -3,6 +3,7 @@ CONFIG_SYS_TEXT_BASE=0x80200000
  CONFIG_SYS_MALLOC_LEN=0x10000000
  CONFIG_NR_DRAM_BANKS=1
  CONFIG_DEFAULT_DEVICE_TREE="openpiton-riscv64"
+CONFIG_SYS_LOAD_ADDR=0x87000000
  CONFIG_TARGET_OPENPITON_RISCV64=y
  CONFIG_ARCH_RV64I=y
  CONFIG_CMODEL_MEDANY=y
@@ -11,7 +12,6 @@ CONFIG_OF_BOARD_FIXUP=y
  # CONFIG_LOCALVERSION_AUTO is not set
  CONFIG_ENV_VARS_UBOOT_CONFIG=y
  # CONFIG_EXPERT is not set
-CONFIG_SYS_LOAD_ADDR=0x87000000
  # CONFIG_LEGACY_IMAGE_FORMAT is not set
  # CONFIG_ARCH_FIXUP_FDT_MEMORY is not set
  CONFIG_USE_BOOTCOMMAND=y
diff --git a/configs/openpiton_riscv64_spl_defconfig b/configs/openpiton_riscv64_spl_defconfig

index 629b20499ed4d455101da04ae8500d4a54ad5736..4ea4db90d20a19ecdc51131cc65287ccdeaa2acb 100644 (file)
--- a/configs/openpiton_riscv64_spl_defconfig
+++ b/configs/openpiton_riscv64_spl_defconfig
@@ -6,6 +6,7 @@ CONFIG_DEFAULT_DEVICE_TREE="openpiton-riscv64"
  CONFIG_SPL_SYS_MALLOC_F_LEN=0x100000
  CONFIG_SPL=y
  CONFIG_SPL_LIBDISK_SUPPORT=y
+CONFIG_SYS_LOAD_ADDR=0x87000000
  CONFIG_SPL_PAYLOAD=""
  CONFIG_TARGET_OPENPITON_RISCV64=y
  CONFIG_NR_CPUS=32
@@ -15,7 +16,6 @@ CONFIG_RISCV_SMODE=y
  # CONFIG_LOCALVERSION_AUTO is not set
  CONFIG_ENV_VARS_UBOOT_CONFIG=y
  # CONFIG_EXPERT is not set
-CONFIG_SYS_LOAD_ADDR=0x87000000
  # CONFIG_LEGACY_IMAGE_FORMAT is not set
  # CONFIG_ARCH_FIXUP_FDT_MEMORY is not set
  CONFIG_USE_BOOTCOMMAND=y
diff --git a/configs/openrd_base_defconfig b/configs/openrd_base_defconfig

index 73ba408d84dc4cb961c468382aa14e387343cd71..4ae5d1fa5dd788d7632de364514ed73dbfa00edc 100644 (file)
--- a/configs/openrd_base_defconfig
+++ b/configs/openrd_base_defconfig
@@ -12,10 +12,10 @@ CONFIG_ENV_SIZE=0x20000
  CONFIG_ENV_OFFSET=0x80000
  CONFIG_DEFAULT_DEVICE_TREE="kirkwood-openrd-base"
  CONFIG_IDENT_STRING="\nOpenRD-Base"
+CONFIG_SYS_LOAD_ADDR=0x800000
  # CONFIG_SYS_MALLOC_F is not set
  CONFIG_HAS_BOARD_SIZE_LIMIT=y
  CONFIG_BOARD_SIZE_LIMIT=524288
-CONFIG_SYS_LOAD_ADDR=0x800000
  CONFIG_BOOTDELAY=3
  CONFIG_USE_BOOTCOMMAND=y
  CONFIG_BOOTCOMMAND="${x_bootcmd_kernel}; setenv bootargs ${x_bootargs} ${x_bootargs_root}; ${x_bootcmd_usb}; bootm 0x6400000;"
diff --git a/configs/openrd_client_defconfig b/configs/openrd_client_defconfig

index faf51464e5e9f370c0e84a047dcfa4863e41d474..3e6eb170ff830c9addcf9236e3ca8d11ecb2a043 100644 (file)
--- a/configs/openrd_client_defconfig
+++ b/configs/openrd_client_defconfig
@@ -13,10 +13,10 @@ CONFIG_ENV_SIZE=0x20000
  CONFIG_ENV_OFFSET=0x80000
  CONFIG_DEFAULT_DEVICE_TREE="kirkwood-openrd-client"
  CONFIG_IDENT_STRING="\nOpenRD-Client"
+CONFIG_SYS_LOAD_ADDR=0x800000
  # CONFIG_SYS_MALLOC_F is not set
  CONFIG_HAS_BOARD_SIZE_LIMIT=y
  CONFIG_BOARD_SIZE_LIMIT=524288
-CONFIG_SYS_LOAD_ADDR=0x800000
  CONFIG_BOOTDELAY=3
  CONFIG_USE_BOOTCOMMAND=y
  CONFIG_BOOTCOMMAND="${x_bootcmd_kernel}; setenv bootargs ${x_bootargs} ${x_bootargs_root}; ${x_bootcmd_usb}; bootm 0x6400000;"
diff --git a/configs/openrd_ultimate_defconfig b/configs/openrd_ultimate_defconfig

index 597e694a16d5223e4116802d14da189fb83d34da..d7a02dd2d8a0ea7bc47af1f1c6e070a26529a6ee 100644 (file)
--- a/configs/openrd_ultimate_defconfig
+++ b/configs/openrd_ultimate_defconfig
@@ -13,10 +13,10 @@ CONFIG_ENV_SIZE=0x20000
  CONFIG_ENV_OFFSET=0x80000
  CONFIG_DEFAULT_DEVICE_TREE="kirkwood-openrd-ultimate"
  CONFIG_IDENT_STRING="\nOpenRD-Ultimate"
+CONFIG_SYS_LOAD_ADDR=0x800000
  # CONFIG_SYS_MALLOC_F is not set
  CONFIG_HAS_BOARD_SIZE_LIMIT=y
  CONFIG_BOARD_SIZE_LIMIT=524288
-CONFIG_SYS_LOAD_ADDR=0x800000
  CONFIG_BOOTDELAY=3
  CONFIG_USE_BOOTCOMMAND=y
  CONFIG_BOOTCOMMAND="${x_bootcmd_kernel}; setenv bootargs ${x_bootargs} ${x_bootargs_root}; ${x_bootcmd_usb}; bootm 0x6400000;"
diff --git a/configs/orangepi-rk3399_defconfig b/configs/orangepi-rk3399_defconfig

index 9857fb10653fca6a671a8d19d85ef1e8711adf7e..04e1f4e1363bea33bca9e7895c52d56e672aedfb 100644 (file)
--- a/configs/orangepi-rk3399_defconfig
+++ b/configs/orangepi-rk3399_defconfig
@@ -9,8 +9,8 @@ CONFIG_ROCKCHIP_RK3399=y
  CONFIG_TARGET_EVB_RK3399=y
  CONFIG_DEBUG_UART_BASE=0xFF1A0000
  CONFIG_DEBUG_UART_CLOCK=24000000
-CONFIG_DEBUG_UART=y
  CONFIG_SYS_LOAD_ADDR=0x800800
+CONFIG_DEBUG_UART=y
  CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-orangepi.dtb"
  CONFIG_DISPLAY_BOARDINFO_LATE=y
  # CONFIG_SPL_RAW_IMAGE_SUPPORT is not set
diff --git a/configs/origen_defconfig b/configs/origen_defconfig

index 83a83ab13b14746e991e9443542381f2bb4973f0..6ffec862cd9d0e5daf00657e8cbfa86809bab9aa 100644 (file)
--- a/configs/origen_defconfig
+++ b/configs/origen_defconfig
@@ -14,8 +14,8 @@ CONFIG_DEFAULT_DEVICE_TREE="exynos4210-origen"
  CONFIG_SPL_TEXT_BASE=0x02021410
  CONFIG_SPL=y
  CONFIG_IDENT_STRING=" for ORIGEN"
-CONFIG_DISTRO_DEFAULTS=y
  CONFIG_SYS_LOAD_ADDR=0x43e00000
+CONFIG_DISTRO_DEFAULTS=y
  CONFIG_BOOTCOMMAND="if mmc rescan; then echo SD/MMC found on device ${mmcdev};if run loadbootenv; then echo Loaded environment from ${bootenv};run importbootenv;fi;if test -n $uenvcmd; then echo Running uenvcmd ...;run uenvcmd;fi;if run loadbootscript; then run bootscript; fi; fi;load mmc ${mmcdev} ${loadaddr} uImage; bootm ${loadaddr} "
  CONFIG_SYS_CONSOLE_IS_IN_ENV=y
  CONFIG_SYS_CONSOLE_INFO_QUIET=y
diff --git a/configs/p200_defconfig b/configs/p200_defconfig

index b59dbb8a0ad1fadfa6e606037975a5b2f90c3d95..4ba0028f73ac444a1b9d53e4c22e27063e3e697d 100644 (file)
--- a/configs/p200_defconfig
+++ b/configs/p200_defconfig
@@ -8,9 +8,9 @@ CONFIG_DEFAULT_DEVICE_TREE="meson-gxbb-p200"
  CONFIG_DEBUG_UART_BASE=0xc81004c0
  CONFIG_DEBUG_UART_CLOCK=24000000
  CONFIG_IDENT_STRING=" p200"
+CONFIG_SYS_LOAD_ADDR=0x1000000
  CONFIG_DEBUG_UART=y
  CONFIG_REMAKE_ELF=y
-CONFIG_SYS_LOAD_ADDR=0x1000000
  CONFIG_OF_BOARD_SETUP=y
  # CONFIG_DISPLAY_CPUINFO is not set
  CONFIG_MISC_INIT_R=y
diff --git a/configs/p201_defconfig b/configs/p201_defconfig

index 39bf996b7fb7054e8b117777a9445c6c8875dda8..6de83263bdff364f5413e70c334a37cbc4e3ec21 100644 (file)
--- a/configs/p201_defconfig
+++ b/configs/p201_defconfig
@@ -9,9 +9,9 @@ CONFIG_DEFAULT_DEVICE_TREE="meson-gxbb-p201"
  CONFIG_DEBUG_UART_BASE=0xc81004c0
  CONFIG_DEBUG_UART_CLOCK=24000000
  CONFIG_IDENT_STRING=" p201"
+CONFIG_SYS_LOAD_ADDR=0x1000000
  CONFIG_DEBUG_UART=y
  CONFIG_REMAKE_ELF=y
-CONFIG_SYS_LOAD_ADDR=0x1000000
  CONFIG_OF_BOARD_SETUP=y
  # CONFIG_DISPLAY_CPUINFO is not set
  CONFIG_MISC_INIT_R=y
diff --git a/configs/p212_defconfig b/configs/p212_defconfig

index e321cd03cb54d8694b8c7d6938759e98f9e2d9ea..8506601a47b5459d564e5cf8a97e718a4e8f3b9b 100644 (file)
--- a/configs/p212_defconfig
+++ b/configs/p212_defconfig
@@ -9,9 +9,9 @@ CONFIG_MESON_GXL=y
  CONFIG_DEBUG_UART_BASE=0xc81004c0
  CONFIG_DEBUG_UART_CLOCK=24000000
  CONFIG_IDENT_STRING=" p212"
+CONFIG_SYS_LOAD_ADDR=0x1000000
  CONFIG_DEBUG_UART=y
  CONFIG_REMAKE_ELF=y
-CONFIG_SYS_LOAD_ADDR=0x1000000
  CONFIG_OF_BOARD_SETUP=y
  CONFIG_CONSOLE_MUX=y
  # CONFIG_DISPLAY_CPUINFO is not set
diff --git a/configs/pcm052_defconfig b/configs/pcm052_defconfig

index 292b6b2cd4c5ee93b9063ddd3e2e2713997f3164..c226e04e9365f8c42ff0a9747ded70897f533fe0 100644 (file)
--- a/configs/pcm052_defconfig
+++ b/configs/pcm052_defconfig
@@ -11,11 +11,11 @@ CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="vf610-pcm052"
  CONFIG_ENV_OFFSET_REDUND=0xC0000
  CONFIG_TARGET_PCM052=y
+CONFIG_SYS_LOAD_ADDR=0x82000000
  CONFIG_SYS_MEMTEST_START=0x80010000
  CONFIG_SYS_MEMTEST_END=0x87c00000
  CONFIG_HAS_BOARD_SIZE_LIMIT=y
  CONFIG_BOARD_SIZE_LIMIT=520192
-CONFIG_SYS_LOAD_ADDR=0x82000000
  CONFIG_BOOTDELAY=3
  CONFIG_USE_BOOTCOMMAND=y
  CONFIG_BOOTCOMMAND="run bootcmd_nand"
diff --git a/configs/peach-pi_defconfig b/configs/peach-pi_defconfig

index 930191d7619090f511a245a1e5ffb1f5fff12e02..9b35e5fa8e212f1a14d5b6c4d83c1f63a6af4666 100644 (file)
--- a/configs/peach-pi_defconfig
+++ b/configs/peach-pi_defconfig
@@ -15,8 +15,8 @@ CONFIG_DEFAULT_DEVICE_TREE="exynos5800-peach-pi"
  CONFIG_SPL_TEXT_BASE=0x02024410
  CONFIG_SPL=y
  CONFIG_IDENT_STRING=" for Peach-Pi"
-CONFIG_DISTRO_DEFAULTS=y
  CONFIG_SYS_LOAD_ADDR=0x23e00000
+CONFIG_DISTRO_DEFAULTS=y
  CONFIG_FIT=y
  CONFIG_FIT_BEST_MATCH=y
  CONFIG_SILENT_CONSOLE=y
diff --git a/configs/peach-pit_defconfig b/configs/peach-pit_defconfig

index 16fde6d49ed12021eb9d6f3e68b302ae611b588b..09e2357480d28769f44a9ebe8bc36b455baab353 100644 (file)
--- a/configs/peach-pit_defconfig
+++ b/configs/peach-pit_defconfig
@@ -14,8 +14,8 @@ CONFIG_DEFAULT_DEVICE_TREE="exynos5420-peach-pit"
  CONFIG_SPL_TEXT_BASE=0x02024410
  CONFIG_SPL=y
  CONFIG_IDENT_STRING=" for Peach-Pit"
-CONFIG_DISTRO_DEFAULTS=y
  CONFIG_SYS_LOAD_ADDR=0x23e00000
+CONFIG_DISTRO_DEFAULTS=y
  CONFIG_FIT=y
  CONFIG_FIT_BEST_MATCH=y
  CONFIG_SILENT_CONSOLE=y
diff --git a/configs/pg_wcom_expu1_defconfig b/configs/pg_wcom_expu1_defconfig

index bbc5f9fc7f27cf0d177b2c2866e01be2acce999e..ab98e0a159667da2f203d4035ed2bf0c4d30454c 100644 (file)
--- a/configs/pg_wcom_expu1_defconfig
+++ b/configs/pg_wcom_expu1_defconfig
@@ -14,6 +14,8 @@ CONFIG_BOOTCOUNT_BOOTLIMIT=3
  CONFIG_SYS_BOOTCOUNT_ADDR=0x70000020
  CONFIG_SYS_CLK_FREQ=66666666
  # CONFIG_HAS_ARMV7_SECURE_BASE is not set
+CONFIG_SYS_LOAD_ADDR=0x82000000
+CONFIG_ENV_ADDR=0x60060000
  CONFIG_AHCI=y
  CONFIG_KM_DEF_NETDEV="eth2"
  CONFIG_KM_COMMON_ETH_INIT=y
@@ -24,7 +26,6 @@ CONFIG_PG_WCOM_UBOOT_UPDATE_TEXT_BASE=0x60240000
  CONFIG_SYS_MEMTEST_START=0x80000000
  CONFIG_SYS_MEMTEST_END=0x9fffffff
  CONFIG_DISTRO_DEFAULTS=y
-CONFIG_SYS_LOAD_ADDR=0x82000000
  CONFIG_FIT=y
  CONFIG_FIT_VERBOSE=y
  CONFIG_OF_BOARD_SETUP=y
@@ -57,7 +58,6 @@ CONFIG_OF_CONTROL=y
  CONFIG_ENV_OVERWRITE=y
  CONFIG_ENV_IS_IN_FLASH=y
  CONFIG_SYS_REDUNDAND_ENVIRONMENT=y
-CONFIG_ENV_ADDR=0x60060000
  CONFIG_ENV_ADDR_REDUND=0x60040000
  CONFIG_USE_ETHPRIME=y
  CONFIG_ETHPRIME="ethernet@2d90000"
diff --git a/configs/pg_wcom_expu1_update_defconfig b/configs/pg_wcom_expu1_update_defconfig

index 69a3fc20c8b65280176733a1e5ed9e43a7e6050f..261243f94224dda6b43f179d7731fe08572acd40 100644 (file)
--- a/configs/pg_wcom_expu1_update_defconfig
+++ b/configs/pg_wcom_expu1_update_defconfig
@@ -13,6 +13,8 @@ CONFIG_DEFAULT_DEVICE_TREE="ls1021a-pg-wcom-expu1"
  CONFIG_BOOTCOUNT_BOOTLIMIT=3
  CONFIG_SYS_BOOTCOUNT_ADDR=0x70000020
  # CONFIG_HAS_ARMV7_SECURE_BASE is not set
+CONFIG_SYS_LOAD_ADDR=0x82000000
+CONFIG_ENV_ADDR=0x60220000
  CONFIG_AHCI=y
  CONFIG_KM_DEF_NETDEV="eth2"
  CONFIG_KM_COMMON_ETH_INIT=y
@@ -22,7 +24,6 @@ CONFIG_PG_WCOM_UBOOT_UPDATE=y
  CONFIG_SYS_MEMTEST_START=0x80000000
  CONFIG_SYS_MEMTEST_END=0x9fffffff
  CONFIG_DISTRO_DEFAULTS=y
-CONFIG_SYS_LOAD_ADDR=0x82000000
  CONFIG_FIT=y
  CONFIG_FIT_VERBOSE=y
  CONFIG_OF_BOARD_SETUP=y
@@ -55,7 +56,6 @@ CONFIG_OF_CONTROL=y
  CONFIG_ENV_OVERWRITE=y
  CONFIG_ENV_IS_IN_FLASH=y
  CONFIG_SYS_REDUNDAND_ENVIRONMENT=y
-CONFIG_ENV_ADDR=0x60220000
  CONFIG_ENV_ADDR_REDUND=0x60200000
  CONFIG_USE_ETHPRIME=y
  CONFIG_ETHPRIME="ethernet@2d90000"
diff --git a/configs/pg_wcom_seli8_defconfig b/configs/pg_wcom_seli8_defconfig

index 7cf5a6a3c54ee2184cf24d5a6e13883e319b7def..80a3b74278ed4e9b9463dbaf1c9eba182092a3c8 100644 (file)
--- a/configs/pg_wcom_seli8_defconfig
+++ b/configs/pg_wcom_seli8_defconfig
@@ -14,6 +14,8 @@ CONFIG_BOOTCOUNT_BOOTLIMIT=3
  CONFIG_SYS_BOOTCOUNT_ADDR=0x70000020
  CONFIG_SYS_CLK_FREQ=66666666
  # CONFIG_HAS_ARMV7_SECURE_BASE is not set
+CONFIG_SYS_LOAD_ADDR=0x82000000
+CONFIG_ENV_ADDR=0x60060000
  CONFIG_AHCI=y
  CONFIG_KM_DEF_NETDEV="eth2"
  CONFIG_KM_COMMON_ETH_INIT=y
@@ -24,7 +26,6 @@ CONFIG_PG_WCOM_UBOOT_UPDATE_TEXT_BASE=0x60240000
  CONFIG_SYS_MEMTEST_START=0x80000000
  CONFIG_SYS_MEMTEST_END=0x9fffffff
  CONFIG_DISTRO_DEFAULTS=y
-CONFIG_SYS_LOAD_ADDR=0x82000000
  CONFIG_FIT=y
  CONFIG_FIT_VERBOSE=y
  CONFIG_OF_BOARD_SETUP=y
@@ -57,7 +58,6 @@ CONFIG_OF_CONTROL=y
  CONFIG_ENV_OVERWRITE=y
  CONFIG_ENV_IS_IN_FLASH=y
  CONFIG_SYS_REDUNDAND_ENVIRONMENT=y
-CONFIG_ENV_ADDR=0x60060000
  CONFIG_ENV_ADDR_REDUND=0x60040000
  CONFIG_USE_ETHPRIME=y
  CONFIG_ETHPRIME="ethernet@2d90000"
diff --git a/configs/pg_wcom_seli8_update_defconfig b/configs/pg_wcom_seli8_update_defconfig

index dc336134b610f0493881402a8e839d47bd25c7cd..d322d6daacefb189a9dc5151d000f17bf60063e3 100644 (file)
--- a/configs/pg_wcom_seli8_update_defconfig
+++ b/configs/pg_wcom_seli8_update_defconfig
@@ -13,6 +13,8 @@ CONFIG_DEFAULT_DEVICE_TREE="ls1021a-pg-wcom-seli8"
  CONFIG_BOOTCOUNT_BOOTLIMIT=3
  CONFIG_SYS_BOOTCOUNT_ADDR=0x70000020
  # CONFIG_HAS_ARMV7_SECURE_BASE is not set
+CONFIG_SYS_LOAD_ADDR=0x82000000
+CONFIG_ENV_ADDR=0x60220000
  CONFIG_AHCI=y
  CONFIG_KM_DEF_NETDEV="eth2"
  CONFIG_KM_COMMON_ETH_INIT=y
@@ -22,7 +24,6 @@ CONFIG_PG_WCOM_UBOOT_UPDATE=y
  CONFIG_SYS_MEMTEST_START=0x80000000
  CONFIG_SYS_MEMTEST_END=0x9fffffff
  CONFIG_DISTRO_DEFAULTS=y
-CONFIG_SYS_LOAD_ADDR=0x82000000
  CONFIG_FIT=y
  CONFIG_FIT_VERBOSE=y
  CONFIG_OF_BOARD_SETUP=y
@@ -55,7 +56,6 @@ CONFIG_OF_CONTROL=y
  CONFIG_ENV_OVERWRITE=y
  CONFIG_ENV_IS_IN_FLASH=y
  CONFIG_SYS_REDUNDAND_ENVIRONMENT=y
-CONFIG_ENV_ADDR=0x60220000
  CONFIG_ENV_ADDR_REDUND=0x60200000
  CONFIG_USE_ETHPRIME=y
  CONFIG_ETHPRIME="ethernet@2d90000"
diff --git a/configs/phycore-imx8mm_defconfig b/configs/phycore-imx8mm_defconfig

index c6b2719350dac468fe5d8aabc164f424a4d8c70a..83ad5ec47fcf07fbd6070b3105f89b0a22b0a775 100644 (file)
--- a/configs/phycore-imx8mm_defconfig
+++ b/configs/phycore-imx8mm_defconfig
@@ -2,7 +2,6 @@ CONFIG_ARM=y
  CONFIG_ARCH_IMX8M=y
  CONFIG_SYS_TEXT_BASE=0x40200000
  CONFIG_SYS_MALLOC_LEN=0x2000000
-CONFIG_SYS_MALLOC_F_LEN=0x10000
  CONFIG_SPL_GPIO=y
  CONFIG_SPL_LIBCOMMON_SUPPORT=y
  CONFIG_SPL_LIBGENERIC_SUPPORT=y
diff --git a/configs/phycore-imx8mp_defconfig b/configs/phycore-imx8mp_defconfig

index 2391aa4914104dd78ab4d02ddedf3d96639bef22..1052ccb2aeb3c32c623833584e455d0a7a3cc3ad 100644 (file)
--- a/configs/phycore-imx8mp_defconfig
+++ b/configs/phycore-imx8mp_defconfig
@@ -2,7 +2,6 @@ CONFIG_ARM=y
  CONFIG_ARCH_IMX8M=y
  CONFIG_SYS_TEXT_BASE=0x40200000
  CONFIG_SYS_MALLOC_LEN=0x2000000
-CONFIG_SYS_MALLOC_F_LEN=0x10000
  CONFIG_SPL_GPIO=y
  CONFIG_SPL_LIBCOMMON_SUPPORT=y
  CONFIG_SPL_LIBGENERIC_SUPPORT=y
diff --git a/configs/phycore-rk3288_defconfig b/configs/phycore-rk3288_defconfig

index 63aabfbe81b5b9a045891f55f4b809550d0e6e3c..d582a0d9a9dc2649cca53bef78cb5586b732de52 100644 (file)
--- a/configs/phycore-rk3288_defconfig
+++ b/configs/phycore-rk3288_defconfig
@@ -13,8 +13,8 @@ CONFIG_TARGET_PHYCORE_RK3288=y
  CONFIG_SPL_STACK_R_ADDR=0x80000
  CONFIG_DEBUG_UART_BASE=0xff690000
  CONFIG_DEBUG_UART_CLOCK=24000000
-CONFIG_DEBUG_UART=y
  CONFIG_SYS_LOAD_ADDR=0x800800
+CONFIG_DEBUG_UART=y
  # CONFIG_ANDROID_BOOT_IMAGE is not set
  CONFIG_USE_PREBOOT=y
  CONFIG_DEFAULT_FDT_FILE="rk3288-phycore-rdk.dtb"
diff --git a/configs/pic32mzdask_defconfig b/configs/pic32mzdask_defconfig

index 3c2ad93a37481dec9613fcdebf289596ef67a5bf..8c5934cc9169709f69278bcfacd1dc17126f7a31 100644 (file)
--- a/configs/pic32mzdask_defconfig
+++ b/configs/pic32mzdask_defconfig
@@ -5,13 +5,13 @@ CONFIG_SYS_MALLOC_F_LEN=0x600
  CONFIG_ENV_SIZE=0x4000
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="pic32mzda_sk"
+CONFIG_SYS_LOAD_ADDR=0x88500000
  CONFIG_MACH_PIC32=y
  # CONFIG_MIPS_BOOT_ENV_LEGACY is not set
  CONFIG_MIPS_BOOT_FDT=y
  CONFIG_SYS_MEMTEST_START=0x88000000
  CONFIG_SYS_MEMTEST_END=0x88080000
  CONFIG_DISTRO_DEFAULTS=y
-CONFIG_SYS_LOAD_ADDR=0x88500000
  CONFIG_TIMESTAMP=y
  CONFIG_BOOTDELAY=5
  CONFIG_BOOTCOMMAND="run distro_bootcmd || run legacy_bootcmd"
diff --git a/configs/pico-imx8mq_defconfig b/configs/pico-imx8mq_defconfig

index cd005d09f2d08f2a8609681403dee752e1a46ac0..1b0d12cf8d4ea2694d00bb95c4d761d2d6d735ca 100644 (file)
--- a/configs/pico-imx8mq_defconfig
+++ b/configs/pico-imx8mq_defconfig
@@ -19,8 +19,8 @@ CONFIG_SPL_SERIAL=y
  CONFIG_SPL_DRIVERS_MISC=y
  CONFIG_SPL=y
  CONFIG_IMX_BOOTAUX=y
-CONFIG_REMAKE_ELF=y
  CONFIG_SYS_LOAD_ADDR=0x40480000
+CONFIG_REMAKE_ELF=y
  CONFIG_FIT=y
  CONFIG_FIT_EXTERNAL_OFFSET=0x3000
  CONFIG_SPL_LOAD_FIT=y
diff --git a/configs/pinebook-pro-rk3399_defconfig b/configs/pinebook-pro-rk3399_defconfig

index d7378f5eb395e1b0c274bd026089246edc47a6b2..d12a7d4e403cccca2bb0d106a29f1b0999ee0563 100644 (file)
--- a/configs/pinebook-pro-rk3399_defconfig
+++ b/configs/pinebook-pro-rk3399_defconfig
@@ -11,8 +11,8 @@ CONFIG_DEBUG_UART_BASE=0xFF1A0000
  CONFIG_DEBUG_UART_CLOCK=24000000
  CONFIG_SPL_SPI_FLASH_SUPPORT=y
  CONFIG_SPL_SPI=y
-CONFIG_DEBUG_UART=y
  CONFIG_SYS_LOAD_ADDR=0x800800
+CONFIG_DEBUG_UART=y
  CONFIG_BOOTDELAY=3
  CONFIG_USE_PREBOOT=y
  CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-pinebook-pro.dtb"
diff --git a/configs/pm9261_defconfig b/configs/pm9261_defconfig

index 8e5ebaa50b33aac8a615be49abcffa3d1edd78b6..83b6d7382d119512b885e625e26c89dfd5fb5bb2 100644 (file)
--- a/configs/pm9261_defconfig
+++ b/configs/pm9261_defconfig
@@ -11,6 +11,7 @@ CONFIG_ENV_SECT_SIZE=0x10000
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="at91sam9261ek"
  CONFIG_SYS_LOAD_ADDR=0x22000000
+CONFIG_ENV_ADDR=0x10040000
  CONFIG_BOOTDELAY=3
  CONFIG_USE_BOOTARGS=y
  CONFIG_BOOTARGS="root=/dev/mtdblock4 rootfstype=jffs2 fbcon=rotate:3 "
@@ -33,7 +34,6 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=physmap-flash.0:256k(u-boot)ro,64k(u-boot-env)
  CONFIG_OF_CONTROL=y
  CONFIG_ENV_OVERWRITE=y
  CONFIG_ENV_IS_IN_FLASH=y
-CONFIG_ENV_ADDR=0x10040000
  # CONFIG_NET is not set
  CONFIG_DM=y
  CONFIG_BLK=y
diff --git a/configs/pm9263_defconfig b/configs/pm9263_defconfig

index 2f8380d10a13cc7a2d243d8d49b90affb2064b1a..267b24f43a3c563a60abefa7bc156f81321c56a4 100644 (file)
--- a/configs/pm9263_defconfig
+++ b/configs/pm9263_defconfig
@@ -11,6 +11,7 @@ CONFIG_ENV_SECT_SIZE=0x10000
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="at91sam9263ek"
  CONFIG_SYS_LOAD_ADDR=0x22000000
+CONFIG_ENV_ADDR=0x10040000
  CONFIG_BOOTDELAY=3
  CONFIG_USE_BOOTARGS=y
  CONFIG_BOOTARGS="root=/dev/mtdblock4 rootfstype=jffs2 fbcon=rotate:3 "
@@ -38,7 +39,6 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=physmap-flash.0:256k(u-boot)ro,64k(u-boot-env)
  CONFIG_OF_CONTROL=y
  CONFIG_ENV_OVERWRITE=y
  CONFIG_ENV_IS_IN_FLASH=y
-CONFIG_ENV_ADDR=0x10040000
  CONFIG_DM=y
  CONFIG_BLK=y
  CONFIG_CLK=y
diff --git a/configs/pm9g45_defconfig b/configs/pm9g45_defconfig

index 6a347f9b7d1e435e9cf6da86b83721983458173c..2e3361a5720826cc00e338948dcaace0c0af664c 100644 (file)
--- a/configs/pm9g45_defconfig
+++ b/configs/pm9g45_defconfig
@@ -12,8 +12,8 @@ CONFIG_DEFAULT_DEVICE_TREE="at91sam9m10g45ek"
  CONFIG_DEBUG_UART_BASE=0xffffee00
  CONFIG_DEBUG_UART_CLOCK=132000000
  CONFIG_ENV_OFFSET_REDUND=0x100000
-CONFIG_DEBUG_UART=y
  CONFIG_SYS_LOAD_ADDR=0x22000000
+CONFIG_DEBUG_UART=y
  CONFIG_NAND_BOOT=y
  CONFIG_BOOTDELAY=3
  CONFIG_USE_BOOTARGS=y
diff --git a/configs/pogo_e02_defconfig b/configs/pogo_e02_defconfig

index 37397f4ba2247793c2a806249bb23bb51624735f..2d807f1a9c1173b905f79e3326221a06f1a62011 100644 (file)
--- a/configs/pogo_e02_defconfig
+++ b/configs/pogo_e02_defconfig
@@ -12,8 +12,8 @@ CONFIG_ENV_SIZE=0x20000
  CONFIG_ENV_OFFSET=0xC0000
  CONFIG_DEFAULT_DEVICE_TREE="kirkwood-pogo_e02"
  CONFIG_IDENT_STRING="\nPogo E02"
-# CONFIG_SYS_MALLOC_F is not set
  CONFIG_SYS_LOAD_ADDR=0x800000
+# CONFIG_SYS_MALLOC_F is not set
  CONFIG_BOOTDELAY=3
  CONFIG_USE_BOOTCOMMAND=y
  CONFIG_BOOTCOMMAND="setenv bootargs $(bootargs_console); run bootcmd_usb; bootm 0x00800000 0x01100000"
diff --git a/configs/pomelo_defconfig b/configs/pomelo_defconfig

index e10eceda1557e3080bd51e2cf7d518bcb69364c0..4fe4f2db018d177374c9123253f42a2853443cb7 100644 (file)
--- a/configs/pomelo_defconfig
+++ b/configs/pomelo_defconfig
@@ -4,9 +4,9 @@ CONFIG_SYS_TEXT_BASE=0x180000
  CONFIG_SYS_MALLOC_LEN=0x101000
  CONFIG_NR_DRAM_BANKS=1
  CONFIG_DEFAULT_DEVICE_TREE="phytium-pomelo"
+CONFIG_SYS_LOAD_ADDR=0x90000000
  CONFIG_SYS_PCI_64BIT=y
  CONFIG_DISTRO_DEFAULTS=y
-CONFIG_SYS_LOAD_ADDR=0x90000000
  CONFIG_USE_BOOTARGS=y
  CONFIG_BOOTARGS="console=ttyAMA0,115200 earlycon=pl011,0x28001000 root=/dev/sda2 rw"
  # CONFIG_DISPLAY_CPUINFO is not set
diff --git a/configs/poplar_defconfig b/configs/poplar_defconfig

index 9e0c1d6f30f749a8dcb382181f842c39d3f32f90..5d2639f71bdf181c3c1973d945858b6bc646a003 100644 (file)
--- a/configs/poplar_defconfig
+++ b/configs/poplar_defconfig
@@ -8,8 +8,8 @@ CONFIG_ENV_SIZE=0x10000
  CONFIG_ENV_OFFSET=0x1F0000
  CONFIG_DEFAULT_DEVICE_TREE="hi3798cv200-poplar"
  CONFIG_IDENT_STRING="poplar"
-CONFIG_DISTRO_DEFAULTS=y
  CONFIG_SYS_LOAD_ADDR=0x800000
+CONFIG_DISTRO_DEFAULTS=y
  # CONFIG_DISPLAY_CPUINFO is not set
  CONFIG_SYS_PROMPT="poplar# "
  CONFIG_CMD_MMC=y
diff --git a/configs/popmetal-rk3288_defconfig b/configs/popmetal-rk3288_defconfig

index 46988d91a26d23f180618e2eb1133c07890f823a..4e5db07f217e456fd7892f75cd0f474bc7edb75e 100644 (file)
--- a/configs/popmetal-rk3288_defconfig
+++ b/configs/popmetal-rk3288_defconfig
@@ -13,8 +13,8 @@ CONFIG_TARGET_POPMETAL_RK3288=y
  CONFIG_SPL_STACK_R_ADDR=0x80000
  CONFIG_DEBUG_UART_BASE=0xff690000
  CONFIG_DEBUG_UART_CLOCK=24000000
-CONFIG_DEBUG_UART=y
  CONFIG_SYS_LOAD_ADDR=0x800800
+CONFIG_DEBUG_UART=y
  # CONFIG_ANDROID_BOOT_IMAGE is not set
  CONFIG_USE_PREBOOT=y
  CONFIG_DEFAULT_FDT_FILE="rk3288-popmetal.dtb"
diff --git a/configs/porter_defconfig b/configs/porter_defconfig

index b54b48e831053ca9b952b50e7c1e10f0bfeee80e..05f85d33b64b499da05ac0fbec59dcd200011aa9 100644 (file)
--- a/configs/porter_defconfig
+++ b/configs/porter_defconfig
@@ -25,6 +25,7 @@ CONFIG_SPL=y
  CONFIG_SPL_SPI_FLASH_SUPPORT=y
  CONFIG_SPL_SPI=y
  CONFIG_SYS_LOAD_ADDR=0x50000000
+CONFIG_ENV_ADDR=0xC0000
  CONFIG_FIT=y
  CONFIG_BOOTDELAY=3
  CONFIG_SPL_BOARD_INIT=y
@@ -60,7 +61,6 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=spi0.0:256k(u-boot-spl),512k(u-boot-env1),512k
  CONFIG_OF_CONTROL=y
  CONFIG_ENV_OVERWRITE=y
  CONFIG_ENV_IS_IN_SPI_FLASH=y
-CONFIG_ENV_ADDR=0xC0000
  CONFIG_VERSION_VARIABLE=y
  CONFIG_CLK=y
  CONFIG_CLK_RENESAS=y
diff --git a/configs/puma-rk3399_defconfig b/configs/puma-rk3399_defconfig

index afc54fe45cf83623740ca29f4301ab08fabec54b..c98b5cf5f1492078331ee183b2bf411dad7c1786 100644 (file)
--- a/configs/puma-rk3399_defconfig
+++ b/configs/puma-rk3399_defconfig
@@ -14,8 +14,8 @@ CONFIG_DEBUG_UART_BASE=0xFF180000
  CONFIG_DEBUG_UART_CLOCK=24000000
  CONFIG_SPL_SPI_FLASH_SUPPORT=y
  CONFIG_SPL_SPI=y
-CONFIG_DEBUG_UART=y
  CONFIG_SYS_LOAD_ADDR=0x800800
+CONFIG_DEBUG_UART=y
  CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-puma-haikou.dtb"
  CONFIG_DISPLAY_BOARDINFO_LATE=y
  CONFIG_MISC_INIT_R=y
diff --git a/configs/px30-core-ctouch2-of10-px30_defconfig b/configs/px30-core-ctouch2-of10-px30_defconfig

index 664c9774eb8d190a4e6f4251ece598336464e811..9521990772f7aed9dc5cf5ba1fde6b870b6f2bda 100644 (file)
--- a/configs/px30-core-ctouch2-of10-px30_defconfig
+++ b/configs/px30-core-ctouch2-of10-px30_defconfig
@@ -16,9 +16,9 @@ CONFIG_SPL_DRIVERS_MISC=y
  CONFIG_SPL_STACK_R_ADDR=0x600000
  CONFIG_DEBUG_UART_BASE=0xFF160000
  CONFIG_DEBUG_UART_CLOCK=24000000
+CONFIG_SYS_LOAD_ADDR=0x800800
  CONFIG_DEBUG_UART=y
  CONFIG_TPL_SYS_MALLOC_F_LEN=0x600
-CONFIG_SYS_LOAD_ADDR=0x800800
  # CONFIG_ANDROID_BOOT_IMAGE is not set
  CONFIG_FIT=y
  CONFIG_FIT_VERBOSE=y
diff --git a/configs/px30-core-ctouch2-px30_defconfig b/configs/px30-core-ctouch2-px30_defconfig

index 7d1920458ea0030aa77d53af8a38dfbf60074b28..35d1bcbd4ee5742519c9ba00b28275e11dd21a1a 100644 (file)
--- a/configs/px30-core-ctouch2-px30_defconfig
+++ b/configs/px30-core-ctouch2-px30_defconfig
@@ -16,9 +16,9 @@ CONFIG_SPL_DRIVERS_MISC=y
  CONFIG_SPL_STACK_R_ADDR=0x600000
  CONFIG_DEBUG_UART_BASE=0xFF160000
  CONFIG_DEBUG_UART_CLOCK=24000000
+CONFIG_SYS_LOAD_ADDR=0x800800
  CONFIG_DEBUG_UART=y
  CONFIG_TPL_SYS_MALLOC_F_LEN=0x600
-CONFIG_SYS_LOAD_ADDR=0x800800
  # CONFIG_ANDROID_BOOT_IMAGE is not set
  CONFIG_FIT=y
  CONFIG_FIT_VERBOSE=y
diff --git a/configs/px30-core-edimm2.2-px30_defconfig b/configs/px30-core-edimm2.2-px30_defconfig

index 84c57337ce325d15c8b27f53053a26ad9e5bfd1b..c23711490512c9680eb8a52e4ff804fea4cebaff 100644 (file)
--- a/configs/px30-core-edimm2.2-px30_defconfig
+++ b/configs/px30-core-edimm2.2-px30_defconfig
@@ -16,9 +16,9 @@ CONFIG_SPL_DRIVERS_MISC=y
  CONFIG_SPL_STACK_R_ADDR=0x600000
  CONFIG_DEBUG_UART_BASE=0xFF160000
  CONFIG_DEBUG_UART_CLOCK=24000000
+CONFIG_SYS_LOAD_ADDR=0x800800
  CONFIG_DEBUG_UART=y
  CONFIG_TPL_SYS_MALLOC_F_LEN=0x600
-CONFIG_SYS_LOAD_ADDR=0x800800
  # CONFIG_ANDROID_BOOT_IMAGE is not set
  CONFIG_FIT=y
  CONFIG_FIT_VERBOSE=y
diff --git a/configs/pxm2_defconfig b/configs/pxm2_defconfig

index 5f71e26cbce6e203929ff0ebd7f5978544a96c23..6e9ecc8cd60c95365a93ce0fd842f506fd93c6d4 100644 (file)
--- a/configs/pxm2_defconfig
+++ b/configs/pxm2_defconfig
@@ -21,8 +21,8 @@ CONFIG_SPL_FS_FAT=y
  CONFIG_SPL_LIBDISK_SUPPORT=y
  CONFIG_SPL_SPI_FLASH_SUPPORT=y
  CONFIG_SPL_SPI=y
-CONFIG_ENV_VARS_UBOOT_CONFIG=y
  CONFIG_SYS_LOAD_ADDR=0x81000000
+CONFIG_ENV_VARS_UBOOT_CONFIG=y
  CONFIG_BOOTDELAY=3
  CONFIG_AUTOBOOT_KEYED=y
  CONFIG_AUTOBOOT_PROMPT="Autobooting in %d seconds, press \"<Esc><Esc>\" to stop\n"
diff --git a/configs/qemu-riscv32_defconfig b/configs/qemu-riscv32_defconfig

index b7edc5c575c07095ba3c6d477fb7b8b4fa133bff..91b5c9a3b8021df5f16c6e15467bf148182c4a0f 100644 (file)
--- a/configs/qemu-riscv32_defconfig
+++ b/configs/qemu-riscv32_defconfig
@@ -3,9 +3,9 @@ CONFIG_SYS_MALLOC_LEN=0x800000
  CONFIG_NR_DRAM_BANKS=1
  CONFIG_ENV_SIZE=0x20000
  CONFIG_DEFAULT_DEVICE_TREE="qemu-virt32"
+CONFIG_SYS_LOAD_ADDR=0x80200000
  CONFIG_TARGET_QEMU_VIRT=y
  CONFIG_DISTRO_DEFAULTS=y
-CONFIG_SYS_LOAD_ADDR=0x80200000
  CONFIG_FIT=y
  CONFIG_DISPLAY_CPUINFO=y
  CONFIG_DISPLAY_BOARDINFO=y
diff --git a/configs/qemu-riscv32_smode_defconfig b/configs/qemu-riscv32_smode_defconfig

index ef4e2d134214488f4fec3499fbd5c5b96d8914d9..5a135f8624cdd2b755bc41aeb0ef15939fb4aa0f 100644 (file)
--- a/configs/qemu-riscv32_smode_defconfig
+++ b/configs/qemu-riscv32_smode_defconfig
@@ -3,10 +3,10 @@ CONFIG_SYS_MALLOC_LEN=0x800000
  CONFIG_NR_DRAM_BANKS=1
  CONFIG_ENV_SIZE=0x20000
  CONFIG_DEFAULT_DEVICE_TREE="qemu-virt32"
+CONFIG_SYS_LOAD_ADDR=0x80200000
  CONFIG_TARGET_QEMU_VIRT=y
  CONFIG_RISCV_SMODE=y
  CONFIG_DISTRO_DEFAULTS=y
-CONFIG_SYS_LOAD_ADDR=0x80200000
  CONFIG_FIT=y
  CONFIG_DISPLAY_CPUINFO=y
  CONFIG_DISPLAY_BOARDINFO=y
diff --git a/configs/qemu-riscv32_spl_defconfig b/configs/qemu-riscv32_spl_defconfig

index 50b343c125e6f6e7f833bf5b236cd89210a8e90e..410aecf2162654de69b56a5d22edd514d55cea81 100644 (file)
--- a/configs/qemu-riscv32_spl_defconfig
+++ b/configs/qemu-riscv32_spl_defconfig
@@ -4,16 +4,15 @@ CONFIG_NR_DRAM_BANKS=1
  CONFIG_ENV_SIZE=0x20000
  CONFIG_DEFAULT_DEVICE_TREE="qemu-virt32"
  CONFIG_SPL=y
+CONFIG_SYS_LOAD_ADDR=0x80200000
  CONFIG_TARGET_QEMU_VIRT=y
  CONFIG_RISCV_SMODE=y
  # CONFIG_OF_BOARD_FIXUP is not set
  CONFIG_DISTRO_DEFAULTS=y
-CONFIG_SYS_LOAD_ADDR=0x80200000
  CONFIG_FIT=y
  CONFIG_SPL_LOAD_FIT_ADDRESS=0x80200000
  CONFIG_DISPLAY_CPUINFO=y
  CONFIG_DISPLAY_BOARDINFO=y
-CONFIG_CMD_SBI=y
  # CONFIG_CMD_MII is not set
  CONFIG_SYS_RELOC_GD_ENV_ADDR=y
  CONFIG_DM_MTD=y
diff --git a/configs/qemu-riscv64_defconfig b/configs/qemu-riscv64_defconfig

index f0fa726658f3ce22e840f8d106b60769e643b90a..f7b9de10875fb43e57438d15cc9bc88b77b6e217 100644 (file)
--- a/configs/qemu-riscv64_defconfig
+++ b/configs/qemu-riscv64_defconfig
@@ -3,10 +3,10 @@ CONFIG_SYS_MALLOC_LEN=0x800000
  CONFIG_NR_DRAM_BANKS=1
  CONFIG_ENV_SIZE=0x20000
  CONFIG_DEFAULT_DEVICE_TREE="qemu-virt64"
+CONFIG_SYS_LOAD_ADDR=0x80200000
  CONFIG_TARGET_QEMU_VIRT=y
  CONFIG_ARCH_RV64I=y
  CONFIG_DISTRO_DEFAULTS=y
-CONFIG_SYS_LOAD_ADDR=0x80200000
  CONFIG_FIT=y
  CONFIG_DISPLAY_CPUINFO=y
  CONFIG_DISPLAY_BOARDINFO=y
diff --git a/configs/qemu-riscv64_smode_defconfig b/configs/qemu-riscv64_smode_defconfig

index 17de6b5cd18c04dd3b06049e2c1a8fd4f61f38db..4d83570c455df8ea7979d357c0548085f250015c 100644 (file)
--- a/configs/qemu-riscv64_smode_defconfig
+++ b/configs/qemu-riscv64_smode_defconfig
@@ -3,11 +3,11 @@ CONFIG_SYS_MALLOC_LEN=0x800000
  CONFIG_NR_DRAM_BANKS=1
  CONFIG_ENV_SIZE=0x20000
  CONFIG_DEFAULT_DEVICE_TREE="qemu-virt64"
+CONFIG_SYS_LOAD_ADDR=0x80200000
  CONFIG_TARGET_QEMU_VIRT=y
  CONFIG_ARCH_RV64I=y
  CONFIG_RISCV_SMODE=y
  CONFIG_DISTRO_DEFAULTS=y
-CONFIG_SYS_LOAD_ADDR=0x80200000
  CONFIG_FIT=y
  CONFIG_USE_PREBOOT=y
  CONFIG_PREBOOT="setenv fdt_addr ${fdtcontroladdr}; fdt addr ${fdtcontroladdr};"
diff --git a/configs/qemu-riscv64_spl_defconfig b/configs/qemu-riscv64_spl_defconfig

index bf181457773c7610c0c4bc5da4ca5b543f4bca65..e19273e79cdb05525c92ee96b8fdb2e5d1200236 100644 (file)
--- a/configs/qemu-riscv64_spl_defconfig
+++ b/configs/qemu-riscv64_spl_defconfig
@@ -4,16 +4,15 @@ CONFIG_NR_DRAM_BANKS=1
  CONFIG_ENV_SIZE=0x20000
  CONFIG_DEFAULT_DEVICE_TREE="qemu-virt64"
  CONFIG_SPL=y
+CONFIG_SYS_LOAD_ADDR=0x80200000
  CONFIG_TARGET_QEMU_VIRT=y
  CONFIG_ARCH_RV64I=y
  CONFIG_RISCV_SMODE=y
  CONFIG_DISTRO_DEFAULTS=y
-CONFIG_SYS_LOAD_ADDR=0x80200000
  CONFIG_FIT=y
  CONFIG_SPL_LOAD_FIT_ADDRESS=0x80200000
  CONFIG_DISPLAY_CPUINFO=y
  CONFIG_DISPLAY_BOARDINFO=y
-CONFIG_CMD_SBI=y
  # CONFIG_CMD_MII is not set
  CONFIG_SYS_RELOC_GD_ENV_ADDR=y
  CONFIG_DM_MTD=y
diff --git a/configs/qemu_arm64_defconfig b/configs/qemu_arm64_defconfig

index 62aa341d6a154aa872e6c1b5aa8f45a29748b688..8d5c5751961910f03d090a0b5c9cdcc164e00846 100644 (file)
--- a/configs/qemu_arm64_defconfig
+++ b/configs/qemu_arm64_defconfig
@@ -8,10 +8,11 @@ CONFIG_ENV_SECT_SIZE=0x40000
  CONFIG_DEFAULT_DEVICE_TREE="qemu-arm64"
  CONFIG_DEBUG_UART_BASE=0x9000000
  CONFIG_DEBUG_UART_CLOCK=0
+CONFIG_SYS_LOAD_ADDR=0x40200000
+CONFIG_ENV_ADDR=0x4000000
  CONFIG_DEBUG_UART=y
  CONFIG_AHCI=y
  CONFIG_DISTRO_DEFAULTS=y
-CONFIG_SYS_LOAD_ADDR=0x40200000
  CONFIG_FIT=y
  CONFIG_FIT_SIGNATURE=y
  CONFIG_FIT_VERBOSE=y
@@ -30,7 +31,6 @@ CONFIG_CMD_USB=y
  CONFIG_CMD_TPM=y
  CONFIG_CMD_MTDPARTS=y
  CONFIG_ENV_IS_IN_FLASH=y
-CONFIG_ENV_ADDR=0x4000000
  CONFIG_SCSI_AHCI=y
  CONFIG_AHCI_PCI=y
  CONFIG_DFU_TFTP=y
diff --git a/configs/qemu_arm_defconfig b/configs/qemu_arm_defconfig

index 791a26c0e1052a0772720b627e3b0099cb5918ba..3b019e4bbe9957e964ed4e835fec5f2ed483b549 100644 (file)
--- a/configs/qemu_arm_defconfig
+++ b/configs/qemu_arm_defconfig
@@ -10,10 +10,11 @@ CONFIG_TARGET_QEMU_ARM_32BIT=y
  CONFIG_DEBUG_UART_BASE=0x9000000
  CONFIG_DEBUG_UART_CLOCK=0
  CONFIG_ARMV7_LPAE=y
+CONFIG_SYS_LOAD_ADDR=0x40200000
+CONFIG_ENV_ADDR=0x4000000
  CONFIG_DEBUG_UART=y
  CONFIG_AHCI=y
  CONFIG_DISTRO_DEFAULTS=y
-CONFIG_SYS_LOAD_ADDR=0x40200000
  CONFIG_FIT=y
  CONFIG_FIT_SIGNATURE=y
  CONFIG_FIT_VERBOSE=y
@@ -32,7 +33,6 @@ CONFIG_CMD_USB=y
  CONFIG_CMD_TPM=y
  CONFIG_CMD_MTDPARTS=y
  CONFIG_ENV_IS_IN_FLASH=y
-CONFIG_ENV_ADDR=0x4000000
  CONFIG_SCSI_AHCI=y
  CONFIG_AHCI_PCI=y
  CONFIG_DFU_TFTP=y
diff --git a/configs/r2dplus_defconfig b/configs/r2dplus_defconfig

index f12c09ad409a62a00b48c351a8ab65a19b8c60c1..873eab5b77dac9c03bd2e97598bde336af52d6e0 100644 (file)
--- a/configs/r2dplus_defconfig
+++ b/configs/r2dplus_defconfig
@@ -5,8 +5,9 @@ CONFIG_ENV_SIZE=0x40000
  CONFIG_ENV_SECT_SIZE=0x40000
  CONFIG_DEFAULT_DEVICE_TREE="sh7751-r2dplus"
  CONFIG_SYS_CLK_FREQ=60000000
-CONFIG_TARGET_R2DPLUS=y
  CONFIG_SYS_LOAD_ADDR=0x8e000000
+CONFIG_ENV_ADDR=0xA0040000
+CONFIG_TARGET_R2DPLUS=y
  CONFIG_SYS_MONITOR_BASE=0xA0000000
  CONFIG_BOOTDELAY=-1
  CONFIG_USE_BOOTARGS=y
@@ -28,7 +29,6 @@ CONFIG_DOS_PARTITION=y
  CONFIG_OF_CONTROL=y
  CONFIG_ENV_OVERWRITE=y
  CONFIG_ENV_IS_IN_FLASH=y
-CONFIG_ENV_ADDR=0xA0040000
  CONFIG_DM=y
  CONFIG_SYS_IDE_MAXBUS=1
  CONFIG_SYS_IDE_MAXDEVICE=1
diff --git a/configs/r8a77970_eagle_defconfig b/configs/r8a77970_eagle_defconfig

index 7e73eb32d3887a4d62fcc1902b6a5ca8b0c68cfe..b3fbe8692855c131dabec5cd5536c2fefba7197e 100644 (file)
--- a/configs/r8a77970_eagle_defconfig
+++ b/configs/r8a77970_eagle_defconfig
@@ -12,8 +12,8 @@ CONFIG_DEFAULT_DEVICE_TREE="r8a77970-eagle-u-boot"
  CONFIG_SPL_TEXT_BASE=0xe6318000
  CONFIG_RCAR_GEN3=y
  CONFIG_TARGET_EAGLE=y
-CONFIG_REMAKE_ELF=y
  CONFIG_SYS_LOAD_ADDR=0x58000000
+CONFIG_REMAKE_ELF=y
  CONFIG_FIT=y
  CONFIG_SUPPORT_RAW_INITRD=y
  CONFIG_USE_BOOTARGS=y
diff --git a/configs/r8a77980_condor_defconfig b/configs/r8a77980_condor_defconfig

index b5ec2e9c0479a383bb017f9f661e1272b9fc2eca..88901ec46c082a95402598b779854b7c0f16ba4e 100644 (file)
--- a/configs/r8a77980_condor_defconfig
+++ b/configs/r8a77980_condor_defconfig
@@ -12,8 +12,8 @@ CONFIG_DEFAULT_DEVICE_TREE="r8a77980-condor-u-boot"
  CONFIG_SPL_TEXT_BASE=0xe6318000
  CONFIG_RCAR_GEN3=y
  CONFIG_TARGET_CONDOR=y
-CONFIG_REMAKE_ELF=y
  CONFIG_SYS_LOAD_ADDR=0x58000000
+CONFIG_REMAKE_ELF=y
  CONFIG_FIT=y
  CONFIG_SUPPORT_RAW_INITRD=y
  CONFIG_USE_BOOTARGS=y
diff --git a/configs/r8a77990_ebisu_defconfig b/configs/r8a77990_ebisu_defconfig

index 94a59ad82182dccb17764f4b77ac9e465bf69f23..13422a10be27c31a153a83cb0ee683bfb5aacb16 100644 (file)
--- a/configs/r8a77990_ebisu_defconfig
+++ b/configs/r8a77990_ebisu_defconfig
@@ -11,8 +11,8 @@ CONFIG_DEFAULT_DEVICE_TREE="r8a77990-ebisu-u-boot"
  CONFIG_SPL_TEXT_BASE=0xe6318000
  CONFIG_RCAR_GEN3=y
  CONFIG_TARGET_EBISU=y
-CONFIG_REMAKE_ELF=y
  CONFIG_SYS_LOAD_ADDR=0x58000000
+CONFIG_REMAKE_ELF=y
  CONFIG_FIT=y
  CONFIG_SUPPORT_RAW_INITRD=y
  CONFIG_SYS_MONITOR_BASE=0x00000000
diff --git a/configs/r8a77995_draak_defconfig b/configs/r8a77995_draak_defconfig

index c4c743e67757052733306bddd5bdaa43bc9ca3a2..640f303bffd2cc8f1e662c3a471b1b4a7ca3ea7e 100644 (file)
--- a/configs/r8a77995_draak_defconfig
+++ b/configs/r8a77995_draak_defconfig
@@ -11,8 +11,8 @@ CONFIG_DEFAULT_DEVICE_TREE="r8a77995-draak-u-boot"
  CONFIG_SPL_TEXT_BASE=0xe6318000
  CONFIG_RCAR_GEN3=y
  CONFIG_TARGET_DRAAK=y
-CONFIG_REMAKE_ELF=y
  CONFIG_SYS_LOAD_ADDR=0x58000000
+CONFIG_REMAKE_ELF=y
  CONFIG_FIT=y
  CONFIG_SUPPORT_RAW_INITRD=y
  CONFIG_SYS_MONITOR_BASE=0x00000000
diff --git a/configs/r8a779a0_falcon_defconfig b/configs/r8a779a0_falcon_defconfig

index c1685aa8c2a241dc56c2b8d520b62cf53080e56c..c3f56e4b1a0911fede2abd97976277b38fe9dc19 100644 (file)
--- a/configs/r8a779a0_falcon_defconfig
+++ b/configs/r8a779a0_falcon_defconfig
@@ -14,8 +14,8 @@ CONFIG_TARGET_FALCON=y
  CONFIG_SYS_CLK_FREQ=16666666
  # CONFIG_PSCI_RESET is not set
  CONFIG_ARMV8_PSCI=y
-CONFIG_REMAKE_ELF=y
  CONFIG_SYS_LOAD_ADDR=0x58000000
+CONFIG_REMAKE_ELF=y
  CONFIG_FIT=y
  CONFIG_SUPPORT_RAW_INITRD=y
  CONFIG_USE_BOOTARGS=y
diff --git a/configs/radxa-zero_defconfig b/configs/radxa-zero_defconfig

index 6851101fcb719e6978e38eca9ccacff4d5e74fbe..5e845600b46819976f75f228cb5299eb343d36f3 100644 (file)
--- a/configs/radxa-zero_defconfig
+++ b/configs/radxa-zero_defconfig
@@ -9,9 +9,9 @@ CONFIG_MESON_G12A=y
  CONFIG_DEBUG_UART_BASE=0xff803000
  CONFIG_DEBUG_UART_CLOCK=24000000
  CONFIG_IDENT_STRING=" radxa-zero"
+CONFIG_SYS_LOAD_ADDR=0x1000000
  CONFIG_DEBUG_UART=y
  CONFIG_REMAKE_ELF=y
-CONFIG_SYS_LOAD_ADDR=0x1000000
  CONFIG_OF_BOARD_SETUP=y
  # CONFIG_DISPLAY_CPUINFO is not set
  CONFIG_MISC_INIT_R=y
diff --git a/configs/rastaban_defconfig b/configs/rastaban_defconfig

index 240304e3438ff1bc25308aad0050e9268f29d92c..362167c80d7112eadb03a4c2fc941143309fd66c 100644 (file)
--- a/configs/rastaban_defconfig
+++ b/configs/rastaban_defconfig
@@ -22,8 +22,8 @@ CONFIG_SPL_FS_FAT=y
  CONFIG_SPL_LIBDISK_SUPPORT=y
  CONFIG_SPL_SPI_FLASH_SUPPORT=y
  CONFIG_SPL_SPI=y
-CONFIG_ENV_VARS_UBOOT_CONFIG=y
  CONFIG_SYS_LOAD_ADDR=0x81000000
+CONFIG_ENV_VARS_UBOOT_CONFIG=y
  CONFIG_BOOTDELAY=3
  CONFIG_AUTOBOOT_KEYED=y
  CONFIG_AUTOBOOT_PROMPT="Autobooting in %d seconds, press \"<Esc><Esc>\" to stop\n"
diff --git a/configs/rcar3_salvator-x_defconfig b/configs/rcar3_salvator-x_defconfig

index 4c1320d6a7181ab1121f19ce5810846684641361..b6b63829fe2050b354dbae684985ce015148b5f4 100644 (file)
--- a/configs/rcar3_salvator-x_defconfig
+++ b/configs/rcar3_salvator-x_defconfig
@@ -9,8 +9,8 @@ CONFIG_DEFAULT_DEVICE_TREE="r8a77950-salvator-x-u-boot"
  CONFIG_SPL_TEXT_BASE=0xe6338000
  CONFIG_RCAR_GEN3=y
  CONFIG_TARGET_SALVATOR_X=y
-CONFIG_REMAKE_ELF=y
  CONFIG_SYS_LOAD_ADDR=0x58000000
+CONFIG_REMAKE_ELF=y
  CONFIG_FIT=y
  CONFIG_SUPPORT_RAW_INITRD=y
  CONFIG_SYS_MONITOR_BASE=0x00000000
diff --git a/configs/rcar3_ulcb_defconfig b/configs/rcar3_ulcb_defconfig

index f5eff5fed9b04033fe0f20a751833da9402c465f..85a2e48f96e50b8b6137340116a1886b7994e2a2 100644 (file)
--- a/configs/rcar3_ulcb_defconfig
+++ b/configs/rcar3_ulcb_defconfig
@@ -11,8 +11,8 @@ CONFIG_DEFAULT_DEVICE_TREE="r8a77950-ulcb-u-boot"
  CONFIG_SPL_TEXT_BASE=0xe6338000
  CONFIG_RCAR_GEN3=y
  CONFIG_TARGET_ULCB=y
-CONFIG_REMAKE_ELF=y
  CONFIG_SYS_LOAD_ADDR=0x58000000
+CONFIG_REMAKE_ELF=y
  CONFIG_FIT=y
  CONFIG_SUPPORT_RAW_INITRD=y
  CONFIG_SYS_MONITOR_BASE=0x00000000
diff --git a/configs/roc-cc-rk3308_defconfig b/configs/roc-cc-rk3308_defconfig

index 94492648f553fdb6d5aa22ff32d6de6e8b17ecc0..5bc691d167b334cae1d480e3b2e7d56fd06fd7d5 100644 (file)
--- a/configs/roc-cc-rk3308_defconfig
+++ b/configs/roc-cc-rk3308_defconfig
@@ -13,8 +13,8 @@ CONFIG_TARGET_ROC_RK3308_CC=y
  CONFIG_SPL_STACK_R_ADDR=0xc00000
  CONFIG_DEBUG_UART_BASE=0xFF0C0000
  CONFIG_DEBUG_UART_CLOCK=24000000
-CONFIG_DEBUG_UART=y
  CONFIG_SYS_LOAD_ADDR=0xc00800
+CONFIG_DEBUG_UART=y
  CONFIG_ANDROID_BOOT_IMAGE=y
  CONFIG_FIT=y
  CONFIG_FIT_VERBOSE=y
diff --git a/configs/roc-cc-rk3328_defconfig b/configs/roc-cc-rk3328_defconfig

index e3e40a6d64c0453799e5657f43f623b6b914e050..a60731d5466aad04a278c6c13bb867f4d580e76e 100644 (file)
--- a/configs/roc-cc-rk3328_defconfig
+++ b/configs/roc-cc-rk3328_defconfig
@@ -14,9 +14,9 @@ CONFIG_SPL_DRIVERS_MISC=y
  CONFIG_SPL_STACK_R_ADDR=0x600000
  CONFIG_DEBUG_UART_BASE=0xFF130000
  CONFIG_DEBUG_UART_CLOCK=24000000
+CONFIG_SYS_LOAD_ADDR=0x800800
  CONFIG_DEBUG_UART=y
  CONFIG_TPL_SYS_MALLOC_F_LEN=0x800
-CONFIG_SYS_LOAD_ADDR=0x800800
  # CONFIG_ANDROID_BOOT_IMAGE is not set
  CONFIG_FIT=y
  CONFIG_FIT_VERBOSE=y
diff --git a/configs/roc-pc-mezzanine-rk3399_defconfig b/configs/roc-pc-mezzanine-rk3399_defconfig

index b79200fd3b51c47f661fddaacc9da98732acfc95..569c5dc34f22eed481f285db558eab2fcaee639c 100644 (file)
--- a/configs/roc-pc-mezzanine-rk3399_defconfig
+++ b/configs/roc-pc-mezzanine-rk3399_defconfig
@@ -14,8 +14,8 @@ CONFIG_DEBUG_UART_BASE=0xFF1A0000
  CONFIG_DEBUG_UART_CLOCK=24000000
  CONFIG_SPL_SPI_FLASH_SUPPORT=y
  CONFIG_SPL_SPI=y
-CONFIG_DEBUG_UART=y
  CONFIG_SYS_LOAD_ADDR=0x800800
+CONFIG_DEBUG_UART=y
  # CONFIG_ANDROID_BOOT_IMAGE is not set
  CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-roc-pc-mezzanine.dtb"
  CONFIG_DISPLAY_BOARDINFO_LATE=y
diff --git a/configs/roc-pc-rk3399_defconfig b/configs/roc-pc-rk3399_defconfig

index de35a62da9181f85b4c31530d1d931be1ea42d4c..1ea9a9ad4017e2d4efd0579fa3efdbf5e7f82a8d 100644 (file)
--- a/configs/roc-pc-rk3399_defconfig
+++ b/configs/roc-pc-rk3399_defconfig
@@ -14,8 +14,8 @@ CONFIG_DEBUG_UART_BASE=0xFF1A0000
  CONFIG_DEBUG_UART_CLOCK=24000000
  CONFIG_SPL_SPI_FLASH_SUPPORT=y
  CONFIG_SPL_SPI=y
-CONFIG_DEBUG_UART=y
  CONFIG_SYS_LOAD_ADDR=0x800800
+CONFIG_DEBUG_UART=y
  # CONFIG_ANDROID_BOOT_IMAGE is not set
  CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-roc-pc.dtb"
  CONFIG_DISPLAY_BOARDINFO_LATE=y
diff --git a/configs/rock-pi-4-rk3399_defconfig b/configs/rock-pi-4-rk3399_defconfig

index 4f15627d59c8b64fc0fb4d5e01f5ca11152f57c7..1099aad5dd4192f379c8e9044fcfaa17755f61b2 100644 (file)
--- a/configs/rock-pi-4-rk3399_defconfig
+++ b/configs/rock-pi-4-rk3399_defconfig
@@ -9,8 +9,8 @@ CONFIG_ROCKCHIP_RK3399=y
  CONFIG_TARGET_EVB_RK3399=y
  CONFIG_DEBUG_UART_BASE=0xFF1A0000
  CONFIG_DEBUG_UART_CLOCK=24000000
-CONFIG_DEBUG_UART=y
  CONFIG_SYS_LOAD_ADDR=0x800800
+CONFIG_DEBUG_UART=y
  # CONFIG_ANDROID_BOOT_IMAGE is not set
  CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-rock-pi-4b.dtb"
  CONFIG_DISPLAY_BOARDINFO_LATE=y
diff --git a/configs/rock-pi-4c-rk3399_defconfig b/configs/rock-pi-4c-rk3399_defconfig

index 0381a1ca3f5a75ad8192a2cad8241cba3a802dfa..ae4aec22ab693c86ce5ce40b9c5d0f30a93c2c40 100644 (file)
--- a/configs/rock-pi-4c-rk3399_defconfig
+++ b/configs/rock-pi-4c-rk3399_defconfig
@@ -9,8 +9,8 @@ CONFIG_ROCKCHIP_RK3399=y
  CONFIG_TARGET_EVB_RK3399=y
  CONFIG_DEBUG_UART_BASE=0xFF1A0000
  CONFIG_DEBUG_UART_CLOCK=24000000
-CONFIG_DEBUG_UART=y
  CONFIG_SYS_LOAD_ADDR=0x800800
+CONFIG_DEBUG_UART=y
  # CONFIG_ANDROID_BOOT_IMAGE is not set
  CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-rock-pi-4c.dtb"
  CONFIG_DISPLAY_BOARDINFO_LATE=y
diff --git a/configs/rock-pi-e-rk3328_defconfig b/configs/rock-pi-e-rk3328_defconfig

index 520ad8aa883800f6cee4e112cd933e1d49d1c139..31581630baddff80750543f0d32853c0322c53ec 100644 (file)
--- a/configs/rock-pi-e-rk3328_defconfig
+++ b/configs/rock-pi-e-rk3328_defconfig
@@ -15,9 +15,9 @@ CONFIG_SPL_STACK_R_ADDR=0x4000000
  CONFIG_SPL_SYS_MALLOC_F_LEN=0x4000
  CONFIG_DEBUG_UART_BASE=0xFF130000
  CONFIG_DEBUG_UART_CLOCK=24000000
+CONFIG_SYS_LOAD_ADDR=0x800800
  CONFIG_DEBUG_UART=y
  CONFIG_TPL_SYS_MALLOC_F_LEN=0x800
-CONFIG_SYS_LOAD_ADDR=0x800800
  # CONFIG_ANDROID_BOOT_IMAGE is not set
  CONFIG_FIT=y
  CONFIG_FIT_VERBOSE=y
diff --git a/configs/rock-pi-n10-rk3399pro_defconfig b/configs/rock-pi-n10-rk3399pro_defconfig

index c066d9160ad65b0b07d835d95a31b8b6060b75c4..c205479b1fca2c60e23ef110889631a4efd5a9c4 100644 (file)
--- a/configs/rock-pi-n10-rk3399pro_defconfig
+++ b/configs/rock-pi-n10-rk3399pro_defconfig
@@ -10,8 +10,8 @@ CONFIG_ROCKCHIP_RK3399=y
  CONFIG_TARGET_EVB_RK3399=y
  CONFIG_DEBUG_UART_BASE=0xFF1A0000
  CONFIG_DEBUG_UART_CLOCK=24000000
-CONFIG_DEBUG_UART=y
  CONFIG_SYS_LOAD_ADDR=0x800800
+CONFIG_DEBUG_UART=y
  # CONFIG_ANDROID_BOOT_IMAGE is not set
  CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399pro-rock-pi-n10.dtb"
  # CONFIG_CONSOLE_MUX is not set
diff --git a/configs/rock-pi-n8-rk3288_defconfig b/configs/rock-pi-n8-rk3288_defconfig

index ab29c5b4bd9a29dcb1eab7ef1fc0a49802570cb9..6c8300bd0ebacc830b65c92565116f330af1b8df 100644 (file)
--- a/configs/rock-pi-n8-rk3288_defconfig
+++ b/configs/rock-pi-n8-rk3288_defconfig
@@ -14,8 +14,8 @@ CONFIG_TARGET_EVB_RK3288=y
  CONFIG_SPL_STACK_R_ADDR=0x80000
  CONFIG_DEBUG_UART_BASE=0xff690000
  CONFIG_DEBUG_UART_CLOCK=24000000
-CONFIG_DEBUG_UART=y
  CONFIG_SYS_LOAD_ADDR=0x800800
+CONFIG_DEBUG_UART=y
  # CONFIG_ANDROID_BOOT_IMAGE is not set
  CONFIG_USE_PREBOOT=y
  CONFIG_SILENT_CONSOLE=y
diff --git a/configs/rock2_defconfig b/configs/rock2_defconfig

index b97aa6b02f330a9624461d752583387e3476b648..03d9c87ff3843d86c922f80b491c6be73939495b 100644 (file)
--- a/configs/rock2_defconfig
+++ b/configs/rock2_defconfig
@@ -13,8 +13,8 @@ CONFIG_TARGET_ROCK2=y
  CONFIG_SPL_STACK_R_ADDR=0x80000
  CONFIG_DEBUG_UART_BASE=0xff690000
  CONFIG_DEBUG_UART_CLOCK=24000000
-CONFIG_DEBUG_UART=y
  CONFIG_SYS_LOAD_ADDR=0x800800
+CONFIG_DEBUG_UART=y
  # CONFIG_ANDROID_BOOT_IMAGE is not set
  CONFIG_USE_PREBOOT=y
  CONFIG_DEFAULT_FDT_FILE="rk3288-rock2-square.dtb"
diff --git a/configs/rock64-rk3328_defconfig b/configs/rock64-rk3328_defconfig

index 38b91569c23d216ac6945fa7d35a125648ed1660..6704946c16c0a07b887da83f446bfdc1b1edc707 100644 (file)
--- a/configs/rock64-rk3328_defconfig
+++ b/configs/rock64-rk3328_defconfig
@@ -14,9 +14,9 @@ CONFIG_SPL_DRIVERS_MISC=y
  CONFIG_SPL_STACK_R_ADDR=0x600000
  CONFIG_DEBUG_UART_BASE=0xFF130000
  CONFIG_DEBUG_UART_CLOCK=24000000
+CONFIG_SYS_LOAD_ADDR=0x800800
  CONFIG_DEBUG_UART=y
  CONFIG_TPL_SYS_MALLOC_F_LEN=0x800
-CONFIG_SYS_LOAD_ADDR=0x800800
  # CONFIG_ANDROID_BOOT_IMAGE is not set
  CONFIG_FIT=y
  CONFIG_FIT_VERBOSE=y
diff --git a/configs/rock960-rk3399_defconfig b/configs/rock960-rk3399_defconfig

index d95da518912825249ab47522a8d90347d0c9a41c..1e45d82c60e980668bbda9374edf6ffa399992c5 100644 (file)
--- a/configs/rock960-rk3399_defconfig
+++ b/configs/rock960-rk3399_defconfig
@@ -8,8 +8,8 @@ CONFIG_ROCKCHIP_RK3399=y
  CONFIG_TARGET_ROCK960_RK3399=y
  CONFIG_DEBUG_UART_BASE=0xFF1A0000
  CONFIG_DEBUG_UART_CLOCK=24000000
-CONFIG_DEBUG_UART=y
  CONFIG_SYS_LOAD_ADDR=0x800800
+CONFIG_DEBUG_UART=y
  CONFIG_USE_PREBOOT=y
  CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-rock960.dtb"
  CONFIG_DISPLAY_BOARDINFO_LATE=y
diff --git a/configs/rock_defconfig b/configs/rock_defconfig

index 46df66994b3e2e3f5b69b7c156ac74c75443f2ab..290f5afd7874162a60db9dedcfcd6b29b7450c2c 100644 (file)
--- a/configs/rock_defconfig
+++ b/configs/rock_defconfig
@@ -15,8 +15,8 @@ CONFIG_TARGET_ROCK=y
  CONFIG_SPL_STACK_R_ADDR=0x60080000
  CONFIG_DEBUG_UART_BASE=0x20064000
  CONFIG_DEBUG_UART_CLOCK=24000000
-CONFIG_DEBUG_UART=y
  CONFIG_SYS_LOAD_ADDR=0x60800800
+CONFIG_DEBUG_UART=y
  CONFIG_USE_PREBOOT=y
  CONFIG_DEFAULT_FDT_FILE="rk3188-radxarock.dtb"
  # CONFIG_DISPLAY_CPUINFO is not set
diff --git a/configs/rockpro64-rk3399_defconfig b/configs/rockpro64-rk3399_defconfig

index d5e98a4f73d4437517f73460cb6e0481cccf4698..dc9f5f2ac6646f7ac1f5822fdc3a45ba664af629 100644 (file)
--- a/configs/rockpro64-rk3399_defconfig
+++ b/configs/rockpro64-rk3399_defconfig
@@ -12,8 +12,8 @@ CONFIG_DEBUG_UART_BASE=0xFF1A0000
  CONFIG_DEBUG_UART_CLOCK=24000000
  CONFIG_SPL_SPI_FLASH_SUPPORT=y
  CONFIG_SPL_SPI=y
-CONFIG_DEBUG_UART=y
  CONFIG_SYS_LOAD_ADDR=0x800800
+CONFIG_DEBUG_UART=y
  CONFIG_USE_PREBOOT=y
  CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-rockpro64.dtb"
  CONFIG_DISPLAY_BOARDINFO_LATE=y
diff --git a/configs/rpi_0_w_defconfig b/configs/rpi_0_w_defconfig

index a46c68d3c0057b68b56ec50739dedce124daac54..a59ae3b46524e4feb54734c3145015e43fdbc0e9 100644 (file)
--- a/configs/rpi_0_w_defconfig
+++ b/configs/rpi_0_w_defconfig
@@ -6,8 +6,8 @@ CONFIG_TARGET_RPI_0_W=y
  CONFIG_NR_DRAM_BANKS=1
  CONFIG_ENV_SIZE=0x4000
  CONFIG_DEFAULT_DEVICE_TREE="bcm2835-rpi-zero-w"
-CONFIG_DISTRO_DEFAULTS=y
  CONFIG_SYS_LOAD_ADDR=0x1000000
+CONFIG_DISTRO_DEFAULTS=y
  CONFIG_OF_BOARD_SETUP=y
  CONFIG_USE_PREBOOT=y
  # CONFIG_DISPLAY_CPUINFO is not set
diff --git a/configs/rpi_2_defconfig b/configs/rpi_2_defconfig

index a45999b15e0ab8b92f898b66e64e8477bce84bf3..86630176762e8a7ca7824416e64a95de1f09dbd2 100644 (file)
--- a/configs/rpi_2_defconfig
+++ b/configs/rpi_2_defconfig
@@ -7,8 +7,8 @@ CONFIG_TARGET_RPI_2=y
  CONFIG_NR_DRAM_BANKS=1
  CONFIG_ENV_SIZE=0x4000
  CONFIG_DEFAULT_DEVICE_TREE="bcm2836-rpi-2-b"
-CONFIG_DISTRO_DEFAULTS=y
  CONFIG_SYS_LOAD_ADDR=0x1000000
+CONFIG_DISTRO_DEFAULTS=y
  CONFIG_OF_BOARD_SETUP=y
  CONFIG_USE_PREBOOT=y
  # CONFIG_DISPLAY_CPUINFO is not set
diff --git a/configs/rpi_3_32b_defconfig b/configs/rpi_3_32b_defconfig

index 5ae1bd04d9ca775120212b285836410b48f191a2..f9792373942ffb2816443778428aa7a8ff6dbf9c 100644 (file)
--- a/configs/rpi_3_32b_defconfig
+++ b/configs/rpi_3_32b_defconfig
@@ -8,8 +8,8 @@ CONFIG_TARGET_RPI_3_32B=y
  CONFIG_NR_DRAM_BANKS=1
  CONFIG_ENV_SIZE=0x4000
  CONFIG_DEFAULT_DEVICE_TREE="bcm2837-rpi-3-b"
-CONFIG_DISTRO_DEFAULTS=y
  CONFIG_SYS_LOAD_ADDR=0x1000000
+CONFIG_DISTRO_DEFAULTS=y
  CONFIG_OF_BOARD_SETUP=y
  CONFIG_USE_PREBOOT=y
  # CONFIG_DISPLAY_CPUINFO is not set
diff --git a/configs/rpi_3_b_plus_defconfig b/configs/rpi_3_b_plus_defconfig

index 607305841d92f3d96ddba08ca19eea22ac5d672e..94b287b990d6ec560fdd7f3f50cd2d53397fe30b 100644 (file)
--- a/configs/rpi_3_b_plus_defconfig
+++ b/configs/rpi_3_b_plus_defconfig
@@ -7,8 +7,8 @@ CONFIG_TARGET_RPI_3=y
  CONFIG_NR_DRAM_BANKS=1
  CONFIG_ENV_SIZE=0x4000
  CONFIG_DEFAULT_DEVICE_TREE="bcm2837-rpi-3-b-plus"
-CONFIG_DISTRO_DEFAULTS=y
  CONFIG_SYS_LOAD_ADDR=0x1000000
+CONFIG_DISTRO_DEFAULTS=y
  CONFIG_OF_BOARD_SETUP=y
  CONFIG_USE_PREBOOT=y
  # CONFIG_DISPLAY_CPUINFO is not set
diff --git a/configs/rpi_3_defconfig b/configs/rpi_3_defconfig

index 58af5de0ff129c3886f9b2a8daa0de5291ae03e8..28f7786e94ec7413a12e789cc1a9e9a32bb817c7 100644 (file)
--- a/configs/rpi_3_defconfig
+++ b/configs/rpi_3_defconfig
@@ -7,8 +7,8 @@ CONFIG_TARGET_RPI_3=y
  CONFIG_NR_DRAM_BANKS=1
  CONFIG_ENV_SIZE=0x4000
  CONFIG_DEFAULT_DEVICE_TREE="bcm2837-rpi-3-b"
-CONFIG_DISTRO_DEFAULTS=y
  CONFIG_SYS_LOAD_ADDR=0x1000000
+CONFIG_DISTRO_DEFAULTS=y
  CONFIG_OF_BOARD_SETUP=y
  CONFIG_USE_PREBOOT=y
  # CONFIG_DISPLAY_CPUINFO is not set
diff --git a/configs/rpi_4_32b_defconfig b/configs/rpi_4_32b_defconfig

index 3eb57c4ffcb363d71ee508c290d14c19250f6983..4d3a92d22cee6d53fd4e4f17977c689c344ee005 100644 (file)
--- a/configs/rpi_4_32b_defconfig
+++ b/configs/rpi_4_32b_defconfig
@@ -5,8 +5,8 @@ CONFIG_SYS_MALLOC_F_LEN=0x2000
  CONFIG_TARGET_RPI_4_32B=y
  CONFIG_ENV_SIZE=0x4000
  CONFIG_DEFAULT_DEVICE_TREE="bcm2711-rpi-4-b"
-CONFIG_DISTRO_DEFAULTS=y
  CONFIG_SYS_LOAD_ADDR=0x1000000
+CONFIG_DISTRO_DEFAULTS=y
  CONFIG_OF_BOARD_SETUP=y
  CONFIG_USE_PREBOOT=y
  CONFIG_PREBOOT="pci enum; usb start;"
diff --git a/configs/rpi_4_defconfig b/configs/rpi_4_defconfig

index 59472d7710250f0d0886764e354d5662798de82d..67c14ffd6669b5d247f46a216db0971bfc6edd92 100644 (file)
--- a/configs/rpi_4_defconfig
+++ b/configs/rpi_4_defconfig
@@ -5,8 +5,8 @@ CONFIG_SYS_MALLOC_F_LEN=0x2000
  CONFIG_TARGET_RPI_4=y
  CONFIG_ENV_SIZE=0x4000
  CONFIG_DEFAULT_DEVICE_TREE="bcm2711-rpi-4-b"
-CONFIG_DISTRO_DEFAULTS=y
  CONFIG_SYS_LOAD_ADDR=0x1000000
+CONFIG_DISTRO_DEFAULTS=y
  CONFIG_OF_BOARD_SETUP=y
  CONFIG_USE_PREBOOT=y
  CONFIG_PREBOOT="pci enum; usb start;"
diff --git a/configs/rpi_arm64_defconfig b/configs/rpi_arm64_defconfig

index 639a3a8a3c2b9b581d54a91376a48cf7474ed05f..e6f6044a3760f1e5df4c717daf27257b94d64ba6 100644 (file)
--- a/configs/rpi_arm64_defconfig
+++ b/configs/rpi_arm64_defconfig
@@ -5,8 +5,8 @@ CONFIG_SYS_MALLOC_F_LEN=0x2000
  CONFIG_TARGET_RPI_ARM64=y
  CONFIG_ENV_SIZE=0x4000
  CONFIG_DEFAULT_DEVICE_TREE="bcm2711-rpi-4-b"
-CONFIG_DISTRO_DEFAULTS=y
  CONFIG_SYS_LOAD_ADDR=0x1000000
+CONFIG_DISTRO_DEFAULTS=y
  CONFIG_OF_BOARD_SETUP=y
  CONFIG_USE_PREBOOT=y
  CONFIG_PREBOOT="pci enum; usb start;"
diff --git a/configs/rpi_defconfig b/configs/rpi_defconfig

index 66c82024b1d934871482113be914808622bab812..e663c8e9c123f1032dc6be2e1b1c17549ab89e59 100644 (file)
--- a/configs/rpi_defconfig
+++ b/configs/rpi_defconfig
@@ -6,8 +6,8 @@ CONFIG_TARGET_RPI=y
  CONFIG_NR_DRAM_BANKS=1
  CONFIG_ENV_SIZE=0x4000
  CONFIG_DEFAULT_DEVICE_TREE="bcm2835-rpi-b"
-CONFIG_DISTRO_DEFAULTS=y
  CONFIG_SYS_LOAD_ADDR=0x1000000
+CONFIG_DISTRO_DEFAULTS=y
  CONFIG_OF_BOARD_SETUP=y
  CONFIG_USE_PREBOOT=y
  # CONFIG_DISPLAY_CPUINFO is not set
diff --git a/configs/rut_defconfig b/configs/rut_defconfig

index c3f8dd4b084ba579a1e0562c1e2141c99a3806eb..0a9a4b78057b4f2b4ee9196d9ba5f1be64972ddb 100644 (file)
--- a/configs/rut_defconfig
+++ b/configs/rut_defconfig
@@ -21,8 +21,8 @@ CONFIG_SPL_FS_FAT=y
  CONFIG_SPL_LIBDISK_SUPPORT=y
  CONFIG_SPL_SPI_FLASH_SUPPORT=y
  CONFIG_SPL_SPI=y
-CONFIG_ENV_VARS_UBOOT_CONFIG=y
  CONFIG_SYS_LOAD_ADDR=0x81000000
+CONFIG_ENV_VARS_UBOOT_CONFIG=y
  CONFIG_BOOTDELAY=3
  CONFIG_AUTOBOOT_KEYED=y
  CONFIG_AUTOBOOT_PROMPT="Autobooting in %d seconds, press \"<Esc><Esc>\" to stop\n"
diff --git a/configs/rzg2_beacon_defconfig b/configs/rzg2_beacon_defconfig

index 5babd4898ab40672b71c8d37061e237b42220d91..6c8a94a06bceb57482bdb14ffa88929dd1db1dd2 100644 (file)
--- a/configs/rzg2_beacon_defconfig
+++ b/configs/rzg2_beacon_defconfig
@@ -9,9 +9,9 @@ CONFIG_DEFAULT_DEVICE_TREE="r8a774a1-beacon-rzg2m-kit"
  CONFIG_RCAR_GEN3=y
  CONFIG_TARGET_BEACON_RZG2M=y
  # CONFIG_SPL is not set
+CONFIG_SYS_LOAD_ADDR=0x58000000
  CONFIG_LTO=y
  CONFIG_REMAKE_ELF=y
-CONFIG_SYS_LOAD_ADDR=0x58000000
  CONFIG_FIT=y
  CONFIG_SUPPORT_RAW_INITRD=y
  # CONFIG_ARCH_FIXUP_FDT_MEMORY is not set
diff --git a/configs/s400_defconfig b/configs/s400_defconfig

index 56caf0193100cf47307ab1c3348334f976ef82bf..1cebca67793ff92d5f46c7dd6ab0f98d6f0c12fe 100644 (file)
--- a/configs/s400_defconfig
+++ b/configs/s400_defconfig
@@ -9,9 +9,9 @@ CONFIG_MESON_AXG=y
  CONFIG_DEBUG_UART_BASE=0xff803000
  CONFIG_DEBUG_UART_CLOCK=24000000
  CONFIG_IDENT_STRING=" s400"
+CONFIG_SYS_LOAD_ADDR=0x1000000
  CONFIG_DEBUG_UART=y
  CONFIG_REMAKE_ELF=y
-CONFIG_SYS_LOAD_ADDR=0x1000000
  CONFIG_OF_BOARD_SETUP=y
  # CONFIG_DISPLAY_CPUINFO is not set
  CONFIG_MISC_INIT_R=y
diff --git a/configs/s5p4418_nanopi2_defconfig b/configs/s5p4418_nanopi2_defconfig

index c924fbf5c374076654333e086f176f0fddf6a086..a8a47b0f7f0180b555387f9d4b0079c7c88fd1d0 100644 (file)
--- a/configs/s5p4418_nanopi2_defconfig
+++ b/configs/s5p4418_nanopi2_defconfig
@@ -14,9 +14,9 @@ CONFIG_S5P4418_ONEWIRE=y
  CONFIG_ROOT_DEV=1
  CONFIG_BOOT_PART=1
  CONFIG_ROOT_PART=2
+CONFIG_SYS_LOAD_ADDR=0x71080000
  CONFIG_SYS_MEMTEST_START=0x71000000
  CONFIG_SYS_MEMTEST_END=0xb0000000
-CONFIG_SYS_LOAD_ADDR=0x71080000
  CONFIG_FIT=y
  CONFIG_FIT_BEST_MATCH=y
  CONFIG_SUPPORT_RAW_INITRD=y
diff --git a/configs/s5p_goni_defconfig b/configs/s5p_goni_defconfig

index 80f693e35e817eacaf606f1460c3f28bedb605dc..a8f20fc001c8ee7e9054d983c2e65d5b677e14d3 100644 (file)
--- a/configs/s5p_goni_defconfig
+++ b/configs/s5p_goni_defconfig
@@ -8,8 +8,8 @@ CONFIG_ENV_SIZE=0x1000
  CONFIG_ENV_OFFSET=0x7000
  CONFIG_DEFAULT_DEVICE_TREE="s5pc1xx-goni"
  CONFIG_TARGET_S5P_GONI=y
-CONFIG_ENV_VARS_UBOOT_CONFIG=y
  CONFIG_SYS_LOAD_ADDR=0x34000000
+CONFIG_ENV_VARS_UBOOT_CONFIG=y
  # CONFIG_AUTOBOOT is not set
  CONFIG_USE_BOOTARGS=y
  CONFIG_BOOTARGS="root=/dev/mtdblock8 rootfstype=ext4 ${console} ${meminfo} ${mtdparts}"
diff --git a/configs/s5pc210_universal_defconfig b/configs/s5pc210_universal_defconfig

index 3c0c7b53547bd5018133a129ef1a10616596b84e..8a34908e85cc12e70992928e05ae2e49cd118f2a 100644 (file)
--- a/configs/s5pc210_universal_defconfig
+++ b/configs/s5pc210_universal_defconfig
@@ -11,8 +11,8 @@ CONFIG_NR_DRAM_BANKS=2
  CONFIG_ENV_SIZE=0x1000
  CONFIG_ENV_OFFSET=0x7000
  CONFIG_DEFAULT_DEVICE_TREE="exynos4210-universal_c210"
-CONFIG_DISTRO_DEFAULTS=y
  CONFIG_SYS_LOAD_ADDR=0x44800000
+CONFIG_DISTRO_DEFAULTS=y
  CONFIG_USE_BOOTARGS=y
  CONFIG_BOOTARGS="Please use defined boot"
  CONFIG_BOOTCOMMAND="run mmcboot"
diff --git a/configs/sagem_f@st1704_ram_defconfig b/configs/sagem_f@st1704_ram_defconfig

index 9ac5dbaae14c3589f67d02e42a82c3674ef6bb93..c06ff632b4051cd454c489eb299ff9fc1785f2f0 100644 (file)
--- a/configs/sagem_f@st1704_ram_defconfig
+++ b/configs/sagem_f@st1704_ram_defconfig
@@ -5,6 +5,7 @@ CONFIG_NR_DRAM_BANKS=1
  CONFIG_ENV_SIZE=0x2000
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="sagem,f@st1704"
+CONFIG_SYS_LOAD_ADDR=0x80100000
  CONFIG_ARCH_BMIPS=y
  CONFIG_SOC_BMIPS_BCM6338=y
  CONFIG_MIPS_CACHE_SETUP=y
@@ -13,7 +14,6 @@ CONFIG_MIPS_CACHE_DISABLE=y
  # CONFIG_MIPS_BOOT_ENV_LEGACY is not set
  CONFIG_MIPS_BOOT_FDT=y
  # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
-CONFIG_SYS_LOAD_ADDR=0x80100000
  CONFIG_OF_STDOUT_VIA_ALIAS=y
  CONFIG_DISPLAY_CPUINFO=y
  CONFIG_HUSH_PARSER=y
diff --git a/configs/sam9x60ek_mmc_defconfig b/configs/sam9x60ek_mmc_defconfig

index 238397f0ac9d70dfe723a6a4b6d990de04f2e6de..17ba0905f87a296c8d6b8da2a0265a5f08753970 100644 (file)
--- a/configs/sam9x60ek_mmc_defconfig
+++ b/configs/sam9x60ek_mmc_defconfig
@@ -13,8 +13,8 @@ CONFIG_DEFAULT_DEVICE_TREE="sam9x60ek"
  CONFIG_DEBUG_UART_BOARD_INIT=y
  CONFIG_DEBUG_UART_BASE=0xfffff200
  CONFIG_DEBUG_UART_CLOCK=200000000
-CONFIG_DEBUG_UART=y
  CONFIG_SYS_LOAD_ADDR=0x22000000
+CONFIG_DEBUG_UART=y
  CONFIG_FIT=y
  CONFIG_SD_BOOT=y
  CONFIG_BOOTDELAY=3
diff --git a/configs/sam9x60ek_nandflash_defconfig b/configs/sam9x60ek_nandflash_defconfig

index 0d3e9d03880dfe7457035ba5cecb62886d5f6e5d..225ae6543633538ae984f8c1209126a41a71f9f8 100644 (file)
--- a/configs/sam9x60ek_nandflash_defconfig
+++ b/configs/sam9x60ek_nandflash_defconfig
@@ -13,8 +13,8 @@ CONFIG_DEBUG_UART_BOARD_INIT=y
  CONFIG_DEBUG_UART_BASE=0xfffff200
  CONFIG_DEBUG_UART_CLOCK=200000000
  CONFIG_ENV_OFFSET_REDUND=0x100000
-CONFIG_DEBUG_UART=y
  CONFIG_SYS_LOAD_ADDR=0x22000000
+CONFIG_DEBUG_UART=y
  CONFIG_FIT=y
  CONFIG_NAND_BOOT=y
  CONFIG_BOOTDELAY=3
diff --git a/configs/sam9x60ek_qspiflash_defconfig b/configs/sam9x60ek_qspiflash_defconfig

index b0f74e61c35b6d0ab544d2a3c07503178f0a7454..fb20216e150bb53899ee6312788c40a8a991120f 100644 (file)
--- a/configs/sam9x60ek_qspiflash_defconfig
+++ b/configs/sam9x60ek_qspiflash_defconfig
@@ -13,9 +13,9 @@ CONFIG_DEFAULT_DEVICE_TREE="sam9x60ek"
  CONFIG_DEBUG_UART_BOARD_INIT=y
  CONFIG_DEBUG_UART_BASE=0xfffff200
  CONFIG_DEBUG_UART_CLOCK=200000000
+CONFIG_SYS_LOAD_ADDR=0x22000000
  CONFIG_DEBUG_UART=y
  CONFIG_ENV_VARS_UBOOT_CONFIG=y
-CONFIG_SYS_LOAD_ADDR=0x22000000
  CONFIG_FIT=y
  CONFIG_QSPI_BOOT=y
  CONFIG_BOOTDELAY=3
diff --git a/configs/sama5d27_giantboard_defconfig b/configs/sama5d27_giantboard_defconfig

index 7d25474260d34112e2f8bc7d676bf7fd09106669..7005fb7896540ebbe1caf89d5001f0e2911985cc 100644 (file)
--- a/configs/sama5d27_giantboard_defconfig
+++ b/configs/sama5d27_giantboard_defconfig
@@ -22,9 +22,9 @@ CONFIG_DEBUG_UART_BASE=0xf8020000
  CONFIG_DEBUG_UART_CLOCK=82000000
  CONFIG_SPL_FS_FAT=y
  CONFIG_SPL_LIBDISK_SUPPORT=y
+CONFIG_SYS_LOAD_ADDR=0x22000000
  CONFIG_DEBUG_UART=y
  CONFIG_ENV_VARS_UBOOT_CONFIG=y
-CONFIG_SYS_LOAD_ADDR=0x22000000
  CONFIG_FIT=y
  CONFIG_SD_BOOT=y
  CONFIG_BOOTDELAY=3
diff --git a/configs/sama5d27_som1_ek_mmc1_defconfig b/configs/sama5d27_som1_ek_mmc1_defconfig

index 1df7ae08976f393799565602c862f56f031dc9d1..aea92ff9218cefea17c116db0fdd15b75f333c0e 100644 (file)
--- a/configs/sama5d27_som1_ek_mmc1_defconfig
+++ b/configs/sama5d27_som1_ek_mmc1_defconfig
@@ -21,9 +21,9 @@ CONFIG_DEBUG_UART_BASE=0xf8020000
  CONFIG_DEBUG_UART_CLOCK=82000000
  CONFIG_SPL_FS_FAT=y
  CONFIG_SPL_LIBDISK_SUPPORT=y
+CONFIG_SYS_LOAD_ADDR=0x22000000
  CONFIG_DEBUG_UART=y
  CONFIG_ENV_VARS_UBOOT_CONFIG=y
-CONFIG_SYS_LOAD_ADDR=0x22000000
  CONFIG_FIT=y
  CONFIG_SD_BOOT=y
  CONFIG_BOOTDELAY=3
diff --git a/configs/sama5d27_som1_ek_mmc_defconfig b/configs/sama5d27_som1_ek_mmc_defconfig

index adb6580f192c3e8ac3abd831b0716edbe7537c80..df3da8bd2e32e42917342dc8d50d865c5a9830ee 100644 (file)
--- a/configs/sama5d27_som1_ek_mmc_defconfig
+++ b/configs/sama5d27_som1_ek_mmc_defconfig
@@ -22,9 +22,9 @@ CONFIG_DEBUG_UART_BASE=0xf8020000
  CONFIG_DEBUG_UART_CLOCK=82000000
  CONFIG_SPL_FS_FAT=y
  CONFIG_SPL_LIBDISK_SUPPORT=y
+CONFIG_SYS_LOAD_ADDR=0x22000000
  CONFIG_DEBUG_UART=y
  CONFIG_ENV_VARS_UBOOT_CONFIG=y
-CONFIG_SYS_LOAD_ADDR=0x22000000
  CONFIG_FIT=y
  CONFIG_SD_BOOT=y
  CONFIG_BOOTDELAY=3
diff --git a/configs/sama5d27_som1_ek_qspiflash_defconfig b/configs/sama5d27_som1_ek_qspiflash_defconfig

index cd5142521a0d7c1372ca843cd7e745771d6c5412..49cfc5ee4977724f59da01499ce18137cf6cc92e 100644 (file)
--- a/configs/sama5d27_som1_ek_qspiflash_defconfig
+++ b/configs/sama5d27_som1_ek_qspiflash_defconfig
@@ -22,9 +22,9 @@ CONFIG_DEBUG_UART_BASE=0xf8020000
  CONFIG_DEBUG_UART_CLOCK=82000000
  CONFIG_SPL_FS_FAT=y
  CONFIG_SPL_LIBDISK_SUPPORT=y
+CONFIG_SYS_LOAD_ADDR=0x22000000
  CONFIG_DEBUG_UART=y
  CONFIG_ENV_VARS_UBOOT_CONFIG=y
-CONFIG_SYS_LOAD_ADDR=0x22000000
  CONFIG_FIT=y
  CONFIG_QSPI_BOOT=y
  CONFIG_BOOTDELAY=3
diff --git a/configs/sama5d27_wlsom1_ek_mmc_defconfig b/configs/sama5d27_wlsom1_ek_mmc_defconfig

index 43be6fbeb3215d1686e2cf4efbb7b4b5a38bfe16..9046bcc8678bad10a8a49171008892658e8a72b9 100644 (file)
--- a/configs/sama5d27_wlsom1_ek_mmc_defconfig
+++ b/configs/sama5d27_wlsom1_ek_mmc_defconfig
@@ -20,9 +20,9 @@ CONFIG_DEBUG_UART_BASE=0xf801c000
  CONFIG_DEBUG_UART_CLOCK=82000000
  CONFIG_SPL_FS_FAT=y
  CONFIG_SPL_LIBDISK_SUPPORT=y
+CONFIG_SYS_LOAD_ADDR=0x22000000
  CONFIG_DEBUG_UART=y
  CONFIG_ENV_VARS_UBOOT_CONFIG=y
-CONFIG_SYS_LOAD_ADDR=0x22000000
  CONFIG_FIT=y
  CONFIG_SD_BOOT=y
  CONFIG_BOOTDELAY=3
diff --git a/configs/sama5d27_wlsom1_ek_qspiflash_defconfig b/configs/sama5d27_wlsom1_ek_qspiflash_defconfig

index 574a67e07ee66daf1051622d86c08467501007a5..d663d4b402dbcecf6c29d8c2b09b5ca2a088ed2b 100644 (file)
--- a/configs/sama5d27_wlsom1_ek_qspiflash_defconfig
+++ b/configs/sama5d27_wlsom1_ek_qspiflash_defconfig
@@ -20,9 +20,9 @@ CONFIG_DEBUG_UART_BASE=0xf801c000
  CONFIG_DEBUG_UART_CLOCK=82000000
  CONFIG_SPL_SPI_FLASH_SUPPORT=y
  CONFIG_SPL_SPI=y
+CONFIG_SYS_LOAD_ADDR=0x22000000
  CONFIG_DEBUG_UART=y
  CONFIG_ENV_VARS_UBOOT_CONFIG=y
-CONFIG_SYS_LOAD_ADDR=0x22000000
  CONFIG_FIT=y
  CONFIG_QSPI_BOOT=y
  CONFIG_SPI_BOOT=y
diff --git a/configs/sama5d2_icp_mmc_defconfig b/configs/sama5d2_icp_mmc_defconfig

index ef920090782389bb481dc0a71923ae239ae98c98..a9146dd519af06fdd02a5c7b2e0040d07e367146 100644 (file)
--- a/configs/sama5d2_icp_mmc_defconfig
+++ b/configs/sama5d2_icp_mmc_defconfig
@@ -20,9 +20,9 @@ CONFIG_DEBUG_UART_BASE=0xf801c000
  CONFIG_DEBUG_UART_CLOCK=83000000
  CONFIG_SPL_FS_FAT=y
  CONFIG_SPL_LIBDISK_SUPPORT=y
+CONFIG_SYS_LOAD_ADDR=0x22000000
  CONFIG_DEBUG_UART=y
  CONFIG_ENV_VARS_UBOOT_CONFIG=y
-CONFIG_SYS_LOAD_ADDR=0x22000000
  CONFIG_FIT=y
  CONFIG_SD_BOOT=y
  CONFIG_BOOTDELAY=3
diff --git a/configs/sama5d2_icp_qspiflash_defconfig b/configs/sama5d2_icp_qspiflash_defconfig

index 4a1efe2c1508cb49bcf667a8e66b879fd945e61a..047c948b1d9f87ceff0f8646563ae72e94f83574 100644 (file)
--- a/configs/sama5d2_icp_qspiflash_defconfig
+++ b/configs/sama5d2_icp_qspiflash_defconfig
@@ -10,13 +10,13 @@ CONFIG_DEFAULT_DEVICE_TREE="at91-sama5d2_icp"
  CONFIG_DEBUG_UART_BOARD_INIT=y
  CONFIG_DEBUG_UART_BASE=0xf801c000
  CONFIG_DEBUG_UART_CLOCK=83000000
+CONFIG_SYS_LOAD_ADDR=0x22000000
  CONFIG_DEBUG_UART=y
  CONFIG_SYS_MEMTEST_START=0x20000000
  CONFIG_SYS_MEMTEST_END=0x40000000
  CONFIG_ENV_VARS_UBOOT_CONFIG=y
  CONFIG_SYS_BOOT_GET_CMDLINE=y
  CONFIG_SYS_BOOT_GET_KBD=y
-CONFIG_SYS_LOAD_ADDR=0x22000000
  CONFIG_FIT=y
  CONFIG_QSPI_BOOT=y
  CONFIG_SD_BOOT=y
diff --git a/configs/sama5d2_ptc_ek_mmc_defconfig b/configs/sama5d2_ptc_ek_mmc_defconfig

index 1c5d750fe530135cdd72286992c2e01338f0dde7..7642f1a47bfb0861974e2be406d7d4cdc5311563 100644 (file)
--- a/configs/sama5d2_ptc_ek_mmc_defconfig
+++ b/configs/sama5d2_ptc_ek_mmc_defconfig
@@ -12,9 +12,9 @@ CONFIG_DEFAULT_DEVICE_TREE="at91-sama5d2_ptc_ek"
  CONFIG_DEBUG_UART_BOARD_INIT=y
  CONFIG_DEBUG_UART_BASE=0xf801c000
  CONFIG_DEBUG_UART_CLOCK=82000000
+CONFIG_SYS_LOAD_ADDR=0x22000000
  CONFIG_DEBUG_UART=y
  CONFIG_ENV_VARS_UBOOT_CONFIG=y
-CONFIG_SYS_LOAD_ADDR=0x22000000
  CONFIG_FIT=y
  CONFIG_SD_BOOT=y
  CONFIG_BOOTDELAY=3
diff --git a/configs/sama5d2_ptc_ek_nandflash_defconfig b/configs/sama5d2_ptc_ek_nandflash_defconfig

index 690361a0f1cc3d18e1966f33c4a2351269028d99..8fc3932848fe4ccd4f03501663465ae848d88617 100644 (file)
--- a/configs/sama5d2_ptc_ek_nandflash_defconfig
+++ b/configs/sama5d2_ptc_ek_nandflash_defconfig
@@ -12,9 +12,9 @@ CONFIG_DEBUG_UART_BOARD_INIT=y
  CONFIG_DEBUG_UART_BASE=0xf801c000
  CONFIG_DEBUG_UART_CLOCK=82000000
  CONFIG_ENV_OFFSET_REDUND=0x100000
+CONFIG_SYS_LOAD_ADDR=0x22000000
  CONFIG_DEBUG_UART=y
  CONFIG_ENV_VARS_UBOOT_CONFIG=y
-CONFIG_SYS_LOAD_ADDR=0x22000000
  CONFIG_FIT=y
  CONFIG_NAND_BOOT=y
  CONFIG_BOOTDELAY=3
diff --git a/configs/sama5d2_xplained_emmc_defconfig b/configs/sama5d2_xplained_emmc_defconfig

index ab54b8344731d720b94bbad250b92b3f331ecc20..b75be1f36bffad88180fb262fa14aeda33de4169 100644 (file)
--- a/configs/sama5d2_xplained_emmc_defconfig
+++ b/configs/sama5d2_xplained_emmc_defconfig
@@ -21,9 +21,9 @@ CONFIG_DEBUG_UART_BASE=0xf8020000
  CONFIG_DEBUG_UART_CLOCK=83000000
  CONFIG_SPL_FS_FAT=y
  CONFIG_SPL_LIBDISK_SUPPORT=y
+CONFIG_SYS_LOAD_ADDR=0x22000000
  CONFIG_DEBUG_UART=y
  CONFIG_ENV_VARS_UBOOT_CONFIG=y
-CONFIG_SYS_LOAD_ADDR=0x22000000
  CONFIG_FIT=y
  CONFIG_SD_BOOT=y
  CONFIG_BOOTDELAY=3
diff --git a/configs/sama5d2_xplained_mmc_defconfig b/configs/sama5d2_xplained_mmc_defconfig

index 17cdd46ae1a1c546a77b73f4d8531a29eb3c5def..da71dd87f7309e2031608e7f61309cc451d67304 100644 (file)
--- a/configs/sama5d2_xplained_mmc_defconfig
+++ b/configs/sama5d2_xplained_mmc_defconfig
@@ -22,9 +22,9 @@ CONFIG_DEBUG_UART_BASE=0xf8020000
  CONFIG_DEBUG_UART_CLOCK=83000000
  CONFIG_SPL_FS_FAT=y
  CONFIG_SPL_LIBDISK_SUPPORT=y
+CONFIG_SYS_LOAD_ADDR=0x22000000
  CONFIG_DEBUG_UART=y
  CONFIG_ENV_VARS_UBOOT_CONFIG=y
-CONFIG_SYS_LOAD_ADDR=0x22000000
  CONFIG_FIT=y
  CONFIG_SD_BOOT=y
  CONFIG_BOOTDELAY=3
diff --git a/configs/sama5d2_xplained_qspiflash_defconfig b/configs/sama5d2_xplained_qspiflash_defconfig

index a3854a5ea2f2945e474d058a15e7442b7ec3494f..68bca84bfb0833c192817a43549bf2a5141300b3 100644 (file)
--- a/configs/sama5d2_xplained_qspiflash_defconfig
+++ b/configs/sama5d2_xplained_qspiflash_defconfig
@@ -22,9 +22,9 @@ CONFIG_DEBUG_UART_BASE=0xf8020000
  CONFIG_DEBUG_UART_CLOCK=83000000
  CONFIG_SPL_FS_FAT=y
  CONFIG_SPL_LIBDISK_SUPPORT=y
+CONFIG_SYS_LOAD_ADDR=0x22000000
  CONFIG_DEBUG_UART=y
  CONFIG_ENV_VARS_UBOOT_CONFIG=y
-CONFIG_SYS_LOAD_ADDR=0x22000000
  CONFIG_FIT=y
  CONFIG_QSPI_BOOT=y
  CONFIG_SD_BOOT=y
diff --git a/configs/sama5d2_xplained_spiflash_defconfig b/configs/sama5d2_xplained_spiflash_defconfig

index bd3a70c954e939319f85aafd850082eb59d60ba7..372af35ee2dc7b22ff4de7a2c1a3f7dfe4627e1b 100644 (file)
--- a/configs/sama5d2_xplained_spiflash_defconfig
+++ b/configs/sama5d2_xplained_spiflash_defconfig
@@ -24,9 +24,9 @@ CONFIG_DEBUG_UART_BASE=0xf8020000
  CONFIG_DEBUG_UART_CLOCK=83000000
  CONFIG_SPL_SPI_FLASH_SUPPORT=y
  CONFIG_SPL_SPI=y
+CONFIG_SYS_LOAD_ADDR=0x22000000
  CONFIG_DEBUG_UART=y
  CONFIG_ENV_VARS_UBOOT_CONFIG=y
-CONFIG_SYS_LOAD_ADDR=0x22000000
  CONFIG_FIT=y
  CONFIG_SPI_BOOT=y
  CONFIG_BOOTDELAY=3
diff --git a/configs/sama5d36ek_cmp_mmc_defconfig b/configs/sama5d36ek_cmp_mmc_defconfig

index 3732b68cce48b7737f8dce79b71f14b6e8cf0685..909db1a8f6d05a8ddb846c85534294fb0be28384 100644 (file)
--- a/configs/sama5d36ek_cmp_mmc_defconfig
+++ b/configs/sama5d36ek_cmp_mmc_defconfig
@@ -12,9 +12,9 @@ CONFIG_DEFAULT_DEVICE_TREE="sama5d36ek_cmp"
  CONFIG_DEBUG_UART_BOARD_INIT=y
  CONFIG_DEBUG_UART_BASE=0xffffee00
  CONFIG_DEBUG_UART_CLOCK=132000000
+CONFIG_SYS_LOAD_ADDR=0x22000000
  CONFIG_DEBUG_UART=y
  CONFIG_ENV_VARS_UBOOT_CONFIG=y
-CONFIG_SYS_LOAD_ADDR=0x22000000
  CONFIG_FIT=y
  CONFIG_SD_BOOT=y
  CONFIG_BOOTDELAY=3
diff --git a/configs/sama5d36ek_cmp_nandflash_defconfig b/configs/sama5d36ek_cmp_nandflash_defconfig

index 2a261400b7802626281d9c625e17760c8fb2da64..f70ca47ebab2501fb5d59d63d3b969aafb464120 100644 (file)
--- a/configs/sama5d36ek_cmp_nandflash_defconfig
+++ b/configs/sama5d36ek_cmp_nandflash_defconfig
@@ -12,9 +12,9 @@ CONFIG_DEBUG_UART_BOARD_INIT=y
  CONFIG_DEBUG_UART_BASE=0xffffee00
  CONFIG_DEBUG_UART_CLOCK=132000000
  CONFIG_ENV_OFFSET_REDUND=0x100000
+CONFIG_SYS_LOAD_ADDR=0x22000000
  CONFIG_DEBUG_UART=y
  CONFIG_ENV_VARS_UBOOT_CONFIG=y
-CONFIG_SYS_LOAD_ADDR=0x22000000
  CONFIG_FIT=y
  CONFIG_NAND_BOOT=y
  CONFIG_BOOTDELAY=3
diff --git a/configs/sama5d36ek_cmp_spiflash_defconfig b/configs/sama5d36ek_cmp_spiflash_defconfig

index df62e0e85b466316f03d7c8dc84fd277c40ed341..849514acf4bf86a43d83891b0308ace775386c15 100644 (file)
--- a/configs/sama5d36ek_cmp_spiflash_defconfig
+++ b/configs/sama5d36ek_cmp_spiflash_defconfig
@@ -14,9 +14,9 @@ CONFIG_DEFAULT_DEVICE_TREE="sama5d36ek_cmp"
  CONFIG_DEBUG_UART_BOARD_INIT=y
  CONFIG_DEBUG_UART_BASE=0xffffee00
  CONFIG_DEBUG_UART_CLOCK=132000000
+CONFIG_SYS_LOAD_ADDR=0x22000000
  CONFIG_DEBUG_UART=y
  CONFIG_ENV_VARS_UBOOT_CONFIG=y
-CONFIG_SYS_LOAD_ADDR=0x22000000
  CONFIG_FIT=y
  CONFIG_SPI_BOOT=y
  CONFIG_BOOTDELAY=3
diff --git a/configs/sama5d3_xplained_mmc_defconfig b/configs/sama5d3_xplained_mmc_defconfig

index d89b6f3618f0ce7f2a8b7612a19d3f09f6280511..c7dd2ebd66939344b3ad23bed7e63f19cef412b1 100644 (file)
--- a/configs/sama5d3_xplained_mmc_defconfig
+++ b/configs/sama5d3_xplained_mmc_defconfig
@@ -22,9 +22,9 @@ CONFIG_DEBUG_UART_BASE=0xffffee00
  CONFIG_DEBUG_UART_CLOCK=132000000
  CONFIG_SPL_FS_FAT=y
  CONFIG_SPL_LIBDISK_SUPPORT=y
+CONFIG_SYS_LOAD_ADDR=0x22000000
  CONFIG_DEBUG_UART=y
  CONFIG_ENV_VARS_UBOOT_CONFIG=y
-CONFIG_SYS_LOAD_ADDR=0x22000000
  CONFIG_FIT=y
  CONFIG_SD_BOOT=y
  CONFIG_BOOTDELAY=3
diff --git a/configs/sama5d3_xplained_nandflash_defconfig b/configs/sama5d3_xplained_nandflash_defconfig

index a06f524d0c2d7ca7055246526bdcb01b3f4adf0e..556a018f42a22412aa94af9fa1c04dcbfaa5fd75 100644 (file)
--- a/configs/sama5d3_xplained_nandflash_defconfig
+++ b/configs/sama5d3_xplained_nandflash_defconfig
@@ -19,9 +19,9 @@ CONFIG_DEBUG_UART_BOARD_INIT=y
  CONFIG_DEBUG_UART_BASE=0xffffee00
  CONFIG_DEBUG_UART_CLOCK=132000000
  CONFIG_ENV_OFFSET_REDUND=0x100000
+CONFIG_SYS_LOAD_ADDR=0x22000000
  CONFIG_DEBUG_UART=y
  CONFIG_ENV_VARS_UBOOT_CONFIG=y
-CONFIG_SYS_LOAD_ADDR=0x22000000
  CONFIG_FIT=y
  CONFIG_NAND_BOOT=y
  CONFIG_BOOTDELAY=3
diff --git a/configs/sama5d3xek_mmc_defconfig b/configs/sama5d3xek_mmc_defconfig

index 8bb370607696634f9b220858bfe0cb9b66d3c92b..df24a0e437077fd49105640a8810061834daced3 100644 (file)
--- a/configs/sama5d3xek_mmc_defconfig
+++ b/configs/sama5d3xek_mmc_defconfig
@@ -22,9 +22,9 @@ CONFIG_DEBUG_UART_BASE=0xffffee00
  CONFIG_DEBUG_UART_CLOCK=132000000
  CONFIG_SPL_FS_FAT=y
  CONFIG_SPL_LIBDISK_SUPPORT=y
+CONFIG_SYS_LOAD_ADDR=0x22000000
  CONFIG_DEBUG_UART=y
  CONFIG_ENV_VARS_UBOOT_CONFIG=y
-CONFIG_SYS_LOAD_ADDR=0x22000000
  CONFIG_FIT=y
  CONFIG_SD_BOOT=y
  CONFIG_BOOTDELAY=3
diff --git a/configs/sama5d3xek_nandflash_defconfig b/configs/sama5d3xek_nandflash_defconfig

index b4568cda31702b545ac39154bd833d0830b6acfa..f002a72fc520ed0db6f52d3c03a489df77176a2c 100644 (file)
--- a/configs/sama5d3xek_nandflash_defconfig
+++ b/configs/sama5d3xek_nandflash_defconfig
@@ -19,9 +19,9 @@ CONFIG_DEBUG_UART_BOARD_INIT=y
  CONFIG_DEBUG_UART_BASE=0xffffee00
  CONFIG_DEBUG_UART_CLOCK=132000000
  CONFIG_ENV_OFFSET_REDUND=0x100000
+CONFIG_SYS_LOAD_ADDR=0x22000000
  CONFIG_DEBUG_UART=y
  CONFIG_ENV_VARS_UBOOT_CONFIG=y
-CONFIG_SYS_LOAD_ADDR=0x22000000
  CONFIG_FIT=y
  CONFIG_NAND_BOOT=y
  CONFIG_BOOTDELAY=3
diff --git a/configs/sama5d3xek_spiflash_defconfig b/configs/sama5d3xek_spiflash_defconfig

index 03c2b208b695a7e6b9d6012cbb2017a14f9b8a26..0fe4b3a504dd666567eb094827d9d5227fe007d9 100644 (file)
--- a/configs/sama5d3xek_spiflash_defconfig
+++ b/configs/sama5d3xek_spiflash_defconfig
@@ -24,9 +24,9 @@ CONFIG_DEBUG_UART_BASE=0xffffee00
  CONFIG_DEBUG_UART_CLOCK=132000000
  CONFIG_SPL_SPI_FLASH_SUPPORT=y
  CONFIG_SPL_SPI=y
+CONFIG_SYS_LOAD_ADDR=0x22000000
  CONFIG_DEBUG_UART=y
  CONFIG_ENV_VARS_UBOOT_CONFIG=y
-CONFIG_SYS_LOAD_ADDR=0x22000000
  CONFIG_FIT=y
  CONFIG_SPI_BOOT=y
  CONFIG_BOOTDELAY=3
diff --git a/configs/sama5d4_xplained_mmc_defconfig b/configs/sama5d4_xplained_mmc_defconfig

index 878f3a316f1fa031b9d7b86456977e641aee9c8b..a6744ccb403a966ec2fd48fc3c66ea2b270bb43f 100644 (file)
--- a/configs/sama5d4_xplained_mmc_defconfig
+++ b/configs/sama5d4_xplained_mmc_defconfig
@@ -22,9 +22,9 @@ CONFIG_DEBUG_UART_BASE=0xfc00c000
  CONFIG_DEBUG_UART_CLOCK=100000000
  CONFIG_SPL_FS_FAT=y
  CONFIG_SPL_LIBDISK_SUPPORT=y
+CONFIG_SYS_LOAD_ADDR=0x22000000
  CONFIG_DEBUG_UART=y
  CONFIG_ENV_VARS_UBOOT_CONFIG=y
-CONFIG_SYS_LOAD_ADDR=0x22000000
  CONFIG_FIT=y
  CONFIG_SD_BOOT=y
  CONFIG_BOOTDELAY=3
diff --git a/configs/sama5d4_xplained_nandflash_defconfig b/configs/sama5d4_xplained_nandflash_defconfig

index 1061762579219536fd9917e7c4b9df020b11a910..790e678225878c46aee9e23cc2b7e0c7d1523420 100644 (file)
--- a/configs/sama5d4_xplained_nandflash_defconfig
+++ b/configs/sama5d4_xplained_nandflash_defconfig
@@ -19,9 +19,9 @@ CONFIG_DEBUG_UART_BOARD_INIT=y
  CONFIG_DEBUG_UART_BASE=0xfc00c000
  CONFIG_DEBUG_UART_CLOCK=100000000
  CONFIG_ENV_OFFSET_REDUND=0x100000
+CONFIG_SYS_LOAD_ADDR=0x22000000
  CONFIG_DEBUG_UART=y
  CONFIG_ENV_VARS_UBOOT_CONFIG=y
-CONFIG_SYS_LOAD_ADDR=0x22000000
  CONFIG_FIT=y
  CONFIG_NAND_BOOT=y
  CONFIG_BOOTDELAY=3
diff --git a/configs/sama5d4_xplained_spiflash_defconfig b/configs/sama5d4_xplained_spiflash_defconfig

index 21e9fc3bf1e13853de81632840b3547411a7174e..6ffe226e50f471138b5dc1ba88f3b07d5984f629 100644 (file)
--- a/configs/sama5d4_xplained_spiflash_defconfig
+++ b/configs/sama5d4_xplained_spiflash_defconfig
@@ -24,9 +24,9 @@ CONFIG_DEBUG_UART_BASE=0xfc00c000
  CONFIG_DEBUG_UART_CLOCK=100000000
  CONFIG_SPL_SPI_FLASH_SUPPORT=y
  CONFIG_SPL_SPI=y
+CONFIG_SYS_LOAD_ADDR=0x22000000
  CONFIG_DEBUG_UART=y
  CONFIG_ENV_VARS_UBOOT_CONFIG=y
-CONFIG_SYS_LOAD_ADDR=0x22000000
  CONFIG_FIT=y
  CONFIG_SPI_BOOT=y
  CONFIG_BOOTDELAY=3
diff --git a/configs/sama5d4ek_mmc_defconfig b/configs/sama5d4ek_mmc_defconfig

index 01b2a587dff0b18c58ebd257acf90c64c0b969fd..6042980e71eaf4b8967460bcd74f755f4ca8c271 100644 (file)
--- a/configs/sama5d4ek_mmc_defconfig
+++ b/configs/sama5d4ek_mmc_defconfig
@@ -22,9 +22,9 @@ CONFIG_DEBUG_UART_BASE=0xfc00c000
  CONFIG_DEBUG_UART_CLOCK=88000000
  CONFIG_SPL_FS_FAT=y
  CONFIG_SPL_LIBDISK_SUPPORT=y
+CONFIG_SYS_LOAD_ADDR=0x22000000
  CONFIG_DEBUG_UART=y
  CONFIG_ENV_VARS_UBOOT_CONFIG=y
-CONFIG_SYS_LOAD_ADDR=0x22000000
  CONFIG_FIT=y
  CONFIG_SD_BOOT=y
  CONFIG_BOOTDELAY=3
diff --git a/configs/sama5d4ek_nandflash_defconfig b/configs/sama5d4ek_nandflash_defconfig

index 25e2b9889374c94698d11c64e7c57f64c2f36c76..f1fb5b2f4e0c614ebd3c0e42d160865e5382e9f5 100644 (file)
--- a/configs/sama5d4ek_nandflash_defconfig
+++ b/configs/sama5d4ek_nandflash_defconfig
@@ -19,9 +19,9 @@ CONFIG_DEBUG_UART_BOARD_INIT=y
  CONFIG_DEBUG_UART_BASE=0xfc00c000
  CONFIG_DEBUG_UART_CLOCK=88000000
  CONFIG_ENV_OFFSET_REDUND=0x100000
+CONFIG_SYS_LOAD_ADDR=0x22000000
  CONFIG_DEBUG_UART=y
  CONFIG_ENV_VARS_UBOOT_CONFIG=y
-CONFIG_SYS_LOAD_ADDR=0x22000000
  CONFIG_FIT=y
  CONFIG_NAND_BOOT=y
  CONFIG_BOOTDELAY=3
diff --git a/configs/sama5d4ek_spiflash_defconfig b/configs/sama5d4ek_spiflash_defconfig

index 484df6a4c6af0fbf17a766f438ef75ebe3648353..35dd5cadc509fbdaca3fb141833c3df98378bb0c 100644 (file)
--- a/configs/sama5d4ek_spiflash_defconfig
+++ b/configs/sama5d4ek_spiflash_defconfig
@@ -24,9 +24,9 @@ CONFIG_DEBUG_UART_BASE=0xfc00c000
  CONFIG_DEBUG_UART_CLOCK=88000000
  CONFIG_SPL_SPI_FLASH_SUPPORT=y
  CONFIG_SPL_SPI=y
+CONFIG_SYS_LOAD_ADDR=0x22000000
  CONFIG_DEBUG_UART=y
  CONFIG_ENV_VARS_UBOOT_CONFIG=y
-CONFIG_SYS_LOAD_ADDR=0x22000000
  CONFIG_FIT=y
  CONFIG_SPI_BOOT=y
  CONFIG_BOOTDELAY=3
diff --git a/configs/sama7g5ek_mmc1_defconfig b/configs/sama7g5ek_mmc1_defconfig

index 559a699fa54749eaba649dd43a895e61f06bf34f..75b24b380d9c6fffb7ec80c2de173ad81f5dd0c7 100644 (file)
--- a/configs/sama7g5ek_mmc1_defconfig
+++ b/configs/sama7g5ek_mmc1_defconfig
@@ -10,11 +10,11 @@ CONFIG_DEFAULT_DEVICE_TREE="at91-sama7g5ek"
  CONFIG_DEBUG_UART_BOARD_INIT=y
  CONFIG_DEBUG_UART_BASE=0xe1824200
  CONFIG_DEBUG_UART_CLOCK=200000000
+CONFIG_SYS_LOAD_ADDR=0x62000000
  CONFIG_DEBUG_UART=y
  CONFIG_SYS_MEMTEST_START=0x60000000
  CONFIG_SYS_MEMTEST_END=0x70000000
  CONFIG_ENV_VARS_UBOOT_CONFIG=y
-CONFIG_SYS_LOAD_ADDR=0x62000000
  CONFIG_FIT=y
  CONFIG_SD_BOOT=y
  CONFIG_USE_BOOTARGS=y
diff --git a/configs/sama7g5ek_mmc_defconfig b/configs/sama7g5ek_mmc_defconfig

index 94ded8a12127d8a3fb6b6f64fc18b01eedb1ea73..9d4da95677fb9915b1727e5360414fe45e736d3c 100644 (file)
--- a/configs/sama7g5ek_mmc_defconfig
+++ b/configs/sama7g5ek_mmc_defconfig
@@ -10,11 +10,11 @@ CONFIG_DEFAULT_DEVICE_TREE="at91-sama7g5ek"
  CONFIG_DEBUG_UART_BOARD_INIT=y
  CONFIG_DEBUG_UART_BASE=0xe1824200
  CONFIG_DEBUG_UART_CLOCK=200000000
+CONFIG_SYS_LOAD_ADDR=0x62000000
  CONFIG_DEBUG_UART=y
  CONFIG_SYS_MEMTEST_START=0x60000000
  CONFIG_SYS_MEMTEST_END=0x70000000
  CONFIG_ENV_VARS_UBOOT_CONFIG=y
-CONFIG_SYS_LOAD_ADDR=0x62000000
  CONFIG_FIT=y
  CONFIG_SD_BOOT=y
  CONFIG_USE_BOOTARGS=y
diff --git a/configs/sandbox64_defconfig b/configs/sandbox64_defconfig

index 4fbe148074c1fcff7ae2fb5c0282aef0a0fd9257..88f9ecbb7fcec9a8a723c83b343ea116a31d118b 100644 (file)
--- a/configs/sandbox64_defconfig
+++ b/configs/sandbox64_defconfig
@@ -5,12 +5,12 @@ CONFIG_ENV_SIZE=0x2000
  CONFIG_DEFAULT_DEVICE_TREE="sandbox64"
  CONFIG_PRE_CON_BUF_ADDR=0x100000
  CONFIG_BOOTSTAGE_STASH_ADDR=0x0
+CONFIG_SYS_LOAD_ADDR=0x0
  CONFIG_SANDBOX64=y
  CONFIG_DEBUG_UART=y
  CONFIG_SYS_MEMTEST_START=0x00100000
  CONFIG_SYS_MEMTEST_END=0x00101000
  CONFIG_DISTRO_DEFAULTS=y
-CONFIG_SYS_LOAD_ADDR=0x0
  CONFIG_FIT=y
  CONFIG_FIT_SIGNATURE=y
  CONFIG_FIT_VERBOSE=y
diff --git a/configs/sandbox_defconfig b/configs/sandbox_defconfig

index 1826cf0195472e265bf5d0f5a3bc406b5640af4f..cb8d590eb6425cf0397746053ea1f7047e0cc818 100644 (file)
--- a/configs/sandbox_defconfig
+++ b/configs/sandbox_defconfig
@@ -5,11 +5,11 @@ CONFIG_ENV_SIZE=0x2000
  CONFIG_DEFAULT_DEVICE_TREE="sandbox"
  CONFIG_PRE_CON_BUF_ADDR=0xf0000
  CONFIG_BOOTSTAGE_STASH_ADDR=0x0
+CONFIG_SYS_LOAD_ADDR=0x0
  CONFIG_DEBUG_UART=y
  CONFIG_SYS_MEMTEST_START=0x00100000
  CONFIG_SYS_MEMTEST_END=0x00101000
  CONFIG_DISTRO_DEFAULTS=y
-CONFIG_SYS_LOAD_ADDR=0x0
  CONFIG_FIT=y
  CONFIG_FIT_RSASSA_PSS=y
  CONFIG_FIT_CIPHER=y
diff --git a/configs/sandbox_flattree_defconfig b/configs/sandbox_flattree_defconfig

index b6f7355d474699a51a0bc24b3f666dedebfd2419..24b272068a19d6c4f6f5f383cd65b57e00119144 100644 (file)
--- a/configs/sandbox_flattree_defconfig
+++ b/configs/sandbox_flattree_defconfig
@@ -4,11 +4,11 @@ CONFIG_NR_DRAM_BANKS=1
  CONFIG_ENV_SIZE=0x2000
  CONFIG_DEFAULT_DEVICE_TREE="sandbox"
  CONFIG_BOOTSTAGE_STASH_ADDR=0x0
+CONFIG_SYS_LOAD_ADDR=0x0
  CONFIG_DEBUG_UART=y
  CONFIG_SYS_MEMTEST_START=0x00100000
  CONFIG_SYS_MEMTEST_END=0x00101000
  CONFIG_DISTRO_DEFAULTS=y
-CONFIG_SYS_LOAD_ADDR=0x0
  CONFIG_FIT=y
  CONFIG_FIT_SIGNATURE=y
  CONFIG_FIT_VERBOSE=y
diff --git a/configs/sandbox_noinst_defconfig b/configs/sandbox_noinst_defconfig

index acf648f4a22c38ea8c712aa9dffafa639a69ac4d..9eefe4f1051cc5e4cfb80dcd65fcb14907a23493 100644 (file)
--- a/configs/sandbox_noinst_defconfig
+++ b/configs/sandbox_noinst_defconfig
@@ -11,12 +11,12 @@ CONFIG_SPL_DRIVERS_MISC=y
  CONFIG_SPL_SYS_MALLOC_F_LEN=0x8000
  CONFIG_SPL=y
  CONFIG_BOOTSTAGE_STASH_ADDR=0x0
+CONFIG_SYS_LOAD_ADDR=0x0
  CONFIG_SANDBOX_SPL=y
  CONFIG_DEBUG_UART=y
  CONFIG_SYS_MEMTEST_START=0x00100000
  CONFIG_SYS_MEMTEST_END=0x00101000
  CONFIG_DISTRO_DEFAULTS=y
-CONFIG_SYS_LOAD_ADDR=0x0
  CONFIG_FIT=y
  CONFIG_FIT_SIGNATURE=y
  CONFIG_FIT_VERBOSE=y
diff --git a/configs/sandbox_spl_defconfig b/configs/sandbox_spl_defconfig

index 11967288cd762024998caffd3c318d30c7d1de6f..0092fea76ba7d381ade306e728366821377076d0 100644 (file)
--- a/configs/sandbox_spl_defconfig
+++ b/configs/sandbox_spl_defconfig
@@ -11,12 +11,12 @@ CONFIG_SPL_DRIVERS_MISC=y
  CONFIG_SPL_SYS_MALLOC_F_LEN=0x8000
  CONFIG_SPL=y
  CONFIG_BOOTSTAGE_STASH_ADDR=0x0
+CONFIG_SYS_LOAD_ADDR=0x0
  CONFIG_SANDBOX_SPL=y
  CONFIG_DEBUG_UART=y
  CONFIG_SYS_MEMTEST_START=0x00100000
  CONFIG_SYS_MEMTEST_END=0x00101000
  CONFIG_DISTRO_DEFAULTS=y
-CONFIG_SYS_LOAD_ADDR=0x0
  CONFIG_FIT=y
  CONFIG_FIT_SIGNATURE=y
  CONFIG_FIT_VERBOSE=y
diff --git a/configs/sei510_defconfig b/configs/sei510_defconfig

index df02fca408a06c3c9bb5e4e715dcbcab063496bd..e9f5781248fe430d9cf975e320fc8a820022705e 100644 (file)
--- a/configs/sei510_defconfig
+++ b/configs/sei510_defconfig
@@ -14,9 +14,9 @@ CONFIG_DEBUG_UART_BASE=0xff803000
  CONFIG_DEBUG_UART_CLOCK=24000000
  CONFIG_IDENT_STRING=" sei510"
  # CONFIG_PSCI_RESET is not set
+CONFIG_SYS_LOAD_ADDR=0x1000000
  CONFIG_DEBUG_UART=y
  CONFIG_REMAKE_ELF=y
-CONFIG_SYS_LOAD_ADDR=0x1000000
  CONFIG_OF_BOARD_SETUP=y
  CONFIG_USE_PREBOOT=y
  CONFIG_PREBOOT="run load_logo"
diff --git a/configs/sei610_defconfig b/configs/sei610_defconfig

index ca4024013d5f247504b728e61d9ee8750303d59d..93b9008383deaece92a9395f1852b8a34fad5eb6 100644 (file)
--- a/configs/sei610_defconfig
+++ b/configs/sei610_defconfig
@@ -14,9 +14,9 @@ CONFIG_DEBUG_UART_BASE=0xff803000
  CONFIG_DEBUG_UART_CLOCK=24000000
  CONFIG_IDENT_STRING=" sei610"
  # CONFIG_PSCI_RESET is not set
+CONFIG_SYS_LOAD_ADDR=0x1000000
  CONFIG_DEBUG_UART=y
  CONFIG_REMAKE_ELF=y
-CONFIG_SYS_LOAD_ADDR=0x1000000
  CONFIG_OF_BOARD_SETUP=y
  CONFIG_USE_PREBOOT=y
  CONFIG_PREBOOT="run load_logo"
diff --git a/configs/sfr_nb4-ser_ram_defconfig b/configs/sfr_nb4-ser_ram_defconfig

index e97c1f06bd7986829e818ec672525bba0bb37cd8..8ff982bd78af4f21efed2e61d2c6ff847f5ff8b3 100644 (file)
--- a/configs/sfr_nb4-ser_ram_defconfig
+++ b/configs/sfr_nb4-ser_ram_defconfig
@@ -5,6 +5,7 @@ CONFIG_NR_DRAM_BANKS=1
  CONFIG_ENV_SIZE=0x2000
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="sfr,nb4-ser"
+CONFIG_SYS_LOAD_ADDR=0x80100000
  CONFIG_ARCH_BMIPS=y
  CONFIG_SOC_BMIPS_BCM6358=y
  CONFIG_BOARD_SFR_NB4_SER=y
@@ -15,7 +16,6 @@ CONFIG_MIPS_CACHE_DISABLE=y
  CONFIG_MIPS_BOOT_FDT=y
  # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
  CONFIG_REMAKE_ELF=y
-CONFIG_SYS_LOAD_ADDR=0x80100000
  CONFIG_OF_STDOUT_VIA_ALIAS=y
  CONFIG_DISPLAY_CPUINFO=y
  CONFIG_HUSH_PARSER=y
diff --git a/configs/sheep-rk3368_defconfig b/configs/sheep-rk3368_defconfig

index 61a2d5a66ec5a5122063a0f95222dd85f8d42646..41d9fa321eaaae857dac403b255a0b15a9f6315a 100644 (file)
--- a/configs/sheep-rk3368_defconfig
+++ b/configs/sheep-rk3368_defconfig
@@ -8,8 +8,8 @@ CONFIG_ROCKCHIP_RK3368=y
  CONFIG_TARGET_SHEEP=y
  CONFIG_DEBUG_UART_BASE=0xFF1b0000
  CONFIG_DEBUG_UART_CLOCK=24000000
-CONFIG_DEBUG_UART=y
  CONFIG_SYS_LOAD_ADDR=0x800800
+CONFIG_DEBUG_UART=y
  CONFIG_ANDROID_BOOT_IMAGE=y
  CONFIG_DEFAULT_FDT_FILE="rockchip/rk3368-sheep.dtb"
  # CONFIG_DISPLAY_CPUINFO is not set
diff --git a/configs/sheevaplug_defconfig b/configs/sheevaplug_defconfig

index 483b5ca1907b85415dd3271ee1204db951f745a2..0525bb436ec1fbd98ceb841ddf88b4f6427919e1 100644 (file)
--- a/configs/sheevaplug_defconfig
+++ b/configs/sheevaplug_defconfig
@@ -12,10 +12,10 @@ CONFIG_ENV_SIZE=0x20000
  CONFIG_ENV_OFFSET=0x80000
  CONFIG_DEFAULT_DEVICE_TREE="kirkwood-sheevaplug"
  CONFIG_IDENT_STRING="\nMarvell-Sheevaplug"
+CONFIG_SYS_LOAD_ADDR=0x800000
  # CONFIG_SYS_MALLOC_F is not set
  CONFIG_HAS_BOARD_SIZE_LIMIT=y
  CONFIG_BOARD_SIZE_LIMIT=524288
-CONFIG_SYS_LOAD_ADDR=0x800000
  CONFIG_BOOTDELAY=3
  CONFIG_USE_BOOTCOMMAND=y
  CONFIG_BOOTCOMMAND="${x_bootcmd_kernel}; setenv bootargs ${x_bootargs} ${x_bootargs_root}; bootm 0x6400000;"
diff --git a/configs/sifive_unleashed_defconfig b/configs/sifive_unleashed_defconfig

index 58c6212c99ef59171b8d42ece23d4eebc0a01d09..49a913b53b72129594992cb9adf3e7ce6559080b 100644 (file)
--- a/configs/sifive_unleashed_defconfig
+++ b/configs/sifive_unleashed_defconfig
@@ -9,11 +9,11 @@ CONFIG_SPL_MMC=y
  CONFIG_SPL=y
  CONFIG_SPL_SPI_FLASH_SUPPORT=y
  CONFIG_SPL_SPI=y
+CONFIG_SYS_LOAD_ADDR=0x80200000
  CONFIG_TARGET_SIFIVE_UNLEASHED=y
  CONFIG_ARCH_RV64I=y
  CONFIG_RISCV_SMODE=y
  CONFIG_DISTRO_DEFAULTS=y
-CONFIG_SYS_LOAD_ADDR=0x80200000
  CONFIG_FIT=y
  CONFIG_SPL_LOAD_FIT_ADDRESS=0x84000000
  CONFIG_USE_PREBOOT=y
diff --git a/configs/sifive_unmatched_defconfig b/configs/sifive_unmatched_defconfig

index 86f8c7856eacb379d7bdf0596c2a9e6cacb8eb8a..f0aeace633d1fee290cbc1c5a9397ce5433e50cd 100644 (file)
--- a/configs/sifive_unmatched_defconfig
+++ b/configs/sifive_unmatched_defconfig
@@ -10,13 +10,13 @@ CONFIG_SPL_MMC=y
  CONFIG_SPL=y
  CONFIG_SPL_SPI_FLASH_SUPPORT=y
  CONFIG_SPL_SPI=y
+CONFIG_SYS_LOAD_ADDR=0x80200000
  CONFIG_SYS_PCI_64BIT=y
  CONFIG_AHCI=y
  CONFIG_TARGET_SIFIVE_UNMATCHED=y
  CONFIG_ARCH_RV64I=y
  CONFIG_RISCV_SMODE=y
  CONFIG_DISTRO_DEFAULTS=y
-CONFIG_SYS_LOAD_ADDR=0x80200000
  CONFIG_FIT=y
  CONFIG_SPL_LOAD_FIT_ADDRESS=0x84000000
  CONFIG_USE_PREBOOT=y
diff --git a/configs/silinux_ek874_defconfig b/configs/silinux_ek874_defconfig

index 0dafb70675714ad239acc9b6a3b84120783dc451..61c2a739281a49aa157f85c7469cba6fa35d6d6e 100644 (file)
--- a/configs/silinux_ek874_defconfig
+++ b/configs/silinux_ek874_defconfig
@@ -12,8 +12,8 @@ CONFIG_DEFAULT_DEVICE_TREE="r8a774c0-ek874-u-boot"
  CONFIG_SPL_TEXT_BASE=0xe6318000
  CONFIG_RCAR_GEN3=y
  CONFIG_TARGET_SILINUX_EK874=y
-CONFIG_REMAKE_ELF=y
  CONFIG_SYS_LOAD_ADDR=0x58000000
+CONFIG_REMAKE_ELF=y
  CONFIG_FIT=y
  CONFIG_SUPPORT_RAW_INITRD=y
  CONFIG_USE_BOOTARGS=y
diff --git a/configs/silk_defconfig b/configs/silk_defconfig

index fe28514dc07c23215b8967cb22804143303ff3c3..9ae358d97a78024d5be39c772d109fea846aa349 100644 (file)
--- a/configs/silk_defconfig
+++ b/configs/silk_defconfig
@@ -25,6 +25,7 @@ CONFIG_SPL=y
  CONFIG_SPL_SPI_FLASH_SUPPORT=y
  CONFIG_SPL_SPI=y
  CONFIG_SYS_LOAD_ADDR=0x50000000
+CONFIG_ENV_ADDR=0xC0000
  CONFIG_FIT=y
  CONFIG_BOOTDELAY=3
  CONFIG_SPL_BOARD_INIT=y
@@ -60,7 +61,6 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=spi0.0:256k(u-boot-spl),512k(u-boot-env1),512k
  CONFIG_OF_CONTROL=y
  CONFIG_ENV_OVERWRITE=y
  CONFIG_ENV_IS_IN_SPI_FLASH=y
-CONFIG_ENV_ADDR=0xC0000
  CONFIG_VERSION_VARIABLE=y
  CONFIG_CLK=y
  CONFIG_CLK_RENESAS=y
diff --git a/configs/sipeed_maix_bitm_defconfig b/configs/sipeed_maix_bitm_defconfig

index 8e12dc1164b17f008e71cfb7e35a1504e9c36a5d..7d1722c88335c9cae518239773067dc1d406ceee 100644 (file)
--- a/configs/sipeed_maix_bitm_defconfig
+++ b/configs/sipeed_maix_bitm_defconfig
@@ -3,9 +3,9 @@ CONFIG_SYS_MALLOC_LEN=0x20000
  CONFIG_ENV_SIZE=0x1000
  CONFIG_ENV_OFFSET=0xfff000
  CONFIG_ENV_SECT_SIZE=0x1000
+CONFIG_SYS_LOAD_ADDR=0x80000000
  CONFIG_TARGET_SIPEED_MAIX=y
  CONFIG_ARCH_RV64I=y
-CONFIG_SYS_LOAD_ADDR=0x80000000
  CONFIG_STACK_SIZE=0x100000
  CONFIG_USE_BOOTCOMMAND=y
  CONFIG_BOOTCOMMAND="run k210_bootcmd"
diff --git a/configs/sipeed_maix_smode_defconfig b/configs/sipeed_maix_smode_defconfig

index 67387b99cf46cb21c3cddd4cb22a10d6a589aa47..0008f5cfa7efc1bc4f869f66c4329ead73833a0f 100644 (file)
--- a/configs/sipeed_maix_smode_defconfig
+++ b/configs/sipeed_maix_smode_defconfig
@@ -4,10 +4,10 @@ CONFIG_SYS_MALLOC_LEN=0x20000
  CONFIG_ENV_SIZE=0x1000
  CONFIG_ENV_OFFSET=0xfff000
  CONFIG_ENV_SECT_SIZE=0x1000
+CONFIG_SYS_LOAD_ADDR=0x80000000
  CONFIG_TARGET_SIPEED_MAIX=y
  CONFIG_ARCH_RV64I=y
  CONFIG_RISCV_SMODE=y
-CONFIG_SYS_LOAD_ADDR=0x80000000
  CONFIG_STACK_SIZE=0x100000
  CONFIG_USE_BOOTCOMMAND=y
  CONFIG_BOOTCOMMAND="run k210_bootcmd"
diff --git a/configs/smdk5250_defconfig b/configs/smdk5250_defconfig

index 26a20602364cfdfee32ce800302f985c7d0313e8..22789da7e28abaa27afa5e6ae33053f5ceb3f34a 100644 (file)
--- a/configs/smdk5250_defconfig
+++ b/configs/smdk5250_defconfig
@@ -17,8 +17,8 @@ CONFIG_DEFAULT_DEVICE_TREE="exynos5250-smdk5250"
  CONFIG_SPL_TEXT_BASE=0x02023400
  CONFIG_SPL=y
  CONFIG_IDENT_STRING=" for SMDK5250"
-CONFIG_DISTRO_DEFAULTS=y
  CONFIG_SYS_LOAD_ADDR=0x43e00000
+CONFIG_DISTRO_DEFAULTS=y
  CONFIG_FIT=y
  CONFIG_FIT_BEST_MATCH=y
  CONFIG_SILENT_CONSOLE=y
diff --git a/configs/smdk5420_defconfig b/configs/smdk5420_defconfig

index 34aacc663f8ef02bc74d8a795ed0c0e3fa9d9fe8..f9eae77149bf4cd18466e9c05b3e3dab77dca935 100644 (file)
--- a/configs/smdk5420_defconfig
+++ b/configs/smdk5420_defconfig
@@ -15,8 +15,8 @@ CONFIG_DEFAULT_DEVICE_TREE="exynos5420-smdk5420"
  CONFIG_SPL_TEXT_BASE=0x02024410
  CONFIG_SPL=y
  CONFIG_IDENT_STRING=" for SMDK5420"
-CONFIG_DISTRO_DEFAULTS=y
  CONFIG_SYS_LOAD_ADDR=0x23e00000
+CONFIG_DISTRO_DEFAULTS=y
  CONFIG_FIT=y
  CONFIG_FIT_BEST_MATCH=y
  CONFIG_SILENT_CONSOLE=y
diff --git a/configs/smdkc100_defconfig b/configs/smdkc100_defconfig

index f2d0845d207059fa3a8c8e3b5249ff4109629a05..ac593063352419a333ff7d2f4ef98f8ffcfdc610 100644 (file)
--- a/configs/smdkc100_defconfig
+++ b/configs/smdkc100_defconfig
@@ -10,6 +10,7 @@ CONFIG_TARGET_SMDKC100=y
  CONFIG_IDENT_STRING=" for SMDKC100"
  CONFIG_SYS_CLK_FREQ=12000000
  CONFIG_SYS_LOAD_ADDR=0x30000000
+CONFIG_ENV_ADDR=0x40000
  CONFIG_BOOTDELAY=3
  CONFIG_USE_BOOTARGS=y
  CONFIG_BOOTARGS="root=/dev/mtdblock5 ubi.mtd=4 rootfstype=cramfs console=ttySAC0,115200n8 mem=128M  mtdparts=s3c-onenand:256k(bootloader),128k@0x40000(params),3m@0x60000(kernel),16m@0x360000(test),-(UBI)"
@@ -28,7 +29,6 @@ CONFIG_MTDIDS_DEFAULT="onenand0=s3c-onenand"
  CONFIG_MTDPARTS_DEFAULT="mtdparts=s3c-onenand:256k(bootloader),128k@0x40000(params),3m@0x60000(kernel),16m@0x360000(test),-(UBI)"
  CONFIG_ENV_OVERWRITE=y
  CONFIG_ENV_IS_IN_ONENAND=y
-CONFIG_ENV_ADDR=0x40000
  # CONFIG_MMC is not set
  CONFIG_MTD=y
  CONFIG_SMC911X=y
diff --git a/configs/smdkv310_defconfig b/configs/smdkv310_defconfig

index add0585e87ff70bd8e8ba80fc8f7857670f5200a..558f797de8e039926fb501eef173e669daf3aa6a 100644 (file)
--- a/configs/smdkv310_defconfig
+++ b/configs/smdkv310_defconfig
@@ -12,8 +12,8 @@ CONFIG_DEFAULT_DEVICE_TREE="exynos4210-smdkv310"
  CONFIG_SPL_TEXT_BASE=0x02021410
  CONFIG_SPL=y
  CONFIG_IDENT_STRING=" for SMDKC210/V310"
-CONFIG_DISTRO_DEFAULTS=y
  CONFIG_SYS_LOAD_ADDR=0x43e00000
+CONFIG_DISTRO_DEFAULTS=y
  CONFIG_BOOTCOMMAND="fatload mmc 0 40007000 uImage; bootm 40007000"
  # CONFIG_SPL_FRAMEWORK is not set
  CONFIG_SYS_PROMPT="SMDKV310 # "
diff --git a/configs/snow_defconfig b/configs/snow_defconfig

index 2b98401461eb78ff380e9ea699e7559d531b3c58..36a93e03523ed8972ad3a000e18632ed32339e9d 100644 (file)
--- a/configs/snow_defconfig
+++ b/configs/snow_defconfig
@@ -19,9 +19,9 @@ CONFIG_SPL=y
  CONFIG_DEBUG_UART_BASE=0x12c30000
  CONFIG_DEBUG_UART_CLOCK=100000000
  CONFIG_IDENT_STRING=" for snow"
+CONFIG_SYS_LOAD_ADDR=0x43e00000
  CONFIG_DEBUG_UART=y
  CONFIG_DISTRO_DEFAULTS=y
-CONFIG_SYS_LOAD_ADDR=0x43e00000
  CONFIG_FIT=y
  CONFIG_FIT_BEST_MATCH=y
  CONFIG_SILENT_CONSOLE=y
diff --git a/configs/socfpga_agilex_atf_defconfig b/configs/socfpga_agilex_atf_defconfig

index 6b15bc373be533f01366cea8899ade46a9c888bc..a048595b5a10ad0ebbe591769e4aed7add6164f6 100644 (file)
--- a/configs/socfpga_agilex_atf_defconfig
+++ b/configs/socfpga_agilex_atf_defconfig
@@ -13,8 +13,8 @@ CONFIG_SPL_TEXT_BASE=0xFFE00000
  CONFIG_TARGET_SOCFPGA_AGILEX_SOCDK=y
  CONFIG_IDENT_STRING="socfpga_agilex"
  CONFIG_SPL_FS_FAT=y
-CONFIG_REMAKE_ELF=y
  CONFIG_SYS_LOAD_ADDR=0x02000000
+CONFIG_REMAKE_ELF=y
  CONFIG_FIT=y
  CONFIG_SPL_FIT_SIGNATURE=y
  CONFIG_SPL_LOAD_FIT=y
diff --git a/configs/socfpga_agilex_defconfig b/configs/socfpga_agilex_defconfig

index 3425adcaefb4d6dc93e28c3d4f556f4b1bb78324..ab18b24531b43b8ffef301caf4dcff51c318f1e9 100644 (file)
--- a/configs/socfpga_agilex_defconfig
+++ b/configs/socfpga_agilex_defconfig
@@ -13,10 +13,10 @@ CONFIG_TARGET_SOCFPGA_AGILEX_SOCDK=y
  CONFIG_IDENT_STRING="socfpga_agilex"
  CONFIG_SPL_FS_FAT=y
  # CONFIG_PSCI_RESET is not set
+CONFIG_SYS_LOAD_ADDR=0x02000000
  CONFIG_SYS_MEMTEST_START=0x00000000
  CONFIG_SYS_MEMTEST_END=0x3fe00000
  CONFIG_REMAKE_ELF=y
-CONFIG_SYS_LOAD_ADDR=0x02000000
  CONFIG_BOOTDELAY=5
  CONFIG_USE_BOOTARGS=y
  CONFIG_BOOTARGS="earlycon"
diff --git a/configs/socfpga_agilex_vab_defconfig b/configs/socfpga_agilex_vab_defconfig

index 486c88fddd49bdb21a404e7958fdca6d5672da3e..2acfd044e27c5c897a9f7b77593d79c916f17c08 100644 (file)
--- a/configs/socfpga_agilex_vab_defconfig
+++ b/configs/socfpga_agilex_vab_defconfig
@@ -14,8 +14,8 @@ CONFIG_SOCFPGA_SECURE_VAB_AUTH=y
  CONFIG_TARGET_SOCFPGA_AGILEX_SOCDK=y
  CONFIG_IDENT_STRING="socfpga_agilex"
  CONFIG_SPL_FS_FAT=y
-CONFIG_REMAKE_ELF=y
  CONFIG_SYS_LOAD_ADDR=0x02000000
+CONFIG_REMAKE_ELF=y
  CONFIG_FIT=y
  CONFIG_SPL_FIT_SIGNATURE=y
  CONFIG_SPL_LOAD_FIT=y
diff --git a/configs/socfpga_secu1_defconfig b/configs/socfpga_secu1_defconfig

index 17a84f8a4c465b1533ef1848220739423cba8293..641d205093a9a9271fc48776d291203b98b62505 100644 (file)
--- a/configs/socfpga_secu1_defconfig
+++ b/configs/socfpga_secu1_defconfig
@@ -13,9 +13,9 @@ CONFIG_TARGET_SOCFPGA_ARRIA5_SECU1=y
  CONFIG_ENV_OFFSET_REDUND=0x120000
  # CONFIG_SPL_LIBDISK_SUPPORT is not set
  # CONFIG_SPL_SPI is not set
+CONFIG_SYS_LOAD_ADDR=0x02000000
  CONFIG_BUILD_TARGET="u-boot-with-nand-spl.sfp"
  CONFIG_DISTRO_DEFAULTS=y
-CONFIG_SYS_LOAD_ADDR=0x02000000
  CONFIG_FIT=y
  CONFIG_BOOT_RETRY=y
  CONFIG_BOOT_RETRY_TIME=45
diff --git a/configs/socfpga_stratix10_atf_defconfig b/configs/socfpga_stratix10_atf_defconfig

index 386a773ae7b36650f672c1930f5da8d1c9192406..5c52fdf6d05af95d8e38c510a3e795c057b78dbd 100644 (file)
--- a/configs/socfpga_stratix10_atf_defconfig
+++ b/configs/socfpga_stratix10_atf_defconfig
@@ -13,8 +13,8 @@ CONFIG_SPL_TEXT_BASE=0xFFE00000
  CONFIG_TARGET_SOCFPGA_STRATIX10_SOCDK=y
  CONFIG_IDENT_STRING="socfpga_stratix10"
  CONFIG_SPL_FS_FAT=y
-CONFIG_REMAKE_ELF=y
  CONFIG_SYS_LOAD_ADDR=0x02000000
+CONFIG_REMAKE_ELF=y
  CONFIG_FIT=y
  CONFIG_SPL_FIT_SIGNATURE=y
  CONFIG_SPL_LOAD_FIT=y
diff --git a/configs/socfpga_stratix10_defconfig b/configs/socfpga_stratix10_defconfig

index 800b200759f49b1c0cb07492963c98c468d20476..f90fcb9282437e52044cedda4415af42f0ddd947 100644 (file)
--- a/configs/socfpga_stratix10_defconfig
+++ b/configs/socfpga_stratix10_defconfig
@@ -13,12 +13,12 @@ CONFIG_TARGET_SOCFPGA_STRATIX10_SOCDK=y
  CONFIG_IDENT_STRING="socfpga_stratix10"
  CONFIG_SPL_FS_FAT=y
  # CONFIG_PSCI_RESET is not set
+CONFIG_SYS_LOAD_ADDR=0x02000000
  CONFIG_SYS_MEMTEST_START=0x00000000
  CONFIG_SYS_MEMTEST_END=0x3fe00000
  CONFIG_OPTIMIZE_INLINING=y
  CONFIG_SPL_OPTIMIZE_INLINING=y
  CONFIG_REMAKE_ELF=y
-CONFIG_SYS_LOAD_ADDR=0x02000000
  CONFIG_BOOTDELAY=5
  CONFIG_USE_BOOTARGS=y
  CONFIG_BOOTARGS="earlycon"
diff --git a/configs/socrates_defconfig b/configs/socrates_defconfig

index c2f83a532663bf72a56f504bfeb08a2e325b79be..2abb81c53b49e2b2a88d43e0becc8275efd7bb21 100644 (file)
--- a/configs/socrates_defconfig
+++ b/configs/socrates_defconfig
@@ -4,6 +4,7 @@ CONFIG_SYS_TEXT_BASE=0xfff80000
  CONFIG_ENV_SIZE=0x4000
  CONFIG_ENV_SECT_SIZE=0x20000
  CONFIG_DEFAULT_DEVICE_TREE="socrates"
+CONFIG_ENV_ADDR=0xFFF40000
  # CONFIG_SYS_PCI_64BIT is not set
  CONFIG_MPC85xx=y
  # CONFIG_CMD_ERRATA is not set
@@ -45,7 +46,6 @@ CONFIG_CMD_EXT2=y
  CONFIG_OF_CONTROL=y
  CONFIG_ENV_IS_IN_FLASH=y
  CONFIG_SYS_REDUNDAND_ENVIRONMENT=y
-CONFIG_ENV_ADDR=0xFFF40000
  CONFIG_ENV_ADDR_REDUND=0xFFF20000
  CONFIG_USE_ETHPRIME=y
  CONFIG_ETHPRIME="TSEC0"
diff --git a/configs/spring_defconfig b/configs/spring_defconfig

index ef5688f861c0bcaa373efcfe08abe58d0ec9b32c..ccd75e2596d83ef9c9063fa7c2aba6de9bd1213c 100644 (file)
--- a/configs/spring_defconfig
+++ b/configs/spring_defconfig
@@ -19,9 +19,9 @@ CONFIG_SPL=y
  CONFIG_DEBUG_UART_BASE=0x12c30000
  CONFIG_DEBUG_UART_CLOCK=100000000
  CONFIG_IDENT_STRING=" for spring"
+CONFIG_SYS_LOAD_ADDR=0x43e00000
  CONFIG_DEBUG_UART=y
  CONFIG_DISTRO_DEFAULTS=y
-CONFIG_SYS_LOAD_ADDR=0x43e00000
  CONFIG_FIT=y
  CONFIG_FIT_BEST_MATCH=y
  CONFIG_SILENT_CONSOLE=y
diff --git a/configs/starqltechn_defconfig b/configs/starqltechn_defconfig

index 75e8409c4dc143589e16c0178237e36758b3d5ea..e3b2f7c24986e17a53538e8edb59bf166c6fd531 100644 (file)
--- a/configs/starqltechn_defconfig
+++ b/configs/starqltechn_defconfig
@@ -3,17 +3,18 @@ CONFIG_SKIP_LOWLEVEL_INIT=y
  CONFIG_POSITION_INDEPENDENT=y
  CONFIG_ARCH_SNAPDRAGON=y
  CONFIG_DEFAULT_DEVICE_TREE="starqltechn"
-CONFIG_BOOTDELAY=0
-CONFIG_FIT=y
-CONFIG_FIT_VERBOSE=y
  CONFIG_TARGET_STARQLTECHN=y
  CONFIG_IDENT_STRING="\nSamsung S9 SM-G9600"
  CONFIG_SYS_LOAD_ADDR=0x80000000
-CONFIG_LMB_MAX_REGIONS=64
+CONFIG_FIT=y
+CONFIG_FIT_VERBOSE=y
+CONFIG_BOOTDELAY=0
+CONFIG_SAVE_PREV_BL_FDT_ADDR=y
+CONFIG_SAVE_PREV_BL_INITRAMFS_START_ADDR=y
  # CONFIG_DISPLAY_CPUINFO is not set
  CONFIG_HUSH_PARSER=y
  CONFIG_CMD_GPIO=y
-# CONFIG_REQUIRE_SERIAL_CONSOLE is not set
+CONFIG_CMD_BMP=y
  # CONFIG_NET is not set
  # CONFIG_DM_STDIO is not set
  CONFIG_CLK=y
@@ -22,16 +23,10 @@ CONFIG_PM8916_GPIO=y
  CONFIG_PINCTRL=y
  CONFIG_DM_PMIC=y
  CONFIG_PMIC_PM8916=y
-# CONFIG_MSM_GENI_SERIAL is not set
+# CONFIG_REQUIRE_SERIAL_CONSOLE is not set
  CONFIG_SPMI_MSM=y
-CONFIG_LINUX_KERNEL_IMAGE_HEADER=y
-CONFIG_SAVE_PREV_BL_INITRAMFS_START_ADDR=y
-CONFIG_SAVE_PREV_BL_FDT_ADDR=y
  CONFIG_DM_VIDEO=y
-CONFIG_VIDEO_LOGO=y
-CONFIG_CMD_VIDCONSOLE=y
-CONFIG_CONSOLE_NORMAL=y
  CONFIG_SYS_WHITE_ON_BLACK=y
-CONFIG_VIDEO_DT_SIMPLEFB=y
  CONFIG_VIDEO_SIMPLE=y
-CONFIG_CMD_BMP=y
+CONFIG_VIDEO_DT_SIMPLEFB=y
+CONFIG_LMB_MAX_REGIONS=64
diff --git a/configs/stih410-b2260_defconfig b/configs/stih410-b2260_defconfig

index e99bb1e443ee56b967a85a86c45e20d44eddd48b..4d8f1d3df44154d0f293cd366b1c6f25ed642899 100644 (file)
--- a/configs/stih410-b2260_defconfig
+++ b/configs/stih410-b2260_defconfig
@@ -7,8 +7,8 @@ CONFIG_NR_DRAM_BANKS=1
  CONFIG_ENV_SIZE=0x4000
  CONFIG_DEFAULT_DEVICE_TREE="stih410-b2260"
  CONFIG_IDENT_STRING="STMicroelectronics STiH410-B2260"
-CONFIG_DISTRO_DEFAULTS=y
  CONFIG_SYS_LOAD_ADDR=0x40000000
+CONFIG_DISTRO_DEFAULTS=y
  CONFIG_FIT=y
  CONFIG_FIT_VERBOSE=y
  CONFIG_USE_BOOTARGS=y
diff --git a/configs/stm32f429-discovery_defconfig b/configs/stm32f429-discovery_defconfig

index 6bd52ee814d94b8671322d9d251c99cb4da4342c..c48052ab13a1c251493e0f2a2f5371e2479e0c78 100644 (file)
--- a/configs/stm32f429-discovery_defconfig
+++ b/configs/stm32f429-discovery_defconfig
@@ -9,8 +9,9 @@ CONFIG_ENV_SECT_SIZE=0x20000
  CONFIG_DEFAULT_DEVICE_TREE="stm32f429-disco"
  CONFIG_STM32F4=y
  CONFIG_TARGET_STM32F429_DISCOVERY=y
-CONFIG_ENV_VARS_UBOOT_CONFIG=y
  CONFIG_SYS_LOAD_ADDR=0x90400000
+CONFIG_ENV_ADDR=0x8040000
+CONFIG_ENV_VARS_UBOOT_CONFIG=y
  CONFIG_BOOTDELAY=3
  CONFIG_USE_BOOTARGS=y
  CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk consoleblank=0 ignore_loglevel"
@@ -24,7 +25,6 @@ CONFIG_CMD_IMLS=y
  CONFIG_CMD_TIMER=y
  CONFIG_OF_CONTROL=y
  CONFIG_ENV_IS_IN_FLASH=y
-CONFIG_ENV_ADDR=0x8040000
  # CONFIG_NET is not set
  # CONFIG_MMC is not set
  CONFIG_MTD_NOR_FLASH=y
diff --git a/configs/stm32f429-evaluation_defconfig b/configs/stm32f429-evaluation_defconfig

index 031f998a5f6b81cf320f8338fbc5db46f55e20d5..2217584a3c762dbcd9c981cb4650060179736650 100644 (file)
--- a/configs/stm32f429-evaluation_defconfig
+++ b/configs/stm32f429-evaluation_defconfig
@@ -8,8 +8,8 @@ CONFIG_ENV_SIZE=0x2000
  CONFIG_DEFAULT_DEVICE_TREE="stm32429i-eval"
  CONFIG_STM32F4=y
  CONFIG_TARGET_STM32F429_EVALUATION=y
-CONFIG_DISTRO_DEFAULTS=y
  CONFIG_SYS_LOAD_ADDR=0x400000
+CONFIG_DISTRO_DEFAULTS=y
  CONFIG_BOOTDELAY=3
  # CONFIG_DISPLAY_CPUINFO is not set
  CONFIG_MISC_INIT_R=y
diff --git a/configs/stm32f469-discovery_defconfig b/configs/stm32f469-discovery_defconfig

index 72f823c87e10bed60c359a86b970768237de0cf2..8af71302b2503818d30f66680c42e252a38f1c51 100644 (file)
--- a/configs/stm32f469-discovery_defconfig
+++ b/configs/stm32f469-discovery_defconfig
@@ -8,8 +8,8 @@ CONFIG_ENV_SIZE=0x2000
  CONFIG_DEFAULT_DEVICE_TREE="stm32f469-disco"
  CONFIG_STM32F4=y
  CONFIG_TARGET_STM32F469_DISCOVERY=y
-CONFIG_DISTRO_DEFAULTS=y
  CONFIG_SYS_LOAD_ADDR=0x400000
+CONFIG_DISTRO_DEFAULTS=y
  CONFIG_BOOTDELAY=3
  # CONFIG_DISPLAY_CPUINFO is not set
  CONFIG_MISC_INIT_R=y
diff --git a/configs/stm32f746-disco_defconfig b/configs/stm32f746-disco_defconfig

index ee7e3293ad367d3b9e1aeed99f43928aa3f3e24c..130b90fae30f03efc0c2c9447f9780992247e108 100644 (file)
--- a/configs/stm32f746-disco_defconfig
+++ b/configs/stm32f746-disco_defconfig
@@ -9,8 +9,8 @@ CONFIG_DEFAULT_DEVICE_TREE="stm32f746-disco"
  CONFIG_SPL_TEXT_BASE=0x8000000
  CONFIG_STM32F7=y
  CONFIG_TARGET_STM32F746_DISCO=y
-CONFIG_DISTRO_DEFAULTS=y
  CONFIG_SYS_LOAD_ADDR=0x8008000
+CONFIG_DISTRO_DEFAULTS=y
  CONFIG_BOOTDELAY=3
  CONFIG_AUTOBOOT_KEYED=y
  CONFIG_AUTOBOOT_PROMPT="Hit SPACE in %d seconds to stop autoboot.\n"
diff --git a/configs/stm32f769-disco_defconfig b/configs/stm32f769-disco_defconfig

index 0ba01843597291eb75a5477bb12d20c8b37d50ea..f151dab04fc044807149d3e5950fc6a7f409b742 100644 (file)
--- a/configs/stm32f769-disco_defconfig
+++ b/configs/stm32f769-disco_defconfig
@@ -9,8 +9,8 @@ CONFIG_DEFAULT_DEVICE_TREE="stm32f769-disco"
  CONFIG_SPL_TEXT_BASE=0x8000000
  CONFIG_STM32F7=y
  CONFIG_TARGET_STM32F746_DISCO=y
-CONFIG_DISTRO_DEFAULTS=y
  CONFIG_SYS_LOAD_ADDR=0x8008000
+CONFIG_DISTRO_DEFAULTS=y
  CONFIG_BOOTDELAY=3
  CONFIG_AUTOBOOT_KEYED=y
  CONFIG_AUTOBOOT_PROMPT="Hit SPACE in %d seconds to stop autoboot.\n"
diff --git a/configs/stm32h743-disco_defconfig b/configs/stm32h743-disco_defconfig

index 62a826ebbc817b02fe14af71eb2ac766e2386726..43e9228759273c18698fbec2e747b6b5f2a23e8f 100644 (file)
--- a/configs/stm32h743-disco_defconfig
+++ b/configs/stm32h743-disco_defconfig
@@ -8,8 +8,8 @@ CONFIG_ENV_SIZE=0x2000
  CONFIG_DEFAULT_DEVICE_TREE="stm32h743i-disco"
  CONFIG_STM32H7=y
  CONFIG_TARGET_STM32H743_DISCO=y
-CONFIG_DISTRO_DEFAULTS=y
  CONFIG_SYS_LOAD_ADDR=0xd0400000
+CONFIG_DISTRO_DEFAULTS=y
  CONFIG_BOOTDELAY=3
  CONFIG_AUTOBOOT_KEYED=y
  CONFIG_AUTOBOOT_PROMPT="Hit SPACE in %d seconds to stop autoboot.\n"
diff --git a/configs/stm32h743-eval_defconfig b/configs/stm32h743-eval_defconfig

index 2fe83e1b561d2bba63e51616878a824bd2531853..d7c1c79bb352458dd4b39da4e6e81fc1f465dc0d 100644 (file)
--- a/configs/stm32h743-eval_defconfig
+++ b/configs/stm32h743-eval_defconfig
@@ -8,8 +8,8 @@ CONFIG_ENV_SIZE=0x2000
  CONFIG_DEFAULT_DEVICE_TREE="stm32h743i-eval"
  CONFIG_STM32H7=y
  CONFIG_TARGET_STM32H743_EVAL=y
-CONFIG_DISTRO_DEFAULTS=y
  CONFIG_SYS_LOAD_ADDR=0xd0400000
+CONFIG_DISTRO_DEFAULTS=y
  CONFIG_BOOTDELAY=3
  CONFIG_AUTOBOOT_KEYED=y
  CONFIG_AUTOBOOT_PROMPT="Hit SPACE in %d seconds to stop autoboot.\n"
diff --git a/configs/stm32h750-art-pi_defconfig b/configs/stm32h750-art-pi_defconfig

index 7d409695f8fcf770f272f19c7489c4ea4587a916..7a2709d52fbc8c13143e91b17d32e9e7bc48c469 100644 (file)
--- a/configs/stm32h750-art-pi_defconfig
+++ b/configs/stm32h750-art-pi_defconfig
@@ -8,8 +8,8 @@ CONFIG_ENV_SIZE=0x2000
  CONFIG_DEFAULT_DEVICE_TREE="stm32h750i-art-pi"
  CONFIG_STM32H7=y
  CONFIG_TARGET_STM32H750_ART_PI=y
-CONFIG_DISTRO_DEFAULTS=y
  CONFIG_SYS_LOAD_ADDR=0xc1800000
+CONFIG_DISTRO_DEFAULTS=y
  CONFIG_FIT=y
  CONFIG_BOOTDELAY=3
  CONFIG_AUTOBOOT_KEYED=y
diff --git a/configs/stm32mp15-icore-stm32mp1-ctouch2_defconfig b/configs/stm32mp15-icore-stm32mp1-ctouch2_defconfig

index f1deb1b9f476f86d77a3e38a2fe1c13ec79beda9..7bf24cf01781061b1afdf30166ee457030340b4a 100644 (file)
--- a/configs/stm32mp15-icore-stm32mp1-ctouch2_defconfig
+++ b/configs/stm32mp15-icore-stm32mp1-ctouch2_defconfig
@@ -9,10 +9,10 @@ CONFIG_SPL=y
  CONFIG_TARGET_ICORE_STM32MP1=y
  CONFIG_ENV_OFFSET_REDUND=0x2C0000
  # CONFIG_ARMV7_VIRT is not set
+CONFIG_SYS_LOAD_ADDR=0xc2000000
  CONFIG_SYS_MEMTEST_START=0xc0000000
  CONFIG_SYS_MEMTEST_END=0xc4000000
  CONFIG_DISTRO_DEFAULTS=y
-CONFIG_SYS_LOAD_ADDR=0xc2000000
  CONFIG_FIT=y
  CONFIG_BOOTCOMMAND="run bootcmd_stm32mp"
  CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION=y
diff --git a/configs/stm32mp15-icore-stm32mp1-edimm2.2_defconfig b/configs/stm32mp15-icore-stm32mp1-edimm2.2_defconfig

index 0c17418eba73ae84db9793fbb09fd810292e4f2d..a2f4b7e6d97e6b1b70a455eefdf58f56be3d8033 100644 (file)
--- a/configs/stm32mp15-icore-stm32mp1-edimm2.2_defconfig
+++ b/configs/stm32mp15-icore-stm32mp1-edimm2.2_defconfig
@@ -9,10 +9,10 @@ CONFIG_SPL=y
  CONFIG_TARGET_ICORE_STM32MP1=y
  CONFIG_ENV_OFFSET_REDUND=0x2C0000
  # CONFIG_ARMV7_VIRT is not set
+CONFIG_SYS_LOAD_ADDR=0xc2000000
  CONFIG_SYS_MEMTEST_START=0xc0000000
  CONFIG_SYS_MEMTEST_END=0xc4000000
  CONFIG_DISTRO_DEFAULTS=y
-CONFIG_SYS_LOAD_ADDR=0xc2000000
  CONFIG_FIT=y
  CONFIG_BOOTCOMMAND="run bootcmd_stm32mp"
  CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION=y
diff --git a/configs/stm32mp15-microgea-stm32mp1-microdev2-of7_defconfig b/configs/stm32mp15-microgea-stm32mp1-microdev2-of7_defconfig

index cbe1aadc36c954ebca49f504eac9a171aa2135d6..65bb1c675553b0583d874ee4dfd2d641d34c717f 100644 (file)
--- a/configs/stm32mp15-microgea-stm32mp1-microdev2-of7_defconfig
+++ b/configs/stm32mp15-microgea-stm32mp1-microdev2-of7_defconfig
@@ -9,10 +9,10 @@ CONFIG_SPL=y
  CONFIG_TARGET_MICROGEA_STM32MP1=y
  CONFIG_ENV_OFFSET_REDUND=0x2C0000
  # CONFIG_ARMV7_VIRT is not set
+CONFIG_SYS_LOAD_ADDR=0xc2000000
  CONFIG_SYS_MEMTEST_START=0xc0000000
  CONFIG_SYS_MEMTEST_END=0xc4000000
  CONFIG_DISTRO_DEFAULTS=y
-CONFIG_SYS_LOAD_ADDR=0xc2000000
  CONFIG_FIT=y
  CONFIG_BOOTCOMMAND="run bootcmd_stm32mp"
  CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION=y
diff --git a/configs/stm32mp15-microgea-stm32mp1-microdev2_defconfig b/configs/stm32mp15-microgea-stm32mp1-microdev2_defconfig

index efc0320e7eeb51a7b9bd52dd1789b1cd7c33797a..39f7d9643b17de2a3dbc24a858f9cec7dd97a810 100644 (file)
--- a/configs/stm32mp15-microgea-stm32mp1-microdev2_defconfig
+++ b/configs/stm32mp15-microgea-stm32mp1-microdev2_defconfig
@@ -9,10 +9,10 @@ CONFIG_SPL=y
  CONFIG_TARGET_MICROGEA_STM32MP1=y
  CONFIG_ENV_OFFSET_REDUND=0x2C0000
  # CONFIG_ARMV7_VIRT is not set
+CONFIG_SYS_LOAD_ADDR=0xc2000000
  CONFIG_SYS_MEMTEST_START=0xc0000000
  CONFIG_SYS_MEMTEST_END=0xc4000000
  CONFIG_DISTRO_DEFAULTS=y
-CONFIG_SYS_LOAD_ADDR=0xc2000000
  CONFIG_FIT=y
  CONFIG_BOOTCOMMAND="run bootcmd_stm32mp"
  CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION=y
diff --git a/configs/stm32mp15_basic_defconfig b/configs/stm32mp15_basic_defconfig

index f21877565563ad7172d22d4a47dde5ad107404a3..5d1b2e0fd7ef06b9805f5dbbd1de2c7d1d32b3de 100644 (file)
--- a/configs/stm32mp15_basic_defconfig
+++ b/configs/stm32mp15_basic_defconfig
@@ -16,10 +16,10 @@ CONFIG_TYPEC_STUSB160X=y
  CONFIG_SPL_SPI_FLASH_SUPPORT=y
  CONFIG_SPL_SPI=y
  # CONFIG_ARMV7_VIRT is not set
+CONFIG_SYS_LOAD_ADDR=0xc2000000
  CONFIG_SYS_MEMTEST_START=0xc0000000
  CONFIG_SYS_MEMTEST_END=0xc4000000
  CONFIG_DISTRO_DEFAULTS=y
-CONFIG_SYS_LOAD_ADDR=0xc2000000
  CONFIG_FIT=y
  CONFIG_BOOTDELAY=1
  CONFIG_BOOTCOMMAND="run bootcmd_stm32mp"
diff --git a/configs/stm32mp15_defconfig b/configs/stm32mp15_defconfig

index d0815573bfb7762616033c6fffc38fde68bd80af..29ecb2f82abd0b4e9608e45bd363ed4f4fb72ccd 100644 (file)
--- a/configs/stm32mp15_defconfig
+++ b/configs/stm32mp15_defconfig
@@ -12,10 +12,10 @@ CONFIG_CMD_STM32PROG=y
  CONFIG_ENV_OFFSET_REDUND=0x4C0000
  CONFIG_TYPEC_STUSB160X=y
  # CONFIG_ARMV7_NONSEC is not set
+CONFIG_SYS_LOAD_ADDR=0xc2000000
  CONFIG_SYS_MEMTEST_START=0xc0000000
  CONFIG_SYS_MEMTEST_END=0xc4000000
  CONFIG_DISTRO_DEFAULTS=y
-CONFIG_SYS_LOAD_ADDR=0xc2000000
  CONFIG_FIT=y
  CONFIG_BOOTDELAY=1
  CONFIG_BOOTCOMMAND="run bootcmd_stm32mp"
diff --git a/configs/stm32mp15_dhcom_basic_defconfig b/configs/stm32mp15_dhcom_basic_defconfig

index 08b7d527f9b3a113e2b000ee6be03b7ee5a174b2..ec955eae200923b06a2d63e5ef75c41954b8f263 100644 (file)
--- a/configs/stm32mp15_dhcom_basic_defconfig
+++ b/configs/stm32mp15_dhcom_basic_defconfig
@@ -12,10 +12,10 @@ CONFIG_TARGET_DH_STM32MP1_PDK2=y
  CONFIG_SPL_SPI_FLASH_SUPPORT=y
  CONFIG_SPL_SPI=y
  # CONFIG_ARMV7_VIRT is not set
+CONFIG_SYS_LOAD_ADDR=0xc2000000
  CONFIG_SYS_MEMTEST_START=0xc0000000
  CONFIG_SYS_MEMTEST_END=0xc4000000
  CONFIG_DISTRO_DEFAULTS=y
-CONFIG_SYS_LOAD_ADDR=0xc2000000
  CONFIG_FIT=y
  CONFIG_SPL_LOAD_FIT=y
  CONFIG_SPL_LOAD_FIT_ADDRESS=0xc1000000
diff --git a/configs/stm32mp15_dhcor_basic_defconfig b/configs/stm32mp15_dhcor_basic_defconfig

index 847f80ef4ccfd0ea6420678f0aae359fedf5f178..387e068155ed379c644d08f9a296921db186ad07 100644 (file)
--- a/configs/stm32mp15_dhcor_basic_defconfig
+++ b/configs/stm32mp15_dhcor_basic_defconfig
@@ -12,8 +12,8 @@ CONFIG_TARGET_DH_STM32MP1_PDK2=y
  CONFIG_SPL_SPI_FLASH_SUPPORT=y
  CONFIG_SPL_SPI=y
  # CONFIG_ARMV7_VIRT is not set
-CONFIG_DISTRO_DEFAULTS=y
  CONFIG_SYS_LOAD_ADDR=0xc2000000
+CONFIG_DISTRO_DEFAULTS=y
  CONFIG_FIT=y
  CONFIG_SPL_LOAD_FIT=y
  CONFIG_SPL_LOAD_FIT_ADDRESS=0xc1000000
diff --git a/configs/stm32mp15_trusted_defconfig b/configs/stm32mp15_trusted_defconfig

index 171a305e4fcca44ec5fefed417f5fdf37161b5af..e724db497459613fe00a40f1bb7bb0b877d6b14b 100644 (file)
--- a/configs/stm32mp15_trusted_defconfig
+++ b/configs/stm32mp15_trusted_defconfig
@@ -13,10 +13,10 @@ CONFIG_CMD_STM32PROG=y
  CONFIG_ENV_OFFSET_REDUND=0x2C0000
  CONFIG_TYPEC_STUSB160X=y
  # CONFIG_ARMV7_NONSEC is not set
+CONFIG_SYS_LOAD_ADDR=0xc2000000
  CONFIG_SYS_MEMTEST_START=0xc0000000
  CONFIG_SYS_MEMTEST_END=0xc4000000
  CONFIG_DISTRO_DEFAULTS=y
-CONFIG_SYS_LOAD_ADDR=0xc2000000
  CONFIG_FIT=y
  CONFIG_BOOTDELAY=1
  CONFIG_BOOTCOMMAND="run bootcmd_stm32mp"
diff --git a/configs/stmark2_defconfig b/configs/stmark2_defconfig

index d3507dec8fa9d3416f8bf13fd723150d2e85dcd1..75369d2a0e188e8c6aa6b81bfe14cd6e2203c998 100644 (file)
--- a/configs/stmark2_defconfig
+++ b/configs/stmark2_defconfig
@@ -5,9 +5,9 @@ CONFIG_ENV_SIZE=0x2000
  CONFIG_ENV_OFFSET=0x40000
  CONFIG_ENV_SECT_SIZE=0x10000
  CONFIG_DEFAULT_DEVICE_TREE="stmark2"
+CONFIG_SYS_LOAD_ADDR=0x40010000
  CONFIG_TARGET_STMARK2=y
  CONFIG_MCFTMR=y
-CONFIG_SYS_LOAD_ADDR=0x40010000
  CONFIG_TIMESTAMP=y
  CONFIG_SYS_MONITOR_BASE=0x47E00400
  CONFIG_USE_BOOTARGS=y
diff --git a/configs/stout_defconfig b/configs/stout_defconfig

index ea07ceb8f373c7df38c654cb4975ce25d0fd5d5e..35c99aaed37bc536dfdffb7abd5ada4775b7539f 100644 (file)
--- a/configs/stout_defconfig
+++ b/configs/stout_defconfig
@@ -25,6 +25,7 @@ CONFIG_SPL=y
  CONFIG_SPL_SPI_FLASH_SUPPORT=y
  CONFIG_SPL_SPI=y
  CONFIG_SYS_LOAD_ADDR=0x50000000
+CONFIG_ENV_ADDR=0xC0000
  CONFIG_FIT=y
  CONFIG_BOOTDELAY=3
  CONFIG_SPL_BOARD_INIT=y
@@ -60,7 +61,6 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=spi0.0:256k(u-boot-spl),512k(u-boot-env1),512k
  CONFIG_OF_CONTROL=y
  CONFIG_ENV_OVERWRITE=y
  CONFIG_ENV_IS_IN_SPI_FLASH=y
-CONFIG_ENV_ADDR=0xC0000
  CONFIG_VERSION_VARIABLE=y
  CONFIG_CLK=y
  CONFIG_CLK_RENESAS=y
diff --git a/configs/stv0991_defconfig b/configs/stv0991_defconfig

index d58d6c3c9c08164c3050a8942d2d1d9aca2b9c87..104c573b3b4f35357da83e05755d4aa89ef192e9 100644 (file)
--- a/configs/stv0991_defconfig
+++ b/configs/stv0991_defconfig
@@ -9,9 +9,10 @@ CONFIG_ENV_SIZE=0x10000
  CONFIG_ENV_OFFSET=0x30000
  CONFIG_ENV_SECT_SIZE=0x10000
  CONFIG_DEFAULT_DEVICE_TREE="stv0991"
+CONFIG_SYS_LOAD_ADDR=0x0
+CONFIG_ENV_ADDR=0x188000
  CONFIG_SYS_MEMTEST_START=0x00000000
  CONFIG_SYS_MEMTEST_END=0x00100000
-CONFIG_SYS_LOAD_ADDR=0x0
  CONFIG_BOOTDELAY=3
  CONFIG_AUTOBOOT_KEYED=y
  CONFIG_AUTOBOOT_PROMPT="Hit SPACE in %d seconds to stop autoboot.\n"
@@ -29,7 +30,6 @@ CONFIG_CMD_SPI=y
  CONFIG_CMD_PING=y
  CONFIG_OF_CONTROL=y
  CONFIG_ENV_IS_IN_SPI_FLASH=y
-CONFIG_ENV_ADDR=0x188000
  # CONFIG_MMC is not set
  CONFIG_SPI_FLASH_STMICRO=y
  CONFIG_SPI_FLASH_WINBOND=y
diff --git a/configs/synquacer_developerbox_defconfig b/configs/synquacer_developerbox_defconfig

index fe12c74374f956212dd3634ce15e4923a50b604e..6deb6f389332bbf1c3b9bd825364e6520686c23c 100644 (file)
--- a/configs/synquacer_developerbox_defconfig
+++ b/configs/synquacer_developerbox_defconfig
@@ -7,9 +7,9 @@ CONFIG_ENV_OFFSET=0x300000
  CONFIG_ENV_SECT_SIZE=0x10000
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="synquacer-sc2a11-developerbox"
+CONFIG_SYS_LOAD_ADDR=0x80000000
  CONFIG_TARGET_DEVELOPERBOX=y
  CONFIG_AHCI=y
-CONFIG_SYS_LOAD_ADDR=0x80000000
  CONFIG_FIT=y
  CONFIG_BOOTSTAGE_STASH_SIZE=4096
  CONFIG_HUSH_PARSER=y
diff --git a/configs/syzygy_hub_defconfig b/configs/syzygy_hub_defconfig

index 33ae69b573e8c7d89838b546d4d731d824864ed4..9d2edd2eceb6c7a45d60262ea7498d70928735bb 100644 (file)
--- a/configs/syzygy_hub_defconfig
+++ b/configs/syzygy_hub_defconfig
@@ -13,12 +13,12 @@ CONFIG_DEBUG_UART_BASE=0xe0000000
  CONFIG_DEBUG_UART_CLOCK=50000000
  CONFIG_ZYNQ_MAC_IN_EEPROM=y
  CONFIG_ZYNQ_GEM_I2C_MAC_OFFSET=0xFA
+CONFIG_SYS_LOAD_ADDR=0x0
  CONFIG_DEBUG_UART=y
  CONFIG_DISTRO_DEFAULTS=y
  CONFIG_REMAKE_ELF=y
  CONFIG_SYS_CUSTOM_LDSCRIPT=y
  CONFIG_SYS_LDSCRIPT="arch/arm/mach-zynq/u-boot.lds"
-CONFIG_SYS_LOAD_ADDR=0x0
  CONFIG_FIT=y
  CONFIG_FIT_SIGNATURE=y
  CONFIG_FIT_VERBOSE=y
diff --git a/configs/taurus_defconfig b/configs/taurus_defconfig

index 68de985a5f5afc16c251a2b3ad1e4f3dbaa04a41..78a1fbb72c989f0ffbe5037cded685f6d679ceee 100644 (file)
--- a/configs/taurus_defconfig
+++ b/configs/taurus_defconfig
@@ -30,8 +30,8 @@ CONFIG_DEBUG_UART_CLOCK=18432000
  CONFIG_ENV_OFFSET_REDUND=0x180000
  CONFIG_SPL_SPI_FLASH_SUPPORT=y
  CONFIG_SPL_SPI=y
-CONFIG_DEBUG_UART=y
  CONFIG_SYS_LOAD_ADDR=0x22000000
+CONFIG_DEBUG_UART=y
  CONFIG_NAND_BOOT=y
  CONFIG_BOOTDELAY=3
  CONFIG_USE_BOOTARGS=y
diff --git a/configs/theadorable_debug_defconfig b/configs/theadorable_debug_defconfig

index 3b841b0c427a3d936237af35e85537f4016eee3c..64ae29113e3e21cd35c31736905e7727fb2aded9 100644 (file)
--- a/configs/theadorable_debug_defconfig
+++ b/configs/theadorable_debug_defconfig
@@ -17,9 +17,9 @@ CONFIG_SPL_SERIAL=y
  CONFIG_SPL=y
  CONFIG_DEBUG_UART_BASE=0xd0012000
  CONFIG_DEBUG_UART_CLOCK=250000000
+CONFIG_SYS_LOAD_ADDR=0x800000
  CONFIG_DEBUG_UART=y
  # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
-CONFIG_SYS_LOAD_ADDR=0x800000
  CONFIG_FIT=y
  CONFIG_BOOTDELAY=3
  CONFIG_USE_PREBOOT=y
diff --git a/configs/thuban_defconfig b/configs/thuban_defconfig

index 4e2229098994f54f1c2a23474fe5bf9a8ba459fd..45e5652deb68ecda6c80d24b7b7dad8e31c241f2 100644 (file)
--- a/configs/thuban_defconfig
+++ b/configs/thuban_defconfig
@@ -22,8 +22,8 @@ CONFIG_SPL_FS_FAT=y
  CONFIG_SPL_LIBDISK_SUPPORT=y
  CONFIG_SPL_SPI_FLASH_SUPPORT=y
  CONFIG_SPL_SPI=y
-CONFIG_ENV_VARS_UBOOT_CONFIG=y
  CONFIG_SYS_LOAD_ADDR=0x81000000
+CONFIG_ENV_VARS_UBOOT_CONFIG=y
  CONFIG_BOOTDELAY=3
  CONFIG_AUTOBOOT_KEYED=y
  CONFIG_AUTOBOOT_PROMPT="Autobooting in %d seconds, press \"<Esc><Esc>\" to stop\n"
diff --git a/configs/thunderx_88xx_defconfig b/configs/thunderx_88xx_defconfig

index 9a23701d5b5279f0f8c29ebc43abddba35c9054f..9b0966cfe4a05e34760db4831123af5bfda394f5 100644 (file)
--- a/configs/thunderx_88xx_defconfig
+++ b/configs/thunderx_88xx_defconfig
@@ -8,9 +8,9 @@ CONFIG_DEFAULT_DEVICE_TREE="thunderx-88xx"
  CONFIG_DEBUG_UART_BASE=0x87e024000000
  CONFIG_DEBUG_UART_CLOCK=24000000
  CONFIG_IDENT_STRING=" for Cavium Thunder CN88XX ARM v8 Multi-Core"
+CONFIG_SYS_LOAD_ADDR=0x500000
  CONFIG_DEBUG_UART=y
  CONFIG_REMAKE_ELF=y
-CONFIG_SYS_LOAD_ADDR=0x500000
  CONFIG_BOOTDELAY=5
  CONFIG_USE_BOOTARGS=y
  CONFIG_BOOTARGS="console=ttyAMA0,115200n8 earlycon=pl011,0x87e024000000 debug maxcpus=48 rootwait rw root=/dev/sda2 coherent_pool=16M"
diff --git a/configs/tinker-rk3288_defconfig b/configs/tinker-rk3288_defconfig

index 85dcb9eb885e9343c422d0e7a0c2df31af3a1f49..9b94a40ea2e46807aa8c91c5b9c32a08218d5806 100644 (file)
--- a/configs/tinker-rk3288_defconfig
+++ b/configs/tinker-rk3288_defconfig
@@ -14,8 +14,8 @@ CONFIG_SPL_STACK_R_ADDR=0x80000
  CONFIG_SPL_SIZE_LIMIT=0x4b000
  CONFIG_DEBUG_UART_BASE=0xff690000
  CONFIG_DEBUG_UART_CLOCK=24000000
-CONFIG_DEBUG_UART=y
  CONFIG_SYS_LOAD_ADDR=0x800800
+CONFIG_DEBUG_UART=y
  # CONFIG_ANDROID_BOOT_IMAGE is not set
  CONFIG_USE_PREBOOT=y
  CONFIG_DEFAULT_FDT_FILE="rk3288-tinker.dtb"
diff --git a/configs/tinker-s-rk3288_defconfig b/configs/tinker-s-rk3288_defconfig

index 8d8cbd78a1a92ea4913769321b1f18c5ba38fd12..4cec319460a739ffb2bc62375c43cb92dec4e336 100644 (file)
--- a/configs/tinker-s-rk3288_defconfig
+++ b/configs/tinker-s-rk3288_defconfig
@@ -14,8 +14,8 @@ CONFIG_SPL_STACK_R_ADDR=0x800000
  CONFIG_SPL_SIZE_LIMIT=0x4B000
  CONFIG_DEBUG_UART_BASE=0xff690000
  CONFIG_DEBUG_UART_CLOCK=24000000
-CONFIG_DEBUG_UART=y
  CONFIG_SYS_LOAD_ADDR=0x800800
+CONFIG_DEBUG_UART=y
  # CONFIG_ANDROID_BOOT_IMAGE is not set
  CONFIG_USE_PREBOOT=y
  CONFIG_DEFAULT_FDT_FILE="rk3288-tinker-s.dtb"
diff --git a/configs/topic_miami_defconfig b/configs/topic_miami_defconfig

index 17aab869acce3d7dd3216d8073f5fa41283d96cc..eecc3dcb935867c5a0b1c43eb6624909c588ff5d 100644 (file)
--- a/configs/topic_miami_defconfig
+++ b/configs/topic_miami_defconfig
@@ -13,6 +13,7 @@ CONFIG_SPL=y
  CONFIG_DEBUG_UART_BASE=0xe0000000
  CONFIG_DEBUG_UART_CLOCK=100000000
  CONFIG_BOOT_INIT_FILE="board/topic/zynq/zynq-topic-miami/ps7_regs.txt"
+CONFIG_SYS_LOAD_ADDR=0x0
  CONFIG_DEBUG_UART=y
  CONFIG_SYS_MEMTEST_START=0x00000000
  CONFIG_SYS_MEMTEST_END=0x18000000
@@ -20,7 +21,6 @@ CONFIG_DISTRO_DEFAULTS=y
  CONFIG_REMAKE_ELF=y
  CONFIG_SYS_CUSTOM_LDSCRIPT=y
  CONFIG_SYS_LDSCRIPT="arch/arm/mach-zynq/u-boot.lds"
-CONFIG_SYS_LOAD_ADDR=0x0
  CONFIG_BOOTDELAY=0
  CONFIG_BOOTCOMMAND="if mmcinfo; then if fatload mmc 0 0x1900000 ${bootscript}; then source 0x1900000; fi; fi; run $modeboot"
  CONFIG_USE_PREBOOT=y
diff --git a/configs/topic_miamilite_defconfig b/configs/topic_miamilite_defconfig

index 4edd6eddd9d25462af551a5c8431a80b288f51d9..7188a03edcb4c2128dc908879a81d8676b606f96 100644 (file)
--- a/configs/topic_miamilite_defconfig
+++ b/configs/topic_miamilite_defconfig
@@ -13,6 +13,7 @@ CONFIG_SPL=y
  CONFIG_DEBUG_UART_BASE=0xe0000000
  CONFIG_DEBUG_UART_CLOCK=100000000
  CONFIG_BOOT_INIT_FILE="board/topic/zynq/zynq-topic-miamilite/ps7_regs.txt"
+CONFIG_SYS_LOAD_ADDR=0x0
  CONFIG_DEBUG_UART=y
  CONFIG_SYS_MEMTEST_START=0x00000000
  CONFIG_SYS_MEMTEST_END=0x18000000
@@ -20,7 +21,6 @@ CONFIG_DISTRO_DEFAULTS=y
  CONFIG_REMAKE_ELF=y
  CONFIG_SYS_CUSTOM_LDSCRIPT=y
  CONFIG_SYS_LDSCRIPT="arch/arm/mach-zynq/u-boot.lds"
-CONFIG_SYS_LOAD_ADDR=0x0
  CONFIG_BOOTDELAY=0
  CONFIG_BOOTCOMMAND="if mmcinfo; then if fatload mmc 0 0x1900000 ${bootscript}; then source 0x1900000; fi; fi; run $modeboot"
  CONFIG_USE_PREBOOT=y
diff --git a/configs/topic_miamiplus_defconfig b/configs/topic_miamiplus_defconfig

index 56a791a503e6fa03d7f6e0c58e1f66a928ea9cf5..83f38effd5f7e882e0894b933d2d0920eaab2f2d 100644 (file)
--- a/configs/topic_miamiplus_defconfig
+++ b/configs/topic_miamiplus_defconfig
@@ -13,6 +13,7 @@ CONFIG_SPL=y
  CONFIG_DEBUG_UART_BASE=0xe0000000
  CONFIG_DEBUG_UART_CLOCK=100000000
  CONFIG_BOOT_INIT_FILE="board/topic/zynq/zynq-topic-miamiplus/ps7_regs.txt"
+CONFIG_SYS_LOAD_ADDR=0x0
  CONFIG_DEBUG_UART=y
  CONFIG_SYS_MEMTEST_START=0x00000000
  CONFIG_SYS_MEMTEST_END=0x18000000
@@ -20,7 +21,6 @@ CONFIG_DISTRO_DEFAULTS=y
  CONFIG_REMAKE_ELF=y
  CONFIG_SYS_CUSTOM_LDSCRIPT=y
  CONFIG_SYS_LDSCRIPT="arch/arm/mach-zynq/u-boot.lds"
-CONFIG_SYS_LOAD_ADDR=0x0
  CONFIG_BOOTDELAY=0
  CONFIG_BOOTCOMMAND="if mmcinfo; then if fatload mmc 0 0x1900000 ${bootscript}; then source 0x1900000; fi; fi; run $modeboot"
  CONFIG_USE_PREBOOT=y
diff --git a/configs/total_compute_defconfig b/configs/total_compute_defconfig

index e1c7c453ca5f9cc98699aca931b99060a721a6db..52f349c942c22c7000146146040bfac38876ed9e 100644 (file)
--- a/configs/total_compute_defconfig
+++ b/configs/total_compute_defconfig
@@ -6,11 +6,11 @@ CONFIG_SYS_MALLOC_F_LEN=0x2000
  CONFIG_NR_DRAM_BANKS=2
  CONFIG_ENV_SIZE=0x2a00000
  CONFIG_DEFAULT_DEVICE_TREE="total_compute"
+CONFIG_SYS_LOAD_ADDR=0x90000000
  CONFIG_SYS_MEMTEST_START=0x80000000
  CONFIG_SYS_MEMTEST_END=0xff000000
  CONFIG_DISTRO_DEFAULTS=y
  CONFIG_REMAKE_ELF=y
-CONFIG_SYS_LOAD_ADDR=0x90000000
  CONFIG_ANDROID_BOOT_IMAGE=y
  CONFIG_FIT=y
  CONFIG_FIT_SIGNATURE=y
diff --git a/configs/tplink_wdr4300_defconfig b/configs/tplink_wdr4300_defconfig

index 848895ee9c1e910b5eafa2402cd5ce00ab9bebc2..1f7b65a66591dc141331184a62c4aa246a63ba67 100644 (file)
--- a/configs/tplink_wdr4300_defconfig
+++ b/configs/tplink_wdr4300_defconfig
@@ -4,11 +4,11 @@ CONFIG_SYS_MALLOC_LEN=0x40000
  CONFIG_SYS_MALLOC_F_LEN=0x2000
  CONFIG_ENV_SIZE=0x10000
  CONFIG_DEFAULT_DEVICE_TREE="tplink_wdr4300"
+CONFIG_SYS_LOAD_ADDR=0xa1000000
  CONFIG_ARCH_ATH79=y
  CONFIG_BOARD_TPLINK_WDR4300=y
  CONFIG_SYS_MEMTEST_START=0x80100000
  CONFIG_SYS_MEMTEST_END=0x83f00000
-CONFIG_SYS_LOAD_ADDR=0xa1000000
  CONFIG_BOOTDELAY=3
  CONFIG_USE_BOOTARGS=y
  CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/mtdblock2 rootfstype=squashfs"
diff --git a/configs/trats2_defconfig b/configs/trats2_defconfig

index b93c9eb7175b9460b45354eca67b3d4a0a7729f1..b38ee99371b945e795ead87adec4dc61ff3e5760 100644 (file)
--- a/configs/trats2_defconfig
+++ b/configs/trats2_defconfig
@@ -10,9 +10,9 @@ CONFIG_TARGET_TRATS2=y
  CONFIG_ENV_SIZE=0x1000
  CONFIG_ENV_OFFSET=0x7000
  CONFIG_DEFAULT_DEVICE_TREE="exynos4412-trats2"
+CONFIG_SYS_LOAD_ADDR=0x43e00000
  CONFIG_DISTRO_DEFAULTS=y
  # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
-CONFIG_SYS_LOAD_ADDR=0x43e00000
  CONFIG_FIT=y
  CONFIG_FIT_VERBOSE=y
  CONFIG_USE_BOOTARGS=y
diff --git a/configs/trats_defconfig b/configs/trats_defconfig

index d55c1d70e64b7aaef3989b9c31dffcbce1a6999c..d0689444f987b7e414db248b2f99a5d022dd8146 100644 (file)
--- a/configs/trats_defconfig
+++ b/configs/trats_defconfig
@@ -10,8 +10,8 @@ CONFIG_TARGET_TRATS=y
  CONFIG_ENV_SIZE=0x1000
  CONFIG_ENV_OFFSET=0x7000
  CONFIG_DEFAULT_DEVICE_TREE="exynos4210-trats"
-CONFIG_DISTRO_DEFAULTS=y
  CONFIG_SYS_LOAD_ADDR=0x44800000
+CONFIG_DISTRO_DEFAULTS=y
  CONFIG_FIT=y
  CONFIG_FIT_VERBOSE=y
  CONFIG_USE_BOOTARGS=y
diff --git a/configs/tuge1_defconfig b/configs/tuge1_defconfig

index e4b4afc9fdc5bbe440e9dbabd0caacef534f4f77..11f8b5b10516286a76ffbe40499a4a2c9098e884 100644 (file)
--- a/configs/tuge1_defconfig
+++ b/configs/tuge1_defconfig
@@ -5,6 +5,8 @@ CONFIG_ENV_SECT_SIZE=0x20000
  CONFIG_DEFAULT_DEVICE_TREE="kmtuge1"
  CONFIG_BOOTCOUNT_BOOTLIMIT=3
  CONFIG_SYS_CLK_FREQ=66000000
+CONFIG_SYS_LOAD_ADDR=0x100000
+CONFIG_ENV_ADDR=0xF00C0000
  CONFIG_MPC83xx=y
  CONFIG_HIGH_BATS=y
  CONFIG_TARGET_TUGE1=y
@@ -120,7 +122,6 @@ CONFIG_ACR_PARKM_USB_I2C1_BOOT=y
  CONFIG_LCRR_EADC_1=y
  CONFIG_LCRR_CLKDIV_2=y
  CONFIG_83XX_PCICLK=0x3ef1480
-CONFIG_SYS_LOAD_ADDR=0x100000
  CONFIG_OF_BOARD_SETUP=y
  CONFIG_OF_STDOUT_VIA_ALIAS=y
  CONFIG_AUTOBOOT_KEYED=y
@@ -149,7 +150,6 @@ CONFIG_CMD_UBI=y
  # CONFIG_CMD_UBIFS is not set
  CONFIG_ENV_OVERWRITE=y
  CONFIG_SYS_REDUNDAND_ENVIRONMENT=y
-CONFIG_ENV_ADDR=0xF00C0000
  CONFIG_ENV_ADDR_REDUND=0xF00E0000
  CONFIG_USE_ETHPRIME=y
  CONFIG_ETHPRIME="UEC0"
diff --git a/configs/turris_mox_defconfig b/configs/turris_mox_defconfig

index 27bf740b4e50de0250c4689a0bb0cfbac2efab31..a87322c05221578aa21784c767d30e09ec409393 100644 (file)
--- a/configs/turris_mox_defconfig
+++ b/configs/turris_mox_defconfig
@@ -11,12 +11,12 @@ CONFIG_ENV_SECT_SIZE=0x10000
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="armada-3720-turris-mox"
  CONFIG_DEBUG_UART_BASE=0xd0012000
+CONFIG_SYS_LOAD_ADDR=0x800000
  CONFIG_DEBUG_UART=y
  CONFIG_AHCI=y
  CONFIG_OF_BOARD_FIXUP=y
  CONFIG_DISTRO_DEFAULTS=y
  # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
-CONFIG_SYS_LOAD_ADDR=0x800000
  CONFIG_FIT=y
  CONFIG_FIT_VERBOSE=y
  CONFIG_OF_BOARD_SETUP=y
diff --git a/configs/turris_omnia_defconfig b/configs/turris_omnia_defconfig

index 17c0136b47bd149a34e6d540c0a10942a9ab0f1a..7c9813b6c93c9eb9a15dc14f2a26524e8732de7f 100644 (file)
--- a/configs/turris_omnia_defconfig
+++ b/configs/turris_omnia_defconfig
@@ -20,13 +20,13 @@ CONFIG_SPL_SERIAL=y
  CONFIG_SPL=y
  CONFIG_DEBUG_UART_BASE=0xd0012000
  CONFIG_DEBUG_UART_CLOCK=250000000
+CONFIG_SYS_LOAD_ADDR=0x800000
  CONFIG_DEBUG_UART=y
  CONFIG_AHCI=y
  CONFIG_OF_BOARD_FIXUP=y
  CONFIG_SYS_MEMTEST_START=0x00800000
  CONFIG_SYS_MEMTEST_END=0x00ffffff
  CONFIG_DISTRO_DEFAULTS=y
-CONFIG_SYS_LOAD_ADDR=0x800000
  CONFIG_FIT=y
  CONFIG_FIT_VERBOSE=y
  CONFIG_OF_BOARD_SETUP=y
diff --git a/configs/tuxx1_defconfig b/configs/tuxx1_defconfig

index 0a2c36c16f792cdc25d27e37281ac570cf1114d7..c253664062193e6893731f18a09fc89b735f25bc 100644 (file)
--- a/configs/tuxx1_defconfig
+++ b/configs/tuxx1_defconfig
@@ -5,6 +5,8 @@ CONFIG_ENV_SECT_SIZE=0x20000
  CONFIG_DEFAULT_DEVICE_TREE="kmtuxa1"
  CONFIG_BOOTCOUNT_BOOTLIMIT=3
  CONFIG_SYS_CLK_FREQ=66000000
+CONFIG_SYS_LOAD_ADDR=0x100000
+CONFIG_ENV_ADDR=0xF00C0000
  CONFIG_MPC83xx=y
  CONFIG_HIGH_BATS=y
  CONFIG_TARGET_TUXX1=y
@@ -142,7 +144,6 @@ CONFIG_ACR_PARKM_USB_I2C1_BOOT=y
  CONFIG_LCRR_EADC_1=y
  CONFIG_LCRR_CLKDIV_2=y
  CONFIG_83XX_PCICLK=0x3ef1480
-CONFIG_SYS_LOAD_ADDR=0x100000
  CONFIG_OF_BOARD_SETUP=y
  CONFIG_OF_STDOUT_VIA_ALIAS=y
  CONFIG_AUTOBOOT_KEYED=y
@@ -171,7 +172,6 @@ CONFIG_CMD_UBI=y
  # CONFIG_CMD_UBIFS is not set
  CONFIG_ENV_OVERWRITE=y
  CONFIG_SYS_REDUNDAND_ENVIRONMENT=y
-CONFIG_ENV_ADDR=0xF00C0000
  CONFIG_ENV_ADDR_REDUND=0xF00E0000
  CONFIG_USE_ETHPRIME=y
  CONFIG_ETHPRIME="UEC0"
diff --git a/configs/u200_defconfig b/configs/u200_defconfig

index 75265ebcb2954d5f19604362628afb74e847af80..609f282c65a7ce3a1b3d9b19fbbfdf4c3abbf1ab 100644 (file)
--- a/configs/u200_defconfig
+++ b/configs/u200_defconfig
@@ -9,9 +9,9 @@ CONFIG_MESON_G12A=y
  CONFIG_DEBUG_UART_BASE=0xff803000
  CONFIG_DEBUG_UART_CLOCK=24000000
  CONFIG_IDENT_STRING=" u200"
+CONFIG_SYS_LOAD_ADDR=0x1000000
  CONFIG_DEBUG_UART=y
  CONFIG_REMAKE_ELF=y
-CONFIG_SYS_LOAD_ADDR=0x1000000
  CONFIG_OF_BOARD_SETUP=y
  # CONFIG_DISPLAY_CPUINFO is not set
  CONFIG_MISC_INIT_R=y
diff --git a/configs/uDPU_defconfig b/configs/uDPU_defconfig

index 4bd5ec34148cc363f31d7f1dc3bfdfd0485240fe..e9c183fa5078e240dc6cd7c8e964bc2c74633ad3 100644 (file)
--- a/configs/uDPU_defconfig
+++ b/configs/uDPU_defconfig
@@ -10,11 +10,11 @@ CONFIG_ENV_SECT_SIZE=0x10000
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="armada-3720-uDPU"
  CONFIG_DEBUG_UART_BASE=0xd0012000
+CONFIG_SYS_LOAD_ADDR=0x6000000
  CONFIG_DEBUG_UART=y
  CONFIG_AHCI=y
  CONFIG_DISTRO_DEFAULTS=y
  # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
-CONFIG_SYS_LOAD_ADDR=0x6000000
  CONFIG_FIT=y
  CONFIG_SPI_BOOT=y
  CONFIG_USE_PREBOOT=y
diff --git a/configs/usbarmory_defconfig b/configs/usbarmory_defconfig

index e6fc4a6d9b1a1184eb3acd040cd2fe32dbebedc7..6141a5cfd015b05df60ab9da4283fd5640b84dc6 100644 (file)
--- a/configs/usbarmory_defconfig
+++ b/configs/usbarmory_defconfig
@@ -11,10 +11,10 @@ CONFIG_SYS_I2C_MXC_I2C2=y
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="imx53-usbarmory"
  # CONFIG_CMD_BMODE is not set
+CONFIG_SYS_LOAD_ADDR=0x72000000
  CONFIG_SYS_MEMTEST_START=0x70000000
  CONFIG_SYS_MEMTEST_END=0x90000000
  CONFIG_DISTRO_DEFAULTS=y
-CONFIG_SYS_LOAD_ADDR=0x72000000
  CONFIG_BOOTCOMMAND="run distro_bootcmd; setenv bootargs console=${console} ${bootargs_default}; ext2load mmc 0:1 ${kernel_addr_r} /boot/zImage; ext2load mmc 0:1 ${fdt_addr_r} /boot/${fdtfile}; bootz ${kernel_addr_r} - ${fdt_addr_r}"
  CONFIG_CMD_MEMTEST=y
  CONFIG_CMD_FUSE=y
diff --git a/configs/verdin-imx8mm_defconfig b/configs/verdin-imx8mm_defconfig

index 5b7d68904cad0199cd9734f11be4d6fccef25521..a68cae71f459f2f94b46cf51614d4a7f25cde47d 100644 (file)
--- a/configs/verdin-imx8mm_defconfig
+++ b/configs/verdin-imx8mm_defconfig
@@ -2,7 +2,6 @@ CONFIG_ARM=y
  CONFIG_ARCH_IMX8M=y
  CONFIG_SYS_TEXT_BASE=0x40200000
  CONFIG_SYS_MALLOC_LEN=0x2000000
-CONFIG_SYS_MALLOC_F_LEN=0x10000
  CONFIG_SPL_GPIO=y
  CONFIG_SPL_LIBCOMMON_SUPPORT=y
  CONFIG_SPL_LIBGENERIC_SUPPORT=y
@@ -16,10 +15,10 @@ CONFIG_SPL_MMC=y
  CONFIG_SPL_SERIAL=y
  CONFIG_SPL_DRIVERS_MISC=y
  CONFIG_SPL=y
+CONFIG_SYS_LOAD_ADDR=0x40480000
  CONFIG_SYS_MEMTEST_START=0x40000000
  CONFIG_SYS_MEMTEST_END=0x80000000
  CONFIG_DISTRO_DEFAULTS=y
-CONFIG_SYS_LOAD_ADDR=0x40480000
  CONFIG_FIT=y
  CONFIG_FIT_EXTERNAL_OFFSET=0x3000
  CONFIG_SPL_LOAD_FIT=y
diff --git a/configs/verdin-imx8mp_defconfig b/configs/verdin-imx8mp_defconfig

index efbda20521ad36d2fab059ede028b936f79b2c72..6ca9da70bc484c2f6c5d7272fb491a30738ac232 100644 (file)
--- a/configs/verdin-imx8mp_defconfig
+++ b/configs/verdin-imx8mp_defconfig
@@ -1,7 +1,6 @@
  CONFIG_ARM=y
  CONFIG_ARCH_IMX8M=y
  CONFIG_SYS_TEXT_BASE=0x40200000
-CONFIG_SYS_MALLOC_F_LEN=0x10000
  CONFIG_SPL_GPIO=y
  CONFIG_SPL_LIBCOMMON_SUPPORT=y
  CONFIG_SPL_LIBGENERIC_SUPPORT=y
@@ -22,11 +21,11 @@ CONFIG_SPL_DRIVERS_MISC=y
  CONFIG_SPL=y
  CONFIG_IMX_BOOTAUX=y
  CONFIG_SPL_IMX_ROMAPI_LOADADDR=0x48000000
+CONFIG_SYS_LOAD_ADDR=0x43500000
  CONFIG_SYS_MEMTEST_START=0x40000000
  CONFIG_SYS_MEMTEST_END=0x80000000
  CONFIG_DISTRO_DEFAULTS=y
  CONFIG_REMAKE_ELF=y
-CONFIG_SYS_LOAD_ADDR=0x43500000
  CONFIG_FIT=y
  CONFIG_FIT_EXTERNAL_OFFSET=0x3000
  CONFIG_FIT_VERBOSE=y
diff --git a/configs/vexpress_ca9x4_defconfig b/configs/vexpress_ca9x4_defconfig

index ca7aef69fc70242f08a2f8745012574b605cb9b1..14c6c252ab9ec53dfd54cd0182d7f8284796101d 100644 (file)
--- a/configs/vexpress_ca9x4_defconfig
+++ b/configs/vexpress_ca9x4_defconfig
@@ -7,8 +7,9 @@ CONFIG_ENV_SIZE=0x40000
  CONFIG_ENV_SECT_SIZE=0x40000
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="vexpress-v2p-ca9"
-CONFIG_DISTRO_DEFAULTS=y
  CONFIG_SYS_LOAD_ADDR=0x90000000
+CONFIG_ENV_ADDR=0x47F80000
+CONFIG_DISTRO_DEFAULTS=y
  CONFIG_SYS_MONITOR_BASE=0x40000000
  CONFIG_BOOTCOMMAND="run distro_bootcmd; run bootflash"
  CONFIG_DEFAULT_FDT_FILE="vexpress-v2p-ca9.dtb"
@@ -31,7 +32,6 @@ CONFIG_OF_CONTROL=y
  CONFIG_OF_EMBED=y
  CONFIG_ENV_OVERWRITE=y
  CONFIG_ENV_IS_IN_FLASH=y
-CONFIG_ENV_ADDR=0x47F80000
  CONFIG_DM=y
  CONFIG_CLK=y
  CONFIG_ARM_PL180_MMCI=y
diff --git a/configs/vf610twr_defconfig b/configs/vf610twr_defconfig

index 4d2aaeeecef14bdb0d817820a142c2ab59507297..c80e4ddc5a74de076c44e983908f2515383154b6 100644 (file)
--- a/configs/vf610twr_defconfig
+++ b/configs/vf610twr_defconfig
@@ -11,11 +11,11 @@ CONFIG_SYS_I2C_MXC_I2C1=y
  CONFIG_SYS_I2C_MXC_I2C2=y
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="vf610-twr"
+CONFIG_SYS_LOAD_ADDR=0x82000000
  CONFIG_SYS_MEMTEST_START=0x80010000
  CONFIG_SYS_MEMTEST_END=0x87c00000
  CONFIG_HAS_BOARD_SIZE_LIMIT=y
  CONFIG_BOARD_SIZE_LIMIT=520192
-CONFIG_SYS_LOAD_ADDR=0x82000000
  CONFIG_BOOTDELAY=3
  CONFIG_USE_BOOTCOMMAND=y
  CONFIG_BOOTCOMMAND="mmc dev ${mmcdev}; if mmc rescan; then if run loadbootscript; then run bootscript; else if run loadimage; then run mmcboot; else run netboot; fi; fi; else run netboot; fi"
diff --git a/configs/vf610twr_nand_defconfig b/configs/vf610twr_nand_defconfig

index f282a1df92d9843b33a3b86ae6504286efe074d8..d1794e0ece5299b05f848507d40b449abc9c643f 100644 (file)
--- a/configs/vf610twr_nand_defconfig
+++ b/configs/vf610twr_nand_defconfig
@@ -11,11 +11,11 @@ CONFIG_SYS_I2C_MXC_I2C1=y
  CONFIG_SYS_I2C_MXC_I2C2=y
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="vf610-twr"
+CONFIG_SYS_LOAD_ADDR=0x82000000
  CONFIG_SYS_MEMTEST_START=0x80010000
  CONFIG_SYS_MEMTEST_END=0x87c00000
  CONFIG_HAS_BOARD_SIZE_LIMIT=y
  CONFIG_BOARD_SIZE_LIMIT=520192
-CONFIG_SYS_LOAD_ADDR=0x82000000
  CONFIG_BOOTDELAY=3
  CONFIG_USE_BOOTCOMMAND=y
  CONFIG_BOOTCOMMAND="mmc dev ${mmcdev}; if mmc rescan; then if run loadbootscript; then run bootscript; else if run loadimage; then run mmcboot; else run netboot; fi; fi; else run netboot; fi"
diff --git a/configs/vinco_defconfig b/configs/vinco_defconfig

index 2eb22829eeb7af56449cdf3613350c55db7cfce8..ca4141a071fa32797a0a56fab41fb4d8b23fc135 100644 (file)
--- a/configs/vinco_defconfig
+++ b/configs/vinco_defconfig
@@ -9,8 +9,8 @@ CONFIG_ENV_SIZE=0x10000
  CONFIG_ENV_OFFSET=0x10000
  CONFIG_ENV_SECT_SIZE=0x1000
  CONFIG_DEFAULT_DEVICE_TREE="at91-vinco"
-CONFIG_ENV_VARS_UBOOT_CONFIG=y
  CONFIG_SYS_LOAD_ADDR=0x22000000
+CONFIG_ENV_VARS_UBOOT_CONFIG=y
  CONFIG_SPI_BOOT=y
  CONFIG_BOOTDELAY=3
  CONFIG_USE_BOOTARGS=y
diff --git a/configs/vocore2_defconfig b/configs/vocore2_defconfig

index 0166e443b5468f14889abe370f76fdc62b83bcfd..867655457441c7540420af102e4ed4a16d0301b9 100644 (file)
--- a/configs/vocore2_defconfig
+++ b/configs/vocore2_defconfig
@@ -12,6 +12,7 @@ CONFIG_SYS_BOOTCOUNT_ADDR=0xb000006c
  CONFIG_SPL_SYS_MALLOC_F_LEN=0x40000
  CONFIG_SPL=y
  CONFIG_SYS_BOOTCOUNT_SINGLEWORD=y
+CONFIG_SYS_LOAD_ADDR=0x80100000
  CONFIG_ARCH_MTMIPS=y
  CONFIG_SOC_MT7628=y
  CONFIG_BOARD_VOCORE2=y
@@ -22,7 +23,6 @@ CONFIG_MIPS_BOOT_FDT=y
  CONFIG_ENV_VARS_UBOOT_CONFIG=y
  CONFIG_SYS_BOOT_GET_CMDLINE=y
  CONFIG_SYS_BOOT_GET_KBD=y
-CONFIG_SYS_LOAD_ADDR=0x80100000
  CONFIG_FIT=y
  CONFIG_FIT_SIGNATURE=y
  CONFIG_LEGACY_IMAGE_FORMAT=y
diff --git a/configs/vyasa-rk3288_defconfig b/configs/vyasa-rk3288_defconfig

index 682167f8ed4e45ef17226c721a420ba6abedbf60..9c0e3d441e7bc0b381400a1621a3f79b51a22676 100644 (file)
--- a/configs/vyasa-rk3288_defconfig
+++ b/configs/vyasa-rk3288_defconfig
@@ -14,8 +14,8 @@ CONFIG_TARGET_VYASA_RK3288=y
  CONFIG_SPL_STACK_R_ADDR=0x80000
  CONFIG_DEBUG_UART_BASE=0xff690000
  CONFIG_DEBUG_UART_CLOCK=24000000
-CONFIG_DEBUG_UART=y
  CONFIG_SYS_LOAD_ADDR=0x800800
+CONFIG_DEBUG_UART=y
  CONFIG_USE_PREBOOT=y
  CONFIG_DEFAULT_FDT_FILE="rk3288-vyasa.dtb"
  CONFIG_SILENT_CONSOLE=y
diff --git a/configs/wetek-core2_defconfig b/configs/wetek-core2_defconfig

index bb1d4816317d281c3659ef251e8baae0c96a149f..07268c14a046f7e25e45365beb7076015953d811 100644 (file)
--- a/configs/wetek-core2_defconfig
+++ b/configs/wetek-core2_defconfig
@@ -9,9 +9,9 @@ CONFIG_MESON_GXM=y
  CONFIG_DEBUG_UART_BASE=0xc81004c0
  CONFIG_DEBUG_UART_CLOCK=24000000
  CONFIG_IDENT_STRING=" wetek-core2"
+CONFIG_SYS_LOAD_ADDR=0x1000000
  CONFIG_DEBUG_UART=y
  CONFIG_REMAKE_ELF=y
-CONFIG_SYS_LOAD_ADDR=0x1000000
  CONFIG_OF_BOARD_SETUP=y
  # CONFIG_DISPLAY_CPUINFO is not set
  CONFIG_MISC_INIT_R=y
diff --git a/configs/x530_defconfig b/configs/x530_defconfig

index d042134578b401b18a62e9cf41584e58f2f32b4c..7ebf2ce6670ebdddd21b7a152e8449810d950ccd 100644 (file)
--- a/configs/x530_defconfig
+++ b/configs/x530_defconfig
@@ -17,8 +17,9 @@ CONFIG_SPL_SERIAL=y
  CONFIG_SPL=y
  CONFIG_DEBUG_UART_BASE=0xd0012000
  CONFIG_DEBUG_UART_CLOCK=250000000
-CONFIG_DEBUG_UART=y
  CONFIG_SYS_LOAD_ADDR=0x1000000
+CONFIG_ENV_ADDR=0x100000
+CONFIG_DEBUG_UART=y
  CONFIG_FIT=y
  CONFIG_FIT_VERBOSE=y
  CONFIG_SILENT_CONSOLE=y
@@ -49,7 +50,6 @@ CONFIG_CMD_FS_GENERIC=y
  CONFIG_CMD_MTDPARTS=y
  CONFIG_CMD_UBI=y
  CONFIG_ENV_OVERWRITE=y
-CONFIG_ENV_ADDR=0x100000
  CONFIG_ARP_TIMEOUT=200
  CONFIG_NET_RETRY_COUNT=50
  CONFIG_SPL_OF_TRANSLATE=y
diff --git a/configs/xilinx_versal_mini_defconfig b/configs/xilinx_versal_mini_defconfig

index 2deaf0a3b5103251182d7c20fd6bf4e95836056b..c7d8b6384e4d5b2ad3ad3b7c429ae491b15a4cb6 100644 (file)
--- a/configs/xilinx_versal_mini_defconfig
+++ b/configs/xilinx_versal_mini_defconfig
@@ -10,11 +10,11 @@ CONFIG_DEFAULT_DEVICE_TREE="versal-mini"
  CONFIG_SYS_MEM_RSVD_FOR_MMU=y
  CONFIG_COUNTER_FREQUENCY=100000000
  # CONFIG_PSCI_RESET is not set
+CONFIG_SYS_LOAD_ADDR=0x8000000
  CONFIG_SYS_MEMTEST_START=0x00000000
  CONFIG_SYS_MEMTEST_END=0x00001000
  # CONFIG_EXPERT is not set
  CONFIG_REMAKE_ELF=y
-CONFIG_SYS_LOAD_ADDR=0x8000000
  # CONFIG_LEGACY_IMAGE_FORMAT is not set
  # CONFIG_AUTOBOOT is not set
  CONFIG_USE_BOOTCOMMAND=y
diff --git a/configs/xilinx_versal_mini_emmc0_defconfig b/configs/xilinx_versal_mini_emmc0_defconfig

index 6506dfd874f4cf7d050dad71fc35e68d327b55ab..1165bef6f8a44f90b95ffb6f67abb356c068c114 100644 (file)
--- a/configs/xilinx_versal_mini_emmc0_defconfig
+++ b/configs/xilinx_versal_mini_emmc0_defconfig
@@ -9,9 +9,9 @@ CONFIG_ENV_SIZE=0x80
  CONFIG_DEFAULT_DEVICE_TREE="versal-mini-emmc0"
  CONFIG_COUNTER_FREQUENCY=100000000
  # CONFIG_PSCI_RESET is not set
+CONFIG_SYS_LOAD_ADDR=0x8000000
  # CONFIG_EXPERT is not set
  CONFIG_REMAKE_ELF=y
-CONFIG_SYS_LOAD_ADDR=0x8000000
  # CONFIG_AUTOBOOT is not set
  CONFIG_USE_BOOTCOMMAND=y
  CONFIG_BOOTCOMMAND="run distro_bootcmd"
diff --git a/configs/xilinx_versal_mini_emmc1_defconfig b/configs/xilinx_versal_mini_emmc1_defconfig

index 7d6eb7fd9e686ad367452515654a7366c5781d15..2f44dc38ee210546cdd36ef04d12ffe7efb66a0a 100644 (file)
--- a/configs/xilinx_versal_mini_emmc1_defconfig
+++ b/configs/xilinx_versal_mini_emmc1_defconfig
@@ -9,9 +9,9 @@ CONFIG_ENV_SIZE=0x80
  CONFIG_DEFAULT_DEVICE_TREE="versal-mini-emmc1"
  CONFIG_COUNTER_FREQUENCY=100000000
  # CONFIG_PSCI_RESET is not set
+CONFIG_SYS_LOAD_ADDR=0x8000000
  # CONFIG_EXPERT is not set
  CONFIG_REMAKE_ELF=y
-CONFIG_SYS_LOAD_ADDR=0x8000000
  # CONFIG_AUTOBOOT is not set
  CONFIG_USE_BOOTCOMMAND=y
  CONFIG_BOOTCOMMAND="run distro_bootcmd"
diff --git a/configs/xilinx_versal_virt_defconfig b/configs/xilinx_versal_virt_defconfig

index c9a710c359141837c5bd3ae3193ec9c10cfb9b05..f5873599ca6ea6d4880e131b3b1cc171277cebed 100644 (file)
--- a/configs/xilinx_versal_virt_defconfig
+++ b/configs/xilinx_versal_virt_defconfig
@@ -9,11 +9,11 @@ CONFIG_DEFAULT_DEVICE_TREE="xilinx-versal-virt"
  CONFIG_CMD_FRU=y
  CONFIG_DEFINE_TCM_OCM_MMAP=y
  CONFIG_COUNTER_FREQUENCY=100000000
+CONFIG_SYS_LOAD_ADDR=0x8000000
  CONFIG_SYS_MEMTEST_START=0x00000000
  CONFIG_SYS_MEMTEST_END=0x00001000
  CONFIG_DISTRO_DEFAULTS=y
  CONFIG_REMAKE_ELF=y
-CONFIG_SYS_LOAD_ADDR=0x8000000
  CONFIG_FIT=y
  CONFIG_FIT_VERBOSE=y
  # CONFIG_ARCH_FIXUP_FDT_MEMORY is not set
diff --git a/configs/xilinx_zynq_virt_defconfig b/configs/xilinx_zynq_virt_defconfig

index eeb2f78a95b7c368a9528c4c9f5afcd83a7dbc6e..ea72925912c04972299225d1dbc8384bf6b53ea1 100644 (file)
--- a/configs/xilinx_zynq_virt_defconfig
+++ b/configs/xilinx_zynq_virt_defconfig
@@ -10,13 +10,13 @@ CONFIG_SPL_STACK_R_ADDR=0x200000
  CONFIG_SPL=y
  CONFIG_CMD_FRU=y
  CONFIG_CMD_ZYNQ_AES=y
+CONFIG_SYS_LOAD_ADDR=0x0
  CONFIG_SYS_MEMTEST_START=0x00000000
  CONFIG_SYS_MEMTEST_END=0x00001000
  CONFIG_DISTRO_DEFAULTS=y
  CONFIG_REMAKE_ELF=y
  CONFIG_SYS_CUSTOM_LDSCRIPT=y
  CONFIG_SYS_LDSCRIPT="arch/arm/mach-zynq/u-boot.lds"
-CONFIG_SYS_LOAD_ADDR=0x0
  CONFIG_FIT=y
  CONFIG_FIT_SIGNATURE=y
  CONFIG_FIT_VERBOSE=y
diff --git a/configs/xilinx_zynqmp_mini_defconfig b/configs/xilinx_zynqmp_mini_defconfig

index 5592d912a278d1de117e3cb8697436825354a6ff..1eab616f2f3524384c8844da9f93f51edc89edd9 100644 (file)
--- a/configs/xilinx_zynqmp_mini_defconfig
+++ b/configs/xilinx_zynqmp_mini_defconfig
@@ -9,10 +9,10 @@ CONFIG_DEFAULT_DEVICE_TREE="zynqmp-mini"
  CONFIG_SYS_MEM_RSVD_FOR_MMU=y
  CONFIG_ZYNQMP_PSU_INIT_ENABLED=y
  # CONFIG_CMD_ZYNQMP is not set
+CONFIG_SYS_LOAD_ADDR=0x8000000
  CONFIG_SYS_MEMTEST_START=0x00000000
  CONFIG_SYS_MEMTEST_END=0x00001000
  CONFIG_REMAKE_ELF=y
-CONFIG_SYS_LOAD_ADDR=0x8000000
  # CONFIG_LEGACY_IMAGE_FORMAT is not set
  # CONFIG_AUTOBOOT is not set
  # CONFIG_DISPLAY_CPUINFO is not set
diff --git a/configs/xilinx_zynqmp_mini_emmc0_defconfig b/configs/xilinx_zynqmp_mini_emmc0_defconfig

index 274604af02ea3958952545cf060923ce7f282a5d..e176175251f30544ca256fd22d0f30e71076b816 100644 (file)
--- a/configs/xilinx_zynqmp_mini_emmc0_defconfig
+++ b/configs/xilinx_zynqmp_mini_emmc0_defconfig
@@ -12,8 +12,8 @@ CONFIG_SPL_SYS_MALLOC_F_LEN=0x600
  CONFIG_SPL=y
  CONFIG_ZYNQMP_PSU_INIT_ENABLED=y
  # CONFIG_CMD_ZYNQMP is not set
-CONFIG_REMAKE_ELF=y
  CONFIG_SYS_LOAD_ADDR=0x8000000
+CONFIG_REMAKE_ELF=y
  # CONFIG_MP is not set
  CONFIG_FIT=y
  CONFIG_SUPPORT_RAW_INITRD=y
diff --git a/configs/xilinx_zynqmp_mini_emmc1_defconfig b/configs/xilinx_zynqmp_mini_emmc1_defconfig

index 3a86024c4fdf3bfb8bb91301a0fbca98edfe5b2e..f5b35fbb71cc9106607fdb3bbcc15a464f2c2958 100644 (file)
--- a/configs/xilinx_zynqmp_mini_emmc1_defconfig
+++ b/configs/xilinx_zynqmp_mini_emmc1_defconfig
@@ -12,8 +12,8 @@ CONFIG_SPL_SYS_MALLOC_F_LEN=0x600
  CONFIG_SPL=y
  CONFIG_ZYNQMP_PSU_INIT_ENABLED=y
  # CONFIG_CMD_ZYNQMP is not set
-CONFIG_REMAKE_ELF=y
  CONFIG_SYS_LOAD_ADDR=0x8000000
+CONFIG_REMAKE_ELF=y
  # CONFIG_MP is not set
  CONFIG_FIT=y
  CONFIG_SUPPORT_RAW_INITRD=y
diff --git a/configs/xilinx_zynqmp_mini_nand_defconfig b/configs/xilinx_zynqmp_mini_nand_defconfig

index 0ccc45fda17a39ef4207a2b6a2a2db72affe914e..d57bafcf893897eb53680e39279d0214c51f4e72 100644 (file)
--- a/configs/xilinx_zynqmp_mini_nand_defconfig
+++ b/configs/xilinx_zynqmp_mini_nand_defconfig
@@ -9,8 +9,8 @@ CONFIG_ENV_SIZE=0x80
  CONFIG_DEFAULT_DEVICE_TREE="zynqmp-mini-nand"
  CONFIG_ZYNQMP_PSU_INIT_ENABLED=y
  # CONFIG_CMD_ZYNQMP is not set
-CONFIG_REMAKE_ELF=y
  CONFIG_SYS_LOAD_ADDR=0x8000000
+CONFIG_REMAKE_ELF=y
  # CONFIG_MP is not set
  CONFIG_FIT=y
  CONFIG_SUPPORT_RAW_INITRD=y
diff --git a/configs/xilinx_zynqmp_mini_nand_single_defconfig b/configs/xilinx_zynqmp_mini_nand_single_defconfig

index db659182aaa544e66b6c0ef246813d6dabca08b6..f9bc9afbbad21c9609cdad1bbef48c388e887ea9 100644 (file)
--- a/configs/xilinx_zynqmp_mini_nand_single_defconfig
+++ b/configs/xilinx_zynqmp_mini_nand_single_defconfig
@@ -9,8 +9,8 @@ CONFIG_ENV_SIZE=0x80
  CONFIG_DEFAULT_DEVICE_TREE="zynqmp-mini-nand"
  CONFIG_ZYNQMP_PSU_INIT_ENABLED=y
  # CONFIG_CMD_ZYNQMP is not set
-CONFIG_REMAKE_ELF=y
  CONFIG_SYS_LOAD_ADDR=0x8000000
+CONFIG_REMAKE_ELF=y
  # CONFIG_MP is not set
  CONFIG_FIT=y
  CONFIG_SUPPORT_RAW_INITRD=y
diff --git a/configs/xilinx_zynqmp_mini_qspi_defconfig b/configs/xilinx_zynqmp_mini_qspi_defconfig

index 638aa16ac3afad691922024d0d7c7b0e02182e9f..bdda942db6db31915c3e784050610e5a01269b4a 100644 (file)
--- a/configs/xilinx_zynqmp_mini_qspi_defconfig
+++ b/configs/xilinx_zynqmp_mini_qspi_defconfig
@@ -13,9 +13,9 @@ CONFIG_ZYNQMP_NO_DDR=y
  CONFIG_ZYNQMP_PSU_INIT_ENABLED=y
  # CONFIG_CMD_ZYNQMP is not set
  # CONFIG_PSCI_RESET is not set
+CONFIG_SYS_LOAD_ADDR=0x8000000
  # CONFIG_EXPERT is not set
  CONFIG_REMAKE_ELF=y
-CONFIG_SYS_LOAD_ADDR=0x8000000
  # CONFIG_LEGACY_IMAGE_FORMAT is not set
  # CONFIG_AUTOBOOT is not set
  # CONFIG_DISPLAY_CPUINFO is not set
diff --git a/configs/xilinx_zynqmp_r5_defconfig b/configs/xilinx_zynqmp_r5_defconfig

index 98f46cf0205a0d2045b4d81ad9e2d82346abfa9e..3dcfa43af59bc129ca4f7f9067041d0642f1a1ef 100644 (file)
--- a/configs/xilinx_zynqmp_r5_defconfig
+++ b/configs/xilinx_zynqmp_r5_defconfig
@@ -10,8 +10,8 @@ CONFIG_DEFAULT_DEVICE_TREE="zynqmp-r5"
  CONFIG_DEBUG_UART_BASE=0xff010000
  CONFIG_DEBUG_UART_CLOCK=100000000
  CONFIG_CPU_FREQ_HZ=500000000
-CONFIG_DEBUG_UART=y
  CONFIG_SYS_LOAD_ADDR=0x0
+CONFIG_DEBUG_UART=y
  CONFIG_BOOTSTAGE=y
  # CONFIG_DISPLAY_CPUINFO is not set
  CONFIG_SYS_PROMPT="ZynqMP r5> "
diff --git a/configs/xilinx_zynqmp_virt_defconfig b/configs/xilinx_zynqmp_virt_defconfig

index 990f518448ab80a1325dbe91c40687939c0fbd01..7ddfb97ad88f974f50738e7da0e1b6fffee13e7b 100644 (file)
--- a/configs/xilinx_zynqmp_virt_defconfig
+++ b/configs/xilinx_zynqmp_virt_defconfig
@@ -16,12 +16,12 @@ CONFIG_ZYNQ_MAC_IN_EEPROM=y
  CONFIG_ZYNQ_GEM_I2C_MAC_OFFSET=0x20
  CONFIG_CMD_FRU=y
  CONFIG_ZYNQMP_USB=y
+CONFIG_SYS_LOAD_ADDR=0x8000000
  CONFIG_AHCI=y
  CONFIG_SYS_MEMTEST_START=0x00000000
  CONFIG_SYS_MEMTEST_END=0x00001000
  CONFIG_DISTRO_DEFAULTS=y
  CONFIG_REMAKE_ELF=y
-CONFIG_SYS_LOAD_ADDR=0x8000000
  CONFIG_FIT=y
  CONFIG_FIT_VERBOSE=y
  CONFIG_SPL_LOAD_FIT=y
diff --git a/configs/xtfpga_defconfig b/configs/xtfpga_defconfig

index ff3f26004c2ef942fb6e8801af1f44692cdceb07..367e8f01bea4e68f123f2d0f29da125e51ad6375 100644 (file)
--- a/configs/xtfpga_defconfig
+++ b/configs/xtfpga_defconfig
@@ -3,8 +3,9 @@ CONFIG_SYS_CPU="dc233c"
  CONFIG_SYS_MALLOC_LEN=0x40000
  CONFIG_ENV_SIZE=0x20000
  CONFIG_ENV_SECT_SIZE=0x20000
-CONFIG_XTFPGA_KC705=y
  CONFIG_SYS_LOAD_ADDR=0x02000000
+CONFIG_ENV_ADDR=0xF7FE0000
+CONFIG_XTFPGA_KC705=y
  CONFIG_SYS_MONITOR_BASE=0xF6000000
  CONFIG_DYNAMIC_SYS_CLK_FREQ=y
  CONFIG_SHOW_BOOT_PROGRESS=y
@@ -24,7 +25,6 @@ CONFIG_CMD_DHCP=y
  CONFIG_CMD_PING=y
  CONFIG_CMD_DIAG=y
  CONFIG_ENV_IS_IN_FLASH=y
-CONFIG_ENV_ADDR=0xF7FE0000
  CONFIG_USE_BOOTFILE=y
  CONFIG_BOOTFILE="uImage"
  CONFIG_VERSION_VARIABLE=y
diff --git a/configs/zynq_cse_nand_defconfig b/configs/zynq_cse_nand_defconfig

index 358646b052d4ba26e7ad708d91d477121f20f3c2..b2c5924c2564d75f8ff5c28e280cec039cb1c134 100644 (file)
--- a/configs/zynq_cse_nand_defconfig
+++ b/configs/zynq_cse_nand_defconfig
@@ -12,10 +12,10 @@ CONFIG_ENV_SIZE=0x190
  CONFIG_DEFAULT_DEVICE_TREE="zynq-cse-nand"
  CONFIG_SPL_STACK_R_ADDR=0x200000
  CONFIG_SPL=y
+CONFIG_SYS_LOAD_ADDR=0x0
  CONFIG_REMAKE_ELF=y
  CONFIG_SYS_CUSTOM_LDSCRIPT=y
  CONFIG_SYS_LDSCRIPT="arch/arm/mach-zynq/u-boot.lds"
-CONFIG_SYS_LOAD_ADDR=0x0
  # CONFIG_AUTOBOOT is not set
  CONFIG_USE_PREBOOT=y
  # CONFIG_DISPLAY_CPUINFO is not set
diff --git a/configs/zynq_cse_nor_defconfig b/configs/zynq_cse_nor_defconfig

index 1d55d99cecb879d12aca6471c968359904dcdea6..280627e4ca4b1c8c6943db0d89ad2446f1e5ffea 100644 (file)
--- a/configs/zynq_cse_nor_defconfig
+++ b/configs/zynq_cse_nor_defconfig
@@ -12,10 +12,10 @@ CONFIG_ENV_SIZE=0x190
  CONFIG_DEFAULT_DEVICE_TREE="zynq-cse-nor"
  CONFIG_SPL_STACK_R_ADDR=0x200000
  CONFIG_SPL=y
+CONFIG_SYS_LOAD_ADDR=0x0
  CONFIG_REMAKE_ELF=y
  CONFIG_SYS_CUSTOM_LDSCRIPT=y
  CONFIG_SYS_LDSCRIPT="arch/arm/mach-zynq/u-boot.lds"
-CONFIG_SYS_LOAD_ADDR=0x0
  # CONFIG_AUTOBOOT is not set
  CONFIG_USE_PREBOOT=y
  # CONFIG_DISPLAY_CPUINFO is not set
diff --git a/configs/zynq_cse_qspi_defconfig b/configs/zynq_cse_qspi_defconfig

index 4482a32c1fea8165edcdd7441c7db01983a9b94e..9d4e49e8f3c7b42f3c6ef8f4257f3ef1b6f0e62c 100644 (file)
--- a/configs/zynq_cse_qspi_defconfig
+++ b/configs/zynq_cse_qspi_defconfig
@@ -16,11 +16,11 @@ CONFIG_DEBUG_UART_BASE=0x0
  CONFIG_DEBUG_UART_CLOCK=0
  # CONFIG_ZYNQ_DDRC_INIT is not set
  # CONFIG_CMD_ZYNQ is not set
+CONFIG_SYS_LOAD_ADDR=0x0
  CONFIG_DEBUG_UART=y
  CONFIG_REMAKE_ELF=y
  CONFIG_SYS_CUSTOM_LDSCRIPT=y
  CONFIG_SYS_LDSCRIPT="arch/arm/mach-zynq/u-boot.lds"
-CONFIG_SYS_LOAD_ADDR=0x0
  # CONFIG_ARCH_FIXUP_FDT_MEMORY is not set
  # CONFIG_AUTOBOOT is not set
  CONFIG_USE_PREBOOT=y
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt

index 12208c7a2f8611ffa7f980df70a05245c4e57478..3065da78e1da4ad6d9236f0838c5c6a87c45ffcc 100644 (file)
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -1,8 +1,6 @@
  CONFIG_ARM_GIC_BASE_ADDRESS
  CONFIG_AUTO_ZRELADDR
  CONFIG_BOARDDIR
-CONFIG_BOARD_SIZE_LIMIT
-CONFIG_BOOTROM_ERR_REG
  CONFIG_BOOTSCRIPT_ADDR
  CONFIG_BOOTSCRIPT_COPY_RAM
  CONFIG_BOOTSCRIPT_HDR_ADDR
@@ -15,45 +13,18 @@ CONFIG_BS_HDR_ADDR_RAM
  CONFIG_BS_HDR_SIZE
  CONFIG_BS_SIZE
  CONFIG_CHAIN_BOOT_CMD
-CONFIG_CHROMEOS_EXTRA_ENV_SETTINGS
-CONFIG_CI_UDC_HAS_HOSTPC
-CONFIG_CM922T_XA10
-CONFIG_CMDLINE_PS_SUPPORT
-CONFIG_CM_INIT
-CONFIG_CM_MULTIPLE_SSRAM
-CONFIG_CM_REMAP
-CONFIG_CM_SPD_DETECT
-CONFIG_CM_TCRAM
-CONFIG_COMMON_BOOT
-CONFIG_CONS_SCIF0
-CONFIG_CONS_SCIF1
-CONFIG_CONS_SCIF2
-CONFIG_CONS_SCIF4
-CONFIG_CQSPI_REF_CLK
-CONFIG_CUSTOMER_BOARD_SUPPORT
-CONFIG_DCACHE
-CONFIG_DEBUG
-CONFIG_DEBUG_LED
  CONFIG_DEFAULT
-CONFIG_DEFAULT_IMMR
-CONFIG_DESIGNWARE_ETH
  CONFIG_DFU_ALT
  CONFIG_DFU_ALT_BOOT_EMMC
  CONFIG_DFU_ALT_BOOT_SD
  CONFIG_DFU_ALT_SYSTEM
  CONFIG_DFU_ENV_SETTINGS
-CONFIG_DIMM_SLOTS_PER_CTLR
-CONFIG_DISCOVER_PHY
  CONFIG_DM9000_BASE
  CONFIG_DM9000_BYTE_SWAPPED
  CONFIG_DM9000_DEBUG
  CONFIG_DM9000_NO_SROM
  CONFIG_DM9000_USE_16BIT
-CONFIG_DMA_COHERENT
-CONFIG_DMA_COHERENT_SIZE
-CONFIG_DP_DDR_CTRL
  CONFIG_DP_DDR_DIMM_SLOTS_PER_CTLR
-CONFIG_DP_DDR_NUM_CTRLS
  CONFIG_DRIVER_DM9000
  CONFIG_DSP_CLUSTER_START
  CONFIG_DWC_AHSATA_BASE_ADDR
@@ -151,7 +122,6 @@ CONFIG_FSL_PMIC_BUS
  CONFIG_FSL_PMIC_CLK
  CONFIG_FSL_PMIC_CS
  CONFIG_FSL_PMIC_MODE
-CONFIG_FSL_QIXIS
  CONFIG_FSL_SATA_V2
  CONFIG_FSL_SDHC_V2_3
  CONFIG_FSL_SERDES
@@ -189,7 +159,6 @@ CONFIG_FTWDT010_WATCHDOG
  CONFIG_GATEWAYIP
  CONFIG_GLOBAL_TIMER
  CONFIG_GMII
-CONFIG_GREEN_LED
  CONFIG_G_DNL_THOR_PRODUCT_NUM
  CONFIG_G_DNL_THOR_VENDOR_NUM
  CONFIG_G_DNL_UMS_PRODUCT_NUM
@@ -355,7 +324,6 @@ CONFIG_I2C_MVTWSI_BASE
  CONFIG_I2C_MVTWSI_BASE0
  CONFIG_I2C_MVTWSI_BASE1
  CONFIG_I2C_RTC_ADDR
-CONFIG_ICACHE
  CONFIG_ICS307_REFCLK_HZ
  CONFIG_IDE_PREINIT
  CONFIG_IMX
@@ -561,15 +529,11 @@ CONFIG_PXA_PWR_I2C
  CONFIG_PXA_STD_I2C
  CONFIG_PXA_VGA
  CONFIG_QBMAN_CLK_DIV
-CONFIG_QIXIS_I2C_ACCESS
  CONFIG_RAMBOOT_NAND
  CONFIG_RAMBOOT_SPIFLASH
  CONFIG_RAMBOOT_TEXT_BASE
-CONFIG_RAMDISKFILE
  CONFIG_RAMDISK_ADDR
-CONFIG_RAMDISK_BOOT
  CONFIG_RD_LVL
-CONFIG_RED_LED
  CONFIG_RESERVED_01_BASE
  CONFIG_RESERVED_02_BASE
  CONFIG_RESERVED_03_BASE
@@ -629,7 +593,6 @@ CONFIG_SH_ETHER_SH7734_MII
  CONFIG_SH_ETHER_USE_PORT
  CONFIG_SH_GPIO_PFC
  CONFIG_SH_QSPI_BASE
-CONFIG_SH_SCIF_CLK_FREQ
  CONFIG_SKIP_LOCAL_MAC_RANDOMIZATION
  CONFIG_SKIP_TRUNOFF_WATCHDOG
  CONFIG_SLIC
@@ -943,8 +906,6 @@ CONFIG_SYS_DPAA_DCE
  CONFIG_SYS_DPAA_FMAN
  CONFIG_SYS_DPAA_PME
  CONFIG_SYS_DPAA_RMAN
-CONFIG_SYS_DP_DDR_BASE
-CONFIG_SYS_DP_DDR_BASE_PHY
  CONFIG_SYS_DRAM_BASE
  CONFIG_SYS_DRAM_SIZE
  CONFIG_SYS_DRAM_TEST
@@ -1909,7 +1870,6 @@ CONFIG_UBOOT_SECTOR_COUNT
  CONFIG_UBOOT_SECTOR_START
  CONFIG_UEC_ETH
  CONFIG_UEC_ETH2
-CONFIG_UPDATEB
  CONFIG_USART_BASE
  CONFIG_USART_ID
  CONFIG_USBD_HS
author	Tom Rini <trini@konsulko.com>
	Fri, 8 Apr 2022 17:36:51 +0000 (13:36 -0400)
committer	Tom Rini <trini@konsulko.com>
	Fri, 8 Apr 2022 17:36:51 +0000 (13:36 -0400)