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>
This commit is contained in:
@@ -251,7 +251,6 @@
|
||||
"verify=n\0" \
|
||||
"clearenv=protect off all;" \
|
||||
"erase 0x60040000 +0x40000;\0" \
|
||||
"bootlimit=3\0" \
|
||||
"altbootcmd=run bootrlk\0"
|
||||
|
||||
#define CONFIG_PREBOOT \
|
||||
|
||||
@@ -263,7 +263,6 @@
|
||||
"baudrate=115200\0" \
|
||||
"bootcmd=" CONFIG_BOOTCOMMAND "\0" \
|
||||
"factory=" FACTORY_PROCEDURE "\0" \
|
||||
"bootlimit=3\0" \
|
||||
"ethact=FEC\0" \
|
||||
"netdev=eth0\0" \
|
||||
"boot_os=y\0" \
|
||||
|
||||
@@ -87,7 +87,6 @@
|
||||
|
||||
#define CONFIG_EXTRA_ENV_SETTINGS \
|
||||
"bootcause=POR\0" \
|
||||
"bootlimit=10\0" \
|
||||
"image=/boot/fitImage\0" \
|
||||
"fdt_high=0xffffffff\0" \
|
||||
"dev=mmc\0" \
|
||||
|
||||
@@ -194,7 +194,6 @@
|
||||
"setenv altbootcmd \'setenv boot_bank ${backup_bank}; " \
|
||||
"run ${subbootcmds}; reset\' && " \
|
||||
"saveenv && saveenv && boot\0" \
|
||||
"bootlimit=3\0" \
|
||||
"cramfsloadfdt=" \
|
||||
"cramfsload ${fdt_addr_r} " \
|
||||
"fdt_0x${IVM_BoardId}_0x${IVM_HWKey}.dtb\0" \
|
||||
|
||||
@@ -101,7 +101,6 @@
|
||||
|
||||
#define CONFIG_EXTRA_ENV_SETTINGS \
|
||||
PPD_CONFIG_NFS \
|
||||
"bootlimit=10\0" \
|
||||
"image=/boot/fitImage\0" \
|
||||
"fdt_high=0xffffffff\0" \
|
||||
"dev=mmc\0" \
|
||||
|
||||
@@ -237,7 +237,6 @@
|
||||
"project_dir=targetdir\0" \
|
||||
"upgrade_available=0\0" \
|
||||
"altbootcmd=run bootcmd\0" \
|
||||
"bootlimit=3\0" \
|
||||
"partitionset_active=A\0" \
|
||||
"loadaddr=0x82000000\0" \
|
||||
"kloadaddr=0x81000000\0" \
|
||||
|
||||
Reference in New Issue
Block a user