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>

diff --git a/configs/calimain_defconfig b/configs/calimain_defconfig
index ae517e0b78b9811fc4e6eab292af6af7eb51bb81..e4f392b1b698a14eb84d4ed3bce6367dec358e62 100644 (file)
--- 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

diff --git a/configs/display5_defconfig b/configs/display5_defconfig
index 0b7bcadd2f849e9967ff70f976b780ac9d561c0c..b3124b698d87ed3ed8d14aa2633aa6ccfa30b8ac 100644 (file)
--- a/configs/display5_defconfig
+++ b/configs/display5_defconfig
@@ -57,6 +57,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=02008000.spi.1:128k(SPL),1m(u-boot),64k(env1),
 CONFIG_OF_CONTROL=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_BOOTCOUNT_LIMIT=y
+CONFIG_BOOTCOUNT_BOOTLIMIT=3
 CONFIG_SYS_BOOTCOUNT_SINGLEWORD=y
 CONFIG_SYS_BOOTCOUNT_ADDR=0x020CC068
 CONFIG_FSL_ESDHC=y

diff --git a/configs/draco_defconfig b/configs/draco_defconfig
index 67e275af7699d1deb30b8f8771c77d1360f3ab25..9c5b45e89fe704261af759ec573f6583481e03b4 100644 (file)
--- a/configs/draco_defconfig
+++ b/configs/draco_defconfig
@@ -57,6 +57,7 @@ CONFIG_OF_EMBED=y
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_BOOTCOUNT_LIMIT=y
 CONFIG_BOOTCOUNT_ENV=y
+CONFIG_BOOTCOUNT_BOOTLIMIT=3
 CONFIG_DFU_NAND=y
 CONFIG_MMC_OMAP_HS=y
 CONFIG_NAND=y

diff --git a/configs/etamin_defconfig b/configs/etamin_defconfig
index 4bb4d2697146597fe8b6848e075a64702e6cd289..ce3a22847142bf52e1b777c9989d208f3f92d24c 100644 (file)
--- a/configs/etamin_defconfig
+++ b/configs/etamin_defconfig
@@ -57,6 +57,7 @@ CONFIG_OF_EMBED=y
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_BOOTCOUNT_LIMIT=y
 CONFIG_BOOTCOUNT_ENV=y
+CONFIG_BOOTCOUNT_BOOTLIMIT=3
 CONFIG_DFU_NAND=y
 CONFIG_MMC_OMAP_HS=y
 CONFIG_NAND=y

diff --git a/configs/ge_bx50v3_defconfig b/configs/ge_bx50v3_defconfig
index 8e3f33106924d09dc7b165e310731712f9001769..729377d43818cee4d65d2a7f649b29dd2dc1862f 100644 (file)
--- a/configs/ge_bx50v3_defconfig
+++ b/configs/ge_bx50v3_defconfig
@@ -29,6 +29,7 @@ CONFIG_DOS_PARTITION=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_BOOTCOUNT_LIMIT=y
 CONFIG_BOOTCOUNT_EXT=y
+CONFIG_BOOTCOUNT_BOOTLIMIT=10
 CONFIG_SYS_BOOTCOUNT_EXT_DEVPART="1:5"
 CONFIG_SYS_BOOTCOUNT_ADDR=0x7000A000
 CONFIG_FSL_ESDHC=y

diff --git a/configs/km_kirkwood_128m16_defconfig b/configs/km_kirkwood_128m16_defconfig
index 6632adafdfd557e460afcb9f1ef4842b716b797d..42823fb2661f7f2d4d4836028bf96f3b8013f40e 100644 (file)
--- a/configs/km_kirkwood_128m16_defconfig
+++ b/configs/km_kirkwood_128m16_defconfig
@@ -30,6 +30,7 @@ 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

diff --git a/configs/km_kirkwood_defconfig b/configs/km_kirkwood_defconfig
index 8009e0bfe0edbea565be054bac34eb8120c5e05b..dac15f8a7f7a1c4bfd9adb6a4051731e256df679 100644 (file)
--- a/configs/km_kirkwood_defconfig
+++ b/configs/km_kirkwood_defconfig
@@ -30,6 +30,7 @@ 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

diff --git a/configs/km_kirkwood_pci_defconfig b/configs/km_kirkwood_pci_defconfig
index 7ec76f9e4718b7f93d226b9fc00f63748ceac5ca..f01209ef8cfd1b1d01eb6cb1032233aafff641ff 100644 (file)
--- a/configs/km_kirkwood_pci_defconfig
+++ b/configs/km_kirkwood_pci_defconfig
@@ -30,6 +30,7 @@ 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

diff --git a/configs/kmcoge4_defconfig b/configs/kmcoge4_defconfig
index c8473ca08a553ae4131973e1abbb0fb0de6c723e..9f94c2765f6659fc3ea3b41aeeec910a4f7f3a6b 100644 (file)
--- a/configs/kmcoge4_defconfig
+++ b/configs/kmcoge4_defconfig
@@ -35,6 +35,7 @@ CONFIG_CMD_UBI=y
 CONFIG_DOS_PARTITION=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_BOOTCOUNT_LIMIT=y
+CONFIG_BOOTCOUNT_BOOTLIMIT=3
 CONFIG_SYS_BOOTCOUNT_ADDR=0xFB000020
 # CONFIG_MMC is not set
 CONFIG_SPI_FLASH=y

diff --git a/configs/kmcoge5ne_defconfig b/configs/kmcoge5ne_defconfig
index 4e78d37ad4135ac57feb4ff586a86e3c590cbd45..fdf86028fc28dc01a6dbae8b1ae12e2c3e4e63af 100644 (file)
--- a/configs/kmcoge5ne_defconfig
+++ b/configs/kmcoge5ne_defconfig
@@ -27,6 +27,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=boot:768k(u-boot),128k(env),128k(envred),-(ubi
 CONFIG_CMD_UBI=y
 # CONFIG_CMD_UBIFS is not set
 CONFIG_BOOTCOUNT_LIMIT=y
+CONFIG_BOOTCOUNT_BOOTLIMIT=3
 CONFIG_SYS_BOOTCOUNT_ADDR=0xE011BFF8
 # CONFIG_MMC is not set
 CONFIG_MTD_NOR_FLASH=y

diff --git a/configs/kmcoge5un_defconfig b/configs/kmcoge5un_defconfig
index d5a8a2ae87df7b7498c02a2fa908d7c74f362ab2..d980643b74c89db70a9766b127ed6fb8707455f6 100644 (file)
--- a/configs/kmcoge5un_defconfig
+++ b/configs/kmcoge5un_defconfig
@@ -30,6 +30,7 @@ CONFIG_OF_CONTROL=y
 CONFIG_ENV_IS_IN_SPI_FLASH=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

diff --git a/configs/kmeter1_defconfig b/configs/kmeter1_defconfig
index 9aad99982acf437348c967996ddb4c499e0eedcd..d65643ce864614c584257a9d89f4d81fca2cccf0 100644 (file)
--- a/configs/kmeter1_defconfig
+++ b/configs/kmeter1_defconfig
@@ -26,6 +26,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=boot:768k(u-boot),128k(env),128k(envred),-(ubi
 CONFIG_CMD_UBI=y
 # CONFIG_CMD_UBIFS is not set
 CONFIG_BOOTCOUNT_LIMIT=y
+CONFIG_BOOTCOUNT_BOOTLIMIT=3
 CONFIG_SYS_BOOTCOUNT_ADDR=0xE011BFF8
 # CONFIG_MMC is not set
 CONFIG_MTD_NOR_FLASH=y

diff --git a/configs/kmlion1_defconfig b/configs/kmlion1_defconfig
index 7ffeaf90190e993d598ce2768d47877055e062c7..4b9257545dba4adea99d9025f36f45810c5fec9a 100644 (file)
--- a/configs/kmlion1_defconfig
+++ b/configs/kmlion1_defconfig
@@ -35,6 +35,7 @@ CONFIG_CMD_UBI=y
 CONFIG_DOS_PARTITION=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_BOOTCOUNT_LIMIT=y
+CONFIG_BOOTCOUNT_BOOTLIMIT=3
 CONFIG_SYS_BOOTCOUNT_ADDR=0xFB000020
 # CONFIG_MMC is not set
 CONFIG_SPI_FLASH=y

diff --git a/configs/kmnusa_defconfig b/configs/kmnusa_defconfig
index 35dadb07c836ca635e8f84a1a447ba96ac023901..dcfb1e4a3d03cbbe3547237cd23b9f63751b8562 100644 (file)
--- a/configs/kmnusa_defconfig
+++ b/configs/kmnusa_defconfig
@@ -30,6 +30,7 @@ CONFIG_OF_CONTROL=y
 CONFIG_ENV_IS_IN_SPI_FLASH=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

diff --git a/configs/kmopti2_defconfig b/configs/kmopti2_defconfig
index d8da1c4b187a2bd40696aee24de94e095ca30071..a63d4f947461fdd41d5d6d666579fff816b9d941 100644 (file)
--- a/configs/kmopti2_defconfig
+++ b/configs/kmopti2_defconfig
@@ -26,6 +26,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=boot:768k(u-boot),128k(env),128k(envred),-(ubi
 CONFIG_CMD_UBI=y
 # CONFIG_CMD_UBIFS is not set
 CONFIG_BOOTCOUNT_LIMIT=y
+CONFIG_BOOTCOUNT_BOOTLIMIT=3
 CONFIG_SYS_BOOTCOUNT_ADDR=0xE0113FF8
 # CONFIG_MMC is not set
 CONFIG_MTD_NOR_FLASH=y

diff --git a/configs/kmsugp1_defconfig b/configs/kmsugp1_defconfig
index 4cbf2e68d20f364faf69a4aa1f4dbe650c226040..4dd86b9e73147546f47d12ecaa3461d05b7f0abe 100644 (file)
--- a/configs/kmsugp1_defconfig
+++ b/configs/kmsugp1_defconfig
@@ -30,6 +30,7 @@ CONFIG_OF_CONTROL=y
 CONFIG_ENV_IS_IN_SPI_FLASH=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

diff --git a/configs/kmsupx5_defconfig b/configs/kmsupx5_defconfig
index 79d5f923ffe420a6e681d501097f02b3c9ad891e..35ae380971fbc7d77d94268fd3d183fa2137a345 100644 (file)
--- a/configs/kmsupx5_defconfig
+++ b/configs/kmsupx5_defconfig
@@ -26,6 +26,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=boot:768k(u-boot),128k(env),128k(envred),-(ubi
 CONFIG_CMD_UBI=y
 # CONFIG_CMD_UBIFS is not set
 CONFIG_BOOTCOUNT_LIMIT=y
+CONFIG_BOOTCOUNT_BOOTLIMIT=3
 CONFIG_SYS_BOOTCOUNT_ADDR=0xE0113FF8
 # CONFIG_MMC is not set
 CONFIG_MTD_NOR_FLASH=y

diff --git a/configs/kmsuv31_defconfig b/configs/kmsuv31_defconfig
index f3c885b64c8a0d85922e991b631fd92e198bb9f9..5ade2ce12067263ebc49014b47340f22ba42cea4 100644 (file)
--- a/configs/kmsuv31_defconfig
+++ b/configs/kmsuv31_defconfig
@@ -30,6 +30,7 @@ CONFIG_OF_CONTROL=y
 CONFIG_ENV_IS_IN_SPI_FLASH=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

diff --git a/configs/kmtegr1_defconfig b/configs/kmtegr1_defconfig
index f3ca988c6264c9f1171ea7ee88147364be5ef2a4..461ab530c9334410560aac14e95b122f08f18040 100644 (file)
--- a/configs/kmtegr1_defconfig
+++ b/configs/kmtegr1_defconfig
@@ -28,6 +28,7 @@ CONFIG_CMD_DIAG=y
 CONFIG_CMD_UBI=y
 # CONFIG_CMD_UBIFS is not set
 CONFIG_BOOTCOUNT_LIMIT=y
+CONFIG_BOOTCOUNT_BOOTLIMIT=3
 CONFIG_SYS_BOOTCOUNT_ADDR=0xE0113FF8
 # CONFIG_MMC is not set
 CONFIG_MTD_NOR_FLASH=y

diff --git a/configs/kmtepr2_defconfig b/configs/kmtepr2_defconfig
index c47341e160f61e0324dddf006a4a342398427e70..e88273db02fe4d8260117e6fa46f8aa661d997e8 100644 (file)
--- a/configs/kmtepr2_defconfig
+++ b/configs/kmtepr2_defconfig
@@ -26,6 +26,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=boot:768k(u-boot),128k(env),128k(envred),-(ubi
 CONFIG_CMD_UBI=y
 # CONFIG_CMD_UBIFS is not set
 CONFIG_BOOTCOUNT_LIMIT=y
+CONFIG_BOOTCOUNT_BOOTLIMIT=3
 CONFIG_SYS_BOOTCOUNT_ADDR=0xE0113FF8
 # CONFIG_MMC is not set
 CONFIG_MTD_NOR_FLASH=y

diff --git a/configs/kmvect1_defconfig b/configs/kmvect1_defconfig
index 281a82e0ca81b07b2fd35f223252a8d283231aec..8b3449075692c7af8458581b215454550ca33dbf 100644 (file)
--- a/configs/kmvect1_defconfig
+++ b/configs/kmvect1_defconfig
@@ -27,6 +27,7 @@ CONFIG_CMD_DIAG=y
 CONFIG_CMD_UBI=y
 # CONFIG_CMD_UBIFS is not set
 CONFIG_BOOTCOUNT_LIMIT=y
+CONFIG_BOOTCOUNT_BOOTLIMIT=3
 CONFIG_SYS_BOOTCOUNT_ADDR=0xE0113FF8
 # CONFIG_MMC is not set
 CONFIG_MTD_NOR_FLASH=y

diff --git a/configs/mgcoge3un_defconfig b/configs/mgcoge3un_defconfig
index 6c974b353315eebe07ac9d9b6537eab58018d35f..e4db614f5352e424db265814f70ac9f3c35e3e79 100644 (file)
--- a/configs/mgcoge3un_defconfig
+++ b/configs/mgcoge3un_defconfig
@@ -30,6 +30,7 @@ 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

diff --git a/configs/mx53ppd_defconfig b/configs/mx53ppd_defconfig
index bc7f64aff13be3e3f475369d4a8d3925ae5a8bcd..f0f32ef96775f903317cb8f116166708833750c8 100644 (file)
--- a/configs/mx53ppd_defconfig
+++ b/configs/mx53ppd_defconfig
@@ -26,6 +26,7 @@ CONFIG_CMD_FS_GENERIC=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_BOOTCOUNT_LIMIT=y
 CONFIG_BOOTCOUNT_EXT=y
+CONFIG_BOOTCOUNT_BOOTLIMIT=10
 CONFIG_SYS_BOOTCOUNT_EXT_DEVPART="0:5"
 CONFIG_SYS_BOOTCOUNT_ADDR=0x7000A000
 CONFIG_FSL_ESDHC=y

diff --git a/configs/portl2_defconfig b/configs/portl2_defconfig
index 9d25e18a4872bae55c9c30a6d751b6ca218ad7f6..125866d02d7246084b8d7abb00abafd3c2d030d2 100644 (file)
--- a/configs/portl2_defconfig
+++ b/configs/portl2_defconfig
@@ -28,6 +28,7 @@ CONFIG_CMD_UBI=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

diff --git a/configs/pxm2_defconfig b/configs/pxm2_defconfig
index 3e9c4f96fe2d7b6910e9307400f2a39629938db0..6a9cb5529ed2749949b1a7eca535f797f0aff689 100644 (file)
--- a/configs/pxm2_defconfig
+++ b/configs/pxm2_defconfig
@@ -59,6 +59,7 @@ CONFIG_OF_EMBED=y
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_BOOTCOUNT_LIMIT=y
 CONFIG_BOOTCOUNT_ENV=y
+CONFIG_BOOTCOUNT_BOOTLIMIT=3
 CONFIG_DFU_NAND=y
 CONFIG_MMC_OMAP_HS=y
 CONFIG_NAND=y

diff --git a/configs/rastaban_defconfig b/configs/rastaban_defconfig
index e9ed675e91849cded4b77c6ebe7c1aa93349e76a..9b29418950143cf04776c26e2e5acc3d8487f62b 100644 (file)
--- a/configs/rastaban_defconfig
+++ b/configs/rastaban_defconfig
@@ -57,6 +57,7 @@ CONFIG_OF_EMBED=y
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_BOOTCOUNT_LIMIT=y
 CONFIG_BOOTCOUNT_ENV=y
+CONFIG_BOOTCOUNT_BOOTLIMIT=3
 CONFIG_DFU_NAND=y
 CONFIG_MMC_OMAP_HS=y
 CONFIG_NAND=y

diff --git a/configs/rut_defconfig b/configs/rut_defconfig
index 8d963f8df344d0ba93fc5356f7c4b4ca92bb269a..107014e56c2f36fc4c25a0ab9244d79d4275d2b4 100644 (file)
--- a/configs/rut_defconfig
+++ b/configs/rut_defconfig
@@ -60,6 +60,7 @@ CONFIG_OF_EMBED=y
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_BOOTCOUNT_LIMIT=y
 CONFIG_BOOTCOUNT_ENV=y
+CONFIG_BOOTCOUNT_BOOTLIMIT=3
 CONFIG_DFU_NAND=y
 CONFIG_MMC_OMAP_HS=y
 CONFIG_NAND=y

diff --git a/configs/suvd3_defconfig b/configs/suvd3_defconfig
index ede7e7316cb6d1ac32cab8330ed3eaf7558cc010..0cf89a37ea78755dfc038435634f46586a9a391d 100644 (file)
--- a/configs/suvd3_defconfig
+++ b/configs/suvd3_defconfig
@@ -26,6 +26,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=boot:768k(u-boot),128k(env),128k(envred),-(ubi
 CONFIG_CMD_UBI=y
 # CONFIG_CMD_UBIFS is not set
 CONFIG_BOOTCOUNT_LIMIT=y
+CONFIG_BOOTCOUNT_BOOTLIMIT=3
 CONFIG_SYS_BOOTCOUNT_ADDR=0xE0113FF8
 # CONFIG_MMC is not set
 CONFIG_MTD_NOR_FLASH=y

diff --git a/configs/thuban_defconfig b/configs/thuban_defconfig
index acc01861ca452491384f8a54f53bc94b653a0072..981b1d8a1449fa1178d5b51e2536bb597a4e3e6a 100644 (file)
--- a/configs/thuban_defconfig
+++ b/configs/thuban_defconfig
@@ -57,6 +57,7 @@ CONFIG_OF_EMBED=y
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_BOOTCOUNT_LIMIT=y
 CONFIG_BOOTCOUNT_ENV=y
+CONFIG_BOOTCOUNT_BOOTLIMIT=3
 CONFIG_DFU_NAND=y
 CONFIG_MMC_OMAP_HS=y
 CONFIG_NAND=y

diff --git a/configs/tuge1_defconfig b/configs/tuge1_defconfig
index 4ace459571003fa015c0821c697f4c595d3002d3..38523ca139f650daf76f3b8fb66837ff3f58131a 100644 (file)
--- a/configs/tuge1_defconfig
+++ b/configs/tuge1_defconfig
@@ -26,6 +26,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=boot:768k(u-boot),128k(env),128k(envred),-(ubi
 CONFIG_CMD_UBI=y
 # CONFIG_CMD_UBIFS is not set
 CONFIG_BOOTCOUNT_LIMIT=y
+CONFIG_BOOTCOUNT_BOOTLIMIT=3
 CONFIG_SYS_BOOTCOUNT_ADDR=0xE0113FF8
 # CONFIG_MMC is not set
 CONFIG_MTD_NOR_FLASH=y

diff --git a/configs/tuxx1_defconfig b/configs/tuxx1_defconfig
index 3e4580243819b19c4effdf94cdf5cc1298217050..08afcdb1da0ac494b0dd22281d6efd3d03a4cae5 100644 (file)
--- a/configs/tuxx1_defconfig
+++ b/configs/tuxx1_defconfig
@@ -26,6 +26,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=boot:768k(u-boot),128k(env),128k(envred),-(ubi
 CONFIG_CMD_UBI=y
 # CONFIG_CMD_UBIFS is not set
 CONFIG_BOOTCOUNT_LIMIT=y
+CONFIG_BOOTCOUNT_BOOTLIMIT=3
 CONFIG_SYS_BOOTCOUNT_ADDR=0xE0113FF8
 # CONFIG_MMC is not set
 CONFIG_MTD_NOR_FLASH=y

diff --git a/include/configs/calimain.h b/include/configs/calimain.h
index b01cf52e109a88dbe11ef6c9f1f9db3cd63ea82b..7f2b751404d9c84668e481f882bf3692914855b0 100644 (file)
--- a/include/configs/calimain.h
+++ b/include/configs/calimain.h
@@ -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                 \

diff --git a/include/configs/display5.h b/include/configs/display5.h
index 5a01023e3658df95bc3223cf9abc653b084393db..dc75f7b973fd84bdc055884e0812ef4ab36c2512 100644 (file)
--- a/include/configs/display5.h
+++ b/include/configs/display5.h
@@ -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" \

diff --git a/include/configs/ge_bx50v3.h b/include/configs/ge_bx50v3.h
index 06818582e2a4970e2f149251b5391075d50b0a4e..fad840b9b2ba91596ac308760359a719fc9fd2df 100644 (file)
--- a/include/configs/ge_bx50v3.h
+++ b/include/configs/ge_bx50v3.h
@@ -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" \

diff --git a/include/configs/km/keymile-common.h b/include/configs/km/keymile-common.h
index aad7657e94ca6a5ac782f549af50ffa0ea56b174..f72cc0a0124cf4deacebce0cc1178d59a2c27695 100644 (file)
--- a/include/configs/km/keymile-common.h
+++ b/include/configs/km/keymile-common.h
@@ -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"             \

diff --git a/include/configs/mx53ppd.h b/include/configs/mx53ppd.h
index dfc312e42affa1fd86d00aaa938caad291e5c139..44d87c1fbc61fee15868c5d0d172ea85a9d611c2 100644 (file)
--- a/include/configs/mx53ppd.h
+++ b/include/configs/mx53ppd.h
@@ -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" \

diff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h
index 8e3a5af46a43eddc386b694d4b93cb7e47f596d4..23a921da4f31631c14afbda6ab1265830f1a06d7 100644 (file)
--- a/include/configs/siemens-am33x-common.h
+++ b/include/configs/siemens-am33x-common.h
@@ -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" \