Convert CONFIG_FIXED_SDHCI_ALIGNED_BUFFER to Kconfig

CONFIG_FIXED_SDHCI_ALIGNED_BUFFER is needed on some Marvell SoCs when
booting from MMC. All existing usages of this have the same value so
make this the default and have the Kconfig option depend on SPL &&
MVEBU_SPL_BOOT_DEVICE_MMC.

Signed-off-by: Chris Packham <judge.packham@gmail.com>
Reviewed-by: Marek Behún <marek.behun@nic.cz>
Reviewed-by: Stefan Roese <sr@denx.de>
This commit is contained in:
Chris Packham 2022-05-29 11:13:17 +12:00 committed by Tom Rini
parent bfbd62f691
commit b19512f1cf
6 changed files with 13 additions and 39 deletions

View file

@ -484,6 +484,19 @@ config SPL_MMC_SDHCI_ADMA
This enables support for the ADMA (Advanced DMA) defined
in the SD Host Controller Standard Specification Version 3.00 in SPL.
config FIXED_SDHCI_ALIGNED_BUFFER
hex "SDRAM address for fixed buffer"
depends on SPL && MVEBU_SPL_BOOT_DEVICE_MMC
default 0x00180000
help
On the Marvell Armada 38x when the SPL runs it located in internal
SRAM which is the L2 cache locked to memory. When the MMC buffers
are located on the stack (or bss), the SDIO controller (SDHCI) can't
write into this L2 cache memory.
This specifies the address of a fixed buffer located in SDRAM that
will be used for all SDHCI transfers in the SPL.
config MMC_SDHCI_ASPEED
bool "Aspeed SDHCI controller"
depends on ARCH_ASPEED

View file

@ -40,15 +40,6 @@
"fdt_high=0x10000000\0" \
"initrd_high=0x10000000\0"
/* SPL */
#if defined(CONFIG_MVEBU_SPL_BOOT_DEVICE_MMC) || defined(CONFIG_MVEBU_SPL_BOOT_DEVICE_SATA)
/* SPL related MMC defines */
#ifdef CONFIG_SPL_BUILD
#define CONFIG_FIXED_SDHCI_ALIGNED_BUFFER 0x00180000 /* in SDRAM */
#endif
#endif
/*
* mv-common.h should be defined after CMD configs since it used them
* to enable certain macros

View file

@ -34,13 +34,6 @@
#define SPL_BOOT_SDIO_MMC_CARD 2
#define CONFIG_SPL_BOOT_DEVICE SPL_BOOT_SPI_NOR_FLASH
#if CONFIG_SPL_BOOT_DEVICE == SPL_BOOT_SDIO_MMC_CARD
/* SPL related MMC defines */
#ifdef CONFIG_SPL_BUILD
#define CONFIG_FIXED_SDHCI_ALIGNED_BUFFER 0x00180000 /* in SDRAM */
#endif
#endif
/*
* Environment Configuration
*/

View file

@ -39,13 +39,6 @@
#define SPL_BOOT_SDIO_MMC_CARD 2
#define CONFIG_SPL_BOOT_DEVICE SPL_BOOT_SPI_NOR_FLASH
#if CONFIG_SPL_BOOT_DEVICE == SPL_BOOT_SDIO_MMC_CARD
/* SPL related MMC defines */
#ifdef CONFIG_SPL_BUILD
#define CONFIG_FIXED_SDHCI_ALIGNED_BUFFER 0x00180000 /* in SDRAM */
#endif
#endif
/*
* mv-common.h should be defined after CMD configs since it used them
* to enable certain macros

View file

@ -40,15 +40,6 @@
"fdt_high=0x10000000\0" \
"initrd_high=0x10000000\0"
/* SPL */
#if defined(CONFIG_MVEBU_SPL_BOOT_DEVICE_MMC) || defined(CONFIG_MVEBU_SPL_BOOT_DEVICE_SATA)
/* SPL related MMC defines */
#ifdef CONFIG_SPL_BUILD
#define CONFIG_FIXED_SDHCI_ALIGNED_BUFFER 0x00180000 /* in SDRAM */
#endif
#endif
/*
* mv-common.h should be defined after CMD configs since it used them
* to enable certain macros

View file

@ -26,13 +26,6 @@
"fdt_high=0x10000000\0" \
"initrd_high=0x10000000\0"
#ifdef CONFIG_MVEBU_SPL_BOOT_DEVICE_MMC
/* SPL related MMC defines */
# ifdef CONFIG_SPL_BUILD
# define CONFIG_FIXED_SDHCI_ALIGNED_BUFFER 0x00180000 /* in SDRAM */
# endif
#endif
/*
* mv-common.h should be defined after CMD configs since it used them
* to enable certain macros