summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2011-04-27 21:43:42 +0200
committerWolfgang Denk <wd@denx.de>2011-04-27 21:43:42 +0200
commit547bea12cc9dd72b4e1cd0383d7f1ecb0e43e139 (patch)
tree94ff2a1b6ed20b07d2ca10324e6ba4763dbf2c56
parent5f902cf139559bc436175367a4507b1ddfa4512d (diff)
parent9ccf0b24fb02ed63eac5d79c23231b019e0a5825 (diff)
downloadu-boot-imx-547bea12cc9dd72b4e1cd0383d7f1ecb0e43e139.zip
u-boot-imx-547bea12cc9dd72b4e1cd0383d7f1ecb0e43e139.tar.gz
u-boot-imx-547bea12cc9dd72b4e1cd0383d7f1ecb0e43e139.tar.bz2
Merge branch 'master' of git://git.denx.de/u-boot-blackfin
-rw-r--r--include/configs/bf506f-ezkit.h2
-rw-r--r--include/configs/bf527-ad7160-eval.h5
-rw-r--r--include/configs/bf537-stamp.h3
-rw-r--r--include/configs/bfin_adi_common.h5
4 files changed, 11 insertions, 4 deletions
diff --git a/include/configs/bf506f-ezkit.h b/include/configs/bf506f-ezkit.h
index 3580ec6..77b6735 100644
--- a/include/configs/bf506f-ezkit.h
+++ b/include/configs/bf506f-ezkit.h
@@ -82,6 +82,8 @@
*/
#define CONFIG_ENV_IS_NOWHERE
#define CONFIG_ENV_SIZE 0x400
+#undef CONFIG_CMD_EXPORTENV
+#undef CONFIG_CMD_IMPORTENV
/*
diff --git a/include/configs/bf527-ad7160-eval.h b/include/configs/bf527-ad7160-eval.h
index 889bfde..9c35f2d 100644
--- a/include/configs/bf527-ad7160-eval.h
+++ b/include/configs/bf527-ad7160-eval.h
@@ -128,9 +128,8 @@
* SPI_MMC Settings
*/
#define CONFIG_MMC
-#define CONFIG_CMD_EXT2
-#define CONFIG_SPI_MMC
-#define CONFIG_SPI_MMC_DEFAULT_CS (MAX_CTRL_CS + GPIO_PH3)
+#define CONFIG_GENERIC_MMC
+#define CONFIG_MMC_SPI
/*
diff --git a/include/configs/bf537-stamp.h b/include/configs/bf537-stamp.h
index 3da2375..c31e914 100644
--- a/include/configs/bf537-stamp.h
+++ b/include/configs/bf537-stamp.h
@@ -137,7 +137,8 @@
* SPI_MMC Settings
*/
#define CONFIG_MMC
-#define CONFIG_SPI_MMC
+#define CONFIG_GENERIC_MMC
+#define CONFIG_MMC_SPI
/*
diff --git a/include/configs/bfin_adi_common.h b/include/configs/bfin_adi_common.h
index a9c66be..3312681 100644
--- a/include/configs/bfin_adi_common.h
+++ b/include/configs/bfin_adi_common.h
@@ -34,10 +34,14 @@
# define CONFIG_DOS_PARTITION
# endif
# ifdef CONFIG_MMC
+# define CONFIG_CMD_EXT2
# define CONFIG_CMD_FAT
# define CONFIG_CMD_MMC
# define CONFIG_DOS_PARTITION
# endif
+# ifdef CONFIG_MMC_SPI
+# define CONFIG_CMD_MMC_SPI
+# endif
# ifdef CONFIG_USB
# define CONFIG_CMD_EXT2
# define CONFIG_CMD_FAT
@@ -273,6 +277,7 @@
*/
#ifdef CONFIG_SPI_FLASH_ALL
# define CONFIG_SPI_FLASH_ATMEL
+# define CONFIG_SPI_FLASH_EON
# define CONFIG_SPI_FLASH_MACRONIX
# define CONFIG_SPI_FLASH_SPANSION
# define CONFIG_SPI_FLASH_SST