diff options
| author | Hannes Schmelzer <hannes.schmelzer@br-automation.com> | 2019-08-22 15:41:46 +0200 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-08-25 20:59:00 -0400 |
| commit | 1ee774d20914fb89ad1b236aedb4178912f77c77 (patch) | |
| tree | 2b8afde3d7a06a3778bd24cf4243dd0856a07add /include | |
| parent | f8584bbe729ff75d19196b7ebbc97fe4f7850016 (diff) | |
| download | u-boot-1ee774d20914fb89ad1b236aedb4178912f77c77.tar.gz u-boot-1ee774d20914fb89ad1b236aedb4178912f77c77.tar.xz u-boot-1ee774d20914fb89ad1b236aedb4178912f77c77.zip | |
Convert CONFIG_SYS_SPI_U_BOOT_OFFS to Kconfig
This converts the following to Kconfig:
CONFIG_SYS_SPI_U_BOOT_OFFS
Signed-off-by: Hannes Schmelzer <hannes.schmelzer@br-automation.com>
[trini: Expose this for SPL_SPI_SUNXI for now]
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'include')
62 files changed, 0 insertions, 118 deletions
diff --git a/include/configs/alt.h b/include/configs/alt.h index eb7eb551ae..bb5267517c 100644 --- a/include/configs/alt.h +++ b/include/configs/alt.h @@ -45,7 +45,6 @@ /* SPL support */ #define CONFIG_SPL_STACK 0xe6340000 #define CONFIG_SPL_MAX_SIZE 0x4000 -#define CONFIG_SYS_SPI_U_BOOT_OFFS 0x140000 #ifdef CONFIG_SPL_BUILD #define CONFIG_CONS_SCIF2 #define CONFIG_SH_SCIF_CLK_FREQ 65000000 diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h index 1885ac8e36..be571066f2 100644 --- a/include/configs/am335x_evm.h +++ b/include/configs/am335x_evm.h @@ -274,7 +274,6 @@ */ #if defined(CONFIG_SPI_BOOT) /* SPL related */ -#define CONFIG_SYS_SPI_U_BOOT_OFFS 0x20000 #define CONFIG_SYS_REDUNDAND_ENVIRONMENT #define CONFIG_ENV_SECT_SIZE (4 << 10) /* 4 KB sectors */ diff --git a/include/configs/am57xx_evm.h b/include/configs/am57xx_evm.h index e181b30564..531f79ee70 100644 --- a/include/configs/am57xx_evm.h +++ b/include/configs/am57xx_evm.h @@ -90,6 +90,5 @@ #define CONFIG_SYS_SPI_ARGS_SIZE 0x80000 /* SPI SPL */ -#define CONFIG_SYS_SPI_U_BOOT_OFFS 0x40000 #endif /* __CONFIG_AM57XX_EVM_H */ diff --git a/include/configs/at91sam9n12ek.h b/include/configs/at91sam9n12ek.h index 2abe979dcf..bc79e1739b 100644 --- a/include/configs/at91sam9n12ek.h +++ b/include/configs/at91sam9n12ek.h @@ -151,11 +151,6 @@ #ifdef CONFIG_SD_BOOT #define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION 1 #define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img" - -#elif CONFIG_SYS_USE_NANDFLASH -#elif CONFIG_SPI_BOOT && CONFIG_SPL_SPI_LOAD -#define CONFIG_SYS_SPI_U_BOOT_OFFS 0x8400 - #elif CONFIG_NAND_BOOT #define CONFIG_SPL_NAND_DRIVERS #define CONFIG_SPL_NAND_BASE diff --git a/include/configs/at91sam9x5ek.h b/include/configs/at91sam9x5ek.h index 8056822692..ad7d281dd6 100644 --- a/include/configs/at91sam9x5ek.h +++ b/include/configs/at91sam9x5ek.h @@ -124,10 +124,6 @@ #ifdef CONFIG_SD_BOOT #define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION 1 #define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img" - -#elif CONFIG_SPI_BOOT && CONFIG_SPL_SPI_LOAD -#define CONFIG_SYS_SPI_U_BOOT_OFFS 0x8400 - #elif CONFIG_NAND_BOOT #define CONFIG_SPL_NAND_DRIVERS #define CONFIG_SPL_NAND_BASE diff --git a/include/configs/bav335x.h b/include/configs/bav335x.h index bfa9fc9a52..db21a473f1 100644 --- a/include/configs/bav335x.h +++ b/include/configs/bav335x.h @@ -443,7 +443,6 @@ DEFAULT_LINUX_BOOT_ENV \ */ #if defined(CONFIG_SPI_BOOT) /* SPL related */ -#define CONFIG_SYS_SPI_U_BOOT_OFFS 0x20000 #define CONFIG_SYS_REDUNDAND_ENVIRONMENT #define CONFIG_ENV_SECT_SIZE (4 << 10) /* 4 KB sectors */ diff --git a/include/configs/brppt1.h b/include/configs/brppt1.h index 5a40f3abd1..bc0dabb51b 100644 --- a/include/configs/brppt1.h +++ b/include/configs/brppt1.h @@ -181,7 +181,6 @@ NANDTGTS \ #if defined(CONFIG_SPI) /* SPI Flash */ -#define CONFIG_SYS_SPI_U_BOOT_OFFS 0x40000 /* Environment */ #define CONFIG_SYS_REDUNDAND_ENVIRONMENT #define CONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET + \ diff --git a/include/configs/brsmarc1.h b/include/configs/brsmarc1.h index c18445816e..c3eb5baacc 100644 --- a/include/configs/brsmarc1.h +++ b/include/configs/brsmarc1.h @@ -72,7 +72,6 @@ BUR_COMMON_ENV \ #define CONFIG_INITRD_TAG /* SPI Flash */ -#define CONFIG_SYS_SPI_U_BOOT_OFFS 0x40000 /* Environment */ #define CONFIG_SYS_REDUNDAND_ENVIRONMENT diff --git a/include/configs/cgtqmx6eval.h b/include/configs/cgtqmx6eval.h index eedf0dd2f8..f109b22fda 100644 --- a/include/configs/cgtqmx6eval.h +++ b/include/configs/cgtqmx6eval.h @@ -17,7 +17,6 @@ #define CONFIG_MACH_TYPE 4122 #ifdef CONFIG_SPL -#define CONFIG_SYS_SPI_U_BOOT_OFFS 0x10000 #include "imx6_spl.h" #endif diff --git a/include/configs/cl-som-imx7.h b/include/configs/cl-som-imx7.h index 7809c4c974..7f3fdea039 100644 --- a/include/configs/cl-som-imx7.h +++ b/include/configs/cl-som-imx7.h @@ -165,8 +165,5 @@ /* SPL */ #include "imx7_spl.h" -#ifdef CONFIG_SPL_BUILD -#define CONFIG_SYS_SPI_U_BOOT_OFFS 0x10000 -#endif /* CONFIG_SPL_BUILD */ #endif /* __CONFIG_H */ diff --git a/include/configs/clearfog.h b/include/configs/clearfog.h index 15c402b542..9d20a5e88c 100644 --- a/include/configs/clearfog.h +++ b/include/configs/clearfog.h @@ -83,7 +83,6 @@ #if defined(CONFIG_MVEBU_SPL_BOOT_DEVICE_SPI) /* SPL related SPI defines */ -#define CONFIG_SYS_SPI_U_BOOT_OFFS 0x20000 #define CONFIG_SYS_U_BOOT_OFFS CONFIG_SYS_SPI_U_BOOT_OFFS #elif defined(CONFIG_MVEBU_SPL_BOOT_DEVICE_MMC) || defined(CONFIG_MVEBU_SPL_BOOT_DEVICE_SATA) /* SPL related MMC defines */ diff --git a/include/configs/cm_fx6.h b/include/configs/cm_fx6.h index b2fae87835..b957e9cba4 100644 --- a/include/configs/cm_fx6.h +++ b/include/configs/cm_fx6.h @@ -207,7 +207,6 @@ /* SPL */ #include "imx6_spl.h" -#define CONFIG_SYS_SPI_U_BOOT_OFFS 0x10000 /* Display */ #define CONFIG_IMX_HDMI diff --git a/include/configs/cm_t43.h b/include/configs/cm_t43.h index d7fafcd333..1314cf96a2 100644 --- a/include/configs/cm_t43.h +++ b/include/configs/cm_t43.h @@ -114,7 +114,6 @@ /* SPL defines. */ #define CONFIG_SYS_SPL_ARGS_ADDR (CONFIG_SYS_SDRAM_BASE + (128 << 20)) -#define CONFIG_SYS_SPI_U_BOOT_OFFS 0x40000 #define CONFIG_SYS_MONITOR_LEN (512 * 1024) /* EEPROM */ diff --git a/include/configs/controlcenterdc.h b/include/configs/controlcenterdc.h index 54bbfe3f55..f6d53284d7 100644 --- a/include/configs/controlcenterdc.h +++ b/include/configs/controlcenterdc.h @@ -97,7 +97,6 @@ #if CONFIG_SPL_BOOT_DEVICE == SPL_BOOT_SPI_NOR_FLASH /* SPL related SPI defines */ -#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 dea7b97a3c..41f0813a01 100644 --- a/include/configs/da850evm.h +++ b/include/configs/da850evm.h @@ -110,7 +110,6 @@ #define CONFIG_SYS_SPI_CLK clk_get(DAVINCI_SPI1_CLKID) #ifdef CONFIG_USE_SPIFLASH -#define CONFIG_SYS_SPI_U_BOOT_OFFS 0x8000 #define CONFIG_SYS_SPI_U_BOOT_SIZE 0x40000 #endif diff --git a/include/configs/db-88f6720.h b/include/configs/db-88f6720.h index a1780fa3da..79b9ccfaa0 100644 --- a/include/configs/db-88f6720.h +++ b/include/configs/db-88f6720.h @@ -73,7 +73,6 @@ #define CONFIG_SPL_BOOTROM_SAVE (CONFIG_SPL_STACK + 4) /* SPL related SPI defines */ -#define CONFIG_SYS_SPI_U_BOOT_OFFS 0x20000 #define CONFIG_SYS_U_BOOT_OFFS CONFIG_SYS_SPI_U_BOOT_OFFS #endif /* _CONFIG_DB_88F6720_H */ diff --git a/include/configs/db-88f6820-amc.h b/include/configs/db-88f6820-amc.h index 6ff86df8e9..61b91dd91f 100644 --- a/include/configs/db-88f6820-amc.h +++ b/include/configs/db-88f6820-amc.h @@ -68,7 +68,6 @@ #if CONFIG_SPL_BOOT_DEVICE == SPL_BOOT_SPI_NOR_FLASH /* SPL related SPI defines */ -#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 c98679e109..900c962679 100644 --- a/include/configs/db-88f6820-gp.h +++ b/include/configs/db-88f6820-gp.h @@ -85,7 +85,6 @@ #if CONFIG_SPL_BOOT_DEVICE == SPL_BOOT_SPI_NOR_FLASH /* SPL related SPI defines */ -#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 73962de1a4..907bd0d032 100644 --- a/include/configs/db-mv784mp-gp.h +++ b/include/configs/db-mv784mp-gp.h @@ -82,7 +82,6 @@ #define CONFIG_SPL_BOOTROM_SAVE (CONFIG_SPL_STACK + 4) /* SPL related SPI defines */ -#define CONFIG_SYS_SPI_U_BOOT_OFFS 0x20000 #define CONFIG_SYS_U_BOOT_OFFS CONFIG_SYS_SPI_U_BOOT_OFFS /* Enable DDR support in SPL (DDR3 training from Marvell bin_hdr) */ diff --git a/include/configs/dh_imx6.h b/include/configs/dh_imx6.h index c3a17b010c..c516e6ed4c 100644 --- a/include/configs/dh_imx6.h +++ b/include/configs/dh_imx6.h @@ -23,7 +23,6 @@ /* SPL */ #include "imx6_spl.h" /* common IMX6 SPL configuration */ -#define CONFIG_SYS_SPI_U_BOOT_OFFS 0x11400 #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 e3f90a6279..e503e4a0ce 100644 --- a/include/configs/display5.h +++ b/include/configs/display5.h @@ -45,7 +45,6 @@ #define CONFIG_SYS_SPI_ARGS_SIZE 0x10000 #include "imx6_spl.h" -#define CONFIG_SYS_SPI_U_BOOT_OFFS 0x20000 #define CONFIG_CMDLINE_TAG #define CONFIG_SETUP_MEMORY_TAGS diff --git a/include/configs/dra7xx_evm.h b/include/configs/dra7xx_evm.h index 7ec6e691c7..3487b8ac1b 100644 --- a/include/configs/dra7xx_evm.h +++ b/include/configs/dra7xx_evm.h @@ -92,7 +92,6 @@ #endif /* SPI SPL */ -#define CONFIG_SYS_SPI_U_BOOT_OFFS 0x40000 /* USB xHCI HOST */ #define CONFIG_USB_XHCI_OMAP diff --git a/include/configs/ds414.h b/include/configs/ds414.h index b175e9d574..552c7449d5 100644 --- a/include/configs/ds414.h +++ b/include/configs/ds414.h @@ -91,7 +91,6 @@ #define CONFIG_SPL_BOOTROM_SAVE (CONFIG_SPL_STACK + 4) /* SPL related SPI defines */ -#define CONFIG_SYS_SPI_U_BOOT_OFFS 0x24000 /* DS414 bus width is 32bits */ #define CONFIG_DDR_32BIT diff --git a/include/configs/el6x_common.h b/include/configs/el6x_common.h index bd46a340c3..fe28154dc1 100644 --- a/include/configs/el6x_common.h +++ b/include/configs/el6x_common.h @@ -20,7 +20,6 @@ #define CONFIG_MXC_UART #ifdef CONFIG_SPL -#define CONFIG_SYS_SPI_U_BOOT_OFFS 0x10000 #include "imx6_spl.h" #endif diff --git a/include/configs/gose.h b/include/configs/gose.h index 0de0a362e3..fcb9f17750 100644 --- a/include/configs/gose.h +++ b/include/configs/gose.h @@ -40,7 +40,6 @@ /* SPL support */ #define CONFIG_SPL_STACK 0xe6340000 #define CONFIG_SPL_MAX_SIZE 0x4000 -#define CONFIG_SYS_SPI_U_BOOT_OFFS 0x140000 #ifdef CONFIG_SPL_BUILD #define CONFIG_CONS_SCIF0 #define CONFIG_SH_SCIF_CLK_FREQ 65000000 diff --git a/include/configs/helios4.h b/include/configs/helios4.h index e03d8409ad..4df32002e0 100644 --- a/include/configs/helios4.h +++ b/include/configs/helios4.h @@ -104,7 +104,6 @@ #define CONFIG_SPL_SPI_FLASH_SUPPORT #define CONFIG_SPL_SPI_LOAD #define CONFIG_SPL_SPI_SUPPORT -#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/j721e_evm.h b/include/configs/j721e_evm.h index f8d4d7bdf8..5fe77ef16d 100644 --- a/include/configs/j721e_evm.h +++ b/include/configs/j721e_evm.h @@ -22,7 +22,6 @@ #ifdef CONFIG_TARGET_J721E_A72_EVM #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SPL_TEXT_BASE + \ CONFIG_SYS_K3_NON_SECURE_MSRAM_SIZE) -#define CONFIG_SYS_SPI_U_BOOT_OFFS 0x280000 #else /* * Maximum size in memory allocated to the SPL BSS. Keep it as tight as @@ -45,7 +44,6 @@ /* Configure R5 SPL post-relocation malloc pool in DDR */ #define CONFIG_SYS_SPL_MALLOC_START 0x84000000 #define CONFIG_SYS_SPL_MALLOC_SIZE SZ_16M -#define CONFIG_SYS_SPI_U_BOOT_OFFS 0x80000 #endif #ifdef CONFIG_SYS_K3_SPL_ATF diff --git a/include/configs/koelsch.h b/include/configs/koelsch.h index c42139dc3a..140076a54e 100644 --- a/include/configs/koelsch.h +++ b/include/configs/koelsch.h @@ -40,7 +40,6 @@ /* SPL support */ #define CONFIG_SPL_STACK 0xe6340000 #define CONFIG_SPL_MAX_SIZE 0x4000 -#define CONFIG_SYS_SPI_U_BOOT_OFFS 0x140000 #ifdef CONFIG_SPL_BUILD #define CONFIG_CONS_SCIF0 #define CONFIG_SH_SCIF_CLK_FREQ 65000000 diff --git a/include/configs/lager.h b/include/configs/lager.h index 5acd5a2118..db1dbc0ee8 100644 --- a/include/configs/lager.h +++ b/include/configs/lager.h @@ -41,7 +41,6 @@ /* SPL support */ #define CONFIG_SPL_STACK 0xe6340000 #define CONFIG_SPL_MAX_SIZE 0x4000 -#define CONFIG_SYS_SPI_U_BOOT_OFFS 0x140000 #ifdef CONFIG_SPL_BUILD #define CONFIG_CONS_SCIF0 #define CONFIG_SH_SCIF_CLK_FREQ 65000000 diff --git a/include/configs/maxbcm.h b/include/configs/maxbcm.h index a017d92cc9..9d5fbcd516 100644 --- a/include/configs/maxbcm.h +++ b/include/configs/maxbcm.h @@ -71,7 +71,6 @@ #define CONFIG_SPL_BOOTROM_SAVE (CONFIG_SPL_STACK + 4) /* SPL related SPI defines */ -#define CONFIG_SYS_SPI_U_BOOT_OFFS 0x20000 /* Enable DDR support in SPL (DDR3 training from Marvell bin_hdr) */ #define CONFIG_DDR_FIXED_SIZE (1 << 20) /* 1GiB */ diff --git a/include/configs/mt7629.h b/include/configs/mt7629.h index fc69d61918..741b6fbc1b 100644 --- a/include/configs/mt7629.h +++ b/include/configs/mt7629.h @@ -38,9 +38,6 @@ #define CONFIG_SPL_PAD_TO 0x10000 #define CONFIG_SPI_ADDR 0x30000000 -#ifdef CONFIG_SPL_SPI_LOAD -#define CONFIG_SYS_SPI_U_BOOT_OFFS 0x10000 -#endif #define CONFIG_SYS_UBOOT_BASE (CONFIG_SPI_ADDR + CONFIG_SPL_PAD_TO) /* SPL -> Uboot */ diff --git a/include/configs/omapl138_lcdk.h b/include/configs/omapl138_lcdk.h index d5f9346f07..cab402a484 100644 --- a/include/configs/omapl138_lcdk.h +++ b/include/configs/omapl138_lcdk.h @@ -116,7 +116,6 @@ #define CONFIG_SYS_SPI_CLK clk_get(DAVINCI_SPI1_CLKID) #ifdef CONFIG_USE_SPIFLASH -#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 17ccf8b741..4efef892a8 100644 --- a/include/configs/ot1200.h +++ b/include/configs/ot1200.h @@ -59,7 +59,6 @@ /* SPL */ #ifdef CONFIG_SPL #include "imx6_spl.h" -#define CONFIG_SYS_SPI_U_BOOT_OFFS 0x10000 #endif #define CONFIG_FEC_MXC diff --git a/include/configs/pcm051.h b/include/configs/pcm051.h index 153e567c2f..fdbc07575c 100644 --- a/include/configs/pcm051.h +++ b/include/configs/pcm051.h @@ -117,7 +117,6 @@ /* CPU */ #ifdef CONFIG_SPI_BOOT -#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 02c9214cd8..855bc445fe 100644 --- a/include/configs/pcm058.h +++ b/include/configs/pcm058.h @@ -8,7 +8,6 @@ #define __PCM058_CONFIG_H #ifdef CONFIG_SPL -#define CONFIG_SYS_SPI_U_BOOT_OFFS 0x10000 #include "imx6_spl.h" #endif diff --git a/include/configs/pfla02.h b/include/configs/pfla02.h index ed7e4fb8d9..8731d89af2 100644 --- a/include/configs/pfla02.h +++ b/include/configs/pfla02.h @@ -8,7 +8,6 @@ #define __PCM058_CONFIG_H #ifdef CONFIG_SPL -#define CONFIG_SYS_SPI_U_BOOT_OFFS 0x10000 #include "imx6_spl.h" #endif diff --git a/include/configs/phycore_am335x_r2.h b/include/configs/phycore_am335x_r2.h index 78d265d1d2..ca28b6ff1b 100644 --- a/include/configs/phycore_am335x_r2.h +++ b/include/configs/phycore_am335x_r2.h @@ -119,7 +119,6 @@ /* CPU */ #ifdef CONFIG_SPI_BOOT -#define CONFIG_SYS_SPI_U_BOOT_OFFS 0x20000 #define CONFIG_SYS_SPI_U_BOOT_SIZE 0x40000 #elif defined(CONFIG_ENV_IS_IN_NAND) #define CONFIG_SYS_ENV_SECT_SIZE CONFIG_SYS_NAND_BLOCK_SIZE diff --git a/include/configs/porter.h b/include/configs/porter.h index 1db28869cd..db42176d28 100644 --- a/include/configs/porter.h +++ b/include/configs/porter.h @@ -45,7 +45,6 @@ /* SPL support */ #define CONFIG_SPL_STACK 0xe6340000 #define CONFIG_SPL_MAX_SIZE 0x4000 -#define CONFIG_SYS_SPI_U_BOOT_OFFS 0x140000 #ifdef CONFIG_SPL_BUILD #define CONFIG_CONS_SCIF0 #define CONFIG_SH_SCIF_CLK_FREQ 65000000 diff --git a/include/configs/rk3128_common.h b/include/configs/rk3128_common.h index dbc7011a6b..d0c9e5c809 100644 --- a/include/configs/rk3128_common.h +++ b/include/configs/rk3128_common.h @@ -26,9 +26,6 @@ #define CONFIG_SYS_BOOTM_LEN (64 << 20) /* 64M */ /* RAW SD card / eMMC locations. */ -#ifdef CONFIG_SPL_SPI_LOAD -#define CONFIG_SYS_SPI_U_BOOT_OFFS 0x20000 -#endif #define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION 1 #define CONFIG_SYS_SDRAM_BASE 0x60000000 diff --git a/include/configs/rk3288_common.h b/include/configs/rk3288_common.h index 9648e34539..bcda769af5 100644 --- a/include/configs/rk3288_common.h +++ b/include/configs/rk3288_common.h @@ -29,9 +29,6 @@ #define CONFIG_IRAM_BASE 0xff700000 /* RAW SD card / eMMC locations. */ -#ifdef CONFIG_SPL_SPI_LOAD -#define CONFIG_SYS_SPI_U_BOOT_OFFS 0x20000 -#endif /* FAT sd card locations. */ #define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION 1 diff --git a/include/configs/rk3328_common.h b/include/configs/rk3328_common.h index 394ee3ef10..3ff3331c80 100644 --- a/include/configs/rk3328_common.h +++ b/include/configs/rk3328_common.h @@ -24,10 +24,6 @@ #define CONFIG_SYS_BOOTM_LEN (64 << 20) /* 64M */ -#ifdef CONFIG_SPL_SPI_LOAD -#define CONFIG_SYS_SPI_U_BOOT_OFFS 0x20000 -#endif - /* FAT sd card locations. */ #define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION 1 #define CONFIG_SYS_SDRAM_BASE 0 diff --git a/include/configs/rk3399_common.h b/include/configs/rk3399_common.h index 06d35a01fd..126c34763e 100644 --- a/include/configs/rk3399_common.h +++ b/include/configs/rk3399_common.h @@ -38,9 +38,6 @@ #define CONFIG_ROCKCHIP_SDHCI_MAX_FREQ 200000000 /* RAW SD card / eMMC locations. */ -#ifdef CONFIG_SPL_SPI_LOAD -#define CONFIG_SYS_SPI_U_BOOT_OFFS 0x20000 -#endif /* FAT sd card locations. */ #define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION 1 diff --git a/include/configs/sama5d27_som1_ek.h b/include/configs/sama5d27_som1_ek.h index 7898f4d277..9b33acd40d 100644 --- a/include/configs/sama5d27_som1_ek.h +++ b/include/configs/sama5d27_som1_ek.h @@ -62,8 +62,4 @@ #define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img" #endif -#if defined(CONFIG_QSPI_BOOT) && defined(CONFIG_SPL_SPI_LOAD) -#define CONFIG_SYS_SPI_U_BOOT_OFFS 0x10000 -#endif - #endif diff --git a/include/configs/sama5d2_xplained.h b/include/configs/sama5d2_xplained.h index 3dea359127..487339594e 100644 --- a/include/configs/sama5d2_xplained.h +++ b/include/configs/sama5d2_xplained.h @@ -69,10 +69,6 @@ #ifdef CONFIG_SD_BOOT #define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION 1 #define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img" - -#elif CONFIG_SPI_BOOT -#define CONFIG_SYS_SPI_U_BOOT_OFFS 0x10000 - #endif #endif diff --git a/include/configs/sama5d3xek.h b/include/configs/sama5d3xek.h index c5a2e54e08..3a712b51bd 100644 --- a/include/configs/sama5d3xek.h +++ b/include/configs/sama5d3xek.h @@ -83,10 +83,6 @@ #ifdef CONFIG_SD_BOOT #define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION 1 #define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img" - -#elif CONFIG_SPI_BOOT && CONFIG_SPL_SPI_LOAD -#define CONFIG_SYS_SPI_U_BOOT_OFFS 0x10000 - #elif CONFIG_NAND_BOOT #define CONFIG_SPL_NAND_DRIVERS #define CONFIG_SPL_NAND_BASE diff --git a/include/configs/sama5d4_xplained.h b/include/configs/sama5d4_xplained.h index 5e6f59f756..1773412819 100644 --- a/include/configs/sama5d4_xplained.h +++ b/include/configs/sama5d4_xplained.h @@ -47,11 +47,6 @@ #ifdef CONFIG_SD_BOOT #define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION 1 #define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img" - -#elif CONFIG_SYS_USE_NANDFLASH -#elif CONFIG_SPI_BOOT -#define CONFIG_SYS_SPI_U_BOOT_OFFS 0x10000 - #elif CONFIG_NAND_BOOT #define CONFIG_SPL_NAND_DRIVERS #define CONFIG_SPL_NAND_BASE diff --git a/include/configs/sama5d4ek.h b/include/configs/sama5d4ek.h index c1f22f7016..6cf07a1127 100644 --- a/include/configs/sama5d4ek.h +++ b/include/configs/sama5d4ek.h @@ -47,10 +47,6 @@ #ifdef CONFIG_SD_BOOT #define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION 1 #define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img" - -#elif CONFIG_SPI_BOOT -#define CONFIG_SYS_SPI_U_BOOT_OFFS 0x10000 - #elif CONFIG_NAND_BOOT #define CONFIG_SPL_NAND_DRIVERS #define CONFIG_SPL_NAND_BASE diff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h index dd63adb6db..ea6cc38fc1 100644 --- a/include/configs/siemens-am33x-common.h +++ b/include/configs/siemens-am33x-common.h @@ -94,8 +94,6 @@ #define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION 1 #define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img" -#define CONFIG_SYS_SPI_U_BOOT_OFFS 0x20000 - #define CONFIG_SPL_NAND_BASE #define CONFIG_SPL_NAND_DRIVERS #define CONFIG_SPL_NAND_ECC diff --git a/include/configs/silk.h b/include/configs/silk.h index c42b57ab2a..a78da46a17 100644 --- a/include/configs/silk.h +++ b/include/configs/silk.h @@ -45,7 +45,6 @@ /* SPL support */ #define CONFIG_SPL_STACK 0xe6340000 #define CONFIG_SPL_MAX_SIZE 0x4000 -#define CONFIG_SYS_SPI_U_BOOT_OFFS 0x140000 #ifdef CONFIG_SPL_BUILD #define CONFIG_CONS_SCIF2 #define CONFIG_SH_SCIF_CLK_FREQ 65000000 diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h index 4141c7efd3..b11fe021a7 100644 --- a/include/configs/socfpga_common.h +++ b/include/configs/socfpga_common.h @@ -213,13 +213,6 @@ unsigned int cm_get_qspi_controller_clk_hz(void); #endif /* SPL QSPI boot support */ -#ifdef CONFIG_SPL_SPI_SUPPORT -#if defined(CONFIG_TARGET_SOCFPGA_GEN5) && defined(CONFIG_SPL_SPI_LOAD) -#define CONFIG_SYS_SPI_U_BOOT_OFFS 0x40000 -#elif defined(CONFIG_TARGET_SOCFPGA_ARRIA10) && defined(CONFIG_SPL_SPI_LOAD) -#define CONFIG_SYS_SPI_U_BOOT_OFFS 0x100000 -#endif -#endif /* SPL NAND boot support */ #ifdef CONFIG_SPL_NAND_SUPPORT diff --git a/include/configs/socfpga_stratix10_socdk.h b/include/configs/socfpga_stratix10_socdk.h index 90ad8172e2..7b55dd14da 100644 --- a/include/configs/socfpga_stratix10_socdk.h +++ b/include/configs/socfpga_stratix10_socdk.h @@ -201,7 +201,6 @@ unsigned int cm_get_l4_sys_free_clk_hz(void); #define CONFIG_SYS_SPL_MALLOC_SIZE (CONFIG_SYS_MALLOC_LEN) #define CONFIG_SYS_SPL_MALLOC_START (CONFIG_SPL_BSS_START_ADDR \ - CONFIG_SYS_SPL_MALLOC_SIZE) -#define CONFIG_SYS_SPI_U_BOOT_OFFS 0x3C00000 /* SPL SDMMC boot support */ #define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION 1 diff --git a/include/configs/stout.h b/include/configs/stout.h index 4a465e01bd..67345958be 100644 --- a/include/configs/stout.h +++ b/include/configs/stout.h @@ -49,7 +49,6 @@ /* SPL support */ #define CONFIG_SPL_STACK 0xe6340000 #define CONFIG_SPL_MAX_SIZE 0x4000 -#define CONFIG_SYS_SPI_U_BOOT_OFFS 0x140000 #ifdef CONFIG_SPL_BUILD #define CONFIG_CONS_SCIFA0 #define CONFIG_SH_SCIF_CLK_FREQ 52000000 diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h index c5dbf6d833..0ef289fd64 100644 --- a/include/configs/sunxi-common.h +++ b/include/configs/sunxi-common.h @@ -118,10 +118,6 @@ #define CONFIG_SYS_MAX_NAND_DEVICE 8 #endif -#if defined(CONFIG_SPL_SPI_SUNXI) && defined(CONFIG_SPL_SPI_LOAD) -#define CONFIG_SYS_SPI_U_BOOT_OFFS 0x8000 -#endif - /* mmc config */ #ifdef CONFIG_MMC #define CONFIG_MMC_SUNXI_SLOT 0 diff --git a/include/configs/taurus.h b/include/configs/taurus.h index bc7399aa17..fdd1c5224b 100644 --- a/include/configs/taurus.h +++ b/include/configs/taurus.h @@ -102,7 +102,6 @@ #if defined(CONFIG_SPL_BUILD) /* SPL related */ -#define CONFIG_SYS_SPI_U_BOOT_OFFS 0x20000 #endif /* load address */ diff --git a/include/configs/theadorable.h b/include/configs/theadorable.h index 3562a14261..45cd7e2b83 100644 --- a/include/configs/theadorable.h +++ b/include/configs/theadorable.h @@ -106,7 +106,6 @@ #define CONFIG_SPL_BOOTROM_SAVE (CONFIG_SPL_STACK + 4) /* SPL related SPI defines */ -#define CONFIG_SYS_SPI_U_BOOT_OFFS 0x1a000 #define CONFIG_SYS_U_BOOT_OFFS CONFIG_SYS_SPI_U_BOOT_OFFS /* Enable DDR support in SPL (DDR3 training from Marvell bin_hdr) */ diff --git a/include/configs/ti814x_evm.h b/include/configs/ti814x_evm.h index 364bac03f7..46b1b41ef9 100644 --- a/include/configs/ti814x_evm.h +++ b/include/configs/ti814x_evm.h @@ -129,9 +129,6 @@ #define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION 1 #define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img" -#ifdef CONFIG_SPL_SPI_LOAD -#define CONFIG_SYS_SPI_U_BOOT_OFFS 0x20000 -#endif #define CONFIG_SYS_SPI_U_BOOT_SIZE 0x40000 /* diff --git a/include/configs/ti_armv7_keystone2.h b/include/configs/ti_armv7_keystone2.h index 7e1d2eb7ac..d7bb1efcbf 100644 --- a/include/configs/ti_armv7_keystone2.h +++ b/include/configs/ti_armv7_keystone2.h @@ -43,9 +43,6 @@ CONFIG_SYS_SPL_MALLOC_SIZE + \ SPL_MALLOC_F_SIZE + \ KEYSTONE_SPL_STACK_SIZE - 4) -#ifdef CONFIG_SPL_SPI_LOAD -#define CONFIG_SYS_SPI_U_BOOT_OFFS 0x10000 -#endif /* SRAM scratch space entries */ #define SRAM_SCRATCH_SPACE_ADDR CONFIG_SPL_STACK + 0x8 diff --git a/include/configs/topic_miami.h b/include/configs/topic_miami.h index a915c32607..b98656dd4c 100644 --- a/include/configs/topic_miami.h +++ b/include/configs/topic_miami.h @@ -22,8 +22,6 @@ /* SPL settings */ #undef CONFIG_SPL_ETH_SUPPORT -#undef CONFIG_SYS_SPI_U_BOOT_OFFS -#define CONFIG_SYS_SPI_U_BOOT_OFFS 0x20000 #undef CONFIG_SPL_MAX_FOOTPRINT #define CONFIG_SPL_MAX_FOOTPRINT CONFIG_SYS_SPI_U_BOOT_OFFS #define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img" diff --git a/include/configs/turris_omnia.h b/include/configs/turris_omnia.h index edd776ec70..abe1e99acd 100644 --- a/include/configs/turris_omnia.h +++ b/include/configs/turris_omnia.h @@ -50,7 +50,6 @@ #ifdef CONFIG_MVEBU_SPL_BOOT_DEVICE_SPI /* SPL related SPI defines */ -# 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/x530.h b/include/configs/x530.h index 16480d5693..2269d1ed8c 100644 --- a/include/configs/x530.h +++ b/include/configs/x530.h @@ -117,7 +117,6 @@ #define CONFIG_SPL_BOOTROM_SAVE (CONFIG_SPL_STACK + 4) /* SPL related SPI defines */ -#define CONFIG_SYS_SPI_U_BOOT_OFFS 0x24000 #define CONFIG_SYS_U_BOOT_OFFS CONFIG_SYS_SPI_U_BOOT_OFFS #endif /* _CONFIG_X530_H */ diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h index 56500fe868..a1c55a8306 100644 --- a/include/configs/xilinx_zynqmp.h +++ b/include/configs/xilinx_zynqmp.h @@ -217,9 +217,6 @@ # define CONFIG_SYS_SPI_KERNEL_OFFS 0x80000 # define CONFIG_SYS_SPI_ARGS_OFFS 0xa0000 # define CONFIG_SYS_SPI_ARGS_SIZE 0xa0000 -#ifdef CONFIG_SPL_SPI_LOAD -# define CONFIG_SYS_SPI_U_BOOT_OFFS 0x170000 -#endif #endif /* u-boot is like dtb */ diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h index fd761c2f5d..ae08ebf2af 100644 --- a/include/configs/zynq-common.h +++ b/include/configs/zynq-common.h @@ -293,9 +293,6 @@ /* qspi mode is working fine */ #ifdef CONFIG_ZYNQ_QSPI -#ifdef CONFIG_SPL_SPI_LOAD -#define CONFIG_SYS_SPI_U_BOOT_OFFS 0x100000 -#endif #define CONFIG_SYS_SPI_ARGS_OFFS 0x200000 #define CONFIG_SYS_SPI_ARGS_SIZE 0x80000 #define CONFIG_SYS_SPI_KERNEL_OFFS (CONFIG_SYS_SPI_ARGS_OFFS + \ |