summaryrefslogtreecommitdiffstats
path: root/configs/calimain_defconfig
diff options
context:
space:
mode:
authorAlex Kiernan <alex.kiernan@gmail.com>2018-07-21 20:25:33 +0000
committerTom Rini <trini@konsulko.com>2018-08-17 13:03:59 -0400
commitca0d535edcd2c2fdbd133575c3b06b583924741c (patch)
treeb25204bd854909ee583a690ead836d537bfb19a9 /configs/calimain_defconfig
parentc9ad6bc23543fbfa9735118b93b5f4741ab0ad6f (diff)
downloadu-boot-ca0d535edcd2c2fdbd133575c3b06b583924741c.tar.gz
u-boot-ca0d535edcd2c2fdbd133575c3b06b583924741c.tar.xz
u-boot-ca0d535edcd2c2fdbd133575c3b06b583924741c.zip
Migrate bootlimit to Kconfig
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>
Diffstat (limited to 'configs/calimain_defconfig')
-rw-r--r--configs/calimain_defconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/configs/calimain_defconfig b/configs/calimain_defconfig
index ae517e0b78..e4f392b1b6 100644
--- a/configs/calimain_defconfig
+++ b/configs/calimain_defconfig
@@ -23,6 +23,7 @@ CONFIG_CMD_PING=y
CONFIG_CMD_DIAG=y
CONFIG_ENV_IS_IN_FLASH=y
CONFIG_BOOTCOUNT_LIMIT=y
+CONFIG_BOOTCOUNT_BOOTLIMIT=3
CONFIG_SYS_BOOTCOUNT_ADDR=0x01C23000
CONFIG_DA8XX_GPIO=y
# CONFIG_MMC is not set