autoboot: follow-up cleanup after CONFIG_BOOTDELAY moves
Tidy up garbage left by commit bb597c0eeb
("common: bootdelay: move
CONFIG_BOOTDELAY into a Kconfig option").
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
This commit is contained in:
parent
2c15534f6b
commit
3865b9ebe7
@ -97,11 +97,6 @@
|
|||||||
/*
|
/*
|
||||||
* Env Settings
|
* Env Settings
|
||||||
*/
|
*/
|
||||||
#ifndef CONFIG_BOOTDELAY
|
|
||||||
# if (CONFIG_BFIN_BOOT_MODE == BFIN_BOOT_UART)
|
|
||||||
# else
|
|
||||||
# endif
|
|
||||||
#endif
|
|
||||||
#ifndef CONFIG_BOOTCOMMAND
|
#ifndef CONFIG_BOOTCOMMAND
|
||||||
# define CONFIG_BOOTCOMMAND "run ramboot"
|
# define CONFIG_BOOTCOMMAND "run ramboot"
|
||||||
#endif
|
#endif
|
||||||
|
@ -59,9 +59,6 @@
|
|||||||
#endif
|
#endif
|
||||||
#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR
|
#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR
|
||||||
|
|
||||||
#ifndef CONFIG_BOOTDELAY
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* allow to overwrite serial and ethaddr */
|
/* allow to overwrite serial and ethaddr */
|
||||||
#define CONFIG_ENV_OVERWRITE
|
#define CONFIG_ENV_OVERWRITE
|
||||||
#define CONFIG_CONS_INDEX 1
|
#define CONFIG_CONS_INDEX 1
|
||||||
|
@ -34,9 +34,6 @@
|
|||||||
#define CONFIG_LOADADDR 0x80800000
|
#define CONFIG_LOADADDR 0x80800000
|
||||||
#define CONFIG_SYS_TEXT_BASE 0x87800000
|
#define CONFIG_SYS_TEXT_BASE 0x87800000
|
||||||
|
|
||||||
#ifndef CONFIG_BOOTDELAY
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* allow to overwrite serial and ethaddr */
|
/* allow to overwrite serial and ethaddr */
|
||||||
#define CONFIG_ENV_OVERWRITE
|
#define CONFIG_ENV_OVERWRITE
|
||||||
#define CONFIG_CONS_INDEX 1
|
#define CONFIG_CONS_INDEX 1
|
||||||
|
@ -73,8 +73,6 @@
|
|||||||
#define CONFIG_NAND_OMAP_GPMC
|
#define CONFIG_NAND_OMAP_GPMC
|
||||||
#define CONFIG_SYS_MAX_NAND_DEVICE 1 /* Max number of NAND */
|
#define CONFIG_SYS_MAX_NAND_DEVICE 1 /* Max number of NAND */
|
||||||
/* devices */
|
/* devices */
|
||||||
/* override default CONFIG_BOOTDELAY */
|
|
||||||
|
|
||||||
#define CONFIG_EXTRA_ENV_SETTINGS \
|
#define CONFIG_EXTRA_ENV_SETTINGS \
|
||||||
"machid=ffffffff\0" \
|
"machid=ffffffff\0" \
|
||||||
"fdt_high=0x87000000\0" \
|
"fdt_high=0x87000000\0" \
|
||||||
|
Loading…
Reference in New Issue
Block a user