Skip to content

Commit ea72ee7

Browse files
masahir0ytrini
authored andcommitted
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 <[email protected]> Acked-by: Pavel Machek <[email protected]> Reviewed-by: Heiko Schocher <[email protected]> Reviewed-by: Stefan Roese <[email protected]>
1 parent 4aae64c commit ea72ee7

File tree

2 files changed

+1
-4
lines changed

2 files changed

+1
-4
lines changed

configs/socfpga_is1_defconfig

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,13 @@ CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_is1"
99
CONFIG_SPL=y
1010
CONFIG_SPL_STACK_R=y
1111
CONFIG_FIT=y
12+
CONFIG_BOOTDELAY=3
1213
CONFIG_HUSH_PARSER=y
1314
CONFIG_CMD_BOOTZ=y
1415
# CONFIG_CMD_IMLS is not set
1516
CONFIG_CMD_ASKENV=y
1617
CONFIG_CMD_GREPENV=y
17-
# CONFIG_CMD_MEMTEST is not set
1818
# CONFIG_CMD_FLASH is not set
19-
# CONFIG_CMD_MMC is not set
2019
CONFIG_CMD_SF=y
2120
CONFIG_CMD_SPI=y
2221
CONFIG_CMD_I2C=y
@@ -36,7 +35,6 @@ CONFIG_SYS_I2C_DW=y
3635
CONFIG_SPI_FLASH=y
3736
CONFIG_SPI_FLASH_BAR=y
3837
CONFIG_SPI_FLASH_STMICRO=y
39-
CONFIG_SPI_FLASH_USE_4K_SECTORS=y
4038
CONFIG_DM_ETH=y
4139
CONFIG_ETH_DESIGNWARE=y
4240
CONFIG_SYS_NS16550=y

include/configs/socfpga_is1.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
#define PHYS_SDRAM_1_SIZE 0x10000000
2020

2121
/* Booting Linux */
22-
#define CONFIG_BOOTDELAY 3
2322
#define CONFIG_BOOTFILE "zImage"
2423
#define CONFIG_BOOTARGS "console=ttyS0," __stringify(CONFIG_BAUDRATE)
2524
#define CONFIG_LOADADDR 0x01000000

0 commit comments

Comments
 (0)