diff options
| author | Simon Glass <sjg@chromium.org> | 2016-09-12 23:18:44 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-09-16 17:27:13 -0400 |
| commit | 1fdf7c64edcc4131934013741b1902b79c8715fd (patch) | |
| tree | e198c8f075b1ece774c42df997fc9b661c58ca83 /include/configs | |
| parent | cc4288ef42be5bf70e7dc0fa5eb977cb4a6e894e (diff) | |
| download | u-boot-1fdf7c64edcc4131934013741b1902b79c8715fd.zip u-boot-1fdf7c64edcc4131934013741b1902b79c8715fd.tar.gz u-boot-1fdf7c64edcc4131934013741b1902b79c8715fd.tar.bz2 | |
Convert CONFIG_SPL_MMC_SUPPORT to Kconfig
Move this option to Kconfig and tidy up existing uses.
Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'include/configs')
74 files changed, 1 insertions, 92 deletions
diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h index af2eb22..69010fb 100644 --- a/include/configs/P1010RDB.h +++ b/include/configs/P1010RDB.h @@ -21,7 +21,6 @@ #ifdef CONFIG_SDCARD #define CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT #define CONFIG_SPL_SERIAL_SUPPORT -#define CONFIG_SPL_MMC_SUPPORT #define CONFIG_SPL_MMC_MINIMAL #define CONFIG_SPL_FLUSH_IMAGE #define CONFIG_SPL_TARGET "u-boot-with-spl.bin" diff --git a/include/configs/P1022DS.h b/include/configs/P1022DS.h index 4c4b275..3be00a0 100644 --- a/include/configs/P1022DS.h +++ b/include/configs/P1022DS.h @@ -16,7 +16,6 @@ #ifdef CONFIG_SDCARD #define CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT #define CONFIG_SPL_SERIAL_SUPPORT -#define CONFIG_SPL_MMC_SUPPORT #define CONFIG_SPL_MMC_MINIMAL #define CONFIG_SPL_FLUSH_IMAGE #define CONFIG_SPL_TARGET "u-boot-with-spl.bin" diff --git a/include/configs/T102xQDS.h b/include/configs/T102xQDS.h index 4214111..2697e79 100644 --- a/include/configs/T102xQDS.h +++ b/include/configs/T102xQDS.h @@ -89,7 +89,6 @@ #ifdef CONFIG_SDCARD #define CONFIG_RESET_VECTOR_ADDRESS 0x200FFC -#define CONFIG_SPL_MMC_SUPPORT #define CONFIG_SPL_MMC_MINIMAL #define CONFIG_SYS_MMC_U_BOOT_SIZE (768 << 10) #define CONFIG_SYS_MMC_U_BOOT_DST (0x00200000) diff --git a/include/configs/T102xRDB.h b/include/configs/T102xRDB.h index 0039e4c..20ca6d0 100644 --- a/include/configs/T102xRDB.h +++ b/include/configs/T102xRDB.h @@ -96,7 +96,6 @@ #ifdef CONFIG_SDCARD #define CONFIG_RESET_VECTOR_ADDRESS 0x30000FFC -#define CONFIG_SPL_MMC_SUPPORT #define CONFIG_SPL_MMC_MINIMAL #define CONFIG_SYS_MMC_U_BOOT_SIZE (768 << 10) #define CONFIG_SYS_MMC_U_BOOT_DST (0x30000000) diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h index d5970ee..36baa48 100644 --- a/include/configs/T104xRDB.h +++ b/include/configs/T104xRDB.h @@ -99,7 +99,6 @@ $(SRCTREE)/board/freescale/t104xrdb/t1042d4_rcw.cfg #ifdef CONFIG_SDCARD #define CONFIG_RESET_VECTOR_ADDRESS 0x30000FFC -#define CONFIG_SPL_MMC_SUPPORT #define CONFIG_SPL_MMC_MINIMAL #define CONFIG_SYS_MMC_U_BOOT_SIZE (768 << 10) #define CONFIG_SYS_MMC_U_BOOT_DST (0x30000000) diff --git a/include/configs/T208xQDS.h b/include/configs/T208xQDS.h index b7e1ec7..fed0dca 100644 --- a/include/configs/T208xQDS.h +++ b/include/configs/T208xQDS.h @@ -99,7 +99,6 @@ #ifdef CONFIG_SDCARD #define CONFIG_RESET_VECTOR_ADDRESS 0x200FFC -#define CONFIG_SPL_MMC_SUPPORT #define CONFIG_SPL_MMC_MINIMAL #define CONFIG_SYS_MMC_U_BOOT_SIZE (768 << 10) #define CONFIG_SYS_MMC_U_BOOT_DST (0x00200000) diff --git a/include/configs/T208xRDB.h b/include/configs/T208xRDB.h index 56fc9c6..21ef567 100644 --- a/include/configs/T208xRDB.h +++ b/include/configs/T208xRDB.h @@ -88,7 +88,6 @@ #ifdef CONFIG_SDCARD #define CONFIG_RESET_VECTOR_ADDRESS 0x200FFC -#define CONFIG_SPL_MMC_SUPPORT #define CONFIG_SPL_MMC_MINIMAL #define CONFIG_SYS_MMC_U_BOOT_SIZE (768 << 10) #define CONFIG_SYS_MMC_U_BOOT_DST (0x00200000) diff --git a/include/configs/T4240QDS.h b/include/configs/T4240QDS.h index fa79ac4..eda67e1 100644 --- a/include/configs/T4240QDS.h +++ b/include/configs/T4240QDS.h @@ -49,7 +49,6 @@ #ifdef CONFIG_SDCARD #define CONFIG_RESET_VECTOR_ADDRESS 0x200FFC -#define CONFIG_SPL_MMC_SUPPORT #define CONFIG_SPL_MMC_MINIMAL #define CONFIG_SYS_MMC_U_BOOT_SIZE (768 << 10) #define CONFIG_SYS_MMC_U_BOOT_DST 0x00200000 diff --git a/include/configs/T4240RDB.h b/include/configs/T4240RDB.h index 6533e25..4e8c586 100644 --- a/include/configs/T4240RDB.h +++ b/include/configs/T4240RDB.h @@ -39,7 +39,6 @@ #ifdef CONFIG_SDCARD #define CONFIG_RESET_VECTOR_ADDRESS 0x200FFC -#define CONFIG_SPL_MMC_SUPPORT #define CONFIG_SPL_MMC_MINIMAL #define CONFIG_SYS_MMC_U_BOOT_SIZE (768 << 10) #define CONFIG_SYS_MMC_U_BOOT_DST 0x00200000 diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h index 9c8f108..afda811 100644 --- a/include/configs/am335x_evm.h +++ b/include/configs/am335x_evm.h @@ -328,7 +328,6 @@ /* Remove other SPL modes. */ #undef CONFIG_SPL_YMODEM_SUPPORT #undef CONFIG_SPL_NAND_SUPPORT -#undef CONFIG_SPL_MMC_SUPPORT #define CONFIG_ENV_IS_NOWHERE #undef CONFIG_ENV_IS_IN_NAND /* disable host part of MUSB in SPL */ diff --git a/include/configs/am335x_shc.h b/include/configs/am335x_shc.h index bd7b28e..db3f883 100644 --- a/include/configs/am335x_shc.h +++ b/include/configs/am335x_shc.h @@ -328,7 +328,6 @@ #ifdef CONFIG_SPL_BUILD #define CONFIG_SPL_NET_SUPPORT #define CONFIG_SPL_NET_VCI_STRING "AM335x U-Boot SPL" -#define CONFIG_SPL_MMC_SUPPORT #define CONFIG_ENV_IS_NOWHERE #undef CONFIG_ENV_IS_IN_MMC #endif diff --git a/include/configs/am335x_sl50.h b/include/configs/am335x_sl50.h index b1775cc..70c7287 100644 --- a/include/configs/am335x_sl50.h +++ b/include/configs/am335x_sl50.h @@ -100,7 +100,6 @@ /* Remove other SPL modes. */ #undef CONFIG_SPL_YMODEM_SUPPORT #undef CONFIG_SPL_NAND_SUPPORT -#undef CONFIG_SPL_MMC_SUPPORT #define CONFIG_ENV_IS_NOWHERE #undef CONFIG_ENV_IS_IN_NAND /* disable host part of MUSB in SPL */ diff --git a/include/configs/am3517_crane.h b/include/configs/am3517_crane.h index de43237..53ecf69 100644 --- a/include/configs/am3517_crane.h +++ b/include/configs/am3517_crane.h @@ -287,7 +287,6 @@ #define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION 1 #define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img" -#define CONFIG_SPL_MMC_SUPPORT #define CONFIG_SPL_SERIAL_SUPPORT #define CONFIG_SPL_NAND_SUPPORT #define CONFIG_SPL_NAND_BASE diff --git a/include/configs/am3517_evm.h b/include/configs/am3517_evm.h index 075e83f..b15557f 100644 --- a/include/configs/am3517_evm.h +++ b/include/configs/am3517_evm.h @@ -344,7 +344,6 @@ #define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION 1 #define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img" -#define CONFIG_SPL_MMC_SUPPORT #define CONFIG_SPL_SERIAL_SUPPORT #define CONFIG_SPL_NAND_SUPPORT #define CONFIG_SPL_NAND_BASE diff --git a/include/configs/at91sam9m10g45ek.h b/include/configs/at91sam9m10g45ek.h index 8741e97..5e2521a 100644 --- a/include/configs/at91sam9m10g45ek.h +++ b/include/configs/at91sam9m10g45ek.h @@ -198,7 +198,6 @@ #define CONFIG_SYS_SPL_MALLOC_SIZE 0x00080000 #define CONFIG_SPL_LDSCRIPT arch/arm/mach-at91/arm926ejs/u-boot-spl.lds -#define CONFIG_SPL_MMC_SUPPORT #define CONFIG_SYS_U_BOOT_MAX_SIZE_SECTORS 0x400 #define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR 0x200 #define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION 1 diff --git a/include/configs/at91sam9n12ek.h b/include/configs/at91sam9n12ek.h index 93d4678..66e570d 100644 --- a/include/configs/at91sam9n12ek.h +++ b/include/configs/at91sam9n12ek.h @@ -242,7 +242,6 @@ #ifdef CONFIG_SYS_USE_MMC #define CONFIG_SPL_LDSCRIPT arch/arm/mach-at91/arm926ejs/u-boot-spl.lds -#define CONFIG_SPL_MMC_SUPPORT #define CONFIG_SYS_U_BOOT_MAX_SIZE_SECTORS 0x400 #define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR 0x200 #define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION 1 diff --git a/include/configs/at91sam9x5ek.h b/include/configs/at91sam9x5ek.h index bb0e120..c110dd7 100644 --- a/include/configs/at91sam9x5ek.h +++ b/include/configs/at91sam9x5ek.h @@ -242,7 +242,6 @@ #ifdef CONFIG_SYS_USE_MMC #define CONFIG_SPL_LDSCRIPT arch/arm/mach-at91/arm926ejs/u-boot-spl.lds -#define CONFIG_SPL_MMC_SUPPORT #define CONFIG_SYS_U_BOOT_MAX_SIZE_SECTORS 0x400 #define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR 0x200 #define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION 1 diff --git a/include/configs/brppt1.h b/include/configs/brppt1.h index b0fba16..b5ea8ba 100644 --- a/include/configs/brppt1.h +++ b/include/configs/brppt1.h @@ -57,7 +57,6 @@ /* RAW SD card / eMMC locations. */ #define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR 0x300 /*addr. 0x60000 */ #define CONFIG_SYS_U_BOOT_MAX_SIZE_SECTORS 0x200 /* 256 KB */ - #define CONFIG_SPL_MMC_SUPPORT #endif /* CONFIG_EMMC_BOOT */ /* diff --git a/include/configs/brxre1.h b/include/configs/brxre1.h index 3035eed..1e8426f 100644 --- a/include/configs/brxre1.h +++ b/include/configs/brxre1.h @@ -51,7 +51,6 @@ /* RAW SD card / eMMC locations. */ #define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR 0x300 /*addr. 0x60000 */ #define CONFIG_SYS_U_BOOT_MAX_SIZE_SECTORS 0x200 /* 256 KB */ -#define CONFIG_SPL_MMC_SUPPORT /* Always 64 KiB env size */ #define CONFIG_ENV_SIZE (64 << 10) diff --git a/include/configs/cgtqmx6eval.h b/include/configs/cgtqmx6eval.h index 1038944..91b7959 100644 --- a/include/configs/cgtqmx6eval.h +++ b/include/configs/cgtqmx6eval.h @@ -18,7 +18,6 @@ #define CONFIG_MACH_TYPE 4122 #ifdef CONFIG_SPL -#define CONFIG_SPL_MMC_SUPPORT #define CONFIG_SPL_SPI_SUPPORT #define CONFIG_SPL_SPI_FLASH_SUPPORT #define CONFIG_SYS_SPI_U_BOOT_OFFS (64 * 1024) diff --git a/include/configs/clearfog.h b/include/configs/clearfog.h index e27b8a4..28175d1 100644 --- a/include/configs/clearfog.h +++ b/include/configs/clearfog.h @@ -136,7 +136,6 @@ #if CONFIG_SPL_BOOT_DEVICE == SPL_BOOT_SDIO_MMC_CARD /* SPL related MMC defines */ -#define CONFIG_SPL_MMC_SUPPORT #define CONFIG_SYS_MMC_U_BOOT_OFFS (160 << 10) #define CONFIG_SYS_U_BOOT_OFFS CONFIG_SYS_MMC_U_BOOT_OFFS #define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR ((CONFIG_SYS_U_BOOT_OFFS / 512)\ diff --git a/include/configs/cm_fx6.h b/include/configs/cm_fx6.h index c839b03..6a0c2af 100644 --- a/include/configs/cm_fx6.h +++ b/include/configs/cm_fx6.h @@ -247,9 +247,8 @@ /* SPL */ #include "imx6_spl.h" -#define CONFIG_SPL_MMC_SUPPORT +#undef CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR #define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR 0x80 /* offset 64 kb */ -#define CONFIG_SYS_MONITOR_LEN (CONFIG_SYS_U_BOOT_MAX_SIZE_SECTORS / 2 * 1024) #define CONFIG_SPL_SPI_SUPPORT #define CONFIG_SPL_SPI_FLASH_SUPPORT #define CONFIG_SYS_SPI_U_BOOT_OFFS (64 * 1024) diff --git a/include/configs/cm_t35.h b/include/configs/cm_t35.h index de66ff6..8821821 100644 --- a/include/configs/cm_t35.h +++ b/include/configs/cm_t35.h @@ -306,7 +306,6 @@ #define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img" #define CONFIG_SPL_BOARD_INIT -#define CONFIG_SPL_MMC_SUPPORT #define CONFIG_SPL_SERIAL_SUPPORT #define CONFIG_SPL_NAND_SUPPORT #define CONFIG_SPL_NAND_BASE diff --git a/include/configs/da850evm.h b/include/configs/da850evm.h index bb5d6bc..358df3e 100644 --- a/include/configs/da850evm.h +++ b/include/configs/da850evm.h @@ -353,7 +353,6 @@ /* Load U-Boot Image From MMC */ #ifdef CONFIG_SPL_MMC_LOAD -#define CONFIG_SPL_MMC_SUPPORT #define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR 0x75 #undef CONFIG_SPL_SPI_SUPPORT #undef CONFIG_SPL_SPI_LOAD diff --git a/include/configs/db-88f6820-gp.h b/include/configs/db-88f6820-gp.h index 8de10e7..dcaa4ed 100644 --- a/include/configs/db-88f6820-gp.h +++ b/include/configs/db-88f6820-gp.h @@ -137,7 +137,6 @@ #if CONFIG_SPL_BOOT_DEVICE == SPL_BOOT_SDIO_MMC_CARD /* SPL related MMC defines */ -#define CONFIG_SPL_MMC_SUPPORT #define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_PARTITION 1 #define CONFIG_SYS_MMC_U_BOOT_OFFS (160 << 10) #define CONFIG_SYS_U_BOOT_OFFS CONFIG_SYS_MMC_U_BOOT_OFFS diff --git a/include/configs/dra7xx_evm.h b/include/configs/dra7xx_evm.h index 9251040..c1d9a6e 100644 --- a/include/configs/dra7xx_evm.h +++ b/include/configs/dra7xx_evm.h @@ -182,10 +182,6 @@ #define CONFIG_SYS_SPI_ARGS_OFFS 0x140000 #define CONFIG_SYS_SPI_ARGS_SIZE 0x80000 #if defined(CONFIG_QSPI_BOOT) -/* In SPL, use the environment and discard MMC support for space. */ -#ifdef CONFIG_SPL_BUILD -#undef CONFIG_SPL_MMC_SUPPORT -#endif #define CONFIG_ENV_IS_IN_SPI_FLASH #define CONFIG_SYS_REDUNDAND_ENVIRONMENT #define CONFIG_ENV_SPI_MAX_HZ CONFIG_SF_DEFAULT_SPEED diff --git a/include/configs/el6x_common.h b/include/configs/el6x_common.h index f83cda8..4447401 100644 --- a/include/configs/el6x_common.h +++ b/include/configs/el6x_common.h @@ -25,7 +25,6 @@ #define CONFIG_MXC_UART #ifdef CONFIG_SPL -#define CONFIG_SPL_MMC_SUPPORT #define CONFIG_SPL_SPI_SUPPORT #define CONFIG_SPL_SPI_FLASH_SUPPORT #define CONFIG_SYS_SPI_U_BOOT_OFFS (64 * 1024) diff --git a/include/configs/evb_rk3288.h b/include/configs/evb_rk3288.h index 342557f..390c243 100644 --- a/include/configs/evb_rk3288.h +++ b/include/configs/evb_rk3288.h @@ -10,8 +10,6 @@ #define ROCKCHIP_DEVICE_SETTINGS #include <configs/rk3288_common.h> -#define CONFIG_SPL_MMC_SUPPORT - #define CONFIG_ENV_IS_IN_MMC #define CONFIG_SYS_MMC_ENV_DEV 1 /* SPL @ 32k for ~36k diff --git a/include/configs/fennec_rk3288.h b/include/configs/fennec_rk3288.h index 342557f..390c243 100644 --- a/include/configs/fennec_rk3288.h +++ b/include/configs/fennec_rk3288.h @@ -10,8 +10,6 @@ #define ROCKCHIP_DEVICE_SETTINGS #include <configs/rk3288_common.h> -#define CONFIG_SPL_MMC_SUPPORT - #define CONFIG_ENV_IS_IN_MMC #define CONFIG_SYS_MMC_ENV_DEV 1 /* SPL @ 32k for ~36k diff --git a/include/configs/firefly-rk3288.h b/include/configs/firefly-rk3288.h index a29f557..ee924c3 100644 --- a/include/configs/firefly-rk3288.h +++ b/include/configs/firefly-rk3288.h @@ -14,8 +14,6 @@ #include <configs/rk3288_common.h> -#define CONFIG_SPL_MMC_SUPPORT - #define CONFIG_ENV_IS_IN_MMC #define CONFIG_SYS_MMC_ENV_DEV 0 /* SPL @ 32k for ~36k diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h index bcfa096..a72eeaf 100644 --- a/include/configs/gw_ventana.h +++ b/include/configs/gw_ventana.h @@ -10,7 +10,6 @@ /* SPL */ #define CONFIG_SPL_BOARD_INIT #define CONFIG_SPL_NAND_SUPPORT -#define CONFIG_SPL_MMC_SUPPORT #define CONFIG_SPL_POWER_SUPPORT /* Location in NAND to read U-Boot from */ #define CONFIG_SYS_NAND_U_BOOT_OFFS (14 * SZ_1M) diff --git a/include/configs/kc1.h b/include/configs/kc1.h index f598b29..78991f3 100644 --- a/include/configs/kc1.h +++ b/include/configs/kc1.h @@ -131,7 +131,6 @@ #define CONFIG_SPL_SERIAL_SUPPORT #define CONFIG_SPL_POWER_SUPPORT -#define CONFIG_SPL_MMC_SUPPORT #define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_PARTITION 2 diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h index 3991b1c..9f32716 100644 --- a/include/configs/ls1021aqds.h +++ b/include/configs/ls1021aqds.h @@ -70,7 +70,6 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT #define CONFIG_SPL_WATCHDOG_SUPPORT #define CONFIG_SPL_SERIAL_SUPPORT -#define CONFIG_SPL_MMC_SUPPORT #define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR 0xe8 #define CONFIG_SYS_U_BOOT_MAX_SIZE_SECTORS 0x600 diff --git a/include/configs/ls1021atwr.h b/include/configs/ls1021atwr.h index 0aac58f..4656d68 100644 --- a/include/configs/ls1021atwr.h +++ b/include/configs/ls1021atwr.h @@ -115,7 +115,6 @@ #define CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT #define CONFIG_SPL_WATCHDOG_SUPPORT #define CONFIG_SPL_SERIAL_SUPPORT -#define CONFIG_SPL_MMC_SUPPORT #define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR 0xe8 #ifdef CONFIG_SECURE_BOOT diff --git a/include/configs/ls1043a_common.h b/include/configs/ls1043a_common.h index a74f19e..15c9aa9 100644 --- a/include/configs/ls1043a_common.h +++ b/include/configs/ls1043a_common.h @@ -63,7 +63,6 @@ #define CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT #define CONFIG_SPL_WATCHDOG_SUPPORT #define CONFIG_SPL_SERIAL_SUPPORT -#define CONFIG_SPL_MMC_SUPPORT #define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR 0xf0 #define CONFIG_SYS_U_BOOT_MAX_SIZE_SECTORS 0x500 diff --git a/include/configs/mcx.h b/include/configs/mcx.h index 55cf166..62ee588 100644 --- a/include/configs/mcx.h +++ b/include/configs/mcx.h @@ -320,7 +320,6 @@ #define CONFIG_SPL_BOARD_INIT #define CONFIG_SPL_NAND_SIMPLE -#define CONFIG_SPL_MMC_SUPPORT #define CONFIG_SPL_SERIAL_SUPPORT #define CONFIG_SPL_POWER_SUPPORT #define CONFIG_SPL_NAND_SUPPORT diff --git a/include/configs/miniarm_rk3288.h b/include/configs/miniarm_rk3288.h index 342557f..390c243 100644 --- a/include/configs/miniarm_rk3288.h +++ b/include/configs/miniarm_rk3288.h @@ -10,8 +10,6 @@ #define ROCKCHIP_DEVICE_SETTINGS #include <configs/rk3288_common.h> -#define CONFIG_SPL_MMC_SUPPORT - #define CONFIG_ENV_IS_IN_MMC #define CONFIG_SYS_MMC_ENV_DEV 1 /* SPL @ 32k for ~36k diff --git a/include/configs/mx6cuboxi.h b/include/configs/mx6cuboxi.h index 5291d08..237ef04 100644 --- a/include/configs/mx6cuboxi.h +++ b/include/configs/mx6cuboxi.h @@ -11,7 +11,6 @@ #include <config_distro_defaults.h> #include "mx6_common.h" -#define CONFIG_SPL_MMC_SUPPORT #include "imx6_spl.h" #define CONFIG_IMX_THERMAL diff --git a/include/configs/mx6sabresd.h b/include/configs/mx6sabresd.h index 70d6a8c..5c2734d 100644 --- a/include/configs/mx6sabresd.h +++ b/include/configs/mx6sabresd.h @@ -10,7 +10,6 @@ #define __MX6QSABRESD_CONFIG_H #ifdef CONFIG_SPL -#define CONFIG_SPL_MMC_SUPPORT #include "imx6_spl.h" #endif diff --git a/include/configs/mx6slevk.h b/include/configs/mx6slevk.h index 5f25054..501d7de 100644 --- a/include/configs/mx6slevk.h +++ b/include/configs/mx6slevk.h @@ -12,7 +12,6 @@ #include "mx6_common.h" #ifdef CONFIG_SPL -#define CONFIG_SPL_MMC_SUPPORT #include "imx6_spl.h" #endif diff --git a/include/configs/mx6sxsabresd.h b/include/configs/mx6sxsabresd.h index 473e4eb..4c61999 100644 --- a/include/configs/mx6sxsabresd.h +++ b/include/configs/mx6sxsabresd.h @@ -12,7 +12,6 @@ #include "mx6_common.h" #ifdef CONFIG_SPL -#define CONFIG_SPL_MMC_SUPPORT #include "imx6_spl.h" #endif diff --git a/include/configs/mx6ul_14x14_evk.h b/include/configs/mx6ul_14x14_evk.h index 5821574..823405f 100644 --- a/include/configs/mx6ul_14x14_evk.h +++ b/include/configs/mx6ul_14x14_evk.h @@ -16,7 +16,6 @@ #define is_mx6ul_9x9_evk() CONFIG_IS_ENABLED(TARGET_MX6UL_9X9_EVK) /* SPL options */ -#define CONFIG_SPL_MMC_SUPPORT #include "imx6_spl.h" #define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG diff --git a/include/configs/novena.h b/include/configs/novena.h index f8902e8..8cb0282 100644 --- a/include/configs/novena.h +++ b/include/configs/novena.h @@ -72,7 +72,6 @@ #define CONFIG_SYS_MALLOC_LEN (64 * 1024 * 1024) /* SPL */ -#define CONFIG_SPL_MMC_SUPPORT #include "imx6_spl.h" /* common IMX6 SPL configuration */ /* Ethernet Configuration */ diff --git a/include/configs/omap3_evm.h b/include/configs/omap3_evm.h index a9b4efe..9795757 100644 --- a/include/configs/omap3_evm.h +++ b/include/configs/omap3_evm.h @@ -56,7 +56,6 @@ #define CONFIG_OMAP_HSMMC /* SPL */ -#define CONFIG_SPL_MMC_SUPPORT #define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR 0x300 /* address 0x60000 */ #define CONFIG_SYS_U_BOOT_MAX_SIZE_SECTORS 0x200 /* 256 KB */ #define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION 1 diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h index b729cfb..87542ed 100644 --- a/include/configs/p1_p2_rdb_pc.h +++ b/include/configs/p1_p2_rdb_pc.h @@ -183,7 +183,6 @@ #ifdef CONFIG_SDCARD #define CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT #define CONFIG_SPL_SERIAL_SUPPORT -#define CONFIG_SPL_MMC_SUPPORT #define CONFIG_SPL_MMC_MINIMAL #define CONFIG_SPL_FLUSH_IMAGE #define CONFIG_SPL_TARGET "u-boot-with-spl.bin" diff --git a/include/configs/pcm058.h b/include/configs/pcm058.h index 48eba28..ffe8611 100644 --- a/include/configs/pcm058.h +++ b/include/configs/pcm058.h @@ -12,7 +12,6 @@ #ifdef CONFIG_SPL #define CONFIG_SPL_YMODEM_SUPPORT -#define CONFIG_SPL_MMC_SUPPORT #define CONFIG_SPL_SPI_SUPPORT #define CONFIG_SPL_SPI_FLASH_SUPPORT #define CONFIG_SPL_SPI_LOAD diff --git a/include/configs/picosam9g45.h b/include/configs/picosam9g45.h index 7096abe..750f76a 100644 --- a/include/configs/picosam9g45.h +++ b/include/configs/picosam9g45.h @@ -176,7 +176,6 @@ #define CONFIG_SYS_SPL_MALLOC_SIZE 0x00080000 #define CONFIG_SPL_LDSCRIPT arch/arm/mach-at91/arm926ejs/u-boot-spl.lds -#define CONFIG_SPL_MMC_SUPPORT #define CONFIG_SYS_U_BOOT_MAX_SIZE_SECTORS 0x400 #define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR 0x200 #define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION 1 diff --git a/include/configs/platinum.h b/include/configs/platinum.h index 34ce086..b007b72 100644 --- a/include/configs/platinum.h +++ b/include/configs/platinum.h @@ -9,7 +9,6 @@ /* SPL */ #define CONFIG_SPL_NAND_SUPPORT -#define CONFIG_SPL_MMC_SUPPORT /* Location in NAND to read U-Boot from */ #define CONFIG_SYS_NAND_U_BOOT_OFFS (14 * 1024 * 1024) diff --git a/include/configs/popmetal_rk3288.h b/include/configs/popmetal_rk3288.h index 342557f..390c243 100644 --- a/include/configs/popmetal_rk3288.h +++ b/include/configs/popmetal_rk3288.h @@ -10,8 +10,6 @@ #define ROCKCHIP_DEVICE_SETTINGS #include <configs/rk3288_common.h> -#define CONFIG_SPL_MMC_SUPPORT - #define CONFIG_ENV_IS_IN_MMC #define CONFIG_SYS_MMC_ENV_DEV 1 /* SPL @ 32k for ~36k diff --git a/include/configs/rock2.h b/include/configs/rock2.h index a29f557..ee924c3 100644 --- a/include/configs/rock2.h +++ b/include/configs/rock2.h @@ -14,8 +14,6 @@ #include <configs/rk3288_common.h> -#define CONFIG_SPL_MMC_SUPPORT - #define CONFIG_ENV_IS_IN_MMC #define CONFIG_SYS_MMC_ENV_DEV 0 /* SPL @ 32k for ~36k diff --git a/include/configs/sama5d2_xplained.h b/include/configs/sama5d2_xplained.h index 001bf63..d074c01 100644 --- a/include/configs/sama5d2_xplained.h +++ b/include/configs/sama5d2_xplained.h @@ -132,7 +132,6 @@ #ifdef CONFIG_SYS_USE_MMC #define CONFIG_SPL_LDSCRIPT arch/arm/mach-at91/armv7/u-boot-spl.lds -#define CONFIG_SPL_MMC_SUPPORT #define CONFIG_SYS_U_BOOT_MAX_SIZE_SECTORS 0x400 #define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR 0x200 #define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION 1 diff --git a/include/configs/sama5d3_xplained.h b/include/configs/sama5d3_xplained.h index d1881bb..f07c361 100644 --- a/include/configs/sama5d3_xplained.h +++ b/include/configs/sama5d3_xplained.h @@ -131,7 +131,6 @@ #ifdef CONFIG_SYS_USE_MMC #define CONFIG_SPL_LDSCRIPT arch/arm/mach-at91/armv7/u-boot-spl.lds -#define CONFIG_SPL_MMC_SUPPORT #define CONFIG_SYS_U_BOOT_MAX_SIZE_SECTORS 0x400 #define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR 0x200 #define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION 1 diff --git a/include/configs/sama5d3xek.h b/include/configs/sama5d3xek.h index 1d57e9c..fcc3e13 100644 --- a/include/configs/sama5d3xek.h +++ b/include/configs/sama5d3xek.h @@ -171,7 +171,6 @@ #ifdef CONFIG_SYS_USE_MMC #define CONFIG_SPL_LDSCRIPT arch/arm/mach-at91/armv7/u-boot-spl.lds -#define CONFIG_SPL_MMC_SUPPORT #define CONFIG_SYS_U_BOOT_MAX_SIZE_SECTORS 0x400 #define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR 0x200 #define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION 1 diff --git a/include/configs/sama5d4_xplained.h b/include/configs/sama5d4_xplained.h index 4b608c5..074d31d 100644 --- a/include/configs/sama5d4_xplained.h +++ b/include/configs/sama5d4_xplained.h @@ -131,7 +131,6 @@ #ifdef CONFIG_SYS_USE_MMC #define CONFIG_SPL_LDSCRIPT arch/arm/mach-at91/armv7/u-boot-spl.lds -#define CONFIG_SPL_MMC_SUPPORT #define CONFIG_SYS_U_BOOT_MAX_SIZE_SECTORS 0x400 #define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR 0x200 #define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION 1 diff --git a/include/configs/sama5d4ek.h b/include/configs/sama5d4ek.h index b991ad0..88c9ba2 100644 --- a/include/configs/sama5d4ek.h +++ b/include/configs/sama5d4ek.h @@ -129,7 +129,6 @@ #ifdef CONFIG_SYS_USE_MMC #define CONFIG_SPL_LDSCRIPT arch/arm/mach-at91/armv7/u-boot-spl.lds -#define CONFIG_SPL_MMC_SUPPORT #define CONFIG_SYS_U_BOOT_MAX_SIZE_SECTORS 0x400 #define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR 0x200 #define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION 1 diff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h index 41e53c1..ec4f084 100644 --- a/include/configs/siemens-am33x-common.h +++ b/include/configs/siemens-am33x-common.h @@ -133,7 +133,6 @@ #define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR 0x300 /* address 0x60000 */ #define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION 1 #define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img" -#define CONFIG_SPL_MMC_SUPPORT #define CONFIG_FS_FAT #define CONFIG_SPL_SERIAL_SUPPORT diff --git a/include/configs/sniper.h b/include/configs/sniper.h index 7983e03..20146b0 100644 --- a/include/configs/sniper.h +++ b/include/configs/sniper.h @@ -139,7 +139,6 @@ #define CONFIG_SPL_SERIAL_SUPPORT #define CONFIG_SPL_POWER_SUPPORT -#define CONFIG_SPL_MMC_SUPPORT #define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_PARTITION 2 diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h index fcdb305..d6cb7e3 100644 --- a/include/configs/socfpga_common.h +++ b/include/configs/socfpga_common.h @@ -324,9 +324,6 @@ unsigned int cm_get_qspi_controller_clk_hz(void); #define CONFIG_SPL_WATCHDOG_SUPPORT #define CONFIG_SPL_SERIAL_SUPPORT -#ifdef CONFIG_DM_MMC -#define CONFIG_SPL_MMC_SUPPORT -#endif #ifdef CONFIG_DM_SPI #define CONFIG_SPL_SPI_SUPPORT #endif diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h index de0a50b..a1a4aaa 100644 --- a/include/configs/sunxi-common.h +++ b/include/configs/sunxi-common.h @@ -204,10 +204,6 @@ #define CONFIG_SPL_MAX_SIZE 0x5fc0 /* 24KB on sun4i/sun7i */ #endif -#ifdef CONFIG_MMC -#define CONFIG_SPL_MMC_SUPPORT -#endif - #ifndef CONFIG_ARM64 #define CONFIG_SPL_LDSCRIPT "arch/arm/cpu/armv7/sunxi/u-boot-spl.lds" #endif diff --git a/include/configs/tam3517-common.h b/include/configs/tam3517-common.h index c8d5b6a..c0e92c5 100644 --- a/include/configs/tam3517-common.h +++ b/include/configs/tam3517-common.h @@ -201,7 +201,6 @@ #define CONFIG_SPL_NAND_SOFTECC #define CONFIG_SPL_NAND_WORKSPACE 0x8f07f000 /* below BSS */ -#define CONFIG_SPL_MMC_SUPPORT #define CONFIG_SPL_SERIAL_SUPPORT #define CONFIG_SPL_POWER_SUPPORT #define CONFIG_SPL_NAND_SUPPORT diff --git a/include/configs/tao3530.h b/include/configs/tao3530.h index 9653e86..8caf552 100644 --- a/include/configs/tao3530.h +++ b/include/configs/tao3530.h @@ -288,7 +288,6 @@ #define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img" #define CONFIG_SPL_BOARD_INIT -#define CONFIG_SPL_MMC_SUPPORT #define CONFIG_SPL_SERIAL_SUPPORT #define CONFIG_SPL_NAND_SUPPORT #define CONFIG_SPL_NAND_BASE diff --git a/include/configs/ti814x_evm.h b/include/configs/ti814x_evm.h index fa7b893..c92de74 100644 --- a/include/configs/ti814x_evm.h +++ b/include/configs/ti814x_evm.h @@ -166,7 +166,6 @@ #define CONFIG_SYS_U_BOOT_MAX_SIZE_SECTORS 0x200 /* 256 KB */ #define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION 1 #define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img" -#define CONFIG_SPL_MMC_SUPPORT #define CONFIG_SPL_SERIAL_SUPPORT #define CONFIG_SPL_YMODEM_SUPPORT diff --git a/include/configs/ti816x_evm.h b/include/configs/ti816x_evm.h index 17a0a60..67546b5 100644 --- a/include/configs/ti816x_evm.h +++ b/include/configs/ti816x_evm.h @@ -132,7 +132,6 @@ #define CONFIG_SYS_U_BOOT_MAX_SIZE_SECTORS 0x200 /* 256 KB */ #define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION 1 #define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img" -#define CONFIG_SPL_MMC_SUPPORT #define CONFIG_SPL_SERIAL_SUPPORT #define CONFIG_SPL_YMODEM_SUPPORT diff --git a/include/configs/ti_armv7_common.h b/include/configs/ti_armv7_common.h index e8fae15..deefdb3 100644 --- a/include/configs/ti_armv7_common.h +++ b/include/configs/ti_armv7_common.h @@ -260,10 +260,6 @@ #define CONFIG_CMD_SPL #endif -#ifdef CONFIG_MMC -#define CONFIG_SPL_MMC_SUPPORT -#endif - #define CONFIG_SYS_THUMB_BUILD /* General parts of the framework, required. */ diff --git a/include/configs/ti_armv7_keystone2.h b/include/configs/ti_armv7_keystone2.h index 7d567c2..f61eebd 100644 --- a/include/configs/ti_armv7_keystone2.h +++ b/include/configs/ti_armv7_keystone2.h @@ -307,7 +307,6 @@ #undef CONFIG_SPL_OS_BOOT /* We do not have MMC support.. yet.. */ -#undef CONFIG_SPL_MMC_SUPPORT #undef CONFIG_MMC #undef CONFIG_GENERIC_MMC diff --git a/include/configs/tqma6.h b/include/configs/tqma6.h index be8920e..95d7692 100644 --- a/include/configs/tqma6.h +++ b/include/configs/tqma6.h @@ -13,7 +13,6 @@ /* SPL */ /* #if defined(CONFIG_SPL_BUILD) */ -#define CONFIG_SPL_MMC_SUPPORT #define CONFIG_SPL_SPI_SUPPORT /* common IMX6 SPL configuration */ diff --git a/include/configs/tricorder.h b/include/configs/tricorder.h index f369477..fb453ac 100644 --- a/include/configs/tricorder.h +++ b/include/configs/tricorder.h @@ -325,7 +325,6 @@ #define CONFIG_SPL_NAND_BASE #define CONFIG_SPL_NAND_DRIVERS #define CONFIG_SPL_NAND_ECC -#define CONFIG_SPL_MMC_SUPPORT #define CONFIG_SPL_LDSCRIPT "$(CPUDIR)/omap-common/u-boot-spl.lds" #define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img" #define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION 1 diff --git a/include/configs/udoo.h b/include/configs/udoo.h index 7e80297..0a7767c 100644 --- a/include/configs/udoo.h +++ b/include/configs/udoo.h @@ -11,7 +11,6 @@ #include "mx6_common.h" -#define CONFIG_SPL_MMC_SUPPORT #include "imx6_spl.h" #define MACH_TYPE_UDOO 4800 diff --git a/include/configs/uniphier.h b/include/configs/uniphier.h index 94e76b2..4414960 100644 --- a/include/configs/uniphier.h +++ b/include/configs/uniphier.h @@ -283,7 +283,6 @@ #define CONFIG_SPL_BOARD_LOAD_IMAGE #else #define CONFIG_SPL_NAND_SUPPORT -#define CONFIG_SPL_MMC_SUPPORT #endif #define CONFIG_SPL_BOARD_INIT diff --git a/include/configs/wandboard.h b/include/configs/wandboard.h index 35d3869..69d0fd5 100644 --- a/include/configs/wandboard.h +++ b/include/configs/wandboard.h @@ -12,7 +12,6 @@ #include <config_distro_defaults.h> #include "mx6_common.h" -#define CONFIG_SPL_MMC_SUPPORT #include "imx6_spl.h" #define MACH_TYPE_WANDBOARD 4412 diff --git a/include/configs/woodburn_sd.h b/include/configs/woodburn_sd.h index 8ccd7eb..418d859 100644 --- a/include/configs/woodburn_sd.h +++ b/include/configs/woodburn_sd.h @@ -23,7 +23,6 @@ #define CONFIG_SPL_FRAMEWORK #define CONFIG_SPL_LDSCRIPT "arch/arm/cpu/arm1136/u-boot-spl.lds" #define CONFIG_SPL_SERIAL_SUPPORT -#define CONFIG_SPL_MMC_SUPPORT #define CONFIG_SPL_BOARD_INIT #define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR 0x100 /* address 0x60000 */ #define CONFIG_SYS_U_BOOT_MAX_SIZE_SECTORS 0x400 /* 512 KB */ diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h index b3f865b..88c9fc5 100644 --- a/include/configs/xilinx_zynqmp.h +++ b/include/configs/xilinx_zynqmp.h @@ -277,7 +277,6 @@ /* MMC support */ #ifdef CONFIG_ZYNQ_SDHCI -# define CONFIG_SPL_MMC_SUPPORT # define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION 1 # define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR 0 /* unused */ # define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS 0 /* unused */ diff --git a/include/configs/xpress.h b/include/configs/xpress.h index 8d57101..dd28e6a 100644 --- a/include/configs/xpress.h +++ b/include/configs/xpress.h @@ -12,7 +12,6 @@ #include <asm/imx-common/gpio.h> /* SPL options */ -#define CONFIG_SPL_MMC_SUPPORT #include "imx6_spl.h" #define CONFIG_DISPLAY_CPUINFO diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h index 6da611f..226285c 100644 --- a/include/configs/zynq-common.h +++ b/include/configs/zynq-common.h @@ -301,7 +301,6 @@ /* MMC support */ #ifdef CONFIG_ZYNQ_SDHCI -#define CONFIG_SPL_MMC_SUPPORT #define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR 0x300 /* address 0x60000 */ #define CONFIG_SYS_U_BOOT_MAX_SIZE_SECTORS 0x200 /* 256 KB */ #define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION 1 |