avr32: Use CONFIG_ATMEL_MCI to select the atmel_mci driver

After we move the atmel_mci driver into drivers/mmc, we can't select
it with CONFIG_MMC anymore. Introduce a new symbol specifically for
this driver so that there's no ambiguity.

Signed-off-by: Haavard Skinnemoen <haavard.skinnemoen@atmel.com>
Acked-by: Jean-Chritophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>

diff --git a/cpu/at32ap/Makefile b/cpu/at32ap/Makefile
index d16c58b77388f368a4d680f2480fa8d30e3f1f33..f1823300a86adab5449e6065b586cd629cbc2297 100644 (file)
--- 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-$(CONFIG_MMC)    += atmel_mci.o
+COBJS-$(CONFIG_ATMEL_MCI) += 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/include/configs/atngw100.h b/include/configs/atngw100.h
index 7ac51b543ca1a92a191001f68e4d09ae391e1c5f..84d235ea9d5eeecb2eccc352c7d9f6f6974f577f 100644 (file)
--- a/include/configs/atngw100.h
+++ b/include/configs/atngw100.h
@@ -128,6 +128,7 @@
 #define CFG_NR_PIOS                    5
 #define CFG_HSDRAMC                    1
 #define CONFIG_MMC                     1
+#define CONFIG_ATMEL_MCI               1
 #define CONFIG_ATMEL_SPI               1
 
 #define CONFIG_SPI_FLASH               1

diff --git a/include/configs/atstk1002.h b/include/configs/atstk1002.h
index ba18eb63c7f4da584de708f563d3f1ae1e05e6af..90910bb98a5e50ea5704d668d6e69a670ec5c245 100644 (file)
--- a/include/configs/atstk1002.h
+++ b/include/configs/atstk1002.h
@@ -153,6 +153,7 @@
 #define CFG_NR_PIOS                    5
 #define CFG_HSDRAMC                    1
 #define CONFIG_MMC                     1
+#define CONFIG_ATMEL_MCI               1
 
 #define CFG_DCACHE_LINESZ              32
 #define CFG_ICACHE_LINESZ              32

diff --git a/include/configs/atstk1003.h b/include/configs/atstk1003.h
index a528ddfb0e92f178f013d912e6deced06d8b66e6..03472a8869ca63ec811ba49c076361e59d9a2e81 100644 (file)
--- a/include/configs/atstk1003.h
+++ b/include/configs/atstk1003.h
@@ -136,6 +136,7 @@
 #define CONFIG_PIO2                    1
 #define CFG_HSDRAMC                    1
 #define CONFIG_MMC                     1
+#define CONFIG_ATMEL_MCI               1
 
 #define CFG_DCACHE_LINESZ              32
 #define CFG_ICACHE_LINESZ              32

diff --git a/include/configs/atstk1004.h b/include/configs/atstk1004.h
index fc9585e84d2d21eeca8d0e23ca88d6a672e35529..07add821a94e55b6665224479fb9c00aa2568063 100644 (file)
--- a/include/configs/atstk1004.h
+++ b/include/configs/atstk1004.h
@@ -136,6 +136,7 @@
 #define CONFIG_PIO2                    1
 #define CFG_HSDRAMC                    1
 #define CONFIG_MMC                     1
+#define CONFIG_ATMEL_MCI               1
 
 #define CFG_DCACHE_LINESZ              32
 #define CFG_ICACHE_LINESZ              32

diff --git a/include/configs/atstk1006.h b/include/configs/atstk1006.h
index 9fd49a53a34d30c0490624d482596b4a5810d624..f9af67540a093243473a369e520d836262683e2a 100644 (file)
--- a/include/configs/atstk1006.h
+++ b/include/configs/atstk1006.h
@@ -153,6 +153,7 @@
 #define CFG_NR_PIOS                    5
 #define CFG_HSDRAMC                    1
 #define CONFIG_MMC                     1
+#define CONFIG_ATMEL_MCI               1
 
 #define CFG_DCACHE_LINESZ              32
 #define CFG_ICACHE_LINESZ              32