diff options
| author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2016-06-11 18:44:09 +0900 |
|---|---|---|
| committer | Masahiro Yamada <yamada.masahiro@socionext.com> | 2016-06-13 07:46:29 +0900 |
| commit | 3865b9ebe73eb6246ff2ab6ae7957f507eb539f7 (patch) | |
| tree | 2008d692e444c99d951e1c5af242ec4284761002 /include/configs | |
| parent | 2c15534f6b5b2157b7c93b6d7c59e26989afb069 (diff) | |
| download | talos-obmc-uboot-3865b9ebe73eb6246ff2ab6ae7957f507eb539f7.tar.gz talos-obmc-uboot-3865b9ebe73eb6246ff2ab6ae7957f507eb539f7.zip | |
autoboot: follow-up cleanup after CONFIG_BOOTDELAY moves
Tidy up garbage left by commit bb597c0eeb7e ("common: bootdelay: move
CONFIG_BOOTDELAY into a Kconfig option").
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Diffstat (limited to 'include/configs')
| -rw-r--r-- | include/configs/bfin_adi_common.h | 5 | ||||
| -rw-r--r-- | include/configs/mx6_common.h | 3 | ||||
| -rw-r--r-- | include/configs/mx7_common.h | 3 | ||||
| -rw-r--r-- | include/configs/omap3_cairo.h | 2 |
4 files changed, 0 insertions, 13 deletions
diff --git a/include/configs/bfin_adi_common.h b/include/configs/bfin_adi_common.h index 13076072e4..502ddad96b 100644 --- a/include/configs/bfin_adi_common.h +++ b/include/configs/bfin_adi_common.h @@ -97,11 +97,6 @@ /* * Env Settings */ -#ifndef CONFIG_BOOTDELAY -# if (CONFIG_BFIN_BOOT_MODE == BFIN_BOOT_UART) -# else -# endif -#endif #ifndef CONFIG_BOOTCOMMAND # define CONFIG_BOOTCOMMAND "run ramboot" #endif diff --git a/include/configs/mx6_common.h b/include/configs/mx6_common.h index 27f38f497e..fb49322f3b 100644 --- a/include/configs/mx6_common.h +++ b/include/configs/mx6_common.h @@ -59,9 +59,6 @@ #endif #define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR -#ifndef CONFIG_BOOTDELAY -#endif - /* allow to overwrite serial and ethaddr */ #define CONFIG_ENV_OVERWRITE #define CONFIG_CONS_INDEX 1 diff --git a/include/configs/mx7_common.h b/include/configs/mx7_common.h index 5e5656d480..fbc6de6283 100644 --- a/include/configs/mx7_common.h +++ b/include/configs/mx7_common.h @@ -34,9 +34,6 @@ #define CONFIG_LOADADDR 0x80800000 #define CONFIG_SYS_TEXT_BASE 0x87800000 -#ifndef CONFIG_BOOTDELAY -#endif - /* allow to overwrite serial and ethaddr */ #define CONFIG_ENV_OVERWRITE #define CONFIG_CONS_INDEX 1 diff --git a/include/configs/omap3_cairo.h b/include/configs/omap3_cairo.h index 96c3c4b958..82e0d5000c 100644 --- a/include/configs/omap3_cairo.h +++ b/include/configs/omap3_cairo.h @@ -73,8 +73,6 @@ #define CONFIG_NAND_OMAP_GPMC #define CONFIG_SYS_MAX_NAND_DEVICE 1 /* Max number of NAND */ /* devices */ -/* override default CONFIG_BOOTDELAY */ - #define CONFIG_EXTRA_ENV_SETTINGS \ "machid=ffffffff\0" \ "fdt_high=0x87000000\0" \ |
