Rename CONFIG_SYS_AUTOLAOD to CONFIG_SYS_DISABLE_AUTOLOAD

The "autoload" environment variable is always checked with env_get_yesno
as it can be set to any form of no.  The default behavior of
env_get_yesno is to return -1 on variables that are not set, which acts
as true in general (we test for non-zero return).  To convert
CONFIG_SYS_AUTOLOAD to Kconfig, given that it was almost always used to
set autoload to no, first rename to CONFIG_SYS_DISABLE_AUTOLOAD for
consistency sake.  Then, make it so that if enabled we set autoload=0 in
the default environment.  Migrate all platforms which set
CONFIG_SYS_AUTOLOAD to non-true or that set autoload to false in their
default environment to using CONFIG_SYS_DISABLE_AUTOLOAD

Signed-off-by: Tom Rini <trini@konsulko.com>

diff --git a/cmd/Kconfig b/cmd/Kconfig
index dea3729d1327bc735e3e32312987d09bd0fad66c..ad36ae63c659f45f196fd93bff93b9891c1300fb 100644 (file)
--- a/cmd/Kconfig
+++ b/cmd/Kconfig
@@ -1737,6 +1737,15 @@ config NFS_TIMEOUT
          "ERROR: Cannot umount" in nfs command, try longer timeout such as
          10000.
 
+config SYS_DISABLE_AUTOLOAD
+       bool "Disable automatically loading files over the network"
+       depends on CMD_BOOTP || CMD_DHCP || CMD_NFS || CMD_RARP
+       help
+         Typically, commands such as "dhcp" will attempt to automatically
+         load a file from the network, once the initial network configuration
+         is complete.  Enable this option to disable this behavior and instead
+         require files to be loaded over the network by subsequent commands.
+
 config CMD_MII
        bool "mii"
        imply CMD_MDIO

diff --git a/configs/am335x_guardian_defconfig b/configs/am335x_guardian_defconfig
index 0dc4bb25be28221fdee2b39bf8a99b84c06aee69..34bef30edd3be6c22b917beb1519b0e7308a11d3 100644 (file)
--- a/configs/am335x_guardian_defconfig
+++ b/configs/am335x_guardian_defconfig
@@ -59,6 +59,7 @@ CONFIG_CMD_MTD=y
 CONFIG_CMD_NAND=y
 CONFIG_CMD_USB=y
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_DISABLE_AUTOLOAD=y
 CONFIG_CMD_BMP=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_MTDPARTS=y

diff --git a/configs/bitmain_antminer_s9_defconfig b/configs/bitmain_antminer_s9_defconfig
index f8ab91435875d8f1b2e1d23e8ba40a54b7bae45c..98d38a89a042ce788ec52e89d199e70ba780022f 100644 (file)
--- a/configs/bitmain_antminer_s9_defconfig
+++ b/configs/bitmain_antminer_s9_defconfig
@@ -56,6 +56,7 @@ CONFIG_CMD_PART=y
 CONFIG_CMD_DHCP=y
 CONFIG_BOOTP_MAY_FAIL=y
 # CONFIG_CMD_NFS is not set
+CONFIG_SYS_DISABLE_AUTOLOAD=y
 CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_PXE=y

diff --git a/configs/bk4r1_defconfig b/configs/bk4r1_defconfig
index 838090e3039deaa49ab9321abf5adbfbc3cd567f..0f8955dbbf183c203842c505aa234f9fb2cd3fa6 100644 (file)
--- a/configs/bk4r1_defconfig
+++ b/configs/bk4r1_defconfig
@@ -41,6 +41,7 @@ CONFIG_CMD_I2C=y
 CONFIG_CMD_MMC=y
 CONFIG_CMD_NAND_TRIMFFS=y
 CONFIG_CMD_DHCP=y
+CONFIG_SYS_DISABLE_AUTOLOAD=y
 CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_BOOTCOUNT=y

diff --git a/configs/brppt1_mmc_defconfig b/configs/brppt1_mmc_defconfig
index 488167e27f15ca655fd86f5aa2e032f8d025774a..b1c8577ab62779fb2fcc8cd38077498c182a24fe 100644 (file)
--- a/configs/brppt1_mmc_defconfig
+++ b/configs/brppt1_mmc_defconfig
@@ -61,6 +61,7 @@ CONFIG_CMD_USB=y
 CONFIG_CMD_DHCP=y
 CONFIG_BOOTP_MAY_FAIL=y
 # CONFIG_CMD_NFS is not set
+CONFIG_SYS_DISABLE_AUTOLOAD=y
 CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_BOOTCOUNT=y

diff --git a/configs/brppt1_nand_defconfig b/configs/brppt1_nand_defconfig
index dce6bebd81d458b4d4879aa02def08051e766325..5addd4970b2a3d6f665f8a5224d5d482e872f0d7 100644 (file)
--- a/configs/brppt1_nand_defconfig
+++ b/configs/brppt1_nand_defconfig
@@ -61,6 +61,7 @@ CONFIG_CMD_USB=y
 CONFIG_CMD_DHCP=y
 CONFIG_BOOTP_MAY_FAIL=y
 # CONFIG_CMD_NFS is not set
+CONFIG_SYS_DISABLE_AUTOLOAD=y
 CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_BOOTCOUNT=y

diff --git a/configs/brppt1_spi_defconfig b/configs/brppt1_spi_defconfig
index 41dd24feddabe86a32c021f9fa62bc8e215cf2d0..67683c895d23b35219b24fc174e28e7fa07d8166 100644 (file)
--- a/configs/brppt1_spi_defconfig
+++ b/configs/brppt1_spi_defconfig
@@ -70,6 +70,7 @@ CONFIG_CMD_USB=y
 CONFIG_CMD_DHCP=y
 CONFIG_BOOTP_MAY_FAIL=y
 # CONFIG_CMD_NFS is not set
+CONFIG_SYS_DISABLE_AUTOLOAD=y
 CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_BOOTCOUNT=y

diff --git a/configs/brppt2_defconfig b/configs/brppt2_defconfig
index db87b579eedab652a0bc779732f1301827d6e41e..40e32d1f513687524bf0b8621119223163092f23 100644 (file)
--- a/configs/brppt2_defconfig
+++ b/configs/brppt2_defconfig
@@ -57,6 +57,7 @@ CONFIG_CMD_USB=y
 CONFIG_CMD_DHCP=y
 CONFIG_BOOTP_MAY_FAIL=y
 # CONFIG_CMD_NFS is not set
+CONFIG_SYS_DISABLE_AUTOLOAD=y
 CONFIG_CMD_MII=y
 CONFIG_CMD_CACHE=y
 CONFIG_CMD_TIME=y

diff --git a/configs/brsmarc1_defconfig b/configs/brsmarc1_defconfig
index 3134d3b4b6a906bdecf1ca6aef19861fcd650a7e..2f7ff524cc1d91e32ada509ca7850e804634339e 100644 (file)
--- a/configs/brsmarc1_defconfig
+++ b/configs/brsmarc1_defconfig
@@ -72,6 +72,7 @@ CONFIG_CMD_USB=y
 CONFIG_CMD_DHCP=y
 CONFIG_BOOTP_MAY_FAIL=y
 # CONFIG_CMD_NFS is not set
+CONFIG_SYS_DISABLE_AUTOLOAD=y
 CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_TIME=y

diff --git a/configs/brxre1_defconfig b/configs/brxre1_defconfig
index c39389451f1b1acd30da14bdf113f534540fb823..c38393410f3d13e1bb7728eb3927ec2b64c77d3c 100644 (file)
--- a/configs/brxre1_defconfig
+++ b/configs/brxre1_defconfig
@@ -63,6 +63,7 @@ CONFIG_CMD_USB=y
 CONFIG_CMD_DHCP=y
 CONFIG_BOOTP_MAY_FAIL=y
 # CONFIG_CMD_NFS is not set
+CONFIG_SYS_DISABLE_AUTOLOAD=y
 CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_TIME=y

diff --git a/configs/cl-som-imx7_defconfig b/configs/cl-som-imx7_defconfig
index 075d8678c8a9cf1108c5de7f08564d76cb281dfd..bf670dbae68954f43fbb08edb15ebdb5cc68abbe 100644 (file)
--- a/configs/cl-som-imx7_defconfig
+++ b/configs/cl-som-imx7_defconfig
@@ -52,6 +52,7 @@ CONFIG_CMD_I2C=y
 CONFIG_CMD_MMC=y
 CONFIG_CMD_USB=y
 CONFIG_CMD_DHCP=y
+CONFIG_SYS_DISABLE_AUTOLOAD=y
 CONFIG_CMD_MII=y
 # CONFIG_CMD_MDIO is not set
 CONFIG_CMD_PING=y

diff --git a/configs/cm_fx6_defconfig b/configs/cm_fx6_defconfig
index 4d8788099f49e61a0ecfbe7dffcdd3ce5283a715..9bf78788e49732367130d63a5844bbc62ab32e60 100644 (file)
--- a/configs/cm_fx6_defconfig
+++ b/configs/cm_fx6_defconfig
@@ -56,6 +56,7 @@ CONFIG_CMD_MMC=y
 CONFIG_CMD_SATA=y
 CONFIG_CMD_USB=y
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_DISABLE_AUTOLOAD=y
 CONFIG_CMD_BMP=y
 CONFIG_CMD_CACHE=y
 CONFIG_CMD_EXT4_WRITE=y

diff --git a/configs/cm_t335_defconfig b/configs/cm_t335_defconfig
index 0c2e8a35ef8777738fac9b77540dfcd6d3f6f702..f1b4b622cbd56b95e3e54e00357c47756d564327 100644 (file)
--- a/configs/cm_t335_defconfig
+++ b/configs/cm_t335_defconfig
@@ -46,6 +46,7 @@ CONFIG_CMD_MMC=y
 CONFIG_CMD_NAND=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_BOOTP_DNS2=y
+CONFIG_SYS_DISABLE_AUTOLOAD=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_MTDPARTS=y
 CONFIG_MTDIDS_DEFAULT="nand0=nand"

diff --git a/configs/cm_t43_defconfig b/configs/cm_t43_defconfig
index 30afd5e7d0045f4adac8b6a8a51a7960437cc6ff..c0dc70312a2e835b413dc5ab8e7791cbdae537f3 100644 (file)
--- a/configs/cm_t43_defconfig
+++ b/configs/cm_t43_defconfig
@@ -62,6 +62,7 @@ CONFIG_CMD_NAND=y
 CONFIG_CMD_SPI=y
 CONFIG_CMD_USB=y
 # CONFIG_CMD_NFS is not set
+CONFIG_SYS_DISABLE_AUTOLOAD=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_MTDPARTS=y
 CONFIG_OF_CONTROL=y

diff --git a/configs/d2net_v2_defconfig b/configs/d2net_v2_defconfig
index 05f0d4bb35ed7bd9bc0bb3fbe9aa780527aac3da..bbafd57727959e04626c3081ac46c346948e81ed 100644 (file)
--- a/configs/d2net_v2_defconfig
+++ b/configs/d2net_v2_defconfig
@@ -38,6 +38,7 @@ CONFIG_CMD_SATA=y
 CONFIG_CMD_USB=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_DHCP=y
+CONFIG_SYS_DISABLE_AUTOLOAD=y
 CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_EXT2=y

diff --git a/configs/devkit3250_defconfig b/configs/devkit3250_defconfig
index 5290ac5e82e104d3ea1832361f16f8eb7f138ae5..a0b7a2e2d36cade2328a4af16a6ac2a530a2647a 100644 (file)
--- a/configs/devkit3250_defconfig
+++ b/configs/devkit3250_defconfig
@@ -43,6 +43,7 @@ CONFIG_CMD_I2C=y
 CONFIG_CMD_NAND=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_DHCP=y
+CONFIG_SYS_DISABLE_AUTOLOAD=y
 CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_CACHE=y

diff --git a/configs/dns325_defconfig b/configs/dns325_defconfig
index 511ca2f64736721a5a3c1a483be48817f0be5516..242cc36fcef069bf909bf6400ef39c23559fb97f 100644 (file)
--- a/configs/dns325_defconfig
+++ b/configs/dns325_defconfig
@@ -30,6 +30,7 @@ CONFIG_CMD_NAND=y
 CONFIG_CMD_USB=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_DHCP=y
+CONFIG_SYS_DISABLE_AUTOLOAD=y
 CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_EXT2=y

diff --git a/configs/ethernut5_defconfig b/configs/ethernut5_defconfig
index 256f6520a598903af9a7f5d06b92e004b4561749..796b71793a7f090891a11e59414715f744ece4f9 100644 (file)
--- a/configs/ethernut5_defconfig
+++ b/configs/ethernut5_defconfig
@@ -38,6 +38,7 @@ CONFIG_CMD_SPI=y
 CONFIG_CMD_DHCP=y
 CONFIG_BOOTP_BOOTFILESIZE=y
 CONFIG_CMD_RARP=y
+CONFIG_SYS_DISABLE_AUTOLOAD=y
 CONFIG_CMD_MII=y
 # CONFIG_CMD_MDIO is not set
 CONFIG_CMD_PING=y

diff --git a/configs/inetspace_v2_defconfig b/configs/inetspace_v2_defconfig
index 160a0898f2ed10061ffa8d343bde2a3edbcc0a8e..7b1e8dee16df486df5db4e471e036bb847c7e01a 100644 (file)
--- a/configs/inetspace_v2_defconfig
+++ b/configs/inetspace_v2_defconfig
@@ -38,6 +38,7 @@ CONFIG_CMD_SATA=y
 CONFIG_CMD_USB=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_DHCP=y
+CONFIG_SYS_DISABLE_AUTOLOAD=y
 CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_EXT2=y

diff --git a/configs/nas220_defconfig b/configs/nas220_defconfig
index 5d105522dd1236bc60df6383dd1826fc35639b7c..99f36b72bf97cb98e44bf48eaacb71fd07b8b138 100644 (file)
--- a/configs/nas220_defconfig
+++ b/configs/nas220_defconfig
@@ -30,6 +30,7 @@ CONFIG_CMD_NAND=y
 CONFIG_CMD_USB=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_DHCP=y
+CONFIG_SYS_DISABLE_AUTOLOAD=y
 CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_EXT2=y

diff --git a/configs/net2big_v2_defconfig b/configs/net2big_v2_defconfig
index 68d1eeff11e0e8202885d94a1b7b888e1cf04664..248ce90519eb08f81acb3cd95a1658eeff33cfeb 100644 (file)
--- a/configs/net2big_v2_defconfig
+++ b/configs/net2big_v2_defconfig
@@ -39,6 +39,7 @@ CONFIG_CMD_SATA=y
 CONFIG_CMD_USB=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_DHCP=y
+CONFIG_SYS_DISABLE_AUTOLOAD=y
 CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_EXT2=y

diff --git a/configs/netspace_lite_v2_defconfig b/configs/netspace_lite_v2_defconfig
index 98d8e59119f000ccd15db5eb0d2dec117064b21b..eea86eb0b73657133285cb09f7be277ba1507d8c 100644 (file)
--- a/configs/netspace_lite_v2_defconfig
+++ b/configs/netspace_lite_v2_defconfig
@@ -39,6 +39,7 @@ CONFIG_CMD_SATA=y
 CONFIG_CMD_USB=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_DHCP=y
+CONFIG_SYS_DISABLE_AUTOLOAD=y
 CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_EXT2=y

diff --git a/configs/netspace_max_v2_defconfig b/configs/netspace_max_v2_defconfig
index 11fd496e6d389985f6cb147c9cfb9e42fdf85aed..cb06fe2ae3cf57cd1ede2a0961ba4fc0083db570 100644 (file)
--- a/configs/netspace_max_v2_defconfig
+++ b/configs/netspace_max_v2_defconfig
@@ -39,6 +39,7 @@ CONFIG_CMD_SATA=y
 CONFIG_CMD_USB=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_DHCP=y
+CONFIG_SYS_DISABLE_AUTOLOAD=y
 CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_EXT2=y

diff --git a/configs/netspace_mini_v2_defconfig b/configs/netspace_mini_v2_defconfig
index 1025ca30ad930b127ea9bc66a518e6871c5428a3..3a461469106ff57b648581a45fbab118ad4fe227 100644 (file)
--- a/configs/netspace_mini_v2_defconfig
+++ b/configs/netspace_mini_v2_defconfig
@@ -38,6 +38,7 @@ CONFIG_CMD_I2C=y
 CONFIG_CMD_SATA=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_DHCP=y
+CONFIG_SYS_DISABLE_AUTOLOAD=y
 CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_EXT2=y

diff --git a/configs/netspace_v2_defconfig b/configs/netspace_v2_defconfig
index 1bb9915cc1ed50f4b7f54b691409297174c863a5..d39b6a479e9490a3530fd766474324d95a3d41a9 100644 (file)
--- a/configs/netspace_v2_defconfig
+++ b/configs/netspace_v2_defconfig
@@ -39,6 +39,7 @@ CONFIG_CMD_SATA=y
 CONFIG_CMD_USB=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_DHCP=y
+CONFIG_SYS_DISABLE_AUTOLOAD=y
 CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_EXT2=y

diff --git a/configs/octeontx2_95xx_defconfig b/configs/octeontx2_95xx_defconfig
index fc7bc6d50ec40840fed483da26a17b8eedda4917..2b3748b2d049c2c239606be6ec612eb653118182 100644 (file)
--- a/configs/octeontx2_95xx_defconfig
+++ b/configs/octeontx2_95xx_defconfig
@@ -59,6 +59,7 @@ CONFIG_BOOTP_BOOTFILESIZE=y
 CONFIG_CMD_TFTPPUT=y
 CONFIG_CMD_TFTPSRV=y
 CONFIG_CMD_RARP=y
+CONFIG_SYS_DISABLE_AUTOLOAD=y
 CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_CDP=y

diff --git a/configs/octeontx2_96xx_defconfig b/configs/octeontx2_96xx_defconfig
index e0d4fe76a0f9a4d3c585605ae0816299afdc0a30..0fd5b7212b825258a06a8215ba66e481c1999610 100644 (file)
--- a/configs/octeontx2_96xx_defconfig
+++ b/configs/octeontx2_96xx_defconfig
@@ -60,6 +60,7 @@ CONFIG_BOOTP_BOOTFILESIZE=y
 CONFIG_CMD_TFTPPUT=y
 CONFIG_CMD_TFTPSRV=y
 CONFIG_CMD_RARP=y
+CONFIG_SYS_DISABLE_AUTOLOAD=y
 CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_CDP=y

diff --git a/configs/omap35_logic_defconfig b/configs/omap35_logic_defconfig
index c76c10ac70fd30f73130f4d4e193ab215edce545..787c26eaa4779a43b9af1b330629bebfa0c67826 100644 (file)
--- a/configs/omap35_logic_defconfig
+++ b/configs/omap35_logic_defconfig
@@ -51,6 +51,7 @@ CONFIG_CMD_SPL_WRITE_SIZE=0x20000
 # CONFIG_CMD_FLASH is not set
 CONFIG_CMD_NAND=y
 CONFIG_CMD_NAND_LOCK_UNLOCK=y
+CONFIG_SYS_DISABLE_AUTOLOAD=y
 CONFIG_CMD_CACHE=y
 CONFIG_CMD_UUID=y
 CONFIG_CMD_MTDPARTS=y

diff --git a/configs/omap35_logic_somlv_defconfig b/configs/omap35_logic_somlv_defconfig
index 2637ecf9c50e42d46fece44d481f2b947aec900d..ab5dfad28fccbacbb510acbe34a6c10524109f76 100644 (file)
--- a/configs/omap35_logic_somlv_defconfig
+++ b/configs/omap35_logic_somlv_defconfig
@@ -52,6 +52,7 @@ CONFIG_CMD_SPL_NAND_OFS=0x240000
 CONFIG_CMD_SPL_WRITE_SIZE=0x20000
 CONFIG_CMD_NAND=y
 CONFIG_CMD_NAND_LOCK_UNLOCK=y
+CONFIG_SYS_DISABLE_AUTOLOAD=y
 CONFIG_CMD_CACHE=y
 CONFIG_CMD_UUID=y
 CONFIG_CMD_MTDPARTS=y

diff --git a/configs/omap3_logic_defconfig b/configs/omap3_logic_defconfig
index f55d52736baed627663552111e06b5b7948002f0..ce777cae88b379077a6868ffb8a0049edeb6f4f4 100644 (file)
--- a/configs/omap3_logic_defconfig
+++ b/configs/omap3_logic_defconfig
@@ -50,6 +50,7 @@ CONFIG_CMD_SPL_WRITE_SIZE=0x20000
 # CONFIG_CMD_FLASH is not set
 CONFIG_CMD_NAND=y
 CONFIG_CMD_NAND_LOCK_UNLOCK=y
+CONFIG_SYS_DISABLE_AUTOLOAD=y
 CONFIG_CMD_CACHE=y
 CONFIG_CMD_UUID=y
 CONFIG_CMD_MTDPARTS=y

diff --git a/configs/omap3_logic_somlv_defconfig b/configs/omap3_logic_somlv_defconfig
index 97cdc9491d3bf5d573d9d08bc4e05b32bfc7c50f..8c5bc19f10bfd9635309886fb9e3555303c8146b 100644 (file)
--- a/configs/omap3_logic_somlv_defconfig
+++ b/configs/omap3_logic_somlv_defconfig
@@ -52,6 +52,7 @@ CONFIG_CMD_SPL_NAND_OFS=0x240000
 CONFIG_CMD_SPL_WRITE_SIZE=0x20000
 CONFIG_CMD_NAND=y
 CONFIG_CMD_NAND_LOCK_UNLOCK=y
+CONFIG_SYS_DISABLE_AUTOLOAD=y
 CONFIG_CMD_CACHE=y
 CONFIG_CMD_UUID=y
 CONFIG_CMD_MTDPARTS=y

diff --git a/configs/opos6uldev_defconfig b/configs/opos6uldev_defconfig
index 1c1daf86a3b6d634d22e2268b5f6e55f483651df..b76e272e2552e4ba5d7aa28e195024d5db0ec590 100644 (file)
--- a/configs/opos6uldev_defconfig
+++ b/configs/opos6uldev_defconfig
@@ -55,6 +55,7 @@ CONFIG_CMD_USB=y
 CONFIG_CMD_USB_MASS_STORAGE=y
 CONFIG_CMD_DHCP=y
 CONFIG_CMD_TFTPPUT=y
+CONFIG_SYS_DISABLE_AUTOLOAD=y
 CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_SNTP=y

diff --git a/configs/pcm052_defconfig b/configs/pcm052_defconfig
index 75999d177dc9482282c691ee2a4efaee2048a525..41f1dc22c88ab93982e42673c660df3d24b1638a 100644 (file)
--- a/configs/pcm052_defconfig
+++ b/configs/pcm052_defconfig
@@ -31,6 +31,7 @@ CONFIG_CMD_I2C=y
 CONFIG_CMD_MMC=y
 CONFIG_CMD_NAND_TRIMFFS=y
 CONFIG_CMD_DHCP=y
+CONFIG_SYS_DISABLE_AUTOLOAD=y
 CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_FAT=y

diff --git a/configs/stm32mp15-icore-stm32mp1-ctouch2_defconfig b/configs/stm32mp15-icore-stm32mp1-ctouch2_defconfig
index 9441b8c3b1c3576863df2991db244440a5979e18..76a450952fc1530fbb54846b0a3cdb0a3200d366 100644 (file)
--- a/configs/stm32mp15-icore-stm32mp1-ctouch2_defconfig
+++ b/configs/stm32mp15-icore-stm32mp1-ctouch2_defconfig
@@ -43,6 +43,7 @@ CONFIG_CMD_GPIO=y
 CONFIG_CMD_I2C=y
 CONFIG_CMD_MMC=y
 CONFIG_CMD_REMOTEPROC=y
+CONFIG_SYS_DISABLE_AUTOLOAD=y
 CONFIG_CMD_CACHE=y
 CONFIG_CMD_TIME=y
 CONFIG_CMD_TIMER=y

diff --git a/configs/stm32mp15-icore-stm32mp1-edimm2.2_defconfig b/configs/stm32mp15-icore-stm32mp1-edimm2.2_defconfig
index 96162854523206e460213a94d452f883fa4cf630..d413d2cac4b60f016b81889b8cebd9a8b19bc052 100644 (file)
--- a/configs/stm32mp15-icore-stm32mp1-edimm2.2_defconfig
+++ b/configs/stm32mp15-icore-stm32mp1-edimm2.2_defconfig
@@ -43,6 +43,7 @@ CONFIG_CMD_GPIO=y
 CONFIG_CMD_I2C=y
 CONFIG_CMD_MMC=y
 CONFIG_CMD_REMOTEPROC=y
+CONFIG_SYS_DISABLE_AUTOLOAD=y
 CONFIG_CMD_CACHE=y
 CONFIG_CMD_TIME=y
 CONFIG_CMD_TIMER=y

diff --git a/configs/stm32mp15-microgea-stm32mp1-microdev2-of7_defconfig b/configs/stm32mp15-microgea-stm32mp1-microdev2-of7_defconfig
index 354a43cf55ef016b1b8befcd2cc070c782071bf9..dd270975508c80d22fa4239389eaa27938a3cbf0 100644 (file)
--- a/configs/stm32mp15-microgea-stm32mp1-microdev2-of7_defconfig
+++ b/configs/stm32mp15-microgea-stm32mp1-microdev2-of7_defconfig
@@ -43,6 +43,7 @@ CONFIG_CMD_GPIO=y
 CONFIG_CMD_I2C=y
 CONFIG_CMD_MMC=y
 CONFIG_CMD_REMOTEPROC=y
+CONFIG_SYS_DISABLE_AUTOLOAD=y
 CONFIG_CMD_CACHE=y
 CONFIG_CMD_TIME=y
 CONFIG_CMD_TIMER=y

diff --git a/configs/stm32mp15-microgea-stm32mp1-microdev2_defconfig b/configs/stm32mp15-microgea-stm32mp1-microdev2_defconfig
index a601477d127b3e9f4d5a77e6393859107910badd..54a5385926f1146c2ce48851628dd7b44857bce5 100644 (file)
--- a/configs/stm32mp15-microgea-stm32mp1-microdev2_defconfig
+++ b/configs/stm32mp15-microgea-stm32mp1-microdev2_defconfig
@@ -43,6 +43,7 @@ CONFIG_CMD_GPIO=y
 CONFIG_CMD_I2C=y
 CONFIG_CMD_MMC=y
 CONFIG_CMD_REMOTEPROC=y
+CONFIG_SYS_DISABLE_AUTOLOAD=y
 CONFIG_CMD_CACHE=y
 CONFIG_CMD_TIME=y
 CONFIG_CMD_TIMER=y

diff --git a/configs/stm32mp15_basic_defconfig b/configs/stm32mp15_basic_defconfig
index 8ae668ca2383372430a820236231e364504ac88f..a17dbed6590e75763718df43699569d37536d609 100644 (file)
--- a/configs/stm32mp15_basic_defconfig
+++ b/configs/stm32mp15_basic_defconfig
@@ -64,6 +64,7 @@ CONFIG_CMD_REMOTEPROC=y
 CONFIG_CMD_SPI=y
 CONFIG_CMD_USB=y
 CONFIG_CMD_USB_MASS_STORAGE=y
+CONFIG_SYS_DISABLE_AUTOLOAD=y
 CONFIG_CMD_BMP=y
 CONFIG_CMD_CACHE=y
 CONFIG_CMD_EFIDEBUG=y

diff --git a/configs/stm32mp15_defconfig b/configs/stm32mp15_defconfig
index 8c41f80ee17bfdab83277a0275a66664246a9531..48185d32baa7b2ada915fd234c4ca73a239ee7f8 100644 (file)
--- a/configs/stm32mp15_defconfig
+++ b/configs/stm32mp15_defconfig
@@ -40,6 +40,7 @@ CONFIG_CMD_REMOTEPROC=y
 CONFIG_CMD_SPI=y
 CONFIG_CMD_USB=y
 CONFIG_CMD_USB_MASS_STORAGE=y
+CONFIG_SYS_DISABLE_AUTOLOAD=y
 CONFIG_CMD_BMP=y
 CONFIG_CMD_CACHE=y
 CONFIG_CMD_EFIDEBUG=y

diff --git a/configs/stm32mp15_dhcom_basic_defconfig b/configs/stm32mp15_dhcom_basic_defconfig
index fc23400264c3aba99e6c3c8811e6e173622541d6..178c51687bec67bb798fbc664d4617a42b7399f7 100644 (file)
--- a/configs/stm32mp15_dhcom_basic_defconfig
+++ b/configs/stm32mp15_dhcom_basic_defconfig
@@ -72,6 +72,7 @@ CONFIG_CMD_REMOTEPROC=y
 CONFIG_CMD_SPI=y
 CONFIG_CMD_USB=y
 CONFIG_CMD_USB_MASS_STORAGE=y
+CONFIG_SYS_DISABLE_AUTOLOAD=y
 CONFIG_CMD_CACHE=y
 CONFIG_CMD_TIME=y
 CONFIG_CMD_TIMER=y

diff --git a/configs/stm32mp15_dhcor_basic_defconfig b/configs/stm32mp15_dhcor_basic_defconfig
index 95338c58c7d181939d9e911c167a50e0b0c28b6b..67a2c249007c29bfe5503adabe6414c090890a9f 100644 (file)
--- a/configs/stm32mp15_dhcor_basic_defconfig
+++ b/configs/stm32mp15_dhcor_basic_defconfig
@@ -70,6 +70,7 @@ CONFIG_CMD_REMOTEPROC=y
 CONFIG_CMD_SPI=y
 CONFIG_CMD_USB=y
 CONFIG_CMD_USB_MASS_STORAGE=y
+CONFIG_SYS_DISABLE_AUTOLOAD=y
 CONFIG_CMD_CACHE=y
 CONFIG_CMD_TIME=y
 CONFIG_CMD_TIMER=y

diff --git a/configs/stm32mp15_trusted_defconfig b/configs/stm32mp15_trusted_defconfig
index ebb51289c8adf0bfbe32d3c487130dee44402141..7cb430fc3282f27128dd75e70fc976432edff46d 100644 (file)
--- a/configs/stm32mp15_trusted_defconfig
+++ b/configs/stm32mp15_trusted_defconfig
@@ -41,6 +41,7 @@ CONFIG_CMD_REMOTEPROC=y
 CONFIG_CMD_SPI=y
 CONFIG_CMD_USB=y
 CONFIG_CMD_USB_MASS_STORAGE=y
+CONFIG_SYS_DISABLE_AUTOLOAD=y
 CONFIG_CMD_BMP=y
 CONFIG_CMD_CACHE=y
 CONFIG_CMD_EFIDEBUG=y

diff --git a/include/configs/am335x_guardian.h b/include/configs/am335x_guardian.h
index b92703205cde6b0e5b8b79b57c398ee750d86c0d..93fea95996cc3fef726a1e61cca77619502de69e 100644 (file)
--- a/include/configs/am335x_guardian.h
+++ b/include/configs/am335x_guardian.h
@@ -52,7 +52,6 @@
        MEM_LAYOUT_ENV_SETTINGS \
        BOOTENV \
        GUARDIAN_DEFAULT_PROD_ENV \
-       "autoload=no\0" \
        "backlight_brightness=50\0" \
        "bootubivol=rootfs\0" \
        "distro_bootcmd=" \

diff --git a/include/configs/bitmain_antminer_s9.h b/include/configs/bitmain_antminer_s9.h
index 2bcd0e1a989d97e782101f590f4c965b6d245c7c..829e816ad664be656c074f9e23c1d8d588a2e071 100644 (file)
--- a/include/configs/bitmain_antminer_s9.h
+++ b/include/configs/bitmain_antminer_s9.h
@@ -10,7 +10,6 @@
 #define CONFIG_SYS_SDRAM_SIZE  0x40000000
 
 #define CONFIG_EXTRA_ENV_SETTINGS \
-       "autoload=no\0" \
        "pxefile_addr_r=0x2000000\0" \
        "scriptaddr=0x3000000\0" \
        "kernel_addr_r=0x2000000\0" \

diff --git a/include/configs/bk4r1.h b/include/configs/bk4r1.h
index 2069d51d2fd1c95e77b1f6179134a0abfaa33af9..5311dc4eff9c7387ad41927d6fe6edf05cbb3070 100644 (file)
--- a/include/configs/bk4r1.h
+++ b/include/configs/bk4r1.h
@@ -67,7 +67,6 @@
 /* Extra env settings (including the target-defined ones if any) */
 #define CONFIG_EXTRA_ENV_SETTINGS \
        BK4_EXTRA_ENV_SETTINGS \
-       "autoload=no\0" \
        "fdt_high=0xffffffff\0" \
        "initrd_high=0xffffffff\0" \
        "blimg_file=u-boot.vyb\0" \

diff --git a/include/configs/brppt1.h b/include/configs/brppt1.h
index 440571a799e5881540265877aba502e4de8986ba..d7755b8cafa2941a54696f2172df2f426bc0e87d 100644 (file)
--- a/include/configs/brppt1.h
+++ b/include/configs/brppt1.h
@@ -102,7 +102,6 @@ MMCSPI_TGTS \
 #define CONFIG_EXTRA_ENV_SETTINGS \
 BUR_COMMON_ENV \
 "verify=no\0" \
-"autoload=0\0" \
 "scraddr=" __stringify(LOAD_OFFSET(0000000)) "\0" \
 "cfgaddr=" __stringify(LOAD_OFFSET(0020000)) "\0" \
 "dtbaddr=" __stringify(LOAD_OFFSET(0040000)) "\0" \

diff --git a/include/configs/brppt2.h b/include/configs/brppt2.h
index 19276cc6ecab319e7a96be57c378e787f55166fd..adaba410ce9714a429fd193026101b33b55066f7 100644 (file)
--- a/include/configs/brppt2.h
+++ b/include/configs/brppt2.h
@@ -29,7 +29,6 @@
 
 #define CONFIG_EXTRA_ENV_SETTINGS \
 BUR_COMMON_ENV \
-"autoload=0\0" \
 "cfgaddr=0x106F0000\0" \
 "scraddr=0x10700000\0" \
 "loadaddr=0x10800000\0" \

diff --git a/include/configs/brsmarc1.h b/include/configs/brsmarc1.h
index eccf16fdb7a147049ff6fdca5867c2754f94869a..8fa5843be5d143971c2b05fe8c658e472feefdf9 100644 (file)
--- a/include/configs/brsmarc1.h
+++ b/include/configs/brsmarc1.h
@@ -27,7 +27,6 @@
 /* Default environment */
 #define CONFIG_EXTRA_ENV_SETTINGS      \
 BUR_COMMON_ENV \
-"autoload=0\0" \
 "scradr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
 "cfgscr=mw ${dtbaddr} 0;" \
 " sf probe && sf read ${scradr} 0xC0000 0x10000 && source ${scradr};" \

diff --git a/include/configs/brxre1.h b/include/configs/brxre1.h
index b4e8d73db05ab89afaee1e1dcdf5c8ab09e71496..4d91a776ba8410170026937bc5dc1a1372ca7088 100644 (file)
--- a/include/configs/brxre1.h
+++ b/include/configs/brxre1.h
@@ -26,7 +26,6 @@
 /* Default environment */
 #define CONFIG_EXTRA_ENV_SETTINGS      \
 BUR_COMMON_ENV \
-"autoload=0\0" \
 "scradr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
 "bootaddr=0x80001100\0" \
 "bootdev=cpsw(0,0)\0" \

diff --git a/include/configs/cl-som-imx7.h b/include/configs/cl-som-imx7.h
index 4e982189559de3f529241b8dc9f6685321e879a5..1043eb75060fd644d3ea40916b595226383c9012 100644 (file)
--- a/include/configs/cl-som-imx7.h
+++ b/include/configs/cl-som-imx7.h
@@ -26,13 +26,9 @@
 #define CONFIG_SYS_I2C_PCA953X_ADDR    0x20
 #define CONFIG_SYS_I2C_PCA953X_WIDTH   { {0x20, 16} }
 
-#undef CONFIG_SYS_AUTOLOAD
 #undef CONFIG_EXTRA_ENV_SETTINGS
 
-#define CONFIG_SYS_AUTOLOAD            "no"
-
 #define CONFIG_EXTRA_ENV_SETTINGS \
-       "autoload=off\0" \
        "script=boot.scr\0" \
        "loadscript=load ${storagetype} ${storagedev} ${loadaddr} ${script};\0" \
        "loadkernel=load ${storagetype} ${storagedev} ${loadaddr} ${kernel};\0" \

diff --git a/include/configs/cm_fx6.h b/include/configs/cm_fx6.h
index 6bffeb6a65b58d260497e0837c106877e25f5d91..3bb00a359f88f57cda38a886ce1b1287cfcf4cea 100644 (file)
--- a/include/configs/cm_fx6.h
+++ b/include/configs/cm_fx6.h
@@ -43,7 +43,6 @@
        "stdout=serial,vidconsole\0" \
        "stderr=serial,vidconsole\0" \
        "panel=HDMI\0" \
-       "autoload=no\0" \
        "uImage=uImage-cm-fx6\0" \
        "zImage=zImage-cm-fx6\0" \
        "kernel=uImage-cm-fx6\0" \

diff --git a/include/configs/cm_t335.h b/include/configs/cm_t335.h
index b2bec10960aa56a3c994539da26b28ca0381f0b9..b81c3af29f625552b7cc49c815c6aeb8627266a1 100644 (file)
--- a/include/configs/cm_t335.h
+++ b/include/configs/cm_t335.h
@@ -55,8 +55,6 @@
        MMCARGS \
        NANDARGS
 
-#define CONFIG_SYS_AUTOLOAD            "no"
-
 /* Serial console configuration */
 
 /* NS16550 Configuration */

diff --git a/include/configs/cm_t43.h b/include/configs/cm_t43.h
index ec1355b8a32085b0b5e9b96cb2be46df9eff7b2c..07c5cb8ded1b506a5c35bf1c2ef9f82c647c62b1 100644 (file)
--- a/include/configs/cm_t43.h
+++ b/include/configs/cm_t43.h
@@ -56,7 +56,6 @@
        "loadaddr=0x80200000\0" \
        "fdtaddr=0x81200000\0" \
        "bootm_size=0x8000000\0" \
-       "autoload=no\0" \
        "console=ttyO0,115200n8\0" \
        "fdtfile=am437x-sb-som-t43.dtb\0" \
        "kernel=zImage-cm-t43\0" \

diff --git a/include/configs/devkit3250.h b/include/configs/devkit3250.h
index 15160db276d74aab438e9b5b9ad2b8a6da5abb46..e101d1f600486d77159cd98fb0da87c6c8a20d76 100644 (file)
--- a/include/configs/devkit3250.h
+++ b/include/configs/devkit3250.h
@@ -71,7 +71,6 @@
  */
 
 #define CONFIG_EXTRA_ENV_SETTINGS              \
-       "autoload=no\0"                         \
        "ethaddr=00:01:90:00:C0:81\0"           \
        "dtbaddr=0x81000000\0"                  \
        "nfsroot=/opt/projects/images/vladimir/oe/devkit3250/rootfs\0"  \

diff --git a/include/configs/dns325.h b/include/configs/dns325.h
index 0590704000ec7b50c5d5a5950ce8b49a8522a3d4..af2d3b6bcc3af145fc14793d03b0c95671260916 100644 (file)
--- a/include/configs/dns325.h
+++ b/include/configs/dns325.h
@@ -40,7 +40,6 @@
        "stdout=serial\0" \
        "stderr=serial\0" \
        "loadaddr=0x800000\0" \
-       "autoload=no\0" \
        "console=ttyS0,115200\0" \
        "mtdparts="CONFIG_MTDPARTS_DEFAULT \
        "optargs=\0" \

diff --git a/include/configs/ethernut5.h b/include/configs/ethernut5.h
index 8f9cfd50bc1e6fd0fe6eca1c64e6d837c3b2ce58..2126731ccfc90c2724e0ebc9414194fe709f0103 100644 (file)
--- a/include/configs/ethernut5.h
+++ b/include/configs/ethernut5.h
@@ -98,11 +98,6 @@
 #define I2C_DELAY      udelay(100)
 #define I2C_READ       at91_get_pio_value(AT91_PIO_PORTA, 23)
 
-/* DHCP/BOOTP options */
-#ifdef CONFIG_CMD_DHCP
-#define CONFIG_SYS_AUTOLOAD    "n"
-#endif
-
 /* File systems */
 
 /* Boot command */

diff --git a/include/configs/imx7-cm.h b/include/configs/imx7-cm.h
index 2f00198e40eaadca9803f776db6c83a9504203b6..f0f800b8409bd291e3d1e4fbeb1ec013705925e8 100644 (file)
--- a/include/configs/imx7-cm.h
+++ b/include/configs/imx7-cm.h
@@ -12,7 +12,6 @@
 
 #define CONFIG_MXC_UART_BASE            UART1_IPS_BASE_ADDR
 
-#undef CONFIG_SYS_AUTOLOAD
 #undef CONFIG_EXTRA_ENV_SETTINGS
 
 /*

diff --git a/include/configs/lacie_kw.h b/include/configs/lacie_kw.h
index 5e0f1c90934e8d488d9138f8aa1631dbe811beee..9b70eed46f7cd324037c809186817c1a1039e1e4 100644 (file)
--- a/include/configs/lacie_kw.h
+++ b/include/configs/lacie_kw.h
@@ -57,7 +57,6 @@
        "stderr=serial\0"                                       \
        "bootfile=uImage\0"                                     \
        "loadaddr=0x800000\0"                                   \
-       "autoload=no\0"                                         \
        "netconsole="                                           \
                "set stdin $stdin,nc; "                         \
                "set stdout $stdout,nc; "                       \

diff --git a/include/configs/nas220.h b/include/configs/nas220.h
index 815f81f6493d9a4cc38f918cec5b86de46cfcde1..a8a905d4942a0f96ac11d4909f9c9292881d6e29 100644 (file)
--- a/include/configs/nas220.h
+++ b/include/configs/nas220.h
@@ -42,8 +42,7 @@
        "0x500000@0xc0000(uimage),"\
        "0x1a40000@0x5c0000(rootfs)\0" \
        "mtdids=nand0=orion_nand\0"\
-       "autostart=no\0"\
-       "autoload=no\0"
+       "autostart=no\0"
 
 /*
  * Ethernet Driver configuration

diff --git a/include/configs/octeontx2_common.h b/include/configs/octeontx2_common.h
index 5c75f23a0bfbe67d6223e39cb03768f80d5ab4d4..f377ba8fa2ec08821efed87bdb0eb268a1557693 100644 (file)
--- a/include/configs/octeontx2_common.h
+++ b/include/configs/octeontx2_common.h
@@ -18,8 +18,7 @@
 /** Extra environment settings */
 #define CONFIG_EXTRA_ENV_SETTINGS      \
                                        "loadaddr=20080000\0"   \
-                                       "ethrotate=yes\0"       \
-                                       "autoload=0\0"
+                                       "ethrotate=yes\0"
 
 #define CONFIG_SYS_MMC_MAX_BLK_COUNT   8192
 

diff --git a/include/configs/octeontx_common.h b/include/configs/octeontx_common.h
index 2697a703cea52de5bb2d7a9a6d745036c4a8a809..73a14b25de67b941ba686fa61ac81838dbde7766 100644 (file)
--- a/include/configs/octeontx_common.h
+++ b/include/configs/octeontx_common.h
@@ -18,7 +18,6 @@
 #include <config_distro_bootcmd.h>
 /* Extra environment variables */
 #define CONFIG_EXTRA_ENV_SETTINGS      \
-       "autoload=0\0"                  \
        "loadaddr=0x20080000\0"         \
        "kernel_addr_r=0x02000000\0"    \
        "ramdisk_addr_r=0x03000000\0"   \

diff --git a/include/configs/omap3_logic.h b/include/configs/omap3_logic.h
index 12e502cd3640a762f09e470002bae3887fc9d153..ef55a621674776f26755f864c4643b9a4cc99172 100644 (file)
--- a/include/configs/omap3_logic.h
+++ b/include/configs/omap3_logic.h
@@ -87,7 +87,6 @@
                "nfsroot=${nfsrootpath} " \
                "ip=${ipaddr}:${tftpserver}:${gatewayip}:${netmask}::eth0:off\0" \
        "nfsrootpath=/opt/nfs-exports/omap\0" \
-       "autoload=no\0" \
        "fdtimage=" CONFIG_DEFAULT_DEVICE_TREE ".dtb\0" \
        "loadfdt=mmc rescan; " \
                "load mmc ${mmcdev} ${fdtaddr} ${fdtimage}\0" \

diff --git a/include/configs/opos6uldev.h b/include/configs/opos6uldev.h
index 73fe86f9bab810d6019277ccdabc2ccc7fe0e70b..3e551e13aa67f880e3a2d68eb35540bb847f077f 100644 (file)
--- a/include/configs/opos6uldev.h
+++ b/include/configs/opos6uldev.h
@@ -31,7 +31,6 @@
 /* LCD */
 #define MXS_LCDIF_BASE MX6UL_LCDIF1_BASE_ADDR
 
-#define CONFIG_SYS_AUTOLOAD     "no"
 #define CONFIG_ROOTPATH         "/tftpboot/opos6ul-root"
 
 #endif /* __OPOS6ULDEV_CONFIG_H */

diff --git a/include/configs/pcm052.h b/include/configs/pcm052.h
index e360b166f5573650f8f835493744cc041fa38ea1..bc4a59b3875781dc8cbdea45d5c4347bd8b91042 100644 (file)
--- a/include/configs/pcm052.h
+++ b/include/configs/pcm052.h
@@ -33,7 +33,6 @@
 /* Extra env settings (including the target-defined ones if any) */
 #define CONFIG_EXTRA_ENV_SETTINGS \
        PCM052_EXTRA_ENV_SETTINGS \
-       "autoload=no\0" \
        "fdt_high=0xffffffff\0" \
        "initrd_high=0xffffffff\0" \
        "blimg_file=u-boot.vyb\0" \

diff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h
index db8ff848285a04e4043345f74d8b81515211eea8..d2d4296eed6232dc32a4f807a3c55d88ecdd8c73 100644 (file)
--- a/include/configs/siemens-am33x-common.h
+++ b/include/configs/siemens-am33x-common.h
@@ -19,8 +19,6 @@
 
 #define CONFIG_ROOTPATH                "/opt/eldk"
 
-#define CONFIG_SYS_AUTOLOAD    "yes"
-
 /* Clock Defines */
 #define V_OSCK                         24000000  /* Clock output from T2 */
 #define V_SCLK                         (V_OSCK)

diff --git a/include/configs/smartweb.h b/include/configs/smartweb.h
index da6fb18c17ad35e7d34e08fb71b7e0090ea90ec4..b86b05b3193a45aa4f59ff79d29bc248ccc18aca 100644 (file)
--- a/include/configs/smartweb.h
+++ b/include/configs/smartweb.h
@@ -41,9 +41,6 @@
 
 /* misc settings */
 
-/* setting board specific options */
-#define CONFIG_SYS_AUTOLOAD "yes"
-
 /*
  * SDRAM: 1 bank, 64 MB, base address 0x20000000
  * Already initialized before u-boot gets started.

diff --git a/include/configs/stm32mp15_common.h b/include/configs/stm32mp15_common.h
index fc636beb3fc846324a3a725aa43303dd3ddb69a6..1e14e91ea701bdd2ab972de59c86ff7fc1892648 100644 (file)
--- a/include/configs/stm32mp15_common.h
+++ b/include/configs/stm32mp15_common.h
@@ -33,7 +33,6 @@
 /* Ethernet need */
 #ifdef CONFIG_DWC_ETH_QOS
 #define CONFIG_SERVERIP                 192.168.1.1
-#define CONFIG_SYS_AUTOLOAD            "no"
 #endif
 
 /*****************************************************************************/

diff --git a/include/env_default.h b/include/env_default.h
index 7113e08e6b0fd8c90a34b21ce073db6b53b30bba..d1508b3ff44ecd65a386bcee603f49ad97829da6 100644 (file)
--- a/include/env_default.h
+++ b/include/env_default.h
@@ -59,8 +59,8 @@ const char default_environment[] = {
 #ifdef CONFIG_SERVERIP
        "serverip="     __stringify(CONFIG_SERVERIP)    "\0"
 #endif
-#ifdef CONFIG_SYS_AUTOLOAD
-       "autoload="     CONFIG_SYS_AUTOLOAD             "\0"
+#ifdef CONFIG_SYS_DISABLE_AUTOLOAD
+       "autoload=0\0"
 #endif
 #ifdef CONFIG_PREBOOT
        "preboot="      CONFIG_PREBOOT                  "\0"