Haavard Skinnemoen wrote:
Remove #ifdef CONFIG_MMC from the source file and use conditional compilation in the Makefile instead.
What's wrong with the current code? Why are you doing this?
Signed-off-by: Haavard Skinnemoen haavard.skinnemoen@atmel.com
cpu/at32ap/Makefile | 2 +- cpu/at32ap/atmel_mci.c | 4 ---- 2 files changed, 1 insertions(+), 5 deletions(-)
diff --git a/cpu/at32ap/Makefile b/cpu/at32ap/Makefile index 29f9c0d..d16c58b 100644 --- a/cpu/at32ap/Makefile +++ b/cpu/at32ap/Makefile @@ -35,7 +35,7 @@ COBJS-y += exception.o COBJS-y += cache.o COBJS-y += interrupts.o COBJS-y += pio.o -COBJS-y += atmel_mci.o +COBJS-$(CONFIG_MMC) += atmel_mci.o
SRCS := $(START-y:.o=.S) $(SOBJS-y:.o=.S) $(COBJS-y:.o=.c) OBJS := $(addprefix $(obj),$(SOBJS-y) $(COBJS-y)) diff --git a/cpu/at32ap/atmel_mci.c b/cpu/at32ap/atmel_mci.c index 226b5c0..3795add 100644 --- a/cpu/at32ap/atmel_mci.c +++ b/cpu/at32ap/atmel_mci.c @@ -21,8 +21,6 @@ */ #include <common.h>
-#ifdef CONFIG_MMC
#include <part.h> #include <mmc.h>
@@ -548,5 +546,3 @@ int mmc2info(ulong addr) { return 0; }
-#endif /* CONFIG_MMC */
1.5.5.1
Sincerely,
Ken Fuchs