Move the preprocessor test of CONFIG_SYS_NO_FLASH out of flash.c and
back to the Makefile, for readability.
Signed-off-by: Robert P. J. Day <rpj...@crashcourse.ca>
---
this one is a little uglier since it adds an "#ifndef" check to the
Makefile, but i still consider this to be more readable since it's
potentially misleading to have a hard-coded build of a file in the
Makefile, only to have to go that file to notice that a subsequent
preprocessor check takes the file out of play. except in weird
circumstances, tests like that should be in the Makefile.
i don't think there's a lot of this left.
diff --git a/common/Makefile b/common/Makefile
index 3781738..69629f5 100644
--- a/common/Makefile
+++ b/common/Makefile
@@ -152,7 +152,9 @@ COBJS-$(CONFIG_VFD) += cmd_vfd.o
COBJS-$(CONFIG_DDR_SPD) += ddr_spd.o
COBJS-$(CONFIG_HWCONFIG) += hwconfig.o
COBJS-$(CONFIG_CONSOLE_MUX) += iomux.o
+#ifndef CONFIG_SYS_NO_FLASH
COBJS-y += flash.o
+#endif
COBJS-$(CONFIG_CMD_KGDB) += kgdb.o
COBJS-$(CONFIG_KALLSYMS) += kallsyms.o
COBJS-$(CONFIG_LCD) += lcd.o
diff --git a/common/flash.c b/common/flash.c
index eb4b2f5..f5da566 100644
--- a/common/flash.c
+++ b/common/flash.c
@@ -26,8 +26,6 @@
#include <common.h>
#include <flash.h>
-#if !defined(CONFIG_SYS_NO_FLASH)
-
extern flash_info_t flash_info[]; /* info for FLASH chips */
/*-----------------------------------------------------------------------
@@ -222,7 +220,3 @@ void flash_perror (int err)
break;
}
}
-
-/*-----------------------------------------------------------------------
- */
-#endif /* !CONFIG_SYS_NO_FLASH */
========================================================================
Robert P. J. Day Waterloo, Ontario, CANADA
Linux Consulting, Training and Kernel Pedantry.
Web page: http://crashcourse.ca
Twitter: http://twitter.com/rpjday
========================================================================
_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
