From 555004381e957200d0448ec88f59d77d174fc7bf Mon Sep 17 00:00:00 2001 From: Marek Vasut Date: Sat, 7 Apr 2018 16:05:27 +0200 Subject: spl: spi: Move CONFIG_SPL_SPI_LOAD to Kconfig Add Kconfig entry for CONFIG_SPL_SPI_LOAD symbol and move all configurations using it to Kconfig. Signed-off-by: Marek Vasut Cc: Tom Rini --- include/configs/am335x_evm.h | 1 - include/configs/am57xx_evm.h | 1 - include/configs/at91sam9n12ek.h | 1 - include/configs/at91sam9x5ek.h | 1 - include/configs/bav335x.h | 1 - include/configs/brppt1.h | 1 - include/configs/cgtqmx6eval.h | 1 - include/configs/cl-som-am57x.h | 2 -- include/configs/cl-som-imx7.h | 1 - include/configs/clearfog.h | 1 - include/configs/cm_fx6.h | 1 - include/configs/cm_t43.h | 1 - include/configs/controlcenterdc.h | 1 - include/configs/da850evm.h | 5 ----- include/configs/db-88f6720.h | 1 - include/configs/db-88f6820-amc.h | 1 - include/configs/db-88f6820-gp.h | 1 - include/configs/db-mv784mp-gp.h | 1 - include/configs/dh_imx6.h | 1 - include/configs/display5.h | 1 - include/configs/dra7xx_evm.h | 1 - include/configs/ds414.h | 1 - include/configs/el6x_common.h | 1 - include/configs/ma5d4evk.h | 1 - include/configs/maxbcm.h | 1 - include/configs/omapl138_lcdk.h | 1 - include/configs/ot1200.h | 1 - include/configs/pcm051.h | 1 - include/configs/pcm058.h | 1 - include/configs/pfla02.h | 1 - include/configs/porter.h | 1 - include/configs/rk3399_common.h | 3 --- include/configs/sama5d27_som1_ek.h | 1 - include/configs/sama5d2_xplained.h | 1 - include/configs/sama5d3xek.h | 1 - include/configs/sama5d4_xplained.h | 1 - include/configs/sama5d4ek.h | 1 - include/configs/siemens-am33x-common.h | 1 - include/configs/socfpga_common.h | 1 - include/configs/taurus.h | 1 - include/configs/theadorable.h | 1 - include/configs/ti_armv7_keystone2.h | 1 - include/configs/turris_omnia.h | 1 - include/configs/veyron.h | 1 - include/configs/xilinx_zynqmp.h | 1 - include/configs/zynq-common.h | 1 - 46 files changed, 53 deletions(-) (limited to 'include/configs') diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h index 89334ffb0b1..ff87adcd490 100644 --- a/include/configs/am335x_evm.h +++ b/include/configs/am335x_evm.h @@ -280,7 +280,6 @@ */ #if defined(CONFIG_SPI_BOOT) /* SPL related */ -#define CONFIG_SPL_SPI_LOAD #define CONFIG_SYS_SPI_U_BOOT_OFFS 0x20000 #define CONFIG_SYS_REDUNDAND_ENVIRONMENT diff --git a/include/configs/am57xx_evm.h b/include/configs/am57xx_evm.h index 7211cde2522..d1f73f76a45 100644 --- a/include/configs/am57xx_evm.h +++ b/include/configs/am57xx_evm.h @@ -111,7 +111,6 @@ /* SPI SPL */ #define CONFIG_TI_EDMA3 -#define CONFIG_SPL_SPI_LOAD #define CONFIG_SYS_SPI_U_BOOT_OFFS 0x40000 /* SPI */ diff --git a/include/configs/at91sam9n12ek.h b/include/configs/at91sam9n12ek.h index 0758902fe61..90dbc0eac4a 100644 --- a/include/configs/at91sam9n12ek.h +++ b/include/configs/at91sam9n12ek.h @@ -170,7 +170,6 @@ #elif CONFIG_SYS_USE_NANDFLASH #elif CONFIG_SPI_BOOT -#define CONFIG_SPL_SPI_LOAD #define CONFIG_SYS_SPI_U_BOOT_OFFS 0x8400 #elif CONFIG_NAND_BOOT diff --git a/include/configs/at91sam9x5ek.h b/include/configs/at91sam9x5ek.h index 95e327aa658..0af0127cd47 100644 --- a/include/configs/at91sam9x5ek.h +++ b/include/configs/at91sam9x5ek.h @@ -143,7 +143,6 @@ #define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img" #elif CONFIG_SPI_BOOT -#define CONFIG_SPL_SPI_LOAD #define CONFIG_SYS_SPI_U_BOOT_OFFS 0x8400 #elif CONFIG_NAND_BOOT diff --git a/include/configs/bav335x.h b/include/configs/bav335x.h index a044329fbff..fb896fee277 100644 --- a/include/configs/bav335x.h +++ b/include/configs/bav335x.h @@ -450,7 +450,6 @@ DEFAULT_LINUX_BOOT_ENV \ */ #if defined(CONFIG_SPI_BOOT) /* SPL related */ -#define CONFIG_SPL_SPI_LOAD #define CONFIG_SYS_SPI_U_BOOT_OFFS 0x20000 #define CONFIG_SYS_REDUNDAND_ENVIRONMENT diff --git a/include/configs/brppt1.h b/include/configs/brppt1.h index 02e989ad7ad..457f55b8a83 100644 --- a/include/configs/brppt1.h +++ b/include/configs/brppt1.h @@ -216,7 +216,6 @@ MMCARGS #define CONFIG_SPI #define CONFIG_SF_DEFAULT_SPEED 24000000 -#define CONFIG_SPL_SPI_LOAD #define CONFIG_SYS_SPI_U_BOOT_OFFS 0x20000 #define CONFIG_SYS_REDUNDAND_ENVIRONMENT #define CONFIG_ENV_SPI_MAX_HZ CONFIG_SF_DEFAULT_SPEED diff --git a/include/configs/cgtqmx6eval.h b/include/configs/cgtqmx6eval.h index b3814a6ce6d..a0a9ec8af3d 100644 --- a/include/configs/cgtqmx6eval.h +++ b/include/configs/cgtqmx6eval.h @@ -19,7 +19,6 @@ #ifdef CONFIG_SPL #define CONFIG_SYS_SPI_U_BOOT_OFFS (64 * 1024) -#define CONFIG_SPL_SPI_LOAD #include "imx6_spl.h" #endif diff --git a/include/configs/cl-som-am57x.h b/include/configs/cl-som-am57x.h index 922ba93c690..9c70cf0b37b 100644 --- a/include/configs/cl-som-am57x.h +++ b/include/configs/cl-som-am57x.h @@ -36,8 +36,6 @@ /* Offsets: 0K - SPL1, 64K - SPL2, 128K - SPL3, 192K - SPL4, 256K - U-Boot */ #define CONFIG_SYS_SPI_U_BOOT_OFFS (256 * 1024) #define CONFIG_SPL_SPI_SUPPORT -#define CONFIG_SPL_SPI_FLASH_SUPPORT -#define CONFIG_SPL_SPI_LOAD /* SD/MMC RAW/FS boot */ #define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img" diff --git a/include/configs/cl-som-imx7.h b/include/configs/cl-som-imx7.h index 7d6f39f4da8..36cf5769e98 100644 --- a/include/configs/cl-som-imx7.h +++ b/include/configs/cl-som-imx7.h @@ -184,7 +184,6 @@ /* SPL */ #include "imx7_spl.h" #ifdef CONFIG_SPL_BUILD -#define CONFIG_SPL_SPI_LOAD #define CONFIG_SYS_SPI_U_BOOT_OFFS (64 * 1024) #endif /* CONFIG_SPL_BUILD */ diff --git a/include/configs/clearfog.h b/include/configs/clearfog.h index c5bd2ed3368..059c3021735 100644 --- a/include/configs/clearfog.h +++ b/include/configs/clearfog.h @@ -98,7 +98,6 @@ #if CONFIG_SPL_BOOT_DEVICE == SPL_BOOT_SPI_NOR_FLASH /* SPL related SPI defines */ -#define CONFIG_SPL_SPI_LOAD #define CONFIG_SYS_SPI_U_BOOT_OFFS 0x20000 #define CONFIG_SYS_U_BOOT_OFFS CONFIG_SYS_SPI_U_BOOT_OFFS #endif diff --git a/include/configs/cm_fx6.h b/include/configs/cm_fx6.h index 9cf559e04f4..35328b16461 100644 --- a/include/configs/cm_fx6.h +++ b/include/configs/cm_fx6.h @@ -227,7 +227,6 @@ /* SPL */ #include "imx6_spl.h" #define CONFIG_SYS_SPI_U_BOOT_OFFS (64 * 1024) -#define CONFIG_SPL_SPI_LOAD /* Display */ #define CONFIG_VIDEO_IPUV3 diff --git a/include/configs/cm_t43.h b/include/configs/cm_t43.h index 4bb48175afc..a118f0ee367 100644 --- a/include/configs/cm_t43.h +++ b/include/configs/cm_t43.h @@ -131,7 +131,6 @@ #define CONFIG_SYS_SPL_ARGS_ADDR (CONFIG_SYS_SDRAM_BASE + (128 << 20)) #define CONFIG_SYS_SPI_U_BOOT_OFFS (256 * 1024) #define CONFIG_SYS_MONITOR_LEN (512 * 1024) -#define CONFIG_SPL_SPI_LOAD /* EEPROM */ #define CONFIG_ENV_EEPROM_IS_ON_I2C diff --git a/include/configs/controlcenterdc.h b/include/configs/controlcenterdc.h index 1db18a4065c..b6d15f684f0 100644 --- a/include/configs/controlcenterdc.h +++ b/include/configs/controlcenterdc.h @@ -117,7 +117,6 @@ #if CONFIG_SPL_BOOT_DEVICE == SPL_BOOT_SPI_NOR_FLASH /* SPL related SPI defines */ -#define CONFIG_SPL_SPI_LOAD #define CONFIG_SYS_SPI_U_BOOT_OFFS 0x30000 #define CONFIG_SYS_U_BOOT_OFFS CONFIG_SYS_SPI_U_BOOT_OFFS #endif diff --git a/include/configs/da850evm.h b/include/configs/da850evm.h index dcae282e289..a914564c63a 100644 --- a/include/configs/da850evm.h +++ b/include/configs/da850evm.h @@ -136,7 +136,6 @@ #endif #ifdef CONFIG_USE_SPIFLASH -#define CONFIG_SPL_SPI_LOAD #define CONFIG_SYS_SPI_U_BOOT_OFFS 0x8000 #define CONFIG_SYS_SPI_U_BOOT_SIZE 0x40000 #endif @@ -292,7 +291,6 @@ #define CONFIG_SYS_SPL_MALLOC_START (CONFIG_SYS_TEXT_BASE - \ CONFIG_SYS_MALLOC_LEN) #define CONFIG_SYS_SPL_MALLOC_SIZE CONFIG_SYS_MALLOC_LEN -#define CONFIG_SPL_SPI_LOAD #define CONFIG_SPL_STACK 0x8001ff00 #define CONFIG_SPL_TEXT_BASE 0x80000000 #define CONFIG_SPL_MAX_FOOTPRINT 32768 @@ -300,9 +298,6 @@ #endif /* Load U-Boot Image From MMC */ -#ifdef CONFIG_SPL_MMC_LOAD -#undef CONFIG_SPL_SPI_LOAD -#endif /* additions for new relocation code, must added to all boards */ #define CONFIG_SYS_SDRAM_BASE 0xc0000000 diff --git a/include/configs/db-88f6720.h b/include/configs/db-88f6720.h index 066b7def0e8..a0eab2dcaea 100644 --- a/include/configs/db-88f6720.h +++ b/include/configs/db-88f6720.h @@ -80,7 +80,6 @@ #define CONFIG_SPL_BOOTROM_SAVE (CONFIG_SPL_STACK + 4) /* SPL related SPI defines */ -#define CONFIG_SPL_SPI_LOAD #define CONFIG_SYS_SPI_U_BOOT_OFFS 0x20000 #define CONFIG_SYS_U_BOOT_OFFS CONFIG_SYS_SPI_U_BOOT_OFFS diff --git a/include/configs/db-88f6820-amc.h b/include/configs/db-88f6820-amc.h index 915432ae26c..cc54efec992 100644 --- a/include/configs/db-88f6820-amc.h +++ b/include/configs/db-88f6820-amc.h @@ -84,7 +84,6 @@ #if CONFIG_SPL_BOOT_DEVICE == SPL_BOOT_SPI_NOR_FLASH /* SPL related SPI defines */ -#define CONFIG_SPL_SPI_LOAD #define CONFIG_SYS_SPI_U_BOOT_OFFS 0x24000 #define CONFIG_SYS_U_BOOT_OFFS CONFIG_SYS_SPI_U_BOOT_OFFS #endif diff --git a/include/configs/db-88f6820-gp.h b/include/configs/db-88f6820-gp.h index bcc919d86d1..8ea039efc2b 100644 --- a/include/configs/db-88f6820-gp.h +++ b/include/configs/db-88f6820-gp.h @@ -98,7 +98,6 @@ #if CONFIG_SPL_BOOT_DEVICE == SPL_BOOT_SPI_NOR_FLASH /* SPL related SPI defines */ -#define CONFIG_SPL_SPI_LOAD #define CONFIG_SYS_SPI_U_BOOT_OFFS 0x24000 #define CONFIG_SYS_U_BOOT_OFFS CONFIG_SYS_SPI_U_BOOT_OFFS #endif diff --git a/include/configs/db-mv784mp-gp.h b/include/configs/db-mv784mp-gp.h index f8865911599..f69d997c11d 100644 --- a/include/configs/db-mv784mp-gp.h +++ b/include/configs/db-mv784mp-gp.h @@ -91,7 +91,6 @@ #define CONFIG_SPL_BOOTROM_SAVE (CONFIG_SPL_STACK + 4) /* SPL related SPI defines */ -#define CONFIG_SPL_SPI_LOAD #define CONFIG_SYS_SPI_U_BOOT_OFFS 0x20000 #define CONFIG_SYS_U_BOOT_OFFS CONFIG_SYS_SPI_U_BOOT_OFFS diff --git a/include/configs/dh_imx6.h b/include/configs/dh_imx6.h index 02bf6981e9a..9fce261d2ec 100644 --- a/include/configs/dh_imx6.h +++ b/include/configs/dh_imx6.h @@ -25,7 +25,6 @@ /* SPL */ #include "imx6_spl.h" /* common IMX6 SPL configuration */ #define CONFIG_SYS_SPI_U_BOOT_OFFS 0x11400 -#define CONFIG_SPL_SPI_LOAD #define CONFIG_SPL_TARGET "u-boot-with-spl.imx" /* Miscellaneous configurable options */ diff --git a/include/configs/display5.h b/include/configs/display5.h index 9fa96fed082..cda03d9f9b8 100644 --- a/include/configs/display5.h +++ b/include/configs/display5.h @@ -49,7 +49,6 @@ #include "imx6_spl.h" #define CONFIG_SYS_SPI_U_BOOT_OFFS 0x20000 -#define CONFIG_SPL_SPI_LOAD #define CONFIG_CMDLINE_TAG #define CONFIG_SETUP_MEMORY_TAGS diff --git a/include/configs/dra7xx_evm.h b/include/configs/dra7xx_evm.h index 13efc3e56e1..917a05d701a 100644 --- a/include/configs/dra7xx_evm.h +++ b/include/configs/dra7xx_evm.h @@ -130,7 +130,6 @@ /* SPI SPL */ #define CONFIG_TI_EDMA3 -#define CONFIG_SPL_SPI_LOAD #define CONFIG_SYS_SPI_U_BOOT_OFFS 0x40000 #define CONFIG_SUPPORT_EMMC_BOOT diff --git a/include/configs/ds414.h b/include/configs/ds414.h index e137c0fd2ad..1ac6ccad250 100644 --- a/include/configs/ds414.h +++ b/include/configs/ds414.h @@ -100,7 +100,6 @@ #define CONFIG_SPL_BOOTROM_SAVE (CONFIG_SPL_STACK + 4) /* SPL related SPI defines */ -#define CONFIG_SPL_SPI_LOAD #define CONFIG_SYS_SPI_U_BOOT_OFFS 0x24000 /* DS414 bus width is 32bits */ diff --git a/include/configs/el6x_common.h b/include/configs/el6x_common.h index e6b6be4ced8..9c145200a2f 100644 --- a/include/configs/el6x_common.h +++ b/include/configs/el6x_common.h @@ -22,7 +22,6 @@ #ifdef CONFIG_SPL #define CONFIG_SYS_SPI_U_BOOT_OFFS (64 * 1024) -#define CONFIG_SPL_SPI_LOAD #include "imx6_spl.h" #endif diff --git a/include/configs/ma5d4evk.h b/include/configs/ma5d4evk.h index a00af1a1fb3..1781db8cb58 100644 --- a/include/configs/ma5d4evk.h +++ b/include/configs/ma5d4evk.h @@ -205,7 +205,6 @@ #define CONFIG_SYS_MONITOR_LEN (512 << 10) -#define CONFIG_SPL_SPI_LOAD #define CONFIG_SYS_SPI_U_BOOT_OFFS 0x10000 #define CONFIG_SYS_USE_MMC diff --git a/include/configs/maxbcm.h b/include/configs/maxbcm.h index 93597db2369..0f97b4c1e0c 100644 --- a/include/configs/maxbcm.h +++ b/include/configs/maxbcm.h @@ -76,7 +76,6 @@ #define CONFIG_SPL_BOOTROM_SAVE (CONFIG_SPL_STACK + 4) /* SPL related SPI defines */ -#define CONFIG_SPL_SPI_LOAD #define CONFIG_SYS_SPI_U_BOOT_OFFS 0x20000 /* Enable DDR support in SPL (DDR3 training from Marvell bin_hdr) */ diff --git a/include/configs/omapl138_lcdk.h b/include/configs/omapl138_lcdk.h index 77b89bc7a03..d67a619a8ca 100644 --- a/include/configs/omapl138_lcdk.h +++ b/include/configs/omapl138_lcdk.h @@ -129,7 +129,6 @@ #define CONFIG_ENV_SPI_MAX_HZ CONFIG_SF_DEFAULT_SPEED #ifdef CONFIG_USE_SPIFLASH -#define CONFIG_SPL_SPI_LOAD #define CONFIG_SYS_SPI_U_BOOT_OFFS 0x8000 #define CONFIG_SYS_SPI_U_BOOT_SIZE 0x30000 #endif diff --git a/include/configs/ot1200.h b/include/configs/ot1200.h index b2cbf91ddfa..62b48bc2588 100644 --- a/include/configs/ot1200.h +++ b/include/configs/ot1200.h @@ -68,7 +68,6 @@ #ifdef CONFIG_SPL #include "imx6_spl.h" #define CONFIG_SYS_SPI_U_BOOT_OFFS (64 * 1024) -#define CONFIG_SPL_SPI_LOAD #endif #define CONFIG_FEC_MXC diff --git a/include/configs/pcm051.h b/include/configs/pcm051.h index 4f72350138e..a59e88171fd 100644 --- a/include/configs/pcm051.h +++ b/include/configs/pcm051.h @@ -116,7 +116,6 @@ /* CPU */ #ifdef CONFIG_SPI_BOOT -#define CONFIG_SPL_SPI_LOAD #define CONFIG_SYS_SPI_U_BOOT_OFFS 0x20000 #define CONFIG_SYS_SPI_U_BOOT_SIZE 0x40000 #endif diff --git a/include/configs/pcm058.h b/include/configs/pcm058.h index 9481e5b5c5c..3b8239052eb 100644 --- a/include/configs/pcm058.h +++ b/include/configs/pcm058.h @@ -9,7 +9,6 @@ #define __PCM058_CONFIG_H #ifdef CONFIG_SPL -#define CONFIG_SPL_SPI_LOAD #define CONFIG_SYS_SPI_U_BOOT_OFFS (64 * 1024) #include "imx6_spl.h" #endif diff --git a/include/configs/pfla02.h b/include/configs/pfla02.h index e3c11918178..072cd3454a6 100644 --- a/include/configs/pfla02.h +++ b/include/configs/pfla02.h @@ -9,7 +9,6 @@ #define __PCM058_CONFIG_H #ifdef CONFIG_SPL -#define CONFIG_SPL_SPI_LOAD #define CONFIG_SYS_SPI_U_BOOT_OFFS (64 * 1024) #include "imx6_spl.h" #endif diff --git a/include/configs/porter.h b/include/configs/porter.h index eb28d1afcca..48f433486c8 100644 --- a/include/configs/porter.h +++ b/include/configs/porter.h @@ -57,7 +57,6 @@ #define CONFIG_SPL_TEXT_BASE 0xe6304000 #define CONFIG_SPL_STACK 0xe6340000 #define CONFIG_SPL_MAX_SIZE 0x40000 -#define CONFIG_SPL_SPI_LOAD #define CONFIG_SYS_SPI_U_BOOT_OFFS 0x140000 #endif /* __PORTER_H */ diff --git a/include/configs/rk3399_common.h b/include/configs/rk3399_common.h index f0e550d8aae..bdba19eeae4 100644 --- a/include/configs/rk3399_common.h +++ b/include/configs/rk3399_common.h @@ -13,9 +13,6 @@ #define CONFIG_SYS_MALLOC_LEN (32 << 20) #define CONFIG_SYS_CBSIZE 1024 #define CONFIG_SKIP_LOWLEVEL_INIT -#if defined(CONFIG_SPL_SPI_SUPPORT) -#define CONFIG_SPL_SPI_LOAD -#endif #define COUNTER_FREQUENCY 24000000 diff --git a/include/configs/sama5d27_som1_ek.h b/include/configs/sama5d27_som1_ek.h index 24fa027034e..71dbc104301 100644 --- a/include/configs/sama5d27_som1_ek.h +++ b/include/configs/sama5d27_som1_ek.h @@ -82,7 +82,6 @@ #endif #ifdef CONFIG_QSPI_BOOT -#define CONFIG_SPL_SPI_LOAD #define CONFIG_SYS_SPI_U_BOOT_OFFS 0x10000 #endif diff --git a/include/configs/sama5d2_xplained.h b/include/configs/sama5d2_xplained.h index f06556f0d4a..7f27f7a5ee3 100644 --- a/include/configs/sama5d2_xplained.h +++ b/include/configs/sama5d2_xplained.h @@ -61,7 +61,6 @@ #define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img" #elif CONFIG_SPI_BOOT -#define CONFIG_SPL_SPI_LOAD #define CONFIG_SYS_SPI_U_BOOT_OFFS 0x10000 #endif diff --git a/include/configs/sama5d3xek.h b/include/configs/sama5d3xek.h index be19d8dcedd..51db1359401 100644 --- a/include/configs/sama5d3xek.h +++ b/include/configs/sama5d3xek.h @@ -102,7 +102,6 @@ #define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img" #elif CONFIG_SPI_BOOT -#define CONFIG_SPL_SPI_LOAD #define CONFIG_SYS_SPI_U_BOOT_OFFS 0x10000 #elif CONFIG_NAND_BOOT diff --git a/include/configs/sama5d4_xplained.h b/include/configs/sama5d4_xplained.h index 007a4f653ff..fb1e74019db 100644 --- a/include/configs/sama5d4_xplained.h +++ b/include/configs/sama5d4_xplained.h @@ -63,7 +63,6 @@ #elif CONFIG_SYS_USE_NANDFLASH #elif CONFIG_SPI_BOOT -#define CONFIG_SPL_SPI_LOAD #define CONFIG_SYS_SPI_U_BOOT_OFFS 0x10000 #elif CONFIG_NAND_BOOT diff --git a/include/configs/sama5d4ek.h b/include/configs/sama5d4ek.h index dec3b526c0d..2ac47fdb245 100644 --- a/include/configs/sama5d4ek.h +++ b/include/configs/sama5d4ek.h @@ -60,7 +60,6 @@ #define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img" #elif CONFIG_SPI_BOOT -#define CONFIG_SPL_SPI_LOAD #define CONFIG_SYS_SPI_U_BOOT_OFFS 0x10000 #elif CONFIG_NAND_BOOT diff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h index dfa7114e39d..13c3dc8b233 100644 --- a/include/configs/siemens-am33x-common.h +++ b/include/configs/siemens-am33x-common.h @@ -103,7 +103,6 @@ #define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION 1 #define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img" -#define CONFIG_SPL_SPI_LOAD #define CONFIG_SYS_SPI_U_BOOT_OFFS 0x20000 #define CONFIG_SPL_NAND_BASE diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h index 6385357b224..6580ffca254 100644 --- a/include/configs/socfpga_common.h +++ b/include/configs/socfpga_common.h @@ -269,7 +269,6 @@ unsigned int cm_get_qspi_controller_clk_hz(void); /* SPL QSPI boot support */ #ifdef CONFIG_SPL_SPI_SUPPORT -#define CONFIG_SPL_SPI_LOAD #define CONFIG_SYS_SPI_U_BOOT_OFFS 0x40000 #endif diff --git a/include/configs/taurus.h b/include/configs/taurus.h index f138bd22389..2fa0ded439f 100644 --- a/include/configs/taurus.h +++ b/include/configs/taurus.h @@ -123,7 +123,6 @@ #if defined(CONFIG_SPL_BUILD) /* SPL related */ -#define CONFIG_SPL_SPI_LOAD #define CONFIG_SYS_SPI_U_BOOT_OFFS 0x20000 #define CONFIG_SF_DEFAULT_BUS 0 diff --git a/include/configs/theadorable.h b/include/configs/theadorable.h index 3c2691f952a..c487642e89b 100644 --- a/include/configs/theadorable.h +++ b/include/configs/theadorable.h @@ -118,7 +118,6 @@ #define CONFIG_SPL_BOOTROM_SAVE (CONFIG_SPL_STACK + 4) /* SPL related SPI defines */ -#define CONFIG_SPL_SPI_LOAD #define CONFIG_SYS_SPI_U_BOOT_OFFS 0x1a000 #define CONFIG_SYS_U_BOOT_OFFS CONFIG_SYS_SPI_U_BOOT_OFFS diff --git a/include/configs/ti_armv7_keystone2.h b/include/configs/ti_armv7_keystone2.h index 25920146949..e87acca6500 100644 --- a/include/configs/ti_armv7_keystone2.h +++ b/include/configs/ti_armv7_keystone2.h @@ -48,7 +48,6 @@ CONFIG_SYS_SPL_MALLOC_SIZE + \ SPL_MALLOC_F_SIZE + \ KEYSTONE_SPL_STACK_SIZE - 4) -#define CONFIG_SPL_SPI_LOAD #define CONFIG_SYS_SPI_U_BOOT_OFFS CONFIG_SPL_PAD_TO /* SRAM scratch space entries */ diff --git a/include/configs/turris_omnia.h b/include/configs/turris_omnia.h index 27ce047f7d4..1df806b60a9 100644 --- a/include/configs/turris_omnia.h +++ b/include/configs/turris_omnia.h @@ -97,7 +97,6 @@ #ifdef CONFIG_TURRIS_OMNIA_SPL_BOOT_DEVICE_SPI /* SPL related SPI defines */ -# define CONFIG_SPL_SPI_LOAD # define CONFIG_SYS_SPI_U_BOOT_OFFS 0x24000 # define CONFIG_SYS_U_BOOT_OFFS CONFIG_SYS_SPI_U_BOOT_OFFS #endif diff --git a/include/configs/veyron.h b/include/configs/veyron.h index 3a5fc065d87..49522559d44 100644 --- a/include/configs/veyron.h +++ b/include/configs/veyron.h @@ -14,7 +14,6 @@ #include -#define CONFIG_SPL_SPI_LOAD #define CONFIG_SPI_FLASH_GIGADEVICE #define CONFIG_KEYBOARD diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h index 7c6e451f1b7..56c8b0cb68a 100644 --- a/include/configs/xilinx_zynqmp.h +++ b/include/configs/xilinx_zynqmp.h @@ -221,7 +221,6 @@ #define CONFIG_SPL_BSS_MAX_SIZE 0x80000 #if defined(CONFIG_SPL_SPI_FLASH_SUPPORT) -# define CONFIG_SPL_SPI_LOAD # define CONFIG_SYS_SPI_KERNEL_OFFS 0x80000 # define CONFIG_SYS_SPI_ARGS_OFFS 0xa0000 # define CONFIG_SYS_SPI_ARGS_SIZE 0xa0000 diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h index 554fb666346..6d9924903ce 100644 --- a/include/configs/zynq-common.h +++ b/include/configs/zynq-common.h @@ -298,7 +298,6 @@ /* qspi mode is working fine */ #ifdef CONFIG_ZYNQ_QSPI -#define CONFIG_SPL_SPI_LOAD #define CONFIG_SYS_SPI_U_BOOT_OFFS 0x100000 #define CONFIG_SYS_SPI_ARGS_OFFS 0x200000 #define CONFIG_SYS_SPI_ARGS_SIZE 0x80000 -- cgit v1.2.3