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 <trini@konsulko.com>

diff --git a/README b/README
index 354913f82369026e923ce2288baedff88006f459..9800359e5dfe2748796be515b04a88517ac1efc4 100644 (file)
--- a/README
+++ b/README
@@ -1639,12 +1639,6 @@ The following options need to be configured:
                For ARM, enable an optional function to print more information
                about the running system.
 
-               CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR,
-               CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS
-               Sector and number of sectors to load kernel argument
-               parameters from when MMC is being used in raw mode
-               (for falcon mode)
-
                CONFIG_SPL_MPC83XX_WAIT_FOR_NAND
                Set this for NAND SPL on PPC mpc83xx targets, so that
                start.S waits for the rest of the SPL to load before

diff --git a/common/spl/Kconfig b/common/spl/Kconfig
index 05049c1ffd7ce2c4bfebbef4e6f77374d80f9ebd..d4f02b527d9d2221044b3d1661fec661f60a2bf4 100644 (file)
--- a/common/spl/Kconfig
+++ b/common/spl/Kconfig
@@ -1226,6 +1226,20 @@ config SYS_MMCSD_RAW_MODE_KERNEL_SECTOR
          Note that the Falcon mode image can also be a FIT, if FIT support is
          enabled.
 
+config SYS_MMCSD_RAW_MODE_ARGS_SECTOR
+       hex "Falcon mode: Sector to load 'args' from MMC"
+       depends on SPL_FALCON_BOOT_MMCSD
+       help
+         When Falcon mode is used with an MMC or SD media, SPL needs to know
+         where to look for the OS 'args', typically a device tree. The
+         contents are expected to begin at the raw MMC specified in this config.
+         Note that if using a FIT image, this and the next option can be set to
+         0x0.
+
+config SYS_MMCSD_RAW_MODE_ARGS_SECTORS
+       hex "Falcon mode: Number of sectors to load for 'args' from MMC"
+       depends on SPL_FALCON_BOOT_MMCSD && SYS_MMCSD_RAW_MODE_ARGS_SECTOR != 0x0
+
 config SPL_PAYLOAD
        string "SPL payload"
        default "tpl/u-boot-with-tpl.bin" if TPL

diff --git a/common/spl/spl_mmc.c b/common/spl/spl_mmc.c
index 6116a68371a952d46e7298d6ff7b430e559ed489..f66147477e77bf25d5bd4f81239a57152efe3514 100644 (file)
--- a/common/spl/spl_mmc.c
+++ b/common/spl/spl_mmc.c
@@ -229,7 +229,7 @@ static int mmc_load_image_raw_os(struct spl_image_info *spl_image,
 {
        int ret;
 
-#if defined(CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR)
+#if CONFIG_VAL(SYS_MMCSD_RAW_MODE_ARGS_SECTOR)
        unsigned long count;
 
        count = blk_dread(mmc_get_blk_desc(mmc),

diff --git a/configs/am335x_boneblack_vboot_defconfig b/configs/am335x_boneblack_vboot_defconfig
index 67c4144c35f4b4f1395f3165744e7470cf8723c2..b5ba2ccda5c973da2bc2da575215deffaca9f646 100644 (file)
--- a/configs/am335x_boneblack_vboot_defconfig
+++ b/configs/am335x_boneblack_vboot_defconfig
@@ -31,6 +31,8 @@ CONFIG_SPL_NET_VCI_STRING="AM33xx U-Boot SPL"
 CONFIG_SPL_OS_BOOT=y
 CONFIG_SPL_FALCON_BOOT_MMCSD=y
 CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR=0x1700
+CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR=0x1500
+CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS=0x200
 CONFIG_SPL_USB_GADGET=y
 CONFIG_SPL_USB_ETHER=y
 CONFIG_SYS_MAXARGS=64

diff --git a/configs/am335x_evm_defconfig b/configs/am335x_evm_defconfig
index 8a5beabd6d20262f31e066cc17ff1e2cfb851024..c7dbd3c5702d6a862d229047ae561f87f4ff141d 100644 (file)
--- a/configs/am335x_evm_defconfig
+++ b/configs/am335x_evm_defconfig
@@ -37,6 +37,8 @@ CONFIG_SPL_OS_BOOT=y
 CONFIG_SYS_NAND_SPL_KERNEL_OFFS=0x200000
 CONFIG_SPL_FALCON_BOOT_MMCSD=y
 CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR=0x1700
+CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR=0x1500
+CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS=0x200
 CONFIG_SPL_USB_GADGET=y
 CONFIG_SPL_USB_ETHER=y
 CONFIG_SYS_MAXARGS=64

diff --git a/configs/am335x_igep003x_defconfig b/configs/am335x_igep003x_defconfig
index 78469d7154fab0c3310595e50e270a5f63fcdaab..6da31d9e7f981b01b6a385a2f9e7b5e53d5c5e1b 100644 (file)
--- a/configs/am335x_igep003x_defconfig
+++ b/configs/am335x_igep003x_defconfig
@@ -43,6 +43,8 @@ CONFIG_SPL_OS_BOOT=y
 CONFIG_SYS_NAND_SPL_KERNEL_OFFS=0x280000
 CONFIG_SPL_FALCON_BOOT_MMCSD=y
 CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR=0x1700
+CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR=0x1500
+CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS=0x200
 CONFIG_SPL_POWER=y
 CONFIG_SPL_WATCHDOG=y
 CONFIG_SPL_YMODEM_SUPPORT=y

diff --git a/configs/am335x_shc_defconfig b/configs/am335x_shc_defconfig
index 9f5924e1524f7dbc1bded4bc36b7abe325192fb4..77593e3e3dcb35a4408bedec9daa8128344e2f00 100644 (file)
--- a/configs/am335x_shc_defconfig
+++ b/configs/am335x_shc_defconfig
@@ -40,6 +40,8 @@ CONFIG_SPL_I2C=y
 CONFIG_SPL_OS_BOOT=y
 CONFIG_SPL_FALCON_BOOT_MMCSD=y
 CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR=0x1700
+CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR=0x1500
+CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS=0x200
 CONFIG_SPL_POWER=y
 CONFIG_SPL_WATCHDOG=y
 CONFIG_SPL_YMODEM_SUPPORT=y

diff --git a/configs/am335x_shc_ict_defconfig b/configs/am335x_shc_ict_defconfig
index 7d8a57c18eb3be5737518dd22c9b50a8029df18a..97a361ce4d61b516e8e36ad1c9959890cff721b5 100644 (file)
--- a/configs/am335x_shc_ict_defconfig
+++ b/configs/am335x_shc_ict_defconfig
@@ -38,6 +38,8 @@ CONFIG_SPL_I2C=y
 CONFIG_SPL_OS_BOOT=y
 CONFIG_SPL_FALCON_BOOT_MMCSD=y
 CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR=0x1700
+CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR=0x1500
+CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS=0x200
 CONFIG_SPL_POWER=y
 CONFIG_SPL_WATCHDOG=y
 CONFIG_SPL_YMODEM_SUPPORT=y

diff --git a/configs/am335x_shc_netboot_defconfig b/configs/am335x_shc_netboot_defconfig
index 98e437e0233224f2dd57081900ccf762652618fe..2c6fc5496ebd03595bb97a73e09660f2459cb1fe 100644 (file)
--- a/configs/am335x_shc_netboot_defconfig
+++ b/configs/am335x_shc_netboot_defconfig
@@ -42,6 +42,8 @@ CONFIG_SPL_I2C=y
 CONFIG_SPL_OS_BOOT=y
 CONFIG_SPL_FALCON_BOOT_MMCSD=y
 CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR=0x1700
+CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR=0x1500
+CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS=0x200
 CONFIG_SPL_POWER=y
 CONFIG_SPL_WATCHDOG=y
 CONFIG_SPL_YMODEM_SUPPORT=y

diff --git a/configs/am335x_shc_sdboot_defconfig b/configs/am335x_shc_sdboot_defconfig
index 02146321503af791d7b51583147a1b95ac712bd8..a154a342551aefc56743a7a782d28babf6dc8627 100644 (file)
--- a/configs/am335x_shc_sdboot_defconfig
+++ b/configs/am335x_shc_sdboot_defconfig
@@ -41,6 +41,8 @@ CONFIG_SPL_I2C=y
 CONFIG_SPL_OS_BOOT=y
 CONFIG_SPL_FALCON_BOOT_MMCSD=y
 CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR=0x1700
+CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR=0x1500
+CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS=0x200
 CONFIG_SPL_POWER=y
 CONFIG_SPL_WATCHDOG=y
 CONFIG_SPL_YMODEM_SUPPORT=y

diff --git a/configs/am335x_sl50_defconfig b/configs/am335x_sl50_defconfig
index f42148e0549a3c08faf425a225414da2b498535d..1338190e9ff469d71d4099cdc2a8f7181a98d79c 100644 (file)
--- a/configs/am335x_sl50_defconfig
+++ b/configs/am335x_sl50_defconfig
@@ -38,6 +38,8 @@ CONFIG_SPL_NET_VCI_STRING="AM335x U-Boot SPL"
 CONFIG_SPL_OS_BOOT=y
 CONFIG_SPL_FALCON_BOOT_MMCSD=y
 CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR=0x1700
+CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR=0x1500
+CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS=0x200
 CONFIG_SPL_POWER=y
 CONFIG_SPL_WATCHDOG=y
 CONFIG_SPL_YMODEM_SUPPORT=y

diff --git a/configs/am3517_evm_defconfig b/configs/am3517_evm_defconfig
index f6baee0a2b2b31c664a79b00b3655bffa20673bd..19e01dc41ae295b4ad244e7cc0040aa72c768697 100644 (file)
--- a/configs/am3517_evm_defconfig
+++ b/configs/am3517_evm_defconfig
@@ -35,6 +35,8 @@ CONFIG_SYS_SPL_ARGS_ADDR=0x84000000
 CONFIG_SYS_NAND_SPL_KERNEL_OFFS=0x2a0000
 CONFIG_SPL_FALCON_BOOT_MMCSD=y
 CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR=0x1700
+CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR=0x1500
+CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS=0x200
 # CONFIG_SPL_POWER is not set
 CONFIG_SYS_PROMPT="AM3517_EVM # "
 CONFIG_SYS_MAXARGS=64

diff --git a/configs/am43xx_evm_defconfig b/configs/am43xx_evm_defconfig
index 0825ea1636d18d3931a7f3ee26c5d77d2c2051f5..35b1cdb401666319fe9125f6b6d8ddfe698805db 100644 (file)
--- a/configs/am43xx_evm_defconfig
+++ b/configs/am43xx_evm_defconfig
@@ -32,6 +32,8 @@ CONFIG_SPL_OS_BOOT=y
 CONFIG_SYS_NAND_SPL_KERNEL_OFFS=0x300000
 CONFIG_SPL_FALCON_BOOT_MMCSD=y
 CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR=0x1700
+CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR=0x1500
+CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS=0x200
 CONFIG_SPL_USB_HOST=y
 CONFIG_SPL_USB_GADGET=y
 CONFIG_SPL_USB_ETHER=y

diff --git a/configs/am43xx_evm_rtconly_defconfig b/configs/am43xx_evm_rtconly_defconfig
index 0cdc4018cfc811db2f781f1e140919c3bb68813d..ff5fbc6676ae522d470e0454e0764cc363cce46e 100644 (file)
--- a/configs/am43xx_evm_rtconly_defconfig
+++ b/configs/am43xx_evm_rtconly_defconfig
@@ -29,6 +29,8 @@ CONFIG_SPL_OS_BOOT=y
 CONFIG_SYS_NAND_SPL_KERNEL_OFFS=0x300000
 CONFIG_SPL_FALCON_BOOT_MMCSD=y
 CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR=0x1700
+CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR=0x1500
+CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS=0x200
 CONFIG_SYS_MAXARGS=64
 CONFIG_CMD_SPL=y
 CONFIG_CMD_SPL_NAND_OFS=0x00100000

diff --git a/configs/am43xx_evm_usbhost_boot_defconfig b/configs/am43xx_evm_usbhost_boot_defconfig
index 963cb93545c0764e33ae83693f954d2f54eee3a4..0a4b9a99ceeb31669f65b80efa5cd5ba75b1c0bf 100644 (file)
--- a/configs/am43xx_evm_usbhost_boot_defconfig
+++ b/configs/am43xx_evm_usbhost_boot_defconfig
@@ -28,6 +28,8 @@ CONFIG_SPL_OS_BOOT=y
 CONFIG_SYS_NAND_SPL_KERNEL_OFFS=0x300000
 CONFIG_SPL_FALCON_BOOT_MMCSD=y
 CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR=0x1700
+CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR=0x1500
+CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS=0x200
 CONFIG_SPL_USB_HOST=y
 CONFIG_SPL_USB_STORAGE=y
 CONFIG_SPL_USB_GADGET=y

diff --git a/configs/am57xx_evm_defconfig b/configs/am57xx_evm_defconfig
index 33f8415d8b17c75bec0961471ff848ef877fef9d..d82c66572cceda7d9f05a6de0f405bc13eab493c 100644 (file)
--- a/configs/am57xx_evm_defconfig
+++ b/configs/am57xx_evm_defconfig
@@ -39,6 +39,8 @@ CONFIG_SPL_DM_SPI_FLASH=y
 CONFIG_SPL_OS_BOOT=y
 CONFIG_SPL_FALCON_BOOT_MMCSD=y
 CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR=0x1700
+CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR=0x1500
+CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS=0x200
 CONFIG_SPL_SPI_LOAD=y
 CONFIG_SYS_SPI_U_BOOT_OFFS=0x40000
 CONFIG_SPL_YMODEM_SUPPORT=y

diff --git a/configs/devkit8000_defconfig b/configs/devkit8000_defconfig
index f8a98531f377d1d41ae758b99fc896147d6df5dc..4e144a9c169dafdb3805b311add20e14655bf1de 100644 (file)
--- a/configs/devkit8000_defconfig
+++ b/configs/devkit8000_defconfig
@@ -26,6 +26,8 @@ CONFIG_SYS_SPL_ARGS_ADDR=0x80000100
 CONFIG_SYS_NAND_SPL_KERNEL_OFFS=0x280000
 CONFIG_SPL_FALCON_BOOT_MMCSD=y
 CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR=0x500
+CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR=0x8
+CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS=8
 CONFIG_SYS_MAXARGS=64
 # CONFIG_CMD_IMI is not set
 CONFIG_CMD_SPL=y

diff --git a/configs/display5_defconfig b/configs/display5_defconfig
index 646372c10a3aff73d9645afa7b08613796d2853e..f586596ee9215d85ae186257fb139780c1b6630d 100644 (file)
--- a/configs/display5_defconfig
+++ b/configs/display5_defconfig
@@ -47,6 +47,8 @@ CONFIG_SPL_OS_BOOT=y
 CONFIG_SYS_SPL_ARGS_ADDR=0x18000000
 CONFIG_SPL_FALCON_BOOT_MMCSD=y
 CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR=0x100
+CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR=0x3F00
+CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS=0x10
 CONFIG_SPL_SPI_LOAD=y
 CONFIG_SYS_SPI_U_BOOT_OFFS=0x20000
 CONFIG_HUSH_PARSER=y

diff --git a/configs/display5_factory_defconfig b/configs/display5_factory_defconfig
index 245122843bce289a4165c657744622dbe091c9d6..e2f35a9790c0ead4f687b97e7cb5a98a8bcb1460 100644 (file)
--- a/configs/display5_factory_defconfig
+++ b/configs/display5_factory_defconfig
@@ -42,6 +42,8 @@ CONFIG_SPL_OS_BOOT=y
 CONFIG_SYS_SPL_ARGS_ADDR=0x18000000
 CONFIG_SPL_FALCON_BOOT_MMCSD=y
 CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR=0x100
+CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR=0x3F00
+CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS=0x10
 CONFIG_SPL_SPI_LOAD=y
 CONFIG_SYS_SPI_U_BOOT_OFFS=0x20000
 CONFIG_SPL_USB_HOST=y

diff --git a/configs/dra7xx_evm_defconfig b/configs/dra7xx_evm_defconfig
index fdd89e6f555b354cec51350e0f3c6cf94dcb71b0..aae84dc6adef3790ecde7bbeaff6d4bcb2003ef6 100644 (file)
--- a/configs/dra7xx_evm_defconfig
+++ b/configs/dra7xx_evm_defconfig
@@ -42,6 +42,8 @@ CONFIG_SPL_OS_BOOT=y
 CONFIG_SYS_NAND_SPL_KERNEL_OFFS=0x200000
 CONFIG_SPL_FALCON_BOOT_MMCSD=y
 CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR=0x1700
+CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR=0x1500
+CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS=0x200
 CONFIG_SPL_RAM_SUPPORT=y
 CONFIG_SPL_SPI_LOAD=y
 CONFIG_SYS_SPI_U_BOOT_OFFS=0x40000

diff --git a/configs/gwventana_emmc_defconfig b/configs/gwventana_emmc_defconfig
index a96ed26292a13a367321004c62d9317635a8c2f9..0effee6d30fd3816b8f4544ab7f464189f37c7bb 100644 (file)
--- a/configs/gwventana_emmc_defconfig
+++ b/configs/gwventana_emmc_defconfig
@@ -49,6 +49,8 @@ CONFIG_SPL_OS_BOOT=y
 CONFIG_SYS_SPL_ARGS_ADDR=0x18000000
 CONFIG_SPL_FALCON_BOOT_MMCSD=y
 CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR=0x1000
+CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR=0x800
+CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS=0x100
 CONFIG_SPL_POWER=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="Ventana > "

diff --git a/configs/gwventana_gw5904_defconfig b/configs/gwventana_gw5904_defconfig
index 85bbed23ebc8c7a5ce2fe337256104dfe617d1e4..28e08788b65d958c71d7e86070ebd6435b233e17 100644 (file)
--- a/configs/gwventana_gw5904_defconfig
+++ b/configs/gwventana_gw5904_defconfig
@@ -49,6 +49,8 @@ CONFIG_SPL_OS_BOOT=y
 CONFIG_SYS_SPL_ARGS_ADDR=0x18000000
 CONFIG_SPL_FALCON_BOOT_MMCSD=y
 CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR=0x1000
+CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR=0x800
+CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS=0x100
 CONFIG_SPL_POWER=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="Ventana > "

diff --git a/configs/gwventana_nand_defconfig b/configs/gwventana_nand_defconfig
index 68ffe3e847ea4de7a73f0e0e41e05b16d7a263bf..f46440bf560e1e9071ea1337d21efca54d993a1c 100644 (file)
--- a/configs/gwventana_nand_defconfig
+++ b/configs/gwventana_nand_defconfig
@@ -51,6 +51,8 @@ CONFIG_SYS_SPL_ARGS_ADDR=0x18000000
 CONFIG_SYS_NAND_SPL_KERNEL_OFFS=0x1200000
 CONFIG_SPL_FALCON_BOOT_MMCSD=y
 CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR=0x1000
+CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR=0x800
+CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS=0x100
 CONFIG_SPL_POWER=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="Ventana > "

diff --git a/configs/igep00x0_defconfig b/configs/igep00x0_defconfig
index 3b65a22513c5565eab1a07743646ef0429f28513..00f0a670c2b4f70656bc95052d4ef131e8ba08f2 100644 (file)
--- a/configs/igep00x0_defconfig
+++ b/configs/igep00x0_defconfig
@@ -45,6 +45,8 @@ CONFIG_SYS_SPL_ARGS_ADDR=0x84000000
 CONFIG_SYS_NAND_SPL_KERNEL_OFFS=0x280000
 CONFIG_SPL_FALCON_BOOT_MMCSD=y
 CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR=0x1700
+CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR=0x1500
+CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS=0x200
 CONFIG_SYS_MAXARGS=64
 CONFIG_CMD_SPL=y
 # CONFIG_CMD_FLASH is not set

diff --git a/configs/imx28_xea_defconfig b/configs/imx28_xea_defconfig
index 37233bafad95cc05d23b13f08da470efc6c678ed..1537e8361f68f205cfcb27f252e59adaebfe4b94 100644 (file)
--- a/configs/imx28_xea_defconfig
+++ b/configs/imx28_xea_defconfig
@@ -48,6 +48,8 @@ CONFIG_SPL_OS_BOOT=y
 CONFIG_SYS_SPL_ARGS_ADDR=0x44000000
 CONFIG_SPL_FALCON_BOOT_MMCSD=y
 CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR=0x800
+CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR=0x400
+CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS=0x40
 CONFIG_SPL_SPI_LOAD=y
 CONFIG_SYS_SPI_U_BOOT_OFFS=0x10000
 CONFIG_SPL_YMODEM_SUPPORT=y

diff --git a/configs/imx6dl_mamoj_defconfig b/configs/imx6dl_mamoj_defconfig
index a52ce458f2b331e3ea15dbae01c411f3a8562f36..866921747127b2d3d4b0e1008c93ea4a8b78b74e 100644 (file)
--- a/configs/imx6dl_mamoj_defconfig
+++ b/configs/imx6dl_mamoj_defconfig
@@ -22,6 +22,8 @@ CONFIG_SPL_OS_BOOT=y
 CONFIG_SYS_SPL_ARGS_ADDR=0x13000000
 CONFIG_SPL_FALCON_BOOT_MMCSD=y
 CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR=0x1000
+CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR=0x800
+CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS=0x10
 CONFIG_SYS_MAXARGS=32
 CONFIG_SYS_PBSIZE=532
 CONFIG_CMD_SPL=y

diff --git a/configs/imx6q_logic_defconfig b/configs/imx6q_logic_defconfig
index df4c1c1f950a21a05c33604387cfd9ac582f0bd5..1510d10dc5271c0cc5dd61cc417739add137158a 100644 (file)
--- a/configs/imx6q_logic_defconfig
+++ b/configs/imx6q_logic_defconfig
@@ -38,6 +38,8 @@ CONFIG_SYS_SPL_ARGS_ADDR=0x18000000
 CONFIG_SYS_NAND_SPL_KERNEL_OFFS=0x500000
 CONFIG_SPL_FALCON_BOOT_MMCSD=y
 CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR=0x1000
+CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR=0x800
+CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS=0x800
 CONFIG_SPL_USB_HOST=y
 CONFIG_SPL_USB_GADGET=y
 CONFIG_SPL_USB_SDP_SUPPORT=y

diff --git a/configs/imx6qdl_icore_mipi_defconfig b/configs/imx6qdl_icore_mipi_defconfig
index 929d31722b72298601b064da907ae2bf9e5c0ce3..bddc4ff98ef67eba9089c52be2ca72024caec966 100644 (file)
--- a/configs/imx6qdl_icore_mipi_defconfig
+++ b/configs/imx6qdl_icore_mipi_defconfig
@@ -38,6 +38,8 @@ CONFIG_SPL_OS_BOOT=y
 CONFIG_SYS_SPL_ARGS_ADDR=0x18000000
 CONFIG_SPL_FALCON_BOOT_MMCSD=y
 CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR=0x1000
+CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR=0x800
+CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS=0x10
 CONFIG_SPL_WATCHDOG=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="icorem6qdl-mipi> "

diff --git a/configs/imx6qdl_icore_mmc_defconfig b/configs/imx6qdl_icore_mmc_defconfig
index 3465e1915c2adf527f1ea8e686d77a8d6ec3384e..f8194a002a19aaffb38f5789e709d609ffc21cad 100644 (file)
--- a/configs/imx6qdl_icore_mmc_defconfig
+++ b/configs/imx6qdl_icore_mmc_defconfig
@@ -41,6 +41,8 @@ CONFIG_SPL_OS_BOOT=y
 CONFIG_SYS_SPL_ARGS_ADDR=0x18000000
 CONFIG_SPL_FALCON_BOOT_MMCSD=y
 CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR=0x1000
+CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR=0x800
+CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS=0x10
 CONFIG_SPL_WATCHDOG=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="icorem6qdl> "

diff --git a/configs/imx6qdl_icore_rqs_defconfig b/configs/imx6qdl_icore_rqs_defconfig
index b2ca3ee1b650df05df2d69c643bef641a51b8dfc..cb2b0df98b76de0b8bdc681b0db5318993edf0d8 100644 (file)
--- a/configs/imx6qdl_icore_rqs_defconfig
+++ b/configs/imx6qdl_icore_rqs_defconfig
@@ -35,6 +35,8 @@ CONFIG_SPL_OS_BOOT=y
 CONFIG_SYS_SPL_ARGS_ADDR=0x18000000
 CONFIG_SPL_FALCON_BOOT_MMCSD=y
 CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR=0x1000
+CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR=0x800
+CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS=0x10
 CONFIG_SPL_WATCHDOG=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="icorem6qdl-rqs> "

diff --git a/configs/omap35_logic_defconfig b/configs/omap35_logic_defconfig
index a8d789e11e9c5fbb4529abd5d0a5a45e6da46d19..c76c10ac70fd30f73130f4d4e193ab215edce545 100644 (file)
--- a/configs/omap35_logic_defconfig
+++ b/configs/omap35_logic_defconfig
@@ -39,6 +39,8 @@ CONFIG_SYS_SPL_ARGS_ADDR=0x84000000
 CONFIG_SYS_NAND_SPL_KERNEL_OFFS=0x280000
 CONFIG_SPL_FALCON_BOOT_MMCSD=y
 CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR=0x1700
+CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR=0x1500
+CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS=0x200
 CONFIG_SYS_PROMPT="OMAP Logic # "
 CONFIG_SYS_MAXARGS=64
 CONFIG_SYS_PBSIZE=1054

diff --git a/configs/omap35_logic_somlv_defconfig b/configs/omap35_logic_somlv_defconfig
index 5264f4bc5ebd659e351e7afb334110569e6c0323..2637ecf9c50e42d46fece44d481f2b947aec900d 100644 (file)
--- a/configs/omap35_logic_somlv_defconfig
+++ b/configs/omap35_logic_somlv_defconfig
@@ -40,6 +40,8 @@ CONFIG_SYS_SPL_ARGS_ADDR=0x84000000
 CONFIG_SYS_NAND_SPL_KERNEL_OFFS=0x280000
 CONFIG_SPL_FALCON_BOOT_MMCSD=y
 CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR=0x1700
+CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR=0x1500
+CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS=0x200
 # CONFIG_SPL_POWER is not set
 CONFIG_SYS_PROMPT="OMAP Logic # "
 CONFIG_SYS_MAXARGS=64

diff --git a/configs/omap3_logic_defconfig b/configs/omap3_logic_defconfig
index 292b4650656f58b11096f51504884ca9a6219c20..f55d52736baed627663552111e06b5b7948002f0 100644 (file)
--- a/configs/omap3_logic_defconfig
+++ b/configs/omap3_logic_defconfig
@@ -38,6 +38,8 @@ CONFIG_SYS_SPL_ARGS_ADDR=0x84000000
 CONFIG_SYS_NAND_SPL_KERNEL_OFFS=0x280000
 CONFIG_SPL_FALCON_BOOT_MMCSD=y
 CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR=0x1700
+CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR=0x1500
+CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS=0x200
 CONFIG_SYS_PROMPT="OMAP Logic # "
 CONFIG_SYS_MAXARGS=64
 CONFIG_SYS_PBSIZE=1054

diff --git a/configs/omap3_logic_somlv_defconfig b/configs/omap3_logic_somlv_defconfig
index aee7589b9c3b1833e03cc7ed3b38844e3352119a..97cdc9491d3bf5d573d9d08bc4e05b32bfc7c50f 100644 (file)
--- a/configs/omap3_logic_somlv_defconfig
+++ b/configs/omap3_logic_somlv_defconfig
@@ -40,6 +40,8 @@ CONFIG_SYS_SPL_ARGS_ADDR=0x84000000
 CONFIG_SYS_NAND_SPL_KERNEL_OFFS=0x280000
 CONFIG_SPL_FALCON_BOOT_MMCSD=y
 CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR=0x1700
+CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR=0x1500
+CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS=0x200
 # CONFIG_SPL_POWER is not set
 CONFIG_SYS_PROMPT="OMAP Logic # "
 CONFIG_SYS_MAXARGS=64

diff --git a/configs/omap4_panda_defconfig b/configs/omap4_panda_defconfig
index c51627dcf9c8b9ef8edb73c8db8ce66726ee5034..bd6c2ce4caca83ff58159fd57f666635bde572f0 100644 (file)
--- a/configs/omap4_panda_defconfig
+++ b/configs/omap4_panda_defconfig
@@ -22,6 +22,8 @@ CONFIG_SYS_SPL_MALLOC_SIZE=0x800000
 CONFIG_SPL_OS_BOOT=y
 CONFIG_SPL_FALCON_BOOT_MMCSD=y
 CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR=0x1700
+CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR=0x1500
+CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS=0x200
 CONFIG_SYS_MAXARGS=64
 CONFIG_CMD_SPL=y
 CONFIG_CMD_ASKENV=y

diff --git a/configs/omap5_uevm_defconfig b/configs/omap5_uevm_defconfig
index 03b874576dfae1f5a6306a63c522f3cde3b32381..73d742ea1d2bb4e37c8ae7c7c85fdf3ea85b9e2a 100644 (file)
--- a/configs/omap5_uevm_defconfig
+++ b/configs/omap5_uevm_defconfig
@@ -23,6 +23,8 @@ CONFIG_SYS_SPL_MALLOC_SIZE=0x800000
 CONFIG_SPL_OS_BOOT=y
 CONFIG_SPL_FALCON_BOOT_MMCSD=y
 CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR=0x1700
+CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR=0x1500
+CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS=0x200
 CONFIG_SYS_MAXARGS=64
 CONFIG_CMD_SPL=y
 CONFIG_CMD_ASKENV=y

diff --git a/configs/vyasa-rk3288_defconfig b/configs/vyasa-rk3288_defconfig
index 9ae73816246a4639d7b5d11c17558d95d8696d95..cbaf970e6ad96f13dc5b8c876a45dbc600bd55c1 100644 (file)
--- a/configs/vyasa-rk3288_defconfig
+++ b/configs/vyasa-rk3288_defconfig
@@ -32,6 +32,8 @@ CONFIG_SPL_OS_BOOT=y
 CONFIG_SYS_SPL_ARGS_ADDR=0xffe5000
 CONFIG_SPL_FALCON_BOOT_MMCSD=y
 CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR=0x8800
+CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR=0x8000
+CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS=0x10
 CONFIG_CMD_SPL=y
 CONFIG_CMD_GPIO=y
 CONFIG_CMD_GPT=y

diff --git a/include/configs/brppt1.h b/include/configs/brppt1.h
index 240089318cc10bc59b47d4e47810831a298a7c24..12a4048a511c0eb2ece3a4d333ce1a4754345047 100644 (file)
--- 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 d5d1c68bdaaf7e8bbd51b8fec30eae708ab98fad..4e91f8caa32fe866c0de50722bcd8754bde54db4 100644 (file)
--- 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 420b0c9f6e43f02610bd5f16db0548e9575894a2..c23a57ee7a2b3dab41a257e5ccf1d26e468f49d0 100644 (file)
--- 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 3023d0e0b25b0916af33057ba43d41da00e34f74..00996f5cb784e3d305519dbe7a4d152f2c866c74 100644 (file)
--- 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 c07e48629bb2a37dc807ec313b744de411946c0a..26d171daae7debeca7ac6560c32d447e14645f96 100644 (file)
--- 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 4a1eae1d8b9b8fde96e14e5c001a9104d2e53139..a2d5080a10e424cd1e5a7c05bcc4bc52859308c8 100644 (file)
--- 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 8019dfc0a71f900fbcafa664216e9c3ec42746bc..592c62ab8acc4f4946f96f25c00dba1d5d55b148 100644 (file)
--- 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 00c30d4d5026e049b7417758563a23cc5bd9597e..c4eebb5aeac02204ec9037f09efd4b06915e9acb 100644 (file)
--- 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 bf8738f22a72c80972f5bbc6da26dd19aeaf4809..edb4e64ee41ab415e8f0d0f5bf6bda63be7e04cc 100644 (file)
--- 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 2bbbdfa51f8420d30da1b662e7c82ca022cd2ca1..2c862e9ddcc253f9b465514b87f0a0e2fc9523f4 100644 (file)
--- 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 04f8a16fde98aaeff3608e51a68a7731489e5448..d120c7c7a352e0db76224f675cf1a29fa615a92d 100644 (file)
--- 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 43625402700633cfa632c228d5f76cb5341ffb6e..2f4332a4b19f5d2d3641f076ba0bc53bbd464788 100644 (file)
--- 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 571a233c302de839750e7e94e11c139f12c13658..df4dc4d496c6c44e68b7eb257ded8651ea3842f2 100644 (file)
--- 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 3e0cedadc32d7888309cad7c472a6abe961b3fa3..ea30fbc4cfcca69712b1b19b5ed764408510120b 100644 (file)
--- 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 a293dca6421236f8f17ca73f379811c5ac8a99b0..5a6f22442014be7c4fbb3e3350b40808526092a4 100644 (file)
--- 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 3bb53a0dd1b5d7bb07e1d6975cd7ce49521349b8..a10057452fe4d86a344e96263f0b3f739a2b5c96 100644 (file)
--- 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 0307fc38d8b7c0ab5f6028ca0c26151f64bffc1f..2d1f0372ae359127969cafe3095f691ea852fef1 100644 (file)
--- 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 d0e017f44821fe7cb9aa9872401e130194855e83..e8c1013a71a35e7e862388e237941b0de16c4ca8 100644 (file)
--- 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 b82e6605f823f1fb9e0fd2d848f118d8bf218e46..19ccf633c404fa51ea8489be8a666d75ebf28129 100644 (file)
--- 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 3331738fc4afb832753daeb0021f2a730dbe2005..bfd622bb02899a5478e9dd27cb94aa7b1f84f71e 100644 (file)
--- 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 4d8d44c25d838df3899e20db22dfb64f1ddb79c1..6a045ec60aeb2bfa51bf32bffbc6bd7376cac1d4 100644 (file)
--- 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