* [U-Boot] [PATCH 1/2] Convert CONFIG_BOOTCOUNT_LIMIT to Kconfig @ 2018-02-09 22:50 Lukasz Majewski 2018-02-10 6:18 ` Alex Kiernan ` (3 more replies) 0 siblings, 4 replies; 9+ messages in thread From: Lukasz Majewski @ 2018-02-09 22:50 UTC (permalink / raw) To: u-boot This converts the following to Kconfig: CONFIG_BOOTCOUNT_LIMIT Signed-off-by: Lukasz Majewski <lukma@denx.de> --- README | 10 ---------- configs/am335x_baltos_defconfig | 1 + configs/am335x_boneblack_defconfig | 1 + configs/am335x_boneblack_vboot_defconfig | 1 + configs/am335x_evm_defconfig | 1 + configs/am335x_evm_nor_defconfig | 1 + configs/am335x_evm_spiboot_defconfig | 1 + configs/am335x_evm_usbspl_defconfig | 1 + configs/am335x_hs_evm_defconfig | 1 + configs/am335x_hs_evm_uart_defconfig | 1 + configs/am335x_sl50_defconfig | 1 + configs/birdland_bav335a_defconfig | 1 + configs/birdland_bav335b_defconfig | 1 + configs/brppt1_mmc_defconfig | 1 + configs/brppt1_nand_defconfig | 1 + configs/brppt1_spi_defconfig | 1 + configs/calimain_defconfig | 1 + configs/chiliboard_defconfig | 1 + configs/dh_imx6_defconfig | 1 + configs/draco_defconfig | 1 + configs/etamin_defconfig | 1 + configs/ge_b450v3_defconfig | 1 + configs/ge_b650v3_defconfig | 1 + configs/ge_b850v3_defconfig | 1 + configs/highbank_defconfig | 1 + configs/ids8313_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/socfpga_is1_defconfig | 1 + configs/socfpga_sr1500_defconfig | 1 + configs/suvd3_defconfig | 1 + configs/theadorable_debug_defconfig | 1 + configs/thuban_defconfig | 1 + configs/tqma6s_wru4_mmc_defconfig | 1 + configs/tuge1_defconfig | 1 + configs/tuxx1_defconfig | 1 + configs/x600_defconfig | 1 + drivers/bootcount/Kconfig | 6 ++++++ include/configs/am335x_evm.h | 1 - include/configs/am335x_sl50.h | 1 - include/configs/baltos.h | 1 - include/configs/bav335x.h | 1 - include/configs/brppt1.h | 1 - include/configs/calimain.h | 1 - include/configs/chiliboard.h | 1 - include/configs/cm_t335.h | 1 - include/configs/dh_imx6.h | 1 - include/configs/ge_bx50v3.h | 1 - include/configs/highbank.h | 1 - include/configs/ids8313.h | 1 - include/configs/km/keymile-common.h | 2 -- include/configs/km/km-powerpc.h | 2 -- include/configs/km/kmp204x-common.h | 1 - include/configs/mx53ppd.h | 2 -- include/configs/siemens-am33x-common.h | 1 - include/configs/socfpga_is1.h | 1 - include/configs/socfpga_sr1500.h | 1 - include/configs/theadorable.h | 1 - include/configs/tqma6_wru4.h | 1 - include/configs/x600.h | 1 - 80 files changed, 62 insertions(+), 35 deletions(-) diff --git a/README b/README index 81b7ee1ce8..f51f6709c2 100644 --- a/README +++ b/README @@ -714,11 +714,6 @@ The following options need to be configured: RAM and NFS. - Bootcount: - CONFIG_BOOTCOUNT_LIMIT - Implements a mechanism for detecting a repeating reboot - cycle, see: - http://www.denx.de/wiki/view/DULG/UBootBootCountLimit - CONFIG_BOOTCOUNT_ENV If no softreset save registers are found on the hardware "bootcount" is stored in the environment. To prevent a @@ -2333,11 +2328,6 @@ The following options need to be configured: but sometimes that is not allowed. - bootcount support: - CONFIG_BOOTCOUNT_LIMIT - - This enables the bootcounter support, see: - http://www.denx.de/wiki/DULG/UBootBootCountLimit - CONFIG_AT91SAM9XE enable special bootcounter support on at91sam9xe based boards. CONFIG_SOC_DA8XX diff --git a/configs/am335x_baltos_defconfig b/configs/am335x_baltos_defconfig index 97e600138c..5fd118cde0 100644 --- a/configs/am335x_baltos_defconfig +++ b/configs/am335x_baltos_defconfig @@ -47,6 +47,7 @@ CONFIG_MTDIDS_DEFAULT="nand0=omap2-nand.0" CONFIG_MTDPARTS_DEFAULT="mtdparts=omap2-nand.0:128k(SPL),128k(SPL.backup1),128k(SPL.backup2),128k(SPL.backup3),1920k(u-boot),-(UBI)" CONFIG_CMD_UBI=y CONFIG_ISO_PARTITION=y +CONFIG_BOOTCOUNT_LIMIT=y CONFIG_SYS_OMAP24_I2C_SPEED=1000 CONFIG_MMC_OMAP_HS=y CONFIG_NAND=y diff --git a/configs/am335x_boneblack_defconfig b/configs/am335x_boneblack_defconfig index f14333d7f4..ed430e7130 100644 --- a/configs/am335x_boneblack_defconfig +++ b/configs/am335x_boneblack_defconfig @@ -21,6 +21,7 @@ CONFIG_CMD_SPL=y # CONFIG_CMD_FLASH is not set # CONFIG_CMD_SETEXPR is not set CONFIG_ENV_IS_IN_MMC=y +CONFIG_BOOTCOUNT_LIMIT=y CONFIG_DFU_TFTP=y CONFIG_DFU_MMC=y CONFIG_DFU_RAM=y diff --git a/configs/am335x_boneblack_vboot_defconfig b/configs/am335x_boneblack_vboot_defconfig index 016ec4edde..df73f65209 100644 --- a/configs/am335x_boneblack_vboot_defconfig +++ b/configs/am335x_boneblack_vboot_defconfig @@ -26,6 +26,7 @@ CONFIG_CMD_SPL=y CONFIG_OF_CONTROL=y CONFIG_ENV_IS_IN_MMC=y # CONFIG_BLK is not set +CONFIG_BOOTCOUNT_LIMIT=y CONFIG_DFU_MMC=y CONFIG_DFU_RAM=y CONFIG_DM_I2C=y diff --git a/configs/am335x_evm_defconfig b/configs/am335x_evm_defconfig index 9e79d1c603..39ca59ad96 100644 --- a/configs/am335x_evm_defconfig +++ b/configs/am335x_evm_defconfig @@ -25,6 +25,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=nand.0:128k(NAND.SPL),128k(NAND.SPL.backup1),1 CONFIG_OF_CONTROL=y CONFIG_OF_LIST="am335x-evm am335x-bone am335x-boneblack am335x-evmsk am335x-bonegreen am335x-icev2" # CONFIG_BLK is not set +CONFIG_BOOTCOUNT_LIMIT=y CONFIG_DFU_MMC=y CONFIG_DFU_NAND=y CONFIG_DFU_RAM=y diff --git a/configs/am335x_evm_nor_defconfig b/configs/am335x_evm_nor_defconfig index 14aa2679d1..6598879f07 100644 --- a/configs/am335x_evm_nor_defconfig +++ b/configs/am335x_evm_nor_defconfig @@ -20,6 +20,7 @@ CONFIG_CMD_NAND=y CONFIG_CMD_MTDPARTS=y CONFIG_MTDIDS_DEFAULT="nand0=nand.0" CONFIG_MTDPARTS_DEFAULT="mtdparts=nand.0:128k(NAND.SPL),128k(NAND.SPL.backup1),128k(NAND.SPL.backup2),128k(NAND.SPL.backup3),256k(NAND.u-boot-spl-os),1m(NAND.u-boot),128k(NAND.u-boot-env),128k(NAND.u-boot-env.backup1),8m(NAND.kernel),-(NAND.file-system)" +CONFIG_BOOTCOUNT_LIMIT=y CONFIG_DFU_MMC=y CONFIG_DFU_NAND=y CONFIG_DFU_RAM=y diff --git a/configs/am335x_evm_spiboot_defconfig b/configs/am335x_evm_spiboot_defconfig index 71d6a28779..079f69d919 100644 --- a/configs/am335x_evm_spiboot_defconfig +++ b/configs/am335x_evm_spiboot_defconfig @@ -21,6 +21,7 @@ CONFIG_CMD_MTDPARTS=y CONFIG_MTDIDS_DEFAULT="nor0=m25p80-flash.0" CONFIG_MTDPARTS_DEFAULT="mtdparts=m25p80-flash.0:128k(SPL),512k(u-boot),128k(u-boot-env1),128k(u-boot-env2),3464k(kernel),-(rootfs)" CONFIG_ENV_IS_IN_SPI_FLASH=y +CONFIG_BOOTCOUNT_LIMIT=y CONFIG_DFU_MMC=y CONFIG_DFU_RAM=y CONFIG_MMC_OMAP_HS=y diff --git a/configs/am335x_evm_usbspl_defconfig b/configs/am335x_evm_usbspl_defconfig index 10d6d385de..5afc7407d0 100644 --- a/configs/am335x_evm_usbspl_defconfig +++ b/configs/am335x_evm_usbspl_defconfig @@ -25,6 +25,7 @@ CONFIG_CMD_NAND=y CONFIG_CMD_MTDPARTS=y CONFIG_MTDIDS_DEFAULT="nand0=nand.0" CONFIG_MTDPARTS_DEFAULT="mtdparts=nand.0:128k(NAND.SPL),128k(NAND.SPL.backup1),128k(NAND.SPL.backup2),128k(NAND.SPL.backup3),256k(NAND.u-boot-spl-os),1m(NAND.u-boot),128k(NAND.u-boot-env),128k(NAND.u-boot-env.backup1),8m(NAND.kernel),-(NAND.file-system)" +CONFIG_BOOTCOUNT_LIMIT=y CONFIG_DFU_MMC=y CONFIG_DFU_NAND=y CONFIG_DFU_RAM=y diff --git a/configs/am335x_hs_evm_defconfig b/configs/am335x_hs_evm_defconfig index 55565f4d3b..b953a5c684 100644 --- a/configs/am335x_hs_evm_defconfig +++ b/configs/am335x_hs_evm_defconfig @@ -33,6 +33,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=nand.0:128k(NAND.SPL),128k(NAND.SPL.backup1),1 CONFIG_OF_CONTROL=y CONFIG_OF_LIST="am335x-evm am335x-bone am335x-boneblack am335x-evmsk am335x-bonegreen am335x-icev2" # CONFIG_BLK is not set +CONFIG_BOOTCOUNT_LIMIT=y CONFIG_DFU_MMC=y CONFIG_DFU_NAND=y CONFIG_DFU_RAM=y diff --git a/configs/am335x_hs_evm_uart_defconfig b/configs/am335x_hs_evm_uart_defconfig index 7f05d56743..1fc496e04e 100644 --- a/configs/am335x_hs_evm_uart_defconfig +++ b/configs/am335x_hs_evm_uart_defconfig @@ -31,6 +31,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=nand.0:128k(NAND.SPL),128k(NAND.SPL.backup1),1 CONFIG_OF_CONTROL=y CONFIG_OF_LIST="am335x-evm am335x-bone am335x-boneblack am335x-evmsk am335x-bonegreen am335x-icev2" # CONFIG_BLK is not set +CONFIG_BOOTCOUNT_LIMIT=y CONFIG_DFU_MMC=y CONFIG_DFU_NAND=y CONFIG_DFU_RAM=y diff --git a/configs/am335x_sl50_defconfig b/configs/am335x_sl50_defconfig index ef27addb75..cd1b78e3c1 100644 --- a/configs/am335x_sl50_defconfig +++ b/configs/am335x_sl50_defconfig @@ -38,6 +38,7 @@ CONFIG_CMD_SPI=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_EXT4_WRITE=y CONFIG_ENV_IS_IN_MMC=y +CONFIG_BOOTCOUNT_LIMIT=y CONFIG_MMC_OMAP_HS=y CONFIG_PHYLIB=y CONFIG_SYS_NS16550=y diff --git a/configs/birdland_bav335a_defconfig b/configs/birdland_bav335a_defconfig index d6d5d712e9..83828be574 100644 --- a/configs/birdland_bav335a_defconfig +++ b/configs/birdland_bav335a_defconfig @@ -51,6 +51,7 @@ CONFIG_CMD_EXT4_WRITE=y CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y CONFIG_ISO_PARTITION=y +CONFIG_BOOTCOUNT_LIMIT=y CONFIG_DFU_MMC=y CONFIG_DFU_RAM=y CONFIG_MMC_OMAP_HS=y diff --git a/configs/birdland_bav335b_defconfig b/configs/birdland_bav335b_defconfig index 0c145953db..74f237d5ec 100644 --- a/configs/birdland_bav335b_defconfig +++ b/configs/birdland_bav335b_defconfig @@ -51,6 +51,7 @@ CONFIG_CMD_EXT4_WRITE=y CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y CONFIG_ISO_PARTITION=y +CONFIG_BOOTCOUNT_LIMIT=y CONFIG_DFU_MMC=y CONFIG_DFU_RAM=y CONFIG_MMC_OMAP_HS=y diff --git a/configs/brppt1_mmc_defconfig b/configs/brppt1_mmc_defconfig index ace6279bf1..e6b0dc5599 100644 --- a/configs/brppt1_mmc_defconfig +++ b/configs/brppt1_mmc_defconfig @@ -49,6 +49,7 @@ CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y CONFIG_ENV_IS_IN_MMC=y CONFIG_NETCONSOLE=y +CONFIG_BOOTCOUNT_LIMIT=y CONFIG_MMC_OMAP_HS=y CONFIG_PHYLIB=y CONFIG_SYS_NS16550=y diff --git a/configs/brppt1_nand_defconfig b/configs/brppt1_nand_defconfig index 80664cefd3..24779cec37 100644 --- a/configs/brppt1_nand_defconfig +++ b/configs/brppt1_nand_defconfig @@ -50,6 +50,7 @@ CONFIG_MTDIDS_DEFAULT="nand0=omap2-nand.0" CONFIG_MTDPARTS_DEFAULT="mtdparts=omap2-nand.0:128k(MLO),128k(MLO.backup),128k(dtb),128k(u-boot-env),512k(u-boot),4m(kernel),128m(rootfs),-(user)" CONFIG_ENV_IS_IN_NAND=y CONFIG_NETCONSOLE=y +CONFIG_BOOTCOUNT_LIMIT=y # CONFIG_MMC is not set CONFIG_NAND=y CONFIG_PHYLIB=y diff --git a/configs/brppt1_spi_defconfig b/configs/brppt1_spi_defconfig index d1256e6aca..47fda899d5 100644 --- a/configs/brppt1_spi_defconfig +++ b/configs/brppt1_spi_defconfig @@ -55,6 +55,7 @@ CONFIG_CMD_FS_GENERIC=y CONFIG_CMD_MTDPARTS=y CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_NETCONSOLE=y +CONFIG_BOOTCOUNT_LIMIT=y 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 d8ab012211..499a7f0189 100644 --- a/configs/calimain_defconfig +++ b/configs/calimain_defconfig @@ -20,6 +20,7 @@ CONFIG_CMD_MII=y CONFIG_CMD_PING=y CONFIG_CMD_DIAG=y CONFIG_ENV_IS_IN_FLASH=y +CONFIG_BOOTCOUNT_LIMIT=y # CONFIG_MMC is not set CONFIG_MTD_NOR_FLASH=y CONFIG_SYS_NS16550=y diff --git a/configs/chiliboard_defconfig b/configs/chiliboard_defconfig index a32dab7b51..efe7a435ef 100644 --- a/configs/chiliboard_defconfig +++ b/configs/chiliboard_defconfig @@ -37,6 +37,7 @@ CONFIG_CMD_MTDPARTS=y CONFIG_MTDIDS_DEFAULT="nand0=8000000.nand" CONFIG_MTDPARTS_DEFAULT="mtdparts=8000000.nand:128k(NAND.SPL),128k(NAND.SPL.backup1),128k(NAND.SPL.backup2),128k(NAND.SPL.backup3),256k(NAND.u-boot-spl-os),1m(NAND.u-boot),128k(NAND.u-boot-env),128k(NAND.u-boot-env.backup1),8m(NAND.kernel),-(NAND.file-system)" CONFIG_ENV_IS_IN_MMC=y +CONFIG_BOOTCOUNT_LIMIT=y CONFIG_DM_GPIO=y CONFIG_MMC_OMAP_HS=y CONFIG_NAND=y diff --git a/configs/dh_imx6_defconfig b/configs/dh_imx6_defconfig index 1fd7c50e31..fd61b72227 100644 --- a/configs/dh_imx6_defconfig +++ b/configs/dh_imx6_defconfig @@ -41,6 +41,7 @@ CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_DWC_AHSATA=y +CONFIG_BOOTCOUNT_LIMIT=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_SPANSION=y CONFIG_PHYLIB=y diff --git a/configs/draco_defconfig b/configs/draco_defconfig index 5444260b19..693d91c10e 100644 --- a/configs/draco_defconfig +++ b/configs/draco_defconfig @@ -51,6 +51,7 @@ CONFIG_CMD_UBI=y CONFIG_OF_CONTROL=y CONFIG_OF_EMBED=y CONFIG_ENV_IS_IN_NAND=y +CONFIG_BOOTCOUNT_LIMIT=y CONFIG_DFU_NAND=y CONFIG_MMC_OMAP_HS=y CONFIG_NAND=y diff --git a/configs/etamin_defconfig b/configs/etamin_defconfig index 608faf66ec..e7a3d2210c 100644 --- a/configs/etamin_defconfig +++ b/configs/etamin_defconfig @@ -51,6 +51,7 @@ CONFIG_CMD_UBI=y CONFIG_OF_CONTROL=y CONFIG_OF_EMBED=y CONFIG_ENV_IS_IN_NAND=y +CONFIG_BOOTCOUNT_LIMIT=y CONFIG_DFU_NAND=y CONFIG_MMC_OMAP_HS=y CONFIG_NAND=y diff --git a/configs/ge_b450v3_defconfig b/configs/ge_b450v3_defconfig index c947aa8f89..72455b4095 100644 --- a/configs/ge_b450v3_defconfig +++ b/configs/ge_b450v3_defconfig @@ -22,6 +22,7 @@ CONFIG_CMD_EXT4_WRITE=y CONFIG_CMD_FS_GENERIC=y CONFIG_DOS_PARTITION=y CONFIG_ENV_IS_IN_SPI_FLASH=y +CONFIG_BOOTCOUNT_LIMIT=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_OF_LIBFDT=y diff --git a/configs/ge_b650v3_defconfig b/configs/ge_b650v3_defconfig index 2ea677d2f3..95302b4379 100644 --- a/configs/ge_b650v3_defconfig +++ b/configs/ge_b650v3_defconfig @@ -22,6 +22,7 @@ CONFIG_CMD_EXT4_WRITE=y CONFIG_CMD_FS_GENERIC=y CONFIG_DOS_PARTITION=y CONFIG_ENV_IS_IN_SPI_FLASH=y +CONFIG_BOOTCOUNT_LIMIT=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_OF_LIBFDT=y diff --git a/configs/ge_b850v3_defconfig b/configs/ge_b850v3_defconfig index d433513e4f..c7ebf8ac41 100644 --- a/configs/ge_b850v3_defconfig +++ b/configs/ge_b850v3_defconfig @@ -23,6 +23,7 @@ CONFIG_CMD_EXT4_WRITE=y CONFIG_CMD_FS_GENERIC=y CONFIG_DOS_PARTITION=y CONFIG_ENV_IS_IN_SPI_FLASH=y +CONFIG_BOOTCOUNT_LIMIT=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_OF_LIBFDT=y diff --git a/configs/highbank_defconfig b/configs/highbank_defconfig index f55b5dcebd..41f4ef5f78 100644 --- a/configs/highbank_defconfig +++ b/configs/highbank_defconfig @@ -24,6 +24,7 @@ CONFIG_EFI_PARTITION=y # CONFIG_PARTITION_UUIDS is not set CONFIG_ENV_IS_IN_NVRAM=y CONFIG_SCSI_AHCI=y +CONFIG_BOOTCOUNT_LIMIT=y # CONFIG_MMC is not set CONFIG_SCSI=y CONFIG_OF_LIBFDT=y diff --git a/configs/ids8313_defconfig b/configs/ids8313_defconfig index 839dfbac8f..3e67c55fc2 100644 --- a/configs/ids8313_defconfig +++ b/configs/ids8313_defconfig @@ -29,6 +29,7 @@ CONFIG_CMD_JFFS2=y CONFIG_MTDIDS_DEFAULT="nor0=ff800000.flash,nand0=e1000000.flash" CONFIG_MTDPARTS_DEFAULT="mtdparts=ff800000.flash:7m(dum),768k(BOOT-BIN),128k(BOOT-ENV),128k(BOOT-REDENV);e1000000.flash:-(ubi)" CONFIG_CMD_UBI=y +CONFIG_BOOTCOUNT_LIMIT=y # CONFIG_MMC is not set CONFIG_MTD_NOR_FLASH=y CONFIG_PHYLIB=y diff --git a/configs/km_kirkwood_128m16_defconfig b/configs/km_kirkwood_128m16_defconfig index aeb55c12c0..075b4b30e9 100644 --- a/configs/km_kirkwood_128m16_defconfig +++ b/configs/km_kirkwood_128m16_defconfig @@ -25,6 +25,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=orion_nand:-(ubi0);" CONFIG_CMD_UBI=y # CONFIG_CMD_UBIFS is not set CONFIG_ENV_IS_IN_EEPROM=y +CONFIG_BOOTCOUNT_LIMIT=y # 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 9eed13197e..4ed097d140 100644 --- a/configs/km_kirkwood_defconfig +++ b/configs/km_kirkwood_defconfig @@ -25,6 +25,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=orion_nand:-(ubi0);" CONFIG_CMD_UBI=y # CONFIG_CMD_UBIFS is not set CONFIG_ENV_IS_IN_EEPROM=y +CONFIG_BOOTCOUNT_LIMIT=y # 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 b24c68513c..b47c1ad027 100644 --- a/configs/km_kirkwood_pci_defconfig +++ b/configs/km_kirkwood_pci_defconfig @@ -25,6 +25,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=orion_nand:-(ubi0);" CONFIG_CMD_UBI=y # CONFIG_CMD_UBIFS is not set CONFIG_ENV_IS_IN_EEPROM=y +CONFIG_BOOTCOUNT_LIMIT=y # 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 5c31abeb99..9a65e0cd04 100644 --- a/configs/kmcoge4_defconfig +++ b/configs/kmcoge4_defconfig @@ -30,6 +30,7 @@ CONFIG_CMD_UBI=y # CONFIG_CMD_UBIFS is not set CONFIG_DOS_PARTITION=y CONFIG_ENV_IS_IN_SPI_FLASH=y +CONFIG_BOOTCOUNT_LIMIT=y # CONFIG_MMC is not set CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_SPANSION=y diff --git a/configs/kmcoge5ne_defconfig b/configs/kmcoge5ne_defconfig index d4c8e87ab5..fb1eac1ae1 100644 --- a/configs/kmcoge5ne_defconfig +++ b/configs/kmcoge5ne_defconfig @@ -23,6 +23,7 @@ CONFIG_MTDIDS_DEFAULT="nor0=boot,nand0=app" CONFIG_MTDPARTS_DEFAULT="mtdparts=boot:768k(u-boot),128k(env),128k(envred),-(ubi0);app:-(ubi1);" CONFIG_CMD_UBI=y # CONFIG_CMD_UBIFS is not set +CONFIG_BOOTCOUNT_LIMIT=y # CONFIG_MMC is not set CONFIG_MTD_NOR_FLASH=y # CONFIG_PCI is not set diff --git a/configs/kmcoge5un_defconfig b/configs/kmcoge5un_defconfig index 6eb4781a0c..96c4ad08b9 100644 --- a/configs/kmcoge5un_defconfig +++ b/configs/kmcoge5un_defconfig @@ -25,6 +25,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=orion_nand:-(ubi0);" CONFIG_CMD_UBI=y # CONFIG_CMD_UBIFS is not set CONFIG_ENV_IS_IN_SPI_FLASH=y +CONFIG_BOOTCOUNT_LIMIT=y # 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 cf4f973785..c70c1d04c2 100644 --- a/configs/kmeter1_defconfig +++ b/configs/kmeter1_defconfig @@ -22,6 +22,7 @@ CONFIG_MTDIDS_DEFAULT="nor0=boot" CONFIG_MTDPARTS_DEFAULT="mtdparts=boot:768k(u-boot),128k(env),128k(envred),-(ubi0);" CONFIG_CMD_UBI=y # CONFIG_CMD_UBIFS is not set +CONFIG_BOOTCOUNT_LIMIT=y # CONFIG_MMC is not set CONFIG_MTD_NOR_FLASH=y # CONFIG_PCI is not set diff --git a/configs/kmlion1_defconfig b/configs/kmlion1_defconfig index c7edcaa43c..7267534cab 100644 --- a/configs/kmlion1_defconfig +++ b/configs/kmlion1_defconfig @@ -30,6 +30,7 @@ CONFIG_CMD_UBI=y # CONFIG_CMD_UBIFS is not set CONFIG_DOS_PARTITION=y CONFIG_ENV_IS_IN_SPI_FLASH=y +CONFIG_BOOTCOUNT_LIMIT=y # CONFIG_MMC is not set CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_SPANSION=y diff --git a/configs/kmnusa_defconfig b/configs/kmnusa_defconfig index 22b8b4d238..fec401770f 100644 --- a/configs/kmnusa_defconfig +++ b/configs/kmnusa_defconfig @@ -25,6 +25,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=orion_nand:-(ubi0);" CONFIG_CMD_UBI=y # CONFIG_CMD_UBIFS is not set CONFIG_ENV_IS_IN_SPI_FLASH=y +CONFIG_BOOTCOUNT_LIMIT=y # 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 6eb6019004..df150cd9f9 100644 --- a/configs/kmopti2_defconfig +++ b/configs/kmopti2_defconfig @@ -22,6 +22,7 @@ CONFIG_MTDIDS_DEFAULT="nor0=boot" CONFIG_MTDPARTS_DEFAULT="mtdparts=boot:768k(u-boot),128k(env),128k(envred),-(ubi0);" CONFIG_CMD_UBI=y # CONFIG_CMD_UBIFS is not set +CONFIG_BOOTCOUNT_LIMIT=y # CONFIG_MMC is not set CONFIG_MTD_NOR_FLASH=y # CONFIG_PCI is not set diff --git a/configs/kmsugp1_defconfig b/configs/kmsugp1_defconfig index a105b8a81a..d1f190003a 100644 --- a/configs/kmsugp1_defconfig +++ b/configs/kmsugp1_defconfig @@ -25,6 +25,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=orion_nand:-(ubi0);" CONFIG_CMD_UBI=y # CONFIG_CMD_UBIFS is not set CONFIG_ENV_IS_IN_SPI_FLASH=y +CONFIG_BOOTCOUNT_LIMIT=y # 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 f65a8cf0bd..b6552171cc 100644 --- a/configs/kmsupx5_defconfig +++ b/configs/kmsupx5_defconfig @@ -22,6 +22,7 @@ CONFIG_MTDIDS_DEFAULT="nor0=boot" CONFIG_MTDPARTS_DEFAULT="mtdparts=boot:768k(u-boot),128k(env),128k(envred),-(ubi0);" CONFIG_CMD_UBI=y # CONFIG_CMD_UBIFS is not set +CONFIG_BOOTCOUNT_LIMIT=y # CONFIG_MMC is not set CONFIG_MTD_NOR_FLASH=y # CONFIG_PCI is not set diff --git a/configs/kmsuv31_defconfig b/configs/kmsuv31_defconfig index 59d10668a2..9d4fbfe940 100644 --- a/configs/kmsuv31_defconfig +++ b/configs/kmsuv31_defconfig @@ -25,6 +25,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=orion_nand:-(ubi0);" CONFIG_CMD_UBI=y # CONFIG_CMD_UBIFS is not set CONFIG_ENV_IS_IN_SPI_FLASH=y +CONFIG_BOOTCOUNT_LIMIT=y # 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 d90852bcee..5dca26a696 100644 --- a/configs/kmtegr1_defconfig +++ b/configs/kmtegr1_defconfig @@ -24,6 +24,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=boot:768k(u-boot),256k(qe-fw),128k(env),128k(e CONFIG_CMD_DIAG=y CONFIG_CMD_UBI=y # CONFIG_CMD_UBIFS is not set +CONFIG_BOOTCOUNT_LIMIT=y # CONFIG_MMC is not set CONFIG_MTD_NOR_FLASH=y # CONFIG_PCI is not set diff --git a/configs/kmtepr2_defconfig b/configs/kmtepr2_defconfig index 2593719df0..05bc604e19 100644 --- a/configs/kmtepr2_defconfig +++ b/configs/kmtepr2_defconfig @@ -22,6 +22,7 @@ CONFIG_MTDIDS_DEFAULT="nor0=boot" CONFIG_MTDPARTS_DEFAULT="mtdparts=boot:768k(u-boot),128k(env),128k(envred),-(ubi0);" CONFIG_CMD_UBI=y # CONFIG_CMD_UBIFS is not set +CONFIG_BOOTCOUNT_LIMIT=y # CONFIG_MMC is not set CONFIG_MTD_NOR_FLASH=y # CONFIG_PCI is not set diff --git a/configs/kmvect1_defconfig b/configs/kmvect1_defconfig index a734a2ab39..c6d06499c2 100644 --- a/configs/kmvect1_defconfig +++ b/configs/kmvect1_defconfig @@ -23,6 +23,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=boot:768k(u-boot),128k(env),128k(envred),-(ubi CONFIG_CMD_DIAG=y CONFIG_CMD_UBI=y # CONFIG_CMD_UBIFS is not set +CONFIG_BOOTCOUNT_LIMIT=y # CONFIG_MMC is not set CONFIG_MTD_NOR_FLASH=y # CONFIG_PCI is not set diff --git a/configs/mgcoge3un_defconfig b/configs/mgcoge3un_defconfig index 27f399582c..250513d925 100644 --- a/configs/mgcoge3un_defconfig +++ b/configs/mgcoge3un_defconfig @@ -25,6 +25,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=orion_nand:-(ubi0);" CONFIG_CMD_UBI=y # CONFIG_CMD_UBIFS is not set CONFIG_ENV_IS_IN_EEPROM=y +CONFIG_BOOTCOUNT_LIMIT=y # 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 3fbca2a08c..b83cf72022 100644 --- a/configs/mx53ppd_defconfig +++ b/configs/mx53ppd_defconfig @@ -21,6 +21,7 @@ CONFIG_CMD_EXT4_WRITE=y CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y CONFIG_BOOTCOUNT=y +CONFIG_BOOTCOUNT_LIMIT=y CONFIG_BOOTCOUNT_EXT=y CONFIG_SYS_BOOTCOUNT_EXT_DEVPART="0:5" CONFIG_NETDEVICES=y diff --git a/configs/portl2_defconfig b/configs/portl2_defconfig index 7db41108b8..857dec1aec 100644 --- a/configs/portl2_defconfig +++ b/configs/portl2_defconfig @@ -25,6 +25,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=orion_nand:-(ubi0);" CONFIG_CMD_UBI=y # CONFIG_CMD_UBIFS is not set CONFIG_ENV_IS_IN_EEPROM=y +CONFIG_BOOTCOUNT_LIMIT=y # 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 f68230079f..606325927a 100644 --- a/configs/pxm2_defconfig +++ b/configs/pxm2_defconfig @@ -54,6 +54,7 @@ CONFIG_CMD_UBI=y CONFIG_OF_CONTROL=y CONFIG_OF_EMBED=y CONFIG_ENV_IS_IN_NAND=y +CONFIG_BOOTCOUNT_LIMIT=y CONFIG_DFU_NAND=y CONFIG_MMC_OMAP_HS=y CONFIG_NAND=y diff --git a/configs/rastaban_defconfig b/configs/rastaban_defconfig index c714b07f34..ce6981e000 100644 --- a/configs/rastaban_defconfig +++ b/configs/rastaban_defconfig @@ -51,6 +51,7 @@ CONFIG_CMD_UBI=y CONFIG_OF_CONTROL=y CONFIG_OF_EMBED=y CONFIG_ENV_IS_IN_NAND=y +CONFIG_BOOTCOUNT_LIMIT=y CONFIG_DFU_NAND=y CONFIG_MMC_OMAP_HS=y CONFIG_NAND=y diff --git a/configs/rut_defconfig b/configs/rut_defconfig index 2269747ec3..b31eb9767c 100644 --- a/configs/rut_defconfig +++ b/configs/rut_defconfig @@ -55,6 +55,7 @@ CONFIG_CMD_UBI=y CONFIG_OF_CONTROL=y CONFIG_OF_EMBED=y CONFIG_ENV_IS_IN_NAND=y +CONFIG_BOOTCOUNT_LIMIT=y CONFIG_DFU_NAND=y CONFIG_MMC_OMAP_HS=y CONFIG_NAND=y diff --git a/configs/socfpga_is1_defconfig b/configs/socfpga_is1_defconfig index b87ebd32ba..7c39178003 100644 --- a/configs/socfpga_is1_defconfig +++ b/configs/socfpga_is1_defconfig @@ -40,6 +40,7 @@ CONFIG_CMD_UBI=y CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_SPL_DM=y CONFIG_SPL_DM_SEQ_ALIAS=y +CONFIG_BOOTCOUNT_LIMIT=y CONFIG_FPGA_SOCFPGA=y CONFIG_DM_GPIO=y CONFIG_DWAPB_GPIO=y diff --git a/configs/socfpga_sr1500_defconfig b/configs/socfpga_sr1500_defconfig index 85f28a385e..d27dbc6802 100644 --- a/configs/socfpga_sr1500_defconfig +++ b/configs/socfpga_sr1500_defconfig @@ -44,6 +44,7 @@ CONFIG_CMD_UBI=y CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_SPL_DM=y CONFIG_SPL_DM_SEQ_ALIAS=y +CONFIG_BOOTCOUNT_LIMIT=y CONFIG_FPGA_SOCFPGA=y CONFIG_DM_GPIO=y CONFIG_DWAPB_GPIO=y diff --git a/configs/suvd3_defconfig b/configs/suvd3_defconfig index b957ff731e..e1b4665034 100644 --- a/configs/suvd3_defconfig +++ b/configs/suvd3_defconfig @@ -22,6 +22,7 @@ CONFIG_MTDIDS_DEFAULT="nor0=boot" CONFIG_MTDPARTS_DEFAULT="mtdparts=boot:768k(u-boot),128k(env),128k(envred),-(ubi0);" CONFIG_CMD_UBI=y # CONFIG_CMD_UBIFS is not set +CONFIG_BOOTCOUNT_LIMIT=y # CONFIG_MMC is not set CONFIG_MTD_NOR_FLASH=y # CONFIG_PCI is not set diff --git a/configs/theadorable_debug_defconfig b/configs/theadorable_debug_defconfig index f602c839c3..b62645eac7 100644 --- a/configs/theadorable_debug_defconfig +++ b/configs/theadorable_debug_defconfig @@ -43,6 +43,7 @@ CONFIG_EFI_PARTITION=y CONFIG_NET_RANDOM_ETHADDR=y CONFIG_SPL_OF_TRANSLATE=y CONFIG_SATA_MV=y +CONFIG_BOOTCOUNT_LIMIT=y CONFIG_FPGA_ALTERA=y CONFIG_DM_GPIO=y # CONFIG_MMC is not set diff --git a/configs/thuban_defconfig b/configs/thuban_defconfig index df76145d5b..4a3c0cd377 100644 --- a/configs/thuban_defconfig +++ b/configs/thuban_defconfig @@ -51,6 +51,7 @@ CONFIG_CMD_UBI=y CONFIG_OF_CONTROL=y CONFIG_OF_EMBED=y CONFIG_ENV_IS_IN_NAND=y +CONFIG_BOOTCOUNT_LIMIT=y CONFIG_DFU_NAND=y CONFIG_MMC_OMAP_HS=y CONFIG_NAND=y diff --git a/configs/tqma6s_wru4_mmc_defconfig b/configs/tqma6s_wru4_mmc_defconfig index 4cf6693f5c..84d46b1cfd 100644 --- a/configs/tqma6s_wru4_mmc_defconfig +++ b/configs/tqma6s_wru4_mmc_defconfig @@ -31,6 +31,7 @@ CONFIG_CMD_EXT4_WRITE=y CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y CONFIG_ENV_IS_IN_MMC=y +CONFIG_BOOTCOUNT_LIMIT=y CONFIG_LED_STATUS=y CONFIG_LED_STATUS0=y CONFIG_LED_STATUS_BIT=0 diff --git a/configs/tuge1_defconfig b/configs/tuge1_defconfig index 82b73d20b5..28c6671aaf 100644 --- a/configs/tuge1_defconfig +++ b/configs/tuge1_defconfig @@ -22,6 +22,7 @@ CONFIG_MTDIDS_DEFAULT="nor0=boot" CONFIG_MTDPARTS_DEFAULT="mtdparts=boot:768k(u-boot),128k(env),128k(envred),-(ubi0);" CONFIG_CMD_UBI=y # CONFIG_CMD_UBIFS is not set +CONFIG_BOOTCOUNT_LIMIT=y # CONFIG_MMC is not set CONFIG_MTD_NOR_FLASH=y # CONFIG_PCI is not set diff --git a/configs/tuxx1_defconfig b/configs/tuxx1_defconfig index 60404fd213..4cc5394f73 100644 --- a/configs/tuxx1_defconfig +++ b/configs/tuxx1_defconfig @@ -22,6 +22,7 @@ CONFIG_MTDIDS_DEFAULT="nor0=boot" CONFIG_MTDPARTS_DEFAULT="mtdparts=boot:768k(u-boot),128k(env),128k(envred),-(ubi0);" CONFIG_CMD_UBI=y # CONFIG_CMD_UBIFS is not set +CONFIG_BOOTCOUNT_LIMIT=y # CONFIG_MMC is not set CONFIG_MTD_NOR_FLASH=y # CONFIG_PCI is not set diff --git a/configs/x600_defconfig b/configs/x600_defconfig index 6b66db49c8..47c9be36a1 100644 --- a/configs/x600_defconfig +++ b/configs/x600_defconfig @@ -36,6 +36,7 @@ CONFIG_MTDIDS_DEFAULT="nand0=nand" CONFIG_MTDPARTS_DEFAULT="mtdparts=nand:64M(ubi0),64M(ubi1)" CONFIG_CMD_UBI=y CONFIG_ENV_IS_IN_FLASH=y +CONFIG_BOOTCOUNT_LIMIT=y CONFIG_FPGA_XILINX=y CONFIG_SYS_I2C_DW=y # CONFIG_MMC is not set diff --git a/drivers/bootcount/Kconfig b/drivers/bootcount/Kconfig index c9d627cce2..cb6be73d52 100644 --- a/drivers/bootcount/Kconfig +++ b/drivers/bootcount/Kconfig @@ -11,6 +11,12 @@ config BOOTCOUNT number of times the board has booted on a number of different persistent storage mediums. +config BOOTCOUNT_LIMIT + bool "Enable support for checking boot count limit" + help + Enable checking for exceeding the boot count limit. + More information: http://www.denx.de/wiki/DULG/UBootBootCountLimit + if BOOTCOUNT config BOOTCOUNT_EXT diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h index 31ab503dca..03791deabc 100644 --- a/include/configs/am335x_evm.h +++ b/include/configs/am335x_evm.h @@ -177,7 +177,6 @@ /* SPL */ #ifndef CONFIG_NOR_BOOT /* Bootcount using the RTC block */ -#define CONFIG_BOOTCOUNT_LIMIT #define CONFIG_BOOTCOUNT_AM33XX #define CONFIG_SYS_BOOTCOUNT_BE diff --git a/include/configs/am335x_sl50.h b/include/configs/am335x_sl50.h index b1c7ede7df..1cb3578254 100644 --- a/include/configs/am335x_sl50.h +++ b/include/configs/am335x_sl50.h @@ -74,7 +74,6 @@ /* SPL */ /* Bootcount using the RTC block */ -#define CONFIG_BOOTCOUNT_LIMIT #define CONFIG_BOOTCOUNT_AM33XX #define CONFIG_SYS_BOOTCOUNT_BE diff --git a/include/configs/baltos.h b/include/configs/baltos.h index 75dd0c5e26..440dbf5367 100644 --- a/include/configs/baltos.h +++ b/include/configs/baltos.h @@ -231,7 +231,6 @@ /* SPL */ #ifndef CONFIG_NOR_BOOT /* Bootcount using the RTC block */ -#define CONFIG_BOOTCOUNT_LIMIT #define CONFIG_BOOTCOUNT_AM33XX /* USB gadget RNDIS */ diff --git a/include/configs/bav335x.h b/include/configs/bav335x.h index 930066c149..7bbb7d1300 100644 --- a/include/configs/bav335x.h +++ b/include/configs/bav335x.h @@ -339,7 +339,6 @@ DEFAULT_LINUX_BOOT_ENV \ /* SPL */ #ifndef CONFIG_NOR_BOOT /* Bootcount using the RTC block */ -#define CONFIG_BOOTCOUNT_LIMIT #define CONFIG_BOOTCOUNT_AM33XX #define CONFIG_SYS_BOOTCOUNT_BE diff --git a/include/configs/brppt1.h b/include/configs/brppt1.h index a8022b87d5..fb2845fb5d 100644 --- a/include/configs/brppt1.h +++ b/include/configs/brppt1.h @@ -22,7 +22,6 @@ /* Bootcount using the RTC block */ #define CONFIG_SYS_BOOTCOUNT_ADDR 0x44E3E000 -#define CONFIG_BOOTCOUNT_LIMIT #define CONFIG_BOOTCOUNT_AM33XX /* memory */ diff --git a/include/configs/calimain.h b/include/configs/calimain.h index 4c2f6ba2d5..df807f86ef 100644 --- a/include/configs/calimain.h +++ b/include/configs/calimain.h @@ -278,7 +278,6 @@ /* initial stack pointer in internal SRAM */ #define CONFIG_SYS_INIT_SP_ADDR (0x8001ff00) -#define CONFIG_BOOTCOUNT_LIMIT #define CONFIG_SYS_BOOTCOUNT_LE /* Use little-endian accessors */ #define CONFIG_SYS_BOOTCOUNT_ADDR DAVINCI_RTC_BASE diff --git a/include/configs/chiliboard.h b/include/configs/chiliboard.h index 89740ba1e0..234cd6a4f6 100644 --- a/include/configs/chiliboard.h +++ b/include/configs/chiliboard.h @@ -123,7 +123,6 @@ /* SPL */ /* Bootcount using the RTC block */ -#define CONFIG_BOOTCOUNT_LIMIT #define CONFIG_BOOTCOUNT_AM33XX #define CONFIG_SYS_BOOTCOUNT_BE diff --git a/include/configs/cm_t335.h b/include/configs/cm_t335.h index d6ebdcd600..bd41a56641 100644 --- a/include/configs/cm_t335.h +++ b/include/configs/cm_t335.h @@ -16,7 +16,6 @@ #include <configs/ti_am335x_common.h> #undef CONFIG_SPI -#undef CONFIG_BOOTCOUNT_LIMIT #undef CONFIG_SPL_AM33XX_ENABLE_RTC32K_OSC #undef CONFIG_MAX_RAM_BANK_SIZE diff --git a/include/configs/dh_imx6.h b/include/configs/dh_imx6.h index 7cda878ac7..c89641d67e 100644 --- a/include/configs/dh_imx6.h +++ b/include/configs/dh_imx6.h @@ -47,7 +47,6 @@ #define CONFIG_SYS_MALLOC_LEN (4 * SZ_1M) /* Bootcounter */ -#define CONFIG_BOOTCOUNT_LIMIT #define CONFIG_SYS_BOOTCOUNT_ADDR IRAM_BASE_ADDR #define CONFIG_SYS_BOOTCOUNT_BE diff --git a/include/configs/ge_bx50v3.h b/include/configs/ge_bx50v3.h index b6808dfb23..178af17982 100644 --- a/include/configs/ge_bx50v3.h +++ b/include/configs/ge_bx50v3.h @@ -269,7 +269,6 @@ #define CONFIG_BCH -#define CONFIG_BOOTCOUNT_LIMIT #define CONFIG_BOOTCOUNT_EXT #define CONFIG_SYS_BOOTCOUNT_EXT_INTERFACE "mmc" #define CONFIG_SYS_BOOTCOUNT_EXT_DEVPART "1:5" diff --git a/include/configs/highbank.h b/include/configs/highbank.h index 726ae8a214..2831aa3875 100644 --- a/include/configs/highbank.h +++ b/include/configs/highbank.h @@ -26,7 +26,6 @@ #define CONFIG_PL01x_PORTS { (void *)(0xFFF36000) } #define CONFIG_CONS_INDEX 0 -#define CONFIG_BOOTCOUNT_LIMIT #define CONFIG_SYS_BOOTCOUNT_SINGLEWORD #define CONFIG_SYS_BOOTCOUNT_LE /* Use little-endian accessors */ #define CONFIG_SYS_BOOTCOUNT_ADDR 0xfff3cf0c diff --git a/include/configs/ids8313.h b/include/configs/ids8313.h index 12eb07d1f7..529cbf16ba 100644 --- a/include/configs/ids8313.h +++ b/include/configs/ids8313.h @@ -516,7 +516,6 @@ #define CONFIG_MTD_PARTITIONS /* bootcount support */ -#define CONFIG_BOOTCOUNT_LIMIT #define CONFIG_BOOTCOUNT_I2C #define CONFIG_BOOTCOUNT_ALEN 1 #define CONFIG_SYS_BOOTCOUNT_ADDR 0x9 diff --git a/include/configs/km/keymile-common.h b/include/configs/km/keymile-common.h index 4d9a133dd4..740202b69b 100644 --- a/include/configs/km/keymile-common.h +++ b/include/configs/km/keymile-common.h @@ -8,8 +8,6 @@ #ifndef __CONFIG_KEYMILE_H #define __CONFIG_KEYMILE_H -#define CONFIG_BOOTCOUNT_LIMIT - #undef CONFIG_WATCHDOG /* disable platform specific watchdog */ /* diff --git a/include/configs/km/km-powerpc.h b/include/configs/km/km-powerpc.h index 0d50538a8e..64c1d2ff7e 100644 --- a/include/configs/km/km-powerpc.h +++ b/include/configs/km/km-powerpc.h @@ -12,8 +12,6 @@ #define CONFIG_BOARD_EARLY_INIT_R #define CONFIG_LAST_STAGE_INIT -#define CONFIG_BOOTCOUNT_LIMIT - #define CONFIG_JFFS2_CMDLINE /* standard km ethernet_present for piggy */ diff --git a/include/configs/km/kmp204x-common.h b/include/configs/km/kmp204x-common.h index a0c932a2fa..fd9391d928 100644 --- a/include/configs/km/kmp204x-common.h +++ b/include/configs/km/kmp204x-common.h @@ -191,7 +191,6 @@ unsigned long get_board_sys_clk(unsigned long dummy); #define CONFIG_SYS_OR1_PRELIM CONFIG_SYS_QRIO_OR_PRELIM /* QRIO Options */ /* bootcounter in QRIO */ -#define CONFIG_BOOTCOUNT_LIMIT #define CONFIG_SYS_BOOTCOUNT_ADDR (CONFIG_SYS_QRIO_BASE + 0x20) #define CONFIG_BOARD_EARLY_INIT_R /* call board_early_init_r function */ diff --git a/include/configs/mx53ppd.h b/include/configs/mx53ppd.h index 05c3d529af..e0e846dc07 100644 --- a/include/configs/mx53ppd.h +++ b/include/configs/mx53ppd.h @@ -233,8 +233,6 @@ #define CONFIG_BCH -#define CONFIG_BOOTCOUNT_LIMIT - /* Backlight Control */ #define CONFIG_PWM_IMX #define CONFIG_IMX6_PWM_PER_CLK 66666000 diff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h index 44c85cd7fa..eb4b1f6332 100644 --- a/include/configs/siemens-am33x-common.h +++ b/include/configs/siemens-am33x-common.h @@ -500,7 +500,6 @@ #define CONFIG_RESET_TO_RETRY #define CONFIG_BOOT_RETRY_TIME 60 -#define CONFIG_BOOTCOUNT_LIMIT #define CONFIG_BOOTCOUNT_ENV #endif /* ! __CONFIG_SIEMENS_AM33X_COMMON_H */ diff --git a/include/configs/socfpga_is1.h b/include/configs/socfpga_is1.h index 46f5f135dd..883ffb76f3 100644 --- a/include/configs/socfpga_is1.h +++ b/include/configs/socfpga_is1.h @@ -32,7 +32,6 @@ /* * Bootcounter */ -#define CONFIG_BOOTCOUNT_LIMIT /* last 2 lwords in OCRAM */ #define CONFIG_SYS_BOOTCOUNT_ADDR 0xfffffff8 #define CONFIG_SYS_BOOTCOUNT_BE diff --git a/include/configs/socfpga_sr1500.h b/include/configs/socfpga_sr1500.h index 39bf612291..8c9069c923 100644 --- a/include/configs/socfpga_sr1500.h +++ b/include/configs/socfpga_sr1500.h @@ -31,7 +31,6 @@ /* * Bootcounter */ -#define CONFIG_BOOTCOUNT_LIMIT /* last 2 lwords in OCRAM */ #define CONFIG_SYS_BOOTCOUNT_ADDR 0xfffffff8 #define CONFIG_SYS_BOOTCOUNT_BE diff --git a/include/configs/theadorable.h b/include/configs/theadorable.h index 438abf10cc..ec9dc2e74a 100644 --- a/include/configs/theadorable.h +++ b/include/configs/theadorable.h @@ -83,7 +83,6 @@ /* * Bootcounter */ -#define CONFIG_BOOTCOUNT_LIMIT #define CONFIG_BOOTCOUNT_RAM /* Max size of RAM minus BOOTCOUNT_ADDR is the bootcounter address */ #define BOOTCOUNT_ADDR 0x1000 diff --git a/include/configs/tqma6_wru4.h b/include/configs/tqma6_wru4.h index 4e99cdbb59..a388c57ad4 100644 --- a/include/configs/tqma6_wru4.h +++ b/include/configs/tqma6_wru4.h @@ -34,7 +34,6 @@ /* LED */ /* Bootcounter */ -#define CONFIG_BOOTCOUNT_LIMIT #define CONFIG_SYS_BOOTCOUNT_ADDR IRAM_BASE_ADDR #define CONFIG_SYS_BOOTCOUNT_BE diff --git a/include/configs/x600.h b/include/configs/x600.h index e18b38902b..567d3bfa1d 100644 --- a/include/configs/x600.h +++ b/include/configs/x600.h @@ -121,7 +121,6 @@ #define CONFIG_SYS_LOAD_ADDR 0x00800000 /* Use last 2 lwords in internal SRAM for bootcounter */ -#define CONFIG_BOOTCOUNT_LIMIT #define CONFIG_SYS_BOOTCOUNT_ADDR (CONFIG_SRAM_BASE + \ CONFIG_SRAM_SIZE) -- 2.11.0 ^ permalink raw reply related [flat|nested] 9+ messages in thread
* [U-Boot] [PATCH 1/2] Convert CONFIG_BOOTCOUNT_LIMIT to Kconfig 2018-02-09 22:50 [U-Boot] [PATCH 1/2] Convert CONFIG_BOOTCOUNT_LIMIT to Kconfig Lukasz Majewski @ 2018-02-10 6:18 ` Alex Kiernan 2018-02-10 10:01 ` Lukasz Majewski 2018-02-11 19:23 ` Alex Kiernan ` (2 subsequent siblings) 3 siblings, 1 reply; 9+ messages in thread From: Alex Kiernan @ 2018-02-10 6:18 UTC (permalink / raw) To: u-boot On Fri, Feb 9, 2018 at 10:50 PM, Lukasz Majewski <lukma@denx.de> wrote: > diff --git a/configs/mx53ppd_defconfig b/configs/mx53ppd_defconfig > index 3fbca2a08c..b83cf72022 100644 > --- a/configs/mx53ppd_defconfig > +++ b/configs/mx53ppd_defconfig > @@ -21,6 +21,7 @@ CONFIG_CMD_EXT4_WRITE=y > CONFIG_CMD_FAT=y > CONFIG_CMD_FS_GENERIC=y > CONFIG_BOOTCOUNT=y > +CONFIG_BOOTCOUNT_LIMIT=y > CONFIG_BOOTCOUNT_EXT=y > CONFIG_SYS_BOOTCOUNT_EXT_DEVPART="0:5" > CONFIG_NETDEVICES=y ... > diff --git a/drivers/bootcount/Kconfig b/drivers/bootcount/Kconfig > index c9d627cce2..cb6be73d52 100644 > --- a/drivers/bootcount/Kconfig > +++ b/drivers/bootcount/Kconfig > @@ -11,6 +11,12 @@ config BOOTCOUNT > number of times the board has booted on a number of different > persistent storage mediums. > > +config BOOTCOUNT_LIMIT > + bool "Enable support for checking boot count limit" > + help > + Enable checking for exceeding the boot count limit. > + More information: http://www.denx.de/wiki/DULG/UBootBootCountLimit > + > if BOOTCOUNT > > config BOOTCOUNT_EXT Can't CONFIG_BOOTCOUNT and CONFIG_BOOTCOUNT_LIMIT be merged? config BOOTCOUNT bool "Enable Boot count support" help Enable boot count support, which provides the ability to store the number of times the board has booted on a number of different persistent storage mediums. AFAICT mx53ppd is the only board which has CONFIG_BOOTCOUNT set, BOOTCOUNT is just used within Kconfig, not actually consumed either by a Makefile or any piece of code and should probably go? -- Alex Kiernan ^ permalink raw reply [flat|nested] 9+ messages in thread
* [U-Boot] [PATCH 1/2] Convert CONFIG_BOOTCOUNT_LIMIT to Kconfig 2018-02-10 6:18 ` Alex Kiernan @ 2018-02-10 10:01 ` Lukasz Majewski 2018-02-10 12:21 ` Alex Kiernan 0 siblings, 1 reply; 9+ messages in thread From: Lukasz Majewski @ 2018-02-10 10:01 UTC (permalink / raw) To: u-boot Hi Alex, > On Fri, Feb 9, 2018 at 10:50 PM, Lukasz Majewski <lukma@denx.de> > wrote: > > diff --git a/configs/mx53ppd_defconfig b/configs/mx53ppd_defconfig > > index 3fbca2a08c..b83cf72022 100644 > > --- a/configs/mx53ppd_defconfig > > +++ b/configs/mx53ppd_defconfig > > @@ -21,6 +21,7 @@ CONFIG_CMD_EXT4_WRITE=y > > CONFIG_CMD_FAT=y > > CONFIG_CMD_FS_GENERIC=y > > CONFIG_BOOTCOUNT=y > > +CONFIG_BOOTCOUNT_LIMIT=y > > CONFIG_BOOTCOUNT_EXT=y > > CONFIG_SYS_BOOTCOUNT_EXT_DEVPART="0:5" > > CONFIG_NETDEVICES=y > > ... > > > diff --git a/drivers/bootcount/Kconfig b/drivers/bootcount/Kconfig > > index c9d627cce2..cb6be73d52 100644 > > --- a/drivers/bootcount/Kconfig > > +++ b/drivers/bootcount/Kconfig > > @@ -11,6 +11,12 @@ config BOOTCOUNT > > number of times the board has booted on a number of > > different persistent storage mediums. > > > > +config BOOTCOUNT_LIMIT > > + bool "Enable support for checking boot count limit" > > + help > > + Enable checking for exceeding the boot count limit. > > + More information: > > http://www.denx.de/wiki/DULG/UBootBootCountLimit + > > if BOOTCOUNT > > > > config BOOTCOUNT_EXT > > Can't CONFIG_BOOTCOUNT and CONFIG_BOOTCOUNT_LIMIT be merged? This patch was mostly generated by moveconfig utility. > > config BOOTCOUNT > bool "Enable Boot count support" > help > Enable boot count support, which provides the ability to > store the number of times the board has booted on a number of > different persistent storage mediums. > > AFAICT mx53ppd is the only board which has CONFIG_BOOTCOUNT set, I would use pragmatic approach here - leave this patch as is, and prepare next one on top of it to replace CONFIG_BOOTCOUNT with CONFIG_BOOTCOUNT_LIMIT (as the last one is used in many places). > BOOTCOUNT is just used within Kconfig, not actually consumed either by > a Makefile or any piece of code and should probably go? Yes. It could be replaced with CONFIG_BOOTCOUNT_LIMIT. > 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 -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 488 bytes Desc: OpenPGP digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20180210/acba2c2a/attachment.sig> ^ permalink raw reply [flat|nested] 9+ messages in thread
* [U-Boot] [PATCH 1/2] Convert CONFIG_BOOTCOUNT_LIMIT to Kconfig 2018-02-10 10:01 ` Lukasz Majewski @ 2018-02-10 12:21 ` Alex Kiernan 2018-02-10 18:15 ` Lukasz Majewski 0 siblings, 1 reply; 9+ messages in thread From: Alex Kiernan @ 2018-02-10 12:21 UTC (permalink / raw) To: u-boot On Sat, Feb 10, 2018 at 10:01 AM, Lukasz Majewski <lukma@denx.de> wrote: > Hi Alex, > >> On Fri, Feb 9, 2018 at 10:50 PM, Lukasz Majewski <lukma@denx.de> >> wrote: >> > diff --git a/configs/mx53ppd_defconfig b/configs/mx53ppd_defconfig >> > index 3fbca2a08c..b83cf72022 100644 >> > --- a/configs/mx53ppd_defconfig >> > +++ b/configs/mx53ppd_defconfig >> > @@ -21,6 +21,7 @@ CONFIG_CMD_EXT4_WRITE=y >> > CONFIG_CMD_FAT=y >> > CONFIG_CMD_FS_GENERIC=y >> > CONFIG_BOOTCOUNT=y >> > +CONFIG_BOOTCOUNT_LIMIT=y >> > CONFIG_BOOTCOUNT_EXT=y >> > CONFIG_SYS_BOOTCOUNT_EXT_DEVPART="0:5" >> > CONFIG_NETDEVICES=y >> >> ... >> >> > diff --git a/drivers/bootcount/Kconfig b/drivers/bootcount/Kconfig >> > index c9d627cce2..cb6be73d52 100644 >> > --- a/drivers/bootcount/Kconfig >> > +++ b/drivers/bootcount/Kconfig >> > @@ -11,6 +11,12 @@ config BOOTCOUNT >> > number of times the board has booted on a number of >> > different persistent storage mediums. >> > >> > +config BOOTCOUNT_LIMIT >> > + bool "Enable support for checking boot count limit" >> > + help >> > + Enable checking for exceeding the boot count limit. >> > + More information: >> > http://www.denx.de/wiki/DULG/UBootBootCountLimit + >> > if BOOTCOUNT >> > >> > config BOOTCOUNT_EXT >> >> Can't CONFIG_BOOTCOUNT and CONFIG_BOOTCOUNT_LIMIT be merged? > > This patch was mostly generated by moveconfig utility. > Yeah, I've a similar patch series where I'd done the same thing. > >> >> config BOOTCOUNT >> bool "Enable Boot count support" >> help >> Enable boot count support, which provides the ability to >> store the number of times the board has booted on a number of >> different persistent storage mediums. >> >> AFAICT mx53ppd is the only board which has CONFIG_BOOTCOUNT set, > > I would use pragmatic approach here - leave this patch as is, and > prepare next one on top of it to replace CONFIG_BOOTCOUNT with > CONFIG_BOOTCOUNT_LIMIT (as the last one is used in many places). > >> BOOTCOUNT is just used within Kconfig, not actually consumed either by >> a Makefile or any piece of code and should probably go? > > Yes. It could be replaced with CONFIG_BOOTCOUNT_LIMIT. > Broadly what I had, only I'd reused the description from CONFIG_BOOTCOUNT. I also worked through all the drivers, and made bootlimit configurable from Kconfig. But I see you're doing way more work around BOOTCOUNT, so I'll hold off on them. -- Alex Kiernan ^ permalink raw reply [flat|nested] 9+ messages in thread
* [U-Boot] [PATCH 1/2] Convert CONFIG_BOOTCOUNT_LIMIT to Kconfig 2018-02-10 12:21 ` Alex Kiernan @ 2018-02-10 18:15 ` Lukasz Majewski 2018-02-10 20:53 ` Alex Kiernan 0 siblings, 1 reply; 9+ messages in thread From: Lukasz Majewski @ 2018-02-10 18:15 UTC (permalink / raw) To: u-boot Hi Alex, > On Sat, Feb 10, 2018 at 10:01 AM, Lukasz Majewski <lukma@denx.de> > wrote: > > Hi Alex, > > > >> On Fri, Feb 9, 2018 at 10:50 PM, Lukasz Majewski <lukma@denx.de> > >> wrote: > >> > diff --git a/configs/mx53ppd_defconfig > >> > b/configs/mx53ppd_defconfig index 3fbca2a08c..b83cf72022 100644 > >> > --- a/configs/mx53ppd_defconfig > >> > +++ b/configs/mx53ppd_defconfig > >> > @@ -21,6 +21,7 @@ CONFIG_CMD_EXT4_WRITE=y > >> > CONFIG_CMD_FAT=y > >> > CONFIG_CMD_FS_GENERIC=y > >> > CONFIG_BOOTCOUNT=y > >> > +CONFIG_BOOTCOUNT_LIMIT=y > >> > CONFIG_BOOTCOUNT_EXT=y > >> > CONFIG_SYS_BOOTCOUNT_EXT_DEVPART="0:5" > >> > CONFIG_NETDEVICES=y > >> > >> ... > >> > >> > diff --git a/drivers/bootcount/Kconfig > >> > b/drivers/bootcount/Kconfig index c9d627cce2..cb6be73d52 100644 > >> > --- a/drivers/bootcount/Kconfig > >> > +++ b/drivers/bootcount/Kconfig > >> > @@ -11,6 +11,12 @@ config BOOTCOUNT > >> > number of times the board has booted on a number of > >> > different persistent storage mediums. > >> > > >> > +config BOOTCOUNT_LIMIT > >> > + bool "Enable support for checking boot count limit" > >> > + help > >> > + Enable checking for exceeding the boot count limit. > >> > + More information: > >> > http://www.denx.de/wiki/DULG/UBootBootCountLimit + > >> > if BOOTCOUNT > >> > > >> > config BOOTCOUNT_EXT > >> > >> Can't CONFIG_BOOTCOUNT and CONFIG_BOOTCOUNT_LIMIT be merged? > > > > This patch was mostly generated by moveconfig utility. > > > > Yeah, I've a similar patch series where I'd done the same thing. I see :/ > > > > >> > >> config BOOTCOUNT > >> bool "Enable Boot count support" > >> help > >> Enable boot count support, which provides the ability to > >> store the number of times the board has booted on a number of > >> different persistent storage mediums. > >> > >> AFAICT mx53ppd is the only board which has CONFIG_BOOTCOUNT set, > > > > I would use pragmatic approach here - leave this patch as is, and > > prepare next one on top of it to replace CONFIG_BOOTCOUNT with > > CONFIG_BOOTCOUNT_LIMIT (as the last one is used in many places). > > > >> BOOTCOUNT is just used within Kconfig, not actually consumed > >> either by a Makefile or any piece of code and should probably go? > > > > Yes. It could be replaced with CONFIG_BOOTCOUNT_LIMIT. > > > > Broadly what I had, only I'd reused the description from > CONFIG_BOOTCOUNT. As you have written above - the CONFIG_BOOTCOUNT_LIMIT is used in ./drivers/bootcount. > I also worked through all the drivers, and made > bootlimit configurable from Kconfig. But I see you're doing way more > work around BOOTCOUNT, so I'll hold off on them. Maybe you can share / send the code, which replaces CONFIG_BOOTCOUNT with CONFIG_BOOTCOUNT_LIMIT? Or even better, place such patch on top of this series? Thanks in advance, 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 -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 488 bytes Desc: OpenPGP digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20180210/0f9addf6/attachment.sig> ^ permalink raw reply [flat|nested] 9+ messages in thread
* [U-Boot] [PATCH 1/2] Convert CONFIG_BOOTCOUNT_LIMIT to Kconfig 2018-02-10 18:15 ` Lukasz Majewski @ 2018-02-10 20:53 ` Alex Kiernan 0 siblings, 0 replies; 9+ messages in thread From: Alex Kiernan @ 2018-02-10 20:53 UTC (permalink / raw) To: u-boot >> I also worked through all the drivers, and made >> bootlimit configurable from Kconfig. But I see you're doing way more >> work around BOOTCOUNT, so I'll hold off on them. > > Maybe you can share / send the code, which replaces CONFIG_BOOTCOUNT > with CONFIG_BOOTCOUNT_LIMIT? > > Or even better, place such patch on top of this series? > Yes of course... just trying to pick it apart sensibly. -- Alex Kiernan ^ permalink raw reply [flat|nested] 9+ messages in thread
* [U-Boot] [PATCH 1/2] Convert CONFIG_BOOTCOUNT_LIMIT to Kconfig 2018-02-09 22:50 [U-Boot] [PATCH 1/2] Convert CONFIG_BOOTCOUNT_LIMIT to Kconfig Lukasz Majewski 2018-02-10 6:18 ` Alex Kiernan @ 2018-02-11 19:23 ` Alex Kiernan 2018-02-12 7:56 ` [U-Boot] Antwort: " Hannes Schmelzer 2018-02-15 15:09 ` [U-Boot] [U-Boot, " Tom Rini 3 siblings, 0 replies; 9+ messages in thread From: Alex Kiernan @ 2018-02-11 19:23 UTC (permalink / raw) To: u-boot On Fri, Feb 9, 2018 at 10:50 PM, Lukasz Majewski <lukma@denx.de> wrote: > This converts the following to Kconfig: > CONFIG_BOOTCOUNT_LIMIT > > Signed-off-by: Lukasz Majewski <lukma@denx.de> > --- > > README | 10 ---------- > configs/am335x_baltos_defconfig | 1 + > configs/am335x_boneblack_defconfig | 1 + > configs/am335x_boneblack_vboot_defconfig | 1 + > configs/am335x_evm_defconfig | 1 + > configs/am335x_evm_nor_defconfig | 1 + > configs/am335x_evm_spiboot_defconfig | 1 + > configs/am335x_evm_usbspl_defconfig | 1 + > configs/am335x_hs_evm_defconfig | 1 + > configs/am335x_hs_evm_uart_defconfig | 1 + > configs/am335x_sl50_defconfig | 1 + > configs/birdland_bav335a_defconfig | 1 + > configs/birdland_bav335b_defconfig | 1 + > configs/brppt1_mmc_defconfig | 1 + > configs/brppt1_nand_defconfig | 1 + > configs/brppt1_spi_defconfig | 1 + > configs/calimain_defconfig | 1 + > configs/chiliboard_defconfig | 1 + > configs/dh_imx6_defconfig | 1 + > configs/draco_defconfig | 1 + > configs/etamin_defconfig | 1 + > configs/ge_b450v3_defconfig | 1 + > configs/ge_b650v3_defconfig | 1 + > configs/ge_b850v3_defconfig | 1 + > configs/highbank_defconfig | 1 + > configs/ids8313_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/socfpga_is1_defconfig | 1 + > configs/socfpga_sr1500_defconfig | 1 + > configs/suvd3_defconfig | 1 + > configs/theadorable_debug_defconfig | 1 + > configs/thuban_defconfig | 1 + > configs/tqma6s_wru4_mmc_defconfig | 1 + > configs/tuge1_defconfig | 1 + > configs/tuxx1_defconfig | 1 + > configs/x600_defconfig | 1 + > drivers/bootcount/Kconfig | 6 ++++++ > include/configs/am335x_evm.h | 1 - > include/configs/am335x_sl50.h | 1 - > include/configs/baltos.h | 1 - > include/configs/bav335x.h | 1 - > include/configs/brppt1.h | 1 - > include/configs/calimain.h | 1 - > include/configs/chiliboard.h | 1 - > include/configs/cm_t335.h | 1 - > include/configs/dh_imx6.h | 1 - > include/configs/ge_bx50v3.h | 1 - > include/configs/highbank.h | 1 - > include/configs/ids8313.h | 1 - > include/configs/km/keymile-common.h | 2 -- > include/configs/km/km-powerpc.h | 2 -- > include/configs/km/kmp204x-common.h | 1 - > include/configs/mx53ppd.h | 2 -- > include/configs/siemens-am33x-common.h | 1 - > include/configs/socfpga_is1.h | 1 - > include/configs/socfpga_sr1500.h | 1 - > include/configs/theadorable.h | 1 - > include/configs/tqma6_wru4.h | 1 - > include/configs/x600.h | 1 - > 80 files changed, 62 insertions(+), 35 deletions(-) > > diff --git a/README b/README > index 81b7ee1ce8..f51f6709c2 100644 > --- a/README > +++ b/README > @@ -714,11 +714,6 @@ The following options need to be configured: > RAM and NFS. > > - Bootcount: > - CONFIG_BOOTCOUNT_LIMIT > - Implements a mechanism for detecting a repeating reboot > - cycle, see: > - http://www.denx.de/wiki/view/DULG/UBootBootCountLimit > - > CONFIG_BOOTCOUNT_ENV > If no softreset save registers are found on the hardware > "bootcount" is stored in the environment. To prevent a > @@ -2333,11 +2328,6 @@ The following options need to be configured: > but sometimes that is not allowed. > > - bootcount support: > - CONFIG_BOOTCOUNT_LIMIT > - > - This enables the bootcounter support, see: > - http://www.denx.de/wiki/DULG/UBootBootCountLimit > - > CONFIG_AT91SAM9XE > enable special bootcounter support on at91sam9xe based boards. > CONFIG_SOC_DA8XX > diff --git a/configs/am335x_baltos_defconfig b/configs/am335x_baltos_defconfig > index 97e600138c..5fd118cde0 100644 > --- a/configs/am335x_baltos_defconfig > +++ b/configs/am335x_baltos_defconfig > @@ -47,6 +47,7 @@ CONFIG_MTDIDS_DEFAULT="nand0=omap2-nand.0" > CONFIG_MTDPARTS_DEFAULT="mtdparts=omap2-nand.0:128k(SPL),128k(SPL.backup1),128k(SPL.backup2),128k(SPL.backup3),1920k(u-boot),-(UBI)" > CONFIG_CMD_UBI=y > CONFIG_ISO_PARTITION=y > +CONFIG_BOOTCOUNT_LIMIT=y > CONFIG_SYS_OMAP24_I2C_SPEED=1000 > CONFIG_MMC_OMAP_HS=y > CONFIG_NAND=y > diff --git a/configs/am335x_boneblack_defconfig b/configs/am335x_boneblack_defconfig > index f14333d7f4..ed430e7130 100644 > --- a/configs/am335x_boneblack_defconfig > +++ b/configs/am335x_boneblack_defconfig > @@ -21,6 +21,7 @@ CONFIG_CMD_SPL=y > # CONFIG_CMD_FLASH is not set > # CONFIG_CMD_SETEXPR is not set > CONFIG_ENV_IS_IN_MMC=y > +CONFIG_BOOTCOUNT_LIMIT=y > CONFIG_DFU_TFTP=y > CONFIG_DFU_MMC=y > CONFIG_DFU_RAM=y > diff --git a/configs/am335x_boneblack_vboot_defconfig b/configs/am335x_boneblack_vboot_defconfig > index 016ec4edde..df73f65209 100644 > --- a/configs/am335x_boneblack_vboot_defconfig > +++ b/configs/am335x_boneblack_vboot_defconfig > @@ -26,6 +26,7 @@ CONFIG_CMD_SPL=y > CONFIG_OF_CONTROL=y > CONFIG_ENV_IS_IN_MMC=y > # CONFIG_BLK is not set > +CONFIG_BOOTCOUNT_LIMIT=y > CONFIG_DFU_MMC=y > CONFIG_DFU_RAM=y > CONFIG_DM_I2C=y > diff --git a/configs/am335x_evm_defconfig b/configs/am335x_evm_defconfig > index 9e79d1c603..39ca59ad96 100644 > --- a/configs/am335x_evm_defconfig > +++ b/configs/am335x_evm_defconfig > @@ -25,6 +25,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=nand.0:128k(NAND.SPL),128k(NAND.SPL.backup1),1 > CONFIG_OF_CONTROL=y > CONFIG_OF_LIST="am335x-evm am335x-bone am335x-boneblack am335x-evmsk am335x-bonegreen am335x-icev2" > # CONFIG_BLK is not set > +CONFIG_BOOTCOUNT_LIMIT=y > CONFIG_DFU_MMC=y > CONFIG_DFU_NAND=y > CONFIG_DFU_RAM=y > diff --git a/configs/am335x_evm_nor_defconfig b/configs/am335x_evm_nor_defconfig > index 14aa2679d1..6598879f07 100644 > --- a/configs/am335x_evm_nor_defconfig > +++ b/configs/am335x_evm_nor_defconfig > @@ -20,6 +20,7 @@ CONFIG_CMD_NAND=y > CONFIG_CMD_MTDPARTS=y > CONFIG_MTDIDS_DEFAULT="nand0=nand.0" > CONFIG_MTDPARTS_DEFAULT="mtdparts=nand.0:128k(NAND.SPL),128k(NAND.SPL.backup1),128k(NAND.SPL.backup2),128k(NAND.SPL.backup3),256k(NAND.u-boot-spl-os),1m(NAND.u-boot),128k(NAND.u-boot-env),128k(NAND.u-boot-env.backup1),8m(NAND.kernel),-(NAND.file-system)" > +CONFIG_BOOTCOUNT_LIMIT=y > CONFIG_DFU_MMC=y > CONFIG_DFU_NAND=y > CONFIG_DFU_RAM=y > diff --git a/configs/am335x_evm_spiboot_defconfig b/configs/am335x_evm_spiboot_defconfig > index 71d6a28779..079f69d919 100644 > --- a/configs/am335x_evm_spiboot_defconfig > +++ b/configs/am335x_evm_spiboot_defconfig > @@ -21,6 +21,7 @@ CONFIG_CMD_MTDPARTS=y > CONFIG_MTDIDS_DEFAULT="nor0=m25p80-flash.0" > CONFIG_MTDPARTS_DEFAULT="mtdparts=m25p80-flash.0:128k(SPL),512k(u-boot),128k(u-boot-env1),128k(u-boot-env2),3464k(kernel),-(rootfs)" > CONFIG_ENV_IS_IN_SPI_FLASH=y > +CONFIG_BOOTCOUNT_LIMIT=y > CONFIG_DFU_MMC=y > CONFIG_DFU_RAM=y > CONFIG_MMC_OMAP_HS=y > diff --git a/configs/am335x_evm_usbspl_defconfig b/configs/am335x_evm_usbspl_defconfig > index 10d6d385de..5afc7407d0 100644 > --- a/configs/am335x_evm_usbspl_defconfig > +++ b/configs/am335x_evm_usbspl_defconfig > @@ -25,6 +25,7 @@ CONFIG_CMD_NAND=y > CONFIG_CMD_MTDPARTS=y > CONFIG_MTDIDS_DEFAULT="nand0=nand.0" > CONFIG_MTDPARTS_DEFAULT="mtdparts=nand.0:128k(NAND.SPL),128k(NAND.SPL.backup1),128k(NAND.SPL.backup2),128k(NAND.SPL.backup3),256k(NAND.u-boot-spl-os),1m(NAND.u-boot),128k(NAND.u-boot-env),128k(NAND.u-boot-env.backup1),8m(NAND.kernel),-(NAND.file-system)" > +CONFIG_BOOTCOUNT_LIMIT=y > CONFIG_DFU_MMC=y > CONFIG_DFU_NAND=y > CONFIG_DFU_RAM=y > diff --git a/configs/am335x_hs_evm_defconfig b/configs/am335x_hs_evm_defconfig > index 55565f4d3b..b953a5c684 100644 > --- a/configs/am335x_hs_evm_defconfig > +++ b/configs/am335x_hs_evm_defconfig > @@ -33,6 +33,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=nand.0:128k(NAND.SPL),128k(NAND.SPL.backup1),1 > CONFIG_OF_CONTROL=y > CONFIG_OF_LIST="am335x-evm am335x-bone am335x-boneblack am335x-evmsk am335x-bonegreen am335x-icev2" > # CONFIG_BLK is not set > +CONFIG_BOOTCOUNT_LIMIT=y > CONFIG_DFU_MMC=y > CONFIG_DFU_NAND=y > CONFIG_DFU_RAM=y > diff --git a/configs/am335x_hs_evm_uart_defconfig b/configs/am335x_hs_evm_uart_defconfig > index 7f05d56743..1fc496e04e 100644 > --- a/configs/am335x_hs_evm_uart_defconfig > +++ b/configs/am335x_hs_evm_uart_defconfig > @@ -31,6 +31,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=nand.0:128k(NAND.SPL),128k(NAND.SPL.backup1),1 > CONFIG_OF_CONTROL=y > CONFIG_OF_LIST="am335x-evm am335x-bone am335x-boneblack am335x-evmsk am335x-bonegreen am335x-icev2" > # CONFIG_BLK is not set > +CONFIG_BOOTCOUNT_LIMIT=y > CONFIG_DFU_MMC=y > CONFIG_DFU_NAND=y > CONFIG_DFU_RAM=y > diff --git a/configs/am335x_sl50_defconfig b/configs/am335x_sl50_defconfig > index ef27addb75..cd1b78e3c1 100644 > --- a/configs/am335x_sl50_defconfig > +++ b/configs/am335x_sl50_defconfig > @@ -38,6 +38,7 @@ CONFIG_CMD_SPI=y > # CONFIG_CMD_SETEXPR is not set > CONFIG_CMD_EXT4_WRITE=y > CONFIG_ENV_IS_IN_MMC=y > +CONFIG_BOOTCOUNT_LIMIT=y > CONFIG_MMC_OMAP_HS=y > CONFIG_PHYLIB=y > CONFIG_SYS_NS16550=y > diff --git a/configs/birdland_bav335a_defconfig b/configs/birdland_bav335a_defconfig > index d6d5d712e9..83828be574 100644 > --- a/configs/birdland_bav335a_defconfig > +++ b/configs/birdland_bav335a_defconfig > @@ -51,6 +51,7 @@ CONFIG_CMD_EXT4_WRITE=y > CONFIG_CMD_FAT=y > CONFIG_CMD_FS_GENERIC=y > CONFIG_ISO_PARTITION=y > +CONFIG_BOOTCOUNT_LIMIT=y > CONFIG_DFU_MMC=y > CONFIG_DFU_RAM=y > CONFIG_MMC_OMAP_HS=y > diff --git a/configs/birdland_bav335b_defconfig b/configs/birdland_bav335b_defconfig > index 0c145953db..74f237d5ec 100644 > --- a/configs/birdland_bav335b_defconfig > +++ b/configs/birdland_bav335b_defconfig > @@ -51,6 +51,7 @@ CONFIG_CMD_EXT4_WRITE=y > CONFIG_CMD_FAT=y > CONFIG_CMD_FS_GENERIC=y > CONFIG_ISO_PARTITION=y > +CONFIG_BOOTCOUNT_LIMIT=y > CONFIG_DFU_MMC=y > CONFIG_DFU_RAM=y > CONFIG_MMC_OMAP_HS=y > diff --git a/configs/brppt1_mmc_defconfig b/configs/brppt1_mmc_defconfig > index ace6279bf1..e6b0dc5599 100644 > --- a/configs/brppt1_mmc_defconfig > +++ b/configs/brppt1_mmc_defconfig > @@ -49,6 +49,7 @@ CONFIG_CMD_FAT=y > CONFIG_CMD_FS_GENERIC=y > CONFIG_ENV_IS_IN_MMC=y > CONFIG_NETCONSOLE=y > +CONFIG_BOOTCOUNT_LIMIT=y > CONFIG_MMC_OMAP_HS=y > CONFIG_PHYLIB=y > CONFIG_SYS_NS16550=y > diff --git a/configs/brppt1_nand_defconfig b/configs/brppt1_nand_defconfig > index 80664cefd3..24779cec37 100644 > --- a/configs/brppt1_nand_defconfig > +++ b/configs/brppt1_nand_defconfig > @@ -50,6 +50,7 @@ CONFIG_MTDIDS_DEFAULT="nand0=omap2-nand.0" > CONFIG_MTDPARTS_DEFAULT="mtdparts=omap2-nand.0:128k(MLO),128k(MLO.backup),128k(dtb),128k(u-boot-env),512k(u-boot),4m(kernel),128m(rootfs),-(user)" > CONFIG_ENV_IS_IN_NAND=y > CONFIG_NETCONSOLE=y > +CONFIG_BOOTCOUNT_LIMIT=y > # CONFIG_MMC is not set > CONFIG_NAND=y > CONFIG_PHYLIB=y > diff --git a/configs/brppt1_spi_defconfig b/configs/brppt1_spi_defconfig > index d1256e6aca..47fda899d5 100644 > --- a/configs/brppt1_spi_defconfig > +++ b/configs/brppt1_spi_defconfig > @@ -55,6 +55,7 @@ CONFIG_CMD_FS_GENERIC=y > CONFIG_CMD_MTDPARTS=y > CONFIG_ENV_IS_IN_SPI_FLASH=y > CONFIG_NETCONSOLE=y > +CONFIG_BOOTCOUNT_LIMIT=y > 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 d8ab012211..499a7f0189 100644 > --- a/configs/calimain_defconfig > +++ b/configs/calimain_defconfig > @@ -20,6 +20,7 @@ CONFIG_CMD_MII=y > CONFIG_CMD_PING=y > CONFIG_CMD_DIAG=y > CONFIG_ENV_IS_IN_FLASH=y > +CONFIG_BOOTCOUNT_LIMIT=y > # CONFIG_MMC is not set > CONFIG_MTD_NOR_FLASH=y > CONFIG_SYS_NS16550=y > diff --git a/configs/chiliboard_defconfig b/configs/chiliboard_defconfig > index a32dab7b51..efe7a435ef 100644 > --- a/configs/chiliboard_defconfig > +++ b/configs/chiliboard_defconfig > @@ -37,6 +37,7 @@ CONFIG_CMD_MTDPARTS=y > CONFIG_MTDIDS_DEFAULT="nand0=8000000.nand" > CONFIG_MTDPARTS_DEFAULT="mtdparts=8000000.nand:128k(NAND.SPL),128k(NAND.SPL.backup1),128k(NAND.SPL.backup2),128k(NAND.SPL.backup3),256k(NAND.u-boot-spl-os),1m(NAND.u-boot),128k(NAND.u-boot-env),128k(NAND.u-boot-env.backup1),8m(NAND.kernel),-(NAND.file-system)" > CONFIG_ENV_IS_IN_MMC=y > +CONFIG_BOOTCOUNT_LIMIT=y > CONFIG_DM_GPIO=y > CONFIG_MMC_OMAP_HS=y > CONFIG_NAND=y > diff --git a/configs/dh_imx6_defconfig b/configs/dh_imx6_defconfig > index 1fd7c50e31..fd61b72227 100644 > --- a/configs/dh_imx6_defconfig > +++ b/configs/dh_imx6_defconfig > @@ -41,6 +41,7 @@ CONFIG_CMD_FAT=y > CONFIG_CMD_FS_GENERIC=y > CONFIG_ENV_IS_IN_SPI_FLASH=y > CONFIG_DWC_AHSATA=y > +CONFIG_BOOTCOUNT_LIMIT=y > CONFIG_SPI_FLASH=y > CONFIG_SPI_FLASH_SPANSION=y > CONFIG_PHYLIB=y > diff --git a/configs/draco_defconfig b/configs/draco_defconfig > index 5444260b19..693d91c10e 100644 > --- a/configs/draco_defconfig > +++ b/configs/draco_defconfig > @@ -51,6 +51,7 @@ CONFIG_CMD_UBI=y > CONFIG_OF_CONTROL=y > CONFIG_OF_EMBED=y > CONFIG_ENV_IS_IN_NAND=y > +CONFIG_BOOTCOUNT_LIMIT=y > CONFIG_DFU_NAND=y > CONFIG_MMC_OMAP_HS=y > CONFIG_NAND=y > diff --git a/configs/etamin_defconfig b/configs/etamin_defconfig > index 608faf66ec..e7a3d2210c 100644 > --- a/configs/etamin_defconfig > +++ b/configs/etamin_defconfig > @@ -51,6 +51,7 @@ CONFIG_CMD_UBI=y > CONFIG_OF_CONTROL=y > CONFIG_OF_EMBED=y > CONFIG_ENV_IS_IN_NAND=y > +CONFIG_BOOTCOUNT_LIMIT=y > CONFIG_DFU_NAND=y > CONFIG_MMC_OMAP_HS=y > CONFIG_NAND=y > diff --git a/configs/ge_b450v3_defconfig b/configs/ge_b450v3_defconfig > index c947aa8f89..72455b4095 100644 > --- a/configs/ge_b450v3_defconfig > +++ b/configs/ge_b450v3_defconfig > @@ -22,6 +22,7 @@ CONFIG_CMD_EXT4_WRITE=y > CONFIG_CMD_FS_GENERIC=y > CONFIG_DOS_PARTITION=y > CONFIG_ENV_IS_IN_SPI_FLASH=y > +CONFIG_BOOTCOUNT_LIMIT=y > CONFIG_SPI_FLASH=y > CONFIG_SPI_FLASH_STMICRO=y > CONFIG_OF_LIBFDT=y > diff --git a/configs/ge_b650v3_defconfig b/configs/ge_b650v3_defconfig > index 2ea677d2f3..95302b4379 100644 > --- a/configs/ge_b650v3_defconfig > +++ b/configs/ge_b650v3_defconfig > @@ -22,6 +22,7 @@ CONFIG_CMD_EXT4_WRITE=y > CONFIG_CMD_FS_GENERIC=y > CONFIG_DOS_PARTITION=y > CONFIG_ENV_IS_IN_SPI_FLASH=y > +CONFIG_BOOTCOUNT_LIMIT=y > CONFIG_SPI_FLASH=y > CONFIG_SPI_FLASH_STMICRO=y > CONFIG_OF_LIBFDT=y > diff --git a/configs/ge_b850v3_defconfig b/configs/ge_b850v3_defconfig > index d433513e4f..c7ebf8ac41 100644 > --- a/configs/ge_b850v3_defconfig > +++ b/configs/ge_b850v3_defconfig > @@ -23,6 +23,7 @@ CONFIG_CMD_EXT4_WRITE=y > CONFIG_CMD_FS_GENERIC=y > CONFIG_DOS_PARTITION=y > CONFIG_ENV_IS_IN_SPI_FLASH=y > +CONFIG_BOOTCOUNT_LIMIT=y > CONFIG_SPI_FLASH=y > CONFIG_SPI_FLASH_STMICRO=y > CONFIG_OF_LIBFDT=y > diff --git a/configs/highbank_defconfig b/configs/highbank_defconfig > index f55b5dcebd..41f4ef5f78 100644 > --- a/configs/highbank_defconfig > +++ b/configs/highbank_defconfig > @@ -24,6 +24,7 @@ CONFIG_EFI_PARTITION=y > # CONFIG_PARTITION_UUIDS is not set > CONFIG_ENV_IS_IN_NVRAM=y > CONFIG_SCSI_AHCI=y > +CONFIG_BOOTCOUNT_LIMIT=y > # CONFIG_MMC is not set > CONFIG_SCSI=y > CONFIG_OF_LIBFDT=y > diff --git a/configs/ids8313_defconfig b/configs/ids8313_defconfig > index 839dfbac8f..3e67c55fc2 100644 > --- a/configs/ids8313_defconfig > +++ b/configs/ids8313_defconfig > @@ -29,6 +29,7 @@ CONFIG_CMD_JFFS2=y > CONFIG_MTDIDS_DEFAULT="nor0=ff800000.flash,nand0=e1000000.flash" > CONFIG_MTDPARTS_DEFAULT="mtdparts=ff800000.flash:7m(dum),768k(BOOT-BIN),128k(BOOT-ENV),128k(BOOT-REDENV);e1000000.flash:-(ubi)" > CONFIG_CMD_UBI=y > +CONFIG_BOOTCOUNT_LIMIT=y > # CONFIG_MMC is not set > CONFIG_MTD_NOR_FLASH=y > CONFIG_PHYLIB=y > diff --git a/configs/km_kirkwood_128m16_defconfig b/configs/km_kirkwood_128m16_defconfig > index aeb55c12c0..075b4b30e9 100644 > --- a/configs/km_kirkwood_128m16_defconfig > +++ b/configs/km_kirkwood_128m16_defconfig > @@ -25,6 +25,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=orion_nand:-(ubi0);" > CONFIG_CMD_UBI=y > # CONFIG_CMD_UBIFS is not set > CONFIG_ENV_IS_IN_EEPROM=y > +CONFIG_BOOTCOUNT_LIMIT=y > # 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 9eed13197e..4ed097d140 100644 > --- a/configs/km_kirkwood_defconfig > +++ b/configs/km_kirkwood_defconfig > @@ -25,6 +25,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=orion_nand:-(ubi0);" > CONFIG_CMD_UBI=y > # CONFIG_CMD_UBIFS is not set > CONFIG_ENV_IS_IN_EEPROM=y > +CONFIG_BOOTCOUNT_LIMIT=y > # 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 b24c68513c..b47c1ad027 100644 > --- a/configs/km_kirkwood_pci_defconfig > +++ b/configs/km_kirkwood_pci_defconfig > @@ -25,6 +25,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=orion_nand:-(ubi0);" > CONFIG_CMD_UBI=y > # CONFIG_CMD_UBIFS is not set > CONFIG_ENV_IS_IN_EEPROM=y > +CONFIG_BOOTCOUNT_LIMIT=y > # 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 5c31abeb99..9a65e0cd04 100644 > --- a/configs/kmcoge4_defconfig > +++ b/configs/kmcoge4_defconfig > @@ -30,6 +30,7 @@ CONFIG_CMD_UBI=y > # CONFIG_CMD_UBIFS is not set > CONFIG_DOS_PARTITION=y > CONFIG_ENV_IS_IN_SPI_FLASH=y > +CONFIG_BOOTCOUNT_LIMIT=y > # CONFIG_MMC is not set > CONFIG_SPI_FLASH=y > CONFIG_SPI_FLASH_SPANSION=y > diff --git a/configs/kmcoge5ne_defconfig b/configs/kmcoge5ne_defconfig > index d4c8e87ab5..fb1eac1ae1 100644 > --- a/configs/kmcoge5ne_defconfig > +++ b/configs/kmcoge5ne_defconfig > @@ -23,6 +23,7 @@ CONFIG_MTDIDS_DEFAULT="nor0=boot,nand0=app" > CONFIG_MTDPARTS_DEFAULT="mtdparts=boot:768k(u-boot),128k(env),128k(envred),-(ubi0);app:-(ubi1);" > CONFIG_CMD_UBI=y > # CONFIG_CMD_UBIFS is not set > +CONFIG_BOOTCOUNT_LIMIT=y > # CONFIG_MMC is not set > CONFIG_MTD_NOR_FLASH=y > # CONFIG_PCI is not set > diff --git a/configs/kmcoge5un_defconfig b/configs/kmcoge5un_defconfig > index 6eb4781a0c..96c4ad08b9 100644 > --- a/configs/kmcoge5un_defconfig > +++ b/configs/kmcoge5un_defconfig > @@ -25,6 +25,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=orion_nand:-(ubi0);" > CONFIG_CMD_UBI=y > # CONFIG_CMD_UBIFS is not set > CONFIG_ENV_IS_IN_SPI_FLASH=y > +CONFIG_BOOTCOUNT_LIMIT=y > # 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 cf4f973785..c70c1d04c2 100644 > --- a/configs/kmeter1_defconfig > +++ b/configs/kmeter1_defconfig > @@ -22,6 +22,7 @@ CONFIG_MTDIDS_DEFAULT="nor0=boot" > CONFIG_MTDPARTS_DEFAULT="mtdparts=boot:768k(u-boot),128k(env),128k(envred),-(ubi0);" > CONFIG_CMD_UBI=y > # CONFIG_CMD_UBIFS is not set > +CONFIG_BOOTCOUNT_LIMIT=y > # CONFIG_MMC is not set > CONFIG_MTD_NOR_FLASH=y > # CONFIG_PCI is not set > diff --git a/configs/kmlion1_defconfig b/configs/kmlion1_defconfig > index c7edcaa43c..7267534cab 100644 > --- a/configs/kmlion1_defconfig > +++ b/configs/kmlion1_defconfig > @@ -30,6 +30,7 @@ CONFIG_CMD_UBI=y > # CONFIG_CMD_UBIFS is not set > CONFIG_DOS_PARTITION=y > CONFIG_ENV_IS_IN_SPI_FLASH=y > +CONFIG_BOOTCOUNT_LIMIT=y > # CONFIG_MMC is not set > CONFIG_SPI_FLASH=y > CONFIG_SPI_FLASH_SPANSION=y > diff --git a/configs/kmnusa_defconfig b/configs/kmnusa_defconfig > index 22b8b4d238..fec401770f 100644 > --- a/configs/kmnusa_defconfig > +++ b/configs/kmnusa_defconfig > @@ -25,6 +25,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=orion_nand:-(ubi0);" > CONFIG_CMD_UBI=y > # CONFIG_CMD_UBIFS is not set > CONFIG_ENV_IS_IN_SPI_FLASH=y > +CONFIG_BOOTCOUNT_LIMIT=y > # 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 6eb6019004..df150cd9f9 100644 > --- a/configs/kmopti2_defconfig > +++ b/configs/kmopti2_defconfig > @@ -22,6 +22,7 @@ CONFIG_MTDIDS_DEFAULT="nor0=boot" > CONFIG_MTDPARTS_DEFAULT="mtdparts=boot:768k(u-boot),128k(env),128k(envred),-(ubi0);" > CONFIG_CMD_UBI=y > # CONFIG_CMD_UBIFS is not set > +CONFIG_BOOTCOUNT_LIMIT=y > # CONFIG_MMC is not set > CONFIG_MTD_NOR_FLASH=y > # CONFIG_PCI is not set > diff --git a/configs/kmsugp1_defconfig b/configs/kmsugp1_defconfig > index a105b8a81a..d1f190003a 100644 > --- a/configs/kmsugp1_defconfig > +++ b/configs/kmsugp1_defconfig > @@ -25,6 +25,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=orion_nand:-(ubi0);" > CONFIG_CMD_UBI=y > # CONFIG_CMD_UBIFS is not set > CONFIG_ENV_IS_IN_SPI_FLASH=y > +CONFIG_BOOTCOUNT_LIMIT=y > # 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 f65a8cf0bd..b6552171cc 100644 > --- a/configs/kmsupx5_defconfig > +++ b/configs/kmsupx5_defconfig > @@ -22,6 +22,7 @@ CONFIG_MTDIDS_DEFAULT="nor0=boot" > CONFIG_MTDPARTS_DEFAULT="mtdparts=boot:768k(u-boot),128k(env),128k(envred),-(ubi0);" > CONFIG_CMD_UBI=y > # CONFIG_CMD_UBIFS is not set > +CONFIG_BOOTCOUNT_LIMIT=y > # CONFIG_MMC is not set > CONFIG_MTD_NOR_FLASH=y > # CONFIG_PCI is not set > diff --git a/configs/kmsuv31_defconfig b/configs/kmsuv31_defconfig > index 59d10668a2..9d4fbfe940 100644 > --- a/configs/kmsuv31_defconfig > +++ b/configs/kmsuv31_defconfig > @@ -25,6 +25,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=orion_nand:-(ubi0);" > CONFIG_CMD_UBI=y > # CONFIG_CMD_UBIFS is not set > CONFIG_ENV_IS_IN_SPI_FLASH=y > +CONFIG_BOOTCOUNT_LIMIT=y > # 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 d90852bcee..5dca26a696 100644 > --- a/configs/kmtegr1_defconfig > +++ b/configs/kmtegr1_defconfig > @@ -24,6 +24,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=boot:768k(u-boot),256k(qe-fw),128k(env),128k(e > CONFIG_CMD_DIAG=y > CONFIG_CMD_UBI=y > # CONFIG_CMD_UBIFS is not set > +CONFIG_BOOTCOUNT_LIMIT=y > # CONFIG_MMC is not set > CONFIG_MTD_NOR_FLASH=y > # CONFIG_PCI is not set > diff --git a/configs/kmtepr2_defconfig b/configs/kmtepr2_defconfig > index 2593719df0..05bc604e19 100644 > --- a/configs/kmtepr2_defconfig > +++ b/configs/kmtepr2_defconfig > @@ -22,6 +22,7 @@ CONFIG_MTDIDS_DEFAULT="nor0=boot" > CONFIG_MTDPARTS_DEFAULT="mtdparts=boot:768k(u-boot),128k(env),128k(envred),-(ubi0);" > CONFIG_CMD_UBI=y > # CONFIG_CMD_UBIFS is not set > +CONFIG_BOOTCOUNT_LIMIT=y > # CONFIG_MMC is not set > CONFIG_MTD_NOR_FLASH=y > # CONFIG_PCI is not set > diff --git a/configs/kmvect1_defconfig b/configs/kmvect1_defconfig > index a734a2ab39..c6d06499c2 100644 > --- a/configs/kmvect1_defconfig > +++ b/configs/kmvect1_defconfig > @@ -23,6 +23,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=boot:768k(u-boot),128k(env),128k(envred),-(ubi > CONFIG_CMD_DIAG=y > CONFIG_CMD_UBI=y > # CONFIG_CMD_UBIFS is not set > +CONFIG_BOOTCOUNT_LIMIT=y > # CONFIG_MMC is not set > CONFIG_MTD_NOR_FLASH=y > # CONFIG_PCI is not set > diff --git a/configs/mgcoge3un_defconfig b/configs/mgcoge3un_defconfig > index 27f399582c..250513d925 100644 > --- a/configs/mgcoge3un_defconfig > +++ b/configs/mgcoge3un_defconfig > @@ -25,6 +25,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=orion_nand:-(ubi0);" > CONFIG_CMD_UBI=y > # CONFIG_CMD_UBIFS is not set > CONFIG_ENV_IS_IN_EEPROM=y > +CONFIG_BOOTCOUNT_LIMIT=y > # 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 3fbca2a08c..b83cf72022 100644 > --- a/configs/mx53ppd_defconfig > +++ b/configs/mx53ppd_defconfig > @@ -21,6 +21,7 @@ CONFIG_CMD_EXT4_WRITE=y > CONFIG_CMD_FAT=y > CONFIG_CMD_FS_GENERIC=y > CONFIG_BOOTCOUNT=y > +CONFIG_BOOTCOUNT_LIMIT=y > CONFIG_BOOTCOUNT_EXT=y > CONFIG_SYS_BOOTCOUNT_EXT_DEVPART="0:5" > CONFIG_NETDEVICES=y > diff --git a/configs/portl2_defconfig b/configs/portl2_defconfig > index 7db41108b8..857dec1aec 100644 > --- a/configs/portl2_defconfig > +++ b/configs/portl2_defconfig > @@ -25,6 +25,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=orion_nand:-(ubi0);" > CONFIG_CMD_UBI=y > # CONFIG_CMD_UBIFS is not set > CONFIG_ENV_IS_IN_EEPROM=y > +CONFIG_BOOTCOUNT_LIMIT=y > # 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 f68230079f..606325927a 100644 > --- a/configs/pxm2_defconfig > +++ b/configs/pxm2_defconfig > @@ -54,6 +54,7 @@ CONFIG_CMD_UBI=y > CONFIG_OF_CONTROL=y > CONFIG_OF_EMBED=y > CONFIG_ENV_IS_IN_NAND=y > +CONFIG_BOOTCOUNT_LIMIT=y > CONFIG_DFU_NAND=y > CONFIG_MMC_OMAP_HS=y > CONFIG_NAND=y > diff --git a/configs/rastaban_defconfig b/configs/rastaban_defconfig > index c714b07f34..ce6981e000 100644 > --- a/configs/rastaban_defconfig > +++ b/configs/rastaban_defconfig > @@ -51,6 +51,7 @@ CONFIG_CMD_UBI=y > CONFIG_OF_CONTROL=y > CONFIG_OF_EMBED=y > CONFIG_ENV_IS_IN_NAND=y > +CONFIG_BOOTCOUNT_LIMIT=y > CONFIG_DFU_NAND=y > CONFIG_MMC_OMAP_HS=y > CONFIG_NAND=y > diff --git a/configs/rut_defconfig b/configs/rut_defconfig > index 2269747ec3..b31eb9767c 100644 > --- a/configs/rut_defconfig > +++ b/configs/rut_defconfig > @@ -55,6 +55,7 @@ CONFIG_CMD_UBI=y > CONFIG_OF_CONTROL=y > CONFIG_OF_EMBED=y > CONFIG_ENV_IS_IN_NAND=y > +CONFIG_BOOTCOUNT_LIMIT=y > CONFIG_DFU_NAND=y > CONFIG_MMC_OMAP_HS=y > CONFIG_NAND=y > diff --git a/configs/socfpga_is1_defconfig b/configs/socfpga_is1_defconfig > index b87ebd32ba..7c39178003 100644 > --- a/configs/socfpga_is1_defconfig > +++ b/configs/socfpga_is1_defconfig > @@ -40,6 +40,7 @@ CONFIG_CMD_UBI=y > CONFIG_ENV_IS_IN_SPI_FLASH=y > CONFIG_SPL_DM=y > CONFIG_SPL_DM_SEQ_ALIAS=y > +CONFIG_BOOTCOUNT_LIMIT=y > CONFIG_FPGA_SOCFPGA=y > CONFIG_DM_GPIO=y > CONFIG_DWAPB_GPIO=y > diff --git a/configs/socfpga_sr1500_defconfig b/configs/socfpga_sr1500_defconfig > index 85f28a385e..d27dbc6802 100644 > --- a/configs/socfpga_sr1500_defconfig > +++ b/configs/socfpga_sr1500_defconfig > @@ -44,6 +44,7 @@ CONFIG_CMD_UBI=y > CONFIG_ENV_IS_IN_SPI_FLASH=y > CONFIG_SPL_DM=y > CONFIG_SPL_DM_SEQ_ALIAS=y > +CONFIG_BOOTCOUNT_LIMIT=y > CONFIG_FPGA_SOCFPGA=y > CONFIG_DM_GPIO=y > CONFIG_DWAPB_GPIO=y > diff --git a/configs/suvd3_defconfig b/configs/suvd3_defconfig > index b957ff731e..e1b4665034 100644 > --- a/configs/suvd3_defconfig > +++ b/configs/suvd3_defconfig > @@ -22,6 +22,7 @@ CONFIG_MTDIDS_DEFAULT="nor0=boot" > CONFIG_MTDPARTS_DEFAULT="mtdparts=boot:768k(u-boot),128k(env),128k(envred),-(ubi0);" > CONFIG_CMD_UBI=y > # CONFIG_CMD_UBIFS is not set > +CONFIG_BOOTCOUNT_LIMIT=y > # CONFIG_MMC is not set > CONFIG_MTD_NOR_FLASH=y > # CONFIG_PCI is not set > diff --git a/configs/theadorable_debug_defconfig b/configs/theadorable_debug_defconfig > index f602c839c3..b62645eac7 100644 > --- a/configs/theadorable_debug_defconfig > +++ b/configs/theadorable_debug_defconfig > @@ -43,6 +43,7 @@ CONFIG_EFI_PARTITION=y > CONFIG_NET_RANDOM_ETHADDR=y > CONFIG_SPL_OF_TRANSLATE=y > CONFIG_SATA_MV=y > +CONFIG_BOOTCOUNT_LIMIT=y > CONFIG_FPGA_ALTERA=y > CONFIG_DM_GPIO=y > # CONFIG_MMC is not set > diff --git a/configs/thuban_defconfig b/configs/thuban_defconfig > index df76145d5b..4a3c0cd377 100644 > --- a/configs/thuban_defconfig > +++ b/configs/thuban_defconfig > @@ -51,6 +51,7 @@ CONFIG_CMD_UBI=y > CONFIG_OF_CONTROL=y > CONFIG_OF_EMBED=y > CONFIG_ENV_IS_IN_NAND=y > +CONFIG_BOOTCOUNT_LIMIT=y > CONFIG_DFU_NAND=y > CONFIG_MMC_OMAP_HS=y > CONFIG_NAND=y > diff --git a/configs/tqma6s_wru4_mmc_defconfig b/configs/tqma6s_wru4_mmc_defconfig > index 4cf6693f5c..84d46b1cfd 100644 > --- a/configs/tqma6s_wru4_mmc_defconfig > +++ b/configs/tqma6s_wru4_mmc_defconfig > @@ -31,6 +31,7 @@ CONFIG_CMD_EXT4_WRITE=y > CONFIG_CMD_FAT=y > CONFIG_CMD_FS_GENERIC=y > CONFIG_ENV_IS_IN_MMC=y > +CONFIG_BOOTCOUNT_LIMIT=y > CONFIG_LED_STATUS=y > CONFIG_LED_STATUS0=y > CONFIG_LED_STATUS_BIT=0 > diff --git a/configs/tuge1_defconfig b/configs/tuge1_defconfig > index 82b73d20b5..28c6671aaf 100644 > --- a/configs/tuge1_defconfig > +++ b/configs/tuge1_defconfig > @@ -22,6 +22,7 @@ CONFIG_MTDIDS_DEFAULT="nor0=boot" > CONFIG_MTDPARTS_DEFAULT="mtdparts=boot:768k(u-boot),128k(env),128k(envred),-(ubi0);" > CONFIG_CMD_UBI=y > # CONFIG_CMD_UBIFS is not set > +CONFIG_BOOTCOUNT_LIMIT=y > # CONFIG_MMC is not set > CONFIG_MTD_NOR_FLASH=y > # CONFIG_PCI is not set > diff --git a/configs/tuxx1_defconfig b/configs/tuxx1_defconfig > index 60404fd213..4cc5394f73 100644 > --- a/configs/tuxx1_defconfig > +++ b/configs/tuxx1_defconfig > @@ -22,6 +22,7 @@ CONFIG_MTDIDS_DEFAULT="nor0=boot" > CONFIG_MTDPARTS_DEFAULT="mtdparts=boot:768k(u-boot),128k(env),128k(envred),-(ubi0);" > CONFIG_CMD_UBI=y > # CONFIG_CMD_UBIFS is not set > +CONFIG_BOOTCOUNT_LIMIT=y > # CONFIG_MMC is not set > CONFIG_MTD_NOR_FLASH=y > # CONFIG_PCI is not set > diff --git a/configs/x600_defconfig b/configs/x600_defconfig > index 6b66db49c8..47c9be36a1 100644 > --- a/configs/x600_defconfig > +++ b/configs/x600_defconfig > @@ -36,6 +36,7 @@ CONFIG_MTDIDS_DEFAULT="nand0=nand" > CONFIG_MTDPARTS_DEFAULT="mtdparts=nand:64M(ubi0),64M(ubi1)" > CONFIG_CMD_UBI=y > CONFIG_ENV_IS_IN_FLASH=y > +CONFIG_BOOTCOUNT_LIMIT=y > CONFIG_FPGA_XILINX=y > CONFIG_SYS_I2C_DW=y > # CONFIG_MMC is not set > diff --git a/drivers/bootcount/Kconfig b/drivers/bootcount/Kconfig > index c9d627cce2..cb6be73d52 100644 > --- a/drivers/bootcount/Kconfig > +++ b/drivers/bootcount/Kconfig > @@ -11,6 +11,12 @@ config BOOTCOUNT > number of times the board has booted on a number of different > persistent storage mediums. > > +config BOOTCOUNT_LIMIT > + bool "Enable support for checking boot count limit" > + help > + Enable checking for exceeding the boot count limit. > + More information: http://www.denx.de/wiki/DULG/UBootBootCountLimit > + > if BOOTCOUNT > > config BOOTCOUNT_EXT > diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h > index 31ab503dca..03791deabc 100644 > --- a/include/configs/am335x_evm.h > +++ b/include/configs/am335x_evm.h > @@ -177,7 +177,6 @@ > /* SPL */ > #ifndef CONFIG_NOR_BOOT > /* Bootcount using the RTC block */ > -#define CONFIG_BOOTCOUNT_LIMIT > #define CONFIG_BOOTCOUNT_AM33XX > #define CONFIG_SYS_BOOTCOUNT_BE > > diff --git a/include/configs/am335x_sl50.h b/include/configs/am335x_sl50.h > index b1c7ede7df..1cb3578254 100644 > --- a/include/configs/am335x_sl50.h > +++ b/include/configs/am335x_sl50.h > @@ -74,7 +74,6 @@ > /* SPL */ > > /* Bootcount using the RTC block */ > -#define CONFIG_BOOTCOUNT_LIMIT > #define CONFIG_BOOTCOUNT_AM33XX > #define CONFIG_SYS_BOOTCOUNT_BE > > diff --git a/include/configs/baltos.h b/include/configs/baltos.h > index 75dd0c5e26..440dbf5367 100644 > --- a/include/configs/baltos.h > +++ b/include/configs/baltos.h > @@ -231,7 +231,6 @@ > /* SPL */ > #ifndef CONFIG_NOR_BOOT > /* Bootcount using the RTC block */ > -#define CONFIG_BOOTCOUNT_LIMIT > #define CONFIG_BOOTCOUNT_AM33XX > > /* USB gadget RNDIS */ > diff --git a/include/configs/bav335x.h b/include/configs/bav335x.h > index 930066c149..7bbb7d1300 100644 > --- a/include/configs/bav335x.h > +++ b/include/configs/bav335x.h > @@ -339,7 +339,6 @@ DEFAULT_LINUX_BOOT_ENV \ > /* SPL */ > #ifndef CONFIG_NOR_BOOT > /* Bootcount using the RTC block */ > -#define CONFIG_BOOTCOUNT_LIMIT > #define CONFIG_BOOTCOUNT_AM33XX > #define CONFIG_SYS_BOOTCOUNT_BE > > diff --git a/include/configs/brppt1.h b/include/configs/brppt1.h > index a8022b87d5..fb2845fb5d 100644 > --- a/include/configs/brppt1.h > +++ b/include/configs/brppt1.h > @@ -22,7 +22,6 @@ > > /* Bootcount using the RTC block */ > #define CONFIG_SYS_BOOTCOUNT_ADDR 0x44E3E000 > -#define CONFIG_BOOTCOUNT_LIMIT > #define CONFIG_BOOTCOUNT_AM33XX > > /* memory */ > diff --git a/include/configs/calimain.h b/include/configs/calimain.h > index 4c2f6ba2d5..df807f86ef 100644 > --- a/include/configs/calimain.h > +++ b/include/configs/calimain.h > @@ -278,7 +278,6 @@ > /* initial stack pointer in internal SRAM */ > #define CONFIG_SYS_INIT_SP_ADDR (0x8001ff00) > > -#define CONFIG_BOOTCOUNT_LIMIT > #define CONFIG_SYS_BOOTCOUNT_LE /* Use little-endian accessors */ > #define CONFIG_SYS_BOOTCOUNT_ADDR DAVINCI_RTC_BASE > > diff --git a/include/configs/chiliboard.h b/include/configs/chiliboard.h > index 89740ba1e0..234cd6a4f6 100644 > --- a/include/configs/chiliboard.h > +++ b/include/configs/chiliboard.h > @@ -123,7 +123,6 @@ > > /* SPL */ > /* Bootcount using the RTC block */ > -#define CONFIG_BOOTCOUNT_LIMIT > #define CONFIG_BOOTCOUNT_AM33XX > #define CONFIG_SYS_BOOTCOUNT_BE > > diff --git a/include/configs/cm_t335.h b/include/configs/cm_t335.h > index d6ebdcd600..bd41a56641 100644 > --- a/include/configs/cm_t335.h > +++ b/include/configs/cm_t335.h > @@ -16,7 +16,6 @@ > #include <configs/ti_am335x_common.h> > > #undef CONFIG_SPI > -#undef CONFIG_BOOTCOUNT_LIMIT > #undef CONFIG_SPL_AM33XX_ENABLE_RTC32K_OSC > > #undef CONFIG_MAX_RAM_BANK_SIZE > diff --git a/include/configs/dh_imx6.h b/include/configs/dh_imx6.h > index 7cda878ac7..c89641d67e 100644 > --- a/include/configs/dh_imx6.h > +++ b/include/configs/dh_imx6.h > @@ -47,7 +47,6 @@ > #define CONFIG_SYS_MALLOC_LEN (4 * SZ_1M) > > /* Bootcounter */ > -#define CONFIG_BOOTCOUNT_LIMIT > #define CONFIG_SYS_BOOTCOUNT_ADDR IRAM_BASE_ADDR > #define CONFIG_SYS_BOOTCOUNT_BE > > diff --git a/include/configs/ge_bx50v3.h b/include/configs/ge_bx50v3.h > index b6808dfb23..178af17982 100644 > --- a/include/configs/ge_bx50v3.h > +++ b/include/configs/ge_bx50v3.h > @@ -269,7 +269,6 @@ > > #define CONFIG_BCH > > -#define CONFIG_BOOTCOUNT_LIMIT > #define CONFIG_BOOTCOUNT_EXT > #define CONFIG_SYS_BOOTCOUNT_EXT_INTERFACE "mmc" > #define CONFIG_SYS_BOOTCOUNT_EXT_DEVPART "1:5" > diff --git a/include/configs/highbank.h b/include/configs/highbank.h > index 726ae8a214..2831aa3875 100644 > --- a/include/configs/highbank.h > +++ b/include/configs/highbank.h > @@ -26,7 +26,6 @@ > #define CONFIG_PL01x_PORTS { (void *)(0xFFF36000) } > #define CONFIG_CONS_INDEX 0 > > -#define CONFIG_BOOTCOUNT_LIMIT > #define CONFIG_SYS_BOOTCOUNT_SINGLEWORD > #define CONFIG_SYS_BOOTCOUNT_LE /* Use little-endian accessors */ > #define CONFIG_SYS_BOOTCOUNT_ADDR 0xfff3cf0c > diff --git a/include/configs/ids8313.h b/include/configs/ids8313.h > index 12eb07d1f7..529cbf16ba 100644 > --- a/include/configs/ids8313.h > +++ b/include/configs/ids8313.h > @@ -516,7 +516,6 @@ > #define CONFIG_MTD_PARTITIONS > > /* bootcount support */ > -#define CONFIG_BOOTCOUNT_LIMIT > #define CONFIG_BOOTCOUNT_I2C > #define CONFIG_BOOTCOUNT_ALEN 1 > #define CONFIG_SYS_BOOTCOUNT_ADDR 0x9 > diff --git a/include/configs/km/keymile-common.h b/include/configs/km/keymile-common.h > index 4d9a133dd4..740202b69b 100644 > --- a/include/configs/km/keymile-common.h > +++ b/include/configs/km/keymile-common.h > @@ -8,8 +8,6 @@ > #ifndef __CONFIG_KEYMILE_H > #define __CONFIG_KEYMILE_H > > -#define CONFIG_BOOTCOUNT_LIMIT > - > #undef CONFIG_WATCHDOG /* disable platform specific watchdog */ > > /* > diff --git a/include/configs/km/km-powerpc.h b/include/configs/km/km-powerpc.h > index 0d50538a8e..64c1d2ff7e 100644 > --- a/include/configs/km/km-powerpc.h > +++ b/include/configs/km/km-powerpc.h > @@ -12,8 +12,6 @@ > #define CONFIG_BOARD_EARLY_INIT_R > #define CONFIG_LAST_STAGE_INIT > > -#define CONFIG_BOOTCOUNT_LIMIT > - > #define CONFIG_JFFS2_CMDLINE > > /* standard km ethernet_present for piggy */ > diff --git a/include/configs/km/kmp204x-common.h b/include/configs/km/kmp204x-common.h > index a0c932a2fa..fd9391d928 100644 > --- a/include/configs/km/kmp204x-common.h > +++ b/include/configs/km/kmp204x-common.h > @@ -191,7 +191,6 @@ unsigned long get_board_sys_clk(unsigned long dummy); > #define CONFIG_SYS_OR1_PRELIM CONFIG_SYS_QRIO_OR_PRELIM /* QRIO Options */ > > /* bootcounter in QRIO */ > -#define CONFIG_BOOTCOUNT_LIMIT > #define CONFIG_SYS_BOOTCOUNT_ADDR (CONFIG_SYS_QRIO_BASE + 0x20) > > #define CONFIG_BOARD_EARLY_INIT_R /* call board_early_init_r function */ > diff --git a/include/configs/mx53ppd.h b/include/configs/mx53ppd.h > index 05c3d529af..e0e846dc07 100644 > --- a/include/configs/mx53ppd.h > +++ b/include/configs/mx53ppd.h > @@ -233,8 +233,6 @@ > > #define CONFIG_BCH > > -#define CONFIG_BOOTCOUNT_LIMIT > - > /* Backlight Control */ > #define CONFIG_PWM_IMX > #define CONFIG_IMX6_PWM_PER_CLK 66666000 > diff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h > index 44c85cd7fa..eb4b1f6332 100644 > --- a/include/configs/siemens-am33x-common.h > +++ b/include/configs/siemens-am33x-common.h > @@ -500,7 +500,6 @@ > #define CONFIG_RESET_TO_RETRY > #define CONFIG_BOOT_RETRY_TIME 60 > > -#define CONFIG_BOOTCOUNT_LIMIT > #define CONFIG_BOOTCOUNT_ENV > > #endif /* ! __CONFIG_SIEMENS_AM33X_COMMON_H */ > diff --git a/include/configs/socfpga_is1.h b/include/configs/socfpga_is1.h > index 46f5f135dd..883ffb76f3 100644 > --- a/include/configs/socfpga_is1.h > +++ b/include/configs/socfpga_is1.h > @@ -32,7 +32,6 @@ > /* > * Bootcounter > */ > -#define CONFIG_BOOTCOUNT_LIMIT > /* last 2 lwords in OCRAM */ > #define CONFIG_SYS_BOOTCOUNT_ADDR 0xfffffff8 > #define CONFIG_SYS_BOOTCOUNT_BE > diff --git a/include/configs/socfpga_sr1500.h b/include/configs/socfpga_sr1500.h > index 39bf612291..8c9069c923 100644 > --- a/include/configs/socfpga_sr1500.h > +++ b/include/configs/socfpga_sr1500.h > @@ -31,7 +31,6 @@ > /* > * Bootcounter > */ > -#define CONFIG_BOOTCOUNT_LIMIT > /* last 2 lwords in OCRAM */ > #define CONFIG_SYS_BOOTCOUNT_ADDR 0xfffffff8 > #define CONFIG_SYS_BOOTCOUNT_BE > diff --git a/include/configs/theadorable.h b/include/configs/theadorable.h > index 438abf10cc..ec9dc2e74a 100644 > --- a/include/configs/theadorable.h > +++ b/include/configs/theadorable.h > @@ -83,7 +83,6 @@ > /* > * Bootcounter > */ > -#define CONFIG_BOOTCOUNT_LIMIT > #define CONFIG_BOOTCOUNT_RAM > /* Max size of RAM minus BOOTCOUNT_ADDR is the bootcounter address */ > #define BOOTCOUNT_ADDR 0x1000 > diff --git a/include/configs/tqma6_wru4.h b/include/configs/tqma6_wru4.h > index 4e99cdbb59..a388c57ad4 100644 > --- a/include/configs/tqma6_wru4.h > +++ b/include/configs/tqma6_wru4.h > @@ -34,7 +34,6 @@ > /* LED */ > > /* Bootcounter */ > -#define CONFIG_BOOTCOUNT_LIMIT > #define CONFIG_SYS_BOOTCOUNT_ADDR IRAM_BASE_ADDR > #define CONFIG_SYS_BOOTCOUNT_BE > > diff --git a/include/configs/x600.h b/include/configs/x600.h > index e18b38902b..567d3bfa1d 100644 > --- a/include/configs/x600.h > +++ b/include/configs/x600.h > @@ -121,7 +121,6 @@ > #define CONFIG_SYS_LOAD_ADDR 0x00800000 > > /* Use last 2 lwords in internal SRAM for bootcounter */ > -#define CONFIG_BOOTCOUNT_LIMIT > #define CONFIG_SYS_BOOTCOUNT_ADDR (CONFIG_SRAM_BASE + \ > CONFIG_SRAM_SIZE) > Tested-by: Alex Kiernan <alex.kiernan@gmail.com> -- Alex Kiernan ^ permalink raw reply [flat|nested] 9+ messages in thread
* [U-Boot] Antwort: [PATCH 1/2] Convert CONFIG_BOOTCOUNT_LIMIT to Kconfig 2018-02-09 22:50 [U-Boot] [PATCH 1/2] Convert CONFIG_BOOTCOUNT_LIMIT to Kconfig Lukasz Majewski 2018-02-10 6:18 ` Alex Kiernan 2018-02-11 19:23 ` Alex Kiernan @ 2018-02-12 7:56 ` Hannes Schmelzer 2018-02-15 15:09 ` [U-Boot] [U-Boot, " Tom Rini 3 siblings, 0 replies; 9+ messages in thread From: Hannes Schmelzer @ 2018-02-12 7:56 UTC (permalink / raw) To: u-boot > > This converts the following to Kconfig: > CONFIG_BOOTCOUNT_LIMIT > > Signed-off-by: Lukasz Majewski <lukma@denx.de> > --- > > configs/brppt1_mmc_defconfig | 1 + > configs/brppt1_nand_defconfig | 1 + > configs/brppt1_spi_defconfig | 1 + > include/configs/brppt1.h | 1 - for the brppt1 files: Reviewed-by: Hannes Schmelzer <hannes.schmelzer@br-automation.com> Acked-by: Hannes Schmelzer <hannes.schmelzer@br-automation.com> ^ permalink raw reply [flat|nested] 9+ messages in thread
* [U-Boot] [U-Boot, 1/2] Convert CONFIG_BOOTCOUNT_LIMIT to Kconfig 2018-02-09 22:50 [U-Boot] [PATCH 1/2] Convert CONFIG_BOOTCOUNT_LIMIT to Kconfig Lukasz Majewski ` (2 preceding siblings ...) 2018-02-12 7:56 ` [U-Boot] Antwort: " Hannes Schmelzer @ 2018-02-15 15:09 ` Tom Rini 3 siblings, 0 replies; 9+ messages in thread From: Tom Rini @ 2018-02-15 15:09 UTC (permalink / raw) To: u-boot On Fri, Feb 09, 2018 at 11:50:57PM +0100, Lukasz Majewski wrote: > This converts the following to Kconfig: > CONFIG_BOOTCOUNT_LIMIT > > Signed-off-by: Lukasz Majewski <lukma@denx.de> > Tested-by: Alex Kiernan <alex.kiernan@gmail.com> > Reviewed-by: Hannes Schmelzer <hannes.schmelzer@br-automation.com> > Acked-by: Hannes Schmelzer <hannes.schmelzer@br-automation.com> Applied to u-boot/master, thanks! -- Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 819 bytes Desc: not available URL: <http://lists.denx.de/pipermail/u-boot/attachments/20180215/19386f6f/attachment-0001.sig> ^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2018-02-15 15:09 UTC | newest] Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2018-02-09 22:50 [U-Boot] [PATCH 1/2] Convert CONFIG_BOOTCOUNT_LIMIT to Kconfig Lukasz Majewski 2018-02-10 6:18 ` Alex Kiernan 2018-02-10 10:01 ` Lukasz Majewski 2018-02-10 12:21 ` Alex Kiernan 2018-02-10 18:15 ` Lukasz Majewski 2018-02-10 20:53 ` Alex Kiernan 2018-02-11 19:23 ` Alex Kiernan 2018-02-12 7:56 ` [U-Boot] Antwort: " Hannes Schmelzer 2018-02-15 15:09 ` [U-Boot] [U-Boot, " Tom Rini
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.