From mboxrd@z Thu Jan 1 00:00:00 1970 From: Thomas Chou Date: Sun, 25 Oct 2015 21:29:06 +0800 Subject: [U-Boot] [PATCH] mtd: do not include cfi_flash.h if no flash In-Reply-To: <201510250500.35752.marex@denx.de> References: <1445742178-8040-1-git-send-email-thomas@wytron.com.tw> <201510250500.35752.marex@denx.de> Message-ID: <562CD922.1050503@wytron.com.tw> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de Hi Marek, On 10/25/2015 12:00 PM, Marek Vasut wrote: > On Sunday, October 25, 2015 at 04:02:58 AM, Thomas Chou wrote: >> Do not include cfi_flash.h if CONFIG_SYS_NO_FLASH. Because >> the flash_info is undefined in flash.h if CONFIG_SYS_NO_FLASH. >> >> Signed-off-by: Thomas Chou >> --- >> include/mtd/cfi_flash.h | 4 ++++ >> 1 file changed, 4 insertions(+) >> >> diff --git a/include/mtd/cfi_flash.h b/include/mtd/cfi_flash.h >> index 048b477..526898a 100644 >> --- a/include/mtd/cfi_flash.h >> +++ b/include/mtd/cfi_flash.h >> @@ -8,6 +8,8 @@ >> #ifndef __CFI_FLASH_H__ >> #define __CFI_FLASH_H__ >> >> +#ifndef CONFIG_SYS_NO_FLASH >> + > > Hi! > > Something tells me this is not the right way to fix things up, > but I suspect this idea came from flash.h , right ? This legacy > code is a terrible mess :-( > > I'd kinda expect that it'd be always safe to include the cfi_flash.h > because cfi_flash.h would include flash.h and take care of having all > the types available (not the case now). I'd also expect to have all > the CFI command macros available if I include cfi_flash.h, so this new > ifdef would introduce a surprising behavior for me. > > I wonder if we cannot find some better solution instead of adding some > more ifdefs to the already horrible maze of ifdefs there. What do you > think please ? Fully agreed. Please allow me to withdraw this patch and fix it in the other way. You are always welcome. Best regards, Thomas