diff options
| author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2017-02-11 22:43:55 +0900 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-02-12 14:30:31 -0500 |
| commit | 554c73c0256c9e22af1b89e842a310b73b5eb657 (patch) | |
| tree | 9c539305a39a0675d63fe31ad78c1d3f03e081df | |
| parent | e856bdcfb49291d30b19603fc101bea096c48196 (diff) | |
| download | u-boot-imx-554c73c0256c9e22af1b89e842a310b73b5eb657.zip u-boot-imx-554c73c0256c9e22af1b89e842a310b73b5eb657.tar.gz u-boot-imx-554c73c0256c9e22af1b89e842a310b73b5eb657.tar.bz2 | |
flash: compile common/flash.c iif CONFIG_MTD_NO_FLASH is enabled
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>
| -rw-r--r-- | common/Makefile | 2 | ||||
| -rw-r--r-- | common/flash.c | 5 |
2 files changed, 1 insertions, 6 deletions
diff --git a/common/Makefile b/common/Makefile index ecc23e6..86225f1 100644 --- a/common/Makefile +++ b/common/Makefile @@ -67,7 +67,7 @@ endif # others obj-$(CONFIG_BOOTSTAGE) += bootstage.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_I2C_EDID) += edid.o obj-$(CONFIG_KALLSYMS) += kallsyms.o diff --git a/common/flash.c b/common/flash.c index 6d492c7..587ef60 100644 --- a/common/flash.c +++ b/common/flash.c @@ -10,7 +10,6 @@ #include <common.h> #include <flash.h> -#if defined(CONFIG_MTD_NOR_FLASH) #include <mtd/cfi_flash.h> extern flash_info_t flash_info[]; /* info for FLASH chips */ @@ -218,7 +217,3 @@ void flash_perror (int err) break; } } - -/*----------------------------------------------------------------------- - */ -#endif /* !CONFIG_MTD_NOR_FLASH */ |