mirror of
https://github.com/AsahiLinux/u-boot
synced 2025-02-17 22:49:02 +00:00
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>
This commit is contained in:
parent
d8564e919d
commit
bf904ea418
68 changed files with 54 additions and 40 deletions
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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=" \
|
||||
|
|
|
@ -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" \
|
||||
|
|
|
@ -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" \
|
||||
|
|
|
@ -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" \
|
||||
|
|
|
@ -29,7 +29,6 @@
|
|||
|
||||
#define CONFIG_EXTRA_ENV_SETTINGS \
|
||||
BUR_COMMON_ENV \
|
||||
"autoload=0\0" \
|
||||
"cfgaddr=0x106F0000\0" \
|
||||
"scraddr=0x10700000\0" \
|
||||
"loadaddr=0x10800000\0" \
|
||||
|
|
|
@ -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};" \
|
||||
|
|
|
@ -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" \
|
||||
|
|
|
@ -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" \
|
||||
|
|
|
@ -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" \
|
||||
|
|
|
@ -55,8 +55,6 @@
|
|||
MMCARGS \
|
||||
NANDARGS
|
||||
|
||||
#define CONFIG_SYS_AUTOLOAD "no"
|
||||
|
||||
/* Serial console configuration */
|
||||
|
||||
/* NS16550 Configuration */
|
||||
|
|
|
@ -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" \
|
||||
|
|
|
@ -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" \
|
||||
|
|
|
@ -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" \
|
||||
|
|
|
@ -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 */
|
||||
|
|
|
@ -12,7 +12,6 @@
|
|||
|
||||
#define CONFIG_MXC_UART_BASE UART1_IPS_BASE_ADDR
|
||||
|
||||
#undef CONFIG_SYS_AUTOLOAD
|
||||
#undef CONFIG_EXTRA_ENV_SETTINGS
|
||||
|
||||
/*
|
||||
|
|
|
@ -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; " \
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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" \
|
||||
|
|
|
@ -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" \
|
||||
|
|
|
@ -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 */
|
||||
|
|
|
@ -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" \
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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.
|
||||
|
|
|
@ -33,7 +33,6 @@
|
|||
/* Ethernet need */
|
||||
#ifdef CONFIG_DWC_ETH_QOS
|
||||
#define CONFIG_SERVERIP 192.168.1.1
|
||||
#define CONFIG_SYS_AUTOLOAD "no"
|
||||
#endif
|
||||
|
||||
/*****************************************************************************/
|
||||
|
|
|
@ -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"
|
||||
|
|
Loading…
Add table
Reference in a new issue