diff options
| author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2016-06-27 16:22:59 +0900 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-07-01 17:42:54 -0400 |
| commit | ea72ee72f2e6dbce1125f0b37559ad547b7ee802 (patch) | |
| tree | 1f74b87ffc705926b79c868ccbd79d69132ca185 | |
| parent | 4aae64c22abbe3a3003322654ae6cd08d5d4c889 (diff) | |
| download | talos-obmc-uboot-ea72ee72f2e6dbce1125f0b37559ad547b7ee802.tar.gz talos-obmc-uboot-ea72ee72f2e6dbce1125f0b37559ad547b7ee802.zip | |
ARM: socfpga: move CONFIG_BOOTDELAY to Kconfig for IS1 board
This recently added board missed the tree-wide migration of
CONFIG_BOOTDELAY.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Acked-by: Pavel Machek <pavel@denx.de>
Reviewed-by: Heiko Schocher <hs@denx.de>
Reviewed-by: Stefan Roese <sr@denx.de>
| -rw-r--r-- | configs/socfpga_is1_defconfig | 4 | ||||
| -rw-r--r-- | include/configs/socfpga_is1.h | 1 |
2 files changed, 1 insertions, 4 deletions
diff --git a/configs/socfpga_is1_defconfig b/configs/socfpga_is1_defconfig index 7d43c7245e..658770b779 100644 --- a/configs/socfpga_is1_defconfig +++ b/configs/socfpga_is1_defconfig @@ -9,14 +9,13 @@ CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_is1" CONFIG_SPL=y CONFIG_SPL_STACK_R=y CONFIG_FIT=y +CONFIG_BOOTDELAY=3 CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set CONFIG_CMD_ASKENV=y CONFIG_CMD_GREPENV=y -# CONFIG_CMD_MEMTEST is not set # CONFIG_CMD_FLASH is not set -# CONFIG_CMD_MMC is not set CONFIG_CMD_SF=y CONFIG_CMD_SPI=y CONFIG_CMD_I2C=y @@ -36,7 +35,6 @@ CONFIG_SYS_I2C_DW=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_BAR=y CONFIG_SPI_FLASH_STMICRO=y -CONFIG_SPI_FLASH_USE_4K_SECTORS=y CONFIG_DM_ETH=y CONFIG_ETH_DESIGNWARE=y CONFIG_SYS_NS16550=y diff --git a/include/configs/socfpga_is1.h b/include/configs/socfpga_is1.h index 6f5dfce3be..cc07253aba 100644 --- a/include/configs/socfpga_is1.h +++ b/include/configs/socfpga_is1.h @@ -19,7 +19,6 @@ #define PHYS_SDRAM_1_SIZE 0x10000000 /* Booting Linux */ -#define CONFIG_BOOTDELAY 3 #define CONFIG_BOOTFILE "zImage" #define CONFIG_BOOTARGS "console=ttyS0," __stringify(CONFIG_BAUDRATE) #define CONFIG_LOADADDR 0x01000000 |
