|
@@ -17,7 +17,8 @@
|
|
|
#include <asm/arch/cpu.h>
|
|
|
#include <asm/arch/soc.h>
|
|
|
|
|
|
-#if defined(CONFIG_SPL_SPI_FLASH_SUPPORT) || defined(CONFIG_SPL_MMC_SUPPORT) || defined(CONFIG_SPL_SATA_SUPPORT)
|
|
|
+#if defined(CONFIG_SPL_SPI_FLASH_SUPPORT) || defined(CONFIG_SPL_MMC) || \
|
|
|
+ defined(CONFIG_SPL_SATA_SUPPORT)
|
|
|
|
|
|
/*
|
|
|
* When loading U-Boot via SPL from SPI NOR, CONFIG_SYS_SPI_U_BOOT_OFFS must
|
|
@@ -39,7 +40,7 @@
|
|
|
* and CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_DATA_PART_OFFSET need to point to the
|
|
|
* kwbimage main header.
|
|
|
*/
|
|
|
-#ifdef CONFIG_SPL_MMC_SUPPORT
|
|
|
+#ifdef CONFIG_SPL_MMC
|
|
|
#ifdef CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION
|
|
|
#error CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION is unsupported
|
|
|
#endif
|
|
@@ -92,7 +93,7 @@ struct kwbimage_main_hdr_v1 {
|
|
|
uint8_t checksum; /* 0x1F */
|
|
|
} __packed;
|
|
|
|
|
|
-#ifdef CONFIG_SPL_MMC_SUPPORT
|
|
|
+#ifdef CONFIG_SPL_MMC
|
|
|
u32 spl_mmc_boot_mode(const u32 boot_device)
|
|
|
{
|
|
|
return MMCSD_MODE_RAW;
|
|
@@ -124,7 +125,7 @@ int spl_parse_board_header(struct spl_image_info *spl_image,
|
|
|
#ifdef CONFIG_SPL_SATA_SUPPORT
|
|
|
mhdr->blockid != IBR_HDR_SATA_ID &&
|
|
|
#endif
|
|
|
-#ifdef CONFIG_SPL_MMC_SUPPORT
|
|
|
+#ifdef CONFIG_SPL_MMC
|
|
|
mhdr->blockid != IBR_HDR_SDIO_ID &&
|
|
|
#endif
|
|
|
1
|
|
@@ -152,7 +153,7 @@ int spl_parse_board_header(struct spl_image_info *spl_image,
|
|
|
}
|
|
|
#endif
|
|
|
|
|
|
-#ifdef CONFIG_SPL_MMC_SUPPORT
|
|
|
+#ifdef CONFIG_SPL_MMC
|
|
|
/*
|
|
|
* For SDIO (eMMC) srcaddr is specified in number of sectors.
|
|
|
* This expects that sector size is 512 bytes and recalculates
|
|
@@ -261,7 +262,7 @@ u32 spl_boot_device(void)
|
|
|
* If SPL is compiled with chosen boot_device support
|
|
|
* then use SPL driver for loading U-Boot proper.
|
|
|
*/
|
|
|
-#ifdef CONFIG_SPL_MMC_SUPPORT
|
|
|
+#ifdef CONFIG_SPL_MMC
|
|
|
case BOOT_DEVICE_MMC1:
|
|
|
return BOOT_DEVICE_MMC1;
|
|
|
#endif
|