diff options
| author | Tom Rini <trini@konsulko.com> | 2018-02-06 12:15:38 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-02-14 12:14:13 -0500 |
| commit | 75670c81e48d4cdab791ab040f00062f2a997d78 (patch) | |
| tree | 1a944b0d5bb830eb38723a342358acc966d4cffe /include/configs | |
| parent | 7a88afd080a5e248c0cb91aedc74320ca45b72af (diff) | |
configs: Migrate CONFIG_SPL_FRAMEWORK
Migrate the option CONFIG_SPL_FRAMEWORK and make this gate most of the
current set of options we have in Kconfig. We will need to have some
options available for SPL and !SPL_FRAMEWORK so this is important. In a
few cases we re-order existing options so that we have less escapes from
the SPL_FRAMEWORK guard.
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'include/configs')
77 files changed, 0 insertions, 95 deletions
diff --git a/include/configs/am3517_crane.h b/include/configs/am3517_crane.h index bb85dce72c..b220b53acd 100644 --- a/include/configs/am3517_crane.h +++ b/include/configs/am3517_crane.h @@ -228,7 +228,6 @@ GENERATED_GBL_DATA_SIZE) /* Defines for SPL */ -#define CONFIG_SPL_FRAMEWORK #define CONFIG_SPL_TEXT_BASE 0x40200800 #define CONFIG_SPL_MAX_SIZE (SRAM_SCRATCH_SPACE_ADDR - \ CONFIG_SPL_TEXT_BASE) diff --git a/include/configs/am3517_evm.h b/include/configs/am3517_evm.h index 45991e9ee2..031ae3478c 100644 --- a/include/configs/am3517_evm.h +++ b/include/configs/am3517_evm.h @@ -214,7 +214,6 @@ #define CONFIG_ENV_ADDR 0x260000 /* Defines for SPL */ -#define CONFIG_SPL_FRAMEWORK #undef CONFIG_SPL_TEXT_BASE #define CONFIG_SPL_TEXT_BASE 0x40200000 diff --git a/include/configs/at91sam9m10g45ek.h b/include/configs/at91sam9m10g45ek.h index cc0109b384..0be8d0f702 100644 --- a/include/configs/at91sam9m10g45ek.h +++ b/include/configs/at91sam9m10g45ek.h @@ -106,7 +106,6 @@ #define CONFIG_SYS_MALLOC_LEN ROUND(3 * CONFIG_ENV_SIZE + 128*1024, 0x1000) /* Defines for SPL */ -#define CONFIG_SPL_FRAMEWORK #define CONFIG_SPL_TEXT_BASE 0x300000 #define CONFIG_SPL_MAX_SIZE 0x010000 #define CONFIG_SPL_STACK 0x310000 diff --git a/include/configs/at91sam9n12ek.h b/include/configs/at91sam9n12ek.h index 7626fee88e..8094f7e12a 100644 --- a/include/configs/at91sam9n12ek.h +++ b/include/configs/at91sam9n12ek.h @@ -155,7 +155,6 @@ #define CONFIG_SYS_MALLOC_LEN (4 * 1024 * 1024) /* SPL */ -#define CONFIG_SPL_FRAMEWORK #define CONFIG_SPL_TEXT_BASE 0x300000 #define CONFIG_SPL_MAX_SIZE 0x6000 #define CONFIG_SPL_STACK 0x308000 diff --git a/include/configs/at91sam9x5ek.h b/include/configs/at91sam9x5ek.h index 14d5780492..3aeb1a5944 100644 --- a/include/configs/at91sam9x5ek.h +++ b/include/configs/at91sam9x5ek.h @@ -129,7 +129,6 @@ #define CONFIG_SYS_MALLOC_LEN (512 * 1024 + 0x1000) /* SPL */ -#define CONFIG_SPL_FRAMEWORK #define CONFIG_SPL_TEXT_BASE 0x300000 #define CONFIG_SPL_MAX_SIZE 0x6000 #define CONFIG_SPL_STACK 0x308000 diff --git a/include/configs/bur_am335x_common.h b/include/configs/bur_am335x_common.h index c7b7f75753..e8abe531ef 100644 --- a/include/configs/bur_am335x_common.h +++ b/include/configs/bur_am335x_common.h @@ -79,7 +79,6 @@ * under common/spl/. Given our generally common memory map, we set a * number of related defaults and sizes here. */ -#define CONFIG_SPL_FRAMEWORK /* * Place the image at the start of the ROM defined image space. * We limit our size to the ROM-defined downloaded image area, and use the diff --git a/include/configs/chromebook_link.h b/include/configs/chromebook_link.h index b116a27869..be166a81ce 100644 --- a/include/configs/chromebook_link.h +++ b/include/configs/chromebook_link.h @@ -19,8 +19,6 @@ #define CONFIG_ENV_SECT_SIZE 0x1000 #define CONFIG_ENV_OFFSET 0x003f8000 -#define CONFIG_SPL_FRAMEWORK - #define CONFIG_SPL_TEXT_BASE 0xfffd0000 #define BOOT_DEVICE_SPI 10 diff --git a/include/configs/clearfog.h b/include/configs/clearfog.h index 86ed27d4f5..406e8d8e4b 100644 --- a/include/configs/clearfog.h +++ b/include/configs/clearfog.h @@ -86,7 +86,6 @@ #define CONFIG_SPL_BOOT_DEVICE SPL_BOOT_SDIO_MMC_CARD /* Defines for SPL */ -#define CONFIG_SPL_FRAMEWORK #define CONFIG_SPL_SIZE (140 << 10) #define CONFIG_SPL_TEXT_BASE 0x40000030 #define CONFIG_SPL_MAX_SIZE (CONFIG_SPL_SIZE - 0x0030) diff --git a/include/configs/cm_t35.h b/include/configs/cm_t35.h index 5511b88889..4667ee4ebd 100644 --- a/include/configs/cm_t35.h +++ b/include/configs/cm_t35.h @@ -219,7 +219,6 @@ #define CONFIG_SCF0403_LCD /* Defines for SPL */ -#define CONFIG_SPL_FRAMEWORK #define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION 1 #define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img" diff --git a/include/configs/controlcenterdc.h b/include/configs/controlcenterdc.h index 5d9783144b..e34b08ed98 100644 --- a/include/configs/controlcenterdc.h +++ b/include/configs/controlcenterdc.h @@ -94,7 +94,6 @@ #define CONFIG_SPL_BOOT_DEVICE SPL_BOOT_SPI_NOR_FLASH /* Defines for SPL */ -#define CONFIG_SPL_FRAMEWORK #define CONFIG_SPL_SIZE (160 << 10) #if defined(CONFIG_SECURED_MODE_IMAGE) diff --git a/include/configs/corvus.h b/include/configs/corvus.h index 7ba9d1454f..71de980008 100644 --- a/include/configs/corvus.h +++ b/include/configs/corvus.h @@ -115,7 +115,6 @@ SZ_4M, 0x1000) /* Defines for SPL */ -#define CONFIG_SPL_FRAMEWORK #define CONFIG_SPL_TEXT_BASE 0x300000 #define CONFIG_SPL_MAX_SIZE (12 * SZ_1K) #define CONFIG_SPL_STACK (SZ_16K) diff --git a/include/configs/da850evm.h b/include/configs/da850evm.h index ae39d64be3..c6f9c930a4 100644 --- a/include/configs/da850evm.h +++ b/include/configs/da850evm.h @@ -294,7 +294,6 @@ #ifndef CONFIG_DIRECT_NOR_BOOT /* defines for SPL */ -#define CONFIG_SPL_FRAMEWORK #define CONFIG_SYS_SPL_MALLOC_START (CONFIG_SYS_TEXT_BASE - \ CONFIG_SYS_MALLOC_LEN) #define CONFIG_SYS_SPL_MALLOC_SIZE CONFIG_SYS_MALLOC_LEN diff --git a/include/configs/db-88f6720.h b/include/configs/db-88f6720.h index 023a0da642..25ce0ce4d3 100644 --- a/include/configs/db-88f6720.h +++ b/include/configs/db-88f6720.h @@ -69,7 +69,6 @@ /* SPL */ /* Defines for SPL */ -#define CONFIG_SPL_FRAMEWORK #define CONFIG_SPL_TEXT_BASE 0x40004030 #define CONFIG_SPL_MAX_SIZE ((128 << 10) - 0x4030) diff --git a/include/configs/db-88f6820-amc.h b/include/configs/db-88f6820-amc.h index 451dad008b..f039f0b34f 100644 --- a/include/configs/db-88f6820-amc.h +++ b/include/configs/db-88f6820-amc.h @@ -72,7 +72,6 @@ #define CONFIG_SPL_BOOT_DEVICE SPL_BOOT_SPI_NOR_FLASH /* Defines for SPL */ -#define CONFIG_SPL_FRAMEWORK #define CONFIG_SPL_SIZE (140 << 10) #define CONFIG_SPL_TEXT_BASE 0x40000030 #define CONFIG_SPL_MAX_SIZE (CONFIG_SPL_SIZE - 0x0030) diff --git a/include/configs/db-88f6820-gp.h b/include/configs/db-88f6820-gp.h index 5f512d24dc..db7346a1b1 100644 --- a/include/configs/db-88f6820-gp.h +++ b/include/configs/db-88f6820-gp.h @@ -86,7 +86,6 @@ #define CONFIG_SPL_BOOT_DEVICE SPL_BOOT_SPI_NOR_FLASH /* Defines for SPL */ -#define CONFIG_SPL_FRAMEWORK #define CONFIG_SPL_SIZE (140 << 10) #define CONFIG_SPL_TEXT_BASE 0x40000030 #define CONFIG_SPL_MAX_SIZE (CONFIG_SPL_SIZE - 0x0030) diff --git a/include/configs/db-mv784mp-gp.h b/include/configs/db-mv784mp-gp.h index 28763a5545..115b593668 100644 --- a/include/configs/db-mv784mp-gp.h +++ b/include/configs/db-mv784mp-gp.h @@ -81,7 +81,6 @@ /* SPL */ /* Defines for SPL */ -#define CONFIG_SPL_FRAMEWORK #define CONFIG_SPL_TEXT_BASE 0x40004030 #define CONFIG_SPL_MAX_SIZE ((128 << 10) - 0x4030) diff --git a/include/configs/devkit3250.h b/include/configs/devkit3250.h index 31fad7d886..49b4748a70 100644 --- a/include/configs/devkit3250.h +++ b/include/configs/devkit3250.h @@ -172,7 +172,6 @@ #define CONFIG_SPL_STACK 0x0000FFF8 /* Use the framework and generic lib */ -#define CONFIG_SPL_FRAMEWORK /* SPL will use serial */ diff --git a/include/configs/ds414.h b/include/configs/ds414.h index dd0cadd048..69217143f9 100644 --- a/include/configs/ds414.h +++ b/include/configs/ds414.h @@ -90,7 +90,6 @@ /* SPL */ /* Defines for SPL */ -#define CONFIG_SPL_FRAMEWORK #define CONFIG_SPL_TEXT_BASE 0x40004030 #define CONFIG_SPL_MAX_SIZE ((128 << 10) - 0x4030) diff --git a/include/configs/edminiv2.h b/include/configs/edminiv2.h index c40ea8bc38..63d07ba1fd 100644 --- a/include/configs/edminiv2.h +++ b/include/configs/edminiv2.h @@ -16,7 +16,6 @@ * SPL */ -#define CONFIG_SPL_FRAMEWORK #define CONFIG_SPL_TEXT_BASE 0xffff0000 #define CONFIG_SPL_MAX_SIZE 0x0000fff0 #define CONFIG_SPL_STACK 0x00020000 diff --git a/include/configs/imx6_spl.h b/include/configs/imx6_spl.h index 5ea7b60541..5a062260fe 100644 --- a/include/configs/imx6_spl.h +++ b/include/configs/imx6_spl.h @@ -8,9 +8,6 @@ #define __IMX6_SPL_CONFIG_H #ifdef CONFIG_SPL - -#define CONFIG_SPL_FRAMEWORK - /* * see Figure 8-3 in IMX6DQ/IMX6SDL Reference manuals: * - IMX6SDL OCRAM (IRAM) is from 0x00907000 to 0x0091FFFF diff --git a/include/configs/imx7_spl.h b/include/configs/imx7_spl.h index 93d7096a6c..2495486c09 100644 --- a/include/configs/imx7_spl.h +++ b/include/configs/imx7_spl.h @@ -12,9 +12,6 @@ #define __IMX7_SPL_CONFIG_H #ifdef CONFIG_SPL - -#define CONFIG_SPL_FRAMEWORK - /* * see figure 6-22 in i.MX 7Dual/Solo Reference manuals: * - IMX7D/S OCRAM free area RAM (OCRAM) is from 0x00910000 to diff --git a/include/configs/ipam390.h b/include/configs/ipam390.h index ae97b2a0d0..cb7986a77f 100644 --- a/include/configs/ipam390.h +++ b/include/configs/ipam390.h @@ -226,7 +226,6 @@ #define CONFIG_MTD_PARTITIONS /* defines for SPL */ -#define CONFIG_SPL_FRAMEWORK #define CONFIG_SYS_SPL_MALLOC_START (CONFIG_SYS_TEXT_BASE - \ CONFIG_SYS_MALLOC_LEN) #define CONFIG_SYS_SPL_MALLOC_SIZE CONFIG_SYS_MALLOC_LEN diff --git a/include/configs/kc1.h b/include/configs/kc1.h index f172472afd..717e0b5137 100644 --- a/include/configs/kc1.h +++ b/include/configs/kc1.h @@ -75,8 +75,6 @@ * SPL */ -#define CONFIG_SPL_FRAMEWORK - #define CONFIG_SPL_TEXT_BASE 0x40300000 #define CONFIG_SPL_MAX_SIZE (SRAM_SCRATCH_SPACE_ADDR - \ CONFIG_SPL_TEXT_BASE) diff --git a/include/configs/ls1021aiot.h b/include/configs/ls1021aiot.h index 0f1a453dec..0d5ee19a38 100644 --- a/include/configs/ls1021aiot.h +++ b/include/configs/ls1021aiot.h @@ -61,7 +61,6 @@ #ifdef CONFIG_SD_BOOT #define CONFIG_SYS_FSL_PBL_RCW \ board/freescale/ls1021aiot/ls102xa_rcw_sd.cfg -#define CONFIG_SPL_FRAMEWORK #define CONFIG_SPL_LIBCOMMON_SUPPORT #define CONFIG_SPL_LIBGENERIC_SUPPORT #define CONFIG_SPL_ENV_SUPPORT diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h index 80da5e2913..b298ed69ac 100644 --- a/include/configs/ls1021aqds.h +++ b/include/configs/ls1021aqds.h @@ -51,7 +51,6 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_SYS_FSL_PBL_RCW \ board/freescale/ls1021aqds/ls102xa_rcw_sd_ifc.cfg #endif -#define CONFIG_SPL_FRAMEWORK #define CONFIG_SPL_TEXT_BASE 0x10000000 #define CONFIG_SPL_MAX_SIZE 0x1a000 @@ -68,7 +67,6 @@ unsigned long get_board_ddr_clk(void); #ifdef CONFIG_NAND_BOOT #define CONFIG_SYS_FSL_PBL_RCW board/freescale/ls1021aqds/ls102xa_rcw_nand.cfg -#define CONFIG_SPL_FRAMEWORK #define CONFIG_SPL_TEXT_BASE 0x10000000 #define CONFIG_SPL_MAX_SIZE 0x1a000 diff --git a/include/configs/ls1021atwr.h b/include/configs/ls1021atwr.h index e8c414172d..723a73b67a 100644 --- a/include/configs/ls1021atwr.h +++ b/include/configs/ls1021atwr.h @@ -66,7 +66,6 @@ #define CONFIG_SYS_FSL_PBL_RCW \ board/freescale/ls1021atwr/ls102xa_rcw_sd_ifc.cfg #endif -#define CONFIG_SPL_FRAMEWORK #ifdef CONFIG_SECURE_BOOT /* diff --git a/include/configs/ls1043a_common.h b/include/configs/ls1043a_common.h index 67b5ea715e..450051cf69 100644 --- a/include/configs/ls1043a_common.h +++ b/include/configs/ls1043a_common.h @@ -65,7 +65,6 @@ /* SD boot SPL */ #ifdef CONFIG_SD_BOOT -#define CONFIG_SPL_FRAMEWORK #define CONFIG_SPL_TARGET "u-boot-with-spl.bin" #define CONFIG_SPL_TEXT_BASE 0x10000000 @@ -96,7 +95,6 @@ /* NAND SPL */ #ifdef CONFIG_NAND_BOOT #define CONFIG_SPL_PBL_PAD -#define CONFIG_SPL_FRAMEWORK #define CONFIG_SPL_TARGET "u-boot-with-spl.bin" #define CONFIG_SPL_TEXT_BASE 0x10000000 #define CONFIG_SPL_MAX_SIZE 0x1a000 diff --git a/include/configs/ls1046a_common.h b/include/configs/ls1046a_common.h index bef4dd40a6..003509ea3b 100644 --- a/include/configs/ls1046a_common.h +++ b/include/configs/ls1046a_common.h @@ -63,7 +63,6 @@ /* SD boot SPL */ #ifdef CONFIG_SD_BOOT -#define CONFIG_SPL_FRAMEWORK #define CONFIG_SPL_TARGET "u-boot-with-spl.bin" #define CONFIG_SPL_LIBCOMMON_SUPPORT #define CONFIG_SPL_LIBGENERIC_SUPPORT @@ -102,7 +101,6 @@ /* NAND SPL */ #ifdef CONFIG_NAND_BOOT #define CONFIG_SPL_PBL_PAD -#define CONFIG_SPL_FRAMEWORK #define CONFIG_SPL_TARGET "u-boot-with-spl.bin" #define CONFIG_SPL_LIBCOMMON_SUPPORT #define CONFIG_SPL_LIBGENERIC_SUPPORT diff --git a/include/configs/ls1088a_common.h b/include/configs/ls1088a_common.h index 7caf028bf3..441c401345 100644 --- a/include/configs/ls1088a_common.h +++ b/include/configs/ls1088a_common.h @@ -242,7 +242,6 @@ unsigned long long get_qixis_addr(void); #ifdef CONFIG_SPL #define CONFIG_SPL_BSS_START_ADDR 0x80100000 #define CONFIG_SPL_BSS_MAX_SIZE 0x00100000 -#define CONFIG_SPL_FRAMEWORK #define CONFIG_SPL_LDSCRIPT "arch/arm/cpu/armv8/u-boot-spl.lds" #define CONFIG_SPL_MAX_SIZE 0x16000 #define CONFIG_SPL_STACK (CONFIG_SYS_FSL_OCRAM_BASE + 0x9ff0) diff --git a/include/configs/ls2080a_common.h b/include/configs/ls2080a_common.h index 1a9662552d..7d351ab279 100644 --- a/include/configs/ls2080a_common.h +++ b/include/configs/ls2080a_common.h @@ -217,7 +217,6 @@ unsigned long long get_qixis_addr(void); #define CONFIG_SPL_BSS_START_ADDR 0x80100000 #define CONFIG_SPL_BSS_MAX_SIZE 0x00100000 -#define CONFIG_SPL_FRAMEWORK #define CONFIG_SPL_MAX_SIZE 0x16000 #define CONFIG_SPL_STACK (CONFIG_SYS_FSL_OCRAM_BASE + 0x9ff0) #define CONFIG_SPL_TARGET "u-boot-with-spl.bin" diff --git a/include/configs/m53evk.h b/include/configs/m53evk.h index 50c947c164..6899eac7a4 100644 --- a/include/configs/m53evk.h +++ b/include/configs/m53evk.h @@ -173,7 +173,6 @@ /* * NAND SPL */ -#define CONFIG_SPL_FRAMEWORK #define CONFIG_SPL_TARGET "u-boot-with-nand-spl.imx" #define CONFIG_SPL_TEXT_BASE 0x70008000 #define CONFIG_SPL_PAD_TO 0x8000 diff --git a/include/configs/ma5d4evk.h b/include/configs/ma5d4evk.h index 3ddfc0957f..ed95e580c0 100644 --- a/include/configs/ma5d4evk.h +++ b/include/configs/ma5d4evk.h @@ -197,7 +197,6 @@ "fi ; " \ "fi\0" /* SPL */ -#define CONFIG_SPL_FRAMEWORK #define CONFIG_SPL_TEXT_BASE 0x200000 #define CONFIG_SPL_MAX_SIZE 0x10000 #define CONFIG_SPL_BSS_START_ADDR 0x20000000 diff --git a/include/configs/maxbcm.h b/include/configs/maxbcm.h index 1265a941d6..4593145901 100644 --- a/include/configs/maxbcm.h +++ b/include/configs/maxbcm.h @@ -65,7 +65,6 @@ /* SPL */ /* Defines for SPL */ -#define CONFIG_SPL_FRAMEWORK #define CONFIG_SPL_TEXT_BASE 0x40004030 #define CONFIG_SPL_MAX_SIZE ((128 << 10) - 0x4030) diff --git a/include/configs/mcx.h b/include/configs/mcx.h index d9995b67bc..345f482048 100644 --- a/include/configs/mcx.h +++ b/include/configs/mcx.h @@ -256,7 +256,6 @@ GENERATED_GBL_DATA_SIZE) /* Defines for SPL */ -#define CONFIG_SPL_FRAMEWORK #define CONFIG_SPL_NAND_BASE #define CONFIG_SPL_NAND_DRIVERS diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h index 16481cb7ce..a065dd3de9 100644 --- a/include/configs/microblaze-generic.h +++ b/include/configs/microblaze-generic.h @@ -217,7 +217,6 @@ #endif /* SPL part */ -#define CONFIG_SPL_FRAMEWORK #ifdef CONFIG_SYS_FLASH_BASE # define CONFIG_SYS_UBOOT_BASE CONFIG_SYS_FLASH_BASE diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h index d3dfe60bb0..ff4e601e55 100644 --- a/include/configs/omap3_beagle.h +++ b/include/configs/omap3_beagle.h @@ -23,8 +23,6 @@ #undef CONFIG_SPL_TEXT_BASE #define CONFIG_SPL_TEXT_BASE 0x40200000 -#define CONFIG_SPL_FRAMEWORK - #define CONFIG_MISC_INIT_R #define CONFIG_CMDLINE_TAG #define CONFIG_SETUP_MEMORY_TAGS diff --git a/include/configs/omap3_evm.h b/include/configs/omap3_evm.h index c143c5af5c..1517be645d 100644 --- a/include/configs/omap3_evm.h +++ b/include/configs/omap3_evm.h @@ -28,8 +28,6 @@ #undef CONFIG_SPL_TEXT_BASE #define CONFIG_SPL_TEXT_BASE 0x40200000 -#define CONFIG_SPL_FRAMEWORK - #define CONFIG_MISC_INIT_R #define CONFIG_CMDLINE_TAG #define CONFIG_SETUP_MEMORY_TAGS diff --git a/include/configs/omap3_logic.h b/include/configs/omap3_logic.h index 70745a882c..6414383fe3 100644 --- a/include/configs/omap3_logic.h +++ b/include/configs/omap3_logic.h @@ -38,7 +38,6 @@ * order to allow for BCH8 to fit in. */ #undef CONFIG_SPL_TEXT_BASE -#define CONFIG_SPL_FRAMEWORK #define CONFIG_SPL_TEXT_BASE 0x40200000 #define CONFIG_MISC_INIT_R /* misc_init_r dumps the die id */ diff --git a/include/configs/omap3_zoom1.h b/include/configs/omap3_zoom1.h index cc7c2fdf04..6d3cd3f4ff 100644 --- a/include/configs/omap3_zoom1.h +++ b/include/configs/omap3_zoom1.h @@ -19,7 +19,6 @@ #include <configs/ti_omap3_common.h> /* Remove SPL boot option - we do not support that on LDP yet */ -#undef CONFIG_SPL_FRAMEWORK /* Generic NAND definition conflicts with debug_base */ #undef CONFIG_SYS_NAND_BASE diff --git a/include/configs/omapl138_lcdk.h b/include/configs/omapl138_lcdk.h index 2d518a916c..9cecd233f3 100644 --- a/include/configs/omapl138_lcdk.h +++ b/include/configs/omapl138_lcdk.h @@ -282,7 +282,6 @@ #ifndef CONFIG_DIRECT_NOR_BOOT /* defines for SPL */ -#define CONFIG_SPL_FRAMEWORK #define CONFIG_SYS_SPL_MALLOC_START (CONFIG_SYS_TEXT_BASE - \ CONFIG_SYS_MALLOC_LEN) #define CONFIG_SYS_SPL_MALLOC_SIZE CONFIG_SYS_MALLOC_LEN diff --git a/include/configs/picosam9g45.h b/include/configs/picosam9g45.h index 8c473d89be..cabe8543c8 100644 --- a/include/configs/picosam9g45.h +++ b/include/configs/picosam9g45.h @@ -119,7 +119,6 @@ #define CONFIG_SYS_MALLOC_LEN ROUND(3 * CONFIG_ENV_SIZE + 128*1024, 0x1000) /* Defines for SPL */ -#define CONFIG_SPL_FRAMEWORK #define CONFIG_SPL_TEXT_BASE 0x300000 #define CONFIG_SPL_MAX_SIZE 0x010000 #define CONFIG_SPL_STACK 0x310000 diff --git a/include/configs/qemu-x86.h b/include/configs/qemu-x86.h index 01072f8572..8218837e07 100644 --- a/include/configs/qemu-x86.h +++ b/include/configs/qemu-x86.h @@ -36,8 +36,6 @@ /* SPI is not supported */ -#define CONFIG_SPL_FRAMEWORK - #define CONFIG_SPL_TEXT_BASE 0xfffd0000 #define BOOT_DEVICE_SPI 10 diff --git a/include/configs/rk3188_common.h b/include/configs/rk3188_common.h index 6a32b02cc1..94f8cda853 100644 --- a/include/configs/rk3188_common.h +++ b/include/configs/rk3188_common.h @@ -36,7 +36,6 @@ #define CONFIG_SPL_TEXT_BASE 0x10080800 /* spl size 32kb sram - 2kb bootrom */ #define CONFIG_SPL_MAX_SIZE (0x8000 - 0x800) -#define CONFIG_SPL_FRAMEWORK 1 #define CONFIG_ROCKCHIP_SERIAL 1 #define CONFIG_SPL_STACK 0x10087fff diff --git a/include/configs/rk322x_common.h b/include/configs/rk322x_common.h index 0570a16660..7f9c7fbfd5 100644 --- a/include/configs/rk322x_common.h +++ b/include/configs/rk322x_common.h @@ -18,7 +18,6 @@ #define CONFIG_SYS_TIMER_BASE 0x110c00a0 /* TIMER5 */ #define CONFIG_SYS_TIMER_COUNTER (CONFIG_SYS_TIMER_BASE + 8) -#define CONFIG_SPL_FRAMEWORK #define CONFIG_SYS_NS16550_MEM32 #define CONFIG_SYS_INIT_SP_ADDR 0x60100000 #define CONFIG_SYS_LOAD_ADDR 0x60800800 diff --git a/include/configs/rk3288_common.h b/include/configs/rk3288_common.h index 28d52800f8..78595b86ec 100644 --- a/include/configs/rk3288_common.h +++ b/include/configs/rk3288_common.h @@ -19,7 +19,6 @@ #define CONFIG_SYS_TIMER_BASE 0xff810020 /* TIMER7 */ #define CONFIG_SYS_TIMER_COUNTER (CONFIG_SYS_TIMER_BASE + 8) -#define CONFIG_SPL_FRAMEWORK #define CONFIG_SYS_NS16550_MEM32 #ifdef CONFIG_SPL_ROCKCHIP_BACK_TO_BROM diff --git a/include/configs/rk3368_common.h b/include/configs/rk3368_common.h index 7a28a9d8f9..10f643f7ce 100644 --- a/include/configs/rk3368_common.h +++ b/include/configs/rk3368_common.h @@ -24,7 +24,6 @@ #define COUNTER_FREQUENCY 24000000 -#define CONFIG_SPL_FRAMEWORK #define CONFIG_SYS_NS16550_MEM32 #define CONFIG_SYS_INIT_SP_ADDR 0x00300000 diff --git a/include/configs/rk3399_common.h b/include/configs/rk3399_common.h index 4d4772ce6b..d700bf2549 100644 --- a/include/configs/rk3399_common.h +++ b/include/configs/rk3399_common.h @@ -13,7 +13,6 @@ #define CONFIG_SYS_MALLOC_LEN (32 << 20) #define CONFIG_SYS_CBSIZE 1024 #define CONFIG_SKIP_LOWLEVEL_INIT -#define CONFIG_SPL_FRAMEWORK #if defined(CONFIG_SPL_SPI_SUPPORT) #define CONFIG_SPL_SPI_LOAD #endif diff --git a/include/configs/sama5d27_som1_ek.h b/include/configs/sama5d27_som1_ek.h index ba56e00683..24fa027034 100644 --- a/include/configs/sama5d27_som1_ek.h +++ b/include/configs/sama5d27_som1_ek.h @@ -67,7 +67,6 @@ #endif /* SPL */ -#define CONFIG_SPL_FRAMEWORK #define CONFIG_SPL_TEXT_BASE 0x200000 #define CONFIG_SPL_MAX_SIZE 0x10000 #define CONFIG_SPL_BSS_START_ADDR 0x20000000 diff --git a/include/configs/sama5d2_xplained.h b/include/configs/sama5d2_xplained.h index 545ba1740d..f06556f0d4 100644 --- a/include/configs/sama5d2_xplained.h +++ b/include/configs/sama5d2_xplained.h @@ -47,7 +47,6 @@ #endif /* SPL */ -#define CONFIG_SPL_FRAMEWORK #define CONFIG_SPL_TEXT_BASE 0x200000 #define CONFIG_SPL_MAX_SIZE 0x10000 #define CONFIG_SPL_BSS_START_ADDR 0x20000000 diff --git a/include/configs/sama5d3_xplained.h b/include/configs/sama5d3_xplained.h index a6697cdb63..edb553142c 100644 --- a/include/configs/sama5d3_xplained.h +++ b/include/configs/sama5d3_xplained.h @@ -70,7 +70,6 @@ #define CONFIG_SYS_LOAD_ADDR 0x22000000 /* load address */ /* SPL */ -#define CONFIG_SPL_FRAMEWORK #define CONFIG_SPL_TEXT_BASE 0x300000 #define CONFIG_SPL_MAX_SIZE 0x18000 #define CONFIG_SPL_BSS_START_ADDR 0x20000000 diff --git a/include/configs/sama5d3xek.h b/include/configs/sama5d3xek.h index 9ec1e76052..843aaa6394 100644 --- a/include/configs/sama5d3xek.h +++ b/include/configs/sama5d3xek.h @@ -90,7 +90,6 @@ #define CONFIG_SYS_LOAD_ADDR 0x22000000 /* load address */ /* SPL */ -#define CONFIG_SPL_FRAMEWORK #define CONFIG_SPL_TEXT_BASE 0x300000 #define CONFIG_SPL_MAX_SIZE 0x18000 #define CONFIG_SPL_BSS_START_ADDR 0x20000000 diff --git a/include/configs/sama5d4_xplained.h b/include/configs/sama5d4_xplained.h index 6aa4bcc5c5..007a4f653f 100644 --- a/include/configs/sama5d4_xplained.h +++ b/include/configs/sama5d4_xplained.h @@ -48,7 +48,6 @@ #endif /* SPL */ -#define CONFIG_SPL_FRAMEWORK #define CONFIG_SPL_TEXT_BASE 0x200000 #define CONFIG_SPL_MAX_SIZE 0x18000 #define CONFIG_SPL_BSS_START_ADDR 0x20000000 diff --git a/include/configs/sama5d4ek.h b/include/configs/sama5d4ek.h index a46e3508bf..dec3b526c0 100644 --- a/include/configs/sama5d4ek.h +++ b/include/configs/sama5d4ek.h @@ -46,7 +46,6 @@ #endif /* SPL */ -#define CONFIG_SPL_FRAMEWORK #define CONFIG_SPL_TEXT_BASE 0x200000 #define CONFIG_SPL_MAX_SIZE 0x18000 #define CONFIG_SPL_BSS_START_ADDR 0x20000000 diff --git a/include/configs/sandbox_spl.h b/include/configs/sandbox_spl.h index 93b595dd10..82ccc5ddd9 100644 --- a/include/configs/sandbox_spl.h +++ b/include/configs/sandbox_spl.h @@ -8,6 +8,4 @@ #include <configs/sandbox.h> -#define CONFIG_SPL_FRAMEWORK - #endif diff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h index 8594aedbbe..467c5e8d8d 100644 --- a/include/configs/siemens-am33x-common.h +++ b/include/configs/siemens-am33x-common.h @@ -99,7 +99,6 @@ #define CONFIG_SYS_I2C /* Defines for SPL */ -#define CONFIG_SPL_FRAMEWORK #define CONFIG_SPL_TEXT_BASE 0x402F0400 #define CONFIG_SPL_MAX_SIZE (SRAM_SCRATCH_SPACE_ADDR - \ CONFIG_SPL_TEXT_BASE) diff --git a/include/configs/smartweb.h b/include/configs/smartweb.h index f337f9c5f8..42636a08b7 100644 --- a/include/configs/smartweb.h +++ b/include/configs/smartweb.h @@ -195,7 +195,6 @@ #endif /* Defines for SPL */ -#define CONFIG_SPL_FRAMEWORK #define CONFIG_SPL_TEXT_BASE 0x0 #define CONFIG_SPL_MAX_SIZE (SZ_4K) diff --git a/include/configs/sniper.h b/include/configs/sniper.h index 8c834b5f57..3c1616646e 100644 --- a/include/configs/sniper.h +++ b/include/configs/sniper.h @@ -70,8 +70,6 @@ * SPL */ -#define CONFIG_SPL_FRAMEWORK - #define CONFIG_SPL_TEXT_BASE 0x40200000 #define CONFIG_SPL_MAX_SIZE (SRAM_SCRATCH_SPACE_ADDR - \ CONFIG_SPL_TEXT_BASE) diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h index 9b306c7450..0a19f24eff 100644 --- a/include/configs/socfpga_common.h +++ b/include/configs/socfpga_common.h @@ -257,7 +257,6 @@ unsigned int cm_get_qspi_controller_clk_hz(void); * 0xFFFF_zzzz ...... Global Data * 0xFFFF_FF00 ...... End of SRAM */ -#define CONFIG_SPL_FRAMEWORK #define CONFIG_SPL_TEXT_BASE CONFIG_SYS_INIT_RAM_ADDR #define CONFIG_SPL_MAX_SIZE CONFIG_SYS_INIT_RAM_SIZE diff --git a/include/configs/stm32f746-disco.h b/include/configs/stm32f746-disco.h index e9a2649dd6..1baed0033d 100644 --- a/include/configs/stm32f746-disco.h +++ b/include/configs/stm32f746-disco.h @@ -70,7 +70,6 @@ /* For SPL */ #ifdef CONFIG_SUPPORT_SPL #define CONFIG_SPL_STACK CONFIG_SYS_INIT_SP_ADDR -#define CONFIG_SPL_FRAMEWORK #define CONFIG_SPL_TEXT_BASE CONFIG_SYS_FLASH_BASE #define CONFIG_SYS_MONITOR_LEN (512 * 1024) #define CONFIG_SYS_SPL_LEN 0x00008000 diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h index f3f9773ffa..15cafcf0f4 100644 --- a/include/configs/sunxi-common.h +++ b/include/configs/sunxi-common.h @@ -184,8 +184,6 @@ #define CONFIG_SYS_MONITOR_LEN (768 << 10) /* 768 KiB */ -#define CONFIG_SPL_FRAMEWORK - #ifndef CONFIG_ARM64 /* AArch64 FEL support is not ready yet */ #define CONFIG_SPL_BOARD_LOAD_IMAGE #endif diff --git a/include/configs/tam3517-common.h b/include/configs/tam3517-common.h index b7828c938b..9827da9e46 100644 --- a/include/configs/tam3517-common.h +++ b/include/configs/tam3517-common.h @@ -148,7 +148,6 @@ #define CONFIG_NET_RETRY_COUNT 10 /* Defines for SPL */ -#define CONFIG_SPL_FRAMEWORK #define CONFIG_SPL_CONSOLE #define CONFIG_SPL_NAND_SOFTECC #define CONFIG_SPL_NAND_WORKSPACE 0x8f07f000 /* below BSS */ diff --git a/include/configs/tao3530.h b/include/configs/tao3530.h index 45318706b8..61363d45c2 100644 --- a/include/configs/tao3530.h +++ b/include/configs/tao3530.h @@ -204,7 +204,6 @@ #define CONFIG_OMAP_EHCI_PHY1_RESET_GPIO 162 /* Defines for SPL */ -#define CONFIG_SPL_FRAMEWORK #define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION 1 #define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img" diff --git a/include/configs/taurus.h b/include/configs/taurus.h index 55a728e8be..6675fa97df 100644 --- a/include/configs/taurus.h +++ b/include/configs/taurus.h @@ -152,7 +152,6 @@ ROUND(3 * CONFIG_ENV_SIZE + SZ_4M, 0x1000) /* Defines for SPL */ -#define CONFIG_SPL_FRAMEWORK #define CONFIG_SPL_TEXT_BASE 0x0 #define CONFIG_SPL_MAX_SIZE (31 * SZ_512) #define CONFIG_SPL_STACK (ATMEL_BASE_SRAM1 + SZ_16K) diff --git a/include/configs/tegra-common.h b/include/configs/tegra-common.h index 2d98a6fa64..866c1fdfd0 100644 --- a/include/configs/tegra-common.h +++ b/include/configs/tegra-common.h @@ -88,7 +88,6 @@ #ifndef CONFIG_ARM64 /* Defines for SPL */ -#define CONFIG_SPL_FRAMEWORK #define CONFIG_SPL_MAX_FOOTPRINT (CONFIG_SYS_TEXT_BASE - \ CONFIG_SPL_TEXT_BASE) #define CONFIG_SYS_SPL_MALLOC_SIZE 0x00010000 diff --git a/include/configs/theadorable.h b/include/configs/theadorable.h index 433afd27ba..85f8133eec 100644 --- a/include/configs/theadorable.h +++ b/include/configs/theadorable.h @@ -108,7 +108,6 @@ /* SPL */ /* Defines for SPL */ -#define CONFIG_SPL_FRAMEWORK #define CONFIG_SPL_TEXT_BASE 0x40004030 #define CONFIG_SPL_MAX_SIZE ((128 << 10) - 0x4030) diff --git a/include/configs/ti814x_evm.h b/include/configs/ti814x_evm.h index 00924d7734..a17f616bff 100644 --- a/include/configs/ti814x_evm.h +++ b/include/configs/ti814x_evm.h @@ -127,7 +127,6 @@ #define CONFIG_CONS_INDEX 1 /* Defines for SPL */ -#define CONFIG_SPL_FRAMEWORK #define CONFIG_SPL_TEXT_BASE 0x40300000 #define CONFIG_SPL_MAX_SIZE (SRAM_SCRATCH_SPACE_ADDR - \ CONFIG_SPL_TEXT_BASE) diff --git a/include/configs/ti_armv7_common.h b/include/configs/ti_armv7_common.h index d1776c9549..5d5b0603e5 100644 --- a/include/configs/ti_armv7_common.h +++ b/include/configs/ti_armv7_common.h @@ -148,7 +148,6 @@ */ #if !defined(CONFIG_NOR_BOOT) && \ !(defined(CONFIG_QSPI_BOOT) && defined(CONFIG_AM43XX)) -#define CONFIG_SPL_FRAMEWORK /* * We also support Falcon Mode so that the Linux kernel can be booted diff --git a/include/configs/tricorder.h b/include/configs/tricorder.h index 342a1ad2a9..cc05eea7e4 100644 --- a/include/configs/tricorder.h +++ b/include/configs/tricorder.h @@ -228,7 +228,6 @@ #define CONFIG_SYS_SRAM_SIZE 0x10000 /* Defines for SPL */ -#define CONFIG_SPL_FRAMEWORK #define CONFIG_SPL_NAND_BASE #define CONFIG_SPL_NAND_DRIVERS diff --git a/include/configs/turris_omnia.h b/include/configs/turris_omnia.h index 1623177be7..6633540a10 100644 --- a/include/configs/turris_omnia.h +++ b/include/configs/turris_omnia.h @@ -83,7 +83,6 @@ "initrd_high=0x10000000\0" /* Defines for SPL */ -#define CONFIG_SPL_FRAMEWORK #define CONFIG_SPL_SIZE (140 << 10) #define CONFIG_SPL_TEXT_BASE 0x40000030 #define CONFIG_SPL_MAX_SIZE (CONFIG_SPL_SIZE - 0x0030) diff --git a/include/configs/uniphier.h b/include/configs/uniphier.h index 5ab06f6072..50040874a3 100644 --- a/include/configs/uniphier.h +++ b/include/configs/uniphier.h @@ -228,8 +228,6 @@ #define CONFIG_SPL_STACK (0x00100000) -#define CONFIG_SPL_FRAMEWORK - #define CONFIG_SYS_NAND_U_BOOT_OFFS 0x20000 /* subtract sizeof(struct image_header) */ diff --git a/include/configs/wb45n.h b/include/configs/wb45n.h index 371efa2f30..75a432c17e 100644 --- a/include/configs/wb45n.h +++ b/include/configs/wb45n.h @@ -128,7 +128,6 @@ #define CONFIG_SYS_MALLOC_LEN (512 * 1024 + 0x1000) /* SPL */ -#define CONFIG_SPL_FRAMEWORK #define CONFIG_SPL_TEXT_BASE 0x300000 #define CONFIG_SPL_MAX_SIZE 0x6000 #define CONFIG_SPL_STACK 0x308000 diff --git a/include/configs/wb50n.h b/include/configs/wb50n.h index d29615fbbc..0a2543bc7b 100644 --- a/include/configs/wb50n.h +++ b/include/configs/wb50n.h @@ -113,7 +113,6 @@ #define CONFIG_SYS_MALLOC_LEN (2 * 1024 * 1024) /* SPL */ -#define CONFIG_SPL_FRAMEWORK #define CONFIG_SPL_TEXT_BASE 0x300000 #define CONFIG_SPL_MAX_SIZE 0x10000 #define CONFIG_SPL_BSS_START_ADDR 0x20000000 diff --git a/include/configs/woodburn_sd.h b/include/configs/woodburn_sd.h index ed6f157c49..acb5ea49a4 100644 --- a/include/configs/woodburn_sd.h +++ b/include/configs/woodburn_sd.h @@ -19,7 +19,6 @@ /* * SPL */ -#define CONFIG_SPL_FRAMEWORK #define CONFIG_SPL_TEXT_BASE 0x10002300 #define CONFIG_SPL_MAX_SIZE (64 * 1024) /* 8 KB for stack */ diff --git a/include/configs/work_92105.h b/include/configs/work_92105.h index cb77d1862c..5e8638d33b 100644 --- a/include/configs/work_92105.h +++ b/include/configs/work_92105.h @@ -153,7 +153,6 @@ /* SPL will use SRAM as stack */ #define CONFIG_SPL_STACK 0x0000FFF8 /* Use the framework and generic lib */ -#define CONFIG_SPL_FRAMEWORK /* SPL will use serial */ /* SPL will load U-Boot from NAND offset 0x40000 */ #define CONFIG_SPL_NAND_DRIVERS diff --git a/include/configs/x600.h b/include/configs/x600.h index 458a4a67b6..7ecfc1eb04 100644 --- a/include/configs/x600.h +++ b/include/configs/x600.h @@ -221,8 +221,6 @@ #define CONFIG_SPL_MAX_SIZE (CONFIG_SRAM_SIZE - 0xb00) #define CONFIG_SPL_START_S_PATH "arch/arm/cpu/arm926ejs/spear" -#define CONFIG_SPL_FRAMEWORK - /* * Please select/define only one of the following * Each definition corresponds to a supported DDR chip. diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h index d9b59033f4..55338312a7 100644 --- a/include/configs/xilinx_zynqmp.h +++ b/include/configs/xilinx_zynqmp.h @@ -229,8 +229,6 @@ #define CONFIG_SPL_BSS_START_ADDR 0x0 #define CONFIG_SPL_BSS_MAX_SIZE 0x80000 -#define CONFIG_SPL_FRAMEWORK - #if defined(CONFIG_SPL_SPI_FLASH_SUPPORT) # define CONFIG_SPL_SPI_LOAD # define CONFIG_SYS_SPI_KERNEL_OFFS 0x80000 diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h index 2fc9414249..2dfac6fe6c 100644 --- a/include/configs/zynq-common.h +++ b/include/configs/zynq-common.h @@ -293,7 +293,6 @@ /* Commands */ /* SPL part */ -#define CONFIG_SPL_FRAMEWORK /* MMC support */ #ifdef CONFIG_MMC_SDHCI_ZYNQ |