mirror of
https://github.com/u-boot/u-boot.git
synced 2024-12-03 09:33:38 +08:00
ca0d535edc
Migrate boards which set bootlimit in the environment to Kconfig.
We exclude gurnard_defconfig which includes a bootlimit=, but doesn't set
CONFIG_BOOTCOUNT_LIMIT, so we'd fail to include a bootlimit setting
if we migrated it.
display5_defconfig and display5_factory_defconfig share a SYS_CONFIG_NAME,
but only display5_defconfig enables CONFIG_BOOTCOUNT_LIMIT, so we fail to
set bootlimit= in display5_factory_defconfig. This is okay because the
display5_factory_defconfig doesn't need to have it set, as it is only
meant to prepare the board in the factory.
Environment changes for all modified configs as seen from buildman:
boards.cfg is up to date. Nothing to do.
Summary of 3 commits for 32 boards (8 threads, 1 job per thread)
01: Merge git://git.denx.de/u-boot-x86
arm: + draco etamin rastaban pxm2 display5 thuban rut
02: Add BOOTCOUNT_BOOTLIMIT to set reboot limit
03: Migrate bootlimit to Kconfig
- display5_factory: bootlimit=3
Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
Reviewed-by: Lukasz Majewski <lukma@denx.de>
43 lines
1.1 KiB
Plaintext
43 lines
1.1 KiB
Plaintext
CONFIG_ARM=y
|
|
CONFIG_KIRKWOOD=y
|
|
CONFIG_SYS_TEXT_BASE=0x07d00000
|
|
CONFIG_TARGET_KM_KIRKWOOD=y
|
|
CONFIG_IDENT_STRING="\nKeymile Kirkwood PCI"
|
|
CONFIG_DEFAULT_DEVICE_TREE="kirkwood-km_kirkwood"
|
|
CONFIG_SYS_EXTRA_OPTIONS="KM_KIRKWOOD_PCI"
|
|
CONFIG_VERSION_VARIABLE=y
|
|
# CONFIG_DISPLAY_BOARDINFO is not set
|
|
CONFIG_HUSH_PARSER=y
|
|
CONFIG_AUTOBOOT_KEYED=y
|
|
CONFIG_AUTOBOOT_PROMPT="Hit <SPACE> key to stop autoboot in %2ds\n"
|
|
CONFIG_AUTOBOOT_STOP_STR=" "
|
|
CONFIG_CMD_ASKENV=y
|
|
CONFIG_CMD_GREPENV=y
|
|
CONFIG_CMD_EEPROM=y
|
|
# CONFIG_CMD_FLASH is not set
|
|
CONFIG_CMD_I2C=y
|
|
CONFIG_CMD_NAND=y
|
|
CONFIG_CMD_SF=y
|
|
CONFIG_CMD_DHCP=y
|
|
CONFIG_CMD_MII=y
|
|
CONFIG_CMD_PING=y
|
|
CONFIG_CMD_JFFS2=y
|
|
CONFIG_MTDIDS_DEFAULT="nand0=orion_nand"
|
|
CONFIG_MTDPARTS_DEFAULT="mtdparts=orion_nand:-(ubi0);"
|
|
CONFIG_CMD_UBI=y
|
|
# CONFIG_CMD_UBIFS is not set
|
|
CONFIG_OF_CONTROL=y
|
|
CONFIG_ENV_IS_IN_EEPROM=y
|
|
CONFIG_BOOTCOUNT_LIMIT=y
|
|
CONFIG_BOOTCOUNT_RAM=y
|
|
CONFIG_BOOTCOUNT_BOOTLIMIT=3
|
|
# CONFIG_MMC is not set
|
|
CONFIG_SPI_FLASH=y
|
|
CONFIG_SPI_FLASH_STMICRO=y
|
|
CONFIG_MVGBE=y
|
|
CONFIG_MII=y
|
|
CONFIG_SYS_NS16550=y
|
|
CONFIG_SPI=y
|
|
CONFIG_KIRKWOOD_SPI=y
|
|
CONFIG_BCH=y
|