[U-Boot] [PATCH 2/2] AVR32: update to use CONFIG_GENERIC_MMC

[Albin Tonnerre]

With the patch updating the atmel_mci driver, some updates are necessary on
AVR32 to make the MMC support working. This patch defines CONFIG_GENERIC_MMC in
the affected boards config and defines the function cpu_mmc_init.

Signed-off-by: Albin Tonnerre <albin.tonnerre at free-electrons.com>
---
As I don't own any AVR32 hardware, I would really appreciate if some extensive
testing was performed on this platform to avoid regressions

 cpu/at32ap/cpu.c                |    7 +++++++
 include/configs/atngw100.h      |    1 +
 include/configs/atstk1002.h     |    1 +
 include/configs/atstk1003.h     |    1 +
 include/configs/atstk1004.h     |    1 +
 include/configs/atstk1006.h     |    1 +
 include/configs/favr-32-ezkit.h |    1 +
 include/configs/hammerhead.h    |    1 +
 include/configs/mimc200.h       |    1 +
 9 files changed, 15 insertions(+), 0 deletions(-)

diff --git a/cpu/at32ap/cpu.c b/cpu/at32ap/cpu.c
index 904bfb2..71771bc 100644
--- a/cpu/at32ap/cpu.c
+++ b/cpu/at32ap/cpu.c
@@ -87,3 +87,10 @@ int do_reset(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 
 	return -1;
 }
+
+#ifdef CONFIG_ATMEL_MCI
+int cpu_mmc_init(bd_t *bis)
+{
+	atmel_mci_init(bis);
+}
+#endif
diff --git a/include/configs/atngw100.h b/include/configs/atngw100.h
index 4ed5514..580f964 100644
--- a/include/configs/atngw100.h
+++ b/include/configs/atngw100.h
@@ -128,6 +128,7 @@
 #define CONFIG_SYS_NR_PIOS			5
 #define CONFIG_SYS_HSDRAMC			1
 #define CONFIG_MMC			1
+#define CONFIG_GENERIC_MMC		1
 #define CONFIG_ATMEL_MCI		1
 #define CONFIG_ATMEL_SPI		1
 
diff --git a/include/configs/atstk1002.h b/include/configs/atstk1002.h
index b258f2d..c83c30d 100644
--- a/include/configs/atstk1002.h
+++ b/include/configs/atstk1002.h
@@ -153,6 +153,7 @@
 #define CONFIG_SYS_NR_PIOS			5
 #define CONFIG_SYS_HSDRAMC			1
 #define CONFIG_MMC			1
+#define CONFIG_GENERIC_MMC		1
 #define CONFIG_ATMEL_MCI		1
 
 #define CONFIG_SYS_DCACHE_LINESZ		32
diff --git a/include/configs/atstk1003.h b/include/configs/atstk1003.h
index 2ef2552..9077c5c 100644
--- a/include/configs/atstk1003.h
+++ b/include/configs/atstk1003.h
@@ -136,6 +136,7 @@
 #define CONFIG_PORTMUX_PIO		1
 #define CONFIG_SYS_HSDRAMC			1
 #define CONFIG_MMC			1
+#define CONFIG_GENERIC_MMC		1
 #define CONFIG_ATMEL_MCI		1
 
 #define CONFIG_SYS_DCACHE_LINESZ		32
diff --git a/include/configs/atstk1004.h b/include/configs/atstk1004.h
index 195be82..a06f2bf 100644
--- a/include/configs/atstk1004.h
+++ b/include/configs/atstk1004.h
@@ -136,6 +136,7 @@
 #define CONFIG_PORTMUX_PIO		1
 #define CONFIG_SYS_HSDRAMC			1
 #define CONFIG_MMC			1
+#define CONFIG_GENERIC_MMC		1
 #define CONFIG_ATMEL_MCI		1
 
 #define CONFIG_SYS_DCACHE_LINESZ		32
diff --git a/include/configs/atstk1006.h b/include/configs/atstk1006.h
index f93118e..ed82e66 100644
--- a/include/configs/atstk1006.h
+++ b/include/configs/atstk1006.h
@@ -153,6 +153,7 @@
 #define CONFIG_SYS_NR_PIOS			5
 #define CONFIG_SYS_HSDRAMC			1
 #define CONFIG_MMC			1
+#define CONFIG_GENERIC_MMC		1
 #define CONFIG_ATMEL_MCI		1
 
 #define CONFIG_SYS_DCACHE_LINESZ		32
diff --git a/include/configs/favr-32-ezkit.h b/include/configs/favr-32-ezkit.h
index 739ff0d..1fc38f7 100644
--- a/include/configs/favr-32-ezkit.h
+++ b/include/configs/favr-32-ezkit.h
@@ -150,6 +150,7 @@
 #define CONFIG_SYS_NR_PIOS			5
 #define CONFIG_SYS_HSDRAMC			1
 #define CONFIG_MMC			1
+#define CONFIG_GENERIC_MMC		1
 #define CONFIG_ATMEL_MCI		1
 
 #define CONFIG_SYS_DCACHE_LINESZ		32
diff --git a/include/configs/hammerhead.h b/include/configs/hammerhead.h
index 0c70af5..e4b3e20 100644
--- a/include/configs/hammerhead.h
+++ b/include/configs/hammerhead.h
@@ -121,6 +121,7 @@
 #define CONFIG_SYS_NR_PIOS			5
 #define CONFIG_SYS_HSDRAMC			1
 #define CONFIG_MMC			1
+#define CONFIG_GENERIC_MMC		1
 #define CONFIG_ATMEL_MCI		1
 
 #define CONFIG_SYS_DCACHE_LINESZ		32
diff --git a/include/configs/mimc200.h b/include/configs/mimc200.h
index 8f71664..26f6cf3 100644
--- a/include/configs/mimc200.h
+++ b/include/configs/mimc200.h
@@ -127,6 +127,7 @@
 #define CONFIG_SYS_NR_PIOS			5
 #define CONFIG_SYS_HSDRAMC			1
 #define CONFIG_MMC			1
+#define CONFIG_GENERIC_MMC		1
 #define CONFIG_ATMEL_MCI		1
 
 #if defined(CONFIG_LCD)
-- 
1.6.0.4