summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHaavard Skinnemoen <haavard.skinnemoen@atmel.com>2008-05-21 13:01:09 +0200
committerHaavard Skinnemoen <haavard.skinnemoen@atmel.com>2008-05-27 15:27:31 +0200
commit48ea623eae8674793372e3e7c95e72e5a44d7a95 (patch)
treec857ba09054cfed5ef90ebea7ee82c53aa245eca
parente92a5bf8330654e33ac13f6b3058634e58f5d1c0 (diff)
downloadu-boot-imx-48ea623eae8674793372e3e7c95e72e5a44d7a95.zip
u-boot-imx-48ea623eae8674793372e3e7c95e72e5a44d7a95.tar.gz
u-boot-imx-48ea623eae8674793372e3e7c95e72e5a44d7a95.tar.bz2
avr32: Compile atmel_mci.o conditionally
Remove #ifdef CONFIG_MMC from the source file and use conditional compilation in the Makefile instead. Signed-off-by: Haavard Skinnemoen <haavard.skinnemoen@atmel.com>
-rw-r--r--cpu/at32ap/Makefile2
-rw-r--r--cpu/at32ap/atmel_mci.c4
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 */