diff options
author | Tom Rini <trini@konsulko.com> | 2022-07-23 13:04:55 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2022-08-04 16:18:47 -0400 |
commit | b72713dc0bb76a7629dab3746694633089e51339 (patch) | |
tree | 0e07a957e795965beecf3ef0ae42b768698275be /include | |
parent | 52938fc4f0ba06e030aa17bca4f72623ed709c7a (diff) | |
download | u-boot-b72713dc0bb76a7629dab3746694633089e51339.tar.gz |
Convert CONFIG_SYS_FLASH_EMPTY_INFO to Kconfig
This converts the following to Kconfig:
CONFIG_SYS_FLASH_EMPTY_INFO
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'include')
37 files changed, 0 insertions, 40 deletions
diff --git a/include/configs/MPC837XERDB.h b/include/configs/MPC837XERDB.h index d56d60306ab..67a6cfd1ed0 100644 --- a/include/configs/MPC837XERDB.h +++ b/include/configs/MPC837XERDB.h @@ -141,8 +141,6 @@ #define CONFIG_SYS_FLASH_BASE 0xFE000000 /* FLASH base address */ #define CONFIG_SYS_FLASH_SIZE 8 /* max FLASH size is 32M */ -#define CONFIG_SYS_FLASH_EMPTY_INFO /* display empty sectors */ - #define CONFIG_SYS_MAX_FLASH_SECT 256 /* max sectors per device */ diff --git a/include/configs/MPC8548CDS.h b/include/configs/MPC8548CDS.h index c3c68071f2f..4c33188c500 100644 --- a/include/configs/MPC8548CDS.h +++ b/include/configs/MPC8548CDS.h @@ -129,8 +129,6 @@ #define CONFIG_SYS_FLASH_ERASE_TOUT 60000 /* Flash Erase Timeout (ms) */ #define CONFIG_SYS_FLASH_WRITE_TOUT 500 /* Flash Write Timeout (ms) */ -#define CONFIG_SYS_FLASH_EMPTY_INFO - #define CONFIG_HWCONFIG /* enable hwconfig */ /* diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h index 12a78eac17c..fbba1f05318 100644 --- a/include/configs/P1010RDB.h +++ b/include/configs/P1010RDB.h @@ -208,7 +208,6 @@ extern unsigned long get_sdram_size(void); #define CONFIG_SYS_FLASH_WRITE_TOUT 500 /* Flash Write Timeout (ms) */ /* CFI for NOR Flash */ -#define CONFIG_SYS_FLASH_EMPTY_INFO /* NAND Flash on IFC */ #define CONFIG_SYS_NAND_BASE 0xff800000 diff --git a/include/configs/P2041RDB.h b/include/configs/P2041RDB.h index 2d552835b77..3a3f1d30612 100644 --- a/include/configs/P2041RDB.h +++ b/include/configs/P2041RDB.h @@ -155,7 +155,6 @@ | OR_FCM_EHTR) #endif /* CONFIG_NAND_FSL_ELBC */ -#define CONFIG_SYS_FLASH_EMPTY_INFO #define CONFIG_SYS_FLASH_BANKS_LIST {CONFIG_SYS_FLASH_BASE_PHYS + 0x8000000} #define CONFIG_HWCONFIG diff --git a/include/configs/T102xRDB.h b/include/configs/T102xRDB.h index c90ffe048c6..6e7f0bcd52e 100644 --- a/include/configs/T102xRDB.h +++ b/include/configs/T102xRDB.h @@ -172,7 +172,6 @@ #define CONFIG_SYS_FLASH_ERASE_TOUT 60000 /* Flash Erase Timeout (ms) */ #define CONFIG_SYS_FLASH_WRITE_TOUT 500 /* Flash Write Timeout (ms) */ -#define CONFIG_SYS_FLASH_EMPTY_INFO #define CONFIG_SYS_FLASH_BANKS_LIST {CONFIG_SYS_FLASH_BASE_PHYS} #ifdef CONFIG_TARGET_T1024RDB diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h index 56486cf5c93..140b3074784 100644 --- a/include/configs/T104xRDB.h +++ b/include/configs/T104xRDB.h @@ -134,7 +134,6 @@ #define CONFIG_SYS_FLASH_ERASE_TOUT 60000 /* Flash Erase Timeout (ms) */ #define CONFIG_SYS_FLASH_WRITE_TOUT 500 /* Flash Write Timeout (ms) */ -#define CONFIG_SYS_FLASH_EMPTY_INFO #define CONFIG_SYS_FLASH_BANKS_LIST {CONFIG_SYS_FLASH_BASE_PHYS} /* CPLD on IFC */ diff --git a/include/configs/T208xQDS.h b/include/configs/T208xQDS.h index 710254a8fb4..53f62837c66 100644 --- a/include/configs/T208xQDS.h +++ b/include/configs/T208xQDS.h @@ -137,7 +137,6 @@ #define CONFIG_SYS_FLASH_ERASE_TOUT 60000 /* Flash Erase Timeout (ms) */ #define CONFIG_SYS_FLASH_WRITE_TOUT 500 /* Flash Write Timeout (ms) */ -#define CONFIG_SYS_FLASH_EMPTY_INFO #define CONFIG_SYS_FLASH_BANKS_LIST {CONFIG_SYS_FLASH_BASE_PHYS \ + 0x8000000, CONFIG_SYS_FLASH_BASE_PHYS} diff --git a/include/configs/T208xRDB.h b/include/configs/T208xRDB.h index 8ade2e3c829..8a0b0055599 100644 --- a/include/configs/T208xRDB.h +++ b/include/configs/T208xRDB.h @@ -126,7 +126,6 @@ #define CONFIG_SYS_MAX_FLASH_SECT 1024 /* sectors per device */ #define CONFIG_SYS_FLASH_ERASE_TOUT 60000 /* Flash Erase Timeout (ms) */ #define CONFIG_SYS_FLASH_WRITE_TOUT 500 /* Flash Write Timeout (ms) */ -#define CONFIG_SYS_FLASH_EMPTY_INFO #define CONFIG_SYS_FLASH_BANKS_LIST {CONFIG_SYS_FLASH_BASE_PHYS } /* CPLD on IFC */ diff --git a/include/configs/T4240RDB.h b/include/configs/T4240RDB.h index 653483cc99f..d2f5cebfc07 100644 --- a/include/configs/T4240RDB.h +++ b/include/configs/T4240RDB.h @@ -208,7 +208,6 @@ #define CONFIG_SYS_FLASH_ERASE_TOUT 60000 /* Flash Erase Timeout (ms) */ #define CONFIG_SYS_FLASH_WRITE_TOUT 500 /* Flash Write Timeout (ms) */ -#define CONFIG_SYS_FLASH_EMPTY_INFO #define CONFIG_SYS_FLASH_BANKS_LIST {CONFIG_SYS_FLASH_BASE_PHYS \ + 0x8000000, CONFIG_SYS_FLASH_BASE_PHYS} diff --git a/include/configs/bmips_bcm6338.h b/include/configs/bmips_bcm6338.h index ddaa5405139..b8a962dfa2f 100644 --- a/include/configs/bmips_bcm6338.h +++ b/include/configs/bmips_bcm6338.h @@ -21,6 +21,5 @@ #endif #define CONFIG_SYS_FLASH_BASE 0xbfc00000 -#define CONFIG_SYS_FLASH_EMPTY_INFO #endif /* __CONFIG_BMIPS_BCM6338_H */ diff --git a/include/configs/bmips_bcm6348.h b/include/configs/bmips_bcm6348.h index f704fe26ca0..b23ab6a13cc 100644 --- a/include/configs/bmips_bcm6348.h +++ b/include/configs/bmips_bcm6348.h @@ -21,6 +21,5 @@ #endif #define CONFIG_SYS_FLASH_BASE 0xbfc00000 -#define CONFIG_SYS_FLASH_EMPTY_INFO #endif /* __CONFIG_BMIPS_BCM6348_H */ diff --git a/include/configs/bmips_bcm6358.h b/include/configs/bmips_bcm6358.h index 9aaa694cad9..106af2d2772 100644 --- a/include/configs/bmips_bcm6358.h +++ b/include/configs/bmips_bcm6358.h @@ -21,6 +21,5 @@ #endif #define CONFIG_SYS_FLASH_BASE 0xbe000000 -#define CONFIG_SYS_FLASH_EMPTY_INFO #endif /* __CONFIG_BMIPS_BCM6358_H */ diff --git a/include/configs/bmips_bcm6368.h b/include/configs/bmips_bcm6368.h index 0319124a0ed..fb1d760a8f3 100644 --- a/include/configs/bmips_bcm6368.h +++ b/include/configs/bmips_bcm6368.h @@ -21,6 +21,5 @@ #endif #define CONFIG_SYS_FLASH_BASE 0xb8000000 -#define CONFIG_SYS_FLASH_EMPTY_INFO #endif /* __CONFIG_BMIPS_BCM6368_H */ diff --git a/include/configs/corenet_ds.h b/include/configs/corenet_ds.h index 4eeca47c253..7d666e553b0 100644 --- a/include/configs/corenet_ds.h +++ b/include/configs/corenet_ds.h @@ -145,7 +145,6 @@ | OR_FCM_EHTR) #endif /* CONFIG_NAND_FSL_ELBC */ -#define CONFIG_SYS_FLASH_EMPTY_INFO #define CONFIG_SYS_FLASH_BANKS_LIST {CONFIG_SYS_FLASH_BASE_PHYS + 0x8000000, CONFIG_SYS_FLASH_BASE_PHYS} #define CONFIG_HWCONFIG diff --git a/include/configs/integrator-common.h b/include/configs/integrator-common.h index 34eec5a33d2..4408fd0c237 100644 --- a/include/configs/integrator-common.h +++ b/include/configs/integrator-common.h @@ -46,4 +46,3 @@ /* Timeout values in ticks */ #define CONFIG_SYS_FLASH_ERASE_TOUT (2 * CONFIG_SYS_HZ) /* Erase Timeout */ #define CONFIG_SYS_FLASH_WRITE_TOUT (2 * CONFIG_SYS_HZ) /* Write Timeout */ -#define CONFIG_SYS_FLASH_EMPTY_INFO /* flinfo indicates empty blocks */ diff --git a/include/configs/km/pg-wcom-ls102xa.h b/include/configs/km/pg-wcom-ls102xa.h index f8373901350..1477483db5b 100644 --- a/include/configs/km/pg-wcom-ls102xa.h +++ b/include/configs/km/pg-wcom-ls102xa.h @@ -68,7 +68,6 @@ #define CONFIG_SYS_FLASH_ERASE_TOUT 60000 /* Flash Erase Timeout (ms) */ #define CONFIG_SYS_FLASH_WRITE_TOUT 500 /* Flash Write Timeout (ms) */ -#define CONFIG_SYS_FLASH_EMPTY_INFO #define CONFIG_SYS_FLASH_BANKS_LIST { CONFIG_SYS_FLASH_BASE_PHYS } #define CONFIG_SYS_WRITE_SWAPPED_DATA diff --git a/include/configs/kmcent2.h b/include/configs/kmcent2.h index b389229b754..dc369d43189 100644 --- a/include/configs/kmcent2.h +++ b/include/configs/kmcent2.h @@ -236,7 +236,6 @@ #define CONFIG_SYS_MAX_FLASH_SECT 512 /* sectors per device */ -#define CONFIG_SYS_FLASH_EMPTY_INFO #define CONFIG_SYS_FLASH_BANKS_LIST {CONFIG_SYS_FLASH_BASE_PHYS} /* NAND Flash on IFC CS1*/ diff --git a/include/configs/kzm9g.h b/include/configs/kzm9g.h index f94cb54c705..83c676803bb 100644 --- a/include/configs/kzm9g.h +++ b/include/configs/kzm9g.h @@ -41,7 +41,6 @@ /* FLASH */ #undef CONFIG_SYS_FLASH_QUIET_TEST -#define CONFIG_SYS_FLASH_EMPTY_INFO #define FLASH_SECTOR_SIZE (256 * 1024) /* 256 KB sectors */ /* Timeout for Flash erase operations (in ms) */ diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h index 517ade383be..73f1797b476 100644 --- a/include/configs/ls1021aqds.h +++ b/include/configs/ls1021aqds.h @@ -73,7 +73,6 @@ #define CONFIG_SYS_FLASH_ERASE_TOUT 60000 /* Flash Erase Timeout (ms) */ #define CONFIG_SYS_FLASH_WRITE_TOUT 500 /* Flash Write Timeout (ms) */ -#define CONFIG_SYS_FLASH_EMPTY_INFO #define CONFIG_SYS_FLASH_BANKS_LIST {CONFIG_SYS_FLASH_BASE_PHYS, \ CONFIG_SYS_FLASH_BASE_PHYS + 0x8000000} diff --git a/include/configs/ls1021atwr.h b/include/configs/ls1021atwr.h index 1aa29e541ec..732869ac14a 100644 --- a/include/configs/ls1021atwr.h +++ b/include/configs/ls1021atwr.h @@ -102,7 +102,6 @@ #define CONFIG_SYS_FLASH_ERASE_TOUT 60000 /* Flash Erase Timeout (ms) */ #define CONFIG_SYS_FLASH_WRITE_TOUT 500 /* Flash Write Timeout (ms) */ -#define CONFIG_SYS_FLASH_EMPTY_INFO #define CONFIG_SYS_FLASH_BANKS_LIST { CONFIG_SYS_FLASH_BASE_PHYS } #define CONFIG_SYS_WRITE_SWAPPED_DATA diff --git a/include/configs/ls1043aqds.h b/include/configs/ls1043aqds.h index 15c3ff53fe8..f11d3e976bb 100644 --- a/include/configs/ls1043aqds.h +++ b/include/configs/ls1043aqds.h @@ -78,7 +78,6 @@ #define CONFIG_SYS_FLASH_ERASE_TOUT 60000 /* Flash Erase Timeout (ms) */ #define CONFIG_SYS_FLASH_WRITE_TOUT 500 /* Flash Write Timeout (ms) */ -#define CONFIG_SYS_FLASH_EMPTY_INFO #define CONFIG_SYS_FLASH_BANKS_LIST {CONFIG_SYS_FLASH_BASE_PHYS, \ CONFIG_SYS_FLASH_BASE_PHYS + 0x8000000} diff --git a/include/configs/ls1043ardb.h b/include/configs/ls1043ardb.h index 6c33847b27b..45b2359dda2 100644 --- a/include/configs/ls1043ardb.h +++ b/include/configs/ls1043ardb.h @@ -46,7 +46,6 @@ #define CONFIG_SYS_FLASH_ERASE_TOUT 60000 /* Flash Erase Timeout (ms) */ #define CONFIG_SYS_FLASH_WRITE_TOUT 500 /* Flash Write Timeout (ms) */ -#define CONFIG_SYS_FLASH_EMPTY_INFO #define CONFIG_SYS_FLASH_BANKS_LIST { CONFIG_SYS_FLASH_BASE_PHYS } #define CONFIG_SYS_WRITE_SWAPPED_DATA diff --git a/include/configs/ls1046aqds.h b/include/configs/ls1046aqds.h index 36c64db8f5d..71394630169 100644 --- a/include/configs/ls1046aqds.h +++ b/include/configs/ls1046aqds.h @@ -95,7 +95,6 @@ #define CONFIG_SYS_FLASH_ERASE_TOUT 60000 /* Flash Erase Timeout (ms) */ #define CONFIG_SYS_FLASH_WRITE_TOUT 500 /* Flash Write Timeout (ms) */ -#define CONFIG_SYS_FLASH_EMPTY_INFO #define CONFIG_SYS_FLASH_BANKS_LIST {CONFIG_SYS_FLASH_BASE_PHYS, \ CONFIG_SYS_FLASH_BASE_PHYS + 0x8000000} diff --git a/include/configs/ls1088aqds.h b/include/configs/ls1088aqds.h index debb60d25ce..004de7cfb73 100644 --- a/include/configs/ls1088aqds.h +++ b/include/configs/ls1088aqds.h @@ -69,7 +69,6 @@ #define CONFIG_SYS_FLASH_ERASE_TOUT 60000 /* Flash Erase Timeout (ms) */ #define CONFIG_SYS_FLASH_WRITE_TOUT 500 /* Flash Write Timeout (ms) */ -#define CONFIG_SYS_FLASH_EMPTY_INFO #define CONFIG_SYS_FLASH_BANKS_LIST { CONFIG_SYS_FLASH_BASE,\ CONFIG_SYS_FLASH_BASE + 0x40000000} #endif diff --git a/include/configs/ls1088ardb.h b/include/configs/ls1088ardb.h index c0567c3fe58..14b2c9793bb 100644 --- a/include/configs/ls1088ardb.h +++ b/include/configs/ls1088ardb.h @@ -54,7 +54,6 @@ #define CONFIG_SYS_FLASH_ERASE_TOUT 60000 /* Flash Erase Timeout (ms) */ #define CONFIG_SYS_FLASH_WRITE_TOUT 500 /* Flash Write Timeout (ms) */ -#define CONFIG_SYS_FLASH_EMPTY_INFO #define CONFIG_SYS_FLASH_BANKS_LIST { CONFIG_SYS_FLASH_BASE } #endif #endif diff --git a/include/configs/ls2080aqds.h b/include/configs/ls2080aqds.h index 9ba7258572f..ff1c192c6b3 100644 --- a/include/configs/ls2080aqds.h +++ b/include/configs/ls2080aqds.h @@ -71,7 +71,6 @@ #define CONFIG_SYS_FLASH_ERASE_TOUT 60000 /* Flash Erase Timeout (ms) */ #define CONFIG_SYS_FLASH_WRITE_TOUT 500 /* Flash Write Timeout (ms) */ -#define CONFIG_SYS_FLASH_EMPTY_INFO #define CONFIG_SYS_FLASH_BANKS_LIST { CONFIG_SYS_FLASH_BASE,\ CONFIG_SYS_FLASH_BASE + 0x40000000} #endif diff --git a/include/configs/ls2080ardb.h b/include/configs/ls2080ardb.h index a504a0ea462..b2dd6c65893 100644 --- a/include/configs/ls2080ardb.h +++ b/include/configs/ls2080ardb.h @@ -68,7 +68,6 @@ #define CONFIG_SYS_FLASH_ERASE_TOUT 60000 /* Flash Erase Timeout (ms) */ #define CONFIG_SYS_FLASH_WRITE_TOUT 500 /* Flash Write Timeout (ms) */ -#define CONFIG_SYS_FLASH_EMPTY_INFO #define CONFIG_SYS_FLASH_BANKS_LIST { CONFIG_SYS_FLASH_BASE,\ CONFIG_SYS_FLASH_BASE + 0x40000000} #endif diff --git a/include/configs/mccmon6.h b/include/configs/mccmon6.h index 02a22351874..17986a0e348 100644 --- a/include/configs/mccmon6.h +++ b/include/configs/mccmon6.h @@ -27,7 +27,6 @@ /* NOR 16-bit mode */ #define CONFIG_SYS_FLASH_BASE WEIM_ARB_BASE_ADDR -#define CONFIG_SYS_FLASH_EMPTY_INFO #define CONFIG_FLASH_VERIFY /* NOR Flash MTD */ diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h index 73f84922288..9f34d2aea7e 100644 --- a/include/configs/microblaze-generic.h +++ b/include/configs/microblaze-generic.h @@ -18,7 +18,6 @@ #ifdef CONFIG_CFI_FLASH /* ?empty sector */ -# define CONFIG_SYS_FLASH_EMPTY_INFO 1 /* max number of memory banks */ /* max number of sectors on one chip */ # define CONFIG_SYS_MAX_FLASH_SECT 2048 diff --git a/include/configs/mx6sabreauto.h b/include/configs/mx6sabreauto.h index bc4aa52f5bf..5fc3acded30 100644 --- a/include/configs/mx6sabreauto.h +++ b/include/configs/mx6sabreauto.h @@ -33,7 +33,6 @@ #define CONFIG_SYS_FLASH_BASE WEIM_ARB_BASE_ADDR #define CONFIG_SYS_FLASH_SECT_SIZE (128 * 1024) #define CONFIG_SYS_MAX_FLASH_SECT 256 /* max number of sectors on one chip */ -#define CONFIG_SYS_FLASH_EMPTY_INFO #endif #define CONFIG_SYS_FSL_USDHC_NUM 2 diff --git a/include/configs/octeon_ebb7304.h b/include/configs/octeon_ebb7304.h index 7035e631342..5df1a2a755f 100644 --- a/include/configs/octeon_ebb7304.h +++ b/include/configs/octeon_ebb7304.h @@ -13,7 +13,6 @@ * CFI flash */ #define CONFIG_SYS_MAX_FLASH_SECT 256 -#define CONFIG_SYS_FLASH_EMPTY_INFO /* flinfo indicates empty blocks */ #define PHY_ANEG_TIMEOUT 8000 /* PHY needs a longer aneg time */ diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h index ba04029df8d..7ad64f88ed9 100644 --- a/include/configs/p1_p2_rdb_pc.h +++ b/include/configs/p1_p2_rdb_pc.h @@ -202,8 +202,6 @@ #define CONFIG_SYS_FLASH_ERASE_TOUT 60000 /* Flash Erase Timeout (ms) */ #define CONFIG_SYS_FLASH_WRITE_TOUT 500 /* Flash Write Timeout (ms) */ -#define CONFIG_SYS_FLASH_EMPTY_INFO - /* Nand Flash */ #ifdef CONFIG_NAND_FSL_ELBC #define CONFIG_SYS_NAND_BASE 0xff800000 diff --git a/include/configs/total_compute.h b/include/configs/total_compute.h index 4fb3d731c67..5a1eed3f217 100644 --- a/include/configs/total_compute.h +++ b/include/configs/total_compute.h @@ -47,7 +47,6 @@ /* 256 x 256KiB sectors */ #define CONFIG_SYS_MAX_FLASH_SECT 256 -#define CONFIG_SYS_FLASH_EMPTY_INFO /* flinfo indicates empty blocks */ #define FLASH_MAX_SECTOR_SIZE 0x00040000 #endif /* __TOTAL_COMPUTE_H */ diff --git a/include/configs/vexpress_aemv8.h b/include/configs/vexpress_aemv8.h index 3705313aec0..6b65fcf37ec 100644 --- a/include/configs/vexpress_aemv8.h +++ b/include/configs/vexpress_aemv8.h @@ -272,7 +272,6 @@ /* Store environment at top of flash */ #endif -#define CONFIG_SYS_FLASH_EMPTY_INFO /* flinfo indicates empty blocks */ #define FLASH_MAX_SECTOR_SIZE 0x00040000 #endif /* __VEXPRESS_AEMV8_H */ diff --git a/include/configs/vexpress_common.h b/include/configs/vexpress_common.h index ff7307f0904..91ce2fe0ca4 100644 --- a/include/configs/vexpress_common.h +++ b/include/configs/vexpress_common.h @@ -189,7 +189,6 @@ */ /* Store environment at top of flash */ -#define CONFIG_SYS_FLASH_EMPTY_INFO /* flinfo indicates empty blocks */ #define CONFIG_SYS_FLASH_BANKS_LIST { CONFIG_SYS_FLASH_BASE0, \ CONFIG_SYS_FLASH_BASE1 } diff --git a/include/configs/xtfpga.h b/include/configs/xtfpga.h index f1ea4765467..67ba8af71f8 100644 --- a/include/configs/xtfpga.h +++ b/include/configs/xtfpga.h @@ -190,6 +190,5 @@ */ /* print 'E' for empty sector on flinfo */ -#define CONFIG_SYS_FLASH_EMPTY_INFO #endif /* __CONFIG_H */ diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h index 1fdde90654f..c9d8d09f194 100644 --- a/include/configs/zynq-common.h +++ b/include/configs/zynq-common.h @@ -42,7 +42,6 @@ # define CONFIG_SYS_FLASH_ERASE_TOUT 1000 # define CONFIG_SYS_FLASH_WRITE_TOUT 5000 # define CONFIG_FLASH_SHOW_PROGRESS 10 -# undef CONFIG_SYS_FLASH_EMPTY_INFO # define CONFIG_SYS_FLASH_QUIET_TEST #endif |