diff options
| author | Bin Meng <bmeng.cn@gmail.com> | 2021-08-07 13:00:01 +0800 |
|---|---|---|
| committer | Stefan Roese <sr@denx.de> | 2021-08-11 10:36:10 +0200 |
| commit | 74773a4f85221dceccbe92b0b3ae6daef75a141c (patch) | |
| tree | a120324146924e7990cc9a4abfe65f4ed4a8fa24 | |
| parent | 8fff9e335d08a8a901e66e75e99aa2f0091527b1 (diff) | |
| download | u-boot-74773a4f85221dceccbe92b0b3ae6daef75a141c.zip u-boot-74773a4f85221dceccbe92b0b3ae6daef75a141c.tar.gz u-boot-74773a4f85221dceccbe92b0b3ae6daef75a141c.tar.bz2 | |
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>
| -rw-r--r-- | include/flash.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/flash.h b/include/flash.h index 42b18a6..f3959f5 100644 --- a/include/flash.h +++ b/include/flash.h @@ -21,7 +21,6 @@ typedef struct { ulong flash_id; /* combined device & manufacturer code */ ulong start[CONFIG_SYS_MAX_FLASH_SECT]; /* virtual sector start address */ uchar protect[CONFIG_SYS_MAX_FLASH_SECT]; /* sector protection status */ -#ifdef CONFIG_SYS_FLASH_CFI uchar portwidth; /* the width of the port */ uchar chipwidth; /* the width of the chip */ 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 */ uchar sr_supported; /* status register supported */ const char *name; /* human-readable name */ -#endif #ifdef CONFIG_DM_MTD struct mtd_info *mtd; #endif |