mirror of
https://github.com/u-boot/u-boot.git
synced 2025-05-01 17:12:11 +00:00
flash.h: Remove CONFIG_SYS_FLASH_CFI from flash_info_t
Those embers wrapped with CONFIG_SYS_FLASH_CFI in struct flash_info_t are unconditionally used in the cfi_flash.c driver. Drop the #ifdefs in the definition of flash_info_t. Signed-off-by: Bin Meng <bmeng.cn@gmail.com> Reviewed-by: Stefan Roese <sr@denx.de>
This commit is contained in:
parent
8fff9e335d
commit
74773a4f85
1 changed files with 0 additions and 2 deletions
|
@ -21,7 +21,6 @@ typedef struct {
|
||||||
ulong flash_id; /* combined device & manufacturer code */
|
ulong flash_id; /* combined device & manufacturer code */
|
||||||
ulong start[CONFIG_SYS_MAX_FLASH_SECT]; /* virtual sector start address */
|
ulong start[CONFIG_SYS_MAX_FLASH_SECT]; /* virtual sector start address */
|
||||||
uchar protect[CONFIG_SYS_MAX_FLASH_SECT]; /* sector protection status */
|
uchar protect[CONFIG_SYS_MAX_FLASH_SECT]; /* sector protection status */
|
||||||
#ifdef CONFIG_SYS_FLASH_CFI
|
|
||||||
uchar portwidth; /* the width of the port */
|
uchar portwidth; /* the width of the port */
|
||||||
uchar chipwidth; /* the width of the chip */
|
uchar chipwidth; /* the width of the chip */
|
||||||
uchar chip_lsb; /* extra Least Significant Bit in the */
|
uchar chip_lsb; /* extra Least Significant Bit in the */
|
||||||
|
@ -45,7 +44,6 @@ typedef struct {
|
||||||
ulong addr_unlock2; /* unlock address 2 for AMD flash roms */
|
ulong addr_unlock2; /* unlock address 2 for AMD flash roms */
|
||||||
uchar sr_supported; /* status register supported */
|
uchar sr_supported; /* status register supported */
|
||||||
const char *name; /* human-readable name */
|
const char *name; /* human-readable name */
|
||||||
#endif
|
|
||||||
#ifdef CONFIG_DM_MTD
|
#ifdef CONFIG_DM_MTD
|
||||||
struct mtd_info *mtd;
|
struct mtd_info *mtd;
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Add table
Reference in a new issue