diff options
| author | Haavard Skinnemoen <haavard.skinnemoen@atmel.com> | 2008-06-12 19:27:57 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-07-10 00:04:47 +0200 |
| commit | d2d54ea449639f3d1a6007e333ab9fcc609a18f0 (patch) | |
| tree | 55ca71adc46eba5bd6ef491f764e7c72b1345694 | |
| parent | 5ce13051a48c62bda9723df3b4778c492fb47f36 (diff) | |
| download | talos-obmc-uboot-d2d54ea449639f3d1a6007e333ab9fcc609a18f0.tar.gz talos-obmc-uboot-d2d54ea449639f3d1a6007e333ab9fcc609a18f0.zip | |
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>
| -rw-r--r-- | cpu/at32ap/Makefile | 2 | ||||
| -rw-r--r-- | include/configs/atngw100.h | 1 | ||||
| -rw-r--r-- | include/configs/atstk1002.h | 1 | ||||
| -rw-r--r-- | include/configs/atstk1003.h | 1 | ||||
| -rw-r--r-- | include/configs/atstk1004.h | 1 | ||||
| -rw-r--r-- | include/configs/atstk1006.h | 1 |
6 files changed, 6 insertions, 1 deletions
diff --git a/cpu/at32ap/Makefile b/cpu/at32ap/Makefile index d16c58b773..f1823300a8 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-$(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 7ac51b543c..84d235ea9d 100644 --- 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 ba18eb63c7..90910bb98a 100644 --- 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 a528ddfb0e..03472a8869 100644 --- 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 fc9585e84d..07add821a9 100644 --- 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 9fd49a53a3..f9af67540a 100644 --- 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 |
