Merge branch 'master' of git://git.denx.de/u-boot-blackfin

This commit is contained in:
Wolfgang Denk 2011-04-27 21:43:42 +02:00
commit 547bea12cc
4 changed files with 11 additions and 4 deletions

View File

@ -82,6 +82,8 @@
*/ */
#define CONFIG_ENV_IS_NOWHERE #define CONFIG_ENV_IS_NOWHERE
#define CONFIG_ENV_SIZE 0x400 #define CONFIG_ENV_SIZE 0x400
#undef CONFIG_CMD_EXPORTENV
#undef CONFIG_CMD_IMPORTENV
/* /*

View File

@ -128,9 +128,8 @@
* SPI_MMC Settings * SPI_MMC Settings
*/ */
#define CONFIG_MMC #define CONFIG_MMC
#define CONFIG_CMD_EXT2 #define CONFIG_GENERIC_MMC
#define CONFIG_SPI_MMC #define CONFIG_MMC_SPI
#define CONFIG_SPI_MMC_DEFAULT_CS (MAX_CTRL_CS + GPIO_PH3)
/* /*

View File

@ -137,7 +137,8 @@
* SPI_MMC Settings * SPI_MMC Settings
*/ */
#define CONFIG_MMC #define CONFIG_MMC
#define CONFIG_SPI_MMC #define CONFIG_GENERIC_MMC
#define CONFIG_MMC_SPI
/* /*

View File

@ -34,10 +34,14 @@
# define CONFIG_DOS_PARTITION # define CONFIG_DOS_PARTITION
# endif # endif
# ifdef CONFIG_MMC # ifdef CONFIG_MMC
# define CONFIG_CMD_EXT2
# define CONFIG_CMD_FAT # define CONFIG_CMD_FAT
# define CONFIG_CMD_MMC # define CONFIG_CMD_MMC
# define CONFIG_DOS_PARTITION # define CONFIG_DOS_PARTITION
# endif # endif
# ifdef CONFIG_MMC_SPI
# define CONFIG_CMD_MMC_SPI
# endif
# ifdef CONFIG_USB # ifdef CONFIG_USB
# define CONFIG_CMD_EXT2 # define CONFIG_CMD_EXT2
# define CONFIG_CMD_FAT # define CONFIG_CMD_FAT
@ -273,6 +277,7 @@
*/ */
#ifdef CONFIG_SPI_FLASH_ALL #ifdef CONFIG_SPI_FLASH_ALL
# define CONFIG_SPI_FLASH_ATMEL # define CONFIG_SPI_FLASH_ATMEL
# define CONFIG_SPI_FLASH_EON
# define CONFIG_SPI_FLASH_MACRONIX # define CONFIG_SPI_FLASH_MACRONIX
# define CONFIG_SPI_FLASH_SPANSION # define CONFIG_SPI_FLASH_SPANSION
# define CONFIG_SPI_FLASH_SST # define CONFIG_SPI_FLASH_SST