From 103d1aecb0b9e48955d4cd90aa3dbc0a22a1fab9 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Sat, 28 May 2022 17:21:03 -0400 Subject: Convert CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR et al to Kconfig This converts the following to Kconfig: CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS Signed-off-by: Tom Rini --- include/configs/brppt1.h | 2 -- include/configs/devkit8000.h | 5 ----- include/configs/display5.h | 3 --- include/configs/embestmx6boards.h | 3 --- include/configs/gw_ventana.h | 2 -- include/configs/imx6-engicam.h | 2 -- include/configs/imx6_logic.h | 2 -- include/configs/imx6dl-mamoj.h | 2 -- include/configs/ls1043ardb.h | 5 ----- include/configs/mccmon6.h | 2 -- include/configs/mx6sabreauto.h | 2 -- include/configs/mx6sabresd.h | 2 -- include/configs/pico-imx6.h | 2 -- include/configs/pico-imx6ul.h | 2 -- include/configs/pico-imx7d.h | 2 -- include/configs/sama5d3_xplained.h | 2 -- include/configs/ti_armv7_common.h | 2 -- include/configs/vyasa-rk3288.h | 2 -- include/configs/xea.h | 3 --- include/configs/xilinx_zynqmp.h | 4 ---- include/configs/zynq-common.h | 2 -- 21 files changed, 53 deletions(-) (limited to 'include') diff --git a/include/configs/brppt1.h b/include/configs/brppt1.h index 240089318cc..12a4048a511 100644 --- a/include/configs/brppt1.h +++ b/include/configs/brppt1.h @@ -30,8 +30,6 @@ #ifdef CONFIG_SPL_OS_BOOT /* RAW SD card / eMMC */ -#define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR 0x80 /* address 0x10000 */ -#define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS 0x80 /* 64KiB */ #endif /* CONFIG_SPL_OS_BOOT */ diff --git a/include/configs/devkit8000.h b/include/configs/devkit8000.h index d5d1c68bdaa..4e91f8caa32 100644 --- a/include/configs/devkit8000.h +++ b/include/configs/devkit8000.h @@ -116,9 +116,4 @@ #define CONFIG_SYS_NAND_U_BOOT_SIZE 0x200000 -#undef CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR -#undef CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS -#define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR 0x8 /* address 0x1000 */ -#define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS 8 /* 4KB */ - #endif /* __CONFIG_H */ diff --git a/include/configs/display5.h b/include/configs/display5.h index 420b0c9f6e4..c23a57ee7a2 100644 --- a/include/configs/display5.h +++ b/include/configs/display5.h @@ -12,9 +12,6 @@ /* Falcon Mode */ /* Falcon Mode - MMC support */ -#define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR 0x3F00 -#define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS \ - (CONFIG_CMD_SPL_WRITE_SIZE / 512) /* * display5 SPI-NOR memory layout diff --git a/include/configs/embestmx6boards.h b/include/configs/embestmx6boards.h index 3023d0e0b25..00996f5cb78 100644 --- a/include/configs/embestmx6boards.h +++ b/include/configs/embestmx6boards.h @@ -54,9 +54,6 @@ #include "imx6_spl.h" /* RiOTboard */ -#define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR 0 /* offset 69KB */ -#define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS 0 /* offset 69KB */ - #endif /* 256M RAM (minimum), 32M uncompressed kernel, 16M compressed kernel, 1M fdt, diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h index c07e48629bb..26d171daae7 100644 --- a/include/configs/gw_ventana.h +++ b/include/configs/gw_ventana.h @@ -12,8 +12,6 @@ /* Falcon Mode */ /* Falcon Mode - MMC support: args@1MB kernel@2MB */ -#define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR 0x800 /* 1MB */ -#define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS (CONFIG_CMD_SPL_WRITE_SIZE / 512) #include "imx6_spl.h" /* common IMX6 SPL configuration */ #include "mx6_common.h" diff --git a/include/configs/imx6-engicam.h b/include/configs/imx6-engicam.h index 4a1eae1d8b9..a2d5080a10e 100644 --- a/include/configs/imx6-engicam.h +++ b/include/configs/imx6-engicam.h @@ -136,8 +136,6 @@ /* Falcon Mode */ #ifdef CONFIG_SPL_OS_BOOT /* MMC support: args@1MB kernel@2MB */ -# define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR 0x800 /* 1MB */ -# define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS (CONFIG_CMD_SPL_WRITE_SIZE / 512) #endif /* Framebuffer */ diff --git a/include/configs/imx6_logic.h b/include/configs/imx6_logic.h index 8019dfc0a71..592c62ab8ac 100644 --- a/include/configs/imx6_logic.h +++ b/include/configs/imx6_logic.h @@ -131,7 +131,5 @@ /* Falcon Mode */ /* Falcon Mode - MMC support: args@1MB kernel@2MB */ -#define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR 0x800 /* 1MB */ -#define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS (CONFIG_CMD_SPL_WRITE_SIZE / 512) #endif /* __IMX6LOGIC_CONFIG_H */ diff --git a/include/configs/imx6dl-mamoj.h b/include/configs/imx6dl-mamoj.h index 00c30d4d502..c4eebb5aeac 100644 --- a/include/configs/imx6dl-mamoj.h +++ b/include/configs/imx6dl-mamoj.h @@ -53,8 +53,6 @@ /* Falcon */ /* MMC support: args@1MB kernel@2MB */ -#define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR 0x800 /* 1MB */ -#define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS (CONFIG_CMD_SPL_WRITE_SIZE / 512) /* Miscellaneous configurable options */ diff --git a/include/configs/ls1043ardb.h b/include/configs/ls1043ardb.h index bf8738f22a7..edb4e64ee41 100644 --- a/include/configs/ls1043ardb.h +++ b/include/configs/ls1043ardb.h @@ -19,11 +19,6 @@ #define CONFIG_MEM_INIT_VALUE 0xdeadbeef #endif -#ifdef CONFIG_SD_BOOT -#define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR 0x500 -#define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS 30 -#endif - /* * NOR Flash Definitions */ diff --git a/include/configs/mccmon6.h b/include/configs/mccmon6.h index 2bbbdfa51f8..2c862e9ddcc 100644 --- a/include/configs/mccmon6.h +++ b/include/configs/mccmon6.h @@ -18,8 +18,6 @@ * design force U-Boot run when we boot in development * mode from SD card (SD2) */ -#define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR (0x800) -#define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS (0x80) #define CONFIG_MXC_UART_BASE UART1_BASE diff --git a/include/configs/mx6sabreauto.h b/include/configs/mx6sabreauto.h index 04f8a16fde9..d120c7c7a35 100644 --- a/include/configs/mx6sabreauto.h +++ b/include/configs/mx6sabreauto.h @@ -29,8 +29,6 @@ /* Falcon Mode */ #ifdef CONFIG_SPL_OS_BOOT /* Falcon Mode - MMC support: args@1MB kernel@2MB */ -#define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR 0x800 /* 1MB */ -#define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS (CONFIG_CMD_SPL_WRITE_SIZE / 512) #endif #ifdef CONFIG_MTD_NOR_FLASH diff --git a/include/configs/mx6sabresd.h b/include/configs/mx6sabresd.h index 43625402700..2f4332a4b19 100644 --- a/include/configs/mx6sabresd.h +++ b/include/configs/mx6sabresd.h @@ -20,8 +20,6 @@ /* Falcon Mode */ /* Falcon Mode - MMC support: args@1MB kernel@2MB */ -#define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR 0x800 /* 1MB */ -#define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS (CONFIG_CMD_SPL_WRITE_SIZE / 512) #define CONFIG_SYS_FSL_USDHC_NUM 3 diff --git a/include/configs/pico-imx6.h b/include/configs/pico-imx6.h index 571a233c302..df4dc4d496c 100644 --- a/include/configs/pico-imx6.h +++ b/include/configs/pico-imx6.h @@ -16,8 +16,6 @@ /* Falcon Mode */ /* Falcon Mode - MMC support: args@1MB kernel@2MB */ -#define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR 0x800 /* 1MB */ -#define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS (CONFIG_CMD_SPL_WRITE_SIZE / 512) #endif #define CONFIG_MXC_UART_BASE UART1_BASE diff --git a/include/configs/pico-imx6ul.h b/include/configs/pico-imx6ul.h index 3e0cedadc32..ea30fbc4cfc 100644 --- a/include/configs/pico-imx6ul.h +++ b/include/configs/pico-imx6ul.h @@ -18,8 +18,6 @@ /* Falcon Mode */ /* Falcon Mode - MMC support: args@1MB kernel@2MB */ -#define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR 0x800 /* 1MB */ -#define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS (CONFIG_CMD_SPL_WRITE_SIZE / 512) #endif /* Network support */ diff --git a/include/configs/pico-imx7d.h b/include/configs/pico-imx7d.h index a293dca6421..5a6f2244201 100644 --- a/include/configs/pico-imx7d.h +++ b/include/configs/pico-imx7d.h @@ -16,8 +16,6 @@ /* Falcon Mode */ /* Falcon Mode - MMC support: args@1MB kernel@2MB */ -#define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR 0x800 /* 1MB */ -#define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS (CONFIG_CMD_SPL_WRITE_SIZE / 512) #endif #define CONFIG_MXC_UART_BASE UART5_IPS_BASE_ADDR diff --git a/include/configs/sama5d3_xplained.h b/include/configs/sama5d3_xplained.h index 3bb53a0dd1b..a10057452fe 100644 --- a/include/configs/sama5d3_xplained.h +++ b/include/configs/sama5d3_xplained.h @@ -54,8 +54,6 @@ #define CONFIG_SYS_MONITOR_LEN (2 * SZ_512K) /* Falcon boot support on raw MMC */ -#define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR 0x100 /* 128 KiB */ -#define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS (CONFIG_CMD_SPL_WRITE_SIZE / 512) /* U-Boot proper stored by default at 0x200 (256 KiB) */ #endif diff --git a/include/configs/ti_armv7_common.h b/include/configs/ti_armv7_common.h index 0307fc38d8b..2d1f0372ae3 100644 --- a/include/configs/ti_armv7_common.h +++ b/include/configs/ti_armv7_common.h @@ -118,8 +118,6 @@ /* FAT */ /* RAW SD card / eMMC */ -#define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR 0x1500 /* address 0x2A0000 */ -#define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS 0x200 /* 256KiB */ #endif /* General parts of the framework, required. */ diff --git a/include/configs/vyasa-rk3288.h b/include/configs/vyasa-rk3288.h index d0e017f4482..e8c1013a71a 100644 --- a/include/configs/vyasa-rk3288.h +++ b/include/configs/vyasa-rk3288.h @@ -24,8 +24,6 @@ /* Falcon Mode */ /* Falcon Mode - MMC support: args@16MB kernel@17MB */ -#define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR 0x8000 /* 16MB */ -#define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS (CONFIG_CMD_SPL_WRITE_SIZE / 512) #endif #endif diff --git a/include/configs/xea.h b/include/configs/xea.h index b82e6605f82..19ccf633c40 100644 --- a/include/configs/xea.h +++ b/include/configs/xea.h @@ -20,9 +20,6 @@ #define CONFIG_SYS_SPI_ARGS_OFFS SZ_512K #define CONFIG_SYS_SPI_ARGS_SIZE SZ_32K -#define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR (SZ_512K / 0x200) -#define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS (SZ_32K / 0x200) - /* Memory configuration */ #define PHYS_SDRAM_1 0x40000000 /* Base address */ #define PHYS_SDRAM_1_SIZE 0x10000000 /* Max 256 MB RAM */ diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h index 3331738fc4a..bfd622bb028 100644 --- a/include/configs/xilinx_zynqmp.h +++ b/include/configs/xilinx_zynqmp.h @@ -209,10 +209,6 @@ /* ATF is my kernel image */ -/* MMC support */ -# define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR 0 /* unused */ -# define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS 0 /* unused */ - #if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_DFU) # define CONFIG_SPL_HASH # define CONFIG_ENV_MAX_ENTRIES 10 diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h index 4d8d44c25d8..6a045ec60ae 100644 --- a/include/configs/zynq-common.h +++ b/include/configs/zynq-common.h @@ -212,8 +212,6 @@ /* Address in RAM where the parameters must be copied by SPL. */ /* Not using MMC raw mode - just for compilation purpose */ -#define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR 0 -#define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS 0 /* qspi mode is working fine */ #ifdef CONFIG_ZYNQ_QSPI -- cgit v1.2.3