[U-Boot] [PATCH 0/3] Blackfin minor config updates for 2011.06
Now that the mmc_spi driver has been merged, we can convert the Blackfin boards over to it. And since some other patches have been merged now, we can push the Blackfin config updates as well.
Mike Frysinger (3): Blackfin: bf537-stamp/bf527-ad7160-eval: convert to mmc_spi Blackfin: bf506f-ezkit: disable import/export env commands Blackfin: adi boards: add eon to the "all" spi flash list
include/configs/bf506f-ezkit.h | 2 ++ include/configs/bf527-ad7160-eval.h | 5 ++--- include/configs/bf537-stamp.h | 3 ++- include/configs/bfin_adi_common.h | 5 +++++ 4 files changed, 11 insertions(+), 4 deletions(-)
Switch to the new common mmc_spi driver.
Signed-off-by: Mike Frysinger vapier@gentoo.org --- include/configs/bf527-ad7160-eval.h | 5 ++--- include/configs/bf537-stamp.h | 3 ++- include/configs/bfin_adi_common.h | 4 ++++ 3 files changed, 8 insertions(+), 4 deletions(-)
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..9e61542 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
Space is very tight on this board, so remove more extraneous commands.
Signed-off-by: Mike Frysinger vapier@gentoo.org --- include/configs/bf506f-ezkit.h | 2 ++ 1 files changed, 2 insertions(+), 0 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
/*
Signed-off-by: Mike Frysinger vapier@gentoo.org --- include/configs/bfin_adi_common.h | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/include/configs/bfin_adi_common.h b/include/configs/bfin_adi_common.h index 9e61542..3312681 100644 --- a/include/configs/bfin_adi_common.h +++ b/include/configs/bfin_adi_common.h @@ -277,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
The following changes since commit f02efacc515e35695e52ecd08762835c8a74a463:
Merge branch 'master' of git://git.denx.de/u-boot-cfi-flash (2011-04-25 00:58:45 +0200)
are available in the git repository at:
git://www.denx.de/git/u-boot-blackfin.git master
Mike Frysinger (3): Blackfin: bf537-stamp/bf527-ad7160-eval: convert to mmc_spi Blackfin: bf506f-ezkit: disable import/export env commands Blackfin: adi boards: add eon to the "all" spi flash list
include/configs/bf506f-ezkit.h | 2 ++ include/configs/bf527-ad7160-eval.h | 5 ++--- include/configs/bf537-stamp.h | 3 ++- include/configs/bfin_adi_common.h | 5 +++++ 4 files changed, 11 insertions(+), 4 deletions(-)
Dear Mike Frysinger,
In message 1303711621-26829-1-git-send-email-vapier@gentoo.org you wrote:
The following changes since commit f02efacc515e35695e52ecd08762835c8a74a463:
Merge branch 'master' of git://git.denx.de/u-boot-cfi-flash (2011-04-25 00:58:45 +0200)
are available in the git repository at:
git://www.denx.de/git/u-boot-blackfin.git master
Mike Frysinger (3): Blackfin: bf537-stamp/bf527-ad7160-eval: convert to mmc_spi Blackfin: bf506f-ezkit: disable import/export env commands Blackfin: adi boards: add eon to the "all" spi flash list
include/configs/bf506f-ezkit.h | 2 ++ include/configs/bf527-ad7160-eval.h | 5 ++--- include/configs/bf537-stamp.h | 3 ++- include/configs/bfin_adi_common.h | 5 +++++ 4 files changed, 11 insertions(+), 4 deletions(-)
Applied, thanks.
Best regards,
Wolfgang Denk
participants (2)
-
Mike Frysinger -
Wolfgang Denk