[PATCH 2/3] flash.h: Remove CONFIG_SYS_FLASH_CFI from flash_info_t

[Stefan Roese]

On 07.08.21 07:00, Bin Meng wrote:
> 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 at gmail.com>

Applied to u-boot-cfi-flash/master

Thanks,
Stefan

> ---
> 
>   include/flash.h | 2 --
>   1 file changed, 2 deletions(-)
> 
> diff --git a/include/flash.h b/include/flash.h
> index 42b18a6047..f3959f5012 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
> 


Viele Grüße,
Stefan

-- 
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr at denx.de