[U-Boot] [PATCH v1 2/2] Migrate bootlimit to Kconfig

Alex Kiernan alex.kiernan at gmail.com
Fri May 25 04:24:44 UTC 2018


On Thu, May 24, 2018 at 11:14 PM Lukasz Majewski <lukma at denx.de> wrote:

> Hi Alex,

> > Migrate boards which set bootlimit in the environment to Kconfig.
> >
> > We exclude three boards:
> >
> > - display5_factory_defconfig
> > - display5_defconfig
> > - gurnard_defconfig
> >
> > display5_defconfig and display5_factory_defconfig share a
> > SYS_CONFIG_NAME, but only display5_defconfig enables
> > CONFIG_BOOTCOUNT_LIMIT, so we'd fail to set bootlimit= in
> > display5_factory_defconfig if we moved it to Kconfig.

> For display5 board it would be OK to have the CONFIG_BOOTCOUNT_LIMIT
> defined for display5_defconfig.

> The display5_factory_defconfig doesn't need to have it set, as it is
> only meant to prepare the board in factory.


Thanks - reading through the bootcmd logic I suspected it was something
like that. I'll swap it over.

> >
> > gurnard_defconfig includes a bootlimit=, but doesn't set
> > CONFIG_BOOTCOUNT_LIMIT, so again we'd fail to include a bootlimit
> > setting if we migrated it.
> >
> > Signed-off-by: Alex Kiernan <alex.kiernan at gmail.com>
> > ---
> >
> >  configs/brppt1_mmc_defconfig           | 1 +
> >  configs/brppt1_nand_defconfig          | 1 +
> >  configs/brppt1_spi_defconfig           | 1 +
> >  configs/calimain_defconfig             | 1 +
> >  configs/draco_defconfig                | 1 +
> >  configs/etamin_defconfig               | 1 +
> >  configs/ge_bx50v3_defconfig            | 1 +
> >  configs/km_kirkwood_128m16_defconfig   | 1 +
> >  configs/km_kirkwood_defconfig          | 1 +
> >  configs/km_kirkwood_pci_defconfig      | 1 +
> >  configs/kmcoge4_defconfig              | 1 +
> >  configs/kmcoge5ne_defconfig            | 1 +
> >  configs/kmcoge5un_defconfig            | 1 +
> >  configs/kmeter1_defconfig              | 1 +
> >  configs/kmlion1_defconfig              | 1 +
> >  configs/kmnusa_defconfig               | 1 +
> >  configs/kmopti2_defconfig              | 1 +
> >  configs/kmsugp1_defconfig              | 1 +
> >  configs/kmsupx5_defconfig              | 1 +
> >  configs/kmsuv31_defconfig              | 1 +
> >  configs/kmtegr1_defconfig              | 1 +
> >  configs/kmtepr2_defconfig              | 1 +
> >  configs/kmvect1_defconfig              | 1 +
> >  configs/mgcoge3un_defconfig            | 1 +
> >  configs/mx53ppd_defconfig              | 1 +
> >  configs/portl2_defconfig               | 1 +
> >  configs/pxm2_defconfig                 | 1 +
> >  configs/rastaban_defconfig             | 1 +
> >  configs/rut_defconfig                  | 1 +
> >  configs/suvd3_defconfig                | 1 +
> >  configs/thuban_defconfig               | 1 +
> >  configs/tuge1_defconfig                | 1 +
> >  configs/tuxx1_defconfig                | 1 +
> >  include/configs/brppt1.h               | 2 --
> >  include/configs/calimain.h             | 1 -
> >  include/configs/ge_bx50v3.h            | 1 -
> >  include/configs/km/keymile-common.h    | 1 -
> >  include/configs/mx53ppd.h              | 1 -
> >  include/configs/siemens-am33x-common.h | 1 -
> >  39 files changed, 33 insertions(+), 7 deletions(-)
> >
> > diff --git a/configs/brppt1_mmc_defconfig
> > b/configs/brppt1_mmc_defconfig index 5511f2c78e..76d91d4d11 100644
> > --- a/configs/brppt1_mmc_defconfig
> > +++ b/configs/brppt1_mmc_defconfig
> > @@ -50,6 +50,7 @@ CONFIG_CMD_FS_GENERIC=y
> >  CONFIG_ENV_IS_IN_MMC=y
> >  CONFIG_NETCONSOLE=y
> >  CONFIG_BOOTCOUNT_LIMIT=y
> > +CONFIG_BOOTCOUNT_BOOTLIMIT=1
> >  CONFIG_MMC_OMAP_HS=y
> >  CONFIG_DRIVER_TI_CPSW=y
> >  CONFIG_SYS_NS16550=y
> > diff --git a/configs/brppt1_nand_defconfig
> > b/configs/brppt1_nand_defconfig index e00f409d7b..311050c64c 100644
> > --- a/configs/brppt1_nand_defconfig
> > +++ b/configs/brppt1_nand_defconfig
> > @@ -51,6 +51,7 @@
> >
CONFIG_MTDPARTS_DEFAULT="mtdparts=omap2-nand.0:128k(MLO),128k(MLO.backup),128k(d
> > CONFIG_ENV_IS_IN_NAND=y CONFIG_NETCONSOLE=y
> >  CONFIG_BOOTCOUNT_LIMIT=y
> > +CONFIG_BOOTCOUNT_BOOTLIMIT=1
> >  # CONFIG_MMC is not set
> >  CONFIG_NAND=y
> >  CONFIG_DRIVER_TI_CPSW=y
> > diff --git a/configs/brppt1_spi_defconfig
> > b/configs/brppt1_spi_defconfig index 8d4f1c1252..977ae73514 100644
> > --- a/configs/brppt1_spi_defconfig
> > +++ b/configs/brppt1_spi_defconfig
> > @@ -57,6 +57,7 @@ CONFIG_CMD_MTDPARTS=y
> >  CONFIG_ENV_IS_IN_SPI_FLASH=y
> >  CONFIG_NETCONSOLE=y
> >  CONFIG_BOOTCOUNT_LIMIT=y
> > +CONFIG_BOOTCOUNT_BOOTLIMIT=1
> >  CONFIG_MMC_OMAP_HS=y
> >  CONFIG_SPI_FLASH=y
> >  CONFIG_SPI_FLASH_STMICRO=y
> > diff --git a/configs/calimain_defconfig b/configs/calimain_defconfig
> > index 7908cfcc34..55782463ae 100644
> > --- a/configs/calimain_defconfig
> > +++ b/configs/calimain_defconfig
> > @@ -22,6 +22,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_MMC is not set
> >  CONFIG_MTD_NOR_FLASH=y
> > diff --git a/configs/draco_defconfig b/configs/draco_defconfig
> > index 9ddb3d278d..0548b2c19b 100644
> > --- a/configs/draco_defconfig
> > +++ b/configs/draco_defconfig
> > @@ -56,6 +56,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 6521aa8986..f4e986192f 100644
> > --- a/configs/etamin_defconfig
> > +++ b/configs/etamin_defconfig
> > @@ -56,6 +56,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 a37df05d09..d7f5f35f06 100644
> > --- a/configs/ge_bx50v3_defconfig
> > +++ b/configs/ge_bx50v3_defconfig
> > @@ -28,6 +28,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 5d5b485cf7..68caf93d7f
> > 100644 --- a/configs/km_kirkwood_128m16_defconfig
> > +++ b/configs/km_kirkwood_128m16_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/km_kirkwood_defconfig
> > b/configs/km_kirkwood_defconfig index b07f36beaf..86bdf0db3c 100644
> > --- a/configs/km_kirkwood_defconfig
> > +++ b/configs/km_kirkwood_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/km_kirkwood_pci_defconfig
> > b/configs/km_kirkwood_pci_defconfig index 31dcd0ca1b..9eddeae423
> > 100644 --- a/configs/km_kirkwood_pci_defconfig
> > +++ b/configs/km_kirkwood_pci_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/kmcoge4_defconfig b/configs/kmcoge4_defconfig
> > index 4e5b3fc416..09749973d9 100644
> > --- a/configs/kmcoge4_defconfig
> > +++ b/configs/kmcoge4_defconfig
> > @@ -34,6 +34,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 4e78d37ad4..fdf86028fc 100644
> > --- 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 116369acf7..950348fc11 100644
> > --- a/configs/kmcoge5un_defconfig
> > +++ b/configs/kmcoge5un_defconfig
> > @@ -28,6 +28,7 @@ CONFIG_CMD_UBI=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 e64a6936db..00259a6f65 100644
> > --- 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 9e6c92b758..605727b250 100644
> > --- a/configs/kmlion1_defconfig
> > +++ b/configs/kmlion1_defconfig
> > @@ -34,6 +34,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 be7421ca58..8c12fe8321 100644
> > --- a/configs/kmnusa_defconfig
> > +++ b/configs/kmnusa_defconfig
> > @@ -28,6 +28,7 @@ CONFIG_CMD_UBI=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 c6ad62255d..d201ddc10d 100644
> > --- 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 535e8693b0..4433de891c 100644
> > --- a/configs/kmsugp1_defconfig
> > +++ b/configs/kmsugp1_defconfig
> > @@ -28,6 +28,7 @@ CONFIG_CMD_UBI=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 eb4c4b433b..9cdd4bdd77 100644
> > --- 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 59522e733e..914279454c 100644
> > --- a/configs/kmsuv31_defconfig
> > +++ b/configs/kmsuv31_defconfig
> > @@ -28,6 +28,7 @@ CONFIG_CMD_UBI=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 f3ca988c62..461ab530c9 100644
> > --- 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 cf17002d56..650f3bae17 100644
> > --- 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 b148f80346..5e98c55f9b 100644
> > --- 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 abf9cdcbfa..6ae2285574 100644
> > --- a/configs/mgcoge3un_defconfig
> > +++ b/configs/mgcoge3un_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/mx53ppd_defconfig b/configs/mx53ppd_defconfig
> > index 8a0cc5d481..10bf745375 100644
> > --- a/configs/mx53ppd_defconfig
> > +++ b/configs/mx53ppd_defconfig
> > @@ -25,6 +25,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 3c049c4449..268d9061a1 100644
> > --- 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 8b8e580ecd..848db51489 100644
> > --- a/configs/pxm2_defconfig
> > +++ b/configs/pxm2_defconfig
> > @@ -58,6 +58,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 450b21a589..7326d281eb 100644
> > --- a/configs/rastaban_defconfig
> > +++ b/configs/rastaban_defconfig
> > @@ -56,6 +56,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 64384c41a3..720ed9c90c 100644
> > --- a/configs/rut_defconfig
> > +++ b/configs/rut_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/suvd3_defconfig b/configs/suvd3_defconfig
> > index 48fc91f46b..070ca2a62d 100644
> > --- 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 2bf0aa3542..9a5030c5e3 100644
> > --- a/configs/thuban_defconfig
> > +++ b/configs/thuban_defconfig
> > @@ -56,6 +56,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 14f256abd4..3368a4eb80 100644
> > --- 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 d3b9ca25b6..1847a47329 100644
> > --- 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/brppt1.h b/include/configs/brppt1.h
> > index eb45331033..7bc255085f 100644
> > --- a/include/configs/brppt1.h
> > +++ b/include/configs/brppt1.h
> > @@ -90,7 +90,6 @@
> >               "nand read ${loadaddr} kernel ${kernelsize}; " \
> >               "bootz ${loadaddr} - ${dtbaddr}\0" \
> >       "defboot=run nandboot\0" \
> > -     "bootlimit=1\0" \
> >       "simplefb=1\0 " \
> >       "altbootcmd=run usbscript\0"
> >  #else
> > @@ -116,7 +115,6 @@
> >  "defboot=ext4load mmc 1:2 ${loadaddr} /boot/PPTImage.md5 && run
> > mmcboot1; " \ "ext4load mmc 1:1 ${dtbaddr} /$dtb && run mmcboot0; " \
> >       "run ramboot; run usbscript;\0" \
> > -"bootlimit=1\0" \
> >  "altbootcmd=mmc dev 1; run mmcboot0;\0" \
> >  "upduboot=dhcp; " \
> >       "tftp ${loadaddr} MLO && mmc write ${loadaddr} 100 100; " \
> > diff --git a/include/configs/calimain.h b/include/configs/calimain.h
> > index ab4a9e6ddc..254352f299 100644
> > --- a/include/configs/calimain.h
> > +++ b/include/configs/calimain.h
> > @@ -256,7 +256,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/ge_bx50v3.h b/include/configs/ge_bx50v3.h
> > index 1b947db9d4..d2f9279d30 100644
> > --- a/include/configs/ge_bx50v3.h
> > +++ b/include/configs/ge_bx50v3.h
> > @@ -88,7 +88,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 92511193f6..1872708225
> > 100644 --- a/include/configs/km/keymile-common.h
> > +++ b/include/configs/km/keymile-common.h
> > @@ -196,7 +196,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
> > e08e83151f..c4e145833f 100644 --- a/include/configs/mx53ppd.h
> > +++ b/include/configs/mx53ppd.h
> > @@ -102,7 +102,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 470387df8c..b365e94505
> > 100644 --- a/include/configs/siemens-am33x-common.h
> > +++ b/include/configs/siemens-am33x-common.h
> > @@ -244,7 +244,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" \




> Best regards,

> Lukasz Majewski

> --

> DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
> HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
> Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de



-- 
Alex Kiernan


More information about the U-Boot mailing list