Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-14 00:47:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

flash: compile common/flash.c iif CONFIG_MTD_NO_FLASH is enabled

Browse source 
The whole of common/flash.c is guarded by #if defined() ... #endif.
Move the conditional to common/Makefile.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
This commit is contained in:
Masahiro Yamada 2017-02-11 22:43:55 +09:00 committed by Tom Rini
parent e856bdcfb4
commit 554c73c025
2 changed files with 1 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
common/Makefile
View file

@ -67,7 +67,7 @@ endif
# others # others
obj-$(CONFIG_BOOTSTAGE) += bootstage.o obj-$(CONFIG_BOOTSTAGE) += bootstage.o
obj-$(CONFIG_CONSOLE_MUX) += iomux.o obj-$(CONFIG_CONSOLE_MUX) += iomux.o
obj-y += flash.o obj-$(CONFIG_MTD_NOR_FLASH) += flash.o
obj-$(CONFIG_CMD_KGDB) += kgdb.o kgdb_stubs.o obj-$(CONFIG_CMD_KGDB) += kgdb.o kgdb_stubs.o
obj-$(CONFIG_I2C_EDID) += edid.o obj-$(CONFIG_I2C_EDID) += edid.o
obj-$(CONFIG_KALLSYMS) += kallsyms.o obj-$(CONFIG_KALLSYMS) += kallsyms.o

5
common/flash.c
View file

@ -10,7 +10,6 @@
#include <common.h> #include <common.h>
#include <flash.h> #include <flash.h>
#if defined(CONFIG_MTD_NOR_FLASH)
#include <mtd/cfi_flash.h> #include <mtd/cfi_flash.h>
extern flash_info_t flash_info[]; /* info for FLASH chips */ extern flash_info_t flash_info[]; /* info for FLASH chips */
@ -218,7 +217,3 @@ void flash_perror (int err)
break; break;
} }
} }
/*-----------------------------------------------------------------------
*/
#endif /* !CONFIG_MTD_NOR_FLASH */