Convert CONFIG_BOOTCOUNT_LIMIT to Kconfig
PATCH 1/2 Convert CONFIG_BOOTCOUNT_LIMIT to Kconfig
This converts the following to Kconfig:
CONFIG_BOOTCOUNT_LIMIT
---
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(-)
README +0 -10
@@ -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
configs/am335x_baltos_defconfig +1 -0
@@ -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
configs/am335x_boneblack_defconfig +1 -0
@@ -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
configs/am335x_boneblack_vboot_defconfig +1 -0
@@ -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
configs/am335x_evm_defconfig +1 -0
@@ -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
configs/am335x_evm_nor_defconfig +1 -0
@@ -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
configs/am335x_evm_spiboot_defconfig +1 -0
@@ -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
configs/am335x_evm_usbspl_defconfig +1 -0
@@ -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
configs/am335x_hs_evm_defconfig +1 -0
@@ -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
configs/am335x_hs_evm_uart_defconfig +1 -0
@@ -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
configs/am335x_sl50_defconfig +1 -0
@@ -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
configs/birdland_bav335a_defconfig +1 -0
@@ -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
configs/birdland_bav335b_defconfig +1 -0
@@ -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
configs/brppt1_mmc_defconfig +1 -0
@@ -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
configs/brppt1_nand_defconfig +1 -0
@@ -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
configs/brppt1_spi_defconfig +1 -0
@@ -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
configs/calimain_defconfig +1 -0
@@ -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
configs/chiliboard_defconfig +1 -0
@@ -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
configs/dh_imx6_defconfig +1 -0
@@ -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
configs/draco_defconfig +1 -0
@@ -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
configs/etamin_defconfig +1 -0
@@ -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
configs/ge_b450v3_defconfig +1 -0
@@ -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
configs/ge_b650v3_defconfig +1 -0
@@ -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
configs/ge_b850v3_defconfig +1 -0
@@ -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
configs/highbank_defconfig +1 -0
@@ -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
configs/ids8313_defconfig +1 -0
@@ -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
configs/km_kirkwood_128m16_defconfig +1 -0
@@ -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
configs/km_kirkwood_defconfig +1 -0
@@ -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
configs/km_kirkwood_pci_defconfig +1 -0
@@ -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
configs/kmcoge4_defconfig +1 -0
@@ -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
configs/kmcoge5ne_defconfig +1 -0
@@ -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
configs/kmcoge5un_defconfig +1 -0
@@ -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
configs/kmeter1_defconfig +1 -0
@@ -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
configs/kmlion1_defconfig +1 -0
@@ -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
configs/kmnusa_defconfig +1 -0
@@ -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
configs/kmopti2_defconfig +1 -0
@@ -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
configs/kmsugp1_defconfig +1 -0
@@ -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
configs/kmsupx5_defconfig +1 -0
@@ -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
configs/kmsuv31_defconfig +1 -0
@@ -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
configs/kmtegr1_defconfig +1 -0
@@ -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
configs/kmtepr2_defconfig +1 -0
@@ -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
configs/kmvect1_defconfig +1 -0
@@ -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
configs/mgcoge3un_defconfig +1 -0
@@ -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
configs/mx53ppd_defconfig +1 -0
@@ -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
configs/portl2_defconfig +1 -0
@@ -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
configs/pxm2_defconfig +1 -0
@@ -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
configs/rastaban_defconfig +1 -0
@@ -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
configs/rut_defconfig +1 -0
@@ -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
configs/socfpga_is1_defconfig +1 -0
@@ -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
configs/socfpga_sr1500_defconfig +1 -0
@@ -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
configs/suvd3_defconfig +1 -0
@@ -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
configs/theadorable_debug_defconfig +1 -0
@@ -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
configs/thuban_defconfig +1 -0
@@ -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
configs/tqma6s_wru4_mmc_defconfig +1 -0
@@ -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
configs/tuge1_defconfig +1 -0
@@ -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
configs/tuxx1_defconfig +1 -0
@@ -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
configs/x600_defconfig +1 -0
@@ -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
drivers/bootcount/Kconfig +6 -0
@@ -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
include/configs/am335x_evm.h +0 -1
@@ -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
include/configs/am335x_sl50.h +0 -1
@@ -74,7 +74,6 @@/* SPL */ /* Bootcount using the RTC block */ -#define CONFIG_BOOTCOUNT_LIMIT #define CONFIG_BOOTCOUNT_AM33XX #define CONFIG_SYS_BOOTCOUNT_BE
include/configs/baltos.h +0 -1
@@ -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 */
include/configs/bav335x.h +0 -1
@@ -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
include/configs/brppt1.h +0 -1
@@ -22,7 +22,6 @@/* Bootcount using the RTC block */ #define CONFIG_SYS_BOOTCOUNT_ADDR 0x44E3E000 -#define CONFIG_BOOTCOUNT_LIMIT #define CONFIG_BOOTCOUNT_AM33XX /* memory */
include/configs/calimain.h +0 -1
@@ -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
include/configs/chiliboard.h +0 -1
@@ -123,7 +123,6 @@/* SPL */ /* Bootcount using the RTC block */ -#define CONFIG_BOOTCOUNT_LIMIT #define CONFIG_BOOTCOUNT_AM33XX #define CONFIG_SYS_BOOTCOUNT_BE
include/configs/cm_t335.h +0 -1
@@ -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
include/configs/dh_imx6.h +0 -1
@@ -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
include/configs/ge_bx50v3.h +0 -1
@@ -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"
include/configs/highbank.h +0 -1
@@ -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
include/configs/ids8313.h +0 -1
@@ -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
include/configs/km/keymile-common.h +0 -2
@@ -8,8 +8,6 @@#ifndef __CONFIG_KEYMILE_H#define __CONFIG_KEYMILE_H -#define CONFIG_BOOTCOUNT_LIMIT -#undef CONFIG_WATCHDOG/* disable platform specific watchdog */ /*
include/configs/km/km-powerpc.h +0 -2
@@ -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 */
include/configs/km/kmp204x-common.h +0 -1
@@ -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 */
include/configs/mx53ppd.h +0 -2
@@ -233,8 +233,6 @@#define CONFIG_BCH -#define CONFIG_BOOTCOUNT_LIMIT -/* Backlight Control */ #define CONFIG_PWM_IMX #define CONFIG_IMX6_PWM_PER_CLK 66666000
include/configs/siemens-am33x-common.h +0 -1
@@ -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 */
include/configs/socfpga_is1.h +0 -1
@@ -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
include/configs/socfpga_sr1500.h +0 -1
@@ -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
include/configs/theadorable.h +0 -1
@@ -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
include/configs/tqma6_wru4.h +0 -1
@@ -34,7 +34,6 @@/* LED */ /* Bootcounter */ -#define CONFIG_BOOTCOUNT_LIMIT #define CONFIG_SYS_BOOTCOUNT_ADDR IRAM_BASE_ADDR#define CONFIG_SYS_BOOTCOUNT_BE
include/configs/x600.h +0 -1
@@ -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)
Signature · 1 line
2.11.0
PATCH 1/2 Convert CONFIG_BOOTCOUNT_LIMIT to Kconfig
Quoted 12 lines · Lukasz Majewski
configs/mx53ppd_defconfig +1
-0@@ -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
...
Quoted 7 lines
drivers/bootcount/Kconfig +0
-0@@ -11,6 +11,12 @@ config BOOTCOUNT number of times the board has booted on a number of different persistent storage mediums.
drivers/bootcount/Kconfig config BOOTCOUNT · line 22
Quoted 10 lines
drivers/bootcount/Kconfig +6
-0+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?
Signature · 1 line
Alex Kiernan
PATCH 1/2 Convert CONFIG_BOOTCOUNT_LIMIT to Kconfig
Hi Alex,
Quoted 33 lines
Quoted 12 lines · Lukasz Majewski
configs/mx53ppd_defconfig +1
-0@@ -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...
Quoted 16 lines
drivers/bootcount/Kconfig +0
-0@@ -11,6 +11,12 @@ config BOOTCOUNT number of times the board has booted on a number ofdifferent persistent storage mediums.
drivers/bootcount/Kconfig +5
-0+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
Quoted 3 lines
Quoted 1 line
config
BOOTCOUNT_EXTCan't
CONFIG_BOOTCOUNTandCONFIG_BOOTCOUNT_LIMITbe merged?
This patch was mostly generated by moveconfig utility.
Quoted 9 lines
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_BOOTCOUNTset,
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).
Quoted 2 lines
BOOTCOUNT is just used within
Kconfig, not actually consumed either by aMakefileor any piece of code and should probably go?
Yes. It could be replaced with CONFIG_BOOTCOUNT_LIMIT.
Quoted 1 line
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>
PATCH 1/2 Convert CONFIG_BOOTCOUNT_LIMIT to Kconfig
Quoted 35 lines · Lukasz Majewski
Hi Alex,
Quoted 33 lines
Quoted 12 lines · Lukasz Majewski
configs/mx53ppd_defconfig +1
-0@@ -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...
Quoted 16 lines
drivers/bootcount/Kconfig +0
-0@@ -11,6 +11,12 @@ config BOOTCOUNT number of times the board has booted on a number ofdifferent persistent storage mediums.
drivers/bootcount/Kconfig +5
-0+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
Quoted 6 lines
Quoted 3 lines
Quoted 1 line
config
BOOTCOUNT_EXTCan't
CONFIG_BOOTCOUNTandCONFIG_BOOTCOUNT_LIMITbe merged?This patch was mostly generated by moveconfig utility.
Yeah, I've a similar patch series where I'd done the same thing.
Quoted 11 lines
Quoted 10 lines
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_BOOTCOUNTset,
Quoted 9 lines
I would use pragmatic approach here - leave this patch as is, and prepare next one on top of it to replace
CONFIG_BOOTCOUNTwithCONFIG_BOOTCOUNT_LIMIT(as the last one is used in many places).Quoted 2 lines
BOOTCOUNT is just used within
Kconfig, not actually consumed either by aMakefileor 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.
Signature · 1 line
Alex Kiernan
PATCH 1/2 Convert CONFIG_BOOTCOUNT_LIMIT to Kconfig
Hi Alex,
Quoted 37 lines
Quoted 35 lines · Lukasz Majewski
Hi Alex,
Quoted 33 lines
Quoted 12 lines · Lukasz Majewski
(quoted diff) +0
-0b/configs/mx53ppd_defconfig index
3fbca2a08c..b83cf72022100644configs/mx53ppd_defconfig +1
-0@@ -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...
Quoted 16 lines
(quoted diff) +0
-0b/drivers/bootcount/Kconfig index
c9d627cce2..cb6be73d52100644drivers/bootcount/Kconfig +0
-0@@ -11,6 +11,12 @@ config BOOTCOUNT number of times the board has booted on a number ofdifferent persistent storage mediums.
drivers/bootcount/Kconfig +5
-0+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
Quoted 8 lines
Quoted 6 lines
Quoted 3 lines
Quoted 1 line
config
BOOTCOUNT_EXTCan't
CONFIG_BOOTCOUNTandCONFIG_BOOTCOUNT_LIMITbe 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 :/
Quoted 16 lines
Quoted 16 lines
Quoted 11 lines
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_BOOTCOUNTset,I would use pragmatic approach here - leave this patch as is, and prepare next one on top of it to replace
CONFIG_BOOTCOUNTwithCONFIG_BOOTCOUNT_LIMIT(as the last one is used in many places).
Quoted 8 lines
Quoted 5 lines
Quoted 2 lines
BOOTCOUNT is just used within
Kconfig, not actually consumed either by aMakefileor 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.
Quoted 3 lines
I also worked through all the drivers, and made
bootlimit configurable fromKconfig. 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>
PATCH 1/2 Convert CONFIG_BOOTCOUNT_LIMIT to Kconfig
Quoted 9 lines
Quoted 3 lines
I also worked through all the drivers, and made
bootlimit configurable fromKconfig. 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_BOOTCOUNTwithCONFIG_BOOTCOUNT_LIMIT?Or even better, place such patch on top of this series?
Yes of course... just trying to pick it apart sensibly.
Signature · 1 line
Alex Kiernan
PATCH 1/2 Convert CONFIG_BOOTCOUNT_LIMIT to Kconfig
In reply to Lukasz MajewskiQuoted 1,065 lines · Lukasz Majewski
This converts the following to
Kconfig:
CONFIG_BOOTCOUNT_LIMITSigned-off-by Lukasz Majewski <[email protected]>---
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(-)README +0
-10@@ -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_DA8XXconfigs/am335x_baltos_defconfig +1
-0@@ -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=yconfigs/am335x_boneblack_defconfig +1
-0@@ -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=yconfigs/am335x_boneblack_vboot_defconfig +1
-0@@ -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=yconfigs/am335x_evm_defconfig +1
-0@@ -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=yconfigs/am335x_evm_nor_defconfig +1
-0@@ -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=yconfigs/am335x_evm_spiboot_defconfig +1
-0@@ -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=yconfigs/am335x_evm_usbspl_defconfig +1
-0@@ -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=yconfigs/am335x_hs_evm_defconfig +1
-0@@ -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=yconfigs/am335x_hs_evm_uart_defconfig +1
-0@@ -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=yconfigs/am335x_sl50_defconfig +1
-0@@ -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=yconfigs/birdland_bav335a_defconfig +1
-0@@ -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=yconfigs/birdland_bav335b_defconfig +1
-0@@ -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=yconfigs/brppt1_mmc_defconfig +1
-0@@ -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=yconfigs/brppt1_nand_defconfig +1
-0@@ -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=yconfigs/brppt1_spi_defconfig +1
-0@@ -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=yconfigs/calimain_defconfig +1
-0@@ -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=yconfigs/chiliboard_defconfig +1
-0@@ -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=yconfigs/dh_imx6_defconfig +1
-0@@ -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=yconfigs/draco_defconfig +1
-0@@ -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=yconfigs/etamin_defconfig +1
-0@@ -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=yconfigs/ge_b450v3_defconfig +1
-0@@ -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=yconfigs/ge_b650v3_defconfig +1
-0@@ -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=yconfigs/ge_b850v3_defconfig +1
-0@@ -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=yconfigs/highbank_defconfig +1
-0@@ -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=yconfigs/ids8313_defconfig +1
-0@@ -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=yconfigs/km_kirkwood_128m16_defconfig +1
-0@@ -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=yconfigs/km_kirkwood_defconfig +1
-0@@ -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=yconfigs/km_kirkwood_pci_defconfig +1
-0@@ -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=yconfigs/kmcoge4_defconfig +1
-0@@ -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=yconfigs/kmcoge5ne_defconfig +1
-0@@ -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 setconfigs/kmcoge5un_defconfig +1
-0@@ -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=yconfigs/kmeter1_defconfig +1
-0@@ -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 setconfigs/kmlion1_defconfig +1
-0@@ -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=yconfigs/kmnusa_defconfig +1
-0@@ -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=yconfigs/kmopti2_defconfig +1
-0@@ -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 setconfigs/kmsugp1_defconfig +1
-0@@ -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=yconfigs/kmsupx5_defconfig +1
-0@@ -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 setconfigs/kmsuv31_defconfig +1
-0@@ -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=yconfigs/kmtegr1_defconfig +1
-0@@ -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 setconfigs/kmtepr2_defconfig +1
-0@@ -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 setconfigs/kmvect1_defconfig +1
-0@@ -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 setconfigs/mgcoge3un_defconfig +1
-0@@ -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=yconfigs/mx53ppd_defconfig +1
-0@@ -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=yconfigs/portl2_defconfig +1
-0@@ -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=yconfigs/pxm2_defconfig +1
-0@@ -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=yconfigs/rastaban_defconfig +1
-0@@ -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=yconfigs/rut_defconfig +1
-0@@ -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=yconfigs/socfpga_is1_defconfig +1
-0@@ -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=yconfigs/socfpga_sr1500_defconfig +1
-0@@ -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=yconfigs/suvd3_defconfig +1
-0@@ -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 setconfigs/theadorable_debug_defconfig +1
-0@@ -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 setconfigs/thuban_defconfig +1
-0@@ -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=yconfigs/tqma6s_wru4_mmc_defconfig +1
-0@@ -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=0configs/tuge1_defconfig +1
-0@@ -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 setconfigs/tuxx1_defconfig +1
-0@@ -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 setconfigs/x600_defconfig +1
-0@@ -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 setdrivers/bootcount/Kconfig +6
-0@@ -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_EXTinclude/configs/am335x_evm.h +0
-1@@ -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 include/configs/am335x_sl50.h +0
-1@@ -74,7 +74,6 @@/* SPL */ /* Bootcount using the RTC block */ -#define CONFIG_BOOTCOUNT_LIMIT #define CONFIG_BOOTCOUNT_AM33XX #define CONFIG_SYS_BOOTCOUNT_BE include/configs/baltos.h +0
-1@@ -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 */ include/configs/bav335x.h +0
-1@@ -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 include/configs/brppt1.h +0
-1@@ -22,7 +22,6 @@/* Bootcount using the RTC block */ #define CONFIG_SYS_BOOTCOUNT_ADDR 0x44E3E000 -#define CONFIG_BOOTCOUNT_LIMIT #define CONFIG_BOOTCOUNT_AM33XX /* memory */ include/configs/calimain.h +0
-1@@ -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_BASEinclude/configs/chiliboard.h +0
-1@@ -123,7 +123,6 @@/* SPL */ /* Bootcount using the RTC block */ -#define CONFIG_BOOTCOUNT_LIMIT #define CONFIG_BOOTCOUNT_AM33XX #define CONFIG_SYS_BOOTCOUNT_BE include/configs/cm_t335.h +0
-1@@ -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_SIZEinclude/configs/dh_imx6.h +0
-1@@ -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 include/configs/ge_bx50v3.h +0
-1@@ -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"include/configs/highbank.h +0
-1@@ -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 0xfff3cf0cinclude/configs/ids8313.h +0
-1@@ -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 0x9include/configs/km/keymile-common.h +0
-2@@ -8,8 +8,6 @@#ifndef __CONFIG_KEYMILE_H#define __CONFIG_KEYMILE_H -#define CONFIG_BOOTCOUNT_LIMIT -#undef CONFIG_WATCHDOG/* disable platform specific watchdog */ /* include/configs/km/km-powerpc.h +0
-2@@ -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 */ include/configs/km/kmp204x-common.h +0
-1@@ -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 */ include/configs/mx53ppd.h +0
-2@@ -233,8 +233,6 @@#define CONFIG_BCH -#define CONFIG_BOOTCOUNT_LIMIT -/* Backlight Control */ #define CONFIG_PWM_IMX #define CONFIG_IMX6_PWM_PER_CLK 66666000include/configs/siemens-am33x-common.h +0
-1@@ -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 */ include/configs/socfpga_is1.h +0
-1@@ -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 include/configs/socfpga_sr1500.h +0
-1@@ -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 include/configs/theadorable.h +0
-1@@ -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 0x1000include/configs/tqma6_wru4.h +0
-1@@ -34,7 +34,6 @@/* LED */ /* Bootcounter */ -#define CONFIG_BOOTCOUNT_LIMIT #define CONFIG_SYS_BOOTCOUNT_ADDR IRAM_BASE_ADDR#define CONFIG_SYS_BOOTCOUNT_BE include/configs/x600.h +0
-0
include/configs/x600.h line 126
Quoted 7 lines
include/configs/x600.h +0
-1@@ -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)
Signature · 1 line
Alex Kiernan
[U-Boot] Antwort: [PATCH 1/2] Convert CONFIG_BOOTCOUNT_LIMIT to Kconfig
In reply to Lukasz MajewskiQuoted 11 lines
This converts the following to
Kconfig:
CONFIG_BOOTCOUNT_LIMITSigned-off-by Lukasz Majewski <[email protected]>---
configs/brppt1_mmc_defconfig | 1 + configs/brppt1_nand_defconfig | 1 + configs/brppt1_spi_defconfig | 1 + include/configs/brppt1.h | 1 -
for the brppt1 files:
PATCH 1/2 Convert CONFIG_BOOTCOUNT_LIMIT to Kconfig
In reply to Lukasz MajewskiQuoted 7 lines · Lukasz Majewski
This converts the following to
Kconfig:
CONFIG_BOOTCOUNT_LIMITSigned-off-by Lukasz Majewski <[email protected]>Tested-by Alex Kiernan <[email protected]>Reviewed-by Hannes Schmelzer <[email protected]>Acked-by Hannes Schmelzer <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
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>