From 8897bf42889955f5a2a078099dac5b0b8efa18c0 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Sat, 21 Aug 2021 13:50:12 -0400 Subject: global: Remove unused or unnecessary CONFIG symbols related to DDR These symbols are now either unused or were only used within the config file to determine other logic, which could be done in a way that doesn't further pollute the CONFIG namespace. Signed-off-by: Tom Rini --- include/configs/MPC8349EMDS.h | 36 ------------------------------------ include/configs/MPC8349EMDS_SDRAM.h | 36 ------------------------------------ include/configs/MPC837XERDB.h | 8 -------- include/configs/UCP1020.h | 9 --------- include/configs/km/km-mpc83xx.h | 1 - include/configs/socrates.h | 1 - 6 files changed, 91 deletions(-) (limited to 'include') diff --git a/include/configs/MPC8349EMDS.h b/include/configs/MPC8349EMDS.h index d5af4e8166a..9e487b8da29 100644 --- a/include/configs/MPC8349EMDS.h +++ b/include/configs/MPC8349EMDS.h @@ -38,23 +38,9 @@ #define CONFIG_ECC_INIT_VIA_DDRCONTROLLER #define CONFIG_MEM_INIT_VALUE 0xDeadBeef -/* - * 32-bit data path mode. - * - * Please note that using this mode for devices with the real density of 64-bit - * effectively reduces the amount of available memory due to the effect of - * wrapping around while translating address to row/columns, for example in the - * 256MB module the upper 128MB get aliased with contents of the lower - * 128MB); normally this define should be used for devices with real 32-bit - * data path. - */ -#undef CONFIG_DDR_32BIT - #define CONFIG_SYS_SDRAM_BASE 0x00000000 /* DDR is system memory*/ #define CONFIG_SYS_DDR_SDRAM_CLK_CNTL (DDR_SDRAM_CLK_CNTL_SS_EN \ | DDR_SDRAM_CLK_CNTL_CLK_ADJUST_05) -#undef CONFIG_DDR_2T_TIMING - /* * DDRCDR - DDR Control Driver Register */ @@ -70,21 +56,6 @@ * Manually set up DDR parameters */ #define CONFIG_SYS_DDR_SIZE 256 /* MB */ -#if defined(CONFIG_DDR_II) -#define CONFIG_SYS_DDRCDR 0x80080001 -#define CONFIG_SYS_DDR_CS2_BNDS 0x0000000f -#define CONFIG_SYS_DDR_CS2_CONFIG 0x80330102 -#define CONFIG_SYS_DDR_TIMING_0 0x00220802 -#define CONFIG_SYS_DDR_TIMING_1 0x38357322 -#define CONFIG_SYS_DDR_TIMING_2 0x2f9048c8 -#define CONFIG_SYS_DDR_TIMING_3 0x00000000 -#define CONFIG_SYS_DDR_CLK_CNTL 0x02000000 -#define CONFIG_SYS_DDR_MODE 0x47d00432 -#define CONFIG_SYS_DDR_MODE2 0x8000c000 -#define CONFIG_SYS_DDR_INTERVAL 0x03cf0080 -#define CONFIG_SYS_DDR_SDRAM_CFG 0x43000000 -#define CONFIG_SYS_DDR_SDRAM_CFG2 0x00401000 -#else #define CONFIG_SYS_DDR_CS2_CONFIG (CSCONFIG_EN \ | CSCONFIG_ROW_BIT_13 \ | CSCONFIG_COL_BIT_10) @@ -93,17 +64,10 @@ #define CONFIG_SYS_DDR_CONTROL 0xc2000000 /* unbuffered,no DYN_PWR */ #define CONFIG_SYS_DDR_INTERVAL 0x04060100 /* autocharge,no open page */ -#if defined(CONFIG_DDR_32BIT) -/* set burst length to 8 for 32-bit data path */ - /* DLL,normal,seq,4/2.5, 8 burst len */ -#define CONFIG_SYS_DDR_MODE 0x00000023 -#else /* the default burst length is 4 - for 64-bit data path */ /* DLL,normal,seq,4/2.5, 4 burst len */ #define CONFIG_SYS_DDR_MODE 0x00000022 #endif -#endif -#endif /* * SDRAM on the Local Bus diff --git a/include/configs/MPC8349EMDS_SDRAM.h b/include/configs/MPC8349EMDS_SDRAM.h index ac12b22e64e..e652309da58 100644 --- a/include/configs/MPC8349EMDS_SDRAM.h +++ b/include/configs/MPC8349EMDS_SDRAM.h @@ -38,23 +38,9 @@ #define CONFIG_ECC_INIT_VIA_DDRCONTROLLER #define CONFIG_MEM_INIT_VALUE 0xDeadBeef -/* - * 32-bit data path mode. - * - * Please note that using this mode for devices with the real density of 64-bit - * effectively reduces the amount of available memory due to the effect of - * wrapping around while translating address to row/columns, for example in the - * 256MB module the upper 128MB get aliased with contents of the lower - * 128MB); normally this define should be used for devices with real 32-bit - * data path. - */ -#undef CONFIG_DDR_32BIT - #define CONFIG_SYS_SDRAM_BASE 0x00000000 /* DDR is system memory*/ #define CONFIG_SYS_DDR_SDRAM_CLK_CNTL (DDR_SDRAM_CLK_CNTL_SS_EN \ | DDR_SDRAM_CLK_CNTL_CLK_ADJUST_05) -#undef CONFIG_DDR_2T_TIMING - /* * DDRCDR - DDR Control Driver Register */ @@ -70,21 +56,6 @@ * Manually set up DDR parameters */ #define CONFIG_SYS_DDR_SIZE 256 /* MB */ -#if defined(CONFIG_DDR_II) -#define CONFIG_SYS_DDRCDR 0x80080001 -#define CONFIG_SYS_DDR_CS2_BNDS 0x0000000f -#define CONFIG_SYS_DDR_CS2_CONFIG 0x80330102 -#define CONFIG_SYS_DDR_TIMING_0 0x00220802 -#define CONFIG_SYS_DDR_TIMING_1 0x38357322 -#define CONFIG_SYS_DDR_TIMING_2 0x2f9048c8 -#define CONFIG_SYS_DDR_TIMING_3 0x00000000 -#define CONFIG_SYS_DDR_CLK_CNTL 0x02000000 -#define CONFIG_SYS_DDR_MODE 0x47d00432 -#define CONFIG_SYS_DDR_MODE2 0x8000c000 -#define CONFIG_SYS_DDR_INTERVAL 0x03cf0080 -#define CONFIG_SYS_DDR_SDRAM_CFG 0x43000000 -#define CONFIG_SYS_DDR_SDRAM_CFG2 0x00401000 -#else #define CONFIG_SYS_DDR_CS2_CONFIG (CSCONFIG_EN \ | CSCONFIG_ROW_BIT_13 \ | CSCONFIG_COL_BIT_10) @@ -93,17 +64,10 @@ #define CONFIG_SYS_DDR_CONTROL 0xc2000000 /* unbuffered,no DYN_PWR */ #define CONFIG_SYS_DDR_INTERVAL 0x04060100 /* autocharge,no open page */ -#if defined(CONFIG_DDR_32BIT) -/* set burst length to 8 for 32-bit data path */ - /* DLL,normal,seq,4/2.5, 8 burst len */ -#define CONFIG_SYS_DDR_MODE 0x00000023 -#else /* the default burst length is 4 - for 64-bit data path */ /* DLL,normal,seq,4/2.5, 4 burst len */ #define CONFIG_SYS_DDR_MODE 0x00000022 #endif -#endif -#endif /* * SDRAM on the Local Bus diff --git a/include/configs/MPC837XERDB.h b/include/configs/MPC837XERDB.h index 1d2389a1c60..5d5efd09678 100644 --- a/include/configs/MPC837XERDB.h +++ b/include/configs/MPC837XERDB.h @@ -113,17 +113,9 @@ | (0 << SDRAM_INTERVAL_BSTOPRE_SHIFT)) /* 0x06090100 */ -#if defined(CONFIG_DDR_2T_TIMING) -#define CONFIG_SYS_DDR_SDRAM_CFG (SDRAM_CFG_SREN \ - | SDRAM_CFG_SDRAM_TYPE_DDR2 \ - | SDRAM_CFG_32_BE \ - | SDRAM_CFG_2T_EN) - /* 0x43088000 */ -#else #define CONFIG_SYS_DDR_SDRAM_CFG (SDRAM_CFG_SREN \ | SDRAM_CFG_SDRAM_TYPE_DDR2) /* 0x43000000 */ -#endif #define CONFIG_SYS_DDR_SDRAM_CFG2 0x00001000 /* 1 posted refresh */ #define CONFIG_SYS_DDR_MODE ((0x0406 << SDRAM_MODE_ESD_SHIFT) \ | (0x0442 << SDRAM_MODE_SD_SHIFT)) diff --git a/include/configs/UCP1020.h b/include/configs/UCP1020.h index 86bfc746d87..a3caee4254b 100644 --- a/include/configs/UCP1020.h +++ b/include/configs/UCP1020.h @@ -171,11 +171,6 @@ #endif /* DDR Setup */ -#define CONFIG_DDR_ECC_ENABLE -#ifndef CONFIG_DDR_ECC_ENABLE -#define CONFIG_SYS_DDR_RAW_TIMING -#define CONFIG_DDR_SPD -#endif #define CONFIG_SYS_SPD_BUS_NUM 1 #define CONFIG_SYS_SDRAM_SIZE_LAW LAW_SIZE_512M @@ -204,11 +199,7 @@ #define CONFIG_SYS_DDR_SR_CNTR 0x00000000 #define CONFIG_SYS_DDR_RCW_1 0x00000000 #define CONFIG_SYS_DDR_RCW_2 0x00000000 -#ifdef CONFIG_DDR_ECC_ENABLE #define CONFIG_SYS_DDR_CONTROL 0xE70C0000 /* Type = DDR3 & ECC */ -#else -#define CONFIG_SYS_DDR_CONTROL 0xC70C0000 /* Type = DDR3 */ -#endif #define CONFIG_SYS_DDR_CONTROL_2 0x04401050 #define CONFIG_SYS_DDR_TIMING_4 0x00220001 #define CONFIG_SYS_DDR_TIMING_5 0x03402400 diff --git a/include/configs/km/km-mpc83xx.h b/include/configs/km/km-mpc83xx.h index 05bb51f545e..45db5cf873c 100644 --- a/include/configs/km/km-mpc83xx.h +++ b/include/configs/km/km-mpc83xx.h @@ -18,7 +18,6 @@ /* * Manually set up DDR parameters */ -#define CONFIG_DDR_II #define CONFIG_SYS_DDR_SIZE 2048 /* MB */ /* diff --git a/include/configs/socrates.h b/include/configs/socrates.h index 131f6147827..bca5b6af92c 100644 --- a/include/configs/socrates.h +++ b/include/configs/socrates.h @@ -72,7 +72,6 @@ /* I2C addresses of SPD EEPROMs */ #define SPD_EEPROM_ADDRESS 0x50 /* CTLR 0 DIMM 0 */ -#define CONFIG_DDR_DEFAULT_CL 30 /* CAS latency 3 */ /* Hardcoded values, to use instead of SPD */ #define CONFIG_SYS_DDR_CS0_BNDS 0x0000000f -- cgit v1.2.3 From 5b527c505f7d42c2ebba6192b0d55cbea257daa9 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Sat, 21 Aug 2021 13:50:13 -0400 Subject: mvebu: Migrate CONFIG_DDR_32BIT/64BIT to Kconfig MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Move CONFIG_DDR_32BIT/64BIT to Kconfig as a choice for Armada XP platforms. Make 64bit the default as this mirrors the current code. Signed-off-by: Tom Rini Acked-by: Marek Behún Reviewed-by: Stefan Roese --- include/configs/ds414.h | 3 --- 1 file changed, 3 deletions(-) (limited to 'include') diff --git a/include/configs/ds414.h b/include/configs/ds414.h index 8b8dc2245ba..8a78ab3e155 100644 --- a/include/configs/ds414.h +++ b/include/configs/ds414.h @@ -63,9 +63,6 @@ #define CONFIG_SPL_STACK (0x40000000 + ((192 - 16) << 10)) #define CONFIG_SPL_BOOTROM_SAVE (CONFIG_SPL_STACK + 4) -/* DS414 bus width is 32bits */ -#define CONFIG_DDR_32BIT - /* Default Environment */ #define CONFIG_LOADADDR 0x80000 #define CONFIG_BOOTCOMMAND \ -- cgit v1.2.3 From 94752f5fb121009ce42c3abecd2f30773353fb32 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Sat, 21 Aug 2021 13:50:14 -0400 Subject: mvebu: ddr: Rename CONFIG_DDR_FIXED_SIZE to CONFIG_SYS_SDRAM_SIZE MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We have a number of CONFIG symbols to express the fixed size of system memory. For now, rename CONFIG_DDR_FIXED_SIZE to CONFIG_SYS_SDRAM_SIZE and adjust usage to match that CONFIG_SYS_SDRAM_SIZE expects the entire size rather than MiB. Cc: Marek Behún Cc: Stefan Roese Signed-off-by: Tom Rini Acked-by: Marek Behún --- include/configs/maxbcm.h | 4 +++- include/configs/theadorable.h | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/configs/maxbcm.h b/include/configs/maxbcm.h index 6028097c451..53ba64909e1 100644 --- a/include/configs/maxbcm.h +++ b/include/configs/maxbcm.h @@ -6,6 +6,8 @@ #ifndef _CONFIG_DB_MV7846MP_GP_H #define _CONFIG_DB_MV7846MP_GP_H +#include + /* * High Level Configuration Options (easy to change) */ @@ -61,7 +63,7 @@ /* SPL related SPI defines */ /* Enable DDR support in SPL (DDR3 training from Marvell bin_hdr) */ -#define CONFIG_DDR_FIXED_SIZE (1 << 20) /* 1GiB */ +#define CONFIG_SYS_SDRAM_SIZE SZ_1G #define CONFIG_BOARD_ECC_SUPPORT /* this board supports ECC */ #endif /* _CONFIG_DB_MV7846MP_GP_H */ diff --git a/include/configs/theadorable.h b/include/configs/theadorable.h index 746bdb74e2b..64b7f250920 100644 --- a/include/configs/theadorable.h +++ b/include/configs/theadorable.h @@ -6,6 +6,8 @@ #ifndef _CONFIG_THEADORABLE_H #define _CONFIG_THEADORABLE_H +#include + /* * High Level Configuration Options (easy to change) */ @@ -89,6 +91,6 @@ #define CONFIG_SPL_BOOTROM_SAVE (CONFIG_SPL_STACK + 4) /* Enable DDR support in SPL (DDR3 training from Marvell bin_hdr) */ -#define CONFIG_DDR_FIXED_SIZE (2 << 20) /* 2GiB */ +#define CONFIG_SYS_SDRAM_SIZE SZ_2G #endif /* _CONFIG_THEADORABLE_H */ -- cgit v1.2.3 From efb5dab7ba8a9a6f89e44c4e60b0adb768c77e84 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Sat, 21 Aug 2021 13:50:17 -0400 Subject: nxp: Migrate CONFIG_DDR_CLK_FREQ to Kconfig As this symbol can either be a fixed value or the function get_board_ddr_clk, migration is tricky. Introduce a choice of DYNAMIC or STATIC_DDR_CLK_FREQ. If DYNAMIC, we continue to use the board defined get_board_ddr_clk function. If STATIC, set CONFIG_DDR_CLK_FREQ to that value and now include/clock_legacy.h contains the function prototype or defines get_board_ddr_clk() to that static value. Update callers to test for DYNAMIC or STATIC. Signed-off-by: Tom Rini --- include/clock_legacy.h | 11 +++++++++++ include/configs/P1010RDB.h | 1 - include/configs/T102xRDB.h | 2 -- include/configs/T104xRDB.h | 1 - include/configs/T208xQDS.h | 2 -- include/configs/T208xRDB.h | 2 -- include/configs/T4240RDB.h | 2 -- include/configs/UCP1020.h | 1 - include/configs/km/pg-wcom-ls102xa.h | 6 ------ include/configs/kmcent2.h | 1 - include/configs/kontron_sl28.h | 1 - include/configs/ls1021aiot.h | 1 - include/configs/ls1021aqds.h | 3 --- include/configs/ls1021atsn.h | 1 - include/configs/ls1021atwr.h | 1 - include/configs/ls1028aqds.h | 1 - include/configs/ls1028ardb.h | 1 - include/configs/ls1043aqds.h | 2 -- include/configs/ls1043ardb.h | 1 - include/configs/ls1046afrwy.h | 1 - include/configs/ls1046aqds.h | 2 -- include/configs/ls1046ardb.h | 1 - include/configs/ls1088aqds.h | 3 --- include/configs/ls1088ardb.h | 1 - include/configs/ls2080aqds.h | 2 -- include/configs/ls2080ardb.h | 1 - include/configs/lx2160a_common.h | 2 -- include/configs/p1_p2_rdb_pc.h | 1 - 28 files changed, 11 insertions(+), 44 deletions(-) (limited to 'include') diff --git a/include/clock_legacy.h b/include/clock_legacy.h index b0a8333ea6e..29261b680d0 100644 --- a/include/clock_legacy.h +++ b/include/clock_legacy.h @@ -11,4 +11,15 @@ int get_clocks(void); unsigned long get_bus_freq(unsigned long dummy); int get_serial_clock(void); +/* + * If we have CONFIG_DYNAMIC_DDR_CLK_FREQ then there will be an + * implentation of get_board_ddr_clk() somewhere. Otherwise we have + * a static value to use now. + */ +#ifdef CONFIG_DYNAMIC_DDR_CLK_FREQ +unsigned long get_board_ddr_clk(void); +#else +#define get_board_ddr_clk() CONFIG_DDR_CLK_FREQ +#endif + #endif diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h index a222ec93b1e..9c1cc2f14cf 100644 --- a/include/configs/P1010RDB.h +++ b/include/configs/P1010RDB.h @@ -153,7 +153,6 @@ #define CONFIG_PCI_SCAN_SHOW /* show pci devices on startup */ #endif -#define CONFIG_DDR_CLK_FREQ 66666666 /* DDRCLK on P1010 RDB */ #define CONFIG_SYS_CLK_FREQ 66666666 /* SYSCLK for P1010 RDB */ #define CONFIG_HWCONFIG diff --git a/include/configs/T102xRDB.h b/include/configs/T102xRDB.h index 95aafe1a322..8dc9f9e2ecb 100644 --- a/include/configs/T102xRDB.h +++ b/include/configs/T102xRDB.h @@ -134,11 +134,9 @@ #ifndef __ASSEMBLY__ unsigned long get_board_sys_clk(void); -unsigned long get_board_ddr_clk(void); #endif #define CONFIG_SYS_CLK_FREQ 100000000 -#define CONFIG_DDR_CLK_FREQ 100000000 /* * These can be toggled for performance analysis, otherwise use default. diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h index 2b6238e0899..a9b38118977 100644 --- a/include/configs/T104xRDB.h +++ b/include/configs/T104xRDB.h @@ -164,7 +164,6 @@ $(SRCTREE)/board/freescale/t104xrdb/t1042d4_sd_rcw.cfg #endif #define CONFIG_SYS_CLK_FREQ 100000000 -#define CONFIG_DDR_CLK_FREQ 66666666 /* * These can be toggled for performance analysis, otherwise use default. diff --git a/include/configs/T208xQDS.h b/include/configs/T208xQDS.h index cd729cf0c79..714bc3cc3fa 100644 --- a/include/configs/T208xQDS.h +++ b/include/configs/T208xQDS.h @@ -109,11 +109,9 @@ #ifndef __ASSEMBLY__ unsigned long get_board_sys_clk(void); -unsigned long get_board_ddr_clk(void); #endif #define CONFIG_SYS_CLK_FREQ get_board_sys_clk() -#define CONFIG_DDR_CLK_FREQ get_board_ddr_clk() /* * Config the L3 Cache as L3 SRAM diff --git a/include/configs/T208xRDB.h b/include/configs/T208xRDB.h index be8ead70da5..7309581b380 100644 --- a/include/configs/T208xRDB.h +++ b/include/configs/T208xRDB.h @@ -98,11 +98,9 @@ #ifndef __ASSEMBLY__ unsigned long get_board_sys_clk(void); -unsigned long get_board_ddr_clk(void); #endif #define CONFIG_SYS_CLK_FREQ 66660000 -#define CONFIG_DDR_CLK_FREQ 133330000 /* * Config the L3 Cache as L3 SRAM diff --git a/include/configs/T4240RDB.h b/include/configs/T4240RDB.h index 839a7c50f89..0a0214ae474 100644 --- a/include/configs/T4240RDB.h +++ b/include/configs/T4240RDB.h @@ -242,11 +242,9 @@ "bootm 0x01000000 - 0x00f00000" #define CONFIG_SYS_CLK_FREQ 66666666 -#define CONFIG_DDR_CLK_FREQ 133333333 #ifndef __ASSEMBLY__ unsigned long get_board_sys_clk(void); -unsigned long get_board_ddr_clk(void); #endif /* diff --git a/include/configs/UCP1020.h b/include/configs/UCP1020.h index a3caee4254b..51083569a88 100644 --- a/include/configs/UCP1020.h +++ b/include/configs/UCP1020.h @@ -149,7 +149,6 @@ #define CONFIG_LBA48 #define CONFIG_SYS_CLK_FREQ 66666666 -#define CONFIG_DDR_CLK_FREQ 66666666 #define CONFIG_HWCONFIG diff --git a/include/configs/km/pg-wcom-ls102xa.h b/include/configs/km/pg-wcom-ls102xa.h index 23494657a44..69fac2bafdf 100644 --- a/include/configs/km/pg-wcom-ls102xa.h +++ b/include/configs/km/pg-wcom-ls102xa.h @@ -26,12 +26,6 @@ CONFIG_KM_RESERVED_PRAM) >> 10) #define CONFIG_SYS_CLK_FREQ 66666666 -/* - * Take into account default implementation where DDR_FDBK_MULTI is consider as - * configured for DDR_PLL = 2*MEM_PLL_RAT. - * In our case DDR_FDBK_MULTI is 2, means DDR_PLL = MEM_PLL_RAT. - */ -#define CONFIG_DDR_CLK_FREQ (100000000 >> 1) #define PHYS_SDRAM 0x80000000 #define PHYS_SDRAM_SIZE (1u * 1024 * 1024 * 1024) diff --git a/include/configs/kmcent2.h b/include/configs/kmcent2.h index 90e7ba8327b..087b6cc04f1 100644 --- a/include/configs/kmcent2.h +++ b/include/configs/kmcent2.h @@ -177,7 +177,6 @@ #define CONFIG_VERY_BIG_RAM #define CONFIG_SYS_DDR_SDRAM_BASE 0x00000000 #define CONFIG_SYS_SDRAM_BASE CONFIG_SYS_DDR_SDRAM_BASE -#define CONFIG_DDR_CLK_FREQ 66666666 #define CONFIG_DIMM_SLOTS_PER_CTLR 1 #define CONFIG_CHIP_SELECTS_PER_CTRL (2 * CONFIG_DIMM_SLOTS_PER_CTLR) diff --git a/include/configs/kontron_sl28.h b/include/configs/kontron_sl28.h index bfb4e67c8f4..30633fa796a 100644 --- a/include/configs/kontron_sl28.h +++ b/include/configs/kontron_sl28.h @@ -53,7 +53,6 @@ #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 } #define CONFIG_SYS_CLK_FREQ 100000000 -#define CONFIG_DDR_CLK_FREQ 100000000 #define COUNTER_FREQUENCY_REAL (CONFIG_SYS_CLK_FREQ / 4) /* ethernet */ diff --git a/include/configs/ls1021aiot.h b/include/configs/ls1021aiot.h index 6c1cedf2613..b88c16f95ea 100644 --- a/include/configs/ls1021aiot.h +++ b/include/configs/ls1021aiot.h @@ -20,7 +20,6 @@ #define CONFIG_SYS_INIT_RAM_SIZE OCRAM_SIZE #define CONFIG_SYS_CLK_FREQ 100000000 -#define CONFIG_DDR_CLK_FREQ 100000000 /* * DDR: 800 MHz ( 1600 MT/s data rate ) diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h index a71c3e8b586..e2e45b0cab8 100644 --- a/include/configs/ls1021aqds.h +++ b/include/configs/ls1021aqds.h @@ -25,16 +25,13 @@ #ifndef __ASSEMBLY__ unsigned long get_board_sys_clk(void); -unsigned long get_board_ddr_clk(void); #endif #if defined(CONFIG_QSPI_BOOT) || defined(CONFIG_SD_BOOT_QSPI) #define CONFIG_SYS_CLK_FREQ 100000000 -#define CONFIG_DDR_CLK_FREQ 100000000 #define CONFIG_QIXIS_I2C_ACCESS #else #define CONFIG_SYS_CLK_FREQ get_board_sys_clk() -#define CONFIG_DDR_CLK_FREQ get_board_ddr_clk() #endif #ifdef CONFIG_RAMBOOT_PBL diff --git a/include/configs/ls1021atsn.h b/include/configs/ls1021atsn.h index 7ce808bc53f..490e86f6488 100644 --- a/include/configs/ls1021atsn.h +++ b/include/configs/ls1021atsn.h @@ -22,7 +22,6 @@ #define CONFIG_USB_MAX_CONTROLLER_COUNT 1 #define CONFIG_SYS_CLK_FREQ 100000000 -#define CONFIG_DDR_CLK_FREQ 100000000 #define DDR_SDRAM_CFG 0x470c0008 #define DDR_CS0_BNDS 0x008000bf diff --git a/include/configs/ls1021atwr.h b/include/configs/ls1021atwr.h index 379a143c103..56f30ff4b31 100644 --- a/include/configs/ls1021atwr.h +++ b/include/configs/ls1021atwr.h @@ -23,7 +23,6 @@ #define CONFIG_SYS_INIT_RAM_SIZE OCRAM_SIZE #define CONFIG_SYS_CLK_FREQ 100000000 -#define CONFIG_DDR_CLK_FREQ 100000000 #define DDR_SDRAM_CFG 0x470c0008 #define DDR_CS0_BNDS 0x008000bf diff --git a/include/configs/ls1028aqds.h b/include/configs/ls1028aqds.h index 9ae37b96ceb..fe20363e690 100644 --- a/include/configs/ls1028aqds.h +++ b/include/configs/ls1028aqds.h @@ -9,7 +9,6 @@ #include "ls1028a_common.h" #define CONFIG_SYS_CLK_FREQ 100000000 -#define CONFIG_DDR_CLK_FREQ 100000000 #define COUNTER_FREQUENCY_REAL (CONFIG_SYS_CLK_FREQ / 4) /* DDR */ diff --git a/include/configs/ls1028ardb.h b/include/configs/ls1028ardb.h index 1a80cb945df..348db1e2f8c 100644 --- a/include/configs/ls1028ardb.h +++ b/include/configs/ls1028ardb.h @@ -9,7 +9,6 @@ #include "ls1028a_common.h" #define CONFIG_SYS_CLK_FREQ 100000000 -#define CONFIG_DDR_CLK_FREQ 100000000 #define COUNTER_FREQUENCY_REAL (CONFIG_SYS_CLK_FREQ / 4) #define CONFIG_SYS_RTC_BUS_NUM 0 diff --git a/include/configs/ls1043aqds.h b/include/configs/ls1043aqds.h index 2677090249c..d0bb6e552c7 100644 --- a/include/configs/ls1043aqds.h +++ b/include/configs/ls1043aqds.h @@ -10,11 +10,9 @@ #ifndef __ASSEMBLY__ unsigned long get_board_sys_clk(void); -unsigned long get_board_ddr_clk(void); #endif #define CONFIG_SYS_CLK_FREQ get_board_sys_clk() -#define CONFIG_DDR_CLK_FREQ get_board_ddr_clk() #define CONFIG_SKIP_LOWLEVEL_INIT diff --git a/include/configs/ls1043ardb.h b/include/configs/ls1043ardb.h index 985b1cbe09c..577fe296049 100644 --- a/include/configs/ls1043ardb.h +++ b/include/configs/ls1043ardb.h @@ -9,7 +9,6 @@ #include "ls1043a_common.h" #define CONFIG_SYS_CLK_FREQ 100000000 -#define CONFIG_DDR_CLK_FREQ 100000000 #define CONFIG_LAYERSCAPE_NS_ACCESS diff --git a/include/configs/ls1046afrwy.h b/include/configs/ls1046afrwy.h index d97555c430c..7da08605f5a 100644 --- a/include/configs/ls1046afrwy.h +++ b/include/configs/ls1046afrwy.h @@ -9,7 +9,6 @@ #include "ls1046a_common.h" #define CONFIG_SYS_CLK_FREQ 100000000 -#define CONFIG_DDR_CLK_FREQ 100000000 #define CONFIG_LAYERSCAPE_NS_ACCESS diff --git a/include/configs/ls1046aqds.h b/include/configs/ls1046aqds.h index b7e6ba890f8..f3e4f6a4c56 100644 --- a/include/configs/ls1046aqds.h +++ b/include/configs/ls1046aqds.h @@ -10,11 +10,9 @@ #ifndef __ASSEMBLY__ unsigned long get_board_sys_clk(void); -unsigned long get_board_ddr_clk(void); #endif #define CONFIG_SYS_CLK_FREQ get_board_sys_clk() -#define CONFIG_DDR_CLK_FREQ get_board_ddr_clk() #define CONFIG_SKIP_LOWLEVEL_INIT diff --git a/include/configs/ls1046ardb.h b/include/configs/ls1046ardb.h index c90dc209ccb..4a657533ef8 100644 --- a/include/configs/ls1046ardb.h +++ b/include/configs/ls1046ardb.h @@ -10,7 +10,6 @@ #include "ls1046a_common.h" #define CONFIG_SYS_CLK_FREQ 100000000 -#define CONFIG_DDR_CLK_FREQ 100000000 #define CONFIG_LAYERSCAPE_NS_ACCESS diff --git a/include/configs/ls1088aqds.h b/include/configs/ls1088aqds.h index f556fb387f0..d9d7af24e78 100644 --- a/include/configs/ls1088aqds.h +++ b/include/configs/ls1088aqds.h @@ -11,7 +11,6 @@ #ifndef __ASSEMBLY__ unsigned long get_board_sys_clk(void); -unsigned long get_board_ddr_clk(void); #endif #ifdef CONFIG_TFABOOT @@ -23,11 +22,9 @@ unsigned long get_board_ddr_clk(void); #define SYS_NO_FLASH #define CONFIG_SYS_CLK_FREQ 100000000 -#define CONFIG_DDR_CLK_FREQ 100000000 #else #define CONFIG_QIXIS_I2C_ACCESS #define CONFIG_SYS_CLK_FREQ get_board_sys_clk() -#define CONFIG_DDR_CLK_FREQ get_board_ddr_clk() #endif #define COUNTER_FREQUENCY_REAL (CONFIG_SYS_CLK_FREQ/4) diff --git a/include/configs/ls1088ardb.h b/include/configs/ls1088ardb.h index fcafea13dc9..21416da48ed 100644 --- a/include/configs/ls1088ardb.h +++ b/include/configs/ls1088ardb.h @@ -17,7 +17,6 @@ #endif #define CONFIG_SYS_CLK_FREQ 100000000 -#define CONFIG_DDR_CLK_FREQ 100000000 #define COUNTER_FREQUENCY_REAL 25000000 /* 25MHz */ #define COUNTER_FREQUENCY 25000000 /* 25MHz */ diff --git a/include/configs/ls2080aqds.h b/include/configs/ls2080aqds.h index dc5f347e510..f0c794d0fe0 100644 --- a/include/configs/ls2080aqds.h +++ b/include/configs/ls2080aqds.h @@ -11,7 +11,6 @@ #ifndef __ASSEMBLY__ unsigned long get_board_sys_clk(void); -unsigned long get_board_ddr_clk(void); #endif #ifdef CONFIG_FSL_QSPI @@ -21,7 +20,6 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_SYS_I2C_FPGA_ADDR 0x66 #define CONFIG_SYS_CLK_FREQ get_board_sys_clk() -#define CONFIG_DDR_CLK_FREQ get_board_ddr_clk() #define COUNTER_FREQUENCY_REAL (CONFIG_SYS_CLK_FREQ/4) #define CONFIG_DDR_SPD diff --git a/include/configs/ls2080ardb.h b/include/configs/ls2080ardb.h index 6362b7f8f0b..27843c1ea4a 100644 --- a/include/configs/ls2080ardb.h +++ b/include/configs/ls2080ardb.h @@ -36,7 +36,6 @@ unsigned long get_board_sys_clk(void); #endif #define CONFIG_SYS_CLK_FREQ get_board_sys_clk() -#define CONFIG_DDR_CLK_FREQ 133333333 #define COUNTER_FREQUENCY_REAL (CONFIG_SYS_CLK_FREQ/4) #define CONFIG_DDR_SPD diff --git a/include/configs/lx2160a_common.h b/include/configs/lx2160a_common.h index 3cdd627003f..a060a1f9ddd 100644 --- a/include/configs/lx2160a_common.h +++ b/include/configs/lx2160a_common.h @@ -151,11 +151,9 @@ #ifndef __ASSEMBLY__ unsigned long get_board_sys_clk(void); -unsigned long get_board_ddr_clk(void); #endif #define CONFIG_SYS_CLK_FREQ get_board_sys_clk() -#define CONFIG_DDR_CLK_FREQ get_board_ddr_clk() #define COUNTER_FREQUENCY_REAL (CONFIG_SYS_CLK_FREQ / 4) #define CONFIG_HWCONFIG diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h index c1571c2235e..0a4f8a3ef77 100644 --- a/include/configs/p1_p2_rdb_pc.h +++ b/include/configs/p1_p2_rdb_pc.h @@ -157,7 +157,6 @@ #else #define CONFIG_SYS_CLK_FREQ 66666666 #endif -#define CONFIG_DDR_CLK_FREQ 66666666 #define CONFIG_HWCONFIG /* -- cgit v1.2.3 From 95372165aec94fa0984f30ca33c3691fe2aabdcd Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Sat, 21 Aug 2021 13:50:18 -0400 Subject: nxp: Migrate a number of DDR related symbols to Kconfig - Guard most of the options in drivers/ddr/fsl/Kconfig with SYS_FSL_DDR || SYS_FSL_MMDC. - Migrate FSL_DMA, DDR_ECC, DDR_ECC_CMD, and ECC_INIT_VIA_DDRCONTROLLER to Kconfig. - Clean up the logic for including the DDR_ECC_CMD code. Signed-off-by: Tom Rini --- include/configs/MPC8349EMDS.h | 3 --- include/configs/MPC8349EMDS_SDRAM.h | 3 --- include/configs/MPC837XERDB.h | 3 --- include/configs/MPC8540ADS.h | 1 - include/configs/MPC8548CDS.h | 3 --- include/configs/MPC8560ADS.h | 1 - include/configs/P1010RDB.h | 1 - include/configs/P2041RDB.h | 2 -- include/configs/T102xRDB.h | 3 --- include/configs/T104xRDB.h | 4 ---- include/configs/T208xQDS.h | 3 --- include/configs/T208xRDB.h | 3 --- include/configs/T4240RDB.h | 5 ----- include/configs/corenet_ds.h | 4 ---- include/configs/k2e_evm.h | 2 -- include/configs/k2hk_evm.h | 2 -- include/configs/km/pg-wcom-ls102xa.h | 2 -- include/configs/kmcent2.h | 2 -- include/configs/kontron_sl28.h | 2 -- include/configs/ls1021aqds.h | 3 --- include/configs/ls1043aqds.h | 3 --- include/configs/ls1043ardb.h | 1 - include/configs/ls1046aqds.h | 3 --- include/configs/ls1046ardb.h | 3 --- include/configs/ls1088aqds.h | 3 --- include/configs/ls1088ardb.h | 3 --- include/configs/ls2080aqds.h | 3 --- include/configs/ls2080ardb.h | 3 --- include/configs/lx2160a_common.h | 3 --- include/configs/p1_p2_rdb_pc.h | 1 - include/configs/socrates.h | 2 -- 31 files changed, 80 deletions(-) (limited to 'include') diff --git a/include/configs/MPC8349EMDS.h b/include/configs/MPC8349EMDS.h index 9e487b8da29..9612c70f8b4 100644 --- a/include/configs/MPC8349EMDS.h +++ b/include/configs/MPC8349EMDS.h @@ -22,8 +22,6 @@ /* * DDR Setup */ -#define CONFIG_DDR_ECC /* support DDR ECC function */ -#define CONFIG_DDR_ECC_CMD /* use DDR ECC user commands */ #define CONFIG_SPD_EEPROM /* use SPD EEPROM for DDR setup*/ /* @@ -35,7 +33,6 @@ #define SPD_EEPROM_ADDRESS2 0x51 #define CONFIG_DIMM_SLOTS_PER_CTLR 2 #define CONFIG_CHIP_SELECTS_PER_CTRL (2 * CONFIG_DIMM_SLOTS_PER_CTLR) -#define CONFIG_ECC_INIT_VIA_DDRCONTROLLER #define CONFIG_MEM_INIT_VALUE 0xDeadBeef #define CONFIG_SYS_SDRAM_BASE 0x00000000 /* DDR is system memory*/ diff --git a/include/configs/MPC8349EMDS_SDRAM.h b/include/configs/MPC8349EMDS_SDRAM.h index e652309da58..b3887f5d460 100644 --- a/include/configs/MPC8349EMDS_SDRAM.h +++ b/include/configs/MPC8349EMDS_SDRAM.h @@ -22,8 +22,6 @@ /* * DDR Setup */ -#define CONFIG_DDR_ECC /* support DDR ECC function */ -#define CONFIG_DDR_ECC_CMD /* use DDR ECC user commands */ #define CONFIG_SPD_EEPROM /* use SPD EEPROM for DDR setup*/ /* @@ -35,7 +33,6 @@ #define SPD_EEPROM_ADDRESS2 0x51 #define CONFIG_DIMM_SLOTS_PER_CTLR 2 #define CONFIG_CHIP_SELECTS_PER_CTRL (2 * CONFIG_DIMM_SLOTS_PER_CTLR) -#define CONFIG_ECC_INIT_VIA_DDRCONTROLLER #define CONFIG_MEM_INIT_VALUE 0xDeadBeef #define CONFIG_SYS_SDRAM_BASE 0x00000000 /* DDR is system memory*/ diff --git a/include/configs/MPC837XERDB.h b/include/configs/MPC837XERDB.h index 5d5efd09678..569c66e52c0 100644 --- a/include/configs/MPC837XERDB.h +++ b/include/configs/MPC837XERDB.h @@ -66,9 +66,6 @@ #define CONFIG_SYS_DDRCDR_VALUE (DDRCDR_DHC_EN | DDRCDR_ODT | DDRCDR_Q_DRN) -#undef CONFIG_DDR_ECC /* support DDR ECC function */ -#undef CONFIG_DDR_ECC_CMD /* Use DDR ECC user commands */ - #undef CONFIG_NEVER_ASSERT_ODT_TO_CPU /* Never assert ODT to internal IOs */ /* diff --git a/include/configs/MPC8540ADS.h b/include/configs/MPC8540ADS.h index db1d205f6fa..1e620acea0a 100644 --- a/include/configs/MPC8540ADS.h +++ b/include/configs/MPC8540ADS.h @@ -62,7 +62,6 @@ /* DDR Setup */ #define CONFIG_SPD_EEPROM /* Use SPD EEPROM for DDR setup*/ -#define CONFIG_DDR_SPD #define CONFIG_MEM_INIT_VALUE 0xDeadBeef diff --git a/include/configs/MPC8548CDS.h b/include/configs/MPC8548CDS.h index c8cba4d879f..d7e6b6cd252 100644 --- a/include/configs/MPC8548CDS.h +++ b/include/configs/MPC8548CDS.h @@ -45,10 +45,7 @@ extern unsigned long get_clock_freq(void); /* DDR Setup */ #define CONFIG_SPD_EEPROM /* Use SPD EEPROM for DDR setup*/ -#define CONFIG_DDR_SPD -#define CONFIG_DDR_ECC -#define CONFIG_ECC_INIT_VIA_DDRCONTROLLER /* DDR controller or DMA? */ #define CONFIG_MEM_INIT_VALUE 0xDeadBeef #define CONFIG_SYS_DDR_SDRAM_BASE 0x00000000 /* DDR is system memory*/ diff --git a/include/configs/MPC8560ADS.h b/include/configs/MPC8560ADS.h index 186193c85c8..27a17bb9957 100644 --- a/include/configs/MPC8560ADS.h +++ b/include/configs/MPC8560ADS.h @@ -62,7 +62,6 @@ /* DDR Setup */ #define CONFIG_SPD_EEPROM /* Use SPD EEPROM for DDR setup*/ -#define CONFIG_DDR_SPD #define CONFIG_MEM_INIT_VALUE 0xDeadBeef diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h index 9c1cc2f14cf..952896156d2 100644 --- a/include/configs/P1010RDB.h +++ b/include/configs/P1010RDB.h @@ -167,7 +167,6 @@ /* DDR Setup */ #define CONFIG_SYS_DDR_RAW_TIMING -#define CONFIG_DDR_SPD #define CONFIG_SYS_SPD_BUS_NUM 1 #define SPD_EEPROM_ADDRESS 0x52 diff --git a/include/configs/P2041RDB.h b/include/configs/P2041RDB.h index bc0172b7b10..e4e43904238 100644 --- a/include/configs/P2041RDB.h +++ b/include/configs/P2041RDB.h @@ -101,8 +101,6 @@ unsigned long get_board_sys_clk(unsigned long dummy); #define CONFIG_DIMM_SLOTS_PER_CTLR 1 #define CONFIG_CHIP_SELECTS_PER_CTRL (4 * CONFIG_DIMM_SLOTS_PER_CTLR) -#define CONFIG_DDR_SPD - #define CONFIG_SYS_SPD_BUS_NUM 0 #define SPD_EEPROM_ADDRESS 0x52 #define CONFIG_SYS_SDRAM_SIZE 4096 /* for fixed parameter use */ diff --git a/include/configs/T102xRDB.h b/include/configs/T102xRDB.h index 8dc9f9e2ecb..d21e4020a85 100644 --- a/include/configs/T102xRDB.h +++ b/include/configs/T102xRDB.h @@ -145,9 +145,7 @@ unsigned long get_board_sys_clk(void); #define CONFIG_BACKSIDE_L2_CACHE #define CONFIG_SYS_INIT_L2CSR0 L2CSR0_L2E #define CONFIG_BTB /* toggle branch predition */ -#define CONFIG_DDR_ECC #ifdef CONFIG_DDR_ECC -#define CONFIG_ECC_INIT_VIA_DDRCONTROLLER #define CONFIG_MEM_INIT_VALUE 0xdeadbeef #endif @@ -180,7 +178,6 @@ unsigned long get_board_sys_clk(void); #define CONFIG_DIMM_SLOTS_PER_CTLR 1 #define CONFIG_CHIP_SELECTS_PER_CTRL (4 * CONFIG_DIMM_SLOTS_PER_CTLR) #if defined(CONFIG_TARGET_T1024RDB) -#define CONFIG_DDR_SPD #define CONFIG_SYS_SPD_BUS_NUM 0 #define SPD_EEPROM_ADDRESS 0x51 #define CONFIG_SYS_SDRAM_SIZE 4096 /* for fixed parameter use */ diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h index a9b38118977..8ef13fc9ac3 100644 --- a/include/configs/T104xRDB.h +++ b/include/configs/T104xRDB.h @@ -172,9 +172,7 @@ $(SRCTREE)/board/freescale/t104xrdb/t1042d4_sd_rcw.cfg #define CONFIG_BACKSIDE_L2_CACHE #define CONFIG_SYS_INIT_L2CSR0 L2CSR0_L2E #define CONFIG_BTB /* toggle branch predition */ -#define CONFIG_DDR_ECC #ifdef CONFIG_DDR_ECC -#define CONFIG_ECC_INIT_VIA_DDRCONTROLLER #define CONFIG_MEM_INIT_VALUE 0xdeadbeef #endif @@ -210,8 +208,6 @@ $(SRCTREE)/board/freescale/t104xrdb/t1042d4_sd_rcw.cfg #define CONFIG_DIMM_SLOTS_PER_CTLR 1 #define CONFIG_CHIP_SELECTS_PER_CTRL (2 * CONFIG_DIMM_SLOTS_PER_CTLR) -#define CONFIG_DDR_SPD - #define CONFIG_SYS_SPD_BUS_NUM 0 #define SPD_EEPROM_ADDRESS 0x51 diff --git a/include/configs/T208xQDS.h b/include/configs/T208xQDS.h index 714bc3cc3fa..74f372ad2e3 100644 --- a/include/configs/T208xQDS.h +++ b/include/configs/T208xQDS.h @@ -101,9 +101,7 @@ */ #define CONFIG_SYS_CACHE_STASHING #define CONFIG_BTB /* toggle branch predition */ -#define CONFIG_DDR_ECC #ifdef CONFIG_DDR_ECC -#define CONFIG_ECC_INIT_VIA_DDRCONTROLLER #define CONFIG_MEM_INIT_VALUE 0xdeadbeef #endif @@ -139,7 +137,6 @@ unsigned long get_board_sys_clk(void); #define CONFIG_SYS_SDRAM_BASE CONFIG_SYS_DDR_SDRAM_BASE #define CONFIG_DIMM_SLOTS_PER_CTLR 2 #define CONFIG_CHIP_SELECTS_PER_CTRL (2 * CONFIG_DIMM_SLOTS_PER_CTLR) -#define CONFIG_DDR_SPD #define CONFIG_SYS_SPD_BUS_NUM 0 #define CONFIG_SYS_SDRAM_SIZE 2048 /* for fixed parameter use */ #define SPD_EEPROM_ADDRESS1 0x51 diff --git a/include/configs/T208xRDB.h b/include/configs/T208xRDB.h index 7309581b380..6821cd3882a 100644 --- a/include/configs/T208xRDB.h +++ b/include/configs/T208xRDB.h @@ -90,9 +90,7 @@ */ #define CONFIG_SYS_CACHE_STASHING #define CONFIG_BTB /* toggle branch predition */ -#define CONFIG_DDR_ECC #ifdef CONFIG_DDR_ECC -#define CONFIG_ECC_INIT_VIA_DDRCONTROLLER #define CONFIG_MEM_INIT_VALUE 0xdeadbeef #endif @@ -128,7 +126,6 @@ unsigned long get_board_sys_clk(void); #define CONFIG_SYS_SDRAM_BASE CONFIG_SYS_DDR_SDRAM_BASE #define CONFIG_DIMM_SLOTS_PER_CTLR 1 #define CONFIG_CHIP_SELECTS_PER_CTRL (4 * CONFIG_DIMM_SLOTS_PER_CTLR) -#define CONFIG_DDR_SPD #define CONFIG_SYS_SPD_BUS_NUM 0 #define CONFIG_SYS_SDRAM_SIZE 2048 /* for fixed parameter use */ #define SPD_EEPROM_ADDRESS1 0x51 diff --git a/include/configs/T4240RDB.h b/include/configs/T4240RDB.h index 0a0214ae474..d5bf813ebc6 100644 --- a/include/configs/T4240RDB.h +++ b/include/configs/T4240RDB.h @@ -50,8 +50,6 @@ #endif #endif /* CONFIG_RAMBOOT_PBL */ -#define CONFIG_DDR_ECC - /* High Level Configuration Options */ #define CONFIG_SYS_BOOK3E_HV /* Category E.HV supported */ @@ -72,7 +70,6 @@ #define CONFIG_SYS_CACHE_STASHING #define CONFIG_BTB /* toggle branch predition */ #ifdef CONFIG_DDR_ECC -#define CONFIG_ECC_INIT_VIA_DDRCONTROLLER #define CONFIG_MEM_INIT_VALUE 0xdeadbeef #endif @@ -102,8 +99,6 @@ #define CONFIG_DIMM_SLOTS_PER_CTLR 1 #define CONFIG_CHIP_SELECTS_PER_CTRL 4 -#define CONFIG_DDR_SPD - /* * IFC Definitions */ diff --git a/include/configs/corenet_ds.h b/include/configs/corenet_ds.h index bed469e8825..e9205291c8f 100644 --- a/include/configs/corenet_ds.h +++ b/include/configs/corenet_ds.h @@ -73,9 +73,7 @@ #define CONFIG_BACKSIDE_L2_CACHE #define CONFIG_SYS_INIT_L2CSR0 L2CSR0_L2E #define CONFIG_BTB /* toggle branch predition */ -#define CONFIG_DDR_ECC #ifdef CONFIG_DDR_ECC -#define CONFIG_ECC_INIT_VIA_DDRCONTROLLER #define CONFIG_MEM_INIT_VALUE 0xdeadbeef #endif @@ -114,8 +112,6 @@ #define CONFIG_DIMM_SLOTS_PER_CTLR 1 #define CONFIG_CHIP_SELECTS_PER_CTRL (4 * CONFIG_DIMM_SLOTS_PER_CTLR) -#define CONFIG_DDR_SPD - #define CONFIG_SYS_SPD_BUS_NUM 1 #define SPD_EEPROM_ADDRESS1 0x51 #define SPD_EEPROM_ADDRESS2 0x52 diff --git a/include/configs/k2e_evm.h b/include/configs/k2e_evm.h index 65bf646f3fb..35439c02581 100644 --- a/include/configs/k2e_evm.h +++ b/include/configs/k2e_evm.h @@ -47,6 +47,4 @@ #define CONFIG_KSNET_CPSW_NUM_PORTS 9 #define CONFIG_KSNET_MDIO_PHY_CONFIG_ENABLE -#define CONFIG_DDR_SPD - #endif /* __CONFIG_K2E_EVM_H */ diff --git a/include/configs/k2hk_evm.h b/include/configs/k2hk_evm.h index 1fdecd60e76..f5a20ce02b0 100644 --- a/include/configs/k2hk_evm.h +++ b/include/configs/k2hk_evm.h @@ -46,6 +46,4 @@ #define CONFIG_KSNET_NETCP_V1_0 #define CONFIG_KSNET_CPSW_NUM_PORTS 5 -#define CONFIG_DDR_SPD - #endif /* __CONFIG_K2HK_EVM_H */ diff --git a/include/configs/km/pg-wcom-ls102xa.h b/include/configs/km/pg-wcom-ls102xa.h index 69fac2bafdf..973718a984f 100644 --- a/include/configs/km/pg-wcom-ls102xa.h +++ b/include/configs/km/pg-wcom-ls102xa.h @@ -36,8 +36,6 @@ #define CONFIG_DIMM_SLOTS_PER_CTLR 1 #define CONFIG_CHIP_SELECTS_PER_CTRL 4 -#define CONFIG_DDR_SPD - #define CONFIG_SYS_SPD_BUS_NUM 0 #define SPD_EEPROM_ADDRESS 0x54 diff --git a/include/configs/kmcent2.h b/include/configs/kmcent2.h index 087b6cc04f1..50ce4f0ce5b 100644 --- a/include/configs/kmcent2.h +++ b/include/configs/kmcent2.h @@ -181,8 +181,6 @@ #define CONFIG_DIMM_SLOTS_PER_CTLR 1 #define CONFIG_CHIP_SELECTS_PER_CTRL (2 * CONFIG_DIMM_SLOTS_PER_CTLR) -#define CONFIG_DDR_SPD - #define CONFIG_SYS_SPD_BUS_NUM 0 #define SPD_EEPROM_ADDRESS 0x54 #define CONFIG_SYS_SDRAM_SIZE 4096 /* for fixed parameter use */ diff --git a/include/configs/kontron_sl28.h b/include/configs/kontron_sl28.h index 30633fa796a..48e791b0ffe 100644 --- a/include/configs/kontron_sl28.h +++ b/include/configs/kontron_sl28.h @@ -16,8 +16,6 @@ #endif /* DDR */ -#define CONFIG_DDR_ECC -#define CONFIG_ECC_INIT_VIA_DDRCONTROLLER #define CONFIG_MEM_INIT_VALUE 0xdeadbeef #define CONFIG_VERY_BIG_RAM diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h index e2e45b0cab8..608e91d1207 100644 --- a/include/configs/ls1021aqds.h +++ b/include/configs/ls1021aqds.h @@ -79,7 +79,6 @@ unsigned long get_board_sys_clk(void); #define CONFIG_SYS_MONITOR_LEN 0x80000 #endif -#define CONFIG_DDR_SPD #define SPD_EEPROM_ADDRESS 0x51 #define CONFIG_SYS_SPD_BUS_NUM 0 @@ -92,9 +91,7 @@ unsigned long get_board_sys_clk(void); #define CONFIG_SYS_DDR_SDRAM_BASE 0x80000000UL #define CONFIG_SYS_SDRAM_BASE CONFIG_SYS_DDR_SDRAM_BASE -#define CONFIG_DDR_ECC #ifdef CONFIG_DDR_ECC -#define CONFIG_ECC_INIT_VIA_DDRCONTROLLER #define CONFIG_MEM_INIT_VALUE 0xdeadbeef #endif diff --git a/include/configs/ls1043aqds.h b/include/configs/ls1043aqds.h index d0bb6e552c7..b97e855c9f5 100644 --- a/include/configs/ls1043aqds.h +++ b/include/configs/ls1043aqds.h @@ -22,13 +22,10 @@ unsigned long get_board_sys_clk(void); /* Physical Memory Map */ #define CONFIG_CHIP_SELECTS_PER_CTRL 4 -#define CONFIG_DDR_SPD #define SPD_EEPROM_ADDRESS 0x51 #define CONFIG_SYS_SPD_BUS_NUM 0 -#define CONFIG_DDR_ECC #ifdef CONFIG_DDR_ECC -#define CONFIG_ECC_INIT_VIA_DDRCONTROLLER #define CONFIG_MEM_INIT_VALUE 0xdeadbeef #endif diff --git a/include/configs/ls1043ardb.h b/include/configs/ls1043ardb.h index 577fe296049..6b28abf03d2 100644 --- a/include/configs/ls1043ardb.h +++ b/include/configs/ls1043ardb.h @@ -20,7 +20,6 @@ #ifndef CONFIG_SPL #define CONFIG_SYS_DDR_RAW_TIMING -#define CONFIG_ECC_INIT_VIA_DDRCONTROLLER #define CONFIG_MEM_INIT_VALUE 0xdeadbeef #endif diff --git a/include/configs/ls1046aqds.h b/include/configs/ls1046aqds.h index f3e4f6a4c56..5720e113d78 100644 --- a/include/configs/ls1046aqds.h +++ b/include/configs/ls1046aqds.h @@ -22,13 +22,10 @@ unsigned long get_board_sys_clk(void); /* Physical Memory Map */ #define CONFIG_CHIP_SELECTS_PER_CTRL 4 -#define CONFIG_DDR_SPD #define SPD_EEPROM_ADDRESS 0x51 #define CONFIG_SYS_SPD_BUS_NUM 0 -#define CONFIG_DDR_ECC #ifdef CONFIG_DDR_ECC -#define CONFIG_ECC_INIT_VIA_DDRCONTROLLER #define CONFIG_MEM_INIT_VALUE 0xdeadbeef #endif diff --git a/include/configs/ls1046ardb.h b/include/configs/ls1046ardb.h index 4a657533ef8..814901ef31f 100644 --- a/include/configs/ls1046ardb.h +++ b/include/configs/ls1046ardb.h @@ -17,12 +17,9 @@ /* Physical Memory Map */ #define CONFIG_CHIP_SELECTS_PER_CTRL 4 -#define CONFIG_DDR_SPD #define SPD_EEPROM_ADDRESS 0x51 #define CONFIG_SYS_SPD_BUS_NUM 0 -#define CONFIG_DDR_ECC -#define CONFIG_ECC_INIT_VIA_DDRCONTROLLER #define CONFIG_MEM_INIT_VALUE 0xdeadbeef #ifdef CONFIG_SD_BOOT diff --git a/include/configs/ls1088aqds.h b/include/configs/ls1088aqds.h index d9d7af24e78..a7d8cb50fcc 100644 --- a/include/configs/ls1088aqds.h +++ b/include/configs/ls1088aqds.h @@ -32,9 +32,6 @@ unsigned long get_board_sys_clk(void); #define CONFIG_DIMM_SLOTS_PER_CTLR 1 -#define CONFIG_DDR_SPD -#define CONFIG_DDR_ECC -#define CONFIG_ECC_INIT_VIA_DDRCONTROLLER #define CONFIG_MEM_INIT_VALUE 0xdeadbeef #define SPD_EEPROM_ADDRESS 0x51 #define CONFIG_SYS_SPD_BUS_NUM 0 diff --git a/include/configs/ls1088ardb.h b/include/configs/ls1088ardb.h index 21416da48ed..4a61345db2e 100644 --- a/include/configs/ls1088ardb.h +++ b/include/configs/ls1088ardb.h @@ -20,12 +20,9 @@ #define COUNTER_FREQUENCY_REAL 25000000 /* 25MHz */ #define COUNTER_FREQUENCY 25000000 /* 25MHz */ -#define CONFIG_DDR_SPD #ifdef CONFIG_EMU #define CONFIG_SYS_FSL_DDR_EMU #else -#define CONFIG_DDR_ECC -#define CONFIG_ECC_INIT_VIA_DDRCONTROLLER #define CONFIG_MEM_INIT_VALUE 0xdeadbeef #endif #define SPD_EEPROM_ADDRESS 0x51 diff --git a/include/configs/ls2080aqds.h b/include/configs/ls2080aqds.h index f0c794d0fe0..e831d3797d1 100644 --- a/include/configs/ls2080aqds.h +++ b/include/configs/ls2080aqds.h @@ -22,9 +22,6 @@ unsigned long get_board_sys_clk(void); #define CONFIG_SYS_CLK_FREQ get_board_sys_clk() #define COUNTER_FREQUENCY_REAL (CONFIG_SYS_CLK_FREQ/4) -#define CONFIG_DDR_SPD -#define CONFIG_DDR_ECC -#define CONFIG_ECC_INIT_VIA_DDRCONTROLLER #define CONFIG_MEM_INIT_VALUE 0xdeadbeef #define SPD_EEPROM_ADDRESS1 0x51 #define SPD_EEPROM_ADDRESS2 0x52 diff --git a/include/configs/ls2080ardb.h b/include/configs/ls2080ardb.h index 27843c1ea4a..5568a48ced9 100644 --- a/include/configs/ls2080ardb.h +++ b/include/configs/ls2080ardb.h @@ -38,9 +38,6 @@ unsigned long get_board_sys_clk(void); #define CONFIG_SYS_CLK_FREQ get_board_sys_clk() #define COUNTER_FREQUENCY_REAL (CONFIG_SYS_CLK_FREQ/4) -#define CONFIG_DDR_SPD -#define CONFIG_DDR_ECC -#define CONFIG_ECC_INIT_VIA_DDRCONTROLLER #define CONFIG_MEM_INIT_VALUE 0xdeadbeef #define SPD_EEPROM_ADDRESS1 0x51 #define SPD_EEPROM_ADDRESS2 0x52 diff --git a/include/configs/lx2160a_common.h b/include/configs/lx2160a_common.h index a060a1f9ddd..a701b2ce629 100644 --- a/include/configs/lx2160a_common.h +++ b/include/configs/lx2160a_common.h @@ -29,9 +29,6 @@ #define CONFIG_SYS_DDR_BLOCK2_BASE 0x2080000000ULL #define CONFIG_SYS_FSL_DDR_MAIN_NUM_CTRLS 2 #define CONFIG_SYS_SDRAM_SIZE 0x200000000UL -#define CONFIG_DDR_SPD -#define CONFIG_DDR_ECC -#define CONFIG_ECC_INIT_VIA_DDRCONTROLLER #define CONFIG_SYS_SDRAM_BASE CONFIG_SYS_DDR_SDRAM_BASE #define CONFIG_MEM_INIT_VALUE 0xdeadbeef #define SPD_EEPROM_ADDRESS1 0x51 diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h index 0a4f8a3ef77..68831a0d463 100644 --- a/include/configs/p1_p2_rdb_pc.h +++ b/include/configs/p1_p2_rdb_pc.h @@ -178,7 +178,6 @@ /* DDR Setup */ #define CONFIG_SYS_DDR_RAW_TIMING -#define CONFIG_DDR_SPD #define CONFIG_SYS_SPD_BUS_NUM 1 #define SPD_EEPROM_ADDRESS 0x52 diff --git a/include/configs/socrates.h b/include/configs/socrates.h index bca5b6af92c..5480f278c7b 100644 --- a/include/configs/socrates.h +++ b/include/configs/socrates.h @@ -57,9 +57,7 @@ /* DDR Setup */ #define CONFIG_SPD_EEPROM /* Use SPD EEPROM for DDR setup */ -#define CONFIG_DDR_SPD -#undef CONFIG_ECC_INIT_VIA_DDRCONTROLLER /* DDR controller or DMA? */ #define CONFIG_MEM_INIT_VALUE 0xDeadBeef #define CONFIG_SYS_DDR_SDRAM_BASE 0x00000000 -- cgit v1.2.3 From 9582af1afa506a29dd23912cdc888af582f85d56 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Sat, 21 Aug 2021 13:50:19 -0400 Subject: Convert CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT to Kconfig This converts the following to Kconfig: CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT Signed-off-by: Tom Rini --- include/configs/ls1021aiot.h | 1 - include/configs/ls1046a_common.h | 1 - 2 files changed, 2 deletions(-) (limited to 'include') diff --git a/include/configs/ls1021aiot.h b/include/configs/ls1021aiot.h index b88c16f95ea..e2a70d29c38 100644 --- a/include/configs/ls1021aiot.h +++ b/include/configs/ls1021aiot.h @@ -63,7 +63,6 @@ #define CONFIG_SPL_LIBCOMMON_SUPPORT #define CONFIG_SPL_LIBGENERIC_SUPPORT #define CONFIG_SPL_ENV_SUPPORT -#define CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT #define CONFIG_SPL_I2C #define CONFIG_SPL_WATCHDOG #define CONFIG_SPL_MMC_SUPPORT diff --git a/include/configs/ls1046a_common.h b/include/configs/ls1046a_common.h index 55b1f891130..72422eac696 100644 --- a/include/configs/ls1046a_common.h +++ b/include/configs/ls1046a_common.h @@ -107,7 +107,6 @@ #define CONFIG_SPL_ENV_SUPPORT #define CONFIG_SPL_WATCHDOG #define CONFIG_SPL_I2C -#define CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT #define CONFIG_SPL_NAND_SUPPORT #define CONFIG_SPL_DRIVERS_MISC -- cgit v1.2.3 From 72d81360aabd0485d3832d292bbea29c7c4554ef Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Mon, 23 Aug 2021 10:25:30 -0400 Subject: global: Convert CONFIG_LOADADDR to CONFIG_SYS_LOADADDR - In most of the codebase, we reference CONFIG_SYS_LOAD_ADDR and not CONFIG_LOADADDR. - Generally, CONFIG_SYS_LOADADDR is set to CONFIG_LOADADDR and then as noted, we use CONFIG_SYS_LOADADDR. Signed-off-by: Tom Rini --- include/configs/10m50_devboard.h | 1 - include/configs/3c120_devboard.h | 1 - include/configs/MPC8349EMDS.h | 2 -- include/configs/MPC8349EMDS_SDRAM.h | 2 -- include/configs/MPC837XERDB.h | 3 --- include/configs/MPC8540ADS.h | 2 -- include/configs/MPC8548CDS.h | 2 -- include/configs/MPC8560ADS.h | 2 -- include/configs/P1010RDB.h | 3 --- include/configs/P2041RDB.h | 3 --- include/configs/T102xRDB.h | 1 - include/configs/T104xRDB.h | 3 --- include/configs/T208xQDS.h | 2 -- include/configs/T208xRDB.h | 2 -- include/configs/T4240RDB.h | 3 --- include/configs/UCP1020.h | 3 --- include/configs/apalis-imx8.h | 4 +--- include/configs/apalis-imx8x.h | 4 +--- include/configs/apalis_imx6.h | 7 ++----- include/configs/axs10x.h | 1 - include/configs/bg0900.h | 3 +-- include/configs/bk4r1.h | 7 +------ include/configs/brppt2.h | 3 +-- include/configs/capricorn-common.h | 3 +-- include/configs/cgtqmx8.h | 4 +--- include/configs/ci20.h | 1 - include/configs/cl-som-imx7.h | 1 - include/configs/cm_fx6.h | 6 +++--- include/configs/colibri-imx6ull.h | 3 +-- include/configs/colibri-imx8x.h | 4 +--- include/configs/colibri_imx6.h | 6 ++---- include/configs/colibri_imx7.h | 3 +-- include/configs/colibri_vf.h | 3 +-- include/configs/controlcenterdc.h | 2 -- include/configs/corenet_ds.h | 3 --- include/configs/dart_6ul.h | 1 - include/configs/devkit3250.h | 1 - include/configs/dh_imx6.h | 3 +-- include/configs/ds414.h | 1 - include/configs/el6x_common.h | 6 +++--- include/configs/emsdp.h | 1 - include/configs/ethernut5.h | 1 - include/configs/flea3.h | 5 +---- include/configs/gazerbeam.h | 2 -- include/configs/ge_bx50v3.h | 7 +------ include/configs/hsdk-4xd.h | 1 - include/configs/hsdk.h | 1 - include/configs/ids8313.h | 1 - include/configs/imx27lite-common.h | 3 +-- include/configs/imx6-engicam.h | 3 +-- include/configs/imx6_logic.h | 2 +- include/configs/imx6dl-mamoj.h | 1 - include/configs/imx7-cm.h | 1 - include/configs/imx8mm-cl-iot-gate.h | 4 +--- include/configs/imx8mm_beacon.h | 4 +--- include/configs/imx8mm_evk.h | 8 +++----- include/configs/imx8mm_icore_mx8mm.h | 3 +-- include/configs/imx8mm_venice.h | 3 +-- include/configs/imx8mn_beacon.h | 4 +--- include/configs/imx8mn_evk.h | 8 +++----- include/configs/imx8mp_evk.h | 8 +++----- include/configs/imx8mq_cm.h | 4 +--- include/configs/imx8mq_evk.h | 4 +--- include/configs/imx8mq_phanbell.h | 4 +--- include/configs/imx8qm_mek.h | 4 +--- include/configs/imx8qm_rom7720.h | 4 +--- include/configs/imx8qxp_mek.h | 4 +--- include/configs/imx8ulp_evk.h | 8 +++----- include/configs/imxrt1020-evk.h | 1 - include/configs/imxrt1050-evk.h | 1 - include/configs/iot_devkit.h | 1 - include/configs/kp_imx53.h | 3 +-- include/configs/kp_imx6q_tpc.h | 6 +----- include/configs/liteboard.h | 2 -- include/configs/lsxl.h | 1 - include/configs/m53menlo.h | 3 +-- include/configs/meerkat96.h | 1 - include/configs/mt7622.h | 3 +-- include/configs/mt7623.h | 3 +-- include/configs/mt7629.h | 3 +-- include/configs/mt8512.h | 1 - include/configs/mt8518.h | 1 - include/configs/mx23_olinuxino.h | 3 +-- include/configs/mx23evk.h | 3 +-- include/configs/mx28evk.h | 3 +-- include/configs/mx51evk.h | 4 +--- include/configs/mx53cx9020.h | 4 +--- include/configs/mx53loco.h | 4 +--- include/configs/mx53ppd.h | 4 +--- include/configs/mx6_common.h | 5 ++--- include/configs/mx6cuboxi.h | 6 +++--- include/configs/mx6sabre_common.h | 2 +- include/configs/mx6ul_14x14_evk.h | 3 +-- include/configs/mx6ullevk.h | 1 - include/configs/mx7_common.h | 2 +- include/configs/mx7dsabresd.h | 7 +++---- include/configs/mx7ulp_com.h | 4 +--- include/configs/mx7ulp_evk.h | 3 +-- include/configs/mys_6ulx.h | 1 - include/configs/nitrogen6x.h | 6 +++--- include/configs/novena.h | 6 +++--- include/configs/npi_imx6ull.h | 1 - include/configs/nsim.h | 1 - include/configs/nyan-big.h | 4 ++-- include/configs/opos6uldev.h | 2 +- include/configs/p1_p2_rdb_pc.h | 3 --- include/configs/pcl063.h | 1 - include/configs/pcl063_ull.h | 1 - include/configs/pcm052.h | 4 +--- include/configs/phycore_imx8mm.h | 3 +-- include/configs/phycore_imx8mp.h | 3 +-- include/configs/pico-imx6.h | 6 +++--- include/configs/pico-imx6ul.h | 7 +++---- include/configs/pico-imx7d.h | 9 ++++----- include/configs/pico-imx8mq.h | 4 +--- include/configs/qemu-ppce500.h | 3 --- include/configs/rcar-gen2-common.h | 1 - include/configs/rcar-gen3-common.h | 1 - include/configs/rpi.h | 1 - include/configs/smegw01.h | 1 - include/configs/socfpga_arria10_socdk.h | 3 +-- include/configs/socfpga_arria5_secu1.h | 1 - include/configs/socfpga_arria5_socdk.h | 3 +-- include/configs/socfpga_cyclone5_socdk.h | 3 +-- include/configs/socfpga_dbm_soc1.h | 3 +-- include/configs/socfpga_de0_nano_soc.h | 3 +-- include/configs/socfpga_de10_nano.h | 3 +-- include/configs/socfpga_de1_soc.h | 3 +-- include/configs/socfpga_is1.h | 3 +-- include/configs/socfpga_mcvevk.h | 3 +-- include/configs/socfpga_soc64_common.h | 3 +-- include/configs/socfpga_sockit.h | 3 +-- include/configs/socfpga_socrates.h | 3 +-- include/configs/socfpga_sr1500.h | 3 +-- include/configs/socfpga_vining_fpga.h | 3 +-- include/configs/socrates.h | 1 - include/configs/somlabs_visionsom_6ull.h | 1 - include/configs/stih410-b2260.h | 1 - include/configs/stm32f429-discovery.h | 1 - include/configs/stm32f429-evaluation.h | 1 - include/configs/stm32f469-discovery.h | 1 - include/configs/stm32f746-disco.h | 1 - include/configs/stm32h743-disco.h | 1 - include/configs/stm32h743-eval.h | 1 - include/configs/stm32h750-art-pi.h | 1 - include/configs/stm32mp1.h | 3 +-- include/configs/tb100.h | 1 - include/configs/tegra-common-post.h | 2 -- include/configs/tegra114-common.h | 4 ++-- include/configs/tegra124-common.h | 4 ++-- include/configs/tegra186-common.h | 4 ++-- include/configs/tegra20-common.h | 4 ++-- include/configs/tegra210-common.h | 4 ++-- include/configs/tegra30-common.h | 4 ++-- include/configs/tplink_wdr4300.h | 1 - include/configs/udoo.h | 6 +++--- include/configs/udoo_neo.h | 6 +++--- include/configs/usbarmory.h | 3 +-- include/configs/verdin-imx8mm.h | 3 +-- include/configs/wandboard.h | 8 ++++---- include/configs/warp7.h | 1 - include/configs/work_92105.h | 1 - include/configs/x86-common.h | 1 - include/configs/xea.h | 3 +-- include/configs/xpress.h | 1 - include/env_default.h | 4 ++-- 166 files changed, 141 insertions(+), 355 deletions(-) (limited to 'include') diff --git a/include/configs/10m50_devboard.h b/include/configs/10m50_devboard.h index 3ffc744928f..d8ed2278c62 100644 --- a/include/configs/10m50_devboard.h +++ b/include/configs/10m50_devboard.h @@ -61,6 +61,5 @@ * MISC */ #define CONFIG_SYS_LOAD_ADDR 0xcc000000 /* Half of RAM */ -#define CONFIG_LOADADDR CONFIG_SYS_LOAD_ADDR #endif /* __CONFIG_H */ diff --git a/include/configs/3c120_devboard.h b/include/configs/3c120_devboard.h index 3f065ff315c..b9a17adb128 100644 --- a/include/configs/3c120_devboard.h +++ b/include/configs/3c120_devboard.h @@ -61,6 +61,5 @@ * MISC */ #define CONFIG_SYS_LOAD_ADDR 0xd4000000 /* Half of RAM */ -#define CONFIG_LOADADDR CONFIG_SYS_LOAD_ADDR #endif /* __CONFIG_H */ diff --git a/include/configs/MPC8349EMDS.h b/include/configs/MPC8349EMDS.h index 9612c70f8b4..6286d5ec285 100644 --- a/include/configs/MPC8349EMDS.h +++ b/include/configs/MPC8349EMDS.h @@ -274,8 +274,6 @@ #define CONFIG_ROOTPATH "/nfsroot/rootfs" #define CONFIG_BOOTFILE "uImage" -#define CONFIG_LOADADDR 800000 /* default location for tftp and bootm */ - #define CONFIG_EXTRA_ENV_SETTINGS \ "netdev=eth0\0" \ "hostname=mpc8349emds\0" \ diff --git a/include/configs/MPC8349EMDS_SDRAM.h b/include/configs/MPC8349EMDS_SDRAM.h index b3887f5d460..45d22086a88 100644 --- a/include/configs/MPC8349EMDS_SDRAM.h +++ b/include/configs/MPC8349EMDS_SDRAM.h @@ -331,8 +331,6 @@ #define CONFIG_ROOTPATH "/nfsroot/rootfs" #define CONFIG_BOOTFILE "uImage" -#define CONFIG_LOADADDR 800000 /* default location for tftp and bootm */ - #define CONFIG_EXTRA_ENV_SETTINGS \ "netdev=eth0\0" \ "hostname=mpc8349emds\0" \ diff --git a/include/configs/MPC837XERDB.h b/include/configs/MPC837XERDB.h index 569c66e52c0..e299437a823 100644 --- a/include/configs/MPC837XERDB.h +++ b/include/configs/MPC837XERDB.h @@ -347,9 +347,6 @@ #define CONFIG_UBOOTPATH "u-boot.bin" #define CONFIG_FDTFILE "mpc8379_rdb.dtb" - /* default location for tftp and bootm */ -#define CONFIG_LOADADDR 800000 - #define CONFIG_EXTRA_ENV_SETTINGS \ "netdev=" CONFIG_NETDEV "\0" \ "uboot=" CONFIG_UBOOTPATH "\0" \ diff --git a/include/configs/MPC8540ADS.h b/include/configs/MPC8540ADS.h index 1e620acea0a..82527da431e 100644 --- a/include/configs/MPC8540ADS.h +++ b/include/configs/MPC8540ADS.h @@ -316,8 +316,6 @@ #define CONFIG_GATEWAYIP 192.168.1.1 #define CONFIG_NETMASK 255.255.255.0 -#define CONFIG_LOADADDR 200000 /* default location for tftp and bootm */ - #define CONFIG_EXTRA_ENV_SETTINGS \ "netdev=eth0\0" \ "consoledev=ttyS0\0" \ diff --git a/include/configs/MPC8548CDS.h b/include/configs/MPC8548CDS.h index d7e6b6cd252..289283a39f7 100644 --- a/include/configs/MPC8548CDS.h +++ b/include/configs/MPC8548CDS.h @@ -442,8 +442,6 @@ extern unsigned long get_clock_freq(void); #define CONFIG_GATEWAYIP 192.168.1.1 #define CONFIG_NETMASK 255.255.255.0 -#define CONFIG_LOADADDR 1000000 /*default location for tftp and bootm*/ - #define CONFIG_EXTRA_ENV_SETTINGS \ "hwconfig=fsl_ddr:ecc=off\0" \ "netdev=eth0\0" \ diff --git a/include/configs/MPC8560ADS.h b/include/configs/MPC8560ADS.h index 27a17bb9957..f1828a28cae 100644 --- a/include/configs/MPC8560ADS.h +++ b/include/configs/MPC8560ADS.h @@ -305,8 +305,6 @@ #define CONFIG_GATEWAYIP 192.168.1.1 #define CONFIG_NETMASK 255.255.255.0 -#define CONFIG_LOADADDR 200000 /* default location for tftp and bootm */ - #define CONFIG_EXTRA_ENV_SETTINGS \ "netdev=eth0\0" \ "consoledev=ttyCPM\0" \ diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h index 952896156d2..ea3c39e604d 100644 --- a/include/configs/P1010RDB.h +++ b/include/configs/P1010RDB.h @@ -639,9 +639,6 @@ extern unsigned long get_sdram_size(void); #define CONFIG_BOOTFILE "uImage" #define CONFIG_UBOOTPATH u-boot.bin/* U-Boot image on TFTP server */ -/* default location for tftp and bootm */ -#define CONFIG_LOADADDR 1000000 - #define CONFIG_EXTRA_ENV_SETTINGS \ "hwconfig=" __stringify(CONFIG_DEF_HWCONFIG) "\0" \ "netdev=eth0\0" \ diff --git a/include/configs/P2041RDB.h b/include/configs/P2041RDB.h index e4e43904238..52b9cf57557 100644 --- a/include/configs/P2041RDB.h +++ b/include/configs/P2041RDB.h @@ -481,9 +481,6 @@ unsigned long get_board_sys_clk(unsigned long dummy); #define CONFIG_BOOTFILE "uImage" #define CONFIG_UBOOTPATH u-boot.bin -/* default location for tftp and bootm */ -#define CONFIG_LOADADDR 1000000 - #define __USB_PHY_TYPE utmi #define CONFIG_EXTRA_ENV_SETTINGS \ diff --git a/include/configs/T102xRDB.h b/include/configs/T102xRDB.h index d21e4020a85..4fb22538c77 100644 --- a/include/configs/T102xRDB.h +++ b/include/configs/T102xRDB.h @@ -612,7 +612,6 @@ unsigned long get_board_sys_clk(void); #define CONFIG_ROOTPATH "/opt/nfsroot" #define CONFIG_BOOTFILE "uImage" #define CONFIG_UBOOTPATH u-boot.bin /* U-Boot image on TFTP server */ -#define CONFIG_LOADADDR 1000000 /* default location for tftp, bootm */ #define __USB_PHY_TYPE utmi #ifdef CONFIG_ARCH_T1024 diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h index 8ef13fc9ac3..d1b4debae6f 100644 --- a/include/configs/T104xRDB.h +++ b/include/configs/T104xRDB.h @@ -677,9 +677,6 @@ $(SRCTREE)/board/freescale/t104xrdb/t1042d4_sd_rcw.cfg #define CONFIG_BOOTFILE "uImage" #define CONFIG_UBOOTPATH "u-boot.bin" /* U-Boot image on TFTP server*/ -/* default location for tftp and bootm */ -#define CONFIG_LOADADDR 1000000 - #define __USB_PHY_TYPE utmi #define RAMDISKFILE "t104xrdb/ramdisk.uboot" diff --git a/include/configs/T208xQDS.h b/include/configs/T208xQDS.h index 74f372ad2e3..edf2ed8b444 100644 --- a/include/configs/T208xQDS.h +++ b/include/configs/T208xQDS.h @@ -610,8 +610,6 @@ unsigned long get_board_sys_clk(void); #define CONFIG_BOOTFILE "uImage" #define CONFIG_UBOOTPATH "u-boot.bin" /* U-Boot image on TFTP server */ -/* default location for tftp and bootm */ -#define CONFIG_LOADADDR 1000000 #define __USB_PHY_TYPE utmi #define CONFIG_EXTRA_ENV_SETTINGS \ diff --git a/include/configs/T208xRDB.h b/include/configs/T208xRDB.h index 6821cd3882a..96641152a1a 100644 --- a/include/configs/T208xRDB.h +++ b/include/configs/T208xRDB.h @@ -559,8 +559,6 @@ unsigned long get_board_sys_clk(void); #define CONFIG_BOOTFILE "uImage" #define CONFIG_UBOOTPATH "u-boot.bin" /* U-Boot image on TFTP server */ -/* default location for tftp and bootm */ -#define CONFIG_LOADADDR 1000000 #define __USB_PHY_TYPE utmi #define CONFIG_EXTRA_ENV_SETTINGS \ diff --git a/include/configs/T4240RDB.h b/include/configs/T4240RDB.h index d5bf813ebc6..0486264fedb 100644 --- a/include/configs/T4240RDB.h +++ b/include/configs/T4240RDB.h @@ -229,9 +229,6 @@ #define CONFIG_BOOTFILE "uImage" #define CONFIG_UBOOTPATH "u-boot.bin" /* U-Boot image on TFTP server*/ -/* default location for tftp and bootm */ -#define CONFIG_LOADADDR 1000000 - #define HVBOOT \ "setenv bootargs config-addr=0x60000000; " \ "bootm 0x01000000 - 0x00f00000" diff --git a/include/configs/UCP1020.h b/include/configs/UCP1020.h index 51083569a88..92316765973 100644 --- a/include/configs/UCP1020.h +++ b/include/configs/UCP1020.h @@ -430,9 +430,6 @@ #define CONFIG_BOOTFILE "uImage" #define CONFIG_UBOOTPATH u-boot.bin /* U-Boot image on TFTP server */ -/* default location for tftp and bootm */ -#define CONFIG_LOADADDR 1000000 - #if defined(CONFIG_DONGLE) #define CONFIG_EXTRA_ENV_SETTINGS \ diff --git a/include/configs/apalis-imx8.h b/include/configs/apalis-imx8.h index b04a03f76da..d5bf92a0d0f 100644 --- a/include/configs/apalis-imx8.h +++ b/include/configs/apalis-imx8.h @@ -70,9 +70,7 @@ "${blkcnt}; fi\0" /* Link Definitions */ -#define CONFIG_LOADADDR 0x80280000 - -#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR +#define CONFIG_SYS_LOAD_ADDR 0x80280000 #define CONFIG_SYS_INIT_SP_ADDR 0x80200000 diff --git a/include/configs/apalis-imx8x.h b/include/configs/apalis-imx8x.h index 2ad4ca34188..483cf09943f 100644 --- a/include/configs/apalis-imx8x.h +++ b/include/configs/apalis-imx8x.h @@ -97,9 +97,7 @@ "vidargs=video=imxdpufb5:off video=imxdpufb6:off video=imxdpufb7:off\0" /* Link Definitions */ -#define CONFIG_LOADADDR 0x89000000 - -#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR +#define CONFIG_SYS_LOAD_ADDR 0x89000000 #define CONFIG_SYS_INIT_SP_ADDR 0x80200000 diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h index d1d74559ace..b736d19e3ce 100644 --- a/include/configs/apalis_imx6.h +++ b/include/configs/apalis_imx6.h @@ -71,8 +71,7 @@ #define CONFIG_NETMASK 255.255.255.0 #undef CONFIG_SERVERIP #define CONFIG_SERVERIP 192.168.10.1 - -#define CONFIG_LOADADDR 0x12000000 +#define CONFIG_SYS_LOAD_ADDR 0x12000000 #ifndef CONFIG_SPL_BUILD #define BOOT_TARGET_DEVICES(func) \ @@ -154,7 +153,7 @@ "load ${interface} ${drive}:1 ${loadaddr} flash_blk.img && " \ "source ${loadaddr}\0" \ "splashpos=m,m\0" \ - "splashimage=" __stringify(CONFIG_LOADADDR) "\0" \ + "splashimage=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ "vidargs=mxc_hdmi.only_cea=1 fbmem=32M\0" /* Miscellaneous configurable options */ @@ -163,8 +162,6 @@ #undef CONFIG_SYS_MAXARGS #define CONFIG_SYS_MAXARGS 48 -#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR - /* Physical Memory Map */ #define PHYS_SDRAM MMDC0_ARB_BASE_ADDR diff --git a/include/configs/axs10x.h b/include/configs/axs10x.h index 0c5a3af4cc4..96a1c6400c5 100644 --- a/include/configs/axs10x.h +++ b/include/configs/axs10x.h @@ -63,7 +63,6 @@ * Environment configuration */ #define CONFIG_BOOTFILE "uImage" -#define CONFIG_LOADADDR CONFIG_SYS_LOAD_ADDR /* * Console configuration diff --git a/include/configs/bg0900.h b/include/configs/bg0900.h index b5412363610..aacc70cd551 100644 --- a/include/configs/bg0900.h +++ b/include/configs/bg0900.h @@ -20,8 +20,7 @@ /* Boot Linux */ #define CONFIG_BOOTFILE "uImage" #define CONFIG_BOOTCOMMAND "bootm" -#define CONFIG_LOADADDR 0x42000000 -#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR +#define CONFIG_SYS_LOAD_ADDR 0x42000000 /* Extra Environment */ #define CONFIG_EXTRA_ENV_SETTINGS \ diff --git a/include/configs/bk4r1.h b/include/configs/bk4r1.h index 2abbe7b2ba8..a3ec719b4d7 100644 --- a/include/configs/bk4r1.h +++ b/include/configs/bk4r1.h @@ -80,8 +80,7 @@ #define FSL_QSPI_FLASH_NUM 2 #define CONFIG_SYS_FSL_QSPI_LE #endif - -#define CONFIG_LOADADDR 0x82000000 +#define CONFIG_SYS_LOAD_ADDR 0x82000000 /* We boot from the gfxRAM area of the OCRAM. */ #define CONFIG_BOARD_SIZE_LIMIT 520192 @@ -230,10 +229,6 @@ "source to NAND\0" \ "active_workset=1\0" -/* Miscellaneous configurable options */ - -#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR - /* Physical memory map */ #define PHYS_SDRAM (0x80000000) #define PHYS_SDRAM_SIZE (SZ_512M) diff --git a/include/configs/brppt2.h b/include/configs/brppt2.h index 333d3f44e2e..e30b365a93d 100644 --- a/include/configs/brppt2.h +++ b/include/configs/brppt2.h @@ -20,8 +20,7 @@ #define CONFIG_BOARD_POSTCLK_INIT #define CONFIG_MXC_GPT_HCLK -#define CONFIG_LOADADDR 0x10700000 -#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR +#define CONFIG_SYS_LOAD_ADDR 0x10700000 /* MMC */ #define CONFIG_FSL_USDHC diff --git a/include/configs/capricorn-common.h b/include/configs/capricorn-common.h index 37d4beefef0..bca995e16ca 100644 --- a/include/configs/capricorn-common.h +++ b/include/configs/capricorn-common.h @@ -127,8 +127,7 @@ "reset;" /* Default location for tftp and bootm */ -#define CONFIG_LOADADDR 0x80280000 -#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR +#define CONFIG_SYS_LOAD_ADDR 0x80280000 #define CONFIG_SYS_INIT_SP_ADDR 0x80200000 /* On CCP board, USDHC1 is for eMMC */ diff --git a/include/configs/cgtqmx8.h b/include/configs/cgtqmx8.h index 15c50279ad9..585834c9025 100644 --- a/include/configs/cgtqmx8.h +++ b/include/configs/cgtqmx8.h @@ -147,9 +147,7 @@ "else booti ${loadaddr} - ${fdt_addr}; fi" /* Link Definitions */ -#define CONFIG_LOADADDR 0x80280000 - -#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR +#define CONFIG_SYS_LOAD_ADDR 0x80280000 #define CONFIG_SYS_INIT_SP_ADDR 0x80200000 diff --git a/include/configs/ci20.h b/include/configs/ci20.h index 6e46d29c855..8f9e9f8132f 100644 --- a/include/configs/ci20.h +++ b/include/configs/ci20.h @@ -24,7 +24,6 @@ #define CONFIG_SYS_SDRAM_BASE 0x80000000 /* cached (KSEG0) address */ #define CONFIG_SYS_INIT_SP_OFFSET 0x400000 #define CONFIG_SYS_LOAD_ADDR 0x81000000 -#define CONFIG_LOADADDR CONFIG_SYS_LOAD_ADDR #define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE diff --git a/include/configs/cl-som-imx7.h b/include/configs/cl-som-imx7.h index 51d18c5f108..e8495b387c6 100644 --- a/include/configs/cl-som-imx7.h +++ b/include/configs/cl-som-imx7.h @@ -97,7 +97,6 @@ "echo eMMC boot attempt ...; run emmcbootscript; run emmcboot; " \ "echo USB boot attempt ...; run usbbootscript; " -#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR #define CONFIG_SYS_HZ 1000 /* Physical Memory Map */ diff --git a/include/configs/cm_fx6.h b/include/configs/cm_fx6.h index 41ec15ff04e..e569b90adb5 100644 --- a/include/configs/cm_fx6.h +++ b/include/configs/cm_fx6.h @@ -43,9 +43,9 @@ "initrd_high=0xffffffff\0" \ "fdt_addr_r=0x18000000\0" \ "ramdisk_addr_r=0x13000000\0" \ - "kernel_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \ - "pxefile_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \ - "scriptaddr=" __stringify(CONFIG_LOADADDR) "\0" \ + "kernel_addr_r=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ + "pxefile_addr_r=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ + "scriptaddr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ "fdtfile=undefined\0" \ "stdin=serial,usbkbd\0" \ "stdout=serial,vidconsole\0" \ diff --git a/include/configs/colibri-imx6ull.h b/include/configs/colibri-imx6ull.h index 3799b4a9997..4351bfe7d20 100644 --- a/include/configs/colibri-imx6ull.h +++ b/include/configs/colibri-imx6ull.h @@ -103,11 +103,10 @@ "fatload ${interface} 0:1 ${loadaddr} " \ "${board}/flash_blk.img && source ${loadaddr}\0" \ "splashpos=m,m\0" \ - "splashimage=" __stringify(CONFIG_LOADADDR) "\0" \ + "splashimage=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ "videomode=video=ctfb:x:640,y:480,depth:18,pclk:39722,le:48,ri:16,up:33,lo:10,hs:96,vs:2,sync:0,vmode:0\0" \ "vidargs=video=mxsfb:640x480M-16@60" -#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR /* Physical Memory Map */ #define PHYS_SDRAM MMDC0_ARB_BASE_ADDR diff --git a/include/configs/colibri-imx8x.h b/include/configs/colibri-imx8x.h index cb22b3c75a8..27edb90153c 100644 --- a/include/configs/colibri-imx8x.h +++ b/include/configs/colibri-imx8x.h @@ -102,9 +102,7 @@ "vidargs=video=imxdpufb5:off video=imxdpufb6:off video=imxdpufb7:off\0" /* Link Definitions */ -#define CONFIG_LOADADDR 0x80280000 - -#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR +#define CONFIG_SYS_LOAD_ADDR 0x80280000 #define CONFIG_SYS_INIT_SP_ADDR 0x80200000 diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h index 2b2ee95b70f..ca3709b9400 100644 --- a/include/configs/colibri_imx6.h +++ b/include/configs/colibri_imx6.h @@ -60,7 +60,7 @@ #undef CONFIG_SERVERIP #define CONFIG_SERVERIP 192.168.10.1 -#define CONFIG_LOADADDR 0x12000000 +#define CONFIG_SYS_LOAD_ADDR 0x12000000 #ifndef CONFIG_SPL_BUILD #define BOOT_TARGET_DEVICES(func) \ @@ -134,7 +134,7 @@ "load ${interface} ${drive}:1 ${loadaddr} flash_blk.img && " \ "source ${loadaddr}\0" \ "splashpos=m,m\0" \ - "splashimage=" __stringify(CONFIG_LOADADDR) "\0" \ + "splashimage=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ "vidargs=fbmem=8M\0" /* Miscellaneous configurable options */ @@ -143,8 +143,6 @@ #undef CONFIG_SYS_MAXARGS #define CONFIG_SYS_MAXARGS 48 -#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR - /* Physical Memory Map */ #define PHYS_SDRAM MMDC0_ARB_BASE_ADDR diff --git a/include/configs/colibri_imx7.h b/include/configs/colibri_imx7.h index 5a7919e87c4..4d9de07c84d 100644 --- a/include/configs/colibri_imx7.h +++ b/include/configs/colibri_imx7.h @@ -167,13 +167,12 @@ "fatload ${interface} 0:1 ${loadaddr} " \ "${board}/flash_blk.img && source ${loadaddr}\0" \ "splashpos=m,m\0" \ - "splashimage=" __stringify(CONFIG_LOADADDR) "\0" \ + "splashimage=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ "videomode=video=ctfb:x:640,y:480,depth:18,pclk:39722,le:48,ri:16,up:33,lo:10,hs:96,vs:2,sync:0,vmode:0\0" \ "updlevel=2\0" /* Miscellaneous configurable options */ -#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR #define CONFIG_SYS_HZ 1000 /* Physical Memory Map */ diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h index 5bd440f1db3..96fef9fd7fc 100644 --- a/include/configs/colibri_vf.h +++ b/include/configs/colibri_vf.h @@ -38,7 +38,7 @@ #define CONFIG_NETMASK 255.255.255.0 #define CONFIG_SERVERIP 192.168.10.1 -#define CONFIG_LOADADDR 0x80008000 +#define CONFIG_SYS_LOAD_ADDR 0x80008000 #define CONFIG_FDTADDR 0x84000000 /* We boot from the gfxRAM area of the OCRAM. */ @@ -117,7 +117,6 @@ #define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */ #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE -#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR #define CONFIG_SYS_HZ 1000 /* Physical memory map */ diff --git a/include/configs/controlcenterdc.h b/include/configs/controlcenterdc.h index d03527f40f2..58d83e5f144 100644 --- a/include/configs/controlcenterdc.h +++ b/include/configs/controlcenterdc.h @@ -20,8 +20,6 @@ * U-Boot into it. */ -#define CONFIG_LOADADDR 1000000 - /* * SATA/SCSI/AHCI configuration */ diff --git a/include/configs/corenet_ds.h b/include/configs/corenet_ds.h index e9205291c8f..19190029daa 100644 --- a/include/configs/corenet_ds.h +++ b/include/configs/corenet_ds.h @@ -489,9 +489,6 @@ #define CONFIG_BOOTFILE "uImage" #define CONFIG_UBOOTPATH u-boot.bin /* U-Boot image on TFTP server */ -/* default location for tftp and bootm */ -#define CONFIG_LOADADDR 1000000 - #ifdef CONFIG_TARGET_P4080DS #define __USB_PHY_TYPE ulpi #else diff --git a/include/configs/dart_6ul.h b/include/configs/dart_6ul.h index 12ae1b73177..79b0cd7a68a 100644 --- a/include/configs/dart_6ul.h +++ b/include/configs/dart_6ul.h @@ -50,7 +50,6 @@ /* Miscellaneous configurable options */ -#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR #define CONFIG_SYS_HZ 1000 /* Physical Memory Map */ diff --git a/include/configs/devkit3250.h b/include/configs/devkit3250.h index 9cfeb5ae308..ab1fbc83af6 100644 --- a/include/configs/devkit3250.h +++ b/include/configs/devkit3250.h @@ -126,7 +126,6 @@ #define CONFIG_SETUP_MEMORY_TAGS #define CONFIG_BOOTFILE "uImage" -#define CONFIG_LOADADDR 0x80008000 /* * SPL specific defines diff --git a/include/configs/dh_imx6.h b/include/configs/dh_imx6.h index d9be1c38c44..8e4296b9d33 100644 --- a/include/configs/dh_imx6.h +++ b/include/configs/dh_imx6.h @@ -81,8 +81,7 @@ #define CONFIG_HW_WATCHDOG #endif -#define CONFIG_LOADADDR 0x12000000 -#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR +#define CONFIG_SYS_LOAD_ADDR 0x12000000 #ifndef CONFIG_SPL_BUILD #define CONFIG_EXTRA_ENV_SETTINGS \ diff --git a/include/configs/ds414.h b/include/configs/ds414.h index 8a78ab3e155..3b74aa96cd1 100644 --- a/include/configs/ds414.h +++ b/include/configs/ds414.h @@ -64,7 +64,6 @@ #define CONFIG_SPL_BOOTROM_SAVE (CONFIG_SPL_STACK + 4) /* Default Environment */ -#define CONFIG_LOADADDR 0x80000 #define CONFIG_BOOTCOMMAND \ "sf probe; " \ "sf read ${loadaddr} 0xd0000 0x2d0000; " \ diff --git a/include/configs/el6x_common.h b/include/configs/el6x_common.h index 3b535e53864..220da5b80ad 100644 --- a/include/configs/el6x_common.h +++ b/include/configs/el6x_common.h @@ -47,9 +47,9 @@ "fdt_addr_r=0x18000000\0" \ "fdt_addr=0x18000000\0" \ "findfdt=setenv fdtfile " CONFIG_DEFAULT_FDT_FILE "\0" \ - "kernel_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \ - "scriptaddr=" __stringify(CONFIG_LOADADDR) "\0" \ - "pxefile_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \ + "kernel_addr_r=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ + "scriptaddr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ + "pxefile_addr_r=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ BOOTENV #define BOOT_TARGET_DEVICES(func) \ diff --git a/include/configs/emsdp.h b/include/configs/emsdp.h index a872d48154a..8685f6c270a 100644 --- a/include/configs/emsdp.h +++ b/include/configs/emsdp.h @@ -22,7 +22,6 @@ * Environment */ #define CONFIG_BOOTFILE "app.bin" -#define CONFIG_LOADADDR CONFIG_SYS_LOAD_ADDR #define CONFIG_EXTRA_ENV_SETTINGS \ "upgrade_image=u-boot.bin\0" \ diff --git a/include/configs/ethernut5.h b/include/configs/ethernut5.h index e650cf6daca..dc01de74e3b 100644 --- a/include/configs/ethernut5.h +++ b/include/configs/ethernut5.h @@ -35,7 +35,6 @@ #define CONFIG_SYS_SDRAM_BASE 0x20000000 #define CONFIG_SYS_SDRAM_SIZE (128 << 20) #define CONFIG_SYS_LOAD_ADDR CONFIG_SYS_SDRAM_BASE -#define CONFIG_LOADADDR CONFIG_SYS_LOAD_ADDR #define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + (1 << 20)) /* 512kB on-chip NOR flash */ diff --git a/include/configs/flea3.h b/include/configs/flea3.h index b4b34fd1ce3..6caeff2a1c0 100644 --- a/include/configs/flea3.h +++ b/include/configs/flea3.h @@ -49,8 +49,7 @@ #define CONFIG_NET_RETRY_COUNT 100 - -#define CONFIG_LOADADDR 0x80800000 /* loadaddr env var */ +#define CONFIG_SYS_LOAD_ADDR 0x80800000 /* loadaddr env var */ /* * Ethernet on SOC (FEC) @@ -69,8 +68,6 @@ /* Print Buffer Size */ #define CONFIG_SYS_MAXARGS 32 /* max number of command args */ -#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR - /* * Physical Memory Map */ diff --git a/include/configs/gazerbeam.h b/include/configs/gazerbeam.h index f031f154f8d..4bf0c60aab8 100644 --- a/include/configs/gazerbeam.h +++ b/include/configs/gazerbeam.h @@ -84,8 +84,6 @@ #define CONFIG_HAS_ETH0 #define CONFIG_HAS_ETH1 -#define CONFIG_LOADADDR 800000 /* default location for tftp and bootm */ - /* TODO: Turn into string option and migrate to Kconfig */ #define CONFIG_HOSTNAME "gazerbeam" #define CONFIG_ROOTPATH "/opt/nfsroot" diff --git a/include/configs/ge_bx50v3.h b/include/configs/ge_bx50v3.h index 8570b928518..ba0432f4345 100644 --- a/include/configs/ge_bx50v3.h +++ b/include/configs/ge_bx50v3.h @@ -33,10 +33,6 @@ #define CONFIG_LBA48 #endif -/* Serial Flash */ - -#define CONFIG_LOADADDR 0x12000000 - #ifdef CONFIG_CMD_NFS #define NETWORKBOOT \ "setnetworkboot=" \ @@ -120,8 +116,7 @@ /* Miscellaneous configurable options */ - -#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR +#define CONFIG_SYS_LOAD_ADDR 0x12000000 /* Physical Memory Map */ #define PHYS_SDRAM MMDC0_ARB_BASE_ADDR diff --git a/include/configs/hsdk-4xd.h b/include/configs/hsdk-4xd.h index 5678f0a77bb..8eb3bb9b722 100644 --- a/include/configs/hsdk-4xd.h +++ b/include/configs/hsdk-4xd.h @@ -107,7 +107,6 @@ setenv core_iccm_3 0x6; setenv core_dccm_3 0x6;\0" * Environment configuration */ #define CONFIG_BOOTFILE "uImage" -#define CONFIG_LOADADDR CONFIG_SYS_LOAD_ADDR /* Cli configuration */ #define CONFIG_SYS_CBSIZE SZ_2K diff --git a/include/configs/hsdk.h b/include/configs/hsdk.h index 3cc3b8c0ae2..06577dffb47 100644 --- a/include/configs/hsdk.h +++ b/include/configs/hsdk.h @@ -106,7 +106,6 @@ setenv core_iccm_3 0x6; setenv core_dccm_3 0x6;\0" * Environment configuration */ #define CONFIG_BOOTFILE "uImage" -#define CONFIG_LOADADDR CONFIG_SYS_LOAD_ADDR /* Cli configuration */ #define CONFIG_SYS_CBSIZE SZ_2K diff --git a/include/configs/ids8313.h b/include/configs/ids8313.h index d4f4910b31b..be37b50cbff 100644 --- a/include/configs/ids8313.h +++ b/include/configs/ids8313.h @@ -224,7 +224,6 @@ #define CONFIG_BOOTFILE "ids8313/uImage" #define CONFIG_UBOOTPATH "ids8313/u-boot.bin" #define CONFIG_FDTFILE "ids8313/ids8313.dtb" -#define CONFIG_LOADADDR 0x400000 #define CONFIG_ENV_FLAGS_LIST_STATIC "ethaddr:mo,eth1addr:mo" /* Initial Memory map for Linux*/ diff --git a/include/configs/imx27lite-common.h b/include/configs/imx27lite-common.h index 8c5c0616208..c63e2d5a53a 100644 --- a/include/configs/imx27lite-common.h +++ b/include/configs/imx27lite-common.h @@ -120,8 +120,7 @@ /* Boot Argument Buffer Size */ #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE -#define CONFIG_LOADADDR 0xa0800000 /* loadaddr env var */ -#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR +#define CONFIG_SYS_LOAD_ADDR 0xa0800000 /* loadaddr env var */ #define CONFIG_EXTRA_ENV_SETTINGS \ "netdev=eth0\0" \ diff --git a/include/configs/imx6-engicam.h b/include/configs/imx6-engicam.h index bfe83b8cba5..50ebc151082 100644 --- a/include/configs/imx6-engicam.h +++ b/include/configs/imx6-engicam.h @@ -30,7 +30,7 @@ #define CONFIG_EXTRA_ENV_SETTINGS \ "script=boot.scr\0" \ "splashpos=m,m\0" \ - "splashimage=" __stringify(CONFIG_LOADADDR) "\0" \ + "splashimage=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ "image=uImage\0" \ "fit_image=fit.itb\0" \ "fdt_high=0xffffffff\0" \ @@ -103,7 +103,6 @@ /* Miscellaneous configurable options */ -#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR #define CONFIG_SYS_HZ 1000 #ifdef CONFIG_MX6UL diff --git a/include/configs/imx6_logic.h b/include/configs/imx6_logic.h index 6b992f9ab8b..cdca31e7cce 100644 --- a/include/configs/imx6_logic.h +++ b/include/configs/imx6_logic.h @@ -36,7 +36,7 @@ "bootm_size=0x10000000\0" \ "fdt_addr_r=0x14000000\0" \ "ramdisk_addr_r=0x14080000\0" \ - "kernel_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \ + "kernel_addr_r=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ "ramdisk_file=rootfs.cpio.uboot\0" \ "boot_fdt=try\0" \ "ip_dyn=yes\0" \ diff --git a/include/configs/imx6dl-mamoj.h b/include/configs/imx6dl-mamoj.h index 4027f329d30..e5af32a0131 100644 --- a/include/configs/imx6dl-mamoj.h +++ b/include/configs/imx6dl-mamoj.h @@ -65,7 +65,6 @@ /* Miscellaneous configurable options */ -#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR #define CONFIG_SYS_HZ 1000 /* Physical Memory Map */ diff --git a/include/configs/imx7-cm.h b/include/configs/imx7-cm.h index 4a3706d9960..a390bff3353 100644 --- a/include/configs/imx7-cm.h +++ b/include/configs/imx7-cm.h @@ -75,7 +75,6 @@ #define CONFIG_BOOTCOMMAND "run boot${boot-mode}" -#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR #define CONFIG_SYS_HZ 1000 /* Physical Memory Map */ diff --git a/include/configs/imx8mm-cl-iot-gate.h b/include/configs/imx8mm-cl-iot-gate.h index f5b3b67ab84..c994d717f57 100644 --- a/include/configs/imx8mm-cl-iot-gate.h +++ b/include/configs/imx8mm-cl-iot-gate.h @@ -140,9 +140,7 @@ #endif /* Link Definitions */ -#define CONFIG_LOADADDR 0x40480000 - -#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR +#define CONFIG_SYS_LOAD_ADDR 0x40480000 #define CONFIG_SYS_INIT_RAM_ADDR 0x40000000 #define CONFIG_SYS_INIT_RAM_SIZE 0x80000 diff --git a/include/configs/imx8mm_beacon.h b/include/configs/imx8mm_beacon.h index 13705f63df5..7423e283840 100644 --- a/include/configs/imx8mm_beacon.h +++ b/include/configs/imx8mm_beacon.h @@ -93,9 +93,7 @@ "fi;" /* Link Definitions */ -#define CONFIG_LOADADDR 0x40480000 - -#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR +#define CONFIG_SYS_LOAD_ADDR 0x40480000 #define CONFIG_SYS_INIT_RAM_ADDR 0x40000000 #define CONFIG_SYS_INIT_RAM_SIZE 0x200000 diff --git a/include/configs/imx8mm_evk.h b/include/configs/imx8mm_evk.h index 9cd07466162..6aa7c2a5b9b 100644 --- a/include/configs/imx8mm_evk.h +++ b/include/configs/imx8mm_evk.h @@ -44,8 +44,8 @@ /* Initial environment variables */ #define CONFIG_EXTRA_ENV_SETTINGS \ BOOTENV \ - "scriptaddr=" __stringify(CONFIG_LOADADDR) "\0" \ - "kernel_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \ + "scriptaddr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ + "kernel_addr_r=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ "image=Image\0" \ "console=ttymxc1,115200\0" \ "fdt_addr_r=0x43000000\0" \ @@ -57,9 +57,7 @@ "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \ /* Link Definitions */ -#define CONFIG_LOADADDR 0x40480000 - -#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR +#define CONFIG_SYS_LOAD_ADDR 0x40480000 #define CONFIG_SYS_INIT_RAM_ADDR 0x40000000 #define CONFIG_SYS_INIT_RAM_SIZE 0x200000 diff --git a/include/configs/imx8mm_icore_mx8mm.h b/include/configs/imx8mm_icore_mx8mm.h index 6d822fa8256..9d63b8c4f14 100644 --- a/include/configs/imx8mm_icore_mx8mm.h +++ b/include/configs/imx8mm_icore_mx8mm.h @@ -56,8 +56,7 @@ BOOTENV /* Link Definitions */ -#define CONFIG_LOADADDR 0x40480000 -#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR +#define CONFIG_SYS_LOAD_ADDR 0x40480000 #define CONFIG_SYS_INIT_RAM_ADDR 0x40000000 #define CONFIG_SYS_INIT_RAM_SIZE SZ_2M diff --git a/include/configs/imx8mm_venice.h b/include/configs/imx8mm_venice.h index a0cc2c897ba..ed3307166e3 100644 --- a/include/configs/imx8mm_venice.h +++ b/include/configs/imx8mm_venice.h @@ -37,8 +37,7 @@ "scriptaddr=0x46000000\0" /* Link Definitions */ -#define CONFIG_LOADADDR 0x40480000 -#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR +#define CONFIG_SYS_LOAD_ADDR 0x40480000 /* Enable Distro Boot */ #ifndef CONFIG_SPL_BUILD diff --git a/include/configs/imx8mn_beacon.h b/include/configs/imx8mn_beacon.h index 9ce60fd51b3..0975e786dc2 100644 --- a/include/configs/imx8mn_beacon.h +++ b/include/configs/imx8mn_beacon.h @@ -108,9 +108,7 @@ "else booti ${loadaddr} - ${fdt_addr}; fi" /* Link Definitions */ -#define CONFIG_LOADADDR 0x40480000 - -#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR +#define CONFIG_SYS_LOAD_ADDR 0x40480000 #define CONFIG_SYS_INIT_RAM_ADDR 0x40000000 #define CONFIG_SYS_INIT_RAM_SIZE 0x200000 diff --git a/include/configs/imx8mn_evk.h b/include/configs/imx8mn_evk.h index 42f9041b5dd..feb96b41b36 100644 --- a/include/configs/imx8mn_evk.h +++ b/include/configs/imx8mn_evk.h @@ -44,8 +44,8 @@ #define CONFIG_EXTRA_ENV_SETTINGS \ "image=Image\0" \ BOOTENV \ - "scriptaddr=" __stringify(CONFIG_LOADADDR) "\0" \ - "kernel_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \ + "scriptaddr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ + "kernel_addr_r=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ "console=ttymxc1,115200\0" \ "fdt_addr_r=0x43000000\0" \ "boot_fit=no\0" \ @@ -56,9 +56,7 @@ "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \ /* Link Definitions */ -#define CONFIG_LOADADDR 0x40480000 - -#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR +#define CONFIG_SYS_LOAD_ADDR 0x40480000 #define CONFIG_SYS_INIT_RAM_ADDR 0x40000000 #define CONFIG_SYS_INIT_RAM_SIZE 0x200000 diff --git a/include/configs/imx8mp_evk.h b/include/configs/imx8mp_evk.h index da5cf3d61f1..32c50cd0669 100644 --- a/include/configs/imx8mp_evk.h +++ b/include/configs/imx8mp_evk.h @@ -66,8 +66,8 @@ /* Initial environment variables */ #define CONFIG_EXTRA_ENV_SETTINGS \ BOOTENV \ - "scriptaddr=" __stringify(CONFIG_LOADADDR) "\0" \ - "kernel_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \ + "scriptaddr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ + "kernel_addr_r=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ "image=Image\0" \ "console=ttymxc1,115200 earlycon=ec_imx6q,0x30890000,115200\0" \ "fdt_addr_r=0x43000000\0" \ @@ -79,9 +79,7 @@ "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \ /* Link Definitions */ -#define CONFIG_LOADADDR 0x40480000 - -#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR +#define CONFIG_SYS_LOAD_ADDR 0x40480000 #define CONFIG_SYS_INIT_RAM_ADDR 0x40000000 #define CONFIG_SYS_INIT_RAM_SIZE 0x80000 diff --git a/include/configs/imx8mq_cm.h b/include/configs/imx8mq_cm.h index 9db3bd5f58d..a3267c47ae2 100644 --- a/include/configs/imx8mq_cm.h +++ b/include/configs/imx8mq_cm.h @@ -65,9 +65,7 @@ "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \ /* Link Definitions */ -#define CONFIG_LOADADDR 0x40480000 - -#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR +#define CONFIG_SYS_LOAD_ADDR 0x40480000 #define CONFIG_SYS_INIT_RAM_ADDR 0x40000000 #define CONFIG_SYS_INIT_RAM_SIZE 0x80000 diff --git a/include/configs/imx8mq_evk.h b/include/configs/imx8mq_evk.h index 54e0560406e..fc86ba3dcca 100644 --- a/include/configs/imx8mq_evk.h +++ b/include/configs/imx8mq_evk.h @@ -94,9 +94,7 @@ "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \ /* Link Definitions */ -#define CONFIG_LOADADDR 0x40480000 - -#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR +#define CONFIG_SYS_LOAD_ADDR 0x40480000 #define CONFIG_SYS_INIT_RAM_ADDR 0x40000000 #define CONFIG_SYS_INIT_RAM_SIZE 0x80000 diff --git a/include/configs/imx8mq_phanbell.h b/include/configs/imx8mq_phanbell.h index 7f86f2befc6..d246115b32b 100644 --- a/include/configs/imx8mq_phanbell.h +++ b/include/configs/imx8mq_phanbell.h @@ -137,9 +137,7 @@ "else booti ${loadaddr} - ${fdt_addr}; fi" /* Link Definitions */ -#define CONFIG_LOADADDR 0x40480000 - -#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR +#define CONFIG_SYS_LOAD_ADDR 0x40480000 #define CONFIG_SYS_INIT_RAM_ADDR 0x40000000 #define CONFIG_SYS_INIT_RAM_SIZE 0x80000 diff --git a/include/configs/imx8qm_mek.h b/include/configs/imx8qm_mek.h index 99e73a9446b..04ad3db8ed7 100644 --- a/include/configs/imx8qm_mek.h +++ b/include/configs/imx8qm_mek.h @@ -145,9 +145,7 @@ "else booti ${loadaddr} - ${fdt_addr}; fi" /* Link Definitions */ -#define CONFIG_LOADADDR 0x80280000 - -#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR +#define CONFIG_SYS_LOAD_ADDR 0x80280000 #define CONFIG_SYS_INIT_SP_ADDR 0x80200000 diff --git a/include/configs/imx8qm_rom7720.h b/include/configs/imx8qm_rom7720.h index fcbf8eeb34a..9c7bf4be53c 100644 --- a/include/configs/imx8qm_rom7720.h +++ b/include/configs/imx8qm_rom7720.h @@ -122,9 +122,7 @@ "else booti ${loadaddr} - ${fdt_addr}; fi" /* Link Definitions */ -#define CONFIG_LOADADDR 0x80280000 - -#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR +#define CONFIG_SYS_LOAD_ADDR 0x80280000 #define CONFIG_SYS_INIT_SP_ADDR 0x80200000 diff --git a/include/configs/imx8qxp_mek.h b/include/configs/imx8qxp_mek.h index a7d623a9b9e..bab8021a55a 100644 --- a/include/configs/imx8qxp_mek.h +++ b/include/configs/imx8qxp_mek.h @@ -144,9 +144,7 @@ "else booti ${loadaddr} - ${fdt_addr}; fi" /* Link Definitions */ -#define CONFIG_LOADADDR 0x80280000 - -#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR +#define CONFIG_SYS_LOAD_ADDR 0x80280000 #define CONFIG_SYS_INIT_SP_ADDR 0x80200000 diff --git a/include/configs/imx8ulp_evk.h b/include/configs/imx8ulp_evk.h index 32f8773b241..154ae693c54 100644 --- a/include/configs/imx8ulp_evk.h +++ b/include/configs/imx8ulp_evk.h @@ -63,8 +63,8 @@ /* Initial environment variables */ #define CONFIG_EXTRA_ENV_SETTINGS \ BOOTENV \ - "scriptaddr=" __stringify(CONFIG_LOADADDR) "\0" \ - "kernel_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \ + "scriptaddr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ + "kernel_addr_r=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ "image=Image\0" \ "console=ttyLP1,115200 earlycon\0" \ "fdt_addr_r=0x83000000\0" \ @@ -76,9 +76,7 @@ "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \ /* Link Definitions */ -#define CONFIG_LOADADDR 0x80480000 - -#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR +#define CONFIG_SYS_LOAD_ADDR 0x80480000 #define CONFIG_SYS_INIT_RAM_ADDR 0x80000000 #define CONFIG_SYS_INIT_RAM_SIZE 0x80000 diff --git a/include/configs/imxrt1020-evk.h b/include/configs/imxrt1020-evk.h index 4fb44774b0c..a2b1ab10d9b 100644 --- a/include/configs/imxrt1020-evk.h +++ b/include/configs/imxrt1020-evk.h @@ -15,7 +15,6 @@ #define CONFIG_SYS_LOAD_ADDR 0x20209000 #else #define CONFIG_SYS_LOAD_ADDR 0x80000000 -#define CONFIG_LOADADDR 0x80000000 #endif #define CONFIG_SYS_FSL_ERRATUM_ESDHC135 1 diff --git a/include/configs/imxrt1050-evk.h b/include/configs/imxrt1050-evk.h index c8d661fb3ee..c4787ab3184 100644 --- a/include/configs/imxrt1050-evk.h +++ b/include/configs/imxrt1050-evk.h @@ -15,7 +15,6 @@ #define CONFIG_SYS_LOAD_ADDR 0x20209000 #else #define CONFIG_SYS_LOAD_ADDR 0x80000000 -#define CONFIG_LOADADDR 0x80000000 #endif #define CONFIG_SYS_FSL_ERRATUM_ESDHC135 1 diff --git a/include/configs/iot_devkit.h b/include/configs/iot_devkit.h index 1ba69d9a5d0..93abae02fce 100644 --- a/include/configs/iot_devkit.h +++ b/include/configs/iot_devkit.h @@ -75,6 +75,5 @@ * Environment */ #define CONFIG_BOOTFILE "app.bin" -#define CONFIG_LOADADDR CONFIG_SYS_LOAD_ADDR #endif /* _CONFIG_IOT_DEVKIT_H_ */ diff --git a/include/configs/kp_imx53.h b/include/configs/kp_imx53.h index a40e42842d2..69730075682 100644 --- a/include/configs/kp_imx53.h +++ b/include/configs/kp_imx53.h @@ -20,7 +20,7 @@ #define CONFIG_MXC_USB_FLAGS 0 /* Command definition */ -#define CONFIG_LOADADDR 0x72000000 /* loadaddr env var */ +#define CONFIG_SYS_LOAD_ADDR 0x72000000 /* loadaddr env var */ #define CONFIG_EXTRA_ENV_SETTINGS \ "console=ttymxc1,115200\0" \ @@ -72,7 +72,6 @@ /* Miscellaneous configurable options */ #define CONFIG_SYS_CBSIZE 512 /* Console I/O Buffer Size */ -#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR /* Physical Memory Map */ #define PHYS_SDRAM_1 CSD0_BASE_ADDR diff --git a/include/configs/kp_imx6q_tpc.h b/include/configs/kp_imx6q_tpc.h index 749e880f36f..91023f44a52 100644 --- a/include/configs/kp_imx6q_tpc.h +++ b/include/configs/kp_imx6q_tpc.h @@ -36,11 +36,7 @@ #define CONFIG_MXC_USB_FLAGS 0 #define CONFIG_USB_MAX_CONTROLLER_COUNT 2 /* Enabled USB controller number */ #endif - -/* Watchdog */ - -#define CONFIG_LOADADDR 0x12000000 -#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR +#define CONFIG_SYS_LOAD_ADDR 0x12000000 #ifndef CONFIG_SPL_BUILD #define CONFIG_EXTRA_ENV_SETTINGS \ diff --git a/include/configs/liteboard.h b/include/configs/liteboard.h index 5adbe1ca391..041b78855d5 100644 --- a/include/configs/liteboard.h +++ b/include/configs/liteboard.h @@ -104,8 +104,6 @@ "else run netboot; fi" /* Miscellaneous configurable options */ - -#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR #define CONFIG_SYS_HZ 1000 /* Physical Memory Map */ diff --git a/include/configs/lsxl.h b/include/configs/lsxl.h index a4a4739d0dd..ca138382c5a 100644 --- a/include/configs/lsxl.h +++ b/include/configs/lsxl.h @@ -45,7 +45,6 @@ /* * Default environment variables */ -#define CONFIG_LOADADDR 0x00800000 #if defined(CONFIG_LSXHL) #define CONFIG_FDTFILE "kirkwood-lsxhl.dtb" diff --git a/include/configs/m53menlo.h b/include/configs/m53menlo.h index db601c03dac..1bcd40dd20f 100644 --- a/include/configs/m53menlo.h +++ b/include/configs/m53menlo.h @@ -136,9 +136,8 @@ #define CONFIG_REVISION_TAG #define CONFIG_SETUP_MEMORY_TAGS #define CONFIG_BOOTFILE "boot/fitImage" -#define CONFIG_LOADADDR 0x70800000 +#define CONFIG_SYS_LOAD_ADDR 0x70800000 #define CONFIG_BOOTCOMMAND "run mmc_mmc" -#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR /* * NAND SPL diff --git a/include/configs/meerkat96.h b/include/configs/meerkat96.h index f43a8415e1a..f5deba33e23 100644 --- a/include/configs/meerkat96.h +++ b/include/configs/meerkat96.h @@ -17,7 +17,6 @@ /* Size of malloc() pool */ #define CONFIG_SYS_MALLOC_LEN (32 * SZ_1M) -#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR #define CONFIG_SYS_HZ 1000 /* Physical Memory Map */ diff --git a/include/configs/mt7622.h b/include/configs/mt7622.h index f015d10d9bd..9820d6ac585 100644 --- a/include/configs/mt7622.h +++ b/include/configs/mt7622.h @@ -28,8 +28,7 @@ #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_TEXT_BASE + SZ_2M - \ GENERATED_GBL_DATA_SIZE) /* UBoot -> Kernel */ -#define CONFIG_LOADADDR 0x4007ff28 -#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR +#define CONFIG_SYS_LOAD_ADDR 0x4007ff28 /* DRAM */ #define CONFIG_SYS_SDRAM_BASE 0x40000000 diff --git a/include/configs/mt7623.h b/include/configs/mt7623.h index 9895279749d..6ceb9af264e 100644 --- a/include/configs/mt7623.h +++ b/include/configs/mt7623.h @@ -33,8 +33,7 @@ GENERATED_GBL_DATA_SIZE) /* UBoot -> Kernel */ -#define CONFIG_LOADADDR 0x84000000 -#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR +#define CONFIG_SYS_LOAD_ADDR 0x84000000 /* MMC */ #define MMC_SUPPORTS_TUNING diff --git a/include/configs/mt7629.h b/include/configs/mt7629.h index 08a4d01f552..53f2c3ad368 100644 --- a/include/configs/mt7629.h +++ b/include/configs/mt7629.h @@ -43,8 +43,7 @@ /* UBoot -> Kernel */ #define CONFIG_SYS_SPL_ARGS_ADDR 0x40000000 -#define CONFIG_LOADADDR 0x42007f1c -#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR +#define CONFIG_SYS_LOAD_ADDR 0x42007f1c /* DRAM */ #define CONFIG_SYS_SDRAM_BASE 0x40000000 diff --git a/include/configs/mt8512.h b/include/configs/mt8512.h index 7cd388fa101..8d667d07306 100644 --- a/include/configs/mt8512.h +++ b/include/configs/mt8512.h @@ -18,7 +18,6 @@ #define COUNTER_FREQUENCY 13000000 #define CONFIG_SYS_LOAD_ADDR 0x41000000 -#define CONFIG_LOADADDR CONFIG_SYS_LOAD_ADDR #define CONFIG_SYS_MALLOC_LEN SZ_32M #define CONFIG_SYS_BOOTM_LEN SZ_64M diff --git a/include/configs/mt8518.h b/include/configs/mt8518.h index 4e32442bb5a..a3005460e58 100644 --- a/include/configs/mt8518.h +++ b/include/configs/mt8518.h @@ -22,7 +22,6 @@ #define CONFIG_SYS_SDRAM_SIZE 0x20000000 #define CONFIG_SYS_LOAD_ADDR 0x41000000 -#define CONFIG_LOADADDR CONFIG_SYS_LOAD_ADDR #define CONFIG_SYS_MALLOC_LEN SZ_32M #define CONFIG_SYS_BOOTM_LEN SZ_64M diff --git a/include/configs/mx23_olinuxino.h b/include/configs/mx23_olinuxino.h index 2ee41aeff1b..ba24cd1e666 100644 --- a/include/configs/mx23_olinuxino.h +++ b/include/configs/mx23_olinuxino.h @@ -27,8 +27,7 @@ /* Booting Linux */ #define CONFIG_BOOTFILE "uImage" -#define CONFIG_LOADADDR 0x42000000 -#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR +#define CONFIG_SYS_LOAD_ADDR 0x42000000 /* Extra Environment */ #define CONFIG_EXTRA_ENV_SETTINGS \ diff --git a/include/configs/mx23evk.h b/include/configs/mx23evk.h index 3f13e60531c..ad0e4abafbf 100644 --- a/include/configs/mx23evk.h +++ b/include/configs/mx23evk.h @@ -36,8 +36,7 @@ /* Boot Linux */ #define CONFIG_BOOTFILE "uImage" -#define CONFIG_LOADADDR 0x42000000 -#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR +#define CONFIG_SYS_LOAD_ADDR 0x42000000 /* Extra Environments */ #define CONFIG_EXTRA_ENV_SETTINGS \ diff --git a/include/configs/mx28evk.h b/include/configs/mx28evk.h index 21f3277d5c4..5d51ff1af9c 100644 --- a/include/configs/mx28evk.h +++ b/include/configs/mx28evk.h @@ -50,8 +50,7 @@ /* Boot Linux */ #define CONFIG_BOOTFILE "uImage" -#define CONFIG_LOADADDR 0x42000000 -#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR +#define CONFIG_SYS_LOAD_ADDR 0x42000000 /* Extra Environment */ #define CONFIG_EXTRA_ENV_SETTINGS \ diff --git a/include/configs/mx51evk.h b/include/configs/mx51evk.h index 3574d654516..38609cf049b 100644 --- a/include/configs/mx51evk.h +++ b/include/configs/mx51evk.h @@ -61,7 +61,7 @@ #define CONFIG_ETHPRIME "FEC0" -#define CONFIG_LOADADDR 0x92000000 /* loadaddr env var */ +#define CONFIG_SYS_LOAD_ADDR 0x92000000 /* loadaddr env var */ #define CONFIG_EXTRA_ENV_SETTINGS \ "script=boot.scr\0" \ @@ -140,8 +140,6 @@ * Miscellaneous configurable options */ -#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR - /*----------------------------------------------------------------------- * Physical Memory Map */ diff --git a/include/configs/mx53cx9020.h b/include/configs/mx53cx9020.h index 93158fb4646..2e9958bca60 100644 --- a/include/configs/mx53cx9020.h +++ b/include/configs/mx53cx9020.h @@ -43,7 +43,7 @@ /* Command definition */ -#define CONFIG_LOADADDR 0x70010000 /* loadaddr env var */ +#define CONFIG_SYS_LOAD_ADDR 0x70010000 /* loadaddr env var */ #define BOOT_TARGET_DEVICES(func) \ func(MMC, mmc, 0) \ @@ -72,8 +72,6 @@ /* Miscellaneous configurable options */ #define CONFIG_SYS_CBSIZE 512 /* Console I/O Buffer Size */ -#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR - /* Physical Memory Map */ #define PHYS_SDRAM_1 CSD0_BASE_ADDR #define PHYS_SDRAM_1_SIZE (gd->bd->bi_dram[0].size) diff --git a/include/configs/mx53loco.h b/include/configs/mx53loco.h index 574e647aadf..deb928f91d9 100644 --- a/include/configs/mx53loco.h +++ b/include/configs/mx53loco.h @@ -49,7 +49,7 @@ #define CONFIG_ETHPRIME "FEC0" -#define CONFIG_LOADADDR 0x72000000 /* loadaddr env var */ +#define CONFIG_SYS_LOAD_ADDR 0x72000000 /* loadaddr env var */ #define CONFIG_EXTRA_ENV_SETTINGS \ "script=boot.scr\0" \ @@ -125,8 +125,6 @@ /* Miscellaneous configurable options */ #define CONFIG_SYS_CBSIZE 512 /* Console I/O Buffer Size */ -#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR - /* Physical Memory Map */ #define PHYS_SDRAM_1 CSD0_BASE_ADDR #define PHYS_SDRAM_1_SIZE (gd->bd->bi_dram[0].size) diff --git a/include/configs/mx53ppd.h b/include/configs/mx53ppd.h index dae3a5c5380..ca62d0ff159 100644 --- a/include/configs/mx53ppd.h +++ b/include/configs/mx53ppd.h @@ -33,7 +33,7 @@ /* Command definition */ -#define CONFIG_LOADADDR 0x72000000 /* loadaddr env var */ +#define CONFIG_SYS_LOAD_ADDR 0x72000000 /* loadaddr env var */ #define PPD_CONFIG_NFS \ "nfsserver=192.168.252.95\0" \ @@ -116,8 +116,6 @@ #define CONFIG_SYS_MAXARGS 48 /* max number of command args */ #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE /* Boot Argument Buffer Size */ -#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR - #define CONFIG_SYS_BOOTMAPSZ (256 << 20) /* 256M */ /* Physical Memory Map */ diff --git a/include/configs/mx6_common.h b/include/configs/mx6_common.h index a4504ee27ae..ac212aea3b1 100644 --- a/include/configs/mx6_common.h +++ b/include/configs/mx6_common.h @@ -43,11 +43,10 @@ #if defined(CONFIG_MX6SL) || defined(CONFIG_MX6SLL) || \ defined(CONFIG_MX6SX) || \ defined(CONFIG_MX6UL) || defined(CONFIG_MX6ULL) -#define CONFIG_LOADADDR 0x82000000 +#define CONFIG_SYS_LOAD_ADDR 0x82000000 #else -#define CONFIG_LOADADDR 0x12000000 +#define CONFIG_SYS_LOAD_ADDR 0x12000000 #endif -#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR /* Miscellaneous configurable options */ #define CONFIG_SYS_CBSIZE 512 diff --git a/include/configs/mx6cuboxi.h b/include/configs/mx6cuboxi.h index 9e5083b0d87..9b80646d3b5 100644 --- a/include/configs/mx6cuboxi.h +++ b/include/configs/mx6cuboxi.h @@ -46,9 +46,9 @@ "fdtfile=undefined\0" \ "fdt_addr_r=0x18000000\0" \ "fdt_addr=0x18000000\0" \ - "kernel_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \ - "pxefile_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \ - "scriptaddr=" __stringify(CONFIG_LOADADDR) "\0" \ + "kernel_addr_r=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ + "pxefile_addr_r=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ + "scriptaddr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ "ramdisk_addr_r=0x13000000\0" \ "ramdiskaddr=0x13000000\0" \ "initrd_high=0xffffffff\0" \ diff --git a/include/configs/mx6sabre_common.h b/include/configs/mx6sabre_common.h index ac579f3338a..eb153926926 100644 --- a/include/configs/mx6sabre_common.h +++ b/include/configs/mx6sabre_common.h @@ -52,7 +52,7 @@ "dfu_alt_info=spl raw 0x400\0" \ "fdt_high=0xffffffff\0" \ "initrd_high=0xffffffff\0" \ - "splashimage=" __stringify(CONFIG_LOADADDR) "\0" \ + "splashimage=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ "mmcdev=" __stringify(CONFIG_SYS_MMC_ENV_DEV) "\0" \ "mmcpart=1\0" \ "finduuid=part uuid mmc ${mmcdev}:2 uuid\0" \ diff --git a/include/configs/mx6ul_14x14_evk.h b/include/configs/mx6ul_14x14_evk.h index 0065fdc157b..2ce852a2f3e 100644 --- a/include/configs/mx6ul_14x14_evk.h +++ b/include/configs/mx6ul_14x14_evk.h @@ -48,7 +48,7 @@ "fdt_addr=0x83000000\0" \ "boot_fdt=try\0" \ "ip_dyn=yes\0" \ - "splashimage=" __stringify(CONFIG_LOADADDR) "\0" \ + "splashimage=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ "videomode=video=ctfb:x:480,y:272,depth:24,pclk:108695,le:8,ri:4,up:2,lo:4,hs:41,vs:10,sync:0,vmode:0\0" \ "mmcdev="__stringify(CONFIG_SYS_MMC_ENV_DEV)"\0" \ "mmcpart=" __stringify(CONFIG_SYS_MMC_IMG_LOAD_PART) "\0" \ @@ -127,7 +127,6 @@ /* Miscellaneous configurable options */ -#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR #define CONFIG_SYS_HZ 1000 /* Physical Memory Map */ diff --git a/include/configs/mx6ullevk.h b/include/configs/mx6ullevk.h index 0a62ada31c3..03dbdfcb3da 100644 --- a/include/configs/mx6ullevk.h +++ b/include/configs/mx6ullevk.h @@ -124,7 +124,6 @@ /* Miscellaneous configurable options */ -#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR #define CONFIG_SYS_HZ 1000 /* Physical Memory Map */ diff --git a/include/configs/mx7_common.h b/include/configs/mx7_common.h index 3d876903827..8af1338880c 100644 --- a/include/configs/mx7_common.h +++ b/include/configs/mx7_common.h @@ -28,7 +28,7 @@ /* Enable iomux-lpsr support */ #define CONFIG_IOMUX_LPSR -#define CONFIG_LOADADDR 0x80800000 +#define CONFIG_SYS_LOAD_ADDR 0x80800000 /* Miscellaneous configurable options */ #define CONFIG_SYS_CBSIZE 512 diff --git a/include/configs/mx7dsabresd.h b/include/configs/mx7dsabresd.h index 4766721ba21..ee7117f8d19 100644 --- a/include/configs/mx7dsabresd.h +++ b/include/configs/mx7dsabresd.h @@ -75,11 +75,11 @@ "fdtfile=imx7d-sdb.dtb\0" \ "fdt_addr=0x83000000\0" \ "fdt_addr_r=0x83000000\0" \ - "kernel_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \ - "pxefile_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \ + "kernel_addr_r=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ + "pxefile_addr_r=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ "ramdisk_addr_r=0x83100000\0" \ "ramdiskaddr=0x83100000\0" \ - "scriptaddr=" __stringify(CONFIG_LOADADDR) "\0" \ + "scriptaddr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ "videomode=video=ctfb:x:480,y:272,depth:24,pclk:108695,le:8,ri:4,up:2,lo:4,hs:41,vs:10,sync:0,vmode:0\0" \ BOOTENV @@ -90,7 +90,6 @@ #include -#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR #define CONFIG_SYS_HZ 1000 /* Physical Memory Map */ diff --git a/include/configs/mx7ulp_com.h b/include/configs/mx7ulp_com.h index 28672c4f94c..6c19997793e 100644 --- a/include/configs/mx7ulp_com.h +++ b/include/configs/mx7ulp_com.h @@ -47,7 +47,7 @@ #define PHYS_SDRAM 0x60000000 #define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM -#define CONFIG_LOADADDR 0x60800000 +#define CONFIG_SYS_LOAD_ADDR 0x60800000 #define CONFIG_EXTRA_ENV_SETTINGS \ "image=zImage\0" \ @@ -74,8 +74,6 @@ "run mmcboot; " \ "fi; " \ -#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR - #define CONFIG_SYS_INIT_RAM_ADDR IRAM_BASE_ADDR #define CONFIG_SYS_INIT_RAM_SIZE SZ_256K diff --git a/include/configs/mx7ulp_evk.h b/include/configs/mx7ulp_evk.h index 0c3103082cc..ae0e6a0bbbc 100644 --- a/include/configs/mx7ulp_evk.h +++ b/include/configs/mx7ulp_evk.h @@ -47,7 +47,7 @@ #define PHYS_SDRAM_SIZE SZ_1G #define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM -#define CONFIG_LOADADDR 0x60800000 +#define CONFIG_SYS_LOAD_ADDR 0x60800000 #define CONFIG_EXTRA_ENV_SETTINGS \ "script=boot.scr\0" \ @@ -125,7 +125,6 @@ "fi" #define CONFIG_SYS_HZ 1000 -#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR #define CONFIG_SYS_INIT_RAM_ADDR IRAM_BASE_ADDR #define CONFIG_SYS_INIT_RAM_SIZE SZ_256K diff --git a/include/configs/mys_6ulx.h b/include/configs/mys_6ulx.h index 5ef16fb278e..b68ae1275f1 100644 --- a/include/configs/mys_6ulx.h +++ b/include/configs/mys_6ulx.h @@ -24,7 +24,6 @@ /* MMC Configs */ #define CONFIG_SYS_FSL_ESDHC_ADDR USDHC2_BASE_ADDR -#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR #define CONFIG_SYS_HZ 1000 /* Physical Memory Map */ diff --git a/include/configs/nitrogen6x.h b/include/configs/nitrogen6x.h index c82b4c735a4..c6e14617832 100644 --- a/include/configs/nitrogen6x.h +++ b/include/configs/nitrogen6x.h @@ -108,9 +108,9 @@ "initrd_high=0xffffffff\0" \ "fdt_addr_r=0x18000000\0" \ FDTFILE \ - "kernel_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \ - "pxefile_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \ - "scriptaddr=" __stringify(CONFIG_LOADADDR) "\0" \ + "kernel_addr_r=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ + "pxefile_addr_r=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ + "scriptaddr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ "ramdisk_addr_r=0x13000000\0" \ "ramdiskaddr=0x13000000\0" \ "ip_dyn=yes\0" \ diff --git a/include/configs/novena.h b/include/configs/novena.h index 011284ee5d8..a866791c668 100644 --- a/include/configs/novena.h +++ b/include/configs/novena.h @@ -105,9 +105,9 @@ "bootdev=/dev/mmcblk0p1\0" \ "rootdev=/dev/mmcblk0p2\0" \ "netdev=eth0\0" \ - "kernel_addr_r="__stringify(CONFIG_LOADADDR)"\0" \ - "pxefile_addr_r="__stringify(CONFIG_LOADADDR)"\0" \ - "scriptaddr="__stringify(CONFIG_LOADADDR)"\0" \ + "kernel_addr_r="__stringify(CONFIG_SYS_LOAD_ADDR)"\0" \ + "pxefile_addr_r="__stringify(CONFIG_SYS_LOAD_ADDR)"\0" \ + "scriptaddr="__stringify(CONFIG_SYS_LOAD_ADDR)"\0" \ "ramdisk_addr_r=0x28000000\0" \ "fdt_addr_r=0x18000000\0" \ "fdtfile=imx6q-novena.dtb\0" \ diff --git a/include/configs/npi_imx6ull.h b/include/configs/npi_imx6ull.h index 3be9b8ff55f..d90ecf47c1a 100644 --- a/include/configs/npi_imx6ull.h +++ b/include/configs/npi_imx6ull.h @@ -26,7 +26,6 @@ #define CONFIG_NETMASK 255.255.255.0 -#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR #define CONFIG_SYS_HZ 1000 /* Physical Memory Map */ diff --git a/include/configs/nsim.h b/include/configs/nsim.h index 61217bbe795..69d582594e2 100644 --- a/include/configs/nsim.h +++ b/include/configs/nsim.h @@ -28,7 +28,6 @@ * Environment configuration */ #define CONFIG_BOOTFILE "uImage" -#define CONFIG_LOADADDR CONFIG_SYS_LOAD_ADDR /* * Console configuration diff --git a/include/configs/nyan-big.h b/include/configs/nyan-big.h index 394fb15f313..495753ba118 100644 --- a/include/configs/nyan-big.h +++ b/include/configs/nyan-big.h @@ -26,8 +26,8 @@ /* SPI */ #define CONFIG_SPI_FLASH_SIZE (4 << 20) -#undef CONFIG_LOADADDR -#define CONFIG_LOADADDR 0x82408000 +#undef CONFIG_SYS_LOAD_ADDR +#define CONFIG_SYS_LOAD_ADDR 0x82408000 #include "tegra-common-usb-gadget.h" #include "tegra-common-post.h" diff --git a/include/configs/opos6uldev.h b/include/configs/opos6uldev.h index 2fb1634a7de..d7ec8d00805 100644 --- a/include/configs/opos6uldev.h +++ b/include/configs/opos6uldev.h @@ -78,7 +78,7 @@ "mmcrootfstype=ext4 rootwait\0" \ "kernelimg=" __stringify(CONFIG_BOARD_NAME) "-linux.bin\0" \ "splashpos=0,0\0" \ - "splashimage=" __stringify(CONFIG_LOADADDR) "\0" \ + "splashimage=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ "videomode=video=ctfb:x:800,y:480,depth:18,pclk:33033,le:96,ri:96,up:20,lo:21,hs:64,vs:4,sync:0,vmode:0\0" \ "check_env=if test -n ${flash_env_version}; " \ "then env default env_version; " \ diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h index 68831a0d463..7ac71aa9a28 100644 --- a/include/configs/p1_p2_rdb_pc.h +++ b/include/configs/p1_p2_rdb_pc.h @@ -611,9 +611,6 @@ #define CONFIG_BOOTFILE "uImage" #define CONFIG_UBOOTPATH u-boot.bin /* U-Boot image on TFTP server */ -/* default location for tftp and bootm */ -#define CONFIG_LOADADDR 1000000 - #ifdef __SW_BOOT_NOR #define __NOR_RST_CMD \ norboot=i2c dev 1; i2c mw 18 1 __SW_BOOT_NOR 1; \ diff --git a/include/configs/pcl063.h b/include/configs/pcl063.h index 4f4d50131f5..cb3441ee5b3 100644 --- a/include/configs/pcl063.h +++ b/include/configs/pcl063.h @@ -36,7 +36,6 @@ /* Miscellaneous configurable options */ -#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR #define CONFIG_SYS_HZ 1000 /* Physical Memory Map */ diff --git a/include/configs/pcl063_ull.h b/include/configs/pcl063_ull.h index fee0c3d5103..a1549cd0482 100644 --- a/include/configs/pcl063_ull.h +++ b/include/configs/pcl063_ull.h @@ -39,7 +39,6 @@ /* Miscellaneous configurable options */ -#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR #define CONFIG_SYS_HZ 1000 /* Physical Memory Map */ diff --git a/include/configs/pcm052.h b/include/configs/pcm052.h index 960ff982d8b..0b21c590cf6 100644 --- a/include/configs/pcm052.h +++ b/include/configs/pcm052.h @@ -25,7 +25,7 @@ #define CONFIG_SYS_MAX_NAND_DEVICE 1 -#define CONFIG_LOADADDR 0x82000000 +#define CONFIG_SYS_LOAD_ADDR 0x82000000 /* We boot from the gfxRAM area of the OCRAM. */ #define CONFIG_BOARD_SIZE_LIMIT 520192 @@ -139,8 +139,6 @@ /* Miscellaneous configurable options */ -#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR - /* Physical memory map */ #define PHYS_SDRAM (0x80000000) #define PHYS_SDRAM_SIZE (CONFIG_PCM052_DDR_SIZE * SZ_1M) diff --git a/include/configs/phycore_imx8mm.h b/include/configs/phycore_imx8mm.h index 987335aa70d..add7835528a 100644 --- a/include/configs/phycore_imx8mm.h +++ b/include/configs/phycore_imx8mm.h @@ -82,8 +82,7 @@ "fi;" /* Link Definitions */ -#define CONFIG_LOADADDR 0x40480000 -#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR +#define CONFIG_SYS_LOAD_ADDR 0x40480000 #define CONFIG_SYS_INIT_RAM_ADDR 0x40000000 #define CONFIG_SYS_INIT_RAM_SIZE SZ_512K diff --git a/include/configs/phycore_imx8mp.h b/include/configs/phycore_imx8mp.h index 95eb707c545..d0338fad051 100644 --- a/include/configs/phycore_imx8mp.h +++ b/include/configs/phycore_imx8mp.h @@ -82,8 +82,7 @@ "fi;" /* Link Definitions */ -#define CONFIG_LOADADDR 0x40480000 -#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR +#define CONFIG_SYS_LOAD_ADDR 0x40480000 #define CONFIG_SYS_INIT_RAM_ADDR 0x40000000 #define CONFIG_SYS_INIT_RAM_SIZE SZ_512K diff --git a/include/configs/pico-imx6.h b/include/configs/pico-imx6.h index 6199f0d72e7..96191708eae 100644 --- a/include/configs/pico-imx6.h +++ b/include/configs/pico-imx6.h @@ -94,11 +94,11 @@ "run base_boot;" \ "fi; \0" \ "base_boot=run findfdt; run finduuid; run distro_bootcmd\0" \ - "kernel_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \ - "pxefile_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \ + "kernel_addr_r=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ + "pxefile_addr_r=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ "ramdisk_addr_r=0x13000000\0" \ "ramdiskaddr=0x13000000\0" \ - "scriptaddr=" __stringify(CONFIG_LOADADDR) "\0" \ + "scriptaddr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ BOOTENV #define BOOT_TARGET_DEVICES(func) \ diff --git a/include/configs/pico-imx6ul.h b/include/configs/pico-imx6ul.h index a0f7a3ddbec..20457e3f24a 100644 --- a/include/configs/pico-imx6ul.h +++ b/include/configs/pico-imx6ul.h @@ -82,11 +82,11 @@ BOOTMENU_ENV \ "fdt_addr=0x83000000\0" \ "fdt_addr_r=0x83000000\0" \ - "kernel_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \ - "pxefile_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \ + "kernel_addr_r=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ + "pxefile_addr_r=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ "ramdisk_addr_r=0x83000000\0" \ "ramdiskaddr=0x83000000\0" \ - "scriptaddr=" __stringify(CONFIG_LOADADDR) "\0" \ + "scriptaddr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ "mmcautodetect=yes\0" \ CONFIG_DFU_ENV_SETTINGS \ "findfdt=" \ @@ -111,7 +111,6 @@ #include #include -#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR #define CONFIG_SYS_HZ 1000 /* Physical Memory Map */ diff --git a/include/configs/pico-imx7d.h b/include/configs/pico-imx7d.h index 0b478cb02f9..2851263dfd6 100644 --- a/include/configs/pico-imx7d.h +++ b/include/configs/pico-imx7d.h @@ -74,7 +74,7 @@ #define CONFIG_EXTRA_ENV_SETTINGS \ "image=zImage\0" \ "splashpos=m,m\0" \ - "splashimage=" __stringify(CONFIG_LOADADDR) "\0" \ + "splashimage=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ "console=ttymxc4\0" \ "fdt_high=0xffffffff\0" \ "initrd_high=0xffffffff\0" \ @@ -82,11 +82,11 @@ "videomode=video=ctfb:x:800,y:480,depth:24,mode:0,pclk:30000,le:46,ri:210,up:22,lo:23,hs:20,vs:10,sync:0,vmode:0\0" \ "fdt_addr=0x83000000\0" \ "fdt_addr_r=0x83000000\0" \ - "kernel_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \ - "pxefile_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \ + "kernel_addr_r=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ + "pxefile_addr_r=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ "ramdisk_addr_r=0x83000000\0" \ "ramdiskaddr=0x83000000\0" \ - "scriptaddr=" __stringify(CONFIG_LOADADDR) "\0" \ + "scriptaddr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ CONFIG_DFU_ENV_SETTINGS \ "findfdt=" \ "if test $fdtfile = ask ; then " \ @@ -110,7 +110,6 @@ #include #include -#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR #define CONFIG_SYS_HZ 1000 /* Physical Memory Map */ diff --git a/include/configs/pico-imx8mq.h b/include/configs/pico-imx8mq.h index a7bfcf8f0e8..e802644fdc6 100644 --- a/include/configs/pico-imx8mq.h +++ b/include/configs/pico-imx8mq.h @@ -116,9 +116,7 @@ "else booti ${loadaddr} - ${fdt_addr}; fi" /* Link Definitions */ -#define CONFIG_LOADADDR 0x40480000 - -#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR +#define CONFIG_SYS_LOAD_ADDR 0x40480000 #define CONFIG_SYS_INIT_RAM_ADDR 0x40000000 #define CONFIG_SYS_INIT_RAM_SIZE 0x80000 diff --git a/include/configs/qemu-ppce500.h b/include/configs/qemu-ppce500.h index b2e1204e0fa..5159ff375a9 100644 --- a/include/configs/qemu-ppce500.h +++ b/include/configs/qemu-ppce500.h @@ -102,9 +102,6 @@ extern unsigned long long get_phys_ccsrbar_addr_early(void); #define CONFIG_BOOTFILE "uImage" #define CONFIG_UBOOTPATH "u-boot.bin" /* U-Boot image on TFTP server*/ -/* default location for tftp and bootm */ -#define CONFIG_LOADADDR 1000000 - #define CONFIG_BOOTCOMMAND \ "test -n \"$qemu_kernel_addr\" && bootm $qemu_kernel_addr - $fdtcontroladdr\0" diff --git a/include/configs/rcar-gen2-common.h b/include/configs/rcar-gen2-common.h index f94e9d89799..2aaeeae5f89 100644 --- a/include/configs/rcar-gen2-common.h +++ b/include/configs/rcar-gen2-common.h @@ -29,7 +29,6 @@ #define CONFIG_SYS_SDRAM_BASE (RCAR_GEN2_SDRAM_BASE) #define CONFIG_SYS_SDRAM_SIZE (RCAR_GEN2_UBOOT_SDRAM_SIZE) #define CONFIG_SYS_LOAD_ADDR 0x50000000 -#define CONFIG_LOADADDR CONFIG_SYS_LOAD_ADDR #define CONFIG_SYS_MONITOR_BASE 0x00000000 #define CONFIG_SYS_MONITOR_LEN (256 * 1024) diff --git a/include/configs/rcar-gen3-common.h b/include/configs/rcar-gen3-common.h index 2bad3a9d1bd..f234455f842 100644 --- a/include/configs/rcar-gen3-common.h +++ b/include/configs/rcar-gen3-common.h @@ -45,7 +45,6 @@ #define CONFIG_SYS_SDRAM_BASE (0x40000000 + DRAM_RSV_SIZE) #define CONFIG_SYS_SDRAM_SIZE (0x80000000u - DRAM_RSV_SIZE) #define CONFIG_SYS_LOAD_ADDR 0x58000000 -#define CONFIG_LOADADDR CONFIG_SYS_LOAD_ADDR #define CONFIG_VERY_BIG_RAM #define CONFIG_MAX_MEM_MAPPED (0x80000000u - DRAM_RSV_SIZE) diff --git a/include/configs/rpi.h b/include/configs/rpi.h index 522b41c02db..b6d5d494903 100644 --- a/include/configs/rpi.h +++ b/include/configs/rpi.h @@ -55,7 +55,6 @@ CONFIG_SYS_SDRAM_SIZE - \ GENERATED_GBL_DATA_SIZE) #define CONFIG_SYS_MALLOC_LEN SZ_4M -#define CONFIG_LOADADDR 0x00200000 #ifdef CONFIG_ARM64 #define CONFIG_SYS_BOOTM_LEN SZ_64M diff --git a/include/configs/smegw01.h b/include/configs/smegw01.h index 6f7b46e49b3..0ab2a2c1088 100644 --- a/include/configs/smegw01.h +++ b/include/configs/smegw01.h @@ -45,7 +45,6 @@ "run mmcboot; " \ "fi; " \ -#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR #define CONFIG_SYS_HZ 1000 /* Physical Memory Map */ diff --git a/include/configs/socfpga_arria10_socdk.h b/include/configs/socfpga_arria10_socdk.h index 645e66e6b09..b0cd79eeb4a 100644 --- a/include/configs/socfpga_arria10_socdk.h +++ b/include/configs/socfpga_arria10_socdk.h @@ -9,8 +9,7 @@ #include /* Booting Linux */ -#define CONFIG_LOADADDR 0x01000000 -#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR +#define CONFIG_SYS_LOAD_ADDR 0x01000000 /* * U-Boot general configurations diff --git a/include/configs/socfpga_arria5_secu1.h b/include/configs/socfpga_arria5_secu1.h index c25d6bd82be..c066eb3c1e7 100644 --- a/include/configs/socfpga_arria5_secu1.h +++ b/include/configs/socfpga_arria5_secu1.h @@ -57,7 +57,6 @@ #define CONFIG_BOOT_RETRY_TIME 45 #define CONFIG_RESET_TO_RETRY -#define CONFIG_LOADADDR 0x01000000 #define CONFIG_SYS_LOAD_ADDR CONFIG_KM_KERNEL_ADDR /* diff --git a/include/configs/socfpga_arria5_socdk.h b/include/configs/socfpga_arria5_socdk.h index af6137aeb16..8d62d1307e5 100644 --- a/include/configs/socfpga_arria5_socdk.h +++ b/include/configs/socfpga_arria5_socdk.h @@ -11,8 +11,7 @@ #define PHYS_SDRAM_1_SIZE 0x40000000 /* 1GiB on SoCDK */ /* Booting Linux */ -#define CONFIG_LOADADDR 0x01000000 -#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR +#define CONFIG_SYS_LOAD_ADDR 0x01000000 /* The rest of the configuration is shared */ #include diff --git a/include/configs/socfpga_cyclone5_socdk.h b/include/configs/socfpga_cyclone5_socdk.h index 028db2a09ec..72ba0c52e99 100644 --- a/include/configs/socfpga_cyclone5_socdk.h +++ b/include/configs/socfpga_cyclone5_socdk.h @@ -11,8 +11,7 @@ #define PHYS_SDRAM_1_SIZE 0x40000000 /* 1GiB on SoCDK */ /* Booting Linux */ -#define CONFIG_LOADADDR 0x01000000 -#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR +#define CONFIG_SYS_LOAD_ADDR 0x01000000 /* The rest of the configuration is shared */ #include diff --git a/include/configs/socfpga_dbm_soc1.h b/include/configs/socfpga_dbm_soc1.h index bffedcb7507..1cd97cc863b 100644 --- a/include/configs/socfpga_dbm_soc1.h +++ b/include/configs/socfpga_dbm_soc1.h @@ -13,8 +13,7 @@ /* Booting Linux */ #define CONFIG_BOOTFILE "fitImage" #define CONFIG_BOOTCOMMAND "run mmc_mmc" -#define CONFIG_LOADADDR 0x01000000 -#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR +#define CONFIG_SYS_LOAD_ADDR 0x01000000 /* Environment is in MMC */ diff --git a/include/configs/socfpga_de0_nano_soc.h b/include/configs/socfpga_de0_nano_soc.h index 21108e34475..36ddd41d867 100644 --- a/include/configs/socfpga_de0_nano_soc.h +++ b/include/configs/socfpga_de0_nano_soc.h @@ -11,8 +11,7 @@ #define PHYS_SDRAM_1_SIZE 0x40000000 /* 1GiB */ /* Booting Linux */ -#define CONFIG_LOADADDR 0x01000000 -#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR +#define CONFIG_SYS_LOAD_ADDR 0x01000000 /* The rest of the configuration is shared */ #include diff --git a/include/configs/socfpga_de10_nano.h b/include/configs/socfpga_de10_nano.h index d85f98fbd46..c200bf960d8 100644 --- a/include/configs/socfpga_de10_nano.h +++ b/include/configs/socfpga_de10_nano.h @@ -11,8 +11,7 @@ #define PHYS_SDRAM_1_SIZE 0x40000000 /* 1GiB */ /* Booting Linux */ -#define CONFIG_LOADADDR 0x01000000 -#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR +#define CONFIG_SYS_LOAD_ADDR 0x01000000 /* The rest of the configuration is shared */ #include diff --git a/include/configs/socfpga_de1_soc.h b/include/configs/socfpga_de1_soc.h index 9919d292dc7..5373b554817 100644 --- a/include/configs/socfpga_de1_soc.h +++ b/include/configs/socfpga_de1_soc.h @@ -11,8 +11,7 @@ #define PHYS_SDRAM_1_SIZE 0x40000000 /* 1GiB */ /* Booting Linux */ -#define CONFIG_LOADADDR 0x01000000 -#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR +#define CONFIG_SYS_LOAD_ADDR 0x01000000 /* The rest of the configuration is shared */ #include diff --git a/include/configs/socfpga_is1.h b/include/configs/socfpga_is1.h index c4da5947f32..c3cbac30272 100644 --- a/include/configs/socfpga_is1.h +++ b/include/configs/socfpga_is1.h @@ -13,8 +13,7 @@ /* Booting Linux */ #define CONFIG_BOOTFILE "zImage" -#define CONFIG_LOADADDR 0x01000000 -#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR +#define CONFIG_SYS_LOAD_ADDR 0x01000000 /* Ethernet on SoC (EMAC) */ #if defined(CONFIG_CMD_NET) diff --git a/include/configs/socfpga_mcvevk.h b/include/configs/socfpga_mcvevk.h index 50c59617037..2c77341e457 100644 --- a/include/configs/socfpga_mcvevk.h +++ b/include/configs/socfpga_mcvevk.h @@ -13,8 +13,7 @@ /* Booting Linux */ #define CONFIG_BOOTFILE "fitImage" #define CONFIG_BOOTCOMMAND "run mmc_mmc" -#define CONFIG_LOADADDR 0x01000000 -#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR +#define CONFIG_SYS_LOAD_ADDR 0x01000000 /* Environment is in MMC */ diff --git a/include/configs/socfpga_soc64_common.h b/include/configs/socfpga_soc64_common.h index aa411b2916b..2e9be25d8b5 100644 --- a/include/configs/socfpga_soc64_common.h +++ b/include/configs/socfpga_soc64_common.h @@ -15,8 +15,7 @@ * U-Boot general configurations */ #define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE -#define CONFIG_LOADADDR 0x2000000 -#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR +#define CONFIG_SYS_LOAD_ADDR 0x2000000 #define CONFIG_REMAKE_ELF /* sysmgr.boot_scratch_cold4 & 5 (64bit) will be used for PSCI_CPU_ON call */ #define CPU_RELEASE_ADDR 0xFFD12210 diff --git a/include/configs/socfpga_sockit.h b/include/configs/socfpga_sockit.h index 972999949a0..b66d2e52b52 100644 --- a/include/configs/socfpga_sockit.h +++ b/include/configs/socfpga_sockit.h @@ -11,8 +11,7 @@ #define PHYS_SDRAM_1_SIZE 0x40000000 /* 1GiB on SoCDK */ /* Booting Linux */ -#define CONFIG_LOADADDR 0x01000000 -#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR +#define CONFIG_SYS_LOAD_ADDR 0x01000000 /* The rest of the configuration is shared */ #include diff --git a/include/configs/socfpga_socrates.h b/include/configs/socfpga_socrates.h index 7faea150a9e..22977a0f1ed 100644 --- a/include/configs/socfpga_socrates.h +++ b/include/configs/socfpga_socrates.h @@ -11,8 +11,7 @@ #define PHYS_SDRAM_1_SIZE 0x40000000 /* 1GiB on SoCrates */ /* Booting Linux */ -#define CONFIG_LOADADDR 0x01000000 -#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR +#define CONFIG_SYS_LOAD_ADDR 0x01000000 /* The rest of the configuration is shared */ #include diff --git a/include/configs/socfpga_sr1500.h b/include/configs/socfpga_sr1500.h index ccaa050ae59..ea406b4c82c 100644 --- a/include/configs/socfpga_sr1500.h +++ b/include/configs/socfpga_sr1500.h @@ -11,8 +11,7 @@ #define PHYS_SDRAM_1_SIZE 0x40000000 /* 1GiB on SR1500 */ /* Booting Linux */ -#define CONFIG_LOADADDR 0x01000000 -#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR +#define CONFIG_SYS_LOAD_ADDR 0x01000000 /* Ethernet on SoC (EMAC) */ #define CONFIG_PHY_INTERFACE_MODE PHY_INTERFACE_MODE_RGMII diff --git a/include/configs/socfpga_vining_fpga.h b/include/configs/socfpga_vining_fpga.h index 06976d804c7..16799826211 100644 --- a/include/configs/socfpga_vining_fpga.h +++ b/include/configs/socfpga_vining_fpga.h @@ -14,8 +14,7 @@ #define CONFIG_BOOTFILE "fitImage" #define CONFIG_BOOTCOMMAND "run selboot" #define CONFIG_SYS_BOOTM_LEN 0x2000000 /* 32 MiB */ -#define CONFIG_LOADADDR 0x01000000 -#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR +#define CONFIG_SYS_LOAD_ADDR 0x01000000 /* Ethernet on SoC (EMAC) */ diff --git a/include/configs/socrates.h b/include/configs/socrates.h index 5480f278c7b..373709f12ae 100644 --- a/include/configs/socrates.h +++ b/include/configs/socrates.h @@ -209,7 +209,6 @@ #define CONFIG_KGDB_BAUDRATE 230400 /* speed to run kgdb serial port*/ #endif -#define CONFIG_LOADADDR 200000 /* default addr for tftp & bootm*/ #define CONFIG_EXTRA_ENV_SETTINGS \ "netdev=eth0\0" \ diff --git a/include/configs/somlabs_visionsom_6ull.h b/include/configs/somlabs_visionsom_6ull.h index 945d0ecc737..3f0bc2ea6ab 100644 --- a/include/configs/somlabs_visionsom_6ull.h +++ b/include/configs/somlabs_visionsom_6ull.h @@ -71,7 +71,6 @@ /* Miscellaneous configurable options */ -#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR #define CONFIG_SYS_HZ 1000 /* Physical Memory Map */ diff --git a/include/configs/stih410-b2260.h b/include/configs/stih410-b2260.h index 33b34ee0cd3..83fa1a4e5bb 100644 --- a/include/configs/stih410-b2260.h +++ b/include/configs/stih410-b2260.h @@ -25,7 +25,6 @@ */ #define CONFIG_SYS_BOOTMAPSZ SZ_256M -#define CONFIG_LOADADDR CONFIG_SYS_LOAD_ADDR #define CONFIG_SYS_BOOTM_LEN SZ_16M #define BOOT_TARGET_DEVICES(func) \ diff --git a/include/configs/stm32f429-discovery.h b/include/configs/stm32f429-discovery.h index 9d029fbcc6f..64d22cdafc3 100644 --- a/include/configs/stm32f429-discovery.h +++ b/include/configs/stm32f429-discovery.h @@ -15,7 +15,6 @@ * Configuration of the external SDRAM memory */ #define CONFIG_SYS_LOAD_ADDR 0x90400000 -#define CONFIG_LOADADDR 0x90400000 #define CONFIG_SYS_MAX_FLASH_SECT 12 #define CONFIG_SYS_MAX_FLASH_BANKS 2 diff --git a/include/configs/stm32f429-evaluation.h b/include/configs/stm32f429-evaluation.h index fefdb2dd152..45686febfd7 100644 --- a/include/configs/stm32f429-evaluation.h +++ b/include/configs/stm32f429-evaluation.h @@ -20,7 +20,6 @@ * Configuration of the external SDRAM memory */ #define CONFIG_SYS_LOAD_ADDR 0x00400000 -#define CONFIG_LOADADDR 0x00400000 #define CONFIG_SYS_MAX_FLASH_SECT 12 #define CONFIG_SYS_MAX_FLASH_BANKS 2 diff --git a/include/configs/stm32f469-discovery.h b/include/configs/stm32f469-discovery.h index ba9f05a61b4..6a0199e79da 100644 --- a/include/configs/stm32f469-discovery.h +++ b/include/configs/stm32f469-discovery.h @@ -20,7 +20,6 @@ * Configuration of the external SDRAM memory */ #define CONFIG_SYS_LOAD_ADDR 0x00400000 -#define CONFIG_LOADADDR 0x00400000 #define CONFIG_SYS_MAX_FLASH_SECT 12 #define CONFIG_SYS_MAX_FLASH_BANKS 2 diff --git a/include/configs/stm32f746-disco.h b/include/configs/stm32f746-disco.h index 08d050adfa5..b28e371e68b 100644 --- a/include/configs/stm32f746-disco.h +++ b/include/configs/stm32f746-disco.h @@ -19,7 +19,6 @@ #define CONFIG_SYS_LOAD_ADDR 0x08008000 #else #define CONFIG_SYS_LOAD_ADDR 0xC0400000 -#define CONFIG_LOADADDR 0xC0400000 #endif /* diff --git a/include/configs/stm32h743-disco.h b/include/configs/stm32h743-disco.h index 6e10dbdfe94..28a4c4da9f4 100644 --- a/include/configs/stm32h743-disco.h +++ b/include/configs/stm32h743-disco.h @@ -20,7 +20,6 @@ * Configuration of the external SDRAM memory */ #define CONFIG_SYS_LOAD_ADDR 0xD0400000 -#define CONFIG_LOADADDR 0xD0400000 #define CONFIG_SYS_HZ_CLOCK 1000000 diff --git a/include/configs/stm32h743-eval.h b/include/configs/stm32h743-eval.h index 268d39c7ad6..57aba247237 100644 --- a/include/configs/stm32h743-eval.h +++ b/include/configs/stm32h743-eval.h @@ -20,7 +20,6 @@ * Configuration of the external SDRAM memory */ #define CONFIG_SYS_LOAD_ADDR 0xD0400000 -#define CONFIG_LOADADDR 0xD0400000 #define CONFIG_SYS_HZ_CLOCK 1000000 diff --git a/include/configs/stm32h750-art-pi.h b/include/configs/stm32h750-art-pi.h index 3fd54611677..1f84724ee44 100644 --- a/include/configs/stm32h750-art-pi.h +++ b/include/configs/stm32h750-art-pi.h @@ -20,7 +20,6 @@ * Configuration of the external SDRAM memory */ #define CONFIG_SYS_LOAD_ADDR 0xC1800000 -#define CONFIG_LOADADDR 0xC1800000 #define CONFIG_SYS_HZ_CLOCK 1000000 diff --git a/include/configs/stm32mp1.h b/include/configs/stm32mp1.h index b372838be82..10771ab2f37 100644 --- a/include/configs/stm32mp1.h +++ b/include/configs/stm32mp1.h @@ -30,8 +30,7 @@ /* * default load address used for command tftp, bootm , loadb, ... */ -#define CONFIG_LOADADDR 0xc2000000 -#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR +#define CONFIG_SYS_LOAD_ADDR 0xc2000000 /* ATAGs */ #define CONFIG_CMDLINE_TAG diff --git a/include/configs/tb100.h b/include/configs/tb100.h index f42b0df1cf6..d9a9f2a1fc1 100644 --- a/include/configs/tb100.h +++ b/include/configs/tb100.h @@ -51,7 +51,6 @@ * Environment configuration */ #define CONFIG_BOOTFILE "uImage" -#define CONFIG_LOADADDR CONFIG_SYS_LOAD_ADDR /* * Console configuration diff --git a/include/configs/tegra-common-post.h b/include/configs/tegra-common-post.h index 69adf6462ac..fe2d6886558 100644 --- a/include/configs/tegra-common-post.h +++ b/include/configs/tegra-common-post.h @@ -81,8 +81,6 @@ #define BOARD_EXTRA_ENV_SETTINGS #endif -#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR - #ifndef CONFIG_CHROMEOS_EXTRA_ENV_SETTINGS #define CONFIG_CHROMEOS_EXTRA_ENV_SETTINGS #endif diff --git a/include/configs/tegra114-common.h b/include/configs/tegra114-common.h index 9d751b67404..c3418b6e4ca 100644 --- a/include/configs/tegra114-common.h +++ b/include/configs/tegra114-common.h @@ -45,11 +45,11 @@ * ramdisk_addr_r simply shouldn't overlap anything else. Choosing 49M allows * for the FDT/DTB to be up to 1M, which is hopefully plenty. */ -#define CONFIG_LOADADDR 0x81000000 +#define CONFIG_SYS_LOAD_ADDR 0x81000000 #define MEM_LAYOUT_ENV_SETTINGS \ "scriptaddr=0x90000000\0" \ "pxefile_addr_r=0x90100000\0" \ - "kernel_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \ + "kernel_addr_r=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ "fdtfile=" FDTFILE "\0" \ "fdt_addr_r=0x83000000\0" \ "ramdisk_addr_r=0x83100000\0" diff --git a/include/configs/tegra124-common.h b/include/configs/tegra124-common.h index 0eb8f928091..4d2ea182e60 100644 --- a/include/configs/tegra124-common.h +++ b/include/configs/tegra124-common.h @@ -47,11 +47,11 @@ * ramdisk_addr_r simply shouldn't overlap anything else. Choosing 49M allows * for the FDT/DTB to be up to 1M, which is hopefully plenty. */ -#define CONFIG_LOADADDR 0x81000000 +#define CONFIG_SYS_LOAD_ADDR 0x81000000 #define MEM_LAYOUT_ENV_SETTINGS \ "scriptaddr=0x90000000\0" \ "pxefile_addr_r=0x90100000\0" \ - "kernel_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \ + "kernel_addr_r=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ "fdtfile=" FDTFILE "\0" \ "fdt_addr_r=0x83000000\0" \ "ramdisk_addr_r=0x83100000\0" diff --git a/include/configs/tegra186-common.h b/include/configs/tegra186-common.h index dbf42203de2..59eb4fe703c 100644 --- a/include/configs/tegra186-common.h +++ b/include/configs/tegra186-common.h @@ -47,11 +47,11 @@ * ramdisk_addr_r simply shouldn't overlap anything else. Choosing 33M allows * for the FDT/DTB to be up to 1M, which is hopefully plenty. */ -#define CONFIG_LOADADDR 0x80080000 +#define CONFIG_SYS_LOAD_ADDR 0x80080000 #define MEM_LAYOUT_ENV_SETTINGS \ "scriptaddr=0x90000000\0" \ "pxefile_addr_r=0x90100000\0" \ - "kernel_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \ + "kernel_addr_r=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ "fdt_addr_r=0x82000000\0" \ "ramdisk_addr_r=0x82100000\0" diff --git a/include/configs/tegra20-common.h b/include/configs/tegra20-common.h index fdd89969554..d61962a8af8 100644 --- a/include/configs/tegra20-common.h +++ b/include/configs/tegra20-common.h @@ -46,11 +46,11 @@ * ramdisk_addr_r simply shouldn't overlap anything else. Choosing 49M allows * for the FDT/DTB to be up to 1M, which is hopefully plenty. */ -#define CONFIG_LOADADDR 0x01000000 +#define CONFIG_SYS_LOAD_ADDR 0x01000000 #define MEM_LAYOUT_ENV_SETTINGS \ "scriptaddr=0x10000000\0" \ "pxefile_addr_r=0x10100000\0" \ - "kernel_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \ + "kernel_addr_r=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ "fdtfile=" FDTFILE "\0" \ "fdt_addr_r=0x03000000\0" \ "ramdisk_addr_r=0x03100000\0" diff --git a/include/configs/tegra210-common.h b/include/configs/tegra210-common.h index 2817b1dac79..4f631001a21 100644 --- a/include/configs/tegra210-common.h +++ b/include/configs/tegra210-common.h @@ -38,11 +38,11 @@ * ramdisk_addr_r simply shouldn't overlap anything else. Choosing 33M allows * for the FDT/DTB to be up to 1M, which is hopefully plenty. */ -#define CONFIG_LOADADDR 0x80080000 +#define CONFIG_SYS_LOAD_ADDR 0x80080000 #define MEM_LAYOUT_ENV_SETTINGS \ "scriptaddr=0x90000000\0" \ "pxefile_addr_r=0x90100000\0" \ - "kernel_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \ + "kernel_addr_r=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ "fdtfile=" FDTFILE "\0" \ "fdt_addr_r=0x83000000\0" \ "ramdisk_addr_r=0x83200000\0" diff --git a/include/configs/tegra30-common.h b/include/configs/tegra30-common.h index 6c5dc24b266..2beca3b1666 100644 --- a/include/configs/tegra30-common.h +++ b/include/configs/tegra30-common.h @@ -42,11 +42,11 @@ * ramdisk_addr_r simply shouldn't overlap anything else. Choosing 49M allows * for the FDT/DTB to be up to 1M, which is hopefully plenty. */ -#define CONFIG_LOADADDR 0x81000000 +#define CONFIG_SYS_LOAD_ADDR 0x81000000 #define MEM_LAYOUT_ENV_SETTINGS \ "scriptaddr=0x90000000\0" \ "pxefile_addr_r=0x90100000\0" \ - "kernel_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \ + "kernel_addr_r=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ "fdtfile=" FDTFILE "\0" \ "fdt_addr_r=0x83000000\0" \ "ramdisk_addr_r=0x83100000\0" diff --git a/include/configs/tplink_wdr4300.h b/include/configs/tplink_wdr4300.h index f25f6dccb5c..8ff57fb91b7 100644 --- a/include/configs/tplink_wdr4300.h +++ b/include/configs/tplink_wdr4300.h @@ -17,7 +17,6 @@ #define CONFIG_SYS_SDRAM_BASE 0xa0000000 #define CONFIG_SYS_LOAD_ADDR 0xa1000000 -#define CONFIG_LOADADDR CONFIG_SYS_LOAD_ADDR #define CONFIG_SYS_INIT_RAM_ADDR 0xbd000000 #define CONFIG_SYS_INIT_RAM_SIZE 0x8000 diff --git a/include/configs/udoo.h b/include/configs/udoo.h index 298369373ab..ed8f31b921a 100644 --- a/include/configs/udoo.h +++ b/include/configs/udoo.h @@ -43,10 +43,10 @@ "setenv fdtfile imx6dl-udoo.dtb; fi; " \ "if test ${fdtfile} = undefined; then " \ "echo WARNING: Could not determine dtb to use; fi\0" \ - "kernel_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \ - "pxefile_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \ + "kernel_addr_r=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ + "pxefile_addr_r=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ "ramdisk_addr_r=0x13000000\0" \ - "scriptaddr=" __stringify(CONFIG_LOADADDR) "\0" \ + "scriptaddr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ BOOTENV #define BOOT_TARGET_DEVICES(func) \ diff --git a/include/configs/udoo_neo.h b/include/configs/udoo_neo.h index b76d924ea8d..a4b8514c4e6 100644 --- a/include/configs/udoo_neo.h +++ b/include/configs/udoo_neo.h @@ -45,10 +45,10 @@ "setenv fdtfile imx6sx-udoo-neo-extended.dtb; fi; " \ "if test $fdtfile = UNDEFINED; then " \ "echo WARNING: Could not determine dtb to use; fi\0" \ - "kernel_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \ - "pxefile_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \ + "kernel_addr_r=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ + "pxefile_addr_r=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ "ramdisk_addr_r=0x84000000\0" \ - "scriptaddr=" __stringify(CONFIG_LOADADDR) "\0" \ + "scriptaddr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ BOOTENV #define BOOT_TARGET_DEVICES(func) \ diff --git a/include/configs/usbarmory.h b/include/configs/usbarmory.h index a93a71850a8..381b5d63542 100644 --- a/include/configs/usbarmory.h +++ b/include/configs/usbarmory.h @@ -35,8 +35,7 @@ #define CONFIG_FSL_IIM /* U-Boot memory offsets */ -#define CONFIG_LOADADDR 0x72000000 -#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR +#define CONFIG_SYS_LOAD_ADDR 0x72000000 /* Linux boot */ #define CONFIG_HOSTNAME "usbarmory" diff --git a/include/configs/verdin-imx8mm.h b/include/configs/verdin-imx8mm.h index bd26a40e854..d395cf6377b 100644 --- a/include/configs/verdin-imx8mm.h +++ b/include/configs/verdin-imx8mm.h @@ -37,8 +37,7 @@ "ramdisk_addr_r=0x46400000\0" \ "scriptaddr=0x46000000\0" -#define CONFIG_LOADADDR 0x40480000 -#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR +#define CONFIG_SYS_LOAD_ADDR 0x40480000 /* Enable Distro Boot */ #ifndef CONFIG_SPL_BUILD diff --git a/include/configs/wandboard.h b/include/configs/wandboard.h index bd64893fc77..95a15cb2df0 100644 --- a/include/configs/wandboard.h +++ b/include/configs/wandboard.h @@ -45,7 +45,7 @@ #define CONFIG_EXTRA_ENV_SETTINGS \ "console=ttymxc0\0" \ "splashpos=m,m\0" \ - "splashimage=" __stringify(CONFIG_LOADADDR) "\0" \ + "splashimage=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ "fdtfile=undefined\0" \ "fdt_high=0xffffffff\0" \ "initrd_high=0xffffffff\0" \ @@ -85,11 +85,11 @@ "setenv fdtfile imx6dl-wandboard-revb1.dtb; fi; " \ "if test $fdtfile = undefined; then " \ "echo WARNING: Could not determine dtb to use; fi; \0" \ - "kernel_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \ - "pxefile_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \ + "kernel_addr_r=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ + "pxefile_addr_r=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ "ramdisk_addr_r=0x13000000\0" \ "ramdiskaddr=0x13000000\0" \ - "scriptaddr=" __stringify(CONFIG_LOADADDR) "\0" \ + "scriptaddr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ BOOTENV #define BOOT_TARGET_DEVICES(func) \ diff --git a/include/configs/warp7.h b/include/configs/warp7.h index 8ed7d1db555..c5e3c4dae32 100644 --- a/include/configs/warp7.h +++ b/include/configs/warp7.h @@ -107,7 +107,6 @@ "fi; " \ "fi" -#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR #define CONFIG_SYS_HZ 1000 /* Physical Memory Map */ diff --git a/include/configs/work_92105.h b/include/configs/work_92105.h index 2255958db03..e7472ed3ecf 100644 --- a/include/configs/work_92105.h +++ b/include/configs/work_92105.h @@ -92,7 +92,6 @@ #define CONFIG_INITRD_TAG #define CONFIG_BOOTFILE "uImage" -#define CONFIG_LOADADDR 0x80008000 /* * SPL diff --git a/include/configs/x86-common.h b/include/configs/x86-common.h index f6ff0c6d21f..826aa1d4747 100644 --- a/include/configs/x86-common.h +++ b/include/configs/x86-common.h @@ -82,7 +82,6 @@ #define CONFIG_ROOTPATH "/opt/nfsroot" #define CONFIG_HOSTNAME "x86" #define CONFIG_BOOTFILE "bzImage" -#define CONFIG_LOADADDR 0x1000000 #define CONFIG_RAMDISK_ADDR 0x4000000 #if defined(CONFIG_GENERATE_ACPI_TABLE) || defined(CONFIG_EFI_STUB) #define CONFIG_OTHBOOTARGS "othbootargs=\0" diff --git a/include/configs/xea.h b/include/configs/xea.h index 1207f75017b..78ffcefd338 100644 --- a/include/configs/xea.h +++ b/include/configs/xea.h @@ -43,8 +43,7 @@ /* Booting Linux */ #define CONFIG_BOOTFILE "uImage" #define CONFIG_BOOTCOMMAND "run ${bootpri} ; run ${bootsec}" -#define CONFIG_LOADADDR 0x42000000 -#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR +#define CONFIG_SYS_LOAD_ADDR 0x42000000 /* Extra Environment */ #define CONFIG_HOSTNAME "xea" diff --git a/include/configs/xpress.h b/include/configs/xpress.h index 495ed2ff541..01c3ee3ddb3 100644 --- a/include/configs/xpress.h +++ b/include/configs/xpress.h @@ -23,7 +23,6 @@ /* Miscellaneous configurable options */ -#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR #define CONFIG_SYS_HZ 1000 /* Physical Memory Map */ diff --git a/include/env_default.h b/include/env_default.h index 1ddd64ba8ff..66e203eb6e4 100644 --- a/include/env_default.h +++ b/include/env_default.h @@ -82,8 +82,8 @@ const uchar default_environment[] = { #ifdef CONFIG_BOOTFILE "bootfile=" CONFIG_BOOTFILE "\0" #endif -#ifdef CONFIG_LOADADDR - "loadaddr=" __stringify(CONFIG_LOADADDR) "\0" +#ifdef CONFIG_SYS_LOAD_ADDR + "loadaddr=" __stringify(CONFIG_SYS_LOAD_ADDR)"\0" #endif #if defined(CONFIG_PCI_BOOTDELAY) && (CONFIG_PCI_BOOTDELAY > 0) "pcidelay=" __stringify(CONFIG_PCI_BOOTDELAY)"\0" -- cgit v1.2.3 From 49c8ef0e45a91ec894ef15e7d043dafe8f1c5efd Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Mon, 23 Aug 2021 10:25:31 -0400 Subject: Convert CONFIG_SYS_LOAD_ADDR to Kconfig Now that we have consistent usage, migrate this symbol to Kconfig. Signed-off-by: Tom Rini Reviewed-by: Rick Chen --- include/configs/10m50_devboard.h | 4 ---- include/configs/3c120_devboard.h | 4 ---- include/configs/M5208EVBE.h | 2 -- include/configs/M5235EVB.h | 2 -- include/configs/M5249EVB.h | 2 -- include/configs/M5253DEMO.h | 2 -- include/configs/M5272C3.h | 1 - include/configs/M5275EVB.h | 2 -- include/configs/M5282EVB.h | 2 -- include/configs/M53017EVB.h | 2 -- include/configs/M5329EVB.h | 2 -- include/configs/M5373EVB.h | 2 -- include/configs/MCR3000.h | 2 -- include/configs/MPC8349EMDS.h | 1 - include/configs/MPC8349EMDS_SDRAM.h | 1 - include/configs/MPC837XERDB.h | 1 - include/configs/MPC8540ADS.h | 1 - include/configs/MPC8548CDS.h | 1 - include/configs/MPC8560ADS.h | 1 - include/configs/P1010RDB.h | 1 - include/configs/P2041RDB.h | 1 - include/configs/SBx81LIFKW.h | 2 -- include/configs/SBx81LIFXCAT.h | 2 -- include/configs/T102xRDB.h | 1 - include/configs/T104xRDB.h | 1 - include/configs/T208xQDS.h | 1 - include/configs/T208xRDB.h | 1 - include/configs/T4240RDB.h | 1 - include/configs/UCP1020.h | 1 - include/configs/adp-ae3xx.h | 8 -------- include/configs/adp-ag101p.h | 8 -------- include/configs/amcore.h | 4 ---- include/configs/ap121.h | 1 - include/configs/ap143.h | 1 - include/configs/ap152.h | 1 - include/configs/apalis-imx8.h | 1 - include/configs/apalis-imx8x.h | 1 - include/configs/apalis_imx6.h | 1 - include/configs/armadillo-800eva.h | 2 -- include/configs/astro_mcf5373l.h | 3 --- include/configs/at91sam9260ek.h | 2 -- include/configs/at91sam9261ek.h | 2 -- include/configs/at91sam9263ek.h | 2 -- include/configs/at91sam9m10g45ek.h | 2 -- include/configs/at91sam9n12ek.h | 3 --- include/configs/at91sam9rlek.h | 4 ---- include/configs/at91sam9x5ek.h | 2 -- include/configs/ax25-ae350.h | 14 -------------- include/configs/axs10x.h | 1 - include/configs/bcm_ns3.h | 1 - include/configs/bcmstb.h | 1 - include/configs/bg0900.h | 1 - include/configs/bk4r1.h | 1 - include/configs/bmips_bcm3380.h | 1 - include/configs/bmips_bcm6318.h | 1 - include/configs/bmips_bcm63268.h | 1 - include/configs/bmips_bcm6328.h | 1 - include/configs/bmips_bcm6338.h | 1 - include/configs/bmips_bcm6348.h | 1 - include/configs/bmips_bcm6358.h | 1 - include/configs/bmips_bcm6362.h | 1 - include/configs/bmips_bcm6368.h | 1 - include/configs/bmips_bcm6838.h | 1 - include/configs/boston.h | 2 -- include/configs/broadcom_bcm963158.h | 1 - include/configs/broadcom_bcm968360bg.h | 1 - include/configs/broadcom_bcm968580xref.h | 1 - include/configs/brppt2.h | 2 -- include/configs/bur_am335x_common.h | 5 ----- include/configs/capricorn-common.h | 1 - include/configs/cgtqmx8.h | 1 - include/configs/ci20.h | 1 - include/configs/cobra5272.h | 3 --- include/configs/colibri-imx8x.h | 1 - include/configs/colibri_imx6.h | 2 -- include/configs/colibri_pxa270.h | 1 - include/configs/colibri_vf.h | 1 - include/configs/corenet_ds.h | 1 - include/configs/corvus.h | 2 -- include/configs/da850evm.h | 1 - include/configs/devkit3250.h | 2 -- include/configs/dh_imx6.h | 2 -- include/configs/dragonboard410c.h | 1 - include/configs/dragonboard820c.h | 1 - include/configs/durian.h | 2 -- include/configs/ea-lpc3250devkitv2.h | 1 - include/configs/eb_cpu5282.h | 2 -- include/configs/edison.h | 1 - include/configs/edminiv2.h | 1 - include/configs/emsdp.h | 1 - include/configs/ethernut5.h | 1 - include/configs/evb_ast2500.h | 3 --- include/configs/evb_ast2600.h | 3 --- include/configs/exynos5-common.h | 6 ------ include/configs/exynos7420-common.h | 2 -- include/configs/flea3.h | 2 -- include/configs/gardena-smart-gateway-at91sam.h | 2 -- include/configs/gardena-smart-gateway-mt7688.h | 2 -- include/configs/gazerbeam.h | 1 - include/configs/ge_bx50v3.h | 4 ---- include/configs/grpeach.h | 2 -- include/configs/highbank.h | 1 - include/configs/hikey.h | 2 -- include/configs/hikey960.h | 2 -- include/configs/hsdk-4xd.h | 1 - include/configs/hsdk.h | 1 - include/configs/ids8313.h | 1 - include/configs/imgtec_xilfpga.h | 1 - include/configs/imx27lite-common.h | 2 -- include/configs/imx8mm-cl-iot-gate.h | 1 - include/configs/imx8mm_beacon.h | 1 - include/configs/imx8mm_evk.h | 1 - include/configs/imx8mm_icore_mx8mm.h | 1 - include/configs/imx8mm_venice.h | 1 - include/configs/imx8mn_beacon.h | 1 - include/configs/imx8mn_evk.h | 1 - include/configs/imx8mp_evk.h | 1 - include/configs/imx8mq_cm.h | 1 - include/configs/imx8mq_evk.h | 1 - include/configs/imx8mq_phanbell.h | 1 - include/configs/imx8qm_mek.h | 1 - include/configs/imx8qm_rom7720.h | 1 - include/configs/imx8qxp_mek.h | 1 - include/configs/imx8ulp_evk.h | 1 - include/configs/imxrt1020-evk.h | 6 ------ include/configs/imxrt1050-evk.h | 6 ------ include/configs/integrator-common.h | 1 - include/configs/iot_devkit.h | 1 - include/configs/km/km-powerpc.h | 2 -- include/configs/km/km_arm.h | 2 -- include/configs/km/pg-wcom-ls102xa.h | 2 -- include/configs/kmcent2.h | 2 -- include/configs/kontron_sl28.h | 1 - include/configs/kp_imx53.h | 1 - include/configs/kp_imx6q_tpc.h | 1 - include/configs/kzm9g.h | 1 - include/configs/legoev3.h | 1 - include/configs/linkit-smart-7688.h | 2 -- include/configs/ls1012a_common.h | 1 - include/configs/ls1021aiot.h | 2 -- include/configs/ls1021aqds.h | 2 -- include/configs/ls1021atsn.h | 2 -- include/configs/ls1021atwr.h | 2 -- include/configs/ls1028a_common.h | 1 - include/configs/ls1043a_common.h | 1 - include/configs/ls1046a_common.h | 1 - include/configs/ls1088a_common.h | 1 - include/configs/ls2080a_common.h | 1 - include/configs/lx2160a_common.h | 1 - include/configs/m53menlo.h | 1 - include/configs/malta.h | 2 -- include/configs/meesc.h | 2 -- include/configs/meson64.h | 1 - include/configs/microblaze-generic.h | 2 -- include/configs/microchip_mpfs_icicle.h | 2 -- include/configs/mt7620.h | 1 - include/configs/mt7622.h | 3 --- include/configs/mt7623.h | 3 --- include/configs/mt7628.h | 1 - include/configs/mt7629.h | 1 - include/configs/mt8183.h | 1 - include/configs/mt8512.h | 2 -- include/configs/mt8516.h | 1 - include/configs/mt8518.h | 2 -- include/configs/mv-common.h | 1 - include/configs/mvebu_armada-37xx.h | 1 - include/configs/mvebu_armada-8k.h | 1 - include/configs/mx23_olinuxino.h | 1 - include/configs/mx23evk.h | 1 - include/configs/mx28evk.h | 1 - include/configs/mx51evk.h | 2 -- include/configs/mx53cx9020.h | 2 -- include/configs/mx53loco.h | 2 -- include/configs/mx53ppd.h | 2 -- include/configs/mx6_common.h | 9 --------- include/configs/mx7_common.h | 2 -- include/configs/mx7ulp_com.h | 2 -- include/configs/mx7ulp_evk.h | 2 -- include/configs/nokia_rx51.h | 3 --- include/configs/nsim.h | 1 - include/configs/nyan-big.h | 3 --- include/configs/octeon_common.h | 2 -- include/configs/octeontx2_common.h | 2 -- include/configs/octeontx_common.h | 2 -- include/configs/odroid.h | 3 --- include/configs/omapl138_lcdk.h | 1 - include/configs/openpiton-riscv64.h | 1 - include/configs/origen.h | 3 --- include/configs/owl-common.h | 1 - include/configs/p1_p2_rdb_pc.h | 1 - include/configs/pcm052.h | 2 -- include/configs/phycore_imx8mm.h | 1 - include/configs/phycore_imx8mp.h | 1 - include/configs/pic32mzdask.h | 1 - include/configs/pico-imx8mq.h | 1 - include/configs/pm9261.h | 2 -- include/configs/pm9263.h | 2 -- include/configs/pm9g45.h | 2 -- include/configs/poplar.h | 1 - include/configs/presidio_asic.h | 1 - include/configs/px30_common.h | 1 - include/configs/qemu-arm.h | 1 - include/configs/qemu-ppce500.h | 1 - include/configs/qemu-riscv.h | 2 -- include/configs/r2dplus.h | 1 - include/configs/rcar-gen2-common.h | 1 - include/configs/rcar-gen3-common.h | 1 - include/configs/rk3036_common.h | 1 - include/configs/rk3128_common.h | 1 - include/configs/rk3188_common.h | 1 - include/configs/rk322x_common.h | 1 - include/configs/rk3288_common.h | 1 - include/configs/rk3308_common.h | 1 - include/configs/rk3328_common.h | 1 - include/configs/rk3368_common.h | 1 - include/configs/rk3399_common.h | 1 - include/configs/rk3568_common.h | 1 - include/configs/rpi.h | 1 - include/configs/rv1108_common.h | 1 - include/configs/s5p4418_nanopi2.h | 1 - include/configs/s5p_goni.h | 2 -- include/configs/s5pc210_universal.h | 3 --- include/configs/sam9x60ek.h | 2 -- include/configs/sama5d27_som1_ek.h | 2 -- include/configs/sama5d27_wlsom1_ek.h | 2 -- include/configs/sama5d2_icp.h | 2 -- include/configs/sama5d2_ptc_ek.h | 2 -- include/configs/sama5d2_xplained.h | 2 -- include/configs/sama5d3_xplained.h | 2 -- include/configs/sama5d3xek.h | 2 -- include/configs/sama5d4_xplained.h | 2 -- include/configs/sama5d4ek.h | 2 -- include/configs/sama7g5ek.h | 2 -- include/configs/sandbox.h | 2 -- include/configs/siemens-am33x-common.h | 2 -- include/configs/sifive-unleashed.h | 2 -- include/configs/sifive-unmatched.h | 2 -- include/configs/sipeed-maix.h | 1 - include/configs/smartweb.h | 6 ------ include/configs/smdkc100.h | 2 -- include/configs/smdkv310.h | 3 --- include/configs/snapper9260.h | 1 - include/configs/snapper9g45.h | 1 - include/configs/sniper.h | 2 -- include/configs/socfpga_arria10_socdk.h | 3 --- include/configs/socfpga_arria5_secu1.h | 2 -- include/configs/socfpga_arria5_socdk.h | 3 --- include/configs/socfpga_cyclone5_socdk.h | 3 --- include/configs/socfpga_dbm_soc1.h | 1 - include/configs/socfpga_de0_nano_soc.h | 3 --- include/configs/socfpga_de10_nano.h | 3 --- include/configs/socfpga_de1_soc.h | 3 --- include/configs/socfpga_is1.h | 1 - include/configs/socfpga_mcvevk.h | 1 - include/configs/socfpga_soc64_common.h | 1 - include/configs/socfpga_sockit.h | 3 --- include/configs/socfpga_socrates.h | 3 --- include/configs/socfpga_sr1500.h | 3 --- include/configs/socfpga_vining_fpga.h | 1 - include/configs/socrates.h | 1 - include/configs/stemmy.h | 1 - include/configs/stih410-b2260.h | 1 - include/configs/stm32f429-discovery.h | 1 - include/configs/stm32f429-evaluation.h | 1 - include/configs/stm32f469-discovery.h | 1 - include/configs/stm32f746-disco.h | 6 ------ include/configs/stm32h743-disco.h | 5 ----- include/configs/stm32h743-eval.h | 5 ----- include/configs/stm32h750-art-pi.h | 5 ----- include/configs/stm32mp1.h | 5 ----- include/configs/stmark2.h | 1 - include/configs/stv0991.h | 1 - include/configs/sunxi-common.h | 2 -- include/configs/synquacer.h | 1 - include/configs/tam3517-common.h | 4 ---- include/configs/taurus.h | 3 --- include/configs/tb100.h | 1 - include/configs/tegra114-common.h | 1 - include/configs/tegra124-common.h | 1 - include/configs/tegra186-common.h | 1 - include/configs/tegra20-common.h | 1 - include/configs/tegra210-common.h | 1 - include/configs/tegra30-common.h | 1 - include/configs/thunderx_88xx.h | 1 - include/configs/ti814x_evm.h | 2 -- include/configs/ti_armv7_common.h | 8 -------- include/configs/total_compute.h | 1 - include/configs/tplink_wdr4300.h | 1 - include/configs/trats.h | 3 --- include/configs/trats2.h | 2 -- include/configs/turris_mox.h | 1 - include/configs/uniphier.h | 1 - include/configs/usb_a9263.h | 2 -- include/configs/usbarmory.h | 3 --- include/configs/vcoreiii.h | 1 - include/configs/verdin-imx8mm.h | 2 -- include/configs/vexpress_aemv8a.h | 1 - include/configs/vexpress_common.h | 1 - include/configs/vf610twr.h | 3 --- include/configs/vinco.h | 2 -- include/configs/vocore2.h | 2 -- include/configs/work_92105.h | 2 -- include/configs/x530.h | 1 - include/configs/x86-common.h | 2 -- include/configs/xea.h | 1 - include/configs/xenguest_arm64.h | 1 - include/configs/xilinx_versal.h | 1 - include/configs/xilinx_zynqmp.h | 1 - include/configs/xilinx_zynqmp_r5.h | 1 - include/configs/xtfpga.h | 3 --- include/configs/zmx25.h | 2 -- include/configs/zynq-common.h | 1 - 312 files changed, 564 deletions(-) (limited to 'include') diff --git a/include/configs/10m50_devboard.h b/include/configs/10m50_devboard.h index d8ed2278c62..e3ac6fe378e 100644 --- a/include/configs/10m50_devboard.h +++ b/include/configs/10m50_devboard.h @@ -57,9 +57,5 @@ * (which is common practice). */ -/* - * MISC - */ -#define CONFIG_SYS_LOAD_ADDR 0xcc000000 /* Half of RAM */ #endif /* __CONFIG_H */ diff --git a/include/configs/3c120_devboard.h b/include/configs/3c120_devboard.h index b9a17adb128..74ecd94f797 100644 --- a/include/configs/3c120_devboard.h +++ b/include/configs/3c120_devboard.h @@ -57,9 +57,5 @@ * (which is common practice). */ -/* - * MISC - */ -#define CONFIG_SYS_LOAD_ADDR 0xd4000000 /* Half of RAM */ #endif /* __CONFIG_H */ diff --git a/include/configs/M5208EVBE.h b/include/configs/M5208EVBE.h index 0a80dda6b5d..d75946b022c 100644 --- a/include/configs/M5208EVBE.h +++ b/include/configs/M5208EVBE.h @@ -66,8 +66,6 @@ #define CONFIG_PRAM 512 /* 512 KB */ -#define CONFIG_SYS_LOAD_ADDR 0x40010000 - #define CONFIG_SYS_CLK 166666666 /* CPU Core Clock */ #define CONFIG_SYS_PLL_ODR 0x36 #define CONFIG_SYS_PLL_FDR 0x7D diff --git a/include/configs/M5235EVB.h b/include/configs/M5235EVB.h index 5953141be5d..b0e6ed4e1d5 100644 --- a/include/configs/M5235EVB.h +++ b/include/configs/M5235EVB.h @@ -78,8 +78,6 @@ #define CONFIG_PRAM 512 /* 512 KB */ -#define CONFIG_SYS_LOAD_ADDR (CONFIG_SYS_SDRAM_BASE+0x20000) - #define CONFIG_SYS_CLK 75000000 #define CONFIG_SYS_CPU_CLK CONFIG_SYS_CLK * 2 diff --git a/include/configs/M5249EVB.h b/include/configs/M5249EVB.h index 1a1a1107654..a8734697c1a 100644 --- a/include/configs/M5249EVB.h +++ b/include/configs/M5249EVB.h @@ -31,8 +31,6 @@ */ #undef CONFIG_BOOTP_BOOTFILESIZE -#define CONFIG_SYS_LOAD_ADDR 0x200000 /* default load address */ - /* * Clock configuration: enable only one of the following options */ diff --git a/include/configs/M5253DEMO.h b/include/configs/M5253DEMO.h index 6f0e794bad8..e1f54571d24 100644 --- a/include/configs/M5253DEMO.h +++ b/include/configs/M5253DEMO.h @@ -75,8 +75,6 @@ #define CONFIG_SYS_I2C_PINMUX_CLR (0xFFFFE7FF) #define CONFIG_SYS_I2C_PINMUX_SET (0) -#define CONFIG_SYS_LOAD_ADDR 0x00100000 - #undef CONFIG_SYS_PLL_BYPASS /* bypass PLL for test purpose */ #define CONFIG_SYS_FAST_CLK #ifdef CONFIG_SYS_FAST_CLK diff --git a/include/configs/M5272C3.h b/include/configs/M5272C3.h index 2cdd4369da0..35977cc5c2c 100644 --- a/include/configs/M5272C3.h +++ b/include/configs/M5272C3.h @@ -75,7 +75,6 @@ "save\0" \ "" -#define CONFIG_SYS_LOAD_ADDR 0x20000 #define CONFIG_SYS_CLK 66000000 /* diff --git a/include/configs/M5275EVB.h b/include/configs/M5275EVB.h index 304fd60629b..f66ecc8e8f7 100644 --- a/include/configs/M5275EVB.h +++ b/include/configs/M5275EVB.h @@ -64,8 +64,6 @@ #define CONFIG_SYS_I2C_PINMUX_CLR (0xFFF0) #define CONFIG_SYS_I2C_PINMUX_SET (0x000F) -#define CONFIG_SYS_LOAD_ADDR 0x800000 - #define CONFIG_BOOTCOMMAND "bootm ffe40000" #ifdef CONFIG_MCFFEC diff --git a/include/configs/M5282EVB.h b/include/configs/M5282EVB.h index 6a50a25d325..acaa2f1a966 100644 --- a/include/configs/M5282EVB.h +++ b/include/configs/M5282EVB.h @@ -72,8 +72,6 @@ "save\0" \ "" -#define CONFIG_SYS_LOAD_ADDR 0x20000 - #define CONFIG_SYS_CLK 64000000 /* PLL Configuration: Ext Clock * 6 (see table 9-4 of MCF user manual) */ diff --git a/include/configs/M53017EVB.h b/include/configs/M53017EVB.h index 8d2fa614cd2..adb6cc4ddab 100644 --- a/include/configs/M53017EVB.h +++ b/include/configs/M53017EVB.h @@ -81,8 +81,6 @@ #define CONFIG_PRAM 512 /* 512 KB */ -#define CONFIG_SYS_LOAD_ADDR 0x40010000 - #define CONFIG_SYS_CLK 80000000 #define CONFIG_SYS_CPU_CLK CONFIG_SYS_CLK * 3 diff --git a/include/configs/M5329EVB.h b/include/configs/M5329EVB.h index 97d119da8ae..fc6cd2c0ecd 100644 --- a/include/configs/M5329EVB.h +++ b/include/configs/M5329EVB.h @@ -75,8 +75,6 @@ #define CONFIG_PRAM 512 /* 512 KB */ -#define CONFIG_SYS_LOAD_ADDR 0x40010000 - #define CONFIG_SYS_CLK 80000000 #define CONFIG_SYS_CPU_CLK CONFIG_SYS_CLK * 3 diff --git a/include/configs/M5373EVB.h b/include/configs/M5373EVB.h index 459ce9c47cf..0b3ee11e0c2 100644 --- a/include/configs/M5373EVB.h +++ b/include/configs/M5373EVB.h @@ -77,8 +77,6 @@ #define CONFIG_PRAM 512 /* 512 KB */ -#define CONFIG_SYS_LOAD_ADDR 0x40010000 - #define CONFIG_SYS_CLK 80000000 #define CONFIG_SYS_CPU_CLK CONFIG_SYS_CLK * 3 diff --git a/include/configs/MCR3000.h b/include/configs/MCR3000.h index 48e9ecdb801..a3ceeeb9c2e 100644 --- a/include/configs/MCR3000.h +++ b/include/configs/MCR3000.h @@ -60,8 +60,6 @@ /* Miscellaneous configurable options */ -#define CONFIG_SYS_LOAD_ADDR 0x200000 - #define CONFIG_SYS_HZ 1000 /* Definitions for initial stack pointer and data area (in DPRAM) */ diff --git a/include/configs/MPC8349EMDS.h b/include/configs/MPC8349EMDS.h index 6286d5ec285..126a9b6ffeb 100644 --- a/include/configs/MPC8349EMDS.h +++ b/include/configs/MPC8349EMDS.h @@ -230,7 +230,6 @@ /* * Miscellaneous configurable options */ -#define CONFIG_SYS_LOAD_ADDR 0x2000000 /* default load address */ /* * For booting Linux, the board info and command line data diff --git a/include/configs/MPC8349EMDS_SDRAM.h b/include/configs/MPC8349EMDS_SDRAM.h index 45d22086a88..7e55d20d6c4 100644 --- a/include/configs/MPC8349EMDS_SDRAM.h +++ b/include/configs/MPC8349EMDS_SDRAM.h @@ -285,7 +285,6 @@ /* * Miscellaneous configurable options */ -#define CONFIG_SYS_LOAD_ADDR 0x2000000 /* default load address */ /* * For booting Linux, the board info and command line data diff --git a/include/configs/MPC837XERDB.h b/include/configs/MPC837XERDB.h index e299437a823..f4f139548b1 100644 --- a/include/configs/MPC837XERDB.h +++ b/include/configs/MPC837XERDB.h @@ -315,7 +315,6 @@ /* * Miscellaneous configurable options */ -#define CONFIG_SYS_LOAD_ADDR 0x2000000 /* default load address */ /* * For booting Linux, the board info and command line data diff --git a/include/configs/MPC8540ADS.h b/include/configs/MPC8540ADS.h index 82527da431e..a9edf091113 100644 --- a/include/configs/MPC8540ADS.h +++ b/include/configs/MPC8540ADS.h @@ -281,7 +281,6 @@ /* * Miscellaneous configurable options */ -#define CONFIG_SYS_LOAD_ADDR 0x2000000 /* default load address */ /* * For booting Linux, the board info and command line data diff --git a/include/configs/MPC8548CDS.h b/include/configs/MPC8548CDS.h index 289283a39f7..5be6981a8c6 100644 --- a/include/configs/MPC8548CDS.h +++ b/include/configs/MPC8548CDS.h @@ -407,7 +407,6 @@ extern unsigned long get_clock_freq(void); /* * Miscellaneous configurable options */ -#define CONFIG_SYS_LOAD_ADDR 0x2000000 /* default load address */ /* * For booting Linux, the board info and command line data diff --git a/include/configs/MPC8560ADS.h b/include/configs/MPC8560ADS.h index f1828a28cae..bc35572fbbd 100644 --- a/include/configs/MPC8560ADS.h +++ b/include/configs/MPC8560ADS.h @@ -269,7 +269,6 @@ /* * Miscellaneous configurable options */ -#define CONFIG_SYS_LOAD_ADDR 0x1000000 /* default load address */ #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE /* Boot Argument Buffer Size */ diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h index ea3c39e604d..9738f62f17d 100644 --- a/include/configs/P1010RDB.h +++ b/include/configs/P1010RDB.h @@ -611,7 +611,6 @@ extern unsigned long get_sdram_size(void); /* * Miscellaneous configurable options */ -#define CONFIG_SYS_LOAD_ADDR 0x2000000 /* default load address */ /* * For booting Linux, the board info and command line data diff --git a/include/configs/P2041RDB.h b/include/configs/P2041RDB.h index 52b9cf57557..c79ea361549 100644 --- a/include/configs/P2041RDB.h +++ b/include/configs/P2041RDB.h @@ -460,7 +460,6 @@ unsigned long get_board_sys_clk(unsigned long dummy); /* * Miscellaneous configurable options */ -#define CONFIG_SYS_LOAD_ADDR 0x2000000 /* default load address */ /* * For booting Linux, the board info and command line data diff --git a/include/configs/SBx81LIFKW.h b/include/configs/SBx81LIFKW.h index ded494cfa9b..4b5a8b56e7e 100644 --- a/include/configs/SBx81LIFKW.h +++ b/include/configs/SBx81LIFKW.h @@ -89,6 +89,4 @@ #define CONFIG_PHY_BASE_ADR 0x01 #endif /* CONFIG_CMD_NET */ -#define CONFIG_SYS_LOAD_ADDR 0x1000000 /* default location for tftp and bootm */ - #endif /* _CONFIG_SBX81LIFKW_H */ diff --git a/include/configs/SBx81LIFXCAT.h b/include/configs/SBx81LIFXCAT.h index 06bbd8642e3..cf206803963 100644 --- a/include/configs/SBx81LIFXCAT.h +++ b/include/configs/SBx81LIFXCAT.h @@ -89,6 +89,4 @@ #define CONFIG_PHY_BASE_ADR 0x01 #endif /* CONFIG_CMD_NET */ -#define CONFIG_SYS_LOAD_ADDR 0x1000000 /* default location for tftp and bootm */ - #endif /* _CONFIG_SBX81LIFXCAT_H */ diff --git a/include/configs/T102xRDB.h b/include/configs/T102xRDB.h index 4fb22538c77..ce8c2b2a20c 100644 --- a/include/configs/T102xRDB.h +++ b/include/configs/T102xRDB.h @@ -592,7 +592,6 @@ unsigned long get_board_sys_clk(void); /* * Miscellaneous configurable options */ -#define CONFIG_SYS_LOAD_ADDR 0x2000000 /* default load address */ /* * For booting Linux, the board info and command line data diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h index d1b4debae6f..4f589ed0c91 100644 --- a/include/configs/T104xRDB.h +++ b/include/configs/T104xRDB.h @@ -652,7 +652,6 @@ $(SRCTREE)/board/freescale/t104xrdb/t1042d4_sd_rcw.cfg /* * Miscellaneous configurable options */ -#define CONFIG_SYS_LOAD_ADDR 0x2000000 /* default load address */ /* * For booting Linux, the board info and command line data diff --git a/include/configs/T208xQDS.h b/include/configs/T208xQDS.h index edf2ed8b444..70a856cf555 100644 --- a/include/configs/T208xQDS.h +++ b/include/configs/T208xQDS.h @@ -588,7 +588,6 @@ unsigned long get_board_sys_clk(void); /* * Miscellaneous configurable options */ -#define CONFIG_SYS_LOAD_ADDR 0x2000000 /* default load address */ /* * For booting Linux, the board info and command line data diff --git a/include/configs/T208xRDB.h b/include/configs/T208xRDB.h index 96641152a1a..1901211e4fc 100644 --- a/include/configs/T208xRDB.h +++ b/include/configs/T208xRDB.h @@ -537,7 +537,6 @@ unsigned long get_board_sys_clk(void); /* * Miscellaneous configurable options */ -#define CONFIG_SYS_LOAD_ADDR 0x2000000 /* default load address */ /* * For booting Linux, the board info and command line data diff --git a/include/configs/T4240RDB.h b/include/configs/T4240RDB.h index 0486264fedb..4856890dc94 100644 --- a/include/configs/T4240RDB.h +++ b/include/configs/T4240RDB.h @@ -208,7 +208,6 @@ /* * Miscellaneous configurable options */ -#define CONFIG_SYS_LOAD_ADDR 0x2000000 /* default load address */ /* * For booting Linux, the board info and command line data diff --git a/include/configs/UCP1020.h b/include/configs/UCP1020.h index 92316765973..a3f7a226613 100644 --- a/include/configs/UCP1020.h +++ b/include/configs/UCP1020.h @@ -377,7 +377,6 @@ /* * Miscellaneous configurable options */ -#define CONFIG_SYS_LOAD_ADDR 0x2000000 /* default load address */ #define CONFIG_SYS_HZ 1000 /* decrementer freq: 1ms tick */ /* diff --git a/include/configs/adp-ae3xx.h b/include/configs/adp-ae3xx.h index a7adb599cae..8cb0de3caa0 100644 --- a/include/configs/adp-ae3xx.h +++ b/include/configs/adp-ae3xx.h @@ -104,14 +104,6 @@ #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_SDRAM_BASE + 0xA0000 - \ GENERATED_GBL_DATA_SIZE) -/* - * Load address and memory test area should agree with - * arch/nds32/config.mk. Be careful not to overwrite U-Boot itself. - */ -#define CONFIG_SYS_LOAD_ADDR 0x300000 - -/* memtest works on 63 MB in DRAM */ - /* * Static memory controller configuration */ diff --git a/include/configs/adp-ag101p.h b/include/configs/adp-ag101p.h index afec9ba2425..8d07895fe87 100644 --- a/include/configs/adp-ag101p.h +++ b/include/configs/adp-ag101p.h @@ -216,14 +216,6 @@ GENERATED_GBL_DATA_SIZE) #endif /* CONFIG_MEM_REMAP */ -/* - * Load address and memory test area should agree with - * arch/nds32/config.mk. Be careful not to overwrite U-Boot itself. - */ -#define CONFIG_SYS_LOAD_ADDR 0x300000 - -/* memtest works on 63 MB in DRAM */ - /* * Static memory controller configuration */ diff --git a/include/configs/amcore.h b/include/configs/amcore.h index 641d8fdbd53..63b941a56bd 100644 --- a/include/configs/amcore.h +++ b/include/configs/amcore.h @@ -28,10 +28,6 @@ "erase 0xfff00000 0xffffffff; " \ "cp.b 0x20000 0xfff00000 ${filesize}\0" -/* undef to save memory */ - -#define CONFIG_SYS_LOAD_ADDR 0x20000 /* default load address */ - #define CONFIG_SYS_HZ 1000 #define CONFIG_SYS_CLK 45000000 diff --git a/include/configs/ap121.h b/include/configs/ap121.h index 4902d07247e..88d85ce82dc 100644 --- a/include/configs/ap121.h +++ b/include/configs/ap121.h @@ -16,7 +16,6 @@ #define CONFIG_SYS_BOOTPARAMS_LEN 0x20000 #define CONFIG_SYS_SDRAM_BASE 0x80000000 -#define CONFIG_SYS_LOAD_ADDR 0x81000000 #define CONFIG_SYS_INIT_RAM_ADDR 0xbd000000 #define CONFIG_SYS_INIT_RAM_SIZE 0x8000 diff --git a/include/configs/ap143.h b/include/configs/ap143.h index c79e050dc9c..2001ed1f64d 100644 --- a/include/configs/ap143.h +++ b/include/configs/ap143.h @@ -16,7 +16,6 @@ #define CONFIG_SYS_BOOTPARAMS_LEN 0x20000 #define CONFIG_SYS_SDRAM_BASE 0x80000000 -#define CONFIG_SYS_LOAD_ADDR 0x81000000 #define CONFIG_SYS_INIT_RAM_ADDR 0xbd000000 #define CONFIG_SYS_INIT_RAM_SIZE 0x2000 diff --git a/include/configs/ap152.h b/include/configs/ap152.h index 0d2c484bb9c..9e38de17105 100644 --- a/include/configs/ap152.h +++ b/include/configs/ap152.h @@ -16,7 +16,6 @@ #define CONFIG_SYS_BOOTPARAMS_LEN 0x20000 #define CONFIG_SYS_SDRAM_BASE 0x80000000 -#define CONFIG_SYS_LOAD_ADDR 0x81000000 #define CONFIG_SYS_INIT_RAM_ADDR 0xbd000000 #define CONFIG_SYS_INIT_RAM_SIZE 0x2000 diff --git a/include/configs/apalis-imx8.h b/include/configs/apalis-imx8.h index d5bf92a0d0f..ef03e765c7f 100644 --- a/include/configs/apalis-imx8.h +++ b/include/configs/apalis-imx8.h @@ -70,7 +70,6 @@ "${blkcnt}; fi\0" /* Link Definitions */ -#define CONFIG_SYS_LOAD_ADDR 0x80280000 #define CONFIG_SYS_INIT_SP_ADDR 0x80200000 diff --git a/include/configs/apalis-imx8x.h b/include/configs/apalis-imx8x.h index 483cf09943f..9002058d9e9 100644 --- a/include/configs/apalis-imx8x.h +++ b/include/configs/apalis-imx8x.h @@ -97,7 +97,6 @@ "vidargs=video=imxdpufb5:off video=imxdpufb6:off video=imxdpufb7:off\0" /* Link Definitions */ -#define CONFIG_SYS_LOAD_ADDR 0x89000000 #define CONFIG_SYS_INIT_SP_ADDR 0x80200000 diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h index b736d19e3ce..77028099162 100644 --- a/include/configs/apalis_imx6.h +++ b/include/configs/apalis_imx6.h @@ -71,7 +71,6 @@ #define CONFIG_NETMASK 255.255.255.0 #undef CONFIG_SERVERIP #define CONFIG_SERVERIP 192.168.10.1 -#define CONFIG_SYS_LOAD_ADDR 0x12000000 #ifndef CONFIG_SPL_BUILD #define BOOT_TARGET_DEVICES(func) \ diff --git a/include/configs/armadillo-800eva.h b/include/configs/armadillo-800eva.h index 06704e5e197..db43e35292f 100644 --- a/include/configs/armadillo-800eva.h +++ b/include/configs/armadillo-800eva.h @@ -44,8 +44,6 @@ #define CONFIG_SYS_SDRAM_BASE (ARMADILLO_800EVA_SDRAM_BASE) #define CONFIG_SYS_SDRAM_SIZE (ARMADILLO_800EVA_SDRAM_SIZE) -#define CONFIG_SYS_LOAD_ADDR (CONFIG_SYS_SDRAM_BASE + \ - 64 * 1024 * 1024) #define CONFIG_SYS_MONITOR_BASE 0x00000000 #define CONFIG_SYS_MONITOR_LEN (256 * 1024) diff --git a/include/configs/astro_mcf5373l.h b/include/configs/astro_mcf5373l.h index 65c7d03efc1..5e117fb2187 100644 --- a/include/configs/astro_mcf5373l.h +++ b/include/configs/astro_mcf5373l.h @@ -154,9 +154,6 @@ #endif #endif -/* default RAM address for user programs */ -#define CONFIG_SYS_LOAD_ADDR 0x20000 - #define CONFIG_FPGA_COUNT 1 #define CONFIG_SYS_FPGA_PROG_FEEDBACK #define CONFIG_SYS_FPGA_WAIT 1000 diff --git a/include/configs/at91sam9260ek.h b/include/configs/at91sam9260ek.h index 780bf0cce7a..a3ab1ba8d39 100644 --- a/include/configs/at91sam9260ek.h +++ b/include/configs/at91sam9260ek.h @@ -106,8 +106,6 @@ #define CONFIG_SYS_USB_OHCI_SLOT_NAME "at91sam9260" #define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS 2 -#define CONFIG_SYS_LOAD_ADDR 0x22000000 /* load address */ - #ifdef CONFIG_SYS_USE_DATAFLASH_CS0 /* bootstrap + u-boot + env + linux in dataflash on CS0 */ diff --git a/include/configs/at91sam9261ek.h b/include/configs/at91sam9261ek.h index c3fe41636bf..f87720d6b98 100644 --- a/include/configs/at91sam9261ek.h +++ b/include/configs/at91sam9261ek.h @@ -93,8 +93,6 @@ #endif #define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS 2 -#define CONFIG_SYS_LOAD_ADDR 0x22000000 /* load address */ - #ifdef CONFIG_SYS_USE_DATAFLASH_CS0 /* bootstrap + u-boot + env + linux in dataflash on CS0 */ diff --git a/include/configs/at91sam9263ek.h b/include/configs/at91sam9263ek.h index 51ecf4173b3..efc3c8c1520 100644 --- a/include/configs/at91sam9263ek.h +++ b/include/configs/at91sam9263ek.h @@ -209,8 +209,6 @@ #define CONFIG_SYS_USB_OHCI_SLOT_NAME "at91sam9263" #define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS 2 -#define CONFIG_SYS_LOAD_ADDR 0x22000000 /* load address */ - #ifdef CONFIG_SYS_USE_DATAFLASH /* bootstrap + u-boot + env + linux in dataflash on CS0 */ diff --git a/include/configs/at91sam9m10g45ek.h b/include/configs/at91sam9m10g45ek.h index b4aaf5995fb..8655dbed1db 100644 --- a/include/configs/at91sam9m10g45ek.h +++ b/include/configs/at91sam9m10g45ek.h @@ -67,8 +67,6 @@ #define CONFIG_RESET_PHY_R #define CONFIG_AT91_WANTS_COMMON_PHY -#define CONFIG_SYS_LOAD_ADDR 0x22000000 /* load address */ - #ifdef CONFIG_NAND_BOOT /* bootstrap + u-boot + env in nandflash */ diff --git a/include/configs/at91sam9n12ek.h b/include/configs/at91sam9n12ek.h index fe99253e5a1..a9ff4014ba7 100644 --- a/include/configs/at91sam9n12ek.h +++ b/include/configs/at91sam9n12ek.h @@ -61,9 +61,6 @@ "bootargs_nand=rootfstype=ubifs ubi.mtd=7 root=ubi0:rootfs rw\0"\ "bootargs_mmc=root=/dev/mmcblk0p2 rw rootfstype=ext4 rootwait\0" -/* Ethernet */ -#define CONFIG_SYS_LOAD_ADDR 0x22000000 /* load address */ - /* USB host */ #ifdef CONFIG_CMD_USB #define CONFIG_USB_ATMEL diff --git a/include/configs/at91sam9rlek.h b/include/configs/at91sam9rlek.h index 92b87a2b492..d7d6b55ed9d 100644 --- a/include/configs/at91sam9rlek.h +++ b/include/configs/at91sam9rlek.h @@ -62,10 +62,6 @@ /* Ethernet - not present */ -/* USB - not supported */ - -#define CONFIG_SYS_LOAD_ADDR 0x22000000 /* load address */ - #ifdef CONFIG_SYS_USE_DATAFLASH /* bootstrap + u-boot + env + linux in dataflash on CS0 */ diff --git a/include/configs/at91sam9x5ek.h b/include/configs/at91sam9x5ek.h index 6a95b39cdb7..8217423fa68 100644 --- a/include/configs/at91sam9x5ek.h +++ b/include/configs/at91sam9x5ek.h @@ -65,8 +65,6 @@ #endif #endif -#define CONFIG_SYS_LOAD_ADDR 0x22000000 /* load address */ - #ifdef CONFIG_NAND_BOOT /* bootstrap + u-boot + env + linux in nandflash */ #define CONFIG_BOOTCOMMAND "nand read " \ diff --git a/include/configs/ax25-ae350.h b/include/configs/ax25-ae350.h index bd9c371f835..57744298293 100644 --- a/include/configs/ax25-ae350.h +++ b/include/configs/ax25-ae350.h @@ -79,20 +79,6 @@ #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_SDRAM_BASE + 0x1000000 - \ GENERATED_GBL_DATA_SIZE) -/* - * Load address and memory test area should agree with - * arch/riscv/config.mk. Be careful not to overwrite U-Boot itself. - */ -#define CONFIG_SYS_LOAD_ADDR 0x100000 /* SDRAM */ - -/* - * memtest works on 512 MB in DRAM - */ - -/* - * FLASH and environment organization - */ - /* use CFI framework */ #define CONFIG_SYS_FLASH_CFI_WIDTH FLASH_CFI_16BIT diff --git a/include/configs/axs10x.h b/include/configs/axs10x.h index 96a1c6400c5..5baf2cb451b 100644 --- a/include/configs/axs10x.h +++ b/include/configs/axs10x.h @@ -29,7 +29,6 @@ #define CONFIG_SYS_MALLOC_LEN SZ_2M #define CONFIG_SYS_BOOTM_LEN SZ_128M -#define CONFIG_SYS_LOAD_ADDR 0x82000000 /* * UART configuration diff --git a/include/configs/bcm_ns3.h b/include/configs/bcm_ns3.h index 14275abdc47..62de1a72346 100644 --- a/include/configs/bcm_ns3.h +++ b/include/configs/bcm_ns3.h @@ -16,7 +16,6 @@ #define PHYS_SDRAM_1 V2M_BASE #define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1 -#define CONFIG_SYS_LOAD_ADDR (PHYS_SDRAM_1 + 0x80000) /* * Initial SP before reloaction is placed at end of first DRAM bank, diff --git a/include/configs/bcmstb.h b/include/configs/bcmstb.h index 2660d18f35a..627aca81fd4 100644 --- a/include/configs/bcmstb.h +++ b/include/configs/bcmstb.h @@ -88,7 +88,6 @@ extern phys_addr_t prior_stage_fdt_address; #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_INIT_RAM_ADDR + \ CONFIG_SYS_INIT_RAM_SIZE - \ GENERATED_GBL_DATA_SIZE) -#define CONFIG_SYS_LOAD_ADDR 0x2000000 /* * CONFIG_SYS_LOAD_ADDR - 1 MiB. diff --git a/include/configs/bg0900.h b/include/configs/bg0900.h index aacc70cd551..d9599b85911 100644 --- a/include/configs/bg0900.h +++ b/include/configs/bg0900.h @@ -20,7 +20,6 @@ /* Boot Linux */ #define CONFIG_BOOTFILE "uImage" #define CONFIG_BOOTCOMMAND "bootm" -#define CONFIG_SYS_LOAD_ADDR 0x42000000 /* Extra Environment */ #define CONFIG_EXTRA_ENV_SETTINGS \ diff --git a/include/configs/bk4r1.h b/include/configs/bk4r1.h index a3ec719b4d7..f9ea1331e41 100644 --- a/include/configs/bk4r1.h +++ b/include/configs/bk4r1.h @@ -80,7 +80,6 @@ #define FSL_QSPI_FLASH_NUM 2 #define CONFIG_SYS_FSL_QSPI_LE #endif -#define CONFIG_SYS_LOAD_ADDR 0x82000000 /* We boot from the gfxRAM area of the OCRAM. */ #define CONFIG_BOARD_SIZE_LIMIT 520192 diff --git a/include/configs/bmips_bcm3380.h b/include/configs/bmips_bcm3380.h index 573ff3e4018..472b02f1042 100644 --- a/include/configs/bmips_bcm3380.h +++ b/include/configs/bmips_bcm3380.h @@ -15,7 +15,6 @@ #define CONFIG_SYS_SDRAM_BASE 0x80000000 /* U-Boot */ -#define CONFIG_SYS_LOAD_ADDR CONFIG_SYS_SDRAM_BASE + SZ_1M #if defined(CONFIG_BMIPS_BOOT_RAM) #define CONFIG_SKIP_LOWLEVEL_INIT diff --git a/include/configs/bmips_bcm6318.h b/include/configs/bmips_bcm6318.h index 45eb931c257..904f1b46cc9 100644 --- a/include/configs/bmips_bcm6318.h +++ b/include/configs/bmips_bcm6318.h @@ -24,7 +24,6 @@ #endif /* CONFIG_USB_OHCI_HCD */ /* U-Boot */ -#define CONFIG_SYS_LOAD_ADDR CONFIG_SYS_SDRAM_BASE + SZ_1M #if defined(CONFIG_BMIPS_BOOT_RAM) #define CONFIG_SKIP_LOWLEVEL_INIT diff --git a/include/configs/bmips_bcm63268.h b/include/configs/bmips_bcm63268.h index eed321eb6fc..7b4329132e9 100644 --- a/include/configs/bmips_bcm63268.h +++ b/include/configs/bmips_bcm63268.h @@ -24,7 +24,6 @@ #endif /* CONFIG_USB_OHCI_HCD */ /* U-Boot */ -#define CONFIG_SYS_LOAD_ADDR CONFIG_SYS_SDRAM_BASE + SZ_1M #if defined(CONFIG_BMIPS_BOOT_RAM) #define CONFIG_SKIP_LOWLEVEL_INIT diff --git a/include/configs/bmips_bcm6328.h b/include/configs/bmips_bcm6328.h index c78099a49dc..bed22b46e54 100644 --- a/include/configs/bmips_bcm6328.h +++ b/include/configs/bmips_bcm6328.h @@ -24,7 +24,6 @@ #endif /* CONFIG_USB_OHCI_HCD */ /* U-Boot */ -#define CONFIG_SYS_LOAD_ADDR CONFIG_SYS_SDRAM_BASE + SZ_1M #if defined(CONFIG_BMIPS_BOOT_RAM) #define CONFIG_SKIP_LOWLEVEL_INIT diff --git a/include/configs/bmips_bcm6338.h b/include/configs/bmips_bcm6338.h index 38dd9e3af3a..3a5e56de955 100644 --- a/include/configs/bmips_bcm6338.h +++ b/include/configs/bmips_bcm6338.h @@ -15,7 +15,6 @@ #define CONFIG_SYS_SDRAM_BASE 0x80000000 /* U-Boot */ -#define CONFIG_SYS_LOAD_ADDR CONFIG_SYS_SDRAM_BASE + SZ_1M #if defined(CONFIG_BMIPS_BOOT_RAM) #define CONFIG_SKIP_LOWLEVEL_INIT diff --git a/include/configs/bmips_bcm6348.h b/include/configs/bmips_bcm6348.h index 547cf857ceb..57017a50032 100644 --- a/include/configs/bmips_bcm6348.h +++ b/include/configs/bmips_bcm6348.h @@ -22,7 +22,6 @@ #endif /* CONFIG_USB_OHCI_HCD */ /* U-Boot */ -#define CONFIG_SYS_LOAD_ADDR CONFIG_SYS_SDRAM_BASE + SZ_1M #if defined(CONFIG_BMIPS_BOOT_RAM) #define CONFIG_SKIP_LOWLEVEL_INIT diff --git a/include/configs/bmips_bcm6358.h b/include/configs/bmips_bcm6358.h index 116e9705b6b..57f6185fe96 100644 --- a/include/configs/bmips_bcm6358.h +++ b/include/configs/bmips_bcm6358.h @@ -24,7 +24,6 @@ #endif /* CONFIG_USB_OHCI_HCD */ /* U-Boot */ -#define CONFIG_SYS_LOAD_ADDR CONFIG_SYS_SDRAM_BASE + SZ_1M #if defined(CONFIG_BMIPS_BOOT_RAM) #define CONFIG_SKIP_LOWLEVEL_INIT diff --git a/include/configs/bmips_bcm6362.h b/include/configs/bmips_bcm6362.h index e5e8b15e187..2f819f0c878 100644 --- a/include/configs/bmips_bcm6362.h +++ b/include/configs/bmips_bcm6362.h @@ -24,7 +24,6 @@ #endif /* CONFIG_USB_OHCI_HCD */ /* U-Boot */ -#define CONFIG_SYS_LOAD_ADDR CONFIG_SYS_SDRAM_BASE + SZ_1M #if defined(CONFIG_BMIPS_BOOT_RAM) #define CONFIG_SKIP_LOWLEVEL_INIT diff --git a/include/configs/bmips_bcm6368.h b/include/configs/bmips_bcm6368.h index 4d4403f8d21..58425a485ed 100644 --- a/include/configs/bmips_bcm6368.h +++ b/include/configs/bmips_bcm6368.h @@ -24,7 +24,6 @@ #endif /* CONFIG_USB_OHCI_HCD */ /* U-Boot */ -#define CONFIG_SYS_LOAD_ADDR CONFIG_SYS_SDRAM_BASE + SZ_1M #if defined(CONFIG_BMIPS_BOOT_RAM) #define CONFIG_SKIP_LOWLEVEL_INIT diff --git a/include/configs/bmips_bcm6838.h b/include/configs/bmips_bcm6838.h index f1ff05414d5..b4618689bc8 100644 --- a/include/configs/bmips_bcm6838.h +++ b/include/configs/bmips_bcm6838.h @@ -15,7 +15,6 @@ #define CONFIG_SYS_SDRAM_BASE 0x80000000 /* U-Boot */ -#define CONFIG_SYS_LOAD_ADDR CONFIG_SYS_SDRAM_BASE + SZ_1M #if defined(CONFIG_BMIPS_BOOT_RAM) #define CONFIG_SKIP_LOWLEVEL_INIT diff --git a/include/configs/boston.h b/include/configs/boston.h index b9a9965eec3..4c7b173ea87 100644 --- a/include/configs/boston.h +++ b/include/configs/boston.h @@ -33,8 +33,6 @@ #define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE -#define CONFIG_SYS_LOAD_ADDR (CONFIG_SYS_SDRAM_BASE + 0x08000000) - #define CONFIG_SYS_MALLOC_LEN (256 * 1024) /* diff --git a/include/configs/broadcom_bcm963158.h b/include/configs/broadcom_bcm963158.h index 238ae9c010e..7e376f0dc7d 100644 --- a/include/configs/broadcom_bcm963158.h +++ b/include/configs/broadcom_bcm963158.h @@ -26,7 +26,6 @@ /* U-Boot */ #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_TEXT_BASE + SZ_16M) -#define CONFIG_SYS_LOAD_ADDR CONFIG_SYS_TEXT_BASE #define CONFIG_SKIP_LOWLEVEL_INIT diff --git a/include/configs/broadcom_bcm968360bg.h b/include/configs/broadcom_bcm968360bg.h index 77690ff40f7..12efc3362f1 100644 --- a/include/configs/broadcom_bcm968360bg.h +++ b/include/configs/broadcom_bcm968360bg.h @@ -25,7 +25,6 @@ /* U-Boot */ #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_TEXT_BASE + SZ_16M) -#define CONFIG_SYS_LOAD_ADDR CONFIG_SYS_TEXT_BASE #define CONFIG_SKIP_LOWLEVEL_INIT diff --git a/include/configs/broadcom_bcm968580xref.h b/include/configs/broadcom_bcm968580xref.h index febe6c0a04f..10b64df8ae7 100644 --- a/include/configs/broadcom_bcm968580xref.h +++ b/include/configs/broadcom_bcm968580xref.h @@ -25,7 +25,6 @@ /* U-Boot */ #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_TEXT_BASE + SZ_16M) -#define CONFIG_SYS_LOAD_ADDR CONFIG_SYS_TEXT_BASE #define CONFIG_SKIP_LOWLEVEL_INIT diff --git a/include/configs/brppt2.h b/include/configs/brppt2.h index e30b365a93d..548c7dfd5cb 100644 --- a/include/configs/brppt2.h +++ b/include/configs/brppt2.h @@ -20,8 +20,6 @@ #define CONFIG_BOARD_POSTCLK_INIT #define CONFIG_MXC_GPT_HCLK -#define CONFIG_SYS_LOAD_ADDR 0x10700000 - /* MMC */ #define CONFIG_FSL_USDHC diff --git a/include/configs/bur_am335x_common.h b/include/configs/bur_am335x_common.h index bf54cfb078e..43c12ac462e 100644 --- a/include/configs/bur_am335x_common.h +++ b/include/configs/bur_am335x_common.h @@ -48,11 +48,6 @@ #if !defined(CONFIG_SPL_BUILD) && !defined(CONFIG_NOR_BOOT) #define CONFIG_SKIP_LOWLEVEL_INIT #endif /* !CONFIG_SPL_BUILD, ... */ -/* - * Our DDR memory always starts at 0x80000000 and U-Boot shall have - * relocated itself to higher in memory by the time this value is used. - */ -#define CONFIG_SYS_LOAD_ADDR 0x80000000 /* * ---------------------------------------------------------------------------- * DDR information. We say (for simplicity) that we have 1 bank, diff --git a/include/configs/capricorn-common.h b/include/configs/capricorn-common.h index bca995e16ca..4c76ef54b5c 100644 --- a/include/configs/capricorn-common.h +++ b/include/configs/capricorn-common.h @@ -127,7 +127,6 @@ "reset;" /* Default location for tftp and bootm */ -#define CONFIG_SYS_LOAD_ADDR 0x80280000 #define CONFIG_SYS_INIT_SP_ADDR 0x80200000 /* On CCP board, USDHC1 is for eMMC */ diff --git a/include/configs/cgtqmx8.h b/include/configs/cgtqmx8.h index 585834c9025..55b6186f882 100644 --- a/include/configs/cgtqmx8.h +++ b/include/configs/cgtqmx8.h @@ -147,7 +147,6 @@ "else booti ${loadaddr} - ${fdt_addr}; fi" /* Link Definitions */ -#define CONFIG_SYS_LOAD_ADDR 0x80280000 #define CONFIG_SYS_INIT_SP_ADDR 0x80200000 diff --git a/include/configs/ci20.h b/include/configs/ci20.h index 8f9e9f8132f..09d227ae489 100644 --- a/include/configs/ci20.h +++ b/include/configs/ci20.h @@ -23,7 +23,6 @@ #define CONFIG_SYS_SDRAM_BASE 0x80000000 /* cached (KSEG0) address */ #define CONFIG_SYS_INIT_SP_OFFSET 0x400000 -#define CONFIG_SYS_LOAD_ADDR 0x81000000 #define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE diff --git a/include/configs/cobra5272.h b/include/configs/cobra5272.h index c859616c68c..054b659abfb 100644 --- a/include/configs/cobra5272.h +++ b/include/configs/cobra5272.h @@ -135,9 +135,6 @@ enter a valid image address in flash */ #endif -#define CONFIG_SYS_LOAD_ADDR 0x20000 /*Defines default RAM address -from which user programs will be started */ - /*---*/ /* diff --git a/include/configs/colibri-imx8x.h b/include/configs/colibri-imx8x.h index 27edb90153c..8ad70dddc27 100644 --- a/include/configs/colibri-imx8x.h +++ b/include/configs/colibri-imx8x.h @@ -102,7 +102,6 @@ "vidargs=video=imxdpufb5:off video=imxdpufb6:off video=imxdpufb7:off\0" /* Link Definitions */ -#define CONFIG_SYS_LOAD_ADDR 0x80280000 #define CONFIG_SYS_INIT_SP_ADDR 0x80200000 diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h index ca3709b9400..966aa47d732 100644 --- a/include/configs/colibri_imx6.h +++ b/include/configs/colibri_imx6.h @@ -60,8 +60,6 @@ #undef CONFIG_SERVERIP #define CONFIG_SERVERIP 192.168.10.1 -#define CONFIG_SYS_LOAD_ADDR 0x12000000 - #ifndef CONFIG_SPL_BUILD #define BOOT_TARGET_DEVICES(func) \ func(MMC, mmc, 1) \ diff --git a/include/configs/colibri_pxa270.h b/include/configs/colibri_pxa270.h index 46ddec68686..eeb35ea4bee 100644 --- a/include/configs/colibri_pxa270.h +++ b/include/configs/colibri_pxa270.h @@ -82,7 +82,6 @@ #define CONFIG_SYS_DRAM_BASE 0xa0000000 /* CS0 */ #define CONFIG_SYS_DRAM_SIZE 0x04000000 /* 64 MB DRAM */ -#define CONFIG_SYS_LOAD_ADDR PHYS_SDRAM_1 #define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1 #define CONFIG_SYS_INIT_SP_ADDR 0x5c010000 diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h index 96fef9fd7fc..e3dcbf8f372 100644 --- a/include/configs/colibri_vf.h +++ b/include/configs/colibri_vf.h @@ -38,7 +38,6 @@ #define CONFIG_NETMASK 255.255.255.0 #define CONFIG_SERVERIP 192.168.10.1 -#define CONFIG_SYS_LOAD_ADDR 0x80008000 #define CONFIG_FDTADDR 0x84000000 /* We boot from the gfxRAM area of the OCRAM. */ diff --git a/include/configs/corenet_ds.h b/include/configs/corenet_ds.h index 19190029daa..b0add5c6f01 100644 --- a/include/configs/corenet_ds.h +++ b/include/configs/corenet_ds.h @@ -468,7 +468,6 @@ /* * Miscellaneous configurable options */ -#define CONFIG_SYS_LOAD_ADDR 0x2000000 /* default load address */ /* * For booting Linux, the board info and command line data diff --git a/include/configs/corvus.h b/include/configs/corvus.h index bd4d6e8e39f..164ca4b1426 100644 --- a/include/configs/corvus.h +++ b/include/configs/corvus.h @@ -83,8 +83,6 @@ /* DFU class support */ #define DFU_MANIFEST_POLL_TIMEOUT 25000 -#define CONFIG_SYS_LOAD_ADDR ATMEL_BASE_CS6 - /* bootstrap + u-boot + env in nandflash */ #define CONFIG_BOOTCOMMAND \ diff --git a/include/configs/da850evm.h b/include/configs/da850evm.h index 883cbc95d23..e9761f2adcd 100644 --- a/include/configs/da850evm.h +++ b/include/configs/da850evm.h @@ -173,7 +173,6 @@ #define CONFIG_BOOTFILE "uImage" /* Boot file name */ #define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */ #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE /* Boot Args Buffer Size */ -#define CONFIG_SYS_LOAD_ADDR (PHYS_SDRAM_1 + 0x700000) /* * Linux Information diff --git a/include/configs/devkit3250.h b/include/configs/devkit3250.h index ab1fbc83af6..5377683feb8 100644 --- a/include/configs/devkit3250.h +++ b/include/configs/devkit3250.h @@ -25,8 +25,6 @@ #define CONFIG_SYS_SDRAM_BASE EMC_DYCS0_BASE #define CONFIG_SYS_SDRAM_SIZE SZ_64M -#define CONFIG_SYS_LOAD_ADDR (CONFIG_SYS_SDRAM_BASE + SZ_32K) - #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_SDRAM_BASE + SZ_4K \ - GENERATED_GBL_DATA_SIZE) diff --git a/include/configs/dh_imx6.h b/include/configs/dh_imx6.h index 8e4296b9d33..ca6dc8e8b3f 100644 --- a/include/configs/dh_imx6.h +++ b/include/configs/dh_imx6.h @@ -81,8 +81,6 @@ #define CONFIG_HW_WATCHDOG #endif -#define CONFIG_SYS_LOAD_ADDR 0x12000000 - #ifndef CONFIG_SPL_BUILD #define CONFIG_EXTRA_ENV_SETTINGS \ "console=ttymxc0,115200\0" \ diff --git a/include/configs/dragonboard410c.h b/include/configs/dragonboard410c.h index 6474e57b29a..86ea0729535 100644 --- a/include/configs/dragonboard410c.h +++ b/include/configs/dragonboard410c.h @@ -20,7 +20,6 @@ #define PHYS_SDRAM_1_SIZE SZ_1G #define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1 #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_SDRAM_BASE + 0x7fff0) -#define CONFIG_SYS_LOAD_ADDR (CONFIG_SYS_SDRAM_BASE + 0x80000) #define CONFIG_SYS_BOOTM_LEN SZ_64M /* UART */ diff --git a/include/configs/dragonboard820c.h b/include/configs/dragonboard820c.h index 4256e6f0607..10252fd7144 100644 --- a/include/configs/dragonboard820c.h +++ b/include/configs/dragonboard820c.h @@ -21,7 +21,6 @@ #define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1 #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_SDRAM_BASE + 0x7fff0) -#define CONFIG_SYS_LOAD_ADDR (CONFIG_SYS_SDRAM_BASE + 0x80000) #define CONFIG_SYS_BOOTM_LEN SZ_64M /* Generic Timer Definitions */ diff --git a/include/configs/durian.h b/include/configs/durian.h index fa48e5c0240..65cdccd6b17 100644 --- a/include/configs/durian.h +++ b/include/configs/durian.h @@ -13,8 +13,6 @@ #define PHYS_SDRAM_1_SIZE 0x7B000000 #define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1 -#define CONFIG_SYS_LOAD_ADDR (CONFIG_SYS_SDRAM_BASE + 0x10000000) - /* Size of Malloc Pool */ #define CONFIG_SYS_MALLOC_LEN (1 * 1024 * 1024 + CONFIG_ENV_SIZE) diff --git a/include/configs/ea-lpc3250devkitv2.h b/include/configs/ea-lpc3250devkitv2.h index c1a37c8a790..33ffb7496c0 100644 --- a/include/configs/ea-lpc3250devkitv2.h +++ b/include/configs/ea-lpc3250devkitv2.h @@ -26,7 +26,6 @@ /* * cmd */ -#define CONFIG_SYS_LOAD_ADDR 0x80100000 #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_SDRAM_BASE + SZ_4K - GENERATED_GBL_DATA_SIZE) /* diff --git a/include/configs/eb_cpu5282.h b/include/configs/eb_cpu5282.h index c324881ed35..e4da6948340 100644 --- a/include/configs/eb_cpu5282.h +++ b/include/configs/eb_cpu5282.h @@ -47,8 +47,6 @@ #define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */ #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE -#define CONFIG_SYS_LOAD_ADDR 0x20000 - /*#define CONFIG_SYS_DRAM_TEST 1 */ #undef CONFIG_SYS_DRAM_TEST diff --git a/include/configs/edison.h b/include/configs/edison.h index 0e1205bdb54..3ec35db4bcf 100644 --- a/include/configs/edison.h +++ b/include/configs/edison.h @@ -15,7 +15,6 @@ #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE /* Memory */ -#define CONFIG_SYS_LOAD_ADDR 0x100000 #define CONFIG_PHYSMEM #define CONFIG_SYS_STACK_SIZE (32 * 1024) diff --git a/include/configs/edminiv2.h b/include/configs/edminiv2.h index fffad6ee11d..6bb4a87a844 100644 --- a/include/configs/edminiv2.h +++ b/include/configs/edminiv2.h @@ -169,7 +169,6 @@ * Other required minimal configurations */ -#define CONFIG_SYS_LOAD_ADDR 0x00800000 #define CONFIG_SYS_RESET_ADDRESS 0xffff0000 /* Enable command line editing */ diff --git a/include/configs/emsdp.h b/include/configs/emsdp.h index 8685f6c270a..2f60e1ff6a9 100644 --- a/include/configs/emsdp.h +++ b/include/configs/emsdp.h @@ -16,7 +16,6 @@ #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_SDRAM_BASE + SZ_1M) #define CONFIG_SYS_MALLOC_LEN SZ_64K -#define CONFIG_SYS_LOAD_ADDR CONFIG_SYS_SDRAM_BASE /* * Environment diff --git a/include/configs/ethernut5.h b/include/configs/ethernut5.h index dc01de74e3b..9c430be4153 100644 --- a/include/configs/ethernut5.h +++ b/include/configs/ethernut5.h @@ -34,7 +34,6 @@ /* 128MB SDRAM in 1 bank */ #define CONFIG_SYS_SDRAM_BASE 0x20000000 #define CONFIG_SYS_SDRAM_SIZE (128 << 20) -#define CONFIG_SYS_LOAD_ADDR CONFIG_SYS_SDRAM_BASE #define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + (1 << 20)) /* 512kB on-chip NOR flash */ diff --git a/include/configs/evb_ast2500.h b/include/configs/evb_ast2500.h index 0ff01af833b..dc032c1a419 100644 --- a/include/configs/evb_ast2500.h +++ b/include/configs/evb_ast2500.h @@ -13,7 +13,4 @@ #define CONFIG_SYS_UBOOT_BASE CONFIG_SYS_TEXT_BASE -/* Memory Info */ -#define CONFIG_SYS_LOAD_ADDR 0x83000000 - #endif /* __CONFIG_H */ diff --git a/include/configs/evb_ast2600.h b/include/configs/evb_ast2600.h index e7975bf66d2..177a52eb916 100644 --- a/include/configs/evb_ast2600.h +++ b/include/configs/evb_ast2600.h @@ -10,7 +10,4 @@ #define CONFIG_SYS_UBOOT_BASE CONFIG_SYS_TEXT_BASE -/* Memory Info */ -#define CONFIG_SYS_LOAD_ADDR 0x83000000 - #endif /* __CONFIG_H */ diff --git a/include/configs/exynos5-common.h b/include/configs/exynos5-common.h index 784ddd191b6..e4923964169 100644 --- a/include/configs/exynos5-common.h +++ b/include/configs/exynos5-common.h @@ -45,12 +45,6 @@ /* MMC SPL */ #define COPY_BL2_FNPTR_ADDR 0x02020030 -/* specific .lds file */ - -/* Boot Argument Buffer Size */ -/* memtest works on */ -#define CONFIG_SYS_LOAD_ADDR (CONFIG_SYS_SDRAM_BASE + 0x3E00000) - #define CONFIG_RD_LVL #define PHYS_SDRAM_1 CONFIG_SYS_SDRAM_BASE diff --git a/include/configs/exynos7420-common.h b/include/configs/exynos7420-common.h index 6c0aa9bcd4a..a36b48fb0fa 100644 --- a/include/configs/exynos7420-common.h +++ b/include/configs/exynos7420-common.h @@ -42,8 +42,6 @@ /* select serial console configuration */ -#define CONFIG_SYS_LOAD_ADDR (CONFIG_SYS_SDRAM_BASE + 0x3E00000) - #define PHYS_SDRAM_1 CONFIG_SYS_SDRAM_BASE #define PHYS_SDRAM_1_SIZE SDRAM_BANK_SIZE #define PHYS_SDRAM_2 (CONFIG_SYS_SDRAM_BASE + SDRAM_BANK_SIZE) diff --git a/include/configs/flea3.h b/include/configs/flea3.h index 6caeff2a1c0..7287a779bc7 100644 --- a/include/configs/flea3.h +++ b/include/configs/flea3.h @@ -49,8 +49,6 @@ #define CONFIG_NET_RETRY_COUNT 100 -#define CONFIG_SYS_LOAD_ADDR 0x80800000 /* loadaddr env var */ - /* * Ethernet on SOC (FEC) */ diff --git a/include/configs/gardena-smart-gateway-at91sam.h b/include/configs/gardena-smart-gateway-at91sam.h index 007cbb043a3..4968ae9de0d 100644 --- a/include/configs/gardena-smart-gateway-at91sam.h +++ b/include/configs/gardena-smart-gateway-at91sam.h @@ -45,8 +45,6 @@ #define CONFIG_SYS_NAND_ENABLE_PIN AT91_PIN_PD4 #define CONFIG_SYS_NAND_READY_PIN AT91_PIN_PD5 -#define CONFIG_SYS_LOAD_ADDR 0x22000000 /* load address */ - /* SPL */ #define CONFIG_SPL_MAX_SIZE 0x7000 #define CONFIG_SPL_STACK 0x308000 diff --git a/include/configs/gardena-smart-gateway-mt7688.h b/include/configs/gardena-smart-gateway-mt7688.h index 1b26466eda3..bdbd2f99a05 100644 --- a/include/configs/gardena-smart-gateway-mt7688.h +++ b/include/configs/gardena-smart-gateway-mt7688.h @@ -12,8 +12,6 @@ /* RAM */ #define CONFIG_SYS_SDRAM_BASE 0x80000000 -#define CONFIG_SYS_LOAD_ADDR CONFIG_SYS_SDRAM_BASE + 0x100000 - #define CONFIG_SYS_INIT_SP_OFFSET 0x400000 /* SPL */ diff --git a/include/configs/gazerbeam.h b/include/configs/gazerbeam.h index 4bf0c60aab8..42912985619 100644 --- a/include/configs/gazerbeam.h +++ b/include/configs/gazerbeam.h @@ -60,7 +60,6 @@ /* * Miscellaneous configurable options */ -#define CONFIG_SYS_LOAD_ADDR 0x2000000 /* default load address */ #define CONFIG_SYS_HZ 1000 /* decrementer freq: 1ms ticks */ #define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */ diff --git a/include/configs/ge_bx50v3.h b/include/configs/ge_bx50v3.h index ba0432f4345..0c2db293136 100644 --- a/include/configs/ge_bx50v3.h +++ b/include/configs/ge_bx50v3.h @@ -114,10 +114,6 @@ #define CONFIG_BOOTCOMMAND MMCBOOTCOMMAND #endif - -/* Miscellaneous configurable options */ -#define CONFIG_SYS_LOAD_ADDR 0x12000000 - /* Physical Memory Map */ #define PHYS_SDRAM MMDC0_ARB_BASE_ADDR diff --git a/include/configs/grpeach.h b/include/configs/grpeach.h index 4d5eab09f09..c958006b227 100644 --- a/include/configs/grpeach.h +++ b/include/configs/grpeach.h @@ -20,8 +20,6 @@ #define CONFIG_SYS_SDRAM_SIZE (10 * 1024 * 1024) #define CONFIG_SYS_INIT_SP_ADDR \ (CONFIG_SYS_SDRAM_BASE + CONFIG_SYS_SDRAM_SIZE - 1024 * 1024) -#define CONFIG_SYS_LOAD_ADDR \ - (CONFIG_SYS_SDRAM_BASE + 4 * 1024 * 1024) /* Malloc */ #define CONFIG_SYS_MALLOC_LEN (1024 * 1024) diff --git a/include/configs/highbank.h b/include/configs/highbank.h index ff92c4f5540..05cf485d6c7 100644 --- a/include/configs/highbank.h +++ b/include/configs/highbank.h @@ -36,7 +36,6 @@ #define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */ #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE -#define CONFIG_SYS_LOAD_ADDR 0x800000 #define CONFIG_SYS_64BIT_LBA /* Environment data setup diff --git a/include/configs/hikey.h b/include/configs/hikey.h index 45b01463acb..194e79ddd3f 100644 --- a/include/configs/hikey.h +++ b/include/configs/hikey.h @@ -35,8 +35,6 @@ #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_SDRAM_BASE + 0x7fff0) -#define CONFIG_SYS_LOAD_ADDR (CONFIG_SYS_SDRAM_BASE + 0x80000) - /* Generic Timer Definitions */ #define COUNTER_FREQUENCY 19000000 diff --git a/include/configs/hikey960.h b/include/configs/hikey960.h index 04d458798a1..38c03e14ef5 100644 --- a/include/configs/hikey960.h +++ b/include/configs/hikey960.h @@ -24,8 +24,6 @@ #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_SDRAM_BASE + 0x7fff0) -#define CONFIG_SYS_LOAD_ADDR (CONFIG_SYS_SDRAM_BASE + 0x80000) - /* Generic Timer Definitions */ #define COUNTER_FREQUENCY 19000000 diff --git a/include/configs/hsdk-4xd.h b/include/configs/hsdk-4xd.h index 8eb3bb9b722..9d99d8d6387 100644 --- a/include/configs/hsdk-4xd.h +++ b/include/configs/hsdk-4xd.h @@ -31,7 +31,6 @@ #define CONFIG_SYS_MALLOC_LEN SZ_2M #define CONFIG_SYS_BOOTM_LEN SZ_128M -#define CONFIG_SYS_LOAD_ADDR 0x82000000 /* * UART configuration diff --git a/include/configs/hsdk.h b/include/configs/hsdk.h index 06577dffb47..20d2b85ce4c 100644 --- a/include/configs/hsdk.h +++ b/include/configs/hsdk.h @@ -30,7 +30,6 @@ #define CONFIG_SYS_MALLOC_LEN SZ_2M #define CONFIG_SYS_BOOTM_LEN SZ_128M -#define CONFIG_SYS_LOAD_ADDR 0x82000000 /* * UART configuration diff --git a/include/configs/ids8313.h b/include/configs/ids8313.h index be37b50cbff..48c642b72f0 100644 --- a/include/configs/ids8313.h +++ b/include/configs/ids8313.h @@ -235,7 +235,6 @@ #define CONFIG_SYS_CBSIZE 1024 #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE -#define CONFIG_SYS_LOAD_ADDR 0x100000 #define CONFIG_LOADS_ECHO #define CONFIG_TIMESTAMP #define CONFIG_BOOTCOMMAND "run boot_cramfs" diff --git a/include/configs/imgtec_xilfpga.h b/include/configs/imgtec_xilfpga.h index fcf1b7f990e..ebfbcab4651 100644 --- a/include/configs/imgtec_xilfpga.h +++ b/include/configs/imgtec_xilfpga.h @@ -31,7 +31,6 @@ #define CONFIG_SYS_MALLOC_LEN (256 << 10) #define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE -#define CONFIG_SYS_LOAD_ADDR 0x80500000 /* default load address */ /*---------------------------------------------------------------------- * Commands diff --git a/include/configs/imx27lite-common.h b/include/configs/imx27lite-common.h index c63e2d5a53a..c5319713269 100644 --- a/include/configs/imx27lite-common.h +++ b/include/configs/imx27lite-common.h @@ -120,8 +120,6 @@ /* Boot Argument Buffer Size */ #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE -#define CONFIG_SYS_LOAD_ADDR 0xa0800000 /* loadaddr env var */ - #define CONFIG_EXTRA_ENV_SETTINGS \ "netdev=eth0\0" \ "nfsargs=setenv bootargs root=/dev/nfs rw " \ diff --git a/include/configs/imx8mm-cl-iot-gate.h b/include/configs/imx8mm-cl-iot-gate.h index c994d717f57..dac3077eaf0 100644 --- a/include/configs/imx8mm-cl-iot-gate.h +++ b/include/configs/imx8mm-cl-iot-gate.h @@ -140,7 +140,6 @@ #endif /* Link Definitions */ -#define CONFIG_SYS_LOAD_ADDR 0x40480000 #define CONFIG_SYS_INIT_RAM_ADDR 0x40000000 #define CONFIG_SYS_INIT_RAM_SIZE 0x80000 diff --git a/include/configs/imx8mm_beacon.h b/include/configs/imx8mm_beacon.h index 7423e283840..2131a01c427 100644 --- a/include/configs/imx8mm_beacon.h +++ b/include/configs/imx8mm_beacon.h @@ -93,7 +93,6 @@ "fi;" /* Link Definitions */ -#define CONFIG_SYS_LOAD_ADDR 0x40480000 #define CONFIG_SYS_INIT_RAM_ADDR 0x40000000 #define CONFIG_SYS_INIT_RAM_SIZE 0x200000 diff --git a/include/configs/imx8mm_evk.h b/include/configs/imx8mm_evk.h index 6aa7c2a5b9b..117c98916f8 100644 --- a/include/configs/imx8mm_evk.h +++ b/include/configs/imx8mm_evk.h @@ -57,7 +57,6 @@ "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \ /* Link Definitions */ -#define CONFIG_SYS_LOAD_ADDR 0x40480000 #define CONFIG_SYS_INIT_RAM_ADDR 0x40000000 #define CONFIG_SYS_INIT_RAM_SIZE 0x200000 diff --git a/include/configs/imx8mm_icore_mx8mm.h b/include/configs/imx8mm_icore_mx8mm.h index 9d63b8c4f14..cceb932d229 100644 --- a/include/configs/imx8mm_icore_mx8mm.h +++ b/include/configs/imx8mm_icore_mx8mm.h @@ -56,7 +56,6 @@ BOOTENV /* Link Definitions */ -#define CONFIG_SYS_LOAD_ADDR 0x40480000 #define CONFIG_SYS_INIT_RAM_ADDR 0x40000000 #define CONFIG_SYS_INIT_RAM_SIZE SZ_2M diff --git a/include/configs/imx8mm_venice.h b/include/configs/imx8mm_venice.h index ed3307166e3..010705e0f86 100644 --- a/include/configs/imx8mm_venice.h +++ b/include/configs/imx8mm_venice.h @@ -37,7 +37,6 @@ "scriptaddr=0x46000000\0" /* Link Definitions */ -#define CONFIG_SYS_LOAD_ADDR 0x40480000 /* Enable Distro Boot */ #ifndef CONFIG_SPL_BUILD diff --git a/include/configs/imx8mn_beacon.h b/include/configs/imx8mn_beacon.h index 0975e786dc2..187cf8c6171 100644 --- a/include/configs/imx8mn_beacon.h +++ b/include/configs/imx8mn_beacon.h @@ -108,7 +108,6 @@ "else booti ${loadaddr} - ${fdt_addr}; fi" /* Link Definitions */ -#define CONFIG_SYS_LOAD_ADDR 0x40480000 #define CONFIG_SYS_INIT_RAM_ADDR 0x40000000 #define CONFIG_SYS_INIT_RAM_SIZE 0x200000 diff --git a/include/configs/imx8mn_evk.h b/include/configs/imx8mn_evk.h index feb96b41b36..2be4750f5f9 100644 --- a/include/configs/imx8mn_evk.h +++ b/include/configs/imx8mn_evk.h @@ -56,7 +56,6 @@ "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \ /* Link Definitions */ -#define CONFIG_SYS_LOAD_ADDR 0x40480000 #define CONFIG_SYS_INIT_RAM_ADDR 0x40000000 #define CONFIG_SYS_INIT_RAM_SIZE 0x200000 diff --git a/include/configs/imx8mp_evk.h b/include/configs/imx8mp_evk.h index 32c50cd0669..742e66c4ac2 100644 --- a/include/configs/imx8mp_evk.h +++ b/include/configs/imx8mp_evk.h @@ -79,7 +79,6 @@ "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \ /* Link Definitions */ -#define CONFIG_SYS_LOAD_ADDR 0x40480000 #define CONFIG_SYS_INIT_RAM_ADDR 0x40000000 #define CONFIG_SYS_INIT_RAM_SIZE 0x80000 diff --git a/include/configs/imx8mq_cm.h b/include/configs/imx8mq_cm.h index a3267c47ae2..2f7db8e1cb1 100644 --- a/include/configs/imx8mq_cm.h +++ b/include/configs/imx8mq_cm.h @@ -65,7 +65,6 @@ "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \ /* Link Definitions */ -#define CONFIG_SYS_LOAD_ADDR 0x40480000 #define CONFIG_SYS_INIT_RAM_ADDR 0x40000000 #define CONFIG_SYS_INIT_RAM_SIZE 0x80000 diff --git a/include/configs/imx8mq_evk.h b/include/configs/imx8mq_evk.h index fc86ba3dcca..2f302ad2ce6 100644 --- a/include/configs/imx8mq_evk.h +++ b/include/configs/imx8mq_evk.h @@ -94,7 +94,6 @@ "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \ /* Link Definitions */ -#define CONFIG_SYS_LOAD_ADDR 0x40480000 #define CONFIG_SYS_INIT_RAM_ADDR 0x40000000 #define CONFIG_SYS_INIT_RAM_SIZE 0x80000 diff --git a/include/configs/imx8mq_phanbell.h b/include/configs/imx8mq_phanbell.h index d246115b32b..13e75d5730c 100644 --- a/include/configs/imx8mq_phanbell.h +++ b/include/configs/imx8mq_phanbell.h @@ -137,7 +137,6 @@ "else booti ${loadaddr} - ${fdt_addr}; fi" /* Link Definitions */ -#define CONFIG_SYS_LOAD_ADDR 0x40480000 #define CONFIG_SYS_INIT_RAM_ADDR 0x40000000 #define CONFIG_SYS_INIT_RAM_SIZE 0x80000 diff --git a/include/configs/imx8qm_mek.h b/include/configs/imx8qm_mek.h index 04ad3db8ed7..d37c1263a70 100644 --- a/include/configs/imx8qm_mek.h +++ b/include/configs/imx8qm_mek.h @@ -145,7 +145,6 @@ "else booti ${loadaddr} - ${fdt_addr}; fi" /* Link Definitions */ -#define CONFIG_SYS_LOAD_ADDR 0x80280000 #define CONFIG_SYS_INIT_SP_ADDR 0x80200000 diff --git a/include/configs/imx8qm_rom7720.h b/include/configs/imx8qm_rom7720.h index 9c7bf4be53c..6810f50f96a 100644 --- a/include/configs/imx8qm_rom7720.h +++ b/include/configs/imx8qm_rom7720.h @@ -122,7 +122,6 @@ "else booti ${loadaddr} - ${fdt_addr}; fi" /* Link Definitions */ -#define CONFIG_SYS_LOAD_ADDR 0x80280000 #define CONFIG_SYS_INIT_SP_ADDR 0x80200000 diff --git a/include/configs/imx8qxp_mek.h b/include/configs/imx8qxp_mek.h index bab8021a55a..e632aed0865 100644 --- a/include/configs/imx8qxp_mek.h +++ b/include/configs/imx8qxp_mek.h @@ -144,7 +144,6 @@ "else booti ${loadaddr} - ${fdt_addr}; fi" /* Link Definitions */ -#define CONFIG_SYS_LOAD_ADDR 0x80280000 #define CONFIG_SYS_INIT_SP_ADDR 0x80200000 diff --git a/include/configs/imx8ulp_evk.h b/include/configs/imx8ulp_evk.h index 154ae693c54..17fd429124d 100644 --- a/include/configs/imx8ulp_evk.h +++ b/include/configs/imx8ulp_evk.h @@ -76,7 +76,6 @@ "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \ /* Link Definitions */ -#define CONFIG_SYS_LOAD_ADDR 0x80480000 #define CONFIG_SYS_INIT_RAM_ADDR 0x80000000 #define CONFIG_SYS_INIT_RAM_SIZE 0x80000 diff --git a/include/configs/imxrt1020-evk.h b/include/configs/imxrt1020-evk.h index a2b1ab10d9b..bd5b013fb8a 100644 --- a/include/configs/imxrt1020-evk.h +++ b/include/configs/imxrt1020-evk.h @@ -11,12 +11,6 @@ #define CONFIG_SYS_INIT_SP_ADDR 0x20240000 -#ifdef CONFIG_SUPPORT_SPL -#define CONFIG_SYS_LOAD_ADDR 0x20209000 -#else -#define CONFIG_SYS_LOAD_ADDR 0x80000000 -#endif - #define CONFIG_SYS_FSL_ERRATUM_ESDHC135 1 #define ESDHCI_QUIRK_BROKEN_TIMEOUT_VALUE 1 diff --git a/include/configs/imxrt1050-evk.h b/include/configs/imxrt1050-evk.h index c4787ab3184..2c6433c4abe 100644 --- a/include/configs/imxrt1050-evk.h +++ b/include/configs/imxrt1050-evk.h @@ -11,12 +11,6 @@ #define CONFIG_SYS_INIT_SP_ADDR 0x20280000 -#ifdef CONFIG_SUPPORT_SPL -#define CONFIG_SYS_LOAD_ADDR 0x20209000 -#else -#define CONFIG_SYS_LOAD_ADDR 0x80000000 -#endif - #define CONFIG_SYS_FSL_ERRATUM_ESDHC135 1 #define ESDHCI_QUIRK_BROKEN_TIMEOUT_VALUE 1 diff --git a/include/configs/integrator-common.h b/include/configs/integrator-common.h index 89ab0da50cd..80fcdac100e 100644 --- a/include/configs/integrator-common.h +++ b/include/configs/integrator-common.h @@ -7,7 +7,6 @@ */ #define CONFIG_SYS_TIMERBASE 0x13000100 /* Timer1 */ -#define CONFIG_SYS_LOAD_ADDR 0x7fc0 /* default load address */ #define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 128*1024) /* Size of malloc() pool */ #define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */ diff --git a/include/configs/iot_devkit.h b/include/configs/iot_devkit.h index 93abae02fce..48a229c9f4f 100644 --- a/include/configs/iot_devkit.h +++ b/include/configs/iot_devkit.h @@ -59,7 +59,6 @@ #define CONFIG_SYS_MALLOC_LEN SZ_64K #define CONFIG_SYS_BOOTM_LEN SZ_128K -#define CONFIG_SYS_LOAD_ADDR SRAM_BASE #define ROM_BASE CONFIG_SYS_MONITOR_BASE #define ROM_SIZE SZ_256K diff --git a/include/configs/km/km-powerpc.h b/include/configs/km/km-powerpc.h index 95969a0f8f5..bccf5e831e0 100644 --- a/include/configs/km/km-powerpc.h +++ b/include/configs/km/km-powerpc.h @@ -12,8 +12,6 @@ /* EEprom support 24C08, 24C16, 24C64 */ #define CONFIG_SYS_EEPROM_PAGE_WRITE_ENABLE -#define CONFIG_SYS_LOAD_ADDR 0x100000 /* default load address */ - /* Reserve 4 MB for malloc */ #define CONFIG_SYS_MALLOC_LEN (4 * 1024 * 1024) diff --git a/include/configs/km/km_arm.h b/include/configs/km/km_arm.h index 7dff0f4bf38..f5e67d830ab 100644 --- a/include/configs/km/km_arm.h +++ b/include/configs/km/km_arm.h @@ -40,8 +40,6 @@ #include "asm/arch/config.h" -#define CONFIG_SYS_LOAD_ADDR 0x00800000 /* default load adr- 8M */ - /* architecture specific default bootargs */ #define CONFIG_KM_DEF_BOOT_ARGS_CPU \ "bootcountaddr=${bootcountaddr} ${mtdparts}" \ diff --git a/include/configs/km/pg-wcom-ls102xa.h b/include/configs/km/pg-wcom-ls102xa.h index 973718a984f..f95ae2c1d77 100644 --- a/include/configs/km/pg-wcom-ls102xa.h +++ b/include/configs/km/pg-wcom-ls102xa.h @@ -214,8 +214,6 @@ * Miscellaneous configurable options */ -#define CONFIG_SYS_LOAD_ADDR 0x82000000 - #define CONFIG_LS102XA_STREAM_ID #define CONFIG_SYS_INIT_SP_OFFSET \ diff --git a/include/configs/kmcent2.h b/include/configs/kmcent2.h index 50ce4f0ce5b..b221fdd622a 100644 --- a/include/configs/kmcent2.h +++ b/include/configs/kmcent2.h @@ -185,8 +185,6 @@ #define SPD_EEPROM_ADDRESS 0x54 #define CONFIG_SYS_SDRAM_SIZE 4096 /* for fixed parameter use */ -#define CONFIG_SYS_LOAD_ADDR 0x2000000 /* default load address */ - /****************************************************************************** * (PRAM usage) * ... ------------------------------------------------------- diff --git a/include/configs/kontron_sl28.h b/include/configs/kontron_sl28.h index 48e791b0ffe..21f8e416001 100644 --- a/include/configs/kontron_sl28.h +++ b/include/configs/kontron_sl28.h @@ -68,7 +68,6 @@ /* environment */ /* see include/configs/ti_armv7_common.h */ -#define CONFIG_SYS_LOAD_ADDR 0x82000000 #define ENV_MEM_LAYOUT_SETTINGS \ "loadaddr=0x82000000\0" \ "kernel_addr_r=0x82000000\0" \ diff --git a/include/configs/kp_imx53.h b/include/configs/kp_imx53.h index 69730075682..5d24a0523aa 100644 --- a/include/configs/kp_imx53.h +++ b/include/configs/kp_imx53.h @@ -20,7 +20,6 @@ #define CONFIG_MXC_USB_FLAGS 0 /* Command definition */ -#define CONFIG_SYS_LOAD_ADDR 0x72000000 /* loadaddr env var */ #define CONFIG_EXTRA_ENV_SETTINGS \ "console=ttymxc1,115200\0" \ diff --git a/include/configs/kp_imx6q_tpc.h b/include/configs/kp_imx6q_tpc.h index 91023f44a52..ce81a66dc40 100644 --- a/include/configs/kp_imx6q_tpc.h +++ b/include/configs/kp_imx6q_tpc.h @@ -36,7 +36,6 @@ #define CONFIG_MXC_USB_FLAGS 0 #define CONFIG_USB_MAX_CONTROLLER_COUNT 2 /* Enabled USB controller number */ #endif -#define CONFIG_SYS_LOAD_ADDR 0x12000000 #ifndef CONFIG_SPL_BUILD #define CONFIG_EXTRA_ENV_SETTINGS \ diff --git a/include/configs/kzm9g.h b/include/configs/kzm9g.h index 6bade5e440e..e447f527a5f 100644 --- a/include/configs/kzm9g.h +++ b/include/configs/kzm9g.h @@ -46,7 +46,6 @@ #define CONFIG_SDRAM_OFFSET_FOR_RT (16 * 1024 * 1024) #define CONFIG_SYS_SDRAM_BASE (KZM_SDRAM_BASE + CONFIG_SDRAM_OFFSET_FOR_RT) #define CONFIG_SYS_SDRAM_SIZE (PHYS_SDRAM_SIZE - CONFIG_SDRAM_OFFSET_FOR_RT) -#define CONFIG_SYS_LOAD_ADDR (CONFIG_SYS_SDRAM_BASE + 32 * 1024 * 1024) #define CONFIG_SYS_MONITOR_BASE (KZM_FLASH_BASE) #define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 128 * 1024) diff --git a/include/configs/legoev3.h b/include/configs/legoev3.h index 5de81c0a426..39c0c38f2da 100644 --- a/include/configs/legoev3.h +++ b/include/configs/legoev3.h @@ -56,7 +56,6 @@ #define CONFIG_BOOTFILE "uImage" /* Boot file name */ #define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */ #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE /* Boot Args Buffer Size */ -#define CONFIG_SYS_LOAD_ADDR (PHYS_SDRAM_1 + 0x700000) /* * Linux Information diff --git a/include/configs/linkit-smart-7688.h b/include/configs/linkit-smart-7688.h index e7a7ae31989..0324d66a672 100644 --- a/include/configs/linkit-smart-7688.h +++ b/include/configs/linkit-smart-7688.h @@ -12,8 +12,6 @@ /* RAM */ #define CONFIG_SYS_SDRAM_BASE 0x80000000 -#define CONFIG_SYS_LOAD_ADDR CONFIG_SYS_SDRAM_BASE + 0x100000 - #define CONFIG_SYS_INIT_SP_OFFSET 0x400000 /* SPL */ diff --git a/include/configs/ls1012a_common.h b/include/configs/ls1012a_common.h index 498b86f30a1..c28424417be 100644 --- a/include/configs/ls1012a_common.h +++ b/include/configs/ls1012a_common.h @@ -19,7 +19,6 @@ #else #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_FSL_OCRAM_BASE + 0xfff0) #endif -#define CONFIG_SYS_LOAD_ADDR (CONFIG_SYS_DDR_SDRAM_BASE + 0x10000000) #define CONFIG_SYS_DDR_SDRAM_BASE 0x80000000 #define CONFIG_SYS_FSL_DDR_SDRAM_BASE_PHY 0 diff --git a/include/configs/ls1021aiot.h b/include/configs/ls1021aiot.h index e2a70d29c38..0653fd576e7 100644 --- a/include/configs/ls1021aiot.h +++ b/include/configs/ls1021aiot.h @@ -180,8 +180,6 @@ */ #define CONFIG_SYS_BOOTMAPSZ (256 << 20) -#define CONFIG_SYS_LOAD_ADDR 0x82000000 - #define CONFIG_LS102XA_STREAM_ID #define CONFIG_SYS_INIT_SP_OFFSET \ diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h index 608e91d1207..6c5aa401d2c 100644 --- a/include/configs/ls1021aqds.h +++ b/include/configs/ls1021aqds.h @@ -440,8 +440,6 @@ unsigned long get_board_sys_clk(void); */ #define CONFIG_SYS_BOOTMAPSZ (256 << 20) -#define CONFIG_SYS_LOAD_ADDR 0x82000000 - #define CONFIG_LS102XA_STREAM_ID #define CONFIG_SYS_INIT_SP_OFFSET \ diff --git a/include/configs/ls1021atsn.h b/include/configs/ls1021atsn.h index 490e86f6488..20b67b02b17 100644 --- a/include/configs/ls1021atsn.h +++ b/include/configs/ls1021atsn.h @@ -206,8 +206,6 @@ #define CONFIG_SYS_MAXARGS 16 /* max number of command args */ #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE -#define CONFIG_SYS_LOAD_ADDR 0x82000000 - #define CONFIG_LS102XA_STREAM_ID #define CONFIG_SYS_INIT_SP_OFFSET \ diff --git a/include/configs/ls1021atwr.h b/include/configs/ls1021atwr.h index 56f30ff4b31..70897c2c1c4 100644 --- a/include/configs/ls1021atwr.h +++ b/include/configs/ls1021atwr.h @@ -415,8 +415,6 @@ */ #define CONFIG_SYS_BOOTMAPSZ (256 << 20) -#define CONFIG_SYS_LOAD_ADDR 0x82000000 - #define CONFIG_LS102XA_STREAM_ID #define CONFIG_SYS_INIT_SP_OFFSET \ diff --git a/include/configs/ls1028a_common.h b/include/configs/ls1028a_common.h index 48754747a9b..e413ebacfd1 100644 --- a/include/configs/ls1028a_common.h +++ b/include/configs/ls1028a_common.h @@ -53,7 +53,6 @@ #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 } /* Miscellaneous configurable options */ -#define CONFIG_SYS_LOAD_ADDR (CONFIG_SYS_DDR_SDRAM_BASE + 0x10000000) /* Physical Memory Map */ #define CONFIG_CHIP_SELECTS_PER_CTRL 4 diff --git a/include/configs/ls1043a_common.h b/include/configs/ls1043a_common.h index 82275e4cf20..9b7089e9784 100644 --- a/include/configs/ls1043a_common.h +++ b/include/configs/ls1043a_common.h @@ -206,7 +206,6 @@ #endif /* Miscellaneous configurable options */ -#define CONFIG_SYS_LOAD_ADDR (CONFIG_SYS_DDR_SDRAM_BASE + 0x10000000) #define CONFIG_HWCONFIG #define HWCONFIG_BUFFER_SIZE 128 diff --git a/include/configs/ls1046a_common.h b/include/configs/ls1046a_common.h index 72422eac696..039c9a4205c 100644 --- a/include/configs/ls1046a_common.h +++ b/include/configs/ls1046a_common.h @@ -183,7 +183,6 @@ #endif /* Miscellaneous configurable options */ -#define CONFIG_SYS_LOAD_ADDR (CONFIG_SYS_DDR_SDRAM_BASE + 0x10000000) #define CONFIG_HWCONFIG #define HWCONFIG_BUFFER_SIZE 128 diff --git a/include/configs/ls1088a_common.h b/include/configs/ls1088a_common.h index 638fc49dca9..409c398bb43 100644 --- a/include/configs/ls1088a_common.h +++ b/include/configs/ls1088a_common.h @@ -144,7 +144,6 @@ unsigned long long get_qixis_addr(void); #endif /* Miscellaneous configurable options */ -#define CONFIG_SYS_LOAD_ADDR (CONFIG_SYS_DDR_SDRAM_BASE + 0x10000000) /* SATA */ #ifdef CONFIG_SCSI diff --git a/include/configs/ls2080a_common.h b/include/configs/ls2080a_common.h index ec9905f7534..92fed88f0c3 100644 --- a/include/configs/ls2080a_common.h +++ b/include/configs/ls2080a_common.h @@ -153,7 +153,6 @@ unsigned long long get_qixis_addr(void); #endif /* Miscellaneous configurable options */ -#define CONFIG_SYS_LOAD_ADDR (CONFIG_SYS_DDR_SDRAM_BASE + 0x10000000) /* Physical Memory Map */ /* fixme: these need to be checked against the board */ diff --git a/include/configs/lx2160a_common.h b/include/configs/lx2160a_common.h index a701b2ce629..6bc28b5468e 100644 --- a/include/configs/lx2160a_common.h +++ b/include/configs/lx2160a_common.h @@ -45,7 +45,6 @@ #define CONFIG_SYS_MONITOR_LEN (936 * 1024) /* Miscellaneous configurable options */ -#define CONFIG_SYS_LOAD_ADDR (CONFIG_SYS_DDR_SDRAM_BASE + 0x10000000) /* SMP Definitinos */ #define CPU_RELEASE_ADDR secondary_boot_addr diff --git a/include/configs/m53menlo.h b/include/configs/m53menlo.h index 1bcd40dd20f..3e053fd620a 100644 --- a/include/configs/m53menlo.h +++ b/include/configs/m53menlo.h @@ -136,7 +136,6 @@ #define CONFIG_REVISION_TAG #define CONFIG_SETUP_MEMORY_TAGS #define CONFIG_BOOTFILE "boot/fitImage" -#define CONFIG_SYS_LOAD_ADDR 0x70800000 #define CONFIG_BOOTCOMMAND "run mmc_mmc" /* diff --git a/include/configs/malta.h b/include/configs/malta.h index 9602773ff91..5f89f73be25 100644 --- a/include/configs/malta.h +++ b/include/configs/malta.h @@ -38,8 +38,6 @@ #define CONFIG_SYS_INIT_SP_OFFSET 0x400000 -#define CONFIG_SYS_LOAD_ADDR (CONFIG_SYS_SDRAM_BASE + 0x01000000) - #define CONFIG_SYS_MALLOC_LEN (128 * 1024) #define CONFIG_SYS_BOOTPARAMS_LEN (128 * 1024) #define CONFIG_SYS_BOOTM_LEN (64 * 1024 * 1024) diff --git a/include/configs/meesc.h b/include/configs/meesc.h index bd4bac7aab3..beeb9a75432 100644 --- a/include/configs/meesc.h +++ b/include/configs/meesc.h @@ -58,8 +58,6 @@ #define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM #define CONFIG_SYS_SDRAM_SIZE PHYS_SDRAM_SIZE -#define CONFIG_SYS_LOAD_ADDR (CONFIG_SYS_SDRAM_BASE + 0x00100000) - /* * Initial stack pointer: 4k - GENERATED_GBL_DATA_SIZE in internal SRAM, * leaving the correct space for initial global data structure above diff --git a/include/configs/meson64.h b/include/configs/meson64.h index f9bb0240d2c..865055aa31c 100644 --- a/include/configs/meson64.h +++ b/include/configs/meson64.h @@ -39,7 +39,6 @@ #define CONFIG_SYS_SDRAM_BASE 0 #define CONFIG_SYS_INIT_SP_ADDR 0x20000000 -#define CONFIG_SYS_LOAD_ADDR CONFIG_SYS_TEXT_BASE #define CONFIG_SYS_BOOTM_LEN (64 << 20) /* 64 MiB */ /* ROM USB boot support, auto-execute boot.scr at scriptaddr */ diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h index 59b20cf116a..6d25b900ae6 100644 --- a/include/configs/microblaze-generic.h +++ b/include/configs/microblaze-generic.h @@ -55,8 +55,6 @@ #define CONFIG_SYS_CBSIZE 512 /* max number of command args */ #define CONFIG_SYS_MAXARGS 15 -/* default load address */ -#define CONFIG_SYS_LOAD_ADDR 0 #define CONFIG_HOSTNAME "microblaze-generic" diff --git a/include/configs/microchip_mpfs_icicle.h b/include/configs/microchip_mpfs_icicle.h index 24990370cf0..c3274bd3e87 100644 --- a/include/configs/microchip_mpfs_icicle.h +++ b/include/configs/microchip_mpfs_icicle.h @@ -12,8 +12,6 @@ #define CONFIG_SYS_SDRAM_BASE 0x80000000 #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_SDRAM_BASE + SZ_2M) -#define CONFIG_SYS_LOAD_ADDR (CONFIG_SYS_SDRAM_BASE + SZ_2M) - #define CONFIG_SYS_MALLOC_LEN SZ_8M #define CONFIG_SYS_BOOTM_LEN SZ_64M diff --git a/include/configs/mt7620.h b/include/configs/mt7620.h index 4d074a36888..d600cd48ff8 100644 --- a/include/configs/mt7620.h +++ b/include/configs/mt7620.h @@ -17,7 +17,6 @@ #define CONFIG_SYS_BOOTPARAMS_LEN 0x20000 #define CONFIG_SYS_SDRAM_BASE 0x80000000 -#define CONFIG_SYS_LOAD_ADDR 0x80010000 #define CONFIG_SYS_INIT_SP_OFFSET 0x400000 diff --git a/include/configs/mt7622.h b/include/configs/mt7622.h index 9820d6ac585..3bddbe7bcba 100644 --- a/include/configs/mt7622.h +++ b/include/configs/mt7622.h @@ -27,9 +27,6 @@ #define CONFIG_SYS_UBOOT_START CONFIG_SYS_TEXT_BASE #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_TEXT_BASE + SZ_2M - \ GENERATED_GBL_DATA_SIZE) -/* UBoot -> Kernel */ -#define CONFIG_SYS_LOAD_ADDR 0x4007ff28 - /* DRAM */ #define CONFIG_SYS_SDRAM_BASE 0x40000000 diff --git a/include/configs/mt7623.h b/include/configs/mt7623.h index 6ceb9af264e..70375434144 100644 --- a/include/configs/mt7623.h +++ b/include/configs/mt7623.h @@ -32,9 +32,6 @@ #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_TEXT_BASE + SZ_2M - \ GENERATED_GBL_DATA_SIZE) -/* UBoot -> Kernel */ -#define CONFIG_SYS_LOAD_ADDR 0x84000000 - /* MMC */ #define MMC_SUPPORTS_TUNING diff --git a/include/configs/mt7628.h b/include/configs/mt7628.h index c6752f4acb7..b52d4797f7c 100644 --- a/include/configs/mt7628.h +++ b/include/configs/mt7628.h @@ -17,7 +17,6 @@ #define CONFIG_SYS_BOOTPARAMS_LEN 0x20000 #define CONFIG_SYS_SDRAM_BASE 0x80000000 -#define CONFIG_SYS_LOAD_ADDR 0x80010000 #define CONFIG_SYS_INIT_SP_OFFSET 0x80000 diff --git a/include/configs/mt7629.h b/include/configs/mt7629.h index 53f2c3ad368..17efbd8fdc2 100644 --- a/include/configs/mt7629.h +++ b/include/configs/mt7629.h @@ -43,7 +43,6 @@ /* UBoot -> Kernel */ #define CONFIG_SYS_SPL_ARGS_ADDR 0x40000000 -#define CONFIG_SYS_LOAD_ADDR 0x42007f1c /* DRAM */ #define CONFIG_SYS_SDRAM_BASE 0x40000000 diff --git a/include/configs/mt8183.h b/include/configs/mt8183.h index 8e7afbb48a7..cb11096c26a 100644 --- a/include/configs/mt8183.h +++ b/include/configs/mt8183.h @@ -11,7 +11,6 @@ #include -#define CONFIG_SYS_LOAD_ADDR CONFIG_SYS_TEXT_BASE #define CONFIG_SYS_MALLOC_LEN SZ_4M #define CONFIG_CPU_ARMV8 diff --git a/include/configs/mt8512.h b/include/configs/mt8512.h index 8d667d07306..66a88f51ca4 100644 --- a/include/configs/mt8512.h +++ b/include/configs/mt8512.h @@ -17,8 +17,6 @@ #define COUNTER_FREQUENCY 13000000 -#define CONFIG_SYS_LOAD_ADDR 0x41000000 - #define CONFIG_SYS_MALLOC_LEN SZ_32M #define CONFIG_SYS_BOOTM_LEN SZ_64M diff --git a/include/configs/mt8516.h b/include/configs/mt8516.h index a1c5d8174be..320c18f8352 100644 --- a/include/configs/mt8516.h +++ b/include/configs/mt8516.h @@ -11,7 +11,6 @@ #include -#define CONFIG_SYS_LOAD_ADDR CONFIG_SYS_TEXT_BASE #define CONFIG_SYS_MALLOC_LEN SZ_4M #define CONFIG_CPU_ARMV8 diff --git a/include/configs/mt8518.h b/include/configs/mt8518.h index a3005460e58..f5aa0909fa6 100644 --- a/include/configs/mt8518.h +++ b/include/configs/mt8518.h @@ -21,8 +21,6 @@ #define CONFIG_SYS_SDRAM_BASE 0x40000000 #define CONFIG_SYS_SDRAM_SIZE 0x20000000 -#define CONFIG_SYS_LOAD_ADDR 0x41000000 - #define CONFIG_SYS_MALLOC_LEN SZ_32M #define CONFIG_SYS_BOOTM_LEN SZ_64M diff --git a/include/configs/mv-common.h b/include/configs/mv-common.h index d61c90a4315..acd99208b07 100644 --- a/include/configs/mv-common.h +++ b/include/configs/mv-common.h @@ -60,7 +60,6 @@ /* * Other required minimal configurations */ -#define CONFIG_SYS_LOAD_ADDR 0x00800000 /* default load adr- 8M */ #define CONFIG_SYS_RESET_ADDRESS 0xffff0000 /* Rst Vector Adr */ #define CONFIG_SYS_MAXARGS 32 /* max number of command args */ diff --git a/include/configs/mvebu_armada-37xx.h b/include/configs/mvebu_armada-37xx.h index 46d05692708..31dc58d6597 100644 --- a/include/configs/mvebu_armada-37xx.h +++ b/include/configs/mvebu_armada-37xx.h @@ -44,7 +44,6 @@ /* * Other required minimal configurations */ -#define CONFIG_SYS_LOAD_ADDR 0x06000000 /* default load adr */ #define CONFIG_SYS_RESET_ADDRESS 0xffff0000 /* Rst Vector Adr */ #define CONFIG_SYS_MAXARGS 32 /* max number of command args */ diff --git a/include/configs/mvebu_armada-8k.h b/include/configs/mvebu_armada-8k.h index 493e3de9b9f..dcb48c090cb 100644 --- a/include/configs/mvebu_armada-8k.h +++ b/include/configs/mvebu_armada-8k.h @@ -38,7 +38,6 @@ /* * Other required minimal configurations */ -#define CONFIG_SYS_LOAD_ADDR 0x00800000 /* default load adr- 8M */ #define CONFIG_SYS_RESET_ADDRESS 0xffff0000 /* Rst Vector Adr */ #define CONFIG_SYS_MAXARGS 32 /* max number of command args */ diff --git a/include/configs/mx23_olinuxino.h b/include/configs/mx23_olinuxino.h index ba24cd1e666..0314f349c06 100644 --- a/include/configs/mx23_olinuxino.h +++ b/include/configs/mx23_olinuxino.h @@ -27,7 +27,6 @@ /* Booting Linux */ #define CONFIG_BOOTFILE "uImage" -#define CONFIG_SYS_LOAD_ADDR 0x42000000 /* Extra Environment */ #define CONFIG_EXTRA_ENV_SETTINGS \ diff --git a/include/configs/mx23evk.h b/include/configs/mx23evk.h index ad0e4abafbf..d82dbc1df22 100644 --- a/include/configs/mx23evk.h +++ b/include/configs/mx23evk.h @@ -36,7 +36,6 @@ /* Boot Linux */ #define CONFIG_BOOTFILE "uImage" -#define CONFIG_SYS_LOAD_ADDR 0x42000000 /* Extra Environments */ #define CONFIG_EXTRA_ENV_SETTINGS \ diff --git a/include/configs/mx28evk.h b/include/configs/mx28evk.h index 5d51ff1af9c..f5f1ab0854a 100644 --- a/include/configs/mx28evk.h +++ b/include/configs/mx28evk.h @@ -50,7 +50,6 @@ /* Boot Linux */ #define CONFIG_BOOTFILE "uImage" -#define CONFIG_SYS_LOAD_ADDR 0x42000000 /* Extra Environment */ #define CONFIG_EXTRA_ENV_SETTINGS \ diff --git a/include/configs/mx51evk.h b/include/configs/mx51evk.h index 38609cf049b..25761fb4f1e 100644 --- a/include/configs/mx51evk.h +++ b/include/configs/mx51evk.h @@ -61,8 +61,6 @@ #define CONFIG_ETHPRIME "FEC0" -#define CONFIG_SYS_LOAD_ADDR 0x92000000 /* loadaddr env var */ - #define CONFIG_EXTRA_ENV_SETTINGS \ "script=boot.scr\0" \ "image=zImage\0" \ diff --git a/include/configs/mx53cx9020.h b/include/configs/mx53cx9020.h index 2e9958bca60..570131fe713 100644 --- a/include/configs/mx53cx9020.h +++ b/include/configs/mx53cx9020.h @@ -43,8 +43,6 @@ /* Command definition */ -#define CONFIG_SYS_LOAD_ADDR 0x70010000 /* loadaddr env var */ - #define BOOT_TARGET_DEVICES(func) \ func(MMC, mmc, 0) \ func(MMC, mmc, 1) \ diff --git a/include/configs/mx53loco.h b/include/configs/mx53loco.h index deb928f91d9..5f121da50ce 100644 --- a/include/configs/mx53loco.h +++ b/include/configs/mx53loco.h @@ -49,8 +49,6 @@ #define CONFIG_ETHPRIME "FEC0" -#define CONFIG_SYS_LOAD_ADDR 0x72000000 /* loadaddr env var */ - #define CONFIG_EXTRA_ENV_SETTINGS \ "script=boot.scr\0" \ "image=zImage\0" \ diff --git a/include/configs/mx53ppd.h b/include/configs/mx53ppd.h index ca62d0ff159..6e51e966169 100644 --- a/include/configs/mx53ppd.h +++ b/include/configs/mx53ppd.h @@ -33,8 +33,6 @@ /* Command definition */ -#define CONFIG_SYS_LOAD_ADDR 0x72000000 /* loadaddr env var */ - #define PPD_CONFIG_NFS \ "nfsserver=192.168.252.95\0" \ "gatewayip=192.168.252.95\0" \ diff --git a/include/configs/mx6_common.h b/include/configs/mx6_common.h index ac212aea3b1..71ffcc236bf 100644 --- a/include/configs/mx6_common.h +++ b/include/configs/mx6_common.h @@ -39,15 +39,6 @@ #define CONFIG_INITRD_TAG #define CONFIG_REVISION_TAG -/* Boot options */ -#if defined(CONFIG_MX6SL) || defined(CONFIG_MX6SLL) || \ - defined(CONFIG_MX6SX) || \ - defined(CONFIG_MX6UL) || defined(CONFIG_MX6ULL) -#define CONFIG_SYS_LOAD_ADDR 0x82000000 -#else -#define CONFIG_SYS_LOAD_ADDR 0x12000000 -#endif - /* Miscellaneous configurable options */ #define CONFIG_SYS_CBSIZE 512 #define CONFIG_SYS_MAXARGS 32 diff --git a/include/configs/mx7_common.h b/include/configs/mx7_common.h index 8af1338880c..eb50f5df31c 100644 --- a/include/configs/mx7_common.h +++ b/include/configs/mx7_common.h @@ -28,8 +28,6 @@ /* Enable iomux-lpsr support */ #define CONFIG_IOMUX_LPSR -#define CONFIG_SYS_LOAD_ADDR 0x80800000 - /* Miscellaneous configurable options */ #define CONFIG_SYS_CBSIZE 512 #define CONFIG_SYS_MAXARGS 32 diff --git a/include/configs/mx7ulp_com.h b/include/configs/mx7ulp_com.h index 6c19997793e..52a88ad82b3 100644 --- a/include/configs/mx7ulp_com.h +++ b/include/configs/mx7ulp_com.h @@ -47,8 +47,6 @@ #define PHYS_SDRAM 0x60000000 #define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM -#define CONFIG_SYS_LOAD_ADDR 0x60800000 - #define CONFIG_EXTRA_ENV_SETTINGS \ "image=zImage\0" \ "console=ttyLP0\0" \ diff --git a/include/configs/mx7ulp_evk.h b/include/configs/mx7ulp_evk.h index ae0e6a0bbbc..e7d776a72ca 100644 --- a/include/configs/mx7ulp_evk.h +++ b/include/configs/mx7ulp_evk.h @@ -47,8 +47,6 @@ #define PHYS_SDRAM_SIZE SZ_1G #define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM -#define CONFIG_SYS_LOAD_ADDR 0x60800000 - #define CONFIG_EXTRA_ENV_SETTINGS \ "script=boot.scr\0" \ "image=zImage\0" \ diff --git a/include/configs/nokia_rx51.h b/include/configs/nokia_rx51.h index 7ef25ea8389..67395b47116 100644 --- a/include/configs/nokia_rx51.h +++ b/include/configs/nokia_rx51.h @@ -188,9 +188,6 @@ int rx51_kp_getc(struct stdio_dev *sdev); "run attachboot;" \ "echo" -/* default load address */ -#define CONFIG_SYS_LOAD_ADDR (OMAP34XX_SDRC_CS0) - /* * OMAP3 has 12 GP timers, they can be driven by the system clock * (12/13/16.8/19.2/38.4MHz) or by 32KHz clock. We use 13MHz (V_SCLK). diff --git a/include/configs/nsim.h b/include/configs/nsim.h index 69d582594e2..5bd097a9025 100644 --- a/include/configs/nsim.h +++ b/include/configs/nsim.h @@ -22,7 +22,6 @@ #define CONFIG_SYS_MALLOC_LEN SZ_2M #define CONFIG_SYS_BOOTM_LEN SZ_32M -#define CONFIG_SYS_LOAD_ADDR 0x82000000 /* * Environment configuration diff --git a/include/configs/nyan-big.h b/include/configs/nyan-big.h index 495753ba118..3584d9ad90e 100644 --- a/include/configs/nyan-big.h +++ b/include/configs/nyan-big.h @@ -26,9 +26,6 @@ /* SPI */ #define CONFIG_SPI_FLASH_SIZE (4 << 20) -#undef CONFIG_SYS_LOAD_ADDR -#define CONFIG_SYS_LOAD_ADDR 0x82408000 - #include "tegra-common-usb-gadget.h" #include "tegra-common-post.h" diff --git a/include/configs/octeon_common.h b/include/configs/octeon_common.h index 109ef4064de..80bbbceedbd 100644 --- a/include/configs/octeon_common.h +++ b/include/configs/octeon_common.h @@ -19,8 +19,6 @@ #define CONFIG_SYS_SDRAM_BASE 0xffffffff80000000 #define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE -#define CONFIG_SYS_LOAD_ADDR (CONFIG_SYS_SDRAM_BASE + (1 << 20)) - #define CONFIG_SYS_BOOTM_LEN (64 << 20) /* 64M */ #endif /* __OCTEON_COMMON_H__ */ diff --git a/include/configs/octeontx2_common.h b/include/configs/octeontx2_common.h index 280089617f1..99a1b4d4cfc 100644 --- a/include/configs/octeontx2_common.h +++ b/include/configs/octeontx2_common.h @@ -21,8 +21,6 @@ /** Heap size for U-Boot */ #define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 64 * 1024 * 1024) -#define CONFIG_SYS_LOAD_ADDR CONFIG_SYS_SDRAM_BASE - #define CONFIG_LAST_STAGE_INIT /* Allow environment variable to be overwritten */ diff --git a/include/configs/octeontx_common.h b/include/configs/octeontx_common.h index 0e4a17684f9..4822fd57530 100644 --- a/include/configs/octeontx_common.h +++ b/include/configs/octeontx_common.h @@ -46,8 +46,6 @@ /** Heap size for U-Boot */ #define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 64 * 1024 * 1024) -#define CONFIG_SYS_LOAD_ADDR CONFIG_SYS_SDRAM_BASE - /* Allow environment variable to be overwritten */ #define CONFIG_ENV_OVERWRITE diff --git a/include/configs/odroid.h b/include/configs/odroid.h index 1367d13891a..384885aa5ed 100644 --- a/include/configs/odroid.h +++ b/include/configs/odroid.h @@ -28,9 +28,6 @@ #define CONFIG_SYS_MEM_TOP_HIDE (1UL << 20UL) #define CONFIG_TZSW_RESERVED_DRAM_SIZE CONFIG_SYS_MEM_TOP_HIDE -/* memtest works on */ -#define CONFIG_SYS_LOAD_ADDR (CONFIG_SYS_SDRAM_BASE + 0x3E00000) - #include #define CONFIG_BOOTCOMMAND "run distro_bootcmd ; run autoboot" diff --git a/include/configs/omapl138_lcdk.h b/include/configs/omapl138_lcdk.h index a37359e6c32..f68f7bd1252 100644 --- a/include/configs/omapl138_lcdk.h +++ b/include/configs/omapl138_lcdk.h @@ -161,7 +161,6 @@ #define CONFIG_BOOTFILE "zImage" /* Boot file name */ #define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */ #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE /* Boot Args Buffer Size */ -#define CONFIG_SYS_LOAD_ADDR (PHYS_SDRAM_1 + 0x700000) /* * USB Configs diff --git a/include/configs/openpiton-riscv64.h b/include/configs/openpiton-riscv64.h index 42c64f3ca5e..47a3a96a0a1 100644 --- a/include/configs/openpiton-riscv64.h +++ b/include/configs/openpiton-riscv64.h @@ -16,7 +16,6 @@ /* Environment options */ #define CONFIG_SYS_SDRAM_BASE 0x80000000 #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_SDRAM_BASE + SZ_32M) -#define CONFIG_SYS_LOAD_ADDR 0x87000000 #define CONFIG_SYS_MALLOC_LEN SZ_256M #define CONFIG_SYS_BOOTM_LEN SZ_256M diff --git a/include/configs/origen.h b/include/configs/origen.h index 8a0e145c76c..d63de28bfec 100644 --- a/include/configs/origen.h +++ b/include/configs/origen.h @@ -19,9 +19,6 @@ #define PHYS_SDRAM_1 CONFIG_SYS_SDRAM_BASE #define SDRAM_BANK_SIZE (256 << 20) /* 256 MB */ -/* memtest works on */ -#define CONFIG_SYS_LOAD_ADDR (CONFIG_SYS_SDRAM_BASE + 0x3E00000) - #define CONFIG_MACH_TYPE MACH_TYPE_ORIGEN #define CONFIG_SYS_MEM_TOP_HIDE (1 << 20) /* ram console */ diff --git a/include/configs/owl-common.h b/include/configs/owl-common.h index 4ef9e8ed5d8..d79033be3f5 100644 --- a/include/configs/owl-common.h +++ b/include/configs/owl-common.h @@ -19,7 +19,6 @@ #define CONFIG_SYS_MALLOC_LEN (32 * 1024 * 1024) /* Some commands use this as the default load address */ -#define CONFIG_SYS_LOAD_ADDR (CONFIG_SYS_SDRAM_BASE + 0x7ffc0) /* * This is the initial SP which is used only briefly for relocating the u-boot diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h index 7ac71aa9a28..dda71b3b7c4 100644 --- a/include/configs/p1_p2_rdb_pc.h +++ b/include/configs/p1_p2_rdb_pc.h @@ -589,7 +589,6 @@ /* * Miscellaneous configurable options */ -#define CONFIG_SYS_LOAD_ADDR 0x2000000 /* default load address */ /* * For booting Linux, the board info and command line data diff --git a/include/configs/pcm052.h b/include/configs/pcm052.h index 0b21c590cf6..327ab37791b 100644 --- a/include/configs/pcm052.h +++ b/include/configs/pcm052.h @@ -25,8 +25,6 @@ #define CONFIG_SYS_MAX_NAND_DEVICE 1 -#define CONFIG_SYS_LOAD_ADDR 0x82000000 - /* We boot from the gfxRAM area of the OCRAM. */ #define CONFIG_BOARD_SIZE_LIMIT 520192 diff --git a/include/configs/phycore_imx8mm.h b/include/configs/phycore_imx8mm.h index add7835528a..99e62a56f83 100644 --- a/include/configs/phycore_imx8mm.h +++ b/include/configs/phycore_imx8mm.h @@ -82,7 +82,6 @@ "fi;" /* Link Definitions */ -#define CONFIG_SYS_LOAD_ADDR 0x40480000 #define CONFIG_SYS_INIT_RAM_ADDR 0x40000000 #define CONFIG_SYS_INIT_RAM_SIZE SZ_512K diff --git a/include/configs/phycore_imx8mp.h b/include/configs/phycore_imx8mp.h index d0338fad051..f3191e8eacb 100644 --- a/include/configs/phycore_imx8mp.h +++ b/include/configs/phycore_imx8mp.h @@ -82,7 +82,6 @@ "fi;" /* Link Definitions */ -#define CONFIG_SYS_LOAD_ADDR 0x40480000 #define CONFIG_SYS_INIT_RAM_ADDR 0x40000000 #define CONFIG_SYS_INIT_RAM_SIZE SZ_512K diff --git a/include/configs/pic32mzdask.h b/include/configs/pic32mzdask.h index d50edc7715f..a06ac83a2cd 100644 --- a/include/configs/pic32mzdask.h +++ b/include/configs/pic32mzdask.h @@ -34,7 +34,6 @@ #define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE #define CONFIG_SYS_MONITOR_LEN (192 << 10) -#define CONFIG_SYS_LOAD_ADDR 0x88500000 /* default load address */ #define CONFIG_SYS_ENV_ADDR 0x88300000 #define CONFIG_SYS_FDT_ADDR 0x89d00000 diff --git a/include/configs/pico-imx8mq.h b/include/configs/pico-imx8mq.h index e802644fdc6..935651d6c2c 100644 --- a/include/configs/pico-imx8mq.h +++ b/include/configs/pico-imx8mq.h @@ -116,7 +116,6 @@ "else booti ${loadaddr} - ${fdt_addr}; fi" /* Link Definitions */ -#define CONFIG_SYS_LOAD_ADDR 0x40480000 #define CONFIG_SYS_INIT_RAM_ADDR 0x40000000 #define CONFIG_SYS_INIT_RAM_SIZE 0x80000 diff --git a/include/configs/pm9261.h b/include/configs/pm9261.h index 382d19a241b..cf2ea3a0e59 100644 --- a/include/configs/pm9261.h +++ b/include/configs/pm9261.h @@ -182,8 +182,6 @@ #define CONFIG_SYS_USB_OHCI_SLOT_NAME "at91sam9261" #define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS 2 -#define CONFIG_SYS_LOAD_ADDR 0x22000000 - #undef CONFIG_SYS_USE_DATAFLASH_CS0 #undef CONFIG_SYS_USE_NANDFLASH #define CONFIG_SYS_USE_FLASH 1 diff --git a/include/configs/pm9263.h b/include/configs/pm9263.h index e825270de8a..f31cf78f24a 100644 --- a/include/configs/pm9263.h +++ b/include/configs/pm9263.h @@ -213,8 +213,6 @@ #define CONFIG_SYS_USB_OHCI_SLOT_NAME "at91sam9263" #define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS 2 -#define CONFIG_SYS_LOAD_ADDR 0x22000000 /* load address */ - #define CONFIG_SYS_USE_FLASH 1 #undef CONFIG_SYS_USE_DATAFLASH #undef CONFIG_SYS_USE_NANDFLASH diff --git a/include/configs/pm9g45.h b/include/configs/pm9g45.h index 452fbda0668..9168dd021a9 100644 --- a/include/configs/pm9g45.h +++ b/include/configs/pm9g45.h @@ -57,8 +57,6 @@ #define CONFIG_RESET_PHY_R #define CONFIG_AT91_WANTS_COMMON_PHY -#define CONFIG_SYS_LOAD_ADDR 0x22000000 /* load address */ - #ifdef CONFIG_NAND_BOOT /* bootstrap + u-boot + env in nandflash */ diff --git a/include/configs/poplar.h b/include/configs/poplar.h index 9763218ecbb..5db5fc46c62 100644 --- a/include/configs/poplar.h +++ b/include/configs/poplar.h @@ -18,7 +18,6 @@ /* SYS */ #define CONFIG_SYS_BOOTM_LEN SZ_64M #define CONFIG_SYS_INIT_SP_ADDR 0x200000 -#define CONFIG_SYS_LOAD_ADDR 0x800000 #define CONFIG_SYS_MALLOC_LEN SZ_32M /* ATF bl33.bin load address (must match) */ diff --git a/include/configs/presidio_asic.h b/include/configs/presidio_asic.h index 646a496084a..692c566c44a 100644 --- a/include/configs/presidio_asic.h +++ b/include/configs/presidio_asic.h @@ -47,7 +47,6 @@ #define CONFIG_BOOTP_BOOTFILESIZE /* Miscellaneous configurable options */ -#define CONFIG_SYS_LOAD_ADDR (DDR_BASE + 0x10000000) #define CONFIG_LAST_STAGE_INIT /* SDRAM Bank #1 */ diff --git a/include/configs/px30_common.h b/include/configs/px30_common.h index 76d6ab1c8b4..42fd1bf7626 100644 --- a/include/configs/px30_common.h +++ b/include/configs/px30_common.h @@ -20,7 +20,6 @@ #define CONFIG_IRAM_BASE 0xff020000 #define CONFIG_SYS_INIT_SP_ADDR 0x00400000 -#define CONFIG_SYS_LOAD_ADDR 0x00800800 #define CONFIG_SPL_STACK 0x00400000 #define CONFIG_SPL_MAX_SIZE 0x20000 #define CONFIG_SPL_BSS_START_ADDR 0x4000000 diff --git a/include/configs/qemu-arm.h b/include/configs/qemu-arm.h index 273fa1a7d7b..2fdbeafe498 100644 --- a/include/configs/qemu-arm.h +++ b/include/configs/qemu-arm.h @@ -14,7 +14,6 @@ /* The DTB generated by QEMU is placed at start of RAM, stay away from there */ #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_SDRAM_BASE + SZ_2M) -#define CONFIG_SYS_LOAD_ADDR (CONFIG_SYS_SDRAM_BASE + SZ_2M) #define CONFIG_SYS_MALLOC_LEN SZ_16M #define CONFIG_SYS_BOOTM_LEN SZ_64M diff --git a/include/configs/qemu-ppce500.h b/include/configs/qemu-ppce500.h index 5159ff375a9..d96d18133df 100644 --- a/include/configs/qemu-ppce500.h +++ b/include/configs/qemu-ppce500.h @@ -85,7 +85,6 @@ extern unsigned long long get_phys_ccsrbar_addr_early(void); /* * Miscellaneous configurable options */ -#define CONFIG_SYS_LOAD_ADDR 0x2000000 /* default load address */ /* * For booting Linux, the board info and command line data diff --git a/include/configs/qemu-riscv.h b/include/configs/qemu-riscv.h index bbeea96e271..af53bab8359 100644 --- a/include/configs/qemu-riscv.h +++ b/include/configs/qemu-riscv.h @@ -21,8 +21,6 @@ #define CONFIG_SYS_SDRAM_BASE 0x80000000 #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_SDRAM_BASE + SZ_2M) -#define CONFIG_SYS_LOAD_ADDR (CONFIG_SYS_SDRAM_BASE + SZ_2M) - #define CONFIG_SYS_MALLOC_LEN SZ_8M #define CONFIG_SYS_BOOTM_LEN SZ_64M diff --git a/include/configs/r2dplus.h b/include/configs/r2dplus.h index 61b6fb48465..c36dc4c4a11 100644 --- a/include/configs/r2dplus.h +++ b/include/configs/r2dplus.h @@ -15,7 +15,6 @@ #define CONFIG_SYS_PBSIZE 256 -#define CONFIG_SYS_LOAD_ADDR (CONFIG_SYS_SDRAM_BASE + 32 * 1024 * 1024) /* Address of u-boot image in Flash */ #define CONFIG_SYS_MONITOR_BASE (CONFIG_SYS_FLASH_BASE) #define CONFIG_SYS_MONITOR_LEN (256 * 1024) diff --git a/include/configs/rcar-gen2-common.h b/include/configs/rcar-gen2-common.h index 2aaeeae5f89..2dedcb052d8 100644 --- a/include/configs/rcar-gen2-common.h +++ b/include/configs/rcar-gen2-common.h @@ -28,7 +28,6 @@ #define CONFIG_SYS_SDRAM_BASE (RCAR_GEN2_SDRAM_BASE) #define CONFIG_SYS_SDRAM_SIZE (RCAR_GEN2_UBOOT_SDRAM_SIZE) -#define CONFIG_SYS_LOAD_ADDR 0x50000000 #define CONFIG_SYS_MONITOR_BASE 0x00000000 #define CONFIG_SYS_MONITOR_LEN (256 * 1024) diff --git a/include/configs/rcar-gen3-common.h b/include/configs/rcar-gen3-common.h index f234455f842..559b4ee3acf 100644 --- a/include/configs/rcar-gen3-common.h +++ b/include/configs/rcar-gen3-common.h @@ -44,7 +44,6 @@ #define DRAM_RSV_SIZE 0x08000000 #define CONFIG_SYS_SDRAM_BASE (0x40000000 + DRAM_RSV_SIZE) #define CONFIG_SYS_SDRAM_SIZE (0x80000000u - DRAM_RSV_SIZE) -#define CONFIG_SYS_LOAD_ADDR 0x58000000 #define CONFIG_VERY_BIG_RAM #define CONFIG_MAX_MEM_MAPPED (0x80000000u - DRAM_RSV_SIZE) diff --git a/include/configs/rk3036_common.h b/include/configs/rk3036_common.h index 7f148eff87e..9af9978fe78 100644 --- a/include/configs/rk3036_common.h +++ b/include/configs/rk3036_common.h @@ -17,7 +17,6 @@ #define CONFIG_SYS_HZ_CLOCK 24000000 #define CONFIG_SYS_INIT_SP_ADDR 0x60100000 -#define CONFIG_SYS_LOAD_ADDR 0x60800800 #define CONFIG_SPL_STACK 0x10081fff #define CONFIG_ROCKCHIP_MAX_INIT_SIZE (4 << 10) diff --git a/include/configs/rk3128_common.h b/include/configs/rk3128_common.h index 7c064a0704b..6b0ed40122b 100644 --- a/include/configs/rk3128_common.h +++ b/include/configs/rk3128_common.h @@ -20,7 +20,6 @@ #define CONFIG_IRAM_BASE 0x10080000 #define CONFIG_SYS_INIT_SP_ADDR 0x60100000 -#define CONFIG_SYS_LOAD_ADDR 0x60800800 #define CONFIG_SYS_BOOTM_LEN (64 << 20) /* 64M */ diff --git a/include/configs/rk3188_common.h b/include/configs/rk3188_common.h index 3bcc04808a3..b567943056d 100644 --- a/include/configs/rk3188_common.h +++ b/include/configs/rk3188_common.h @@ -18,7 +18,6 @@ /* Bootrom will load u-boot binary to 0x60000000 once return from SPL */ #endif #define CONFIG_SYS_INIT_SP_ADDR 0x60100000 -#define CONFIG_SYS_LOAD_ADDR 0x60800800 #define CONFIG_ROCKCHIP_MAX_INIT_SIZE (0x8000 - 0x800) #define CONFIG_ROCKCHIP_CHIP_TAG "RK31" diff --git a/include/configs/rk322x_common.h b/include/configs/rk322x_common.h index 7e0c831174a..cdc4eec7f20 100644 --- a/include/configs/rk322x_common.h +++ b/include/configs/rk322x_common.h @@ -18,7 +18,6 @@ #define CONFIG_SYS_HZ_CLOCK 24000000 #define CONFIG_SYS_INIT_SP_ADDR 0x61100000 -#define CONFIG_SYS_LOAD_ADDR 0x61800800 #define CONFIG_SPL_MAX_SIZE 0x100000 #define CONFIG_ROCKCHIP_MAX_INIT_SIZE (28 << 10) diff --git a/include/configs/rk3288_common.h b/include/configs/rk3288_common.h index addad7a16dd..0f43347cc7b 100644 --- a/include/configs/rk3288_common.h +++ b/include/configs/rk3288_common.h @@ -23,7 +23,6 @@ /* Bootrom will load u-boot binary to 0x0 once return from SPL */ #endif #define CONFIG_SYS_INIT_SP_ADDR 0x00100000 -#define CONFIG_SYS_LOAD_ADDR 0x00800800 #define CONFIG_SPL_STACK 0xff718000 #define CONFIG_IRAM_BASE 0xff700000 diff --git a/include/configs/rk3308_common.h b/include/configs/rk3308_common.h index bd9ac826f3d..3edbb34ff36 100644 --- a/include/configs/rk3308_common.h +++ b/include/configs/rk3308_common.h @@ -25,7 +25,6 @@ #define CONFIG_ROCKCHIP_STIMER_BASE 0xff1b00a0 #define CONFIG_IRAM_BASE 0xfff80000 #define CONFIG_SYS_INIT_SP_ADDR 0x00800000 -#define CONFIG_SYS_LOAD_ADDR 0x00C00800 #define CONFIG_SPL_STACK 0x00400000 #define CONFIG_SYS_BOOTM_LEN (64 << 20) /* 64M */ diff --git a/include/configs/rk3328_common.h b/include/configs/rk3328_common.h index 0538da751f2..fe58ee2cc9a 100644 --- a/include/configs/rk3328_common.h +++ b/include/configs/rk3328_common.h @@ -17,7 +17,6 @@ #define CONFIG_SKIP_LOWLEVEL_INIT #define CONFIG_SYS_INIT_SP_ADDR 0x00300000 -#define CONFIG_SYS_LOAD_ADDR 0x00800800 #define CONFIG_SPL_STACK 0x00400000 #define CONFIG_SPL_MAX_SIZE 0x40000 #define CONFIG_SPL_BSS_START_ADDR 0x2000000 diff --git a/include/configs/rk3368_common.h b/include/configs/rk3368_common.h index fbbb8cf267e..43471b94e49 100644 --- a/include/configs/rk3368_common.h +++ b/include/configs/rk3368_common.h @@ -24,7 +24,6 @@ #define CONFIG_IRAM_BASE 0xff8c0000 #define CONFIG_SYS_INIT_SP_ADDR 0x00300000 -#define CONFIG_SYS_LOAD_ADDR 0x00800800 #define CONFIG_SPL_MAX_SIZE 0x40000 #define CONFIG_SPL_BSS_START_ADDR 0x400000 diff --git a/include/configs/rk3399_common.h b/include/configs/rk3399_common.h index 6d710da901e..a17f1813695 100644 --- a/include/configs/rk3399_common.h +++ b/include/configs/rk3399_common.h @@ -17,7 +17,6 @@ #define CONFIG_IRAM_BASE 0xff8c0000 #define CONFIG_SYS_INIT_SP_ADDR 0x00300000 -#define CONFIG_SYS_LOAD_ADDR 0x00800800 #if defined(CONFIG_SPL_BUILD) && defined(CONFIG_TPL_BOOTROM_SUPPORT) #define CONFIG_SPL_STACK 0x00400000 diff --git a/include/configs/rk3568_common.h b/include/configs/rk3568_common.h index b6568917ea8..72f31a012fb 100644 --- a/include/configs/rk3568_common.h +++ b/include/configs/rk3568_common.h @@ -17,7 +17,6 @@ #define CONFIG_IRAM_BASE 0xfdcc0000 #define CONFIG_SYS_INIT_SP_ADDR 0x00c00000 -#define CONFIG_SYS_LOAD_ADDR 0x00c00800 #define CONFIG_SYS_BOOTM_LEN (64 << 20) /* 64M */ #define CONFIG_SYS_SDRAM_BASE 0 diff --git a/include/configs/rpi.h b/include/configs/rpi.h index b6d5d494903..c11930a05bc 100644 --- a/include/configs/rpi.h +++ b/include/configs/rpi.h @@ -87,7 +87,6 @@ #define CONFIG_SYS_CBSIZE 1024 /* Environment */ -#define CONFIG_SYS_LOAD_ADDR 0x1000000 /* Shell */ diff --git a/include/configs/rv1108_common.h b/include/configs/rv1108_common.h index 758e85e89df..86f90777590 100644 --- a/include/configs/rv1108_common.h +++ b/include/configs/rv1108_common.h @@ -20,7 +20,6 @@ #define CONFIG_SYS_SDRAM_BASE 0x60000000 #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_TEXT_BASE + 0x100000) -#define CONFIG_SYS_LOAD_ADDR (CONFIG_SYS_SDRAM_BASE + 0x2000000) /* rockchip ohci host driver */ #define CONFIG_USB_OHCI_NEW diff --git a/include/configs/s5p4418_nanopi2.h b/include/configs/s5p4418_nanopi2.h index 1e2180b970d..1cacf340682 100644 --- a/include/configs/s5p4418_nanopi2.h +++ b/include/configs/s5p4418_nanopi2.h @@ -65,7 +65,6 @@ #define BMP_LOAD_ADDR 0x78000000 /* kernel load address */ -#define CONFIG_SYS_LOAD_ADDR 0x71080000 #define INITRD_START 0x79000000 #define KERNEL_DTB_ADDR 0x7A000000 diff --git a/include/configs/s5p_goni.h b/include/configs/s5p_goni.h index 6af6009e612..fef5e702e6d 100644 --- a/include/configs/s5p_goni.h +++ b/include/configs/s5p_goni.h @@ -138,8 +138,6 @@ "dfu_alt_info=" CONFIG_DFU_ALT "\0" #define CONFIG_SYS_PBSIZE 384 /* Print Buffer Size */ -/* memtest works on */ -#define CONFIG_SYS_LOAD_ADDR (CONFIG_SYS_SDRAM_BASE + 0x4000000) /* Goni has 3 banks of DRAM, but swap the bank */ #define PHYS_SDRAM_1 CONFIG_SYS_SDRAM_BASE /* OneDRAM Bank #0 */ diff --git a/include/configs/s5pc210_universal.h b/include/configs/s5pc210_universal.h index 8ee667e6930..ff29de0d060 100644 --- a/include/configs/s5pc210_universal.h +++ b/include/configs/s5pc210_universal.h @@ -31,9 +31,6 @@ #define CONFIG_SYS_MONITOR_BASE 0x00000000 -/* memtest works on */ -#define CONFIG_SYS_LOAD_ADDR (CONFIG_SYS_SDRAM_BASE + 0x4800000) - /* Actual modem binary size is 16MiB. Add 2MiB for bad block handling */ #define NORMAL_MTDPARTS_DEFAULT CONFIG_MTDPARTS_DEFAULT diff --git a/include/configs/sam9x60ek.h b/include/configs/sam9x60ek.h index 6a6f1de41d1..0f372c69ccf 100644 --- a/include/configs/sam9x60ek.h +++ b/include/configs/sam9x60ek.h @@ -54,8 +54,6 @@ #define CONFIG_SYS_NAND_ONFI_DETECTION #endif -#define CONFIG_SYS_LOAD_ADDR 0x22000000 /* load address */ - #ifdef CONFIG_SD_BOOT /* bootstrap + u-boot + env + linux in sd card */ #define CONFIG_BOOTCOMMAND \ diff --git a/include/configs/sama5d27_som1_ek.h b/include/configs/sama5d27_som1_ek.h index 8942d159349..89d8486ff81 100644 --- a/include/configs/sama5d27_som1_ek.h +++ b/include/configs/sama5d27_som1_ek.h @@ -25,8 +25,6 @@ (CONFIG_SYS_SDRAM_BASE + 16 * 1024 - GENERATED_GBL_DATA_SIZE) #endif -#define CONFIG_SYS_LOAD_ADDR 0x22000000 /* load address */ - #undef CONFIG_BOOTCOMMAND #ifdef CONFIG_SD_BOOT /* bootstrap + u-boot + env in sd card */ diff --git a/include/configs/sama5d27_wlsom1_ek.h b/include/configs/sama5d27_wlsom1_ek.h index 8bea7645821..09ebf488601 100644 --- a/include/configs/sama5d27_wlsom1_ek.h +++ b/include/configs/sama5d27_wlsom1_ek.h @@ -26,8 +26,6 @@ (CONFIG_SYS_SDRAM_BASE + 16 * 1024 - GENERATED_GBL_DATA_SIZE) #endif -#define CONFIG_SYS_LOAD_ADDR 0x22000000 /* load address */ - /* SPL */ #define CONFIG_SPL_TEXT_BASE 0x200000 #define CONFIG_SPL_MAX_SIZE 0x10000 diff --git a/include/configs/sama5d2_icp.h b/include/configs/sama5d2_icp.h index 9be6d4f3381..e7ccfeaef74 100644 --- a/include/configs/sama5d2_icp.h +++ b/include/configs/sama5d2_icp.h @@ -27,8 +27,6 @@ (CONFIG_SYS_SDRAM_BASE + 16 * 1024 - GENERATED_GBL_DATA_SIZE) #endif -#define CONFIG_SYS_LOAD_ADDR 0x22000000 /* load address */ - /* NAND flash */ /* SPI flash */ diff --git a/include/configs/sama5d2_ptc_ek.h b/include/configs/sama5d2_ptc_ek.h index f42e26a0e07..1001bbcf930 100644 --- a/include/configs/sama5d2_ptc_ek.h +++ b/include/configs/sama5d2_ptc_ek.h @@ -22,8 +22,6 @@ #define CONFIG_SYS_INIT_SP_ADDR \ (CONFIG_SYS_SDRAM_BASE + 16 * 1024 - GENERATED_GBL_DATA_SIZE) -#define CONFIG_SYS_LOAD_ADDR 0x22000000 /* load address */ - /* NAND Flash */ #ifdef CONFIG_CMD_NAND #define CONFIG_SYS_MAX_NAND_DEVICE 1 diff --git a/include/configs/sama5d2_xplained.h b/include/configs/sama5d2_xplained.h index 4f5ceca780a..5c69b6b7bc1 100644 --- a/include/configs/sama5d2_xplained.h +++ b/include/configs/sama5d2_xplained.h @@ -22,8 +22,6 @@ (CONFIG_SYS_SDRAM_BASE + 16 * 1024 - GENERATED_GBL_DATA_SIZE) #endif -#define CONFIG_SYS_LOAD_ADDR 0x22000000 /* load address */ - /* SerialFlash */ #ifdef CONFIG_SD_BOOT diff --git a/include/configs/sama5d3_xplained.h b/include/configs/sama5d3_xplained.h index 4c25964b43a..20d1d34044a 100644 --- a/include/configs/sama5d3_xplained.h +++ b/include/configs/sama5d3_xplained.h @@ -56,8 +56,6 @@ #define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS 2 #endif -#define CONFIG_SYS_LOAD_ADDR 0x22000000 /* load address */ - /* SPL */ #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 44c1952b51e..ac52e272174 100644 --- a/include/configs/sama5d3xek.h +++ b/include/configs/sama5d3xek.h @@ -69,8 +69,6 @@ #define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS 3 #endif -#define CONFIG_SYS_LOAD_ADDR 0x22000000 /* load address */ - /* SPL */ #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 80809df638a..3032297731a 100644 --- a/include/configs/sama5d4_xplained.h +++ b/include/configs/sama5d4_xplained.h @@ -22,8 +22,6 @@ (CONFIG_SYS_SDRAM_BASE + 16 * 1024 - GENERATED_GBL_DATA_SIZE) #endif -#define CONFIG_SYS_LOAD_ADDR 0x22000000 /* load address */ - /* NAND flash */ #ifdef CONFIG_CMD_NAND #define CONFIG_SYS_MAX_NAND_DEVICE 1 diff --git a/include/configs/sama5d4ek.h b/include/configs/sama5d4ek.h index 2fb4764f7ce..4e8fe8693cc 100644 --- a/include/configs/sama5d4ek.h +++ b/include/configs/sama5d4ek.h @@ -22,8 +22,6 @@ (CONFIG_SYS_SDRAM_BASE + 16 * 1024 - GENERATED_GBL_DATA_SIZE) #endif -#define CONFIG_SYS_LOAD_ADDR 0x22000000 /* load address */ - /* NAND flash */ #ifdef CONFIG_CMD_NAND #define CONFIG_SYS_MAX_NAND_DEVICE 1 diff --git a/include/configs/sama7g5ek.h b/include/configs/sama7g5ek.h index 96db82e9d46..191138cda0d 100644 --- a/include/configs/sama7g5ek.h +++ b/include/configs/sama7g5ek.h @@ -24,8 +24,6 @@ GENERATED_GBL_DATA_SIZE) #endif -#define CONFIG_SYS_LOAD_ADDR 0x62000000 /* load address */ - #undef CONFIG_BOOTCOMMAND #ifdef CONFIG_SD_BOOT /* u-boot env in sd/mmc card */ diff --git a/include/configs/sandbox.h b/include/configs/sandbox.h index 8eeccdd4264..ebebe2b9300 100644 --- a/include/configs/sandbox.h +++ b/include/configs/sandbox.h @@ -38,8 +38,6 @@ #define CONFIG_I2C_EDID -/* Memory things - we don't really want a memory test */ -#define CONFIG_SYS_LOAD_ADDR 0x00000000 #define CONFIG_SYS_FDT_LOAD_ADDR 0x100 #define CONFIG_PHYSMEM diff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h index 9cf3c675369..20cf4f99b63 100644 --- a/include/configs/siemens-am33x-common.h +++ b/include/configs/siemens-am33x-common.h @@ -53,8 +53,6 @@ * start addr of ram disk */ -#define CONFIG_SYS_LOAD_ADDR 0x81000000 /* Default load address */ - /* Physical Memory Map */ #define PHYS_DRAM_1 0x80000000 /* DRAM Bank #1 */ diff --git a/include/configs/sifive-unleashed.h b/include/configs/sifive-unleashed.h index b6c29f8c604..4d456cef3c4 100644 --- a/include/configs/sifive-unleashed.h +++ b/include/configs/sifive-unleashed.h @@ -28,8 +28,6 @@ #define CONFIG_SYS_SDRAM_BASE 0x80000000 #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_SDRAM_BASE + SZ_2M) -#define CONFIG_SYS_LOAD_ADDR (CONFIG_SYS_SDRAM_BASE + SZ_2M) - #define CONFIG_SYS_MALLOC_LEN SZ_8M #define CONFIG_SYS_BOOTM_LEN SZ_64M diff --git a/include/configs/sifive-unmatched.h b/include/configs/sifive-unmatched.h index 15e15883117..4b655ec8ee0 100644 --- a/include/configs/sifive-unmatched.h +++ b/include/configs/sifive-unmatched.h @@ -28,8 +28,6 @@ #define CONFIG_SYS_SDRAM_BASE 0x80000000 #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_SDRAM_BASE + SZ_2M) -#define CONFIG_SYS_LOAD_ADDR (CONFIG_SYS_SDRAM_BASE + SZ_2M) - #define CONFIG_SYS_MALLOC_LEN SZ_8M #define CONFIG_SYS_BOOTM_LEN SZ_64M diff --git a/include/configs/sipeed-maix.h b/include/configs/sipeed-maix.h index 0fbe8a59058..5b128785525 100644 --- a/include/configs/sipeed-maix.h +++ b/include/configs/sipeed-maix.h @@ -8,7 +8,6 @@ #include -#define CONFIG_SYS_LOAD_ADDR 0x80000000 /* Start just below the second bank so we don't clobber it during reloc */ #define CONFIG_SYS_INIT_SP_ADDR 0x803FFFFF #define CONFIG_SYS_MALLOC_LEN SZ_128K diff --git a/include/configs/smartweb.h b/include/configs/smartweb.h index 009a11cd887..f880dd16210 100644 --- a/include/configs/smartweb.h +++ b/include/configs/smartweb.h @@ -129,12 +129,6 @@ #define CONFIG_BOOTCOMMAND "run flashboot" #define CONFIG_SYS_CBSIZE 512 -/* - * RAM Memory address where to put the - * Linux Kernel befor starting. - */ -#define CONFIG_SYS_LOAD_ADDR 0x22000000 - /* * The NAND Flash partitions: */ diff --git a/include/configs/smdkc100.h b/include/configs/smdkc100.h index 77773cdeaa5..b400386403b 100644 --- a/include/configs/smdkc100.h +++ b/include/configs/smdkc100.h @@ -105,8 +105,6 @@ * Miscellaneous configurable options */ #define CONFIG_SYS_PBSIZE 384 /* Print Buffer Size */ -/* memtest works on */ -#define CONFIG_SYS_LOAD_ADDR CONFIG_SYS_SDRAM_BASE /* SMDKC100 has 1 banks of DRAM, we use only one in U-Boot */ #define PHYS_SDRAM_1 CONFIG_SYS_SDRAM_BASE /* SDRAM Bank #1 */ diff --git a/include/configs/smdkv310.h b/include/configs/smdkv310.h index fc2f6ecf6be..900a2dcd982 100644 --- a/include/configs/smdkv310.h +++ b/include/configs/smdkv310.h @@ -33,9 +33,6 @@ #define CONFIG_BOOTCOMMAND "fatload mmc 0 40007000 uImage; bootm 40007000" -/* memtest works on */ -#define CONFIG_SYS_LOAD_ADDR (CONFIG_SYS_SDRAM_BASE + 0x3E00000) - /* SMDKV310 has 4 bank of DRAM */ #define SDRAM_BANK_SIZE (512UL << 20UL) /* 512 MB */ #define PHYS_SDRAM_1 CONFIG_SYS_SDRAM_BASE diff --git a/include/configs/snapper9260.h b/include/configs/snapper9260.h index 7f2c8056ccf..b97c5abc34d 100644 --- a/include/configs/snapper9260.h +++ b/include/configs/snapper9260.h @@ -96,7 +96,6 @@ #define I2C_DELAY udelay(2) /* Boot options */ -#define CONFIG_SYS_LOAD_ADDR 0x23000000 #define CONFIG_BOOTP_BOOTFILESIZE diff --git a/include/configs/snapper9g45.h b/include/configs/snapper9g45.h index 077e9d667a1..1a43d3ce821 100644 --- a/include/configs/snapper9g45.h +++ b/include/configs/snapper9g45.h @@ -64,7 +64,6 @@ /* UARTs/Serial console */ /* Boot options */ -#define CONFIG_SYS_LOAD_ADDR 0x23000000 #define CONFIG_BOOTP_BOOTFILESIZE diff --git a/include/configs/sniper.h b/include/configs/sniper.h index 25e0735022f..75d44c0a2bc 100644 --- a/include/configs/sniper.h +++ b/include/configs/sniper.h @@ -114,8 +114,6 @@ * Boot */ -#define CONFIG_SYS_LOAD_ADDR 0x82000000 - #define CONFIG_BOOTCOMMAND \ "setenv boot_mmc_part ${kernel_mmc_part}; " \ "if test reboot-${reboot-mode} = reboot-r; then " \ diff --git a/include/configs/socfpga_arria10_socdk.h b/include/configs/socfpga_arria10_socdk.h index b0cd79eeb4a..ebb3e8c5732 100644 --- a/include/configs/socfpga_arria10_socdk.h +++ b/include/configs/socfpga_arria10_socdk.h @@ -8,9 +8,6 @@ #include -/* Booting Linux */ -#define CONFIG_SYS_LOAD_ADDR 0x01000000 - /* * U-Boot general configurations */ diff --git a/include/configs/socfpga_arria5_secu1.h b/include/configs/socfpga_arria5_secu1.h index c066eb3c1e7..73317afc314 100644 --- a/include/configs/socfpga_arria5_secu1.h +++ b/include/configs/socfpga_arria5_secu1.h @@ -57,8 +57,6 @@ #define CONFIG_BOOT_RETRY_TIME 45 #define CONFIG_RESET_TO_RETRY -#define CONFIG_SYS_LOAD_ADDR CONFIG_KM_KERNEL_ADDR - /* * FPGA Remote Update related environment * diff --git a/include/configs/socfpga_arria5_socdk.h b/include/configs/socfpga_arria5_socdk.h index 8d62d1307e5..ca2d7827447 100644 --- a/include/configs/socfpga_arria5_socdk.h +++ b/include/configs/socfpga_arria5_socdk.h @@ -10,9 +10,6 @@ /* Memory configurations */ #define PHYS_SDRAM_1_SIZE 0x40000000 /* 1GiB on SoCDK */ -/* Booting Linux */ -#define CONFIG_SYS_LOAD_ADDR 0x01000000 - /* The rest of the configuration is shared */ #include diff --git a/include/configs/socfpga_cyclone5_socdk.h b/include/configs/socfpga_cyclone5_socdk.h index 72ba0c52e99..c23ba2325b8 100644 --- a/include/configs/socfpga_cyclone5_socdk.h +++ b/include/configs/socfpga_cyclone5_socdk.h @@ -10,9 +10,6 @@ /* Memory configurations */ #define PHYS_SDRAM_1_SIZE 0x40000000 /* 1GiB on SoCDK */ -/* Booting Linux */ -#define CONFIG_SYS_LOAD_ADDR 0x01000000 - /* The rest of the configuration is shared */ #include diff --git a/include/configs/socfpga_dbm_soc1.h b/include/configs/socfpga_dbm_soc1.h index 1cd97cc863b..137da2f1fcf 100644 --- a/include/configs/socfpga_dbm_soc1.h +++ b/include/configs/socfpga_dbm_soc1.h @@ -13,7 +13,6 @@ /* Booting Linux */ #define CONFIG_BOOTFILE "fitImage" #define CONFIG_BOOTCOMMAND "run mmc_mmc" -#define CONFIG_SYS_LOAD_ADDR 0x01000000 /* Environment is in MMC */ diff --git a/include/configs/socfpga_de0_nano_soc.h b/include/configs/socfpga_de0_nano_soc.h index 36ddd41d867..a5e6511b510 100644 --- a/include/configs/socfpga_de0_nano_soc.h +++ b/include/configs/socfpga_de0_nano_soc.h @@ -10,9 +10,6 @@ /* Memory configurations */ #define PHYS_SDRAM_1_SIZE 0x40000000 /* 1GiB */ -/* Booting Linux */ -#define CONFIG_SYS_LOAD_ADDR 0x01000000 - /* The rest of the configuration is shared */ #include diff --git a/include/configs/socfpga_de10_nano.h b/include/configs/socfpga_de10_nano.h index c200bf960d8..dfc22cf6e27 100644 --- a/include/configs/socfpga_de10_nano.h +++ b/include/configs/socfpga_de10_nano.h @@ -10,9 +10,6 @@ /* Memory configurations */ #define PHYS_SDRAM_1_SIZE 0x40000000 /* 1GiB */ -/* Booting Linux */ -#define CONFIG_SYS_LOAD_ADDR 0x01000000 - /* The rest of the configuration is shared */ #include diff --git a/include/configs/socfpga_de1_soc.h b/include/configs/socfpga_de1_soc.h index 5373b554817..4b58bc48c44 100644 --- a/include/configs/socfpga_de1_soc.h +++ b/include/configs/socfpga_de1_soc.h @@ -10,9 +10,6 @@ /* Memory configurations */ #define PHYS_SDRAM_1_SIZE 0x40000000 /* 1GiB */ -/* Booting Linux */ -#define CONFIG_SYS_LOAD_ADDR 0x01000000 - /* The rest of the configuration is shared */ #include diff --git a/include/configs/socfpga_is1.h b/include/configs/socfpga_is1.h index c3cbac30272..06337d405c0 100644 --- a/include/configs/socfpga_is1.h +++ b/include/configs/socfpga_is1.h @@ -13,7 +13,6 @@ /* Booting Linux */ #define CONFIG_BOOTFILE "zImage" -#define CONFIG_SYS_LOAD_ADDR 0x01000000 /* Ethernet on SoC (EMAC) */ #if defined(CONFIG_CMD_NET) diff --git a/include/configs/socfpga_mcvevk.h b/include/configs/socfpga_mcvevk.h index 2c77341e457..14562143255 100644 --- a/include/configs/socfpga_mcvevk.h +++ b/include/configs/socfpga_mcvevk.h @@ -13,7 +13,6 @@ /* Booting Linux */ #define CONFIG_BOOTFILE "fitImage" #define CONFIG_BOOTCOMMAND "run mmc_mmc" -#define CONFIG_SYS_LOAD_ADDR 0x01000000 /* Environment is in MMC */ diff --git a/include/configs/socfpga_soc64_common.h b/include/configs/socfpga_soc64_common.h index 2e9be25d8b5..387ad129b35 100644 --- a/include/configs/socfpga_soc64_common.h +++ b/include/configs/socfpga_soc64_common.h @@ -15,7 +15,6 @@ * U-Boot general configurations */ #define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE -#define CONFIG_SYS_LOAD_ADDR 0x2000000 #define CONFIG_REMAKE_ELF /* sysmgr.boot_scratch_cold4 & 5 (64bit) will be used for PSCI_CPU_ON call */ #define CPU_RELEASE_ADDR 0xFFD12210 diff --git a/include/configs/socfpga_sockit.h b/include/configs/socfpga_sockit.h index b66d2e52b52..a4aece95426 100644 --- a/include/configs/socfpga_sockit.h +++ b/include/configs/socfpga_sockit.h @@ -10,9 +10,6 @@ /* Memory configurations */ #define PHYS_SDRAM_1_SIZE 0x40000000 /* 1GiB on SoCDK */ -/* Booting Linux */ -#define CONFIG_SYS_LOAD_ADDR 0x01000000 - /* The rest of the configuration is shared */ #include diff --git a/include/configs/socfpga_socrates.h b/include/configs/socfpga_socrates.h index 22977a0f1ed..f482005ce31 100644 --- a/include/configs/socfpga_socrates.h +++ b/include/configs/socfpga_socrates.h @@ -10,9 +10,6 @@ /* Memory configurations */ #define PHYS_SDRAM_1_SIZE 0x40000000 /* 1GiB on SoCrates */ -/* Booting Linux */ -#define CONFIG_SYS_LOAD_ADDR 0x01000000 - /* The rest of the configuration is shared */ #include diff --git a/include/configs/socfpga_sr1500.h b/include/configs/socfpga_sr1500.h index ea406b4c82c..62c1bc7408a 100644 --- a/include/configs/socfpga_sr1500.h +++ b/include/configs/socfpga_sr1500.h @@ -10,9 +10,6 @@ /* Memory configurations */ #define PHYS_SDRAM_1_SIZE 0x40000000 /* 1GiB on SR1500 */ -/* Booting Linux */ -#define CONFIG_SYS_LOAD_ADDR 0x01000000 - /* Ethernet on SoC (EMAC) */ #define CONFIG_PHY_INTERFACE_MODE PHY_INTERFACE_MODE_RGMII /* The PHY is autodetected, so no MII PHY address is needed here */ diff --git a/include/configs/socfpga_vining_fpga.h b/include/configs/socfpga_vining_fpga.h index 16799826211..c4a3df25d52 100644 --- a/include/configs/socfpga_vining_fpga.h +++ b/include/configs/socfpga_vining_fpga.h @@ -14,7 +14,6 @@ #define CONFIG_BOOTFILE "fitImage" #define CONFIG_BOOTCOMMAND "run selboot" #define CONFIG_SYS_BOOTM_LEN 0x2000000 /* 32 MiB */ -#define CONFIG_SYS_LOAD_ADDR 0x01000000 /* Ethernet on SoC (EMAC) */ diff --git a/include/configs/socrates.h b/include/configs/socrates.h index 373709f12ae..38da633d917 100644 --- a/include/configs/socrates.h +++ b/include/configs/socrates.h @@ -196,7 +196,6 @@ /* * Miscellaneous configurable options */ -#define CONFIG_SYS_LOAD_ADDR 0x2000000 /* default load address */ /* * For booting Linux, the board info and command line data diff --git a/include/configs/stemmy.h b/include/configs/stemmy.h index b94ef91c2ba..43cfe51719c 100644 --- a/include/configs/stemmy.h +++ b/include/configs/stemmy.h @@ -15,7 +15,6 @@ */ #define CONFIG_SKIP_LOWLEVEL_INIT #define CONFIG_SYS_INIT_SP_ADDR CONFIG_SYS_TEXT_BASE -#define CONFIG_SYS_LOAD_ADDR CONFIG_SYS_TEXT_BASE #define CONFIG_SYS_MALLOC_LEN SZ_2M diff --git a/include/configs/stih410-b2260.h b/include/configs/stih410-b2260.h index 83fa1a4e5bb..68690074dc0 100644 --- a/include/configs/stih410-b2260.h +++ b/include/configs/stih410-b2260.h @@ -13,7 +13,6 @@ #define PHYS_SDRAM_1 0x40000000 #define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1 #define PHYS_SDRAM_1_SIZE 0x3E000000 -#define CONFIG_SYS_LOAD_ADDR PHYS_SDRAM_1 /* default load addr */ #define CONFIG_SYS_HZ_CLOCK 1000000000 /* 1 GHz */ diff --git a/include/configs/stm32f429-discovery.h b/include/configs/stm32f429-discovery.h index 64d22cdafc3..fdc9a5a4b4f 100644 --- a/include/configs/stm32f429-discovery.h +++ b/include/configs/stm32f429-discovery.h @@ -14,7 +14,6 @@ /* * Configuration of the external SDRAM memory */ -#define CONFIG_SYS_LOAD_ADDR 0x90400000 #define CONFIG_SYS_MAX_FLASH_SECT 12 #define CONFIG_SYS_MAX_FLASH_BANKS 2 diff --git a/include/configs/stm32f429-evaluation.h b/include/configs/stm32f429-evaluation.h index 45686febfd7..4bb0a98531a 100644 --- a/include/configs/stm32f429-evaluation.h +++ b/include/configs/stm32f429-evaluation.h @@ -19,7 +19,6 @@ /* * Configuration of the external SDRAM memory */ -#define CONFIG_SYS_LOAD_ADDR 0x00400000 #define CONFIG_SYS_MAX_FLASH_SECT 12 #define CONFIG_SYS_MAX_FLASH_BANKS 2 diff --git a/include/configs/stm32f469-discovery.h b/include/configs/stm32f469-discovery.h index 6a0199e79da..a069308fc25 100644 --- a/include/configs/stm32f469-discovery.h +++ b/include/configs/stm32f469-discovery.h @@ -19,7 +19,6 @@ /* * Configuration of the external SDRAM memory */ -#define CONFIG_SYS_LOAD_ADDR 0x00400000 #define CONFIG_SYS_MAX_FLASH_SECT 12 #define CONFIG_SYS_MAX_FLASH_BANKS 2 diff --git a/include/configs/stm32f746-disco.h b/include/configs/stm32f746-disco.h index b28e371e68b..6b527b8f031 100644 --- a/include/configs/stm32f746-disco.h +++ b/include/configs/stm32f746-disco.h @@ -15,12 +15,6 @@ #define CONFIG_SYS_FLASH_BASE 0x08000000 #define CONFIG_SYS_INIT_SP_ADDR 0x20050000 -#ifdef CONFIG_SUPPORT_SPL -#define CONFIG_SYS_LOAD_ADDR 0x08008000 -#else -#define CONFIG_SYS_LOAD_ADDR 0xC0400000 -#endif - /* * Configuration of the external SDRAM memory */ diff --git a/include/configs/stm32h743-disco.h b/include/configs/stm32h743-disco.h index 28a4c4da9f4..6fe2ac41567 100644 --- a/include/configs/stm32h743-disco.h +++ b/include/configs/stm32h743-disco.h @@ -16,11 +16,6 @@ #define CONFIG_SYS_FLASH_BASE 0x08000000 #define CONFIG_SYS_INIT_SP_ADDR 0x24040000 -/* - * Configuration of the external SDRAM memory - */ -#define CONFIG_SYS_LOAD_ADDR 0xD0400000 - #define CONFIG_SYS_HZ_CLOCK 1000000 #define CONFIG_CMDLINE_TAG diff --git a/include/configs/stm32h743-eval.h b/include/configs/stm32h743-eval.h index 57aba247237..94fa4e7ba96 100644 --- a/include/configs/stm32h743-eval.h +++ b/include/configs/stm32h743-eval.h @@ -16,11 +16,6 @@ #define CONFIG_SYS_FLASH_BASE 0x08000000 #define CONFIG_SYS_INIT_SP_ADDR 0x24040000 -/* - * Configuration of the external SDRAM memory - */ -#define CONFIG_SYS_LOAD_ADDR 0xD0400000 - #define CONFIG_SYS_HZ_CLOCK 1000000 #define CONFIG_CMDLINE_TAG diff --git a/include/configs/stm32h750-art-pi.h b/include/configs/stm32h750-art-pi.h index 1f84724ee44..eeb11a5e633 100644 --- a/include/configs/stm32h750-art-pi.h +++ b/include/configs/stm32h750-art-pi.h @@ -16,11 +16,6 @@ #define CONFIG_SYS_FLASH_BASE 0x90000000 #define CONFIG_SYS_INIT_SP_ADDR 0x24040000 -/* - * Configuration of the external SDRAM memory - */ -#define CONFIG_SYS_LOAD_ADDR 0xC1800000 - #define CONFIG_SYS_HZ_CLOCK 1000000 #define CONFIG_CMDLINE_TAG diff --git a/include/configs/stm32mp1.h b/include/configs/stm32mp1.h index 10771ab2f37..1ac1cac8d3a 100644 --- a/include/configs/stm32mp1.h +++ b/include/configs/stm32mp1.h @@ -27,11 +27,6 @@ */ #define CONFIG_SYS_CBSIZE SZ_1K -/* - * default load address used for command tftp, bootm , loadb, ... - */ -#define CONFIG_SYS_LOAD_ADDR 0xc2000000 - /* ATAGs */ #define CONFIG_CMDLINE_TAG #define CONFIG_SETUP_MEMORY_TAGS diff --git a/include/configs/stmark2.h b/include/configs/stmark2.h index da162cbb114..f6fa96a5901 100644 --- a/include/configs/stmark2.h +++ b/include/configs/stmark2.h @@ -73,7 +73,6 @@ /* Boot Argument Buffer Size */ #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE -#define CONFIG_SYS_LOAD_ADDR (CONFIG_SYS_SDRAM_BASE + 0x10000) #define CONFIG_SYS_MBAR 0xFC000000 /* diff --git a/include/configs/stv0991.h b/include/configs/stv0991.h index 0058dcd4bba..250cdad2af4 100644 --- a/include/configs/stv0991.h +++ b/include/configs/stv0991.h @@ -19,7 +19,6 @@ #define CONFIG_SYS_CBSIZE 1024 /* MISC */ -#define CONFIG_SYS_LOAD_ADDR 0x00000000 #define CONFIG_SYS_INIT_RAM_SIZE 0x8000 #define CONFIG_SYS_INIT_RAM_ADDR 0x00190000 #define CONFIG_SYS_INIT_SP_OFFSET \ diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h index eeada873fbd..abf1234e0b8 100644 --- a/include/configs/sunxi-common.h +++ b/include/configs/sunxi-common.h @@ -61,7 +61,6 @@ #ifdef CONFIG_MACH_SUN9I #define SDRAM_OFFSET(x) 0x2##x #define CONFIG_SYS_SDRAM_BASE 0x20000000 -#define CONFIG_SYS_LOAD_ADDR 0x22000000 /* default load address */ /* Note SPL_STACK_R_ADDR is set through Kconfig, we include it here * since it needs to fit in with the other values. By also #defining it * we get warnings if the Kconfig value mismatches. */ @@ -70,7 +69,6 @@ #else #define SDRAM_OFFSET(x) 0x4##x #define CONFIG_SYS_SDRAM_BASE 0x40000000 -#define CONFIG_SYS_LOAD_ADDR 0x42000000 /* default load address */ /* V3s do not have enough memory to place code at 0x4a000000 */ /* Note SPL_STACK_R_ADDR is set through Kconfig, we include it here * since it needs to fit in with the other values. By also #defining it diff --git a/include/configs/synquacer.h b/include/configs/synquacer.h index 4503cf3f6d0..9ce4d56e0f0 100644 --- a/include/configs/synquacer.h +++ b/include/configs/synquacer.h @@ -25,7 +25,6 @@ */ #define CONFIG_SYS_INIT_SP_ADDR (0xe0000000) /* stack of init proccess */ #define CONFIG_SYS_MALLOC_LEN (0x01000000) /* 16Mbyte size of malloc() */ -#define CONFIG_SYS_LOAD_ADDR CONFIG_SYS_SDRAM_BASE /* default kernel load address */ /* * Hardware drivers support diff --git a/include/configs/tam3517-common.h b/include/configs/tam3517-common.h index e79fb91e4d6..518f5dae487 100644 --- a/include/configs/tam3517-common.h +++ b/include/configs/tam3517-common.h @@ -75,10 +75,6 @@ #define CONFIG_SYS_MAXARGS 32 /* max number of command */ /* args */ -/* memtest works on */ - -#define CONFIG_SYS_LOAD_ADDR (OMAP34XX_SDRC_CS0) /* default load */ - /* address */ /* * AM3517 has 12 GP timers, they can be driven by the system clock diff --git a/include/configs/taurus.h b/include/configs/taurus.h index 6e869462f1e..5e553665429 100644 --- a/include/configs/taurus.h +++ b/include/configs/taurus.h @@ -102,9 +102,6 @@ /* SPL related */ #endif -/* load address */ -#define CONFIG_SYS_LOAD_ADDR 0x22000000 - /* bootstrap in spi flash , u-boot + env + linux in nandflash */ #ifndef CONFIG_SPL_BUILD diff --git a/include/configs/tb100.h b/include/configs/tb100.h index d9a9f2a1fc1..4be6e2dc76b 100644 --- a/include/configs/tb100.h +++ b/include/configs/tb100.h @@ -22,7 +22,6 @@ #define CONFIG_SYS_MALLOC_LEN SZ_128K #define CONFIG_SYS_BOOTM_LEN SZ_32M -#define CONFIG_SYS_LOAD_ADDR 0x82000000 /* * UART configuration diff --git a/include/configs/tegra114-common.h b/include/configs/tegra114-common.h index c3418b6e4ca..f714c52bb53 100644 --- a/include/configs/tegra114-common.h +++ b/include/configs/tegra114-common.h @@ -45,7 +45,6 @@ * ramdisk_addr_r simply shouldn't overlap anything else. Choosing 49M allows * for the FDT/DTB to be up to 1M, which is hopefully plenty. */ -#define CONFIG_SYS_LOAD_ADDR 0x81000000 #define MEM_LAYOUT_ENV_SETTINGS \ "scriptaddr=0x90000000\0" \ "pxefile_addr_r=0x90100000\0" \ diff --git a/include/configs/tegra124-common.h b/include/configs/tegra124-common.h index 4d2ea182e60..4a92954c9be 100644 --- a/include/configs/tegra124-common.h +++ b/include/configs/tegra124-common.h @@ -47,7 +47,6 @@ * ramdisk_addr_r simply shouldn't overlap anything else. Choosing 49M allows * for the FDT/DTB to be up to 1M, which is hopefully plenty. */ -#define CONFIG_SYS_LOAD_ADDR 0x81000000 #define MEM_LAYOUT_ENV_SETTINGS \ "scriptaddr=0x90000000\0" \ "pxefile_addr_r=0x90100000\0" \ diff --git a/include/configs/tegra186-common.h b/include/configs/tegra186-common.h index 59eb4fe703c..968501602aa 100644 --- a/include/configs/tegra186-common.h +++ b/include/configs/tegra186-common.h @@ -47,7 +47,6 @@ * ramdisk_addr_r simply shouldn't overlap anything else. Choosing 33M allows * for the FDT/DTB to be up to 1M, which is hopefully plenty. */ -#define CONFIG_SYS_LOAD_ADDR 0x80080000 #define MEM_LAYOUT_ENV_SETTINGS \ "scriptaddr=0x90000000\0" \ "pxefile_addr_r=0x90100000\0" \ diff --git a/include/configs/tegra20-common.h b/include/configs/tegra20-common.h index d61962a8af8..e99e65fd2f4 100644 --- a/include/configs/tegra20-common.h +++ b/include/configs/tegra20-common.h @@ -46,7 +46,6 @@ * ramdisk_addr_r simply shouldn't overlap anything else. Choosing 49M allows * for the FDT/DTB to be up to 1M, which is hopefully plenty. */ -#define CONFIG_SYS_LOAD_ADDR 0x01000000 #define MEM_LAYOUT_ENV_SETTINGS \ "scriptaddr=0x10000000\0" \ "pxefile_addr_r=0x10100000\0" \ diff --git a/include/configs/tegra210-common.h b/include/configs/tegra210-common.h index 4f631001a21..b9e04147be3 100644 --- a/include/configs/tegra210-common.h +++ b/include/configs/tegra210-common.h @@ -38,7 +38,6 @@ * ramdisk_addr_r simply shouldn't overlap anything else. Choosing 33M allows * for the FDT/DTB to be up to 1M, which is hopefully plenty. */ -#define CONFIG_SYS_LOAD_ADDR 0x80080000 #define MEM_LAYOUT_ENV_SETTINGS \ "scriptaddr=0x90000000\0" \ "pxefile_addr_r=0x90100000\0" \ diff --git a/include/configs/tegra30-common.h b/include/configs/tegra30-common.h index 2beca3b1666..0ee13a226d9 100644 --- a/include/configs/tegra30-common.h +++ b/include/configs/tegra30-common.h @@ -42,7 +42,6 @@ * ramdisk_addr_r simply shouldn't overlap anything else. Choosing 49M allows * for the FDT/DTB to be up to 1M, which is hopefully plenty. */ -#define CONFIG_SYS_LOAD_ADDR 0x81000000 #define MEM_LAYOUT_ENV_SETTINGS \ "scriptaddr=0x90000000\0" \ "pxefile_addr_r=0x90100000\0" \ diff --git a/include/configs/thunderx_88xx.h b/include/configs/thunderx_88xx.h index 4d3c58d1e8f..1692c6da060 100644 --- a/include/configs/thunderx_88xx.h +++ b/include/configs/thunderx_88xx.h @@ -42,7 +42,6 @@ #define CONFIG_BOOTP_BOOTFILESIZE /* Miscellaneous configurable options */ -#define CONFIG_SYS_LOAD_ADDR (MEM_BASE) /* Physical Memory Map */ #define PHYS_SDRAM_1 (MEM_BASE) /* SDRAM Bank #1 */ diff --git a/include/configs/ti814x_evm.h b/include/configs/ti814x_evm.h index 67bcc0c2182..ee619ae5b7e 100644 --- a/include/configs/ti814x_evm.h +++ b/include/configs/ti814x_evm.h @@ -87,8 +87,6 @@ /* Console I/O Buffer Size */ #define CONFIG_SYS_CBSIZE 512 -#define CONFIG_SYS_LOAD_ADDR 0x81000000 /* Default */ - /** * Physical Memory Map */ diff --git a/include/configs/ti_armv7_common.h b/include/configs/ti_armv7_common.h index 0b02324236f..ddc82e4d7bc 100644 --- a/include/configs/ti_armv7_common.h +++ b/include/configs/ti_armv7_common.h @@ -21,14 +21,6 @@ #define CONFIG_SETUP_MEMORY_TAGS #define CONFIG_INITRD_TAG -/* - * Our DDR memory always starts at 0x80000000 and U-Boot shall have - * relocated itself to higher in memory by the time this value is used. - * However, set this to a 32MB offset to allow for easier Linux kernel - * booting as the default is often used as the kernel load address. - */ -#define CONFIG_SYS_LOAD_ADDR 0x82000000 - /* * We setup defaults based on constraints from the Linux kernel, which should * also be safe elsewhere. We have the default load at 32MB into DDR (for diff --git a/include/configs/total_compute.h b/include/configs/total_compute.h index 61ca8660061..79b733ac4cf 100644 --- a/include/configs/total_compute.h +++ b/include/configs/total_compute.h @@ -25,7 +25,6 @@ #define CONFIG_PL011_CLOCK 7372800 /* Miscellaneous configurable options */ -#define CONFIG_SYS_LOAD_ADDR 0x90000000 /* Physical Memory Map */ #define PHYS_SDRAM_1 0x80000000 diff --git a/include/configs/tplink_wdr4300.h b/include/configs/tplink_wdr4300.h index 8ff57fb91b7..a4b45500010 100644 --- a/include/configs/tplink_wdr4300.h +++ b/include/configs/tplink_wdr4300.h @@ -16,7 +16,6 @@ #define CONFIG_SYS_BOOTPARAMS_LEN 0x20000 #define CONFIG_SYS_SDRAM_BASE 0xa0000000 -#define CONFIG_SYS_LOAD_ADDR 0xa1000000 #define CONFIG_SYS_INIT_RAM_ADDR 0xbd000000 #define CONFIG_SYS_INIT_RAM_SIZE 0x8000 diff --git a/include/configs/trats.h b/include/configs/trats.h index c3f891ae53d..7284663f04e 100644 --- a/include/configs/trats.h +++ b/include/configs/trats.h @@ -26,9 +26,6 @@ #define PHYS_SDRAM_1 CONFIG_SYS_SDRAM_BASE #define SDRAM_BANK_SIZE (256 << 20) /* 256 MB */ -/* memtest works on */ -#define CONFIG_SYS_LOAD_ADDR (CONFIG_SYS_SDRAM_BASE + 0x4800000) - #define CONFIG_MACH_TYPE MACH_TYPE_TRATS #define CONFIG_BOOTCOMMAND "run autoboot" diff --git a/include/configs/trats2.h b/include/configs/trats2.h index e5f2b0cc993..114dd8e56fa 100644 --- a/include/configs/trats2.h +++ b/include/configs/trats2.h @@ -24,8 +24,6 @@ #define CONFIG_SYS_SDRAM_BASE 0x40000000 #define PHYS_SDRAM_1 CONFIG_SYS_SDRAM_BASE #define SDRAM_BANK_SIZE (256 << 20) /* 256 MB */ -/* memtest works on */ -#define CONFIG_SYS_LOAD_ADDR (CONFIG_SYS_SDRAM_BASE + 0x3E00000) #define CONFIG_BOOTCOMMAND "run autoboot" diff --git a/include/configs/turris_mox.h b/include/configs/turris_mox.h index 6d6925cfab5..875c192601c 100644 --- a/include/configs/turris_mox.h +++ b/include/configs/turris_mox.h @@ -49,7 +49,6 @@ /* * Other required minimal configurations */ -#define CONFIG_SYS_LOAD_ADDR 0x00800000 /* default load adr- 8M */ #define CONFIG_SYS_RESET_ADDRESS 0xffff0000 /* Rst Vector Adr */ #define CONFIG_SYS_MAXARGS 32 /* max number of command args */ diff --git a/include/configs/uniphier.h b/include/configs/uniphier.h index a81fa9db017..42a5029da20 100644 --- a/include/configs/uniphier.h +++ b/include/configs/uniphier.h @@ -69,7 +69,6 @@ #define CONFIG_GATEWAYIP 192.168.11.1 #define CONFIG_NETMASK 255.255.255.0 -#define CONFIG_SYS_LOAD_ADDR 0x85000000 #define CONFIG_SYS_BOOTM_LEN (32 << 20) #if defined(CONFIG_ARM64) diff --git a/include/configs/usb_a9263.h b/include/configs/usb_a9263.h index 73bf2d19da6..7e0ba117cb9 100644 --- a/include/configs/usb_a9263.h +++ b/include/configs/usb_a9263.h @@ -71,8 +71,6 @@ #define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS 2 #endif -#define CONFIG_SYS_LOAD_ADDR 0x22000000 - /* bootstrap + u-boot + env + linux in dataflash on CS0 */ #define CONFIG_BOOTCOMMAND "nboot 21000000 0" #define CONFIG_EXTRA_ENV_SETTINGS \ diff --git a/include/configs/usbarmory.h b/include/configs/usbarmory.h index 381b5d63542..5acdfe29de7 100644 --- a/include/configs/usbarmory.h +++ b/include/configs/usbarmory.h @@ -34,9 +34,6 @@ /* Fuse */ #define CONFIG_FSL_IIM -/* U-Boot memory offsets */ -#define CONFIG_SYS_LOAD_ADDR 0x72000000 - /* Linux boot */ #define CONFIG_HOSTNAME "usbarmory" #define CONFIG_BOOTCOMMAND \ diff --git a/include/configs/vcoreiii.h b/include/configs/vcoreiii.h index 82a8fa7354e..6b5ca71128b 100644 --- a/include/configs/vcoreiii.h +++ b/include/configs/vcoreiii.h @@ -11,7 +11,6 @@ /* Onboard devices */ #define CONFIG_SYS_MALLOC_LEN 0x1F0000 -#define CONFIG_SYS_LOAD_ADDR 0x00100000 #define CONFIG_SYS_INIT_SP_OFFSET 0x400000 #if defined(CONFIG_SOC_LUTON) || defined(CONFIG_SOC_SERVAL) diff --git a/include/configs/verdin-imx8mm.h b/include/configs/verdin-imx8mm.h index d395cf6377b..6601cedd2be 100644 --- a/include/configs/verdin-imx8mm.h +++ b/include/configs/verdin-imx8mm.h @@ -37,8 +37,6 @@ "ramdisk_addr_r=0x46400000\0" \ "scriptaddr=0x46000000\0" -#define CONFIG_SYS_LOAD_ADDR 0x40480000 - /* Enable Distro Boot */ #ifndef CONFIG_SPL_BUILD #define BOOT_TARGET_DEVICES(func) \ diff --git a/include/configs/vexpress_aemv8a.h b/include/configs/vexpress_aemv8a.h index 54b5967a89d..6b7b69da99d 100644 --- a/include/configs/vexpress_aemv8a.h +++ b/include/configs/vexpress_aemv8a.h @@ -105,7 +105,6 @@ #define CONFIG_BOOTP_BOOTFILESIZE /* Miscellaneous configurable options */ -#define CONFIG_SYS_LOAD_ADDR (V2M_BASE + 0x10000000) /* Physical Memory Map */ #define PHYS_SDRAM_1 (V2M_BASE) /* SDRAM Bank #1 */ diff --git a/include/configs/vexpress_common.h b/include/configs/vexpress_common.h index 5d5ad923e5e..4c2c6aa4893 100644 --- a/include/configs/vexpress_common.h +++ b/include/configs/vexpress_common.h @@ -140,7 +140,6 @@ #define CONFIG_BOOTP_BOOTFILESIZE /* Miscellaneous configurable options */ -#define CONFIG_SYS_LOAD_ADDR (V2M_BASE + 0x8000) #define LINUX_BOOT_PARAM_ADDR (V2M_BASE + 0x2000) /* Physical Memory Map */ diff --git a/include/configs/vf610twr.h b/include/configs/vf610twr.h index ca3ae275c5b..9c4b46f3c75 100644 --- a/include/configs/vf610twr.h +++ b/include/configs/vf610twr.h @@ -44,9 +44,6 @@ /* I2C Configs */ #define CONFIG_SYS_SPD_BUS_NUM 0 - -#define CONFIG_SYS_LOAD_ADDR 0x82000000 - /* We boot from the gfxRAM area of the OCRAM. */ #define CONFIG_BOARD_SIZE_LIMIT 520192 diff --git a/include/configs/vinco.h b/include/configs/vinco.h index 496c228b58e..7397d3e8b3e 100644 --- a/include/configs/vinco.h +++ b/include/configs/vinco.h @@ -30,8 +30,6 @@ #define CONFIG_SYS_INIT_SP_ADDR \ (CONFIG_SYS_SDRAM_BASE + 4 * 1024 - GENERATED_GBL_DATA_SIZE) -#define CONFIG_SYS_LOAD_ADDR 0x22000000 /* load address */ - /* SerialFlash */ #ifdef CONFIG_CMD_SF diff --git a/include/configs/vocore2.h b/include/configs/vocore2.h index dfdb8fcc046..3b4f8263953 100644 --- a/include/configs/vocore2.h +++ b/include/configs/vocore2.h @@ -12,8 +12,6 @@ /* RAM */ #define CONFIG_SYS_SDRAM_BASE 0x80000000 -#define CONFIG_SYS_LOAD_ADDR CONFIG_SYS_SDRAM_BASE + 0x100000 - #define CONFIG_SYS_INIT_SP_OFFSET 0x400000 /* SPL */ diff --git a/include/configs/work_92105.h b/include/configs/work_92105.h index e7472ed3ecf..055a50b2ce9 100644 --- a/include/configs/work_92105.h +++ b/include/configs/work_92105.h @@ -30,8 +30,6 @@ #define CONFIG_SYS_SDRAM_BASE EMC_DYCS0_BASE #define CONFIG_SYS_SDRAM_SIZE SZ_128M -#define CONFIG_SYS_LOAD_ADDR (CONFIG_SYS_SDRAM_BASE + SZ_32K) - #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_SDRAM_BASE + SZ_512K \ - GENERATED_GBL_DATA_SIZE) diff --git a/include/configs/x530.h b/include/configs/x530.h index 64d68276234..4481b1d55a9 100644 --- a/include/configs/x530.h +++ b/include/configs/x530.h @@ -75,7 +75,6 @@ "fdt_high=0x10000000\0" \ "initrd_high=0x10000000\0" -#define CONFIG_SYS_LOAD_ADDR 0x1000000 #define CONFIG_UBI_PART user #define CONFIG_UBIFS_VOLUME user diff --git a/include/configs/x86-common.h b/include/configs/x86-common.h index 826aa1d4747..3f9e80e5311 100644 --- a/include/configs/x86-common.h +++ b/include/configs/x86-common.h @@ -53,8 +53,6 @@ */ #define CONFIG_SYS_CBSIZE 512 -#define CONFIG_SYS_LOAD_ADDR 0x20000000 - /*----------------------------------------------------------------------- * CPU Features */ diff --git a/include/configs/xea.h b/include/configs/xea.h index 78ffcefd338..5081cc86912 100644 --- a/include/configs/xea.h +++ b/include/configs/xea.h @@ -43,7 +43,6 @@ /* Booting Linux */ #define CONFIG_BOOTFILE "uImage" #define CONFIG_BOOTCOMMAND "run ${bootpri} ; run ${bootsec}" -#define CONFIG_SYS_LOAD_ADDR 0x42000000 /* Extra Environment */ #define CONFIG_HOSTNAME "xea" diff --git a/include/configs/xenguest_arm64.h b/include/configs/xenguest_arm64.h index d76ce13d14e..380084f4ece 100644 --- a/include/configs/xenguest_arm64.h +++ b/include/configs/xenguest_arm64.h @@ -20,7 +20,6 @@ * This can be any arbitrary address as we are using PIE, but * please note, that CONFIG_SYS_TEXT_BASE must match the below. */ -#define CONFIG_SYS_LOAD_ADDR 0x40000000 #define CONFIG_LNX_KRNL_IMG_TEXT_OFFSET_BASE CONFIG_SYS_LOAD_ADDR /* Size of malloc() pool */ diff --git a/include/configs/xilinx_versal.h b/include/configs/xilinx_versal.h index 62680ad2386..43486457a45 100644 --- a/include/configs/xilinx_versal.h +++ b/include/configs/xilinx_versal.h @@ -36,7 +36,6 @@ #define CONFIG_BOOTP_MAY_FAIL /* Miscellaneous configurable options */ -#define CONFIG_SYS_LOAD_ADDR 0x8000000 /* Monitor Command Prompt */ /* Console I/O Buffer Size */ diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h index c62d751c137..6864a101b85 100644 --- a/include/configs/xilinx_zynqmp.h +++ b/include/configs/xilinx_zynqmp.h @@ -48,7 +48,6 @@ #endif /* Miscellaneous configurable options */ -#define CONFIG_SYS_LOAD_ADDR 0x8000000 #if defined(CONFIG_ZYNQMP_USB) #define DFU_DEFAULT_POLL_TIMEOUT 300 diff --git a/include/configs/xilinx_zynqmp_r5.h b/include/configs/xilinx_zynqmp_r5.h index c0cd72e5642..e382f4b4735 100644 --- a/include/configs/xilinx_zynqmp_r5.h +++ b/include/configs/xilinx_zynqmp_r5.h @@ -17,7 +17,6 @@ {300, 600, 1200, 2400, 4800, 9600, 19200, 38400, 57600, 115200, 230400} /* Boot configuration */ -#define CONFIG_SYS_LOAD_ADDR 0 /* default? */ #define CONFIG_SYS_MAXARGS 32 /* max number of command args */ diff --git a/include/configs/xtfpga.h b/include/configs/xtfpga.h index 516a6089f6d..04d58a13ca6 100644 --- a/include/configs/xtfpga.h +++ b/include/configs/xtfpga.h @@ -98,9 +98,6 @@ #define XTENSA_SYS_TEXT_ADDR \ (MEMADDR(CONFIG_SYS_MEMORY_SIZE) - CONFIG_SYS_MONITOR_LEN) -/* Used by tftpboot; env var 'loadaddr' */ -#define CONFIG_SYS_LOAD_ADDR MEMADDR(0x02000000) - /*==============================*/ /* U-Boot general configuration */ /*==============================*/ diff --git a/include/configs/zmx25.h b/include/configs/zmx25.h index 88a885463d4..7d747d20dee 100644 --- a/include/configs/zmx25.h +++ b/include/configs/zmx25.h @@ -80,8 +80,6 @@ * CFI FLASH driver setup */ -#define CONFIG_SYS_LOAD_ADDR CONFIG_SYS_SDRAM_BASE - /* * Size of malloc() pool diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h index 7859b77603f..9b4c54b5e6a 100644 --- a/include/configs/zynq-common.h +++ b/include/configs/zynq-common.h @@ -65,7 +65,6 @@ /* enable preboot to be loaded before CONFIG_BOOTDELAY */ /* Boot configuration */ -#define CONFIG_SYS_LOAD_ADDR 0 /* default? */ #ifdef CONFIG_SPL_BUILD #define BOOTENV -- cgit v1.2.3 From 395110284b56bb704020df3fcdf66b74e63986fb Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Tue, 24 Aug 2021 20:41:03 -0400 Subject: nitrogen6x: Populate FDTFILE at build-time for all platforms Rather than using CONFIG_SABRELITE to set FDTFILE for only that platform, switch to always setting this based on CONFIG_DEFAULT_DEVICE_TREE as this should always match the kernel device tree name anyhow. Signed-off-by: Tom Rini Acked-by: Troy Kisky --- include/configs/nitrogen6x.h | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'include') diff --git a/include/configs/nitrogen6x.h b/include/configs/nitrogen6x.h index c6e14617832..6250ce42b95 100644 --- a/include/configs/nitrogen6x.h +++ b/include/configs/nitrogen6x.h @@ -84,14 +84,6 @@ #define DISTRO_BOOT_DEV_DHCP(func) #endif - -#if defined(CONFIG_SABRELITE) -#define FDTFILE "fdtfile=imx6q-sabrelite.dtb\0" -#else -/* FIXME: nitrogen6x covers multiple configs. Define fdtfile for each supported config. */ -#define FDTFILE -#endif - #define BOOT_TARGET_DEVICES(func) \ DISTRO_BOOT_DEV_MMC(func) \ DISTRO_BOOT_DEV_SATA(func) \ @@ -107,7 +99,7 @@ "fdt_high=0xffffffff\0" \ "initrd_high=0xffffffff\0" \ "fdt_addr_r=0x18000000\0" \ - FDTFILE \ + "fdtfile=" __stringify(CONFIG_DEFAULT_DEVICE_TREE) ".dtb\0" \ "kernel_addr_r=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ "pxefile_addr_r=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ "scriptaddr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ -- cgit v1.2.3 From d8ef01e964d6b56d4cce61a6fb3db65026e1cd52 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Tue, 24 Aug 2021 23:11:49 -0400 Subject: Convert CONFIG_RAMBOOT_PBL et al to Kconfig This converts the following to Kconfig: CONFIG_RAMBOOT_PBL CONFIG_SYS_FSL_PBL_PBI CONFIG_SYS_FSL_PBL_RCW Signed-off-by: Tom Rini --- include/configs/P2041RDB.h | 2 -- include/configs/T102xRDB.h | 16 ----------- include/configs/T104xRDB.h | 68 -------------------------------------------- include/configs/T208xQDS.h | 11 ------- include/configs/T208xRDB.h | 5 ---- include/configs/T4240RDB.h | 2 -- include/configs/corenet_ds.h | 10 ------- include/configs/ls1021aiot.h | 7 ----- include/configs/ls1021aqds.h | 14 --------- include/configs/ls1021atsn.h | 8 ------ include/configs/ls1021atwr.h | 12 -------- include/configs/ls1043aqds.h | 17 ----------- include/configs/ls1043ardb.h | 9 ------ include/configs/ls1046aqds.h | 20 ------------- include/configs/ls1046ardb.h | 14 +-------- 15 files changed, 1 insertion(+), 214 deletions(-) (limited to 'include') diff --git a/include/configs/P2041RDB.h b/include/configs/P2041RDB.h index c79ea361549..08d2a5ad72f 100644 --- a/include/configs/P2041RDB.h +++ b/include/configs/P2041RDB.h @@ -14,8 +14,6 @@ #ifdef CONFIG_RAMBOOT_PBL #define CONFIG_RAMBOOT_TEXT_BASE CONFIG_SYS_TEXT_BASE #define CONFIG_RESET_VECTOR_ADDRESS 0xfffffffc -#define CONFIG_SYS_FSL_PBL_PBI board/freescale/corenet_ds/pbi.cfg -#define CONFIG_SYS_FSL_PBL_RCW board/freescale/corenet_ds/rcw_p2041rdb.cfg #endif #ifdef CONFIG_SRIO_PCIE_BOOT_SLAVE diff --git a/include/configs/T102xRDB.h b/include/configs/T102xRDB.h index ce8c2b2a20c..3fceef2fba3 100644 --- a/include/configs/T102xRDB.h +++ b/include/configs/T102xRDB.h @@ -26,7 +26,6 @@ #endif #ifdef CONFIG_RAMBOOT_PBL -#define CONFIG_SYS_FSL_PBL_PBI board/freescale/t102xrdb/t1024_pbi.cfg #define CONFIG_SPL_FLUSH_IMAGE #define CONFIG_SPL_PAD_TO 0x40000 #define CONFIG_SPL_MAX_SIZE 0x28000 @@ -43,11 +42,6 @@ #define CONFIG_SYS_NAND_U_BOOT_DST 0x30000000 #define CONFIG_SYS_NAND_U_BOOT_START 0x30000000 #define CONFIG_SYS_NAND_U_BOOT_OFFS (256 << 10) -#if defined(CONFIG_TARGET_T1024RDB) -#define CONFIG_SYS_FSL_PBL_RCW board/freescale/t102xrdb/t1024_nand_rcw.cfg -#elif defined(CONFIG_TARGET_T1023RDB) -#define CONFIG_SYS_FSL_PBL_RCW board/freescale/t102xrdb/t1023_nand_rcw.cfg -#endif #endif #ifdef CONFIG_SPIFLASH @@ -60,11 +54,6 @@ #ifndef CONFIG_SPL_BUILD #define CONFIG_SYS_MPC85XX_NO_RESETVEC #endif -#if defined(CONFIG_TARGET_T1024RDB) -#define CONFIG_SYS_FSL_PBL_RCW board/freescale/t102xrdb/t1024_spi_rcw.cfg -#elif defined(CONFIG_TARGET_T1023RDB) -#define CONFIG_SYS_FSL_PBL_RCW board/freescale/t102xrdb/t1023_spi_rcw.cfg -#endif #endif #ifdef CONFIG_SDCARD @@ -76,11 +65,6 @@ #ifndef CONFIG_SPL_BUILD #define CONFIG_SYS_MPC85XX_NO_RESETVEC #endif -#if defined(CONFIG_TARGET_T1024RDB) -#define CONFIG_SYS_FSL_PBL_RCW board/freescale/t102xrdb/t1024_sd_rcw.cfg -#elif defined(CONFIG_TARGET_T1023RDB) -#define CONFIG_SYS_FSL_PBL_RCW board/freescale/t102xrdb/t1023_sd_rcw.cfg -#endif #endif #endif /* CONFIG_RAMBOOT_PBL */ diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h index 4f589ed0c91..4e993d9fe0e 100644 --- a/include/configs/T104xRDB.h +++ b/include/configs/T104xRDB.h @@ -15,14 +15,6 @@ #include #ifdef CONFIG_RAMBOOT_PBL - -#ifndef CONFIG_NXP_ESBC -#define CONFIG_SYS_FSL_PBL_PBI $(SRCTREE)/board/freescale/t104xrdb/t104x_pbi.cfg -#else -#define CONFIG_SYS_FSL_PBL_PBI \ - $(SRCTREE)/board/freescale/t104xrdb/t104x_pbi_sb.cfg -#endif - #define CONFIG_SPL_FLUSH_IMAGE #define CONFIG_SPL_PAD_TO 0x40000 #define CONFIG_SPL_MAX_SIZE 0x28000 @@ -49,26 +41,6 @@ #define CONFIG_SYS_NAND_U_BOOT_DST 0x30000000 #define CONFIG_SYS_NAND_U_BOOT_START 0x30000000 #define CONFIG_SYS_NAND_U_BOOT_OFFS (256 << 10) -#ifdef CONFIG_TARGET_T1040RDB -#define CONFIG_SYS_FSL_PBL_RCW \ -$(SRCTREE)/board/freescale/t104xrdb/t1040_nand_rcw.cfg -#endif -#ifdef CONFIG_TARGET_T1042RDB_PI -#define CONFIG_SYS_FSL_PBL_RCW \ -$(SRCTREE)/board/freescale/t104xrdb/t1042_pi_nand_rcw.cfg -#endif -#ifdef CONFIG_TARGET_T1042RDB -#define CONFIG_SYS_FSL_PBL_RCW \ -$(SRCTREE)/board/freescale/t104xrdb/t1042_nand_rcw.cfg -#endif -#ifdef CONFIG_TARGET_T1040D4RDB -#define CONFIG_SYS_FSL_PBL_RCW \ -$(SRCTREE)/board/freescale/t104xrdb/t1040d4_nand_rcw.cfg -#endif -#ifdef CONFIG_TARGET_T1042D4RDB -#define CONFIG_SYS_FSL_PBL_RCW \ -$(SRCTREE)/board/freescale/t104xrdb/t1042d4_nand_rcw.cfg -#endif #endif #ifdef CONFIG_SPIFLASH @@ -81,26 +53,6 @@ $(SRCTREE)/board/freescale/t104xrdb/t1042d4_nand_rcw.cfg #ifndef CONFIG_SPL_BUILD #define CONFIG_SYS_MPC85XX_NO_RESETVEC #endif -#ifdef CONFIG_TARGET_T1040RDB -#define CONFIG_SYS_FSL_PBL_RCW \ -$(SRCTREE)/board/freescale/t104xrdb/t1040_spi_rcw.cfg -#endif -#ifdef CONFIG_TARGET_T1042RDB_PI -#define CONFIG_SYS_FSL_PBL_RCW \ -$(SRCTREE)/board/freescale/t104xrdb/t1042_pi_spi_rcw.cfg -#endif -#ifdef CONFIG_TARGET_T1042RDB -#define CONFIG_SYS_FSL_PBL_RCW \ -$(SRCTREE)/board/freescale/t104xrdb/t1042_spi_rcw.cfg -#endif -#ifdef CONFIG_TARGET_T1040D4RDB -#define CONFIG_SYS_FSL_PBL_RCW \ -$(SRCTREE)/board/freescale/t104xrdb/t1040d4_spi_rcw.cfg -#endif -#ifdef CONFIG_TARGET_T1042D4RDB -#define CONFIG_SYS_FSL_PBL_RCW \ -$(SRCTREE)/board/freescale/t104xrdb/t1042d4_spi_rcw.cfg -#endif #endif #ifdef CONFIG_SDCARD @@ -112,26 +64,6 @@ $(SRCTREE)/board/freescale/t104xrdb/t1042d4_spi_rcw.cfg #ifndef CONFIG_SPL_BUILD #define CONFIG_SYS_MPC85XX_NO_RESETVEC #endif -#ifdef CONFIG_TARGET_T1040RDB -#define CONFIG_SYS_FSL_PBL_RCW \ -$(SRCTREE)/board/freescale/t104xrdb/t1040_sd_rcw.cfg -#endif -#ifdef CONFIG_TARGET_T1042RDB_PI -#define CONFIG_SYS_FSL_PBL_RCW \ -$(SRCTREE)/board/freescale/t104xrdb/t1042_pi_sd_rcw.cfg -#endif -#ifdef CONFIG_TARGET_T1042RDB -#define CONFIG_SYS_FSL_PBL_RCW \ -$(SRCTREE)/board/freescale/t104xrdb/t1042_sd_rcw.cfg -#endif -#ifdef CONFIG_TARGET_T1040D4RDB -#define CONFIG_SYS_FSL_PBL_RCW \ -$(SRCTREE)/board/freescale/t104xrdb/t1040d4_sd_rcw.cfg -#endif -#ifdef CONFIG_TARGET_T1042D4RDB -#define CONFIG_SYS_FSL_PBL_RCW \ -$(SRCTREE)/board/freescale/t104xrdb/t1042d4_sd_rcw.cfg -#endif #endif #endif diff --git a/include/configs/T208xQDS.h b/include/configs/T208xQDS.h index 70a856cf555..1c53a38a189 100644 --- a/include/configs/T208xQDS.h +++ b/include/configs/T208xQDS.h @@ -29,8 +29,6 @@ #define CONFIG_SYS_NUM_CPC CONFIG_SYS_NUM_DDR_CTLRS #ifdef CONFIG_RAMBOOT_PBL -#define CONFIG_SYS_FSL_PBL_PBI board/freescale/t208xqds/t208x_pbi.cfg - #define CONFIG_SPL_FLUSH_IMAGE #define CONFIG_SPL_PAD_TO 0x40000 #define CONFIG_SPL_MAX_SIZE 0x28000 @@ -47,9 +45,6 @@ #define CONFIG_SYS_NAND_U_BOOT_DST 0x00200000 #define CONFIG_SYS_NAND_U_BOOT_START 0x00200000 #define CONFIG_SYS_NAND_U_BOOT_OFFS (256 << 10) -#if defined(CONFIG_ARCH_T2080) -#define CONFIG_SYS_FSL_PBL_RCW board/freescale/t208xqds/t2080_nand_rcw.cfg -#endif #endif #ifdef CONFIG_SPIFLASH @@ -62,9 +57,6 @@ #ifndef CONFIG_SPL_BUILD #define CONFIG_SYS_MPC85XX_NO_RESETVEC #endif -#if defined(CONFIG_ARCH_T2080) -#define CONFIG_SYS_FSL_PBL_RCW board/freescale/t208xqds/t2080_spi_rcw.cfg -#endif #endif #ifdef CONFIG_SDCARD @@ -76,9 +68,6 @@ #ifndef CONFIG_SPL_BUILD #define CONFIG_SYS_MPC85XX_NO_RESETVEC #endif -#if defined(CONFIG_ARCH_T2080) -#define CONFIG_SYS_FSL_PBL_RCW board/freescale/t208xqds/t2080_sd_rcw.cfg -#endif #endif #endif /* CONFIG_RAMBOOT_PBL */ diff --git a/include/configs/T208xRDB.h b/include/configs/T208xRDB.h index 1901211e4fc..9d12f57d5d9 100644 --- a/include/configs/T208xRDB.h +++ b/include/configs/T208xRDB.h @@ -24,8 +24,6 @@ #define CONFIG_SYS_NUM_CPC CONFIG_SYS_NUM_DDR_CTLRS #ifdef CONFIG_RAMBOOT_PBL -#define CONFIG_SYS_FSL_PBL_PBI board/freescale/t208xrdb/t2080_pbi.cfg - #define CONFIG_SPL_FLUSH_IMAGE #define CONFIG_SPL_PAD_TO 0x40000 #define CONFIG_SPL_MAX_SIZE 0x28000 @@ -42,7 +40,6 @@ #define CONFIG_SYS_NAND_U_BOOT_DST 0x00200000 #define CONFIG_SYS_NAND_U_BOOT_START 0x00200000 #define CONFIG_SYS_NAND_U_BOOT_OFFS (256 << 10) -#define CONFIG_SYS_FSL_PBL_RCW board/freescale/t208xrdb/t2080_nand_rcw.cfg #endif #ifdef CONFIG_SPIFLASH @@ -55,7 +52,6 @@ #ifndef CONFIG_SPL_BUILD #define CONFIG_SYS_MPC85XX_NO_RESETVEC #endif -#define CONFIG_SYS_FSL_PBL_RCW board/freescale/t208xrdb/t2080_spi_rcw.cfg #endif #ifdef CONFIG_SDCARD @@ -67,7 +63,6 @@ #ifndef CONFIG_SPL_BUILD #define CONFIG_SYS_MPC85XX_NO_RESETVEC #endif -#define CONFIG_SYS_FSL_PBL_RCW board/freescale/t208xrdb/t2080_sd_rcw.cfg #endif #endif /* CONFIG_RAMBOOT_PBL */ diff --git a/include/configs/T4240RDB.h b/include/configs/T4240RDB.h index 4856890dc94..afcbff9a809 100644 --- a/include/configs/T4240RDB.h +++ b/include/configs/T4240RDB.h @@ -18,7 +18,6 @@ #define CONFIG_ICS307_REFCLK_HZ 25000000 /* ICS307 ref clk freq */ #ifdef CONFIG_RAMBOOT_PBL -#define CONFIG_SYS_FSL_PBL_PBI $(SRCTREE)/board/freescale/t4rdb/t4_pbi.cfg #ifndef CONFIG_SDCARD #define CONFIG_RAMBOOT_TEXT_BASE CONFIG_SYS_TEXT_BASE #define CONFIG_RESET_VECTOR_ADDRESS 0xfffffffc @@ -38,7 +37,6 @@ #ifndef CONFIG_SPL_BUILD #define CONFIG_SYS_MPC85XX_NO_RESETVEC #endif -#define CONFIG_SYS_FSL_PBL_RCW $(SRCTREE)/board/freescale/t4rdb/t4_sd_rcw.cfg #endif #ifdef CONFIG_SPL_BUILD diff --git a/include/configs/corenet_ds.h b/include/configs/corenet_ds.h index b0add5c6f01..933a4937a50 100644 --- a/include/configs/corenet_ds.h +++ b/include/configs/corenet_ds.h @@ -25,16 +25,6 @@ #else #define CONFIG_RAMBOOT_TEXT_BASE CONFIG_SYS_TEXT_BASE #define CONFIG_RESET_VECTOR_ADDRESS 0xfffffffc -#define CONFIG_SYS_FSL_PBL_PBI board/freescale/corenet_ds/pbi.cfg -#if defined(CONFIG_TARGET_P3041DS) -#define CONFIG_SYS_FSL_PBL_RCW board/freescale/corenet_ds/rcw_p3041ds.cfg -#elif defined(CONFIG_TARGET_P4080DS) -#define CONFIG_SYS_FSL_PBL_RCW board/freescale/corenet_ds/rcw_p4080ds.cfg -#elif defined(CONFIG_TARGET_P5020DS) -#define CONFIG_SYS_FSL_PBL_RCW board/freescale/corenet_ds/rcw_p5020ds.cfg -#elif defined(CONFIG_TARGET_P5040DS) -#define CONFIG_SYS_FSL_PBL_RCW board/freescale/corenet_ds/rcw_p5040ds.cfg -#endif #endif #endif diff --git a/include/configs/ls1021aiot.h b/include/configs/ls1021aiot.h index 0653fd576e7..0b39ad1a312 100644 --- a/include/configs/ls1021aiot.h +++ b/include/configs/ls1021aiot.h @@ -52,14 +52,7 @@ #define SDRAM_CFG2_FRC_SR 0x80000000 #define SDRAM_CFG_BI 0x00000001 -#ifdef CONFIG_RAMBOOT_PBL -#define CONFIG_SYS_FSL_PBL_PBI \ - board/freescale/ls1021aiot/ls102xa_pbi.cfg -#endif - #ifdef CONFIG_SD_BOOT -#define CONFIG_SYS_FSL_PBL_RCW \ - board/freescale/ls1021aiot/ls102xa_rcw_sd.cfg #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 6c5aa401d2c..b7bfa218796 100644 --- a/include/configs/ls1021aqds.h +++ b/include/configs/ls1021aqds.h @@ -34,19 +34,7 @@ unsigned long get_board_sys_clk(void); #define CONFIG_SYS_CLK_FREQ get_board_sys_clk() #endif -#ifdef CONFIG_RAMBOOT_PBL -#define CONFIG_SYS_FSL_PBL_PBI board/freescale/ls1021aqds/ls102xa_pbi.cfg -#endif - #ifdef CONFIG_SD_BOOT -#ifdef CONFIG_SD_BOOT_QSPI -#define CONFIG_SYS_FSL_PBL_RCW \ - board/freescale/ls1021aqds/ls102xa_rcw_sd_qspi.cfg -#else -#define CONFIG_SYS_FSL_PBL_RCW \ - board/freescale/ls1021aqds/ls102xa_rcw_sd_ifc.cfg -#endif - #define CONFIG_SPL_MAX_SIZE 0x1a000 #define CONFIG_SPL_STACK 0x1001d000 #define CONFIG_SPL_PAD_TO 0x1c000 @@ -60,8 +48,6 @@ unsigned long get_board_sys_clk(void); #endif #ifdef CONFIG_NAND_BOOT -#define CONFIG_SYS_FSL_PBL_RCW board/freescale/ls1021aqds/ls102xa_rcw_nand.cfg - #define CONFIG_SPL_MAX_SIZE 0x1a000 #define CONFIG_SPL_STACK 0x1001d000 #define CONFIG_SPL_PAD_TO 0x1c000 diff --git a/include/configs/ls1021atsn.h b/include/configs/ls1021atsn.h index 20b67b02b17..3179c5b35cd 100644 --- a/include/configs/ls1021atsn.h +++ b/include/configs/ls1021atsn.h @@ -50,15 +50,7 @@ #define SDRAM_CFG2_FRC_SR 0x80000000 #define SDRAM_CFG_BI 0x00000001 -#ifdef CONFIG_RAMBOOT_PBL -#define CONFIG_SYS_FSL_PBL_PBI \ - "board/freescale/ls1021atsn/ls102xa_pbi.cfg" -#endif - #ifdef CONFIG_SD_BOOT -#define CONFIG_SYS_FSL_PBL_RCW \ - "board/freescale/ls1021atsn/ls102xa_rcw_sd.cfg" - #ifdef CONFIG_NXP_ESBC #define CONFIG_U_BOOT_HDR_SIZE (16 << 10) #endif /* ifdef CONFIG_NXP_ESBC */ diff --git a/include/configs/ls1021atwr.h b/include/configs/ls1021atwr.h index 70897c2c1c4..39f0b8e0e40 100644 --- a/include/configs/ls1021atwr.h +++ b/include/configs/ls1021atwr.h @@ -51,19 +51,7 @@ #define SDRAM_CFG2_FRC_SR 0x80000000 #define SDRAM_CFG_BI 0x00000001 -#ifdef CONFIG_RAMBOOT_PBL -#define CONFIG_SYS_FSL_PBL_PBI board/freescale/ls1021atwr/ls102xa_pbi.cfg -#endif - #ifdef CONFIG_SD_BOOT -#ifdef CONFIG_SD_BOOT_QSPI -#define CONFIG_SYS_FSL_PBL_RCW \ - board/freescale/ls1021atwr/ls102xa_rcw_sd_qspi.cfg -#else -#define CONFIG_SYS_FSL_PBL_RCW \ - board/freescale/ls1021atwr/ls102xa_rcw_sd_ifc.cfg -#endif - #ifdef CONFIG_NXP_ESBC /* * HDR would be appended at end of image and copied to DDR along diff --git a/include/configs/ls1043aqds.h b/include/configs/ls1043aqds.h index b97e855c9f5..e2f27799183 100644 --- a/include/configs/ls1043aqds.h +++ b/include/configs/ls1043aqds.h @@ -48,23 +48,6 @@ unsigned long get_board_sys_clk(void); #define QSGMII_CARD_PORT4_PHY_ADDR_S2 0xB #endif -#ifdef CONFIG_RAMBOOT_PBL -#define CONFIG_SYS_FSL_PBL_PBI board/freescale/ls1043aqds/ls1043aqds_pbi.cfg -#endif - -#ifdef CONFIG_NAND_BOOT -#define CONFIG_SYS_FSL_PBL_RCW board/freescale/ls1043aqds/ls1043aqds_rcw_nand.cfg -#endif - -#ifdef CONFIG_SD_BOOT -#ifdef CONFIG_SD_BOOT_QSPI -#define CONFIG_SYS_FSL_PBL_RCW \ - board/freescale/ls1043aqds/ls1043aqds_rcw_sd_qspi.cfg -#else -#define CONFIG_SYS_FSL_PBL_RCW board/freescale/ls1043aqds/ls1043aqds_rcw_sd_ifc.cfg -#endif -#endif - /* LPUART */ #ifdef CONFIG_LPUART #define CONFIG_LPUART_32B_REG diff --git a/include/configs/ls1043ardb.h b/include/configs/ls1043ardb.h index 6b28abf03d2..906cd09f6eb 100644 --- a/include/configs/ls1043ardb.h +++ b/include/configs/ls1043ardb.h @@ -23,16 +23,7 @@ #define CONFIG_MEM_INIT_VALUE 0xdeadbeef #endif -#ifdef CONFIG_RAMBOOT_PBL -#define CONFIG_SYS_FSL_PBL_PBI board/freescale/ls1043ardb/ls1043ardb_pbi.cfg -#endif - -#ifdef CONFIG_NAND_BOOT -#define CONFIG_SYS_FSL_PBL_RCW board/freescale/ls1043ardb/ls1043ardb_rcw_nand.cfg -#endif - #ifdef CONFIG_SD_BOOT -#define CONFIG_SYS_FSL_PBL_RCW board/freescale/ls1043ardb/ls1043ardb_rcw_sd.cfg #define CONFIG_SYS_SPL_ARGS_ADDR 0x90000000 #define CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR 0x10000 #define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR 0x500 diff --git a/include/configs/ls1046aqds.h b/include/configs/ls1046aqds.h index 5720e113d78..6474fcef37a 100644 --- a/include/configs/ls1046aqds.h +++ b/include/configs/ls1046aqds.h @@ -50,26 +50,6 @@ unsigned long get_board_sys_clk(void); #define QSGMII_CARD_PORT4_PHY_ADDR_S2 0xB #endif -#ifdef CONFIG_RAMBOOT_PBL -#define CONFIG_SYS_FSL_PBL_PBI \ - board/freescale/ls1046aqds/ls1046aqds_pbi.cfg -#endif - -#ifdef CONFIG_NAND_BOOT -#define CONFIG_SYS_FSL_PBL_RCW \ - board/freescale/ls1046aqds/ls1046aqds_rcw_nand.cfg -#endif - -#ifdef CONFIG_SD_BOOT -#ifdef CONFIG_SD_BOOT_QSPI -#define CONFIG_SYS_FSL_PBL_RCW \ - board/freescale/ls1046aqds/ls1046aqds_rcw_sd_qspi.cfg -#else -#define CONFIG_SYS_FSL_PBL_RCW \ - board/freescale/ls1046aqds/ls1046aqds_rcw_sd_ifc.cfg -#endif -#endif - /* IFC */ #if !defined(CONFIG_QSPI_BOOT) && !defined(CONFIG_SD_BOOT_QSPI) #define CONFIG_FSL_IFC diff --git a/include/configs/ls1046ardb.h b/include/configs/ls1046ardb.h index 814901ef31f..40c045a97f3 100644 --- a/include/configs/ls1046ardb.h +++ b/include/configs/ls1046ardb.h @@ -22,19 +22,7 @@ #define CONFIG_MEM_INIT_VALUE 0xdeadbeef -#ifdef CONFIG_SD_BOOT -#define CONFIG_SYS_FSL_PBL_PBI board/freescale/ls1046ardb/ls1046ardb_pbi.cfg -#ifdef CONFIG_EMMC_BOOT -#define CONFIG_SYS_FSL_PBL_RCW \ - board/freescale/ls1046ardb/ls1046ardb_rcw_emmc.cfg -#else -#define CONFIG_SYS_FSL_PBL_RCW board/freescale/ls1046ardb/ls1046ardb_rcw_sd.cfg -#endif -#elif defined(CONFIG_QSPI_BOOT) -#define CONFIG_SYS_FSL_PBL_RCW \ - board/freescale/ls1046ardb/ls1046ardb_rcw_qspi.cfg -#define CONFIG_SYS_FSL_PBL_PBI \ - board/freescale/ls1046ardb/ls1046ardb_qspi_pbi.cfg +#if defined(CONFIG_QSPI_BOOT) #define CONFIG_SYS_UBOOT_BASE 0x40100000 #define CONFIG_SYS_SPL_ARGS_ADDR 0x90000000 #endif -- cgit v1.2.3 From ab92b38a0161f0d8efa1c2112d944ef8f755dfbe Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Thu, 26 Aug 2021 11:47:59 -0400 Subject: Finish converting CONFIG_SYS_CACHELINE_SIZE to Kconfig We move the SYS_CACHE_SHIFT_N options from arch/arm/Kconfig to arch/Kconfig, and introduce SYS_CACHE_SHIFT_4 to provide a size of 16. Introduce select statements for other architectures based on current usage. For MIPS, we take the existing arch-specific symbol and migrate to the generic symbol. This lets us remove a little bit of otherwise unused code. Cc: Alexey Brodkin Cc: Anup Patel Cc: Atish Patra Cc: Bin Meng Cc: Leo Cc: Palmer Dabbelt Cc: Paul Walmsley Cc: Sean Anderson Cc: Simon Glass Signed-off-by: Tom Rini Acked-by: Sean Anderson Reviewed-by: Daniel Schwierzeck Reviewed-by: Rick Chen --- include/configs/M5208EVBE.h | 1 - include/configs/M5235EVB.h | 1 - include/configs/M5249EVB.h | 1 - include/configs/M5253DEMO.h | 1 - include/configs/M5272C3.h | 1 - include/configs/M5275EVB.h | 1 - include/configs/M5282EVB.h | 1 - include/configs/M53017EVB.h | 1 - include/configs/M5329EVB.h | 1 - include/configs/M5373EVB.h | 1 - include/configs/amcore.h | 1 - include/configs/astro_mcf5373l.h | 1 - include/configs/cobra5272.h | 1 - include/configs/eb_cpu5282.h | 1 - include/configs/mx7ulp_evk.h | 2 -- include/configs/rk3188_common.h | 2 -- include/configs/rk3368_common.h | 2 -- include/configs/sifive-unmatched.h | 2 -- include/configs/sipeed-maix.h | 1 - include/configs/stmark2.h | 1 - 20 files changed, 24 deletions(-) (limited to 'include') diff --git a/include/configs/M5208EVBE.h b/include/configs/M5208EVBE.h index d75946b022c..93a2806a8a0 100644 --- a/include/configs/M5208EVBE.h +++ b/include/configs/M5208EVBE.h @@ -131,7 +131,6 @@ env/embedded.o(.text*); /* Cache Configuration */ -#define CONFIG_SYS_CACHELINE_SIZE 16 #define ICACHE_STATUS (CONFIG_SYS_INIT_RAM_ADDR + \ CONFIG_SYS_INIT_RAM_SIZE - 8) diff --git a/include/configs/M5235EVB.h b/include/configs/M5235EVB.h index b0e6ed4e1d5..22c593851f0 100644 --- a/include/configs/M5235EVB.h +++ b/include/configs/M5235EVB.h @@ -147,7 +147,6 @@ /*----------------------------------------------------------------------- * Cache Configuration */ -#define CONFIG_SYS_CACHELINE_SIZE 16 #define ICACHE_STATUS (CONFIG_SYS_INIT_RAM_ADDR + \ CONFIG_SYS_INIT_RAM_SIZE - 8) diff --git a/include/configs/M5249EVB.h b/include/configs/M5249EVB.h index a8734697c1a..2e8bbbb5301 100644 --- a/include/configs/M5249EVB.h +++ b/include/configs/M5249EVB.h @@ -102,7 +102,6 @@ /*----------------------------------------------------------------------- * Cache Configuration */ -#define CONFIG_SYS_CACHELINE_SIZE 16 #define ICACHE_STATUS (CONFIG_SYS_INIT_RAM_ADDR + \ CONFIG_SYS_INIT_RAM_SIZE - 8) diff --git a/include/configs/M5253DEMO.h b/include/configs/M5253DEMO.h index e1f54571d24..cc7126c76e8 100644 --- a/include/configs/M5253DEMO.h +++ b/include/configs/M5253DEMO.h @@ -153,7 +153,6 @@ #endif /* Cache Configuration */ -#define CONFIG_SYS_CACHELINE_SIZE 16 #define ICACHE_STATUS (CONFIG_SYS_INIT_RAM_ADDR + \ CONFIG_SYS_INIT_RAM_SIZE - 8) diff --git a/include/configs/M5272C3.h b/include/configs/M5272C3.h index 35977cc5c2c..02b8e373a76 100644 --- a/include/configs/M5272C3.h +++ b/include/configs/M5272C3.h @@ -133,7 +133,6 @@ /*----------------------------------------------------------------------- * Cache Configuration */ -#define CONFIG_SYS_CACHELINE_SIZE 16 #define ICACHE_STATUS (CONFIG_SYS_INIT_RAM_ADDR + \ CONFIG_SYS_INIT_RAM_SIZE - 8) diff --git a/include/configs/M5275EVB.h b/include/configs/M5275EVB.h index f66ecc8e8f7..29b0f7b67fa 100644 --- a/include/configs/M5275EVB.h +++ b/include/configs/M5275EVB.h @@ -140,7 +140,6 @@ /*----------------------------------------------------------------------- * Cache Configuration */ -#define CONFIG_SYS_CACHELINE_SIZE 16 #define ICACHE_STATUS (CONFIG_SYS_INIT_RAM_ADDR + \ CONFIG_SYS_INIT_RAM_SIZE - 8) diff --git a/include/configs/M5282EVB.h b/include/configs/M5282EVB.h index acaa2f1a966..fb60ec87da7 100644 --- a/include/configs/M5282EVB.h +++ b/include/configs/M5282EVB.h @@ -140,7 +140,6 @@ /*----------------------------------------------------------------------- * Cache Configuration */ -#define CONFIG_SYS_CACHELINE_SIZE 16 #define ICACHE_STATUS (CONFIG_SYS_INIT_RAM_ADDR + \ CONFIG_SYS_INIT_RAM_SIZE - 8) diff --git a/include/configs/M53017EVB.h b/include/configs/M53017EVB.h index adb6cc4ddab..7ee38f810bb 100644 --- a/include/configs/M53017EVB.h +++ b/include/configs/M53017EVB.h @@ -151,7 +151,6 @@ /*----------------------------------------------------------------------- * Cache Configuration */ -#define CONFIG_SYS_CACHELINE_SIZE 16 #define ICACHE_STATUS (CONFIG_SYS_INIT_RAM_ADDR + \ CONFIG_SYS_INIT_RAM_SIZE - 8) diff --git a/include/configs/M5329EVB.h b/include/configs/M5329EVB.h index fc6cd2c0ecd..cce6b560f1a 100644 --- a/include/configs/M5329EVB.h +++ b/include/configs/M5329EVB.h @@ -158,7 +158,6 @@ /*----------------------------------------------------------------------- * Cache Configuration */ -#define CONFIG_SYS_CACHELINE_SIZE 16 #define ICACHE_STATUS (CONFIG_SYS_INIT_RAM_ADDR + \ CONFIG_SYS_INIT_RAM_SIZE - 8) diff --git a/include/configs/M5373EVB.h b/include/configs/M5373EVB.h index 0b3ee11e0c2..d0bb8a121f2 100644 --- a/include/configs/M5373EVB.h +++ b/include/configs/M5373EVB.h @@ -160,7 +160,6 @@ /*----------------------------------------------------------------------- * Cache Configuration */ -#define CONFIG_SYS_CACHELINE_SIZE 16 #define ICACHE_STATUS (CONFIG_SYS_INIT_RAM_ADDR + \ CONFIG_SYS_INIT_RAM_SIZE - 8) diff --git a/include/configs/amcore.h b/include/configs/amcore.h index 63b941a56bd..8376eb14d2d 100644 --- a/include/configs/amcore.h +++ b/include/configs/amcore.h @@ -71,7 +71,6 @@ * This is a single unified instruction/data cache. * sdram - single region - no masks */ -#define CONFIG_SYS_CACHELINE_SIZE 16 #define ICACHE_STATUS (CONFIG_SYS_INIT_RAM_ADDR + \ CONFIG_SYS_INIT_RAM_SIZE - 8) diff --git a/include/configs/astro_mcf5373l.h b/include/configs/astro_mcf5373l.h index 5e117fb2187..63e7e120f88 100644 --- a/include/configs/astro_mcf5373l.h +++ b/include/configs/astro_mcf5373l.h @@ -264,7 +264,6 @@ #endif /* Cache Configuration */ -#define CONFIG_SYS_CACHELINE_SIZE 16 #define ICACHE_STATUS (CONFIG_SYS_INIT_RAM_ADDR + \ CONFIG_SYS_INIT_RAM_SIZE - 8) diff --git a/include/configs/cobra5272.h b/include/configs/cobra5272.h index 054b659abfb..c68cf111406 100644 --- a/include/configs/cobra5272.h +++ b/include/configs/cobra5272.h @@ -234,7 +234,6 @@ enter a valid image address in flash */ /*----------------------------------------------------------------------- * Cache Configuration */ -#define CONFIG_SYS_CACHELINE_SIZE 16 #define ICACHE_STATUS (CONFIG_SYS_INIT_RAM_ADDR + \ CONFIG_SYS_INIT_RAM_SIZE - 8) diff --git a/include/configs/eb_cpu5282.h b/include/configs/eb_cpu5282.h index e4da6948340..97eedcf8016 100644 --- a/include/configs/eb_cpu5282.h +++ b/include/configs/eb_cpu5282.h @@ -133,7 +133,6 @@ /*----------------------------------------------------------------------- * Cache Configuration */ -#define CONFIG_SYS_CACHELINE_SIZE 16 #define ICACHE_STATUS (CONFIG_SYS_INIT_RAM_ADDR + \ CONFIG_SYS_INIT_RAM_SIZE - 8) diff --git a/include/configs/mx7ulp_evk.h b/include/configs/mx7ulp_evk.h index e7d776a72ca..fc2f8d83b8d 100644 --- a/include/configs/mx7ulp_evk.h +++ b/include/configs/mx7ulp_evk.h @@ -33,8 +33,6 @@ /* UART */ #define LPUART_BASE LPUART4_RBASE -#define CONFIG_SYS_CACHELINE_SIZE 64 - /* Miscellaneous configurable options */ #define CONFIG_SYS_PROMPT "=> " #define CONFIG_SYS_CBSIZE 512 diff --git a/include/configs/rk3188_common.h b/include/configs/rk3188_common.h index b567943056d..59a16a77aa9 100644 --- a/include/configs/rk3188_common.h +++ b/include/configs/rk3188_common.h @@ -6,8 +6,6 @@ #ifndef __CONFIG_RK3188_COMMON_H #define __CONFIG_RK3188_COMMON_H -#define CONFIG_SYS_CACHELINE_SIZE 64 - #include #include "rockchip-common.h" diff --git a/include/configs/rk3368_common.h b/include/configs/rk3368_common.h index 43471b94e49..19a556921fe 100644 --- a/include/configs/rk3368_common.h +++ b/include/configs/rk3368_common.h @@ -8,8 +8,6 @@ #include "rockchip-common.h" -#define CONFIG_SYS_CACHELINE_SIZE 64 - #include #include diff --git a/include/configs/sifive-unmatched.h b/include/configs/sifive-unmatched.h index 4b655ec8ee0..a51becb645d 100644 --- a/include/configs/sifive-unmatched.h +++ b/include/configs/sifive-unmatched.h @@ -36,8 +36,6 @@ #define CONFIG_SYS_PCI_64BIT 1 /* enable 64-bit resources */ -#define CONFIG_SYS_CACHELINE_SIZE 64 - /* Environment options */ #ifndef CONFIG_SPL_BUILD diff --git a/include/configs/sipeed-maix.h b/include/configs/sipeed-maix.h index 5b128785525..34e726eb894 100644 --- a/include/configs/sipeed-maix.h +++ b/include/configs/sipeed-maix.h @@ -11,7 +11,6 @@ /* Start just below the second bank so we don't clobber it during reloc */ #define CONFIG_SYS_INIT_SP_ADDR 0x803FFFFF #define CONFIG_SYS_MALLOC_LEN SZ_128K -#define CONFIG_SYS_CACHELINE_SIZE 64 #define CONFIG_SYS_SDRAM_BASE 0x80000000 #define CONFIG_SYS_SDRAM_SIZE SZ_8M diff --git a/include/configs/stmark2.h b/include/configs/stmark2.h index f6fa96a5901..c73c48cef8f 100644 --- a/include/configs/stmark2.h +++ b/include/configs/stmark2.h @@ -131,7 +131,6 @@ #endif /* Cache Configuration */ -#define CONFIG_SYS_CACHELINE_SIZE 16 #define ICACHE_STATUS (CONFIG_SYS_INIT_RAM_ADDR + \ CONFIG_SYS_INIT_RAM_SIZE - 8) #define DCACHE_STATUS (CONFIG_SYS_INIT_RAM_ADDR + \ -- cgit v1.2.3 From a2ac2b964bfbb20d6791ee94b9034a50cfadb5b0 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Fri, 27 Aug 2021 21:18:30 -0400 Subject: Convert CONFIG_SKIP_LOWLEVEL_INIT et al to Kconfig This converts the following to Kconfig: CONFIG_SKIP_LOWLEVEL_INIT CONFIG_SKIP_LOWLEVEL_INIT_ONLY In order to do this, we need to introduce SPL and TPL variants of these options so that we can clearly disable these options only in SPL in some cases, and both instances in other cases. Signed-off-by: Tom Rini --- include/configs/SBx81LIFKW.h | 1 - include/configs/SBx81LIFXCAT.h | 1 - include/configs/adp-ae3xx.h | 2 -- include/configs/adp-ag101p.h | 2 -- include/configs/am43xx_evm.h | 8 -------- include/configs/am64x_evm.h | 4 ---- include/configs/am65x_evm.h | 4 ---- include/configs/aspenite.h | 1 - include/configs/at91-sama5_common.h | 4 ---- include/configs/at91sam9260ek.h | 1 - include/configs/at91sam9261ek.h | 2 -- include/configs/at91sam9263ek.h | 1 - include/configs/at91sam9m10g45ek.h | 1 - include/configs/at91sam9n12ek.h | 1 - include/configs/at91sam9rlek.h | 2 -- include/configs/at91sam9x5ek.h | 1 - include/configs/bcmstb.h | 1 - include/configs/bk4r1.h | 2 -- include/configs/bmips_bcm3380.h | 1 - include/configs/bmips_bcm6318.h | 1 - include/configs/bmips_bcm63268.h | 1 - include/configs/bmips_bcm6328.h | 1 - include/configs/bmips_bcm6338.h | 1 - include/configs/bmips_bcm6348.h | 1 - include/configs/bmips_bcm6358.h | 1 - include/configs/bmips_bcm6362.h | 1 - include/configs/bmips_bcm6368.h | 1 - include/configs/bmips_bcm6838.h | 1 - include/configs/broadcom_bcm963158.h | 2 -- include/configs/broadcom_bcm968360bg.h | 2 -- include/configs/broadcom_bcm968580xref.h | 2 -- include/configs/bur_am335x_common.h | 3 --- include/configs/ci20.h | 2 -- include/configs/cm_t43.h | 3 --- include/configs/colibri_vf.h | 2 -- include/configs/controlcenterdc.h | 2 -- include/configs/corvus.h | 1 - include/configs/da850evm.h | 1 - include/configs/devkit3250.h | 4 ---- include/configs/dns325.h | 1 - include/configs/dockstar.h | 1 - include/configs/ea-lpc3250devkitv2.h | 1 - include/configs/ethernut5.h | 1 - include/configs/exynos-common.h | 2 -- include/configs/gardena-smart-gateway-at91sam.h | 5 ----- include/configs/gardena-smart-gateway-mt7688.h | 3 --- include/configs/goflexhome.h | 1 - include/configs/highbank.h | 1 - include/configs/ib62x0.h | 1 - include/configs/iconnect.h | 1 - include/configs/imgtec_xilfpga.h | 1 - include/configs/integrator-common.h | 1 - include/configs/km/km_arm.h | 2 -- include/configs/km/pg-wcom-ls102xa.h | 2 -- include/configs/lacie_kw.h | 1 - include/configs/legoev3.h | 1 - include/configs/linkit-smart-7688.h | 3 --- include/configs/ls1012a_common.h | 2 -- include/configs/ls1021aqds.h | 2 -- include/configs/ls1021atwr.h | 1 - include/configs/ls1028a_common.h | 2 -- include/configs/ls1043a_common.h | 2 -- include/configs/ls1043aqds.h | 2 -- include/configs/ls1046a_common.h | 2 -- include/configs/ls1046aqds.h | 2 -- include/configs/ls1088a_common.h | 2 -- include/configs/ls2080a_common.h | 2 -- include/configs/lsxl.h | 2 -- include/configs/lx2160a_common.h | 2 -- include/configs/meesc.h | 1 - include/configs/mt7620.h | 3 --- include/configs/mt7628.h | 3 --- include/configs/mv-plug-common.h | 1 - include/configs/mx7_common.h | 5 ----- include/configs/nas220.h | 1 - include/configs/nokia_rx51.h | 2 -- include/configs/nsa310s.h | 1 - include/configs/omapl138_lcdk.h | 1 - include/configs/openrd.h | 1 - include/configs/pcm052.h | 2 -- include/configs/pm9261.h | 2 -- include/configs/pm9263.h | 1 - include/configs/pm9g45.h | 1 - include/configs/pogo_e02.h | 1 - include/configs/px30_common.h | 1 - include/configs/rk3036_common.h | 1 - include/configs/rk3128_common.h | 1 - include/configs/rk3188_common.h | 1 - include/configs/rk322x_common.h | 1 - include/configs/rk3288_common.h | 1 - include/configs/rk3308_common.h | 1 - include/configs/rk3328_common.h | 1 - include/configs/rk3368_common.h | 1 - include/configs/rk3399_common.h | 1 - include/configs/rk3568_common.h | 1 - include/configs/rpi.h | 4 ---- include/configs/rv1108_common.h | 1 - include/configs/sam9x60ek.h | 1 - include/configs/siemens-am33x-common.h | 3 --- include/configs/smartweb.h | 1 - include/configs/smdkv310.h | 1 - include/configs/snapper9260.h | 1 - include/configs/snapper9g45.h | 1 - include/configs/stemmy.h | 1 - include/configs/stih410-b2260.h | 2 -- include/configs/taurus.h | 2 -- include/configs/tegra-common-post.h | 2 -- include/configs/ti814x_evm.h | 3 --- include/configs/ti816x_evm.h | 3 --- include/configs/ti_am335x_common.h | 3 --- include/configs/ti_armv7_keystone2.h | 1 - include/configs/usb_a9263.h | 2 -- include/configs/vf610twr.h | 2 -- include/configs/vocore2.h | 3 --- include/configs/work_92105.h | 4 ---- include/configs/xilinx_zynqmp_r5.h | 2 -- include/configs/zynq_cse.h | 2 -- 117 files changed, 207 deletions(-) (limited to 'include') diff --git a/include/configs/SBx81LIFKW.h b/include/configs/SBx81LIFKW.h index 4b5a8b56e7e..a32151876ce 100644 --- a/include/configs/SBx81LIFKW.h +++ b/include/configs/SBx81LIFKW.h @@ -11,7 +11,6 @@ */ #define CONFIG_FEROCEON_88FR131 1 /* CPU Core subversion */ #define CONFIG_KW88F6281 1 /* SOC Name */ -#define CONFIG_SKIP_LOWLEVEL_INIT /* disable board lowlevel_init */ #define CONFIG_SYS_KWD_CONFIG $(CONFIG_BOARDDIR)/kwbimage.cfg /* additions for new ARM relocation support */ diff --git a/include/configs/SBx81LIFXCAT.h b/include/configs/SBx81LIFXCAT.h index cf206803963..4a53dedbb73 100644 --- a/include/configs/SBx81LIFXCAT.h +++ b/include/configs/SBx81LIFXCAT.h @@ -11,7 +11,6 @@ */ #define CONFIG_FEROCEON_88FR131 1 /* CPU Core subversion */ #define CONFIG_KW88F6281 1 /* SOC Name */ -#define CONFIG_SKIP_LOWLEVEL_INIT /* disable board lowlevel_init */ #define CONFIG_SYS_KWD_CONFIG $(CONFIG_BOARDDIR)/kwbimage.cfg /* additions for new ARM relocation support */ diff --git a/include/configs/adp-ae3xx.h b/include/configs/adp-ae3xx.h index 8cb0de3caa0..3af8ca8d03c 100644 --- a/include/configs/adp-ae3xx.h +++ b/include/configs/adp-ae3xx.h @@ -15,8 +15,6 @@ */ #define CONFIG_USE_INTERRUPT -#define CONFIG_SKIP_LOWLEVEL_INIT - #define CONFIG_SKIP_TRUNOFF_WATCHDOG #define CONFIG_ARCH_MAP_SYSMEM diff --git a/include/configs/adp-ag101p.h b/include/configs/adp-ag101p.h index 8d07895fe87..04bda0a53cf 100644 --- a/include/configs/adp-ag101p.h +++ b/include/configs/adp-ag101p.h @@ -15,8 +15,6 @@ */ #define CONFIG_USE_INTERRUPT -#define CONFIG_SKIP_LOWLEVEL_INIT - #define CONFIG_ARCH_MAP_SYSMEM #define CONFIG_BOOTP_SERVERIP diff --git a/include/configs/am43xx_evm.h b/include/configs/am43xx_evm.h index b8b8cff2070..83fc00de31f 100644 --- a/include/configs/am43xx_evm.h +++ b/include/configs/am43xx_evm.h @@ -38,14 +38,6 @@ #define CONFIG_SYS_L2_PL310 #define CONFIG_SYS_PL310_BASE 0x48242000 -/* - * Since SPL did pll and ddr initialization for us, - * we don't need to do it twice. - */ -#if !defined(CONFIG_SPL_BUILD) && !defined(CONFIG_QSPI_BOOT) -#define CONFIG_SKIP_LOWLEVEL_INIT -#endif - /* * When building U-Boot such that there is no previous loader * we need to call board_early_init_f. This is taken care of in diff --git a/include/configs/am64x_evm.h b/include/configs/am64x_evm.h index 7c520f4395b..16d095584e0 100644 --- a/include/configs/am64x_evm.h +++ b/include/configs/am64x_evm.h @@ -22,10 +22,6 @@ #define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "tispl.bin" #endif -#ifndef CONFIG_CPU_V7R -#define CONFIG_SKIP_LOWLEVEL_INIT -#endif - #define CONFIG_SPL_MAX_SIZE CONFIG_SYS_K3_MAX_DOWNLODABLE_IMAGE_SIZE #if defined(CONFIG_TARGET_AM642_A53_EVM) #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SPL_TEXT_BASE + \ diff --git a/include/configs/am65x_evm.h b/include/configs/am65x_evm.h index d4514a0dbad..55fa6419e33 100644 --- a/include/configs/am65x_evm.h +++ b/include/configs/am65x_evm.h @@ -49,10 +49,6 @@ #define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "tispl.bin" #endif -#ifndef CONFIG_CPU_V7R -#define CONFIG_SKIP_LOWLEVEL_INIT -#endif - #define CONFIG_SPL_MAX_SIZE CONFIG_SYS_K3_MAX_DOWNLODABLE_IMAGE_SIZE #define CONFIG_SYS_BOOTM_LEN SZ_64M diff --git a/include/configs/aspenite.h b/include/configs/aspenite.h index 45d6b629dbd..4a25d561653 100644 --- a/include/configs/aspenite.h +++ b/include/configs/aspenite.h @@ -14,7 +14,6 @@ */ #define CONFIG_SHEEVA_88SV331xV5 1 /* CPU Core subversion */ #define CONFIG_ARMADA100 1 /* SOC Family Name */ -#define CONFIG_SKIP_LOWLEVEL_INIT /* disable board lowlevel_init */ /* * There is no internal RAM in ARMADA100, using DRAM diff --git a/include/configs/at91-sama5_common.h b/include/configs/at91-sama5_common.h index ba21149e43c..8b8e83f4f42 100644 --- a/include/configs/at91-sama5_common.h +++ b/include/configs/at91-sama5_common.h @@ -15,10 +15,6 @@ #define CONFIG_SYS_AT91_SLOW_CLOCK 32768 #define CONFIG_SYS_AT91_MAIN_CLOCK 12000000 /* from 12 MHz crystal */ -#ifndef CONFIG_SPL_BUILD -#define CONFIG_SKIP_LOWLEVEL_INIT -#endif - /* * BOOTP options */ diff --git a/include/configs/at91sam9260ek.h b/include/configs/at91sam9260ek.h index a3ab1ba8d39..a096d92a0e8 100644 --- a/include/configs/at91sam9260ek.h +++ b/include/configs/at91sam9260ek.h @@ -38,7 +38,6 @@ #define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */ #define CONFIG_SETUP_MEMORY_TAGS #define CONFIG_INITRD_TAG -#define CONFIG_SKIP_LOWLEVEL_INIT /* general purpose I/O */ #define CONFIG_ATMEL_LEGACY /* required until (g)pio is fixed */ diff --git a/include/configs/at91sam9261ek.h b/include/configs/at91sam9261ek.h index f87720d6b98..73a439d80a2 100644 --- a/include/configs/at91sam9261ek.h +++ b/include/configs/at91sam9261ek.h @@ -26,8 +26,6 @@ #define CONFIG_SETUP_MEMORY_TAGS #define CONFIG_INITRD_TAG -#define CONFIG_SKIP_LOWLEVEL_INIT - #define CONFIG_ATMEL_LEGACY /* diff --git a/include/configs/at91sam9263ek.h b/include/configs/at91sam9263ek.h index efc3c8c1520..692c52c91c5 100644 --- a/include/configs/at91sam9263ek.h +++ b/include/configs/at91sam9263ek.h @@ -27,7 +27,6 @@ #define CONFIG_INITRD_TAG 1 #ifndef CONFIG_SYS_USE_BOOT_NORFLASH -#define CONFIG_SKIP_LOWLEVEL_INIT #else #define CONFIG_SYS_USE_NORFLASH #endif diff --git a/include/configs/at91sam9m10g45ek.h b/include/configs/at91sam9m10g45ek.h index 8655dbed1db..309b14caf47 100644 --- a/include/configs/at91sam9m10g45ek.h +++ b/include/configs/at91sam9m10g45ek.h @@ -21,7 +21,6 @@ #define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */ #define CONFIG_SETUP_MEMORY_TAGS #define CONFIG_INITRD_TAG -#define CONFIG_SKIP_LOWLEVEL_INIT /* general purpose I/O */ #define CONFIG_ATMEL_LEGACY /* required until (g)pio is fixed */ diff --git a/include/configs/at91sam9n12ek.h b/include/configs/at91sam9n12ek.h index a9ff4014ba7..8733a5874af 100644 --- a/include/configs/at91sam9n12ek.h +++ b/include/configs/at91sam9n12ek.h @@ -17,7 +17,6 @@ #define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */ #define CONFIG_SETUP_MEMORY_TAGS #define CONFIG_INITRD_TAG -#define CONFIG_SKIP_LOWLEVEL_INIT /* LCD */ #define LCD_BPP LCD_COLOR16 diff --git a/include/configs/at91sam9rlek.h b/include/configs/at91sam9rlek.h index d7d6b55ed9d..87f3a6b4088 100644 --- a/include/configs/at91sam9rlek.h +++ b/include/configs/at91sam9rlek.h @@ -16,8 +16,6 @@ #define CONFIG_SYS_AT91_SLOW_CLOCK 32768 /* slow clock xtal */ #define CONFIG_SYS_AT91_MAIN_CLOCK 12000000 /* main clock xtal */ -#define CONFIG_SKIP_LOWLEVEL_INIT - #define CONFIG_CMDLINE_TAG 1 /* enable passing of ATAGs */ #define CONFIG_SETUP_MEMORY_TAGS 1 #define CONFIG_INITRD_TAG 1 diff --git a/include/configs/at91sam9x5ek.h b/include/configs/at91sam9x5ek.h index 8217423fa68..162d494134e 100644 --- a/include/configs/at91sam9x5ek.h +++ b/include/configs/at91sam9x5ek.h @@ -15,7 +15,6 @@ #define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */ #define CONFIG_SETUP_MEMORY_TAGS #define CONFIG_INITRD_TAG -#define CONFIG_SKIP_LOWLEVEL_INIT /* general purpose I/O */ #define CONFIG_ATMEL_LEGACY /* required until (g)pio is fixed */ diff --git a/include/configs/bcmstb.h b/include/configs/bcmstb.h index 627aca81fd4..e4c6b7fcfc9 100644 --- a/include/configs/bcmstb.h +++ b/include/configs/bcmstb.h @@ -36,7 +36,6 @@ extern phys_addr_t prior_stage_fdt_address; /* * CPU configuration. */ -#define CONFIG_SKIP_LOWLEVEL_INIT /* * Memory configuration. diff --git a/include/configs/bk4r1.h b/include/configs/bk4r1.h index f9ea1331e41..b1afe0168b1 100644 --- a/include/configs/bk4r1.h +++ b/include/configs/bk4r1.h @@ -60,8 +60,6 @@ #include #include -#define CONFIG_SKIP_LOWLEVEL_INIT - /* Enable passing of ATAGs */ #define CONFIG_CMDLINE_TAG diff --git a/include/configs/bmips_bcm3380.h b/include/configs/bmips_bcm3380.h index 472b02f1042..66c23cd1d7a 100644 --- a/include/configs/bmips_bcm3380.h +++ b/include/configs/bmips_bcm3380.h @@ -17,7 +17,6 @@ /* U-Boot */ #if defined(CONFIG_BMIPS_BOOT_RAM) -#define CONFIG_SKIP_LOWLEVEL_INIT #define CONFIG_SYS_INIT_SP_OFFSET SZ_8K #endif diff --git a/include/configs/bmips_bcm6318.h b/include/configs/bmips_bcm6318.h index 904f1b46cc9..412471a4aaa 100644 --- a/include/configs/bmips_bcm6318.h +++ b/include/configs/bmips_bcm6318.h @@ -26,7 +26,6 @@ /* U-Boot */ #if defined(CONFIG_BMIPS_BOOT_RAM) -#define CONFIG_SKIP_LOWLEVEL_INIT #define CONFIG_SYS_INIT_SP_OFFSET SZ_8K #endif diff --git a/include/configs/bmips_bcm63268.h b/include/configs/bmips_bcm63268.h index 7b4329132e9..8caddf38462 100644 --- a/include/configs/bmips_bcm63268.h +++ b/include/configs/bmips_bcm63268.h @@ -26,7 +26,6 @@ /* U-Boot */ #if defined(CONFIG_BMIPS_BOOT_RAM) -#define CONFIG_SKIP_LOWLEVEL_INIT #define CONFIG_SYS_INIT_SP_OFFSET SZ_8K #endif diff --git a/include/configs/bmips_bcm6328.h b/include/configs/bmips_bcm6328.h index bed22b46e54..892a3e2c41e 100644 --- a/include/configs/bmips_bcm6328.h +++ b/include/configs/bmips_bcm6328.h @@ -26,7 +26,6 @@ /* U-Boot */ #if defined(CONFIG_BMIPS_BOOT_RAM) -#define CONFIG_SKIP_LOWLEVEL_INIT #define CONFIG_SYS_INIT_SP_OFFSET SZ_8K #endif diff --git a/include/configs/bmips_bcm6338.h b/include/configs/bmips_bcm6338.h index 3a5e56de955..6eaca1c31b5 100644 --- a/include/configs/bmips_bcm6338.h +++ b/include/configs/bmips_bcm6338.h @@ -17,7 +17,6 @@ /* U-Boot */ #if defined(CONFIG_BMIPS_BOOT_RAM) -#define CONFIG_SKIP_LOWLEVEL_INIT #define CONFIG_SYS_INIT_SP_OFFSET SZ_8K #endif diff --git a/include/configs/bmips_bcm6348.h b/include/configs/bmips_bcm6348.h index 57017a50032..5bfbcb779b4 100644 --- a/include/configs/bmips_bcm6348.h +++ b/include/configs/bmips_bcm6348.h @@ -24,7 +24,6 @@ /* U-Boot */ #if defined(CONFIG_BMIPS_BOOT_RAM) -#define CONFIG_SKIP_LOWLEVEL_INIT #define CONFIG_SYS_INIT_SP_OFFSET SZ_8K #endif diff --git a/include/configs/bmips_bcm6358.h b/include/configs/bmips_bcm6358.h index 57f6185fe96..f8c81f698dc 100644 --- a/include/configs/bmips_bcm6358.h +++ b/include/configs/bmips_bcm6358.h @@ -26,7 +26,6 @@ /* U-Boot */ #if defined(CONFIG_BMIPS_BOOT_RAM) -#define CONFIG_SKIP_LOWLEVEL_INIT #define CONFIG_SYS_INIT_SP_OFFSET SZ_8K #endif diff --git a/include/configs/bmips_bcm6362.h b/include/configs/bmips_bcm6362.h index 2f819f0c878..92ab0ba7a2f 100644 --- a/include/configs/bmips_bcm6362.h +++ b/include/configs/bmips_bcm6362.h @@ -26,7 +26,6 @@ /* U-Boot */ #if defined(CONFIG_BMIPS_BOOT_RAM) -#define CONFIG_SKIP_LOWLEVEL_INIT #define CONFIG_SYS_INIT_SP_OFFSET SZ_8K #endif diff --git a/include/configs/bmips_bcm6368.h b/include/configs/bmips_bcm6368.h index 58425a485ed..7d321e14ff5 100644 --- a/include/configs/bmips_bcm6368.h +++ b/include/configs/bmips_bcm6368.h @@ -26,7 +26,6 @@ /* U-Boot */ #if defined(CONFIG_BMIPS_BOOT_RAM) -#define CONFIG_SKIP_LOWLEVEL_INIT #define CONFIG_SYS_INIT_SP_OFFSET SZ_8K #endif diff --git a/include/configs/bmips_bcm6838.h b/include/configs/bmips_bcm6838.h index b4618689bc8..481dfc20b3c 100644 --- a/include/configs/bmips_bcm6838.h +++ b/include/configs/bmips_bcm6838.h @@ -17,7 +17,6 @@ /* U-Boot */ #if defined(CONFIG_BMIPS_BOOT_RAM) -#define CONFIG_SKIP_LOWLEVEL_INIT #define CONFIG_SYS_INIT_SP_OFFSET SZ_8K #endif diff --git a/include/configs/broadcom_bcm963158.h b/include/configs/broadcom_bcm963158.h index 7e376f0dc7d..ec9ac151694 100644 --- a/include/configs/broadcom_bcm963158.h +++ b/include/configs/broadcom_bcm963158.h @@ -27,8 +27,6 @@ /* U-Boot */ #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_TEXT_BASE + SZ_16M) -#define CONFIG_SKIP_LOWLEVEL_INIT - #ifdef CONFIG_MTD_RAW_NAND #define CONFIG_SYS_MAX_NAND_DEVICE 1 #define CONFIG_SYS_NAND_SELF_INIT diff --git a/include/configs/broadcom_bcm968360bg.h b/include/configs/broadcom_bcm968360bg.h index 12efc3362f1..2031f7dca78 100644 --- a/include/configs/broadcom_bcm968360bg.h +++ b/include/configs/broadcom_bcm968360bg.h @@ -26,8 +26,6 @@ /* U-Boot */ #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_TEXT_BASE + SZ_16M) -#define CONFIG_SKIP_LOWLEVEL_INIT - #ifdef CONFIG_MTD_RAW_NAND #define CONFIG_SYS_MAX_NAND_DEVICE 1 #define CONFIG_SYS_NAND_SELF_INIT diff --git a/include/configs/broadcom_bcm968580xref.h b/include/configs/broadcom_bcm968580xref.h index 10b64df8ae7..88fdb9d22cc 100644 --- a/include/configs/broadcom_bcm968580xref.h +++ b/include/configs/broadcom_bcm968580xref.h @@ -26,8 +26,6 @@ /* U-Boot */ #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_TEXT_BASE + SZ_16M) -#define CONFIG_SKIP_LOWLEVEL_INIT - #ifdef CONFIG_MTD_RAW_NAND #define CONFIG_SYS_MAX_NAND_DEVICE 1 #define CONFIG_SYS_NAND_SELF_INIT diff --git a/include/configs/bur_am335x_common.h b/include/configs/bur_am335x_common.h index 43c12ac462e..9b2e8b5c6eb 100644 --- a/include/configs/bur_am335x_common.h +++ b/include/configs/bur_am335x_common.h @@ -45,9 +45,6 @@ * Since SPL did pll and ddr initialization for us, * we don't need to do it twice. */ -#if !defined(CONFIG_SPL_BUILD) && !defined(CONFIG_NOR_BOOT) -#define CONFIG_SKIP_LOWLEVEL_INIT -#endif /* !CONFIG_SPL_BUILD, ... */ /* * ---------------------------------------------------------------------------- * DDR information. We say (for simplicity) that we have 1 bank, diff --git a/include/configs/ci20.h b/include/configs/ci20.h index 09d227ae489..40230fdb6f6 100644 --- a/include/configs/ci20.h +++ b/include/configs/ci20.h @@ -9,8 +9,6 @@ #ifndef __CONFIG_CI20_H__ #define __CONFIG_CI20_H__ -#define CONFIG_SKIP_LOWLEVEL_INIT - /* Ingenic JZ4780 clock configuration. */ #define CONFIG_SYS_HZ 1000 #define CONFIG_SYS_MHZ 1200 diff --git a/include/configs/cm_t43.h b/include/configs/cm_t43.h index f4d8d8288d3..80db84162ff 100644 --- a/include/configs/cm_t43.h +++ b/include/configs/cm_t43.h @@ -62,9 +62,6 @@ * Since SPL did pll and ddr initialization for us, * we don't need to do it twice. */ -#if !defined(CONFIG_SPL_BUILD) -#define CONFIG_SKIP_LOWLEVEL_INIT -#endif #define CONFIG_HSMMC2_8BIT diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h index e3dcbf8f372..93e95f4ff78 100644 --- a/include/configs/colibri_vf.h +++ b/include/configs/colibri_vf.h @@ -16,8 +16,6 @@ #define CONFIG_SYS_FSL_CLK -#define CONFIG_SKIP_LOWLEVEL_INIT - #ifdef CONFIG_VIDEO_FSL_DCU_FB #define CONFIG_VIDEO_LOGO #define CONFIG_VIDEO_BMP_LOGO diff --git a/include/configs/controlcenterdc.h b/include/configs/controlcenterdc.h index 58d83e5f144..96bf3f8b127 100644 --- a/include/configs/controlcenterdc.h +++ b/include/configs/controlcenterdc.h @@ -12,8 +12,6 @@ */ #define CONFIG_CUSTOMER_BOARD_SUPPORT -#define CONFIG_SKIP_LOWLEVEL_INIT /* disable board lowlevel_init */ - /* * TEXT_BASE needs to be below 16MiB, since this area is scrubbed * for DDR ECC byte filling in the SPL before loading the main diff --git a/include/configs/corvus.h b/include/configs/corvus.h index 164ca4b1426..988e4f0f0bf 100644 --- a/include/configs/corvus.h +++ b/include/configs/corvus.h @@ -32,7 +32,6 @@ #define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */ #define CONFIG_SETUP_MEMORY_TAGS #define CONFIG_INITRD_TAG -#define CONFIG_SKIP_LOWLEVEL_INIT_ONLY /* general purpose I/O */ #define CONFIG_ATMEL_LEGACY /* required until (g)pio is fixed */ diff --git a/include/configs/da850evm.h b/include/configs/da850evm.h index e9761f2adcd..a1a86760102 100644 --- a/include/configs/da850evm.h +++ b/include/configs/da850evm.h @@ -22,7 +22,6 @@ #define CONFIG_SYS_OSCIN_FREQ 24000000 #define CONFIG_SYS_TIMERBASE DAVINCI_TIMER0_BASE #define CONFIG_SYS_HZ_CLOCK clk_get(DAVINCI_AUXCLK_CLKID) -#define CONFIG_SKIP_LOWLEVEL_INIT_ONLY #ifdef CONFIG_MTD_NOR_FLASH #define CONFIG_SYS_DV_NOR_BOOT_CFG (0x11) diff --git a/include/configs/devkit3250.h b/include/configs/devkit3250.h index 5377683feb8..e5edb9bc0a0 100644 --- a/include/configs/devkit3250.h +++ b/include/configs/devkit3250.h @@ -14,10 +14,6 @@ #define CONFIG_MACH_TYPE MACH_TYPE_DEVKIT3250 -#if !defined(CONFIG_SPL_BUILD) -#define CONFIG_SKIP_LOWLEVEL_INIT -#endif - /* * Memory configurations */ diff --git a/include/configs/dns325.h b/include/configs/dns325.h index 8990efb3f68..3a943e448bb 100644 --- a/include/configs/dns325.h +++ b/include/configs/dns325.h @@ -22,7 +22,6 @@ */ #define CONFIG_FEROCEON_88FR131 /* CPU Core subversion */ #define CONFIG_KW88F6281 /* SOC Name */ -#define CONFIG_SKIP_LOWLEVEL_INIT /* disable board lowlevel_init */ #include "mv-common.h" diff --git a/include/configs/dockstar.h b/include/configs/dockstar.h index 04dd0f68c37..75a2476f5ef 100644 --- a/include/configs/dockstar.h +++ b/include/configs/dockstar.h @@ -16,7 +16,6 @@ */ #define CONFIG_FEROCEON_88FR131 1 /* CPU Core subversion */ #define CONFIG_KW88F6281 1 /* SOC Name */ -#define CONFIG_SKIP_LOWLEVEL_INIT /* disable board lowlevel_init */ /* * mv-common.h should be defined after CMD configs since it used them diff --git a/include/configs/ea-lpc3250devkitv2.h b/include/configs/ea-lpc3250devkitv2.h index 33ffb7496c0..2ca0e9d990f 100644 --- a/include/configs/ea-lpc3250devkitv2.h +++ b/include/configs/ea-lpc3250devkitv2.h @@ -14,7 +14,6 @@ * SoC and board defines */ #define CONFIG_MACH_TYPE MACH_TYPE_LPC3XXX -#define CONFIG_SKIP_LOWLEVEL_INIT #define CONFIG_BOARD_SIZE_LIMIT 0x000fffff /* maximum allowable size for full U-Boot binary */ /* diff --git a/include/configs/ethernut5.h b/include/configs/ethernut5.h index 9c430be4153..d3be77dc0cf 100644 --- a/include/configs/ethernut5.h +++ b/include/configs/ethernut5.h @@ -14,7 +14,6 @@ /* The first stage boot loader expects u-boot running at this address. */ /* The first stage boot loader takes care of low level initialization. */ -#define CONFIG_SKIP_LOWLEVEL_INIT /* Set our official architecture number. */ #define CONFIG_MACH_TYPE MACH_TYPE_ETHERNUT5 diff --git a/include/configs/exynos-common.h b/include/configs/exynos-common.h index 8adaf297fe3..5dfa4e62291 100644 --- a/include/configs/exynos-common.h +++ b/include/configs/exynos-common.h @@ -16,8 +16,6 @@ #include #include -#define CONFIG_SKIP_LOWLEVEL_INIT - /* Keep L2 Cache Disabled */ /* input clock of PLL: 24MHz input clock */ diff --git a/include/configs/gardena-smart-gateway-at91sam.h b/include/configs/gardena-smart-gateway-at91sam.h index 4968ae9de0d..49dfeadd481 100644 --- a/include/configs/gardena-smart-gateway-at91sam.h +++ b/include/configs/gardena-smart-gateway-at91sam.h @@ -17,11 +17,6 @@ #define CONFIG_SYS_AT91_SLOW_CLOCK 32768 #define CONFIG_SYS_AT91_MAIN_CLOCK 12000000 /* 12 MHz crystal */ -#ifndef CONFIG_SPL_BUILD -#define CONFIG_SKIP_LOWLEVEL_INIT -#endif -#define CONFIG_SKIP_LOWLEVEL_INIT_ONLY - /* general purpose I/O */ #define CONFIG_ATMEL_LEGACY /* required until (g)pio is fixed */ diff --git a/include/configs/gardena-smart-gateway-mt7688.h b/include/configs/gardena-smart-gateway-mt7688.h index bdbd2f99a05..6f236549cc8 100644 --- a/include/configs/gardena-smart-gateway-mt7688.h +++ b/include/configs/gardena-smart-gateway-mt7688.h @@ -15,9 +15,6 @@ #define CONFIG_SYS_INIT_SP_OFFSET 0x400000 /* SPL */ -#if defined(CONFIG_SPL) && !defined(CONFIG_SPL_BUILD) -#define CONFIG_SKIP_LOWLEVEL_INIT -#endif #define CONFIG_SYS_UBOOT_START CONFIG_SYS_TEXT_BASE #define CONFIG_SPL_BSS_START_ADDR 0x80010000 diff --git a/include/configs/goflexhome.h b/include/configs/goflexhome.h index 2e89d72285d..43027a506a5 100644 --- a/include/configs/goflexhome.h +++ b/include/configs/goflexhome.h @@ -19,7 +19,6 @@ */ #define CONFIG_FEROCEON_88FR131 1 /* CPU Core subversion */ #define CONFIG_KW88F6281 1 /* SOC Name */ -#define CONFIG_SKIP_LOWLEVEL_INIT /* disable board lowlevel_init */ /* * Default GPIO configuration and LED status diff --git a/include/configs/highbank.h b/include/configs/highbank.h index 05cf485d6c7..92bd6584a09 100644 --- a/include/configs/highbank.h +++ b/include/configs/highbank.h @@ -45,7 +45,6 @@ #define CONFIG_SYS_SDRAM_BASE 0x00000000 #define CONFIG_SYS_INIT_SP_ADDR 0x01000000 -#define CONFIG_SKIP_LOWLEVEL_INIT #define CONFIG_EXTRA_ENV_SETTINGS \ "fdt_high=0x20000000\0" \ diff --git a/include/configs/ib62x0.h b/include/configs/ib62x0.h index ba859a9a249..4bd3494f108 100644 --- a/include/configs/ib62x0.h +++ b/include/configs/ib62x0.h @@ -13,7 +13,6 @@ */ #define CONFIG_FEROCEON_88FR131 /* CPU Core subversion */ #define CONFIG_KW88F6281 /* SOC Name */ -#define CONFIG_SKIP_LOWLEVEL_INIT /* disable board lowlevel_init */ #include "mv-common.h" diff --git a/include/configs/iconnect.h b/include/configs/iconnect.h index c99490b85dc..29491327f5c 100644 --- a/include/configs/iconnect.h +++ b/include/configs/iconnect.h @@ -13,7 +13,6 @@ */ #define CONFIG_FEROCEON_88FR131 /* CPU Core subversion */ #define CONFIG_KW88F6281 /* SOC Name */ -#define CONFIG_SKIP_LOWLEVEL_INIT /* disable board lowlevel_init */ /* * Machine type diff --git a/include/configs/imgtec_xilfpga.h b/include/configs/imgtec_xilfpga.h index ebfbcab4651..32982e2f98c 100644 --- a/include/configs/imgtec_xilfpga.h +++ b/include/configs/imgtec_xilfpga.h @@ -11,7 +11,6 @@ #define __XILFPGA_CONFIG_H /* BootROM + MIG is pretty smart. DDR and Cache initialized */ -#define CONFIG_SKIP_LOWLEVEL_INIT /*-------------------------------------------- * CPU configuration diff --git a/include/configs/integrator-common.h b/include/configs/integrator-common.h index 80fcdac100e..4b154476efa 100644 --- a/include/configs/integrator-common.h +++ b/include/configs/integrator-common.h @@ -47,7 +47,6 @@ * image to run at reset/power up * e.g. whether the ARM Boot Monitor runs before U-Boot */ -/* #define CONFIG_SKIP_LOWLEVEL_INIT */ /* * The ARM boot monitor does not relocate U-Boot. diff --git a/include/configs/km/km_arm.h b/include/configs/km/km_arm.h index f5e67d830ab..82db0919bf5 100644 --- a/include/configs/km/km_arm.h +++ b/include/configs/km/km_arm.h @@ -57,8 +57,6 @@ "appended one; fi\0" \ "" -#define CONFIG_SKIP_LOWLEVEL_INIT /* disable board lowlevel_init */ - /* * For booting Linux, the board info and command line data * have to be in the first 8 MB of memory, since this is diff --git a/include/configs/km/pg-wcom-ls102xa.h b/include/configs/km/pg-wcom-ls102xa.h index f95ae2c1d77..94381ca8400 100644 --- a/include/configs/km/pg-wcom-ls102xa.h +++ b/include/configs/km/pg-wcom-ls102xa.h @@ -8,8 +8,6 @@ #define CONFIG_SYS_FSL_CLK -#define CONFIG_SKIP_LOWLEVEL_INIT - /* include common defines/options for all Keymile boards */ #include "keymile-common.h" diff --git a/include/configs/lacie_kw.h b/include/configs/lacie_kw.h index d39d6504923..6b6f0d63b49 100644 --- a/include/configs/lacie_kw.h +++ b/include/configs/lacie_kw.h @@ -37,7 +37,6 @@ #else #define CONFIG_KW88F6281 #endif -#define CONFIG_SKIP_LOWLEVEL_INIT /* disable board lowlevel_init */ /* * SDRAM configuration diff --git a/include/configs/legoev3.h b/include/configs/legoev3.h index 39c0c38f2da..c89a7e7e9f0 100644 --- a/include/configs/legoev3.h +++ b/include/configs/legoev3.h @@ -22,7 +22,6 @@ #define CONFIG_SYS_OSCIN_FREQ 24000000 #define CONFIG_SYS_TIMERBASE DAVINCI_TIMER0_BASE #define CONFIG_SYS_HZ_CLOCK clk_get(DAVINCI_AUXCLK_CLKID) -#define CONFIG_SKIP_LOWLEVEL_INIT /* * Memory Info diff --git a/include/configs/linkit-smart-7688.h b/include/configs/linkit-smart-7688.h index 0324d66a672..2f30f675f13 100644 --- a/include/configs/linkit-smart-7688.h +++ b/include/configs/linkit-smart-7688.h @@ -15,9 +15,6 @@ #define CONFIG_SYS_INIT_SP_OFFSET 0x400000 /* SPL */ -#if defined(CONFIG_SPL) && !defined(CONFIG_SPL_BUILD) -#define CONFIG_SKIP_LOWLEVEL_INIT -#endif #define CONFIG_SYS_UBOOT_START CONFIG_SYS_TEXT_BASE #define CONFIG_SPL_BSS_START_ADDR 0x80010000 diff --git a/include/configs/ls1012a_common.h b/include/configs/ls1012a_common.h index c28424417be..142c6892242 100644 --- a/include/configs/ls1012a_common.h +++ b/include/configs/ls1012a_common.h @@ -12,8 +12,6 @@ #define CONFIG_SYS_CLK_FREQ 125000000 -#define CONFIG_SKIP_LOWLEVEL_INIT - #ifdef CONFIG_TFABOOT #define CONFIG_SYS_INIT_SP_ADDR CONFIG_SYS_TEXT_BASE #else diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h index b7bfa218796..ca4dfec5987 100644 --- a/include/configs/ls1021aqds.h +++ b/include/configs/ls1021aqds.h @@ -11,8 +11,6 @@ #define CONFIG_SYS_FSL_CLK -#define CONFIG_SKIP_LOWLEVEL_INIT - #define CONFIG_DEEP_SLEEP /* diff --git a/include/configs/ls1021atwr.h b/include/configs/ls1021atwr.h index 39f0b8e0e40..7d95cfe9b6d 100644 --- a/include/configs/ls1021atwr.h +++ b/include/configs/ls1021atwr.h @@ -11,7 +11,6 @@ #define CONFIG_SYS_FSL_CLK -#define CONFIG_SKIP_LOWLEVEL_INIT #define CONFIG_DEEP_SLEEP /* diff --git a/include/configs/ls1028a_common.h b/include/configs/ls1028a_common.h index e413ebacfd1..4d877696b90 100644 --- a/include/configs/ls1028a_common.h +++ b/include/configs/ls1028a_common.h @@ -16,8 +16,6 @@ /* Link Definitions */ #define CONFIG_SYS_INIT_SP_ADDR CONFIG_SYS_TEXT_BASE -#define CONFIG_SKIP_LOWLEVEL_INIT - #define CONFIG_VERY_BIG_RAM #define CONFIG_SYS_DDR_SDRAM_BASE 0x80000000UL #define CONFIG_SYS_FSL_DDR_SDRAM_BASE_PHY 0 diff --git a/include/configs/ls1043a_common.h b/include/configs/ls1043a_common.h index 9b7089e9784..49defe71f6c 100644 --- a/include/configs/ls1043a_common.h +++ b/include/configs/ls1043a_common.h @@ -38,8 +38,6 @@ #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_FSL_OCRAM_BASE + 0xfff0) #endif -#define CONFIG_SKIP_LOWLEVEL_INIT - #define CONFIG_VERY_BIG_RAM #define CONFIG_SYS_DDR_SDRAM_BASE 0x80000000 #define CONFIG_SYS_FSL_DDR_SDRAM_BASE_PHY 0 diff --git a/include/configs/ls1043aqds.h b/include/configs/ls1043aqds.h index e2f27799183..e7a2bcb7dbc 100644 --- a/include/configs/ls1043aqds.h +++ b/include/configs/ls1043aqds.h @@ -14,8 +14,6 @@ unsigned long get_board_sys_clk(void); #define CONFIG_SYS_CLK_FREQ get_board_sys_clk() -#define CONFIG_SKIP_LOWLEVEL_INIT - #define CONFIG_LAYERSCAPE_NS_ACCESS #define CONFIG_DIMM_SLOTS_PER_CTLR 1 diff --git a/include/configs/ls1046a_common.h b/include/configs/ls1046a_common.h index 039c9a4205c..37439dfafe9 100644 --- a/include/configs/ls1046a_common.h +++ b/include/configs/ls1046a_common.h @@ -38,8 +38,6 @@ #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_FSL_OCRAM_BASE + 0xfff0) #endif -#define CONFIG_SKIP_LOWLEVEL_INIT - #define CONFIG_VERY_BIG_RAM #define CONFIG_SYS_DDR_SDRAM_BASE 0x80000000 #define CONFIG_SYS_FSL_DDR_SDRAM_BASE_PHY 0 diff --git a/include/configs/ls1046aqds.h b/include/configs/ls1046aqds.h index 6474fcef37a..6f96b9cae51 100644 --- a/include/configs/ls1046aqds.h +++ b/include/configs/ls1046aqds.h @@ -14,8 +14,6 @@ unsigned long get_board_sys_clk(void); #define CONFIG_SYS_CLK_FREQ get_board_sys_clk() -#define CONFIG_SKIP_LOWLEVEL_INIT - #define CONFIG_LAYERSCAPE_NS_ACCESS #define CONFIG_DIMM_SLOTS_PER_CTLR 1 diff --git a/include/configs/ls1088a_common.h b/include/configs/ls1088a_common.h index 409c398bb43..666e5db1423 100644 --- a/include/configs/ls1088a_common.h +++ b/include/configs/ls1088a_common.h @@ -37,8 +37,6 @@ /* Link Definitions */ #define CONFIG_SYS_FSL_QSPI_BASE 0x20000000 -#define CONFIG_SKIP_LOWLEVEL_INIT - #define CONFIG_VERY_BIG_RAM #define CONFIG_SYS_DDR_SDRAM_BASE 0x80000000UL #define CONFIG_SYS_FSL_DDR_SDRAM_BASE_PHY 0 diff --git a/include/configs/ls2080a_common.h b/include/configs/ls2080a_common.h index 92fed88f0c3..9c929f76f8b 100644 --- a/include/configs/ls2080a_common.h +++ b/include/configs/ls2080a_common.h @@ -23,8 +23,6 @@ /* Link Definitions */ -#define CONFIG_SKIP_LOWLEVEL_INIT - #ifndef CONFIG_SYS_FSL_DDR4 #define CONFIG_SYS_DDR_RAW_TIMING #endif diff --git a/include/configs/lsxl.h b/include/configs/lsxl.h index ca138382c5a..00c0c8fc026 100644 --- a/include/configs/lsxl.h +++ b/include/configs/lsxl.h @@ -26,8 +26,6 @@ #define CONFIG_FEROCEON_88FR131 /* CPU Core subversion */ #define CONFIG_KW88F6281 /* SOC Name */ -#define CONFIG_SKIP_LOWLEVEL_INIT /* disable board lowlevel_init */ - #define CONFIG_KIRKWOOD_GPIO #include "mv-common.h" diff --git a/include/configs/lx2160a_common.h b/include/configs/lx2160a_common.h index 6bc28b5468e..52aca521a17 100644 --- a/include/configs/lx2160a_common.h +++ b/include/configs/lx2160a_common.h @@ -18,8 +18,6 @@ #define CONFIG_SYS_INIT_SP_ADDR CONFIG_SYS_TEXT_BASE #define CONFIG_SYS_FLASH_BASE 0x20000000 -#define CONFIG_SKIP_LOWLEVEL_INIT - /* DDR */ #define CONFIG_FSL_DDR_INTERACTIVE /* Interactive debugging */ #define CONFIG_SYS_FSL_DDR_INTLV_256B /* force 256 byte interleaving */ diff --git a/include/configs/meesc.h b/include/configs/meesc.h index beeb9a75432..c0840b00f70 100644 --- a/include/configs/meesc.h +++ b/include/configs/meesc.h @@ -32,7 +32,6 @@ #define CONFIG_SYS_AT91_MAIN_CLOCK 16000000/* 16.0 MHz crystal */ /* Misc CPU related */ -#define CONFIG_SKIP_LOWLEVEL_INIT #define CONFIG_SETUP_MEMORY_TAGS #define CONFIG_INITRD_TAG #define CONFIG_SERIAL_TAG diff --git a/include/configs/mt7620.h b/include/configs/mt7620.h index d600cd48ff8..98f5fb50407 100644 --- a/include/configs/mt7620.h +++ b/include/configs/mt7620.h @@ -29,9 +29,6 @@ #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 } /* SPL */ -#if defined(CONFIG_SPL) && !defined(CONFIG_SPL_BUILD) -#define CONFIG_SKIP_LOWLEVEL_INIT -#endif #define CONFIG_SYS_UBOOT_START CONFIG_SYS_TEXT_BASE #define CONFIG_SPL_BSS_START_ADDR 0x80010000 diff --git a/include/configs/mt7628.h b/include/configs/mt7628.h index b52d4797f7c..21b24b50b7d 100644 --- a/include/configs/mt7628.h +++ b/include/configs/mt7628.h @@ -38,9 +38,6 @@ 230400, 460800, 921600 } /* SPL */ -#if defined(CONFIG_SPL) && !defined(CONFIG_SPL_BUILD) -#define CONFIG_SKIP_LOWLEVEL_INIT -#endif #define CONFIG_SYS_UBOOT_START CONFIG_SYS_TEXT_BASE #define CONFIG_SPL_BSS_START_ADDR 0x80010000 diff --git a/include/configs/mv-plug-common.h b/include/configs/mv-plug-common.h index 486650f183f..d38d9872c00 100644 --- a/include/configs/mv-plug-common.h +++ b/include/configs/mv-plug-common.h @@ -11,7 +11,6 @@ * High Level Configuration Options (easy to change) */ #define CONFIG_KW88F6281 1 /* SOC Name */ -#define CONFIG_SKIP_LOWLEVEL_INIT /* disable board lowlevel_init */ /* * mv-common.h should be defined after CMD configs since it used them diff --git a/include/configs/mx7_common.h b/include/configs/mx7_common.h index eb50f5df31c..eeb535efa1b 100644 --- a/include/configs/mx7_common.h +++ b/include/configs/mx7_common.h @@ -47,10 +47,5 @@ * launched by OPTEE, because of that we shall skip all the low level * initialization since it was already done by ATF or OPTEE */ -#if (CONFIG_OPTEE_TZDRAM_SIZE != 0) -#ifndef CONFIG_OPTEE -#define CONFIG_SKIP_LOWLEVEL_INIT -#endif -#endif #endif diff --git a/include/configs/nas220.h b/include/configs/nas220.h index 1fd5471ac5f..1a43587c40a 100644 --- a/include/configs/nas220.h +++ b/include/configs/nas220.h @@ -21,7 +21,6 @@ */ #define CONFIG_FEROCEON_88FR131 /* #define CPU Core subversion */ #define CONFIG_KW88F6192 /* SOC Name */ -#define CONFIG_SKIP_LOWLEVEL_INIT /* disable board lowlevel_init */ /* power-on led, regulator, sata0, sata1 */ #define NAS220_GE_OE_VAL_LOW ((1 << 12)|(1 << 14)|(1 << 24)|(1 << 28)) diff --git a/include/configs/nokia_rx51.h b/include/configs/nokia_rx51.h index 67395b47116..1cdd7d5ec40 100644 --- a/include/configs/nokia_rx51.h +++ b/include/configs/nokia_rx51.h @@ -34,8 +34,6 @@ #define V_OSCK 26000000 /* Clock output from T2 */ #define V_SCLK (V_OSCK >> 1) -#define CONFIG_SKIP_LOWLEVEL_INIT /* X-Loader set everything up */ - #define CONFIG_CMDLINE_TAG /* enable passing kernel command line string */ #define CONFIG_INITRD_TAG /* enable passing initrd */ #define CONFIG_REVISION_TAG /* enable passing revision tag*/ diff --git a/include/configs/nsa310s.h b/include/configs/nsa310s.h index 23cf94ec992..950549c31ca 100644 --- a/include/configs/nsa310s.h +++ b/include/configs/nsa310s.h @@ -13,7 +13,6 @@ #define CONFIG_FEROCEON_88FR131 1 /* CPU Core subversion */ #define CONFIG_KW88F6192 1 /* SOC Name */ #define CONFIG_KW88F6702 1 /* SOC Name */ -#define CONFIG_SKIP_LOWLEVEL_INIT /* disable board lowlevel_init */ #include "mv-common.h" diff --git a/include/configs/omapl138_lcdk.h b/include/configs/omapl138_lcdk.h index f68f7bd1252..22a1537f978 100644 --- a/include/configs/omapl138_lcdk.h +++ b/include/configs/omapl138_lcdk.h @@ -23,7 +23,6 @@ #define CONFIG_SYS_TIMERBASE DAVINCI_TIMER0_BASE #define CONFIG_SYS_HZ_CLOCK clk_get(DAVINCI_AUXCLK_CLKID) #define CONFIG_SYS_HZ 1000 -#define CONFIG_SKIP_LOWLEVEL_INIT_ONLY /* * Memory Info diff --git a/include/configs/openrd.h b/include/configs/openrd.h index 03b9393c9b0..56bfe8747ef 100644 --- a/include/configs/openrd.h +++ b/include/configs/openrd.h @@ -18,7 +18,6 @@ */ #define CONFIG_SHEEVA_88SV131 1 /* CPU Core subversion */ #define CONFIG_KW88F6281 1 /* SOC Name */ -#define CONFIG_SKIP_LOWLEVEL_INIT /* disable board lowlevel_init */ #include "mv-common.h" diff --git a/include/configs/pcm052.h b/include/configs/pcm052.h index 327ab37791b..4995662db54 100644 --- a/include/configs/pcm052.h +++ b/include/configs/pcm052.h @@ -12,8 +12,6 @@ #include #include -#define CONFIG_SKIP_LOWLEVEL_INIT - /* Enable passing of ATAGs */ #define CONFIG_CMDLINE_TAG diff --git a/include/configs/pm9261.h b/include/configs/pm9261.h index cf2ea3a0e59..c142cb127d6 100644 --- a/include/configs/pm9261.h +++ b/include/configs/pm9261.h @@ -132,8 +132,6 @@ #define CONFIG_SETUP_MEMORY_TAGS 1 #define CONFIG_INITRD_TAG 1 -#undef CONFIG_SKIP_LOWLEVEL_INIT - /* * Hardware drivers */ diff --git a/include/configs/pm9263.h b/include/configs/pm9263.h index f31cf78f24a..ff6bc315d38 100644 --- a/include/configs/pm9263.h +++ b/include/configs/pm9263.h @@ -144,7 +144,6 @@ #define CONFIG_SETUP_MEMORY_TAGS 1 #define CONFIG_INITRD_TAG 1 -#undef CONFIG_SKIP_LOWLEVEL_INIT #define CONFIG_USER_LOWLEVEL_INIT 1 /* diff --git a/include/configs/pm9g45.h b/include/configs/pm9g45.h index 9168dd021a9..371e72404aa 100644 --- a/include/configs/pm9g45.h +++ b/include/configs/pm9g45.h @@ -22,7 +22,6 @@ #define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */ #define CONFIG_SETUP_MEMORY_TAGS #define CONFIG_INITRD_TAG -#define CONFIG_SKIP_LOWLEVEL_INIT /* general purpose I/O */ #define CONFIG_ATMEL_LEGACY /* required until (g)pio is fixed */ diff --git a/include/configs/pogo_e02.h b/include/configs/pogo_e02.h index cbe5022297e..ef51da394d1 100644 --- a/include/configs/pogo_e02.h +++ b/include/configs/pogo_e02.h @@ -22,7 +22,6 @@ */ #define CONFIG_FEROCEON_88FR131 /* CPU Core subversion */ #define CONFIG_KW88F6281 /* SOC Name */ -#define CONFIG_SKIP_LOWLEVEL_INIT /* disable board lowlevel_init */ #include "mv-common.h" diff --git a/include/configs/px30_common.h b/include/configs/px30_common.h index 42fd1bf7626..09923871571 100644 --- a/include/configs/px30_common.h +++ b/include/configs/px30_common.h @@ -9,7 +9,6 @@ #include "rockchip-common.h" #define CONFIG_SYS_CBSIZE 1024 -#define CONFIG_SKIP_LOWLEVEL_INIT #define CONFIG_SYS_NS16550_MEM32 diff --git a/include/configs/rk3036_common.h b/include/configs/rk3036_common.h index 9af9978fe78..b133d8ec48b 100644 --- a/include/configs/rk3036_common.h +++ b/include/configs/rk3036_common.h @@ -9,7 +9,6 @@ #include "rockchip-common.h" #define CONFIG_SYS_CBSIZE 1024 -#define CONFIG_SKIP_LOWLEVEL_INIT #define CONFIG_ROCKCHIP_STIMER_BASE 0x200440a0 #define COUNTER_FREQUENCY 24000000 diff --git a/include/configs/rk3128_common.h b/include/configs/rk3128_common.h index 6b0ed40122b..8b7a0bbbca1 100644 --- a/include/configs/rk3128_common.h +++ b/include/configs/rk3128_common.h @@ -10,7 +10,6 @@ #define CONFIG_SYS_MAXARGS 16 #define CONFIG_SYS_CBSIZE 1024 -#define CONFIG_SKIP_LOWLEVEL_INIT #define CONFIG_ROCKCHIP_STIMER_BASE 0x200440a0 #define COUNTER_FREQUENCY 24000000 diff --git a/include/configs/rk3188_common.h b/include/configs/rk3188_common.h index 59a16a77aa9..e7c09645ec6 100644 --- a/include/configs/rk3188_common.h +++ b/include/configs/rk3188_common.h @@ -9,7 +9,6 @@ #include #include "rockchip-common.h" -#define CONFIG_SKIP_LOWLEVEL_INIT_ONLY #define CONFIG_SYS_CBSIZE 1024 #ifdef CONFIG_SPL_ROCKCHIP_BACK_TO_BROM diff --git a/include/configs/rk322x_common.h b/include/configs/rk322x_common.h index cdc4eec7f20..a46b1ffe865 100644 --- a/include/configs/rk322x_common.h +++ b/include/configs/rk322x_common.h @@ -8,7 +8,6 @@ #include #include "rockchip-common.h" -#define CONFIG_SKIP_LOWLEVEL_INIT #define CONFIG_SYS_CBSIZE 1024 #define CONFIG_SYS_BOOTM_LEN (64 << 20) /* 64M */ diff --git a/include/configs/rk3288_common.h b/include/configs/rk3288_common.h index 0f43347cc7b..abbb27395e6 100644 --- a/include/configs/rk3288_common.h +++ b/include/configs/rk3288_common.h @@ -11,7 +11,6 @@ #define CONFIG_SYS_BOOTM_LEN (64 << 20) /* 64MB */ -#define CONFIG_SKIP_LOWLEVEL_INIT_ONLY #define CONFIG_SYS_CBSIZE 1024 #define CONFIG_ROCKCHIP_STIMER_BASE 0xff810020 diff --git a/include/configs/rk3308_common.h b/include/configs/rk3308_common.h index 3edbb34ff36..edaf78a6e81 100644 --- a/include/configs/rk3308_common.h +++ b/include/configs/rk3308_common.h @@ -9,7 +9,6 @@ #include "rockchip-common.h" #define CONFIG_SYS_CBSIZE 1024 -#define CONFIG_SKIP_LOWLEVEL_INIT #define CONFIG_SYS_MAX_NAND_DEVICE 1 #define CONFIG_SYS_NAND_ONFI_DETECTION #define CONFIG_SYS_NAND_PAGE_SIZE 2048 diff --git a/include/configs/rk3328_common.h b/include/configs/rk3328_common.h index fe58ee2cc9a..c1e26a019b5 100644 --- a/include/configs/rk3328_common.h +++ b/include/configs/rk3328_common.h @@ -14,7 +14,6 @@ #define COUNTER_FREQUENCY 24000000 #define CONFIG_SYS_CBSIZE 1024 -#define CONFIG_SKIP_LOWLEVEL_INIT #define CONFIG_SYS_INIT_SP_ADDR 0x00300000 #define CONFIG_SPL_STACK 0x00400000 diff --git a/include/configs/rk3368_common.h b/include/configs/rk3368_common.h index 19a556921fe..8b239ca07da 100644 --- a/include/configs/rk3368_common.h +++ b/include/configs/rk3368_common.h @@ -14,7 +14,6 @@ #define CONFIG_SYS_SDRAM_BASE 0 #define SDRAM_MAX_SIZE 0xff000000 #define CONFIG_SYS_CBSIZE 1024 -#define CONFIG_SKIP_LOWLEVEL_INIT #define CONFIG_ROCKCHIP_STIMER_BASE 0xff830020 #define COUNTER_FREQUENCY 24000000 diff --git a/include/configs/rk3399_common.h b/include/configs/rk3399_common.h index a17f1813695..ed72c8bb6b1 100644 --- a/include/configs/rk3399_common.h +++ b/include/configs/rk3399_common.h @@ -9,7 +9,6 @@ #include "rockchip-common.h" #define CONFIG_SYS_CBSIZE 1024 -#define CONFIG_SKIP_LOWLEVEL_INIT #define COUNTER_FREQUENCY 24000000 #define CONFIG_ROCKCHIP_STIMER_BASE 0xff8680a0 diff --git a/include/configs/rk3568_common.h b/include/configs/rk3568_common.h index 72f31a012fb..afe5050e4d8 100644 --- a/include/configs/rk3568_common.h +++ b/include/configs/rk3568_common.h @@ -9,7 +9,6 @@ #include "rockchip-common.h" #define CONFIG_SYS_CBSIZE 1024 -#define CONFIG_SKIP_LOWLEVEL_INIT #define COUNTER_FREQUENCY 24000000 #define CONFIG_ROCKCHIP_STIMER_BASE 0xfdd1c020 diff --git a/include/configs/rpi.h b/include/configs/rpi.h index c11930a05bc..10566341be1 100644 --- a/include/configs/rpi.h +++ b/include/configs/rpi.h @@ -13,10 +13,6 @@ #include #endif -#if defined(CONFIG_TARGET_RPI_2) || defined(CONFIG_TARGET_RPI_3_32B) -#define CONFIG_SKIP_LOWLEVEL_INIT -#endif - /* Architecture, CPU, etc.*/ /* Use SoC timer for AArch32, but architected timer for AArch64 */ diff --git a/include/configs/rv1108_common.h b/include/configs/rv1108_common.h index 86f90777590..d0f70b04e75 100644 --- a/include/configs/rv1108_common.h +++ b/include/configs/rv1108_common.h @@ -11,7 +11,6 @@ #define CONFIG_IRAM_BASE 0x10080000 #define CONFIG_SYS_CBSIZE 1024 -#define CONFIG_SKIP_LOWLEVEL_INIT #define CONFIG_SYS_TIMER_RATE (24 * 1000 * 1000) /* TIMER1,initialized by ddr initialize code */ diff --git a/include/configs/sam9x60ek.h b/include/configs/sam9x60ek.h index 0f372c69ccf..472b92f1d66 100644 --- a/include/configs/sam9x60ek.h +++ b/include/configs/sam9x60ek.h @@ -17,7 +17,6 @@ #define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */ #define CONFIG_SETUP_MEMORY_TAGS #define CONFIG_INITRD_TAG -#define CONFIG_SKIP_LOWLEVEL_INIT #define CONFIG_USART_BASE ATMEL_BASE_DBGU #define CONFIG_USART_ID 0 /* ignored in arm */ diff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h index 20cf4f99b63..0972767fd2c 100644 --- a/include/configs/siemens-am33x-common.h +++ b/include/configs/siemens-am33x-common.h @@ -122,9 +122,6 @@ * Since SPL did pll and ddr initialization for us, * we don't need to do it twice. */ -#ifndef CONFIG_SPL_BUILD -#define CONFIG_SKIP_LOWLEVEL_INIT -#endif #ifndef CONFIG_SPL_BUILD /* diff --git a/include/configs/smartweb.h b/include/configs/smartweb.h index f880dd16210..63a0d6ec424 100644 --- a/include/configs/smartweb.h +++ b/include/configs/smartweb.h @@ -43,7 +43,6 @@ #define CONFIG_CMDLINE_TAG /* pass commandline to Kernel */ #define CONFIG_SETUP_MEMORY_TAGS /* pass memory defs to kernel */ #define CONFIG_INITRD_TAG /* pass initrd param to kernel */ -#define CONFIG_SKIP_LOWLEVEL_INIT_ONLY /* U-Boot is loaded by a bootloader */ /* We set the max number of command args high to avoid HUSH bugs. */ #define CONFIG_SYS_MAXARGS 32 diff --git a/include/configs/smdkv310.h b/include/configs/smdkv310.h index 900a2dcd982..dd2a549606a 100644 --- a/include/configs/smdkv310.h +++ b/include/configs/smdkv310.h @@ -28,7 +28,6 @@ #define S5P_CHECK_LPA 0xABAD0000 /* MMC SPL */ -#define CONFIG_SKIP_LOWLEVEL_INIT #define COPY_BL2_FNPTR_ADDR 0x00002488 #define CONFIG_BOOTCOMMAND "fatload mmc 0 40007000 uImage; bootm 40007000" diff --git a/include/configs/snapper9260.h b/include/configs/snapper9260.h index b97c5abc34d..a43103b1013 100644 --- a/include/configs/snapper9260.h +++ b/include/configs/snapper9260.h @@ -23,7 +23,6 @@ #define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */ #define CONFIG_SETUP_MEMORY_TAGS #define CONFIG_INITRD_TAG -#define CONFIG_SKIP_LOWLEVEL_INIT /* SDRAM */ #define CONFIG_SYS_SDRAM_BASE ATMEL_BASE_CS1 diff --git a/include/configs/snapper9g45.h b/include/configs/snapper9g45.h index 1a43d3ce821..de001b3c631 100644 --- a/include/configs/snapper9g45.h +++ b/include/configs/snapper9g45.h @@ -22,7 +22,6 @@ #define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */ #define CONFIG_SETUP_MEMORY_TAGS #define CONFIG_INITRD_TAG -#define CONFIG_SKIP_LOWLEVEL_INIT_ONLY /* SDRAM */ #define CONFIG_SYS_SDRAM_BASE ATMEL_BASE_CS6 diff --git a/include/configs/stemmy.h b/include/configs/stemmy.h index 43cfe51719c..d902a0238c6 100644 --- a/include/configs/stemmy.h +++ b/include/configs/stemmy.h @@ -13,7 +13,6 @@ * low-level initialization and rely on configuration provided by the Samsung * bootloader. New images are loaded at the same address for compatibility. */ -#define CONFIG_SKIP_LOWLEVEL_INIT #define CONFIG_SYS_INIT_SP_ADDR CONFIG_SYS_TEXT_BASE #define CONFIG_SYS_MALLOC_LEN SZ_2M diff --git a/include/configs/stih410-b2260.h b/include/configs/stih410-b2260.h index 68690074dc0..5369bc0d47d 100644 --- a/include/configs/stih410-b2260.h +++ b/include/configs/stih410-b2260.h @@ -57,8 +57,6 @@ #define CONFIG_SYS_MAX_FLASH_BANKS 1 -#define CONFIG_SKIP_LOWLEVEL_INIT - /* USB Configs */ #define CONFIG_USB_OHCI_NEW #define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS 2 diff --git a/include/configs/taurus.h b/include/configs/taurus.h index 5e553665429..39e0159d5c4 100644 --- a/include/configs/taurus.h +++ b/include/configs/taurus.h @@ -37,8 +37,6 @@ #define CONFIG_SETUP_MEMORY_TAGS #define CONFIG_INITRD_TAG -#define CONFIG_SKIP_LOWLEVEL_INIT_ONLY - /* general purpose I/O */ #define CONFIG_ATMEL_LEGACY /* required until (g)pio is fixed */ #define CONFIG_AT91_GPIO_PULLUP 1 /* keep pullups on peripheral pins */ diff --git a/include/configs/tegra-common-post.h b/include/configs/tegra-common-post.h index fe2d6886558..0155b625d44 100644 --- a/include/configs/tegra-common-post.h +++ b/include/configs/tegra-common-post.h @@ -109,8 +109,6 @@ /* overrides for SPL build here */ #ifdef CONFIG_SPL_BUILD -#define CONFIG_SKIP_LOWLEVEL_INIT_ONLY - /* remove USB */ #ifdef CONFIG_USB_EHCI_TEGRA #undef CONFIG_USB_EHCI_TEGRA diff --git a/include/configs/ti814x_evm.h b/include/configs/ti814x_evm.h index ee619ae5b7e..5fbbfcaf5b2 100644 --- a/include/configs/ti814x_evm.h +++ b/include/configs/ti814x_evm.h @@ -135,9 +135,6 @@ * Since SPL did pll and ddr initialization for us, * we don't need to do it twice. */ -#ifndef CONFIG_SPL_BUILD -#define CONFIG_SKIP_LOWLEVEL_INIT -#endif /* Ethernet */ #define CONFIG_NET_RETRY_COUNT 10 diff --git a/include/configs/ti816x_evm.h b/include/configs/ti816x_evm.h index 44fdc4c3002..c8f5a0763bb 100644 --- a/include/configs/ti816x_evm.h +++ b/include/configs/ti816x_evm.h @@ -92,9 +92,6 @@ /* Since SPL did pll and ddr initialization for us, * we don't need to do it twice. */ -#ifndef CONFIG_SPL_BUILD -#define CONFIG_SKIP_LOWLEVEL_INIT -#endif /* * Disable MMC DM for SPL build and can be re-enabled after adding diff --git a/include/configs/ti_am335x_common.h b/include/configs/ti_am335x_common.h index c57b20a06a3..10da1238134 100644 --- a/include/configs/ti_am335x_common.h +++ b/include/configs/ti_am335x_common.h @@ -46,9 +46,6 @@ * Since SPL did pll and ddr initialization for us, * we don't need to do it twice. */ -#if !defined(CONFIG_SPL_BUILD) && !defined(CONFIG_NOR_BOOT) -#define CONFIG_SKIP_LOWLEVEL_INIT -#endif /* * When building U-Boot such that there is no previous loader diff --git a/include/configs/ti_armv7_keystone2.h b/include/configs/ti_armv7_keystone2.h index ec8c48e2aa0..126df4d4c94 100644 --- a/include/configs/ti_armv7_keystone2.h +++ b/include/configs/ti_armv7_keystone2.h @@ -12,7 +12,6 @@ #define CONFIG_SOC_KEYSTONE /* U-Boot Build Configuration */ -#define CONFIG_SKIP_LOWLEVEL_INIT /* U-Boot is a 2nd stage loader */ /* SoC Configuration */ #define CONFIG_SPL_TARGET "u-boot-spi.gph" diff --git a/include/configs/usb_a9263.h b/include/configs/usb_a9263.h index 7e0ba117cb9..f61a5e1b1a2 100644 --- a/include/configs/usb_a9263.h +++ b/include/configs/usb_a9263.h @@ -26,8 +26,6 @@ #define CONFIG_SETUP_MEMORY_TAGS #define CONFIG_INITRD_TAG -#define CONFIG_SKIP_LOWLEVEL_INIT - /* * Hardware drivers */ diff --git a/include/configs/vf610twr.h b/include/configs/vf610twr.h index 9c4b46f3c75..2b6c27a42d3 100644 --- a/include/configs/vf610twr.h +++ b/include/configs/vf610twr.h @@ -15,8 +15,6 @@ #define CONFIG_MACH_TYPE 4146 -#define CONFIG_SKIP_LOWLEVEL_INIT - /* Enable passing of ATAGs */ #define CONFIG_CMDLINE_TAG diff --git a/include/configs/vocore2.h b/include/configs/vocore2.h index 3b4f8263953..a0046b87673 100644 --- a/include/configs/vocore2.h +++ b/include/configs/vocore2.h @@ -15,9 +15,6 @@ #define CONFIG_SYS_INIT_SP_OFFSET 0x400000 /* SPL */ -#if defined(CONFIG_SPL) && !defined(CONFIG_SPL_BUILD) -#define CONFIG_SKIP_LOWLEVEL_INIT -#endif #define CONFIG_SYS_UBOOT_START CONFIG_SYS_TEXT_BASE #define CONFIG_SPL_BSS_START_ADDR 0x80010000 diff --git a/include/configs/work_92105.h b/include/configs/work_92105.h index 055a50b2ce9..0179b0d63de 100644 --- a/include/configs/work_92105.h +++ b/include/configs/work_92105.h @@ -19,10 +19,6 @@ */ #define CONFIG_MACH_TYPE 736 -#if !defined(CONFIG_SPL_BUILD) -#define CONFIG_SKIP_LOWLEVEL_INIT -#endif - /* * Memory configurations */ diff --git a/include/configs/xilinx_zynqmp_r5.h b/include/configs/xilinx_zynqmp_r5.h index e382f4b4735..b3d6151ba4c 100644 --- a/include/configs/xilinx_zynqmp_r5.h +++ b/include/configs/xilinx_zynqmp_r5.h @@ -31,6 +31,4 @@ /* Extend size of kernel image for uncompression */ #define CONFIG_SYS_BOOTM_LEN (60 * 1024 * 1024) -#define CONFIG_SKIP_LOWLEVEL_INIT - #endif /* __CONFIG_ZYNQ_ZYNQMP_R5_H */ diff --git a/include/configs/zynq_cse.h b/include/configs/zynq_cse.h index 0491cf51361..7eafdfd9a65 100644 --- a/include/configs/zynq_cse.h +++ b/include/configs/zynq_cse.h @@ -9,8 +9,6 @@ #ifndef __CONFIG_ZYNQ_CSE_H #define __CONFIG_ZYNQ_CSE_H -#define CONFIG_SKIP_LOWLEVEL_INIT - #include /* Undef unneeded configs */ -- cgit v1.2.3 From 7cfbba36e9f84312afe8cd6d12db4e9e9c1e04b5 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Sat, 28 Aug 2021 21:34:49 -0400 Subject: Convert CONFIG_SYS_MALLOC_LEN to Kconfig This converts the following to Kconfig: CONFIG_SYS_MALLOC_LEN Signed-off-by: Tom Rini Acked-by: Sean Anderson Reviewed-by: Rick Chen --- include/configs/10m50_devboard.h | 1 - include/configs/3c120_devboard.h | 1 - include/configs/M5208EVBE.h | 1 - include/configs/M5235EVB.h | 1 - include/configs/M5249EVB.h | 1 - include/configs/M5253DEMO.h | 1 - include/configs/M5272C3.h | 1 - include/configs/M5275EVB.h | 1 - include/configs/M5282EVB.h | 1 - include/configs/M53017EVB.h | 1 - include/configs/M5329EVB.h | 1 - include/configs/M5373EVB.h | 1 - include/configs/MCR3000.h | 1 - include/configs/MPC8349EMDS.h | 1 - include/configs/MPC8349EMDS_SDRAM.h | 1 - include/configs/MPC837XERDB.h | 1 - include/configs/MPC8540ADS.h | 1 - include/configs/MPC8548CDS.h | 1 - include/configs/MPC8560ADS.h | 1 - include/configs/P1010RDB.h | 1 - include/configs/P2041RDB.h | 1 - include/configs/SBx81LIFKW.h | 1 - include/configs/SBx81LIFXCAT.h | 1 - include/configs/T102xRDB.h | 1 - include/configs/T104xRDB.h | 1 - include/configs/T208xQDS.h | 1 - include/configs/T208xRDB.h | 1 - include/configs/T4240RDB.h | 1 - include/configs/UCP1020.h | 1 - include/configs/adp-ae3xx.h | 1 - include/configs/adp-ag101p.h | 6 ------ include/configs/amcore.h | 1 - include/configs/ap121.h | 1 - include/configs/ap143.h | 1 - include/configs/ap152.h | 1 - include/configs/apalis-imx8.h | 3 --- include/configs/apalis-imx8x.h | 3 --- include/configs/apalis_imx6.h | 3 --- include/configs/armadillo-800eva.h | 1 - include/configs/aspeed-common.h | 2 -- include/configs/astro_mcf5373l.h | 2 -- include/configs/at91-sama5_common.h | 3 --- include/configs/at91sam9260ek.h | 5 ----- include/configs/at91sam9261ek.h | 5 ----- include/configs/at91sam9263ek.h | 5 ----- include/configs/at91sam9m10g45ek.h | 5 ----- include/configs/at91sam9n12ek.h | 5 ----- include/configs/at91sam9rlek.h | 6 ------ include/configs/at91sam9x5ek.h | 5 ----- include/configs/ax25-ae350.h | 6 ------ include/configs/axs10x.h | 1 - include/configs/bcm7260.h | 2 -- include/configs/bcm7445.h | 2 -- include/configs/bcm_ns3.h | 1 - include/configs/bk4r1.h | 3 --- include/configs/bmips_common.h | 1 - include/configs/boston.h | 2 -- include/configs/broadcom_bcm963158.h | 1 - include/configs/broadcom_bcm968360bg.h | 1 - include/configs/broadcom_bcm968580xref.h | 1 - include/configs/brppt1.h | 1 - include/configs/brppt2.h | 1 - include/configs/brsmarc1.h | 1 - include/configs/brxre1.h | 1 - include/configs/capricorn-common.h | 3 --- include/configs/cgtqmx8.h | 3 --- include/configs/ci20.h | 1 - include/configs/cl-som-imx7.h | 3 --- include/configs/cm_fx6.h | 1 - include/configs/cobra5272.h | 1 - include/configs/colibri-imx6ull.h | 3 --- include/configs/colibri-imx8x.h | 3 --- include/configs/colibri_imx6.h | 3 --- include/configs/colibri_imx7.h | 3 --- include/configs/colibri_pxa270.h | 1 - include/configs/colibri_vf.h | 3 --- include/configs/corenet_ds.h | 1 - include/configs/corvus.h | 6 ------ include/configs/da850evm.h | 1 - include/configs/dart_6ul.h | 3 --- include/configs/devkit3250.h | 1 - include/configs/devkit8000.h | 4 ---- include/configs/dh_imx6.h | 3 --- include/configs/display5.h | 3 --- include/configs/dragonboard410c.h | 3 --- include/configs/dragonboard820c.h | 3 --- include/configs/durian.h | 3 --- include/configs/ea-lpc3250devkitv2.h | 1 - include/configs/eb_cpu5282.h | 1 - include/configs/edminiv2.h | 5 ----- include/configs/el6x_common.h | 3 --- include/configs/embestmx6boards.h | 3 --- include/configs/emsdp.h | 2 -- include/configs/ethernut5.h | 1 - include/configs/exynos-common.h | 3 --- include/configs/exynos7420-common.h | 3 --- include/configs/flea3.h | 5 ----- include/configs/gardena-smart-gateway-at91sam.h | 2 -- include/configs/gardena-smart-gateway-mt7688.h | 1 - include/configs/gazerbeam.h | 1 - include/configs/ge_b1x5v2.h | 3 --- include/configs/ge_bx50v3.h | 1 - include/configs/grpeach.h | 2 -- include/configs/gw_ventana.h | 3 --- include/configs/highbank.h | 5 ----- include/configs/hikey.h | 3 --- include/configs/hikey960.h | 3 --- include/configs/hsdk-4xd.h | 1 - include/configs/hsdk.h | 1 - include/configs/ids8313.h | 1 - include/configs/imgtec_xilfpga.h | 1 - include/configs/imx27lite-common.h | 2 -- include/configs/imx6-engicam.h | 3 --- include/configs/imx6_logic.h | 3 --- include/configs/imx6dl-mamoj.h | 3 --- include/configs/imx7-cm.h | 3 --- include/configs/imx8mm-cl-iot-gate.h | 3 --- include/configs/imx8mm_beacon.h | 3 --- include/configs/imx8mm_evk.h | 3 --- include/configs/imx8mm_icore_mx8mm.h | 2 -- include/configs/imx8mm_venice.h | 2 -- include/configs/imx8mn_beacon.h | 3 --- include/configs/imx8mn_evk.h | 3 --- include/configs/imx8mp_evk.h | 3 --- include/configs/imx8mq_cm.h | 3 --- include/configs/imx8mq_evk.h | 3 --- include/configs/imx8mq_phanbell.h | 3 --- include/configs/imx8qm_mek.h | 3 --- include/configs/imx8qm_rom7720.h | 3 --- include/configs/imx8qxp_mek.h | 3 --- include/configs/imx8ulp_evk.h | 3 --- include/configs/imxrt1020-evk.h | 1 - include/configs/imxrt1050-evk.h | 1 - include/configs/integrator-common.h | 1 - include/configs/iot_devkit.h | 1 - include/configs/km/km-powerpc.h | 3 --- include/configs/km/km_arm.h | 3 --- include/configs/km/pg-wcom-ls102xa.h | 5 ----- include/configs/kmcent2.h | 2 -- include/configs/kontron_sl28.h | 3 --- include/configs/kp_imx53.h | 3 --- include/configs/kp_imx6q_tpc.h | 3 --- include/configs/kzm9g.h | 1 - include/configs/legoev3.h | 1 - include/configs/linkit-smart-7688.h | 1 - include/configs/liteboard.h | 3 --- include/configs/ls1012a_common.h | 3 --- include/configs/ls1021aiot.h | 5 ----- include/configs/ls1021aqds.h | 5 ----- include/configs/ls1021atsn.h | 3 --- include/configs/ls1021atwr.h | 5 ----- include/configs/ls1028a_common.h | 3 --- include/configs/ls1043a_common.h | 3 --- include/configs/ls1046a_common.h | 3 --- include/configs/ls1088a_common.h | 3 --- include/configs/ls2080a_common.h | 3 --- include/configs/lx2160a_common.h | 3 --- include/configs/m53menlo.h | 1 - include/configs/malta.h | 1 - include/configs/mccmon6.h | 3 --- include/configs/meerkat96.h | 3 --- include/configs/meesc.h | 6 ------ include/configs/meson64.h | 3 --- include/configs/meson64_android.h | 2 -- include/configs/microblaze-generic.h | 2 -- include/configs/microchip_mpfs_icicle.h | 2 -- include/configs/mt7620.h | 1 - include/configs/mt7622.h | 2 -- include/configs/mt7623.h | 2 -- include/configs/mt7628.h | 1 - include/configs/mt7629.h | 2 -- include/configs/mt8183.h | 2 -- include/configs/mt8512.h | 1 - include/configs/mt8516.h | 2 -- include/configs/mt8518.h | 1 - include/configs/mv-common.h | 5 ----- include/configs/mvebu_armada-37xx.h | 5 ----- include/configs/mvebu_armada-8k.h | 5 ----- include/configs/mx51evk.h | 5 ----- include/configs/mx53cx9020.h | 3 --- include/configs/mx53loco.h | 3 --- include/configs/mx53ppd.h | 3 --- include/configs/mx6cuboxi.h | 2 -- include/configs/mx6memcal.h | 2 -- include/configs/mx6sabre_common.h | 3 --- include/configs/mx6slevk.h | 3 --- include/configs/mx6sllevk.h | 3 --- include/configs/mx6sxsabreauto.h | 3 --- include/configs/mx6sxsabresd.h | 3 --- include/configs/mx6ul_14x14_evk.h | 3 --- include/configs/mx6ullevk.h | 3 --- include/configs/mx7dsabresd.h | 3 --- include/configs/mx7ulp_com.h | 3 --- include/configs/mx7ulp_evk.h | 3 --- include/configs/mxs.h | 1 - include/configs/mys_6ulx.h | 3 --- include/configs/nitrogen6x.h | 3 --- include/configs/nokia_rx51.h | 5 ----- include/configs/novena.h | 2 -- include/configs/npi_imx6ull.h | 3 --- include/configs/nsim.h | 1 - include/configs/o4-imx6ull-nano.h | 1 - include/configs/octeon_common.h | 2 -- include/configs/octeontx2_common.h | 3 --- include/configs/octeontx_common.h | 1 - include/configs/omapl138_lcdk.h | 1 - include/configs/openpiton-riscv64.h | 1 - include/configs/opos6uldev.h | 3 --- include/configs/owl-common.h | 2 -- include/configs/p1_p2_rdb_pc.h | 1 - include/configs/pcl063.h | 3 --- include/configs/pcl063_ull.h | 3 --- include/configs/pcm052.h | 3 --- include/configs/pcm058.h | 3 --- include/configs/phycore_imx8mm.h | 2 -- include/configs/phycore_imx8mp.h | 2 -- include/configs/pic32mzdask.h | 1 - include/configs/pico-imx6.h | 3 --- include/configs/pico-imx6ul.h | 3 --- include/configs/pico-imx7d.h | 3 --- include/configs/pico-imx8mq.h | 3 --- include/configs/pm9261.h | 6 ------ include/configs/pm9263.h | 5 ----- include/configs/pm9g45.h | 6 ------ include/configs/poplar.h | 1 - include/configs/presidio_asic.h | 3 --- include/configs/qemu-arm.h | 1 - include/configs/qemu-ppce500.h | 1 - include/configs/qemu-riscv.h | 2 -- include/configs/r2dplus.h | 2 -- include/configs/rcar-gen2-common.h | 1 - include/configs/rcar-gen3-common.h | 1 - include/configs/rpi.h | 1 - include/configs/s5p4418_nanopi2.h | 2 -- include/configs/s5p_goni.h | 3 --- include/configs/sam9x60ek.h | 5 ----- include/configs/sama7g5ek.h | 3 --- include/configs/sandbox.h | 4 ---- include/configs/siemens-am33x-common.h | 1 - include/configs/sifive-unleashed.h | 2 -- include/configs/sifive-unmatched.h | 2 -- include/configs/sipeed-maix.h | 1 - include/configs/smartweb.h | 4 ---- include/configs/smdkc100.h | 6 ------ include/configs/smegw01.h | 3 --- include/configs/snapper9260.h | 3 --- include/configs/snapper9g45.h | 3 --- include/configs/sniper.h | 2 -- include/configs/socfpga_common.h | 1 - include/configs/socfpga_soc64_common.h | 1 - include/configs/socrates.h | 1 - include/configs/somlabs_visionsom_6ull.h | 3 --- include/configs/stemmy.h | 2 -- include/configs/stih410-b2260.h | 2 -- include/configs/stm32f429-discovery.h | 2 -- include/configs/stm32f429-evaluation.h | 2 -- include/configs/stm32f469-discovery.h | 2 -- include/configs/stm32f746-disco.h | 2 -- include/configs/stm32h743-disco.h | 1 - include/configs/stm32h743-eval.h | 1 - include/configs/stm32h750-art-pi.h | 1 - include/configs/stmark2.h | 2 -- include/configs/stv0991.h | 2 -- include/configs/sunxi-common.h | 8 -------- include/configs/synquacer.h | 1 - include/configs/tam3517-common.h | 5 ----- include/configs/taurus.h | 5 ----- include/configs/tb100.h | 1 - include/configs/tbs2910.h | 2 -- include/configs/tegra-common-post.h | 11 ----------- include/configs/thunderx_88xx.h | 3 --- include/configs/ti814x_evm.h | 1 - include/configs/ti_armv7_common.h | 1 - include/configs/total_compute.h | 3 --- include/configs/tplink_wdr4300.h | 1 - include/configs/tqma6.h | 3 --- include/configs/turris_mox.h | 5 ----- include/configs/udoo.h | 3 --- include/configs/udoo_neo.h | 3 --- include/configs/uniphier.h | 2 -- include/configs/usb_a9263.h | 5 ----- include/configs/usbarmory.h | 2 -- include/configs/vcoreiii.h | 1 - include/configs/verdin-imx8mm.h | 2 -- include/configs/vexpress_aemv8a.h | 3 --- include/configs/vexpress_common.h | 3 --- include/configs/vf610twr.h | 3 --- include/configs/vining_2000.h | 3 --- include/configs/vocore2.h | 1 - include/configs/wandboard.h | 3 --- include/configs/warp.h | 3 --- include/configs/warp7.h | 3 --- include/configs/work_92105.h | 1 - include/configs/x530.h | 2 -- include/configs/x86-common.h | 1 - include/configs/xenguest_arm64.h | 3 --- include/configs/xilinx_zynqmp.h | 3 --- include/configs/xilinx_zynqmp_mini.h | 1 - include/configs/xilinx_zynqmp_mini_emmc.h | 1 - include/configs/xilinx_zynqmp_mini_nand.h | 1 - include/configs/xilinx_zynqmp_mini_qspi.h | 1 - include/configs/xilinx_zynqmp_r5.h | 2 -- include/configs/xpress.h | 3 --- include/configs/xtfpga.h | 2 -- include/configs/zmx25.h | 6 ------ 305 files changed, 738 deletions(-) (limited to 'include') diff --git a/include/configs/10m50_devboard.h b/include/configs/10m50_devboard.h index e3ac6fe378e..709a449e796 100644 --- a/include/configs/10m50_devboard.h +++ b/include/configs/10m50_devboard.h @@ -47,7 +47,6 @@ #define CONFIG_SYS_MONITOR_BASE (CONFIG_SYS_SDRAM_BASE + \ CONFIG_SYS_SDRAM_SIZE - \ CONFIG_SYS_MONITOR_LEN) -#define CONFIG_SYS_MALLOC_LEN 0x20000 /* * ENVIRONMENT -- Put environment in sector CONFIG_SYS_MONITOR_LEN above diff --git a/include/configs/3c120_devboard.h b/include/configs/3c120_devboard.h index 74ecd94f797..f7ad7efb0dd 100644 --- a/include/configs/3c120_devboard.h +++ b/include/configs/3c120_devboard.h @@ -47,7 +47,6 @@ #define CONFIG_SYS_MONITOR_BASE (CONFIG_SYS_SDRAM_BASE + \ CONFIG_SYS_SDRAM_SIZE - \ CONFIG_SYS_MONITOR_LEN) -#define CONFIG_SYS_MALLOC_LEN 0x20000 /* * ENVIRONMENT -- Put environment in sector CONFIG_SYS_MONITOR_LEN above diff --git a/include/configs/M5208EVBE.h b/include/configs/M5208EVBE.h index 93a2806a8a0..e0c8d361d16 100644 --- a/include/configs/M5208EVBE.h +++ b/include/configs/M5208EVBE.h @@ -101,7 +101,6 @@ #define CONFIG_SYS_MONITOR_LEN (256 << 10) /* Reserve 256 kB for Monitor */ #define CONFIG_SYS_BOOTPARAMS_LEN 64*1024 -#define CONFIG_SYS_MALLOC_LEN (128 << 10) /* Reserve 128 kB for malloc() */ /* * For booting Linux, the board info and command line data diff --git a/include/configs/M5235EVB.h b/include/configs/M5235EVB.h index 22c593851f0..f983281cc1f 100644 --- a/include/configs/M5235EVB.h +++ b/include/configs/M5235EVB.h @@ -109,7 +109,6 @@ #define CONFIG_SYS_MONITOR_LEN (256 << 10) /* Reserve 256 kB for Monitor */ #define CONFIG_SYS_BOOTPARAMS_LEN 64*1024 -#define CONFIG_SYS_MALLOC_LEN (128 << 10) /* Reserve 128 kB for malloc() */ /* * For booting Linux, the board info and command line data diff --git a/include/configs/M5249EVB.h b/include/configs/M5249EVB.h index 2e8bbbb5301..7015f790dee 100644 --- a/include/configs/M5249EVB.h +++ b/include/configs/M5249EVB.h @@ -76,7 +76,6 @@ #define CONFIG_SYS_MONITOR_BASE (CONFIG_SYS_FLASH_BASE + 0x400) #define CONFIG_SYS_MONITOR_LEN 0x20000 -#define CONFIG_SYS_MALLOC_LEN (1 * 1024*1024) /* Reserve 1 MB for malloc() */ #define CONFIG_SYS_BOOTPARAMS_LEN 64*1024 /* diff --git a/include/configs/M5253DEMO.h b/include/configs/M5253DEMO.h index cc7126c76e8..d892cbb5085 100644 --- a/include/configs/M5253DEMO.h +++ b/include/configs/M5253DEMO.h @@ -117,7 +117,6 @@ #endif #define CONFIG_SYS_MONITOR_LEN 0x40000 -#define CONFIG_SYS_MALLOC_LEN (256 << 10) #define CONFIG_SYS_BOOTPARAMS_LEN (64*1024) /* diff --git a/include/configs/M5272C3.h b/include/configs/M5272C3.h index 02b8e373a76..01c8ac6dd62 100644 --- a/include/configs/M5272C3.h +++ b/include/configs/M5272C3.h @@ -110,7 +110,6 @@ #endif #define CONFIG_SYS_MONITOR_LEN 0x20000 -#define CONFIG_SYS_MALLOC_LEN (256 << 10) #define CONFIG_SYS_BOOTPARAMS_LEN 64*1024 /* diff --git a/include/configs/M5275EVB.h b/include/configs/M5275EVB.h index 29b0f7b67fa..35048613b9f 100644 --- a/include/configs/M5275EVB.h +++ b/include/configs/M5275EVB.h @@ -117,7 +117,6 @@ #endif #define CONFIG_SYS_MONITOR_LEN 0x20000 -#define CONFIG_SYS_MALLOC_LEN (256 << 10) #define CONFIG_SYS_BOOTPARAMS_LEN 64*1024 /* diff --git a/include/configs/M5282EVB.h b/include/configs/M5282EVB.h index fb60ec87da7..fde10840445 100644 --- a/include/configs/M5282EVB.h +++ b/include/configs/M5282EVB.h @@ -114,7 +114,6 @@ #endif #define CONFIG_SYS_MONITOR_LEN 0x20000 -#define CONFIG_SYS_MALLOC_LEN (256 << 10) #define CONFIG_SYS_BOOTPARAMS_LEN 64*1024 /* diff --git a/include/configs/M53017EVB.h b/include/configs/M53017EVB.h index 7ee38f810bb..2e5b82a5f53 100644 --- a/include/configs/M53017EVB.h +++ b/include/configs/M53017EVB.h @@ -117,7 +117,6 @@ #define CONFIG_SYS_MONITOR_LEN (256 << 10) /* Reserve 256 kB for Monitor */ #define CONFIG_SYS_BOOTPARAMS_LEN 64*1024 -#define CONFIG_SYS_MALLOC_LEN (128 << 10) /* Reserve 128 kB for malloc() */ /* * For booting Linux, the board info and command line data diff --git a/include/configs/M5329EVB.h b/include/configs/M5329EVB.h index cce6b560f1a..e3e7d8b7e0e 100644 --- a/include/configs/M5329EVB.h +++ b/include/configs/M5329EVB.h @@ -113,7 +113,6 @@ #define CONFIG_SYS_MONITOR_LEN (256 << 10) /* Reserve 256 kB for Monitor */ #define CONFIG_SYS_BOOTPARAMS_LEN 64*1024 -#define CONFIG_SYS_MALLOC_LEN (128 << 10) /* Reserve 128 kB for malloc() */ /* * For booting Linux, the board info and command line data diff --git a/include/configs/M5373EVB.h b/include/configs/M5373EVB.h index d0bb8a121f2..256a66fb057 100644 --- a/include/configs/M5373EVB.h +++ b/include/configs/M5373EVB.h @@ -115,7 +115,6 @@ #define CONFIG_SYS_MONITOR_LEN (256 << 10) /* Reserve 256 kB for Monitor */ #define CONFIG_SYS_BOOTPARAMS_LEN 64*1024 -#define CONFIG_SYS_MALLOC_LEN (128 << 10) /* Reserve 128 kB for malloc() */ /* * For booting Linux, the board info and command line data diff --git a/include/configs/MCR3000.h b/include/configs/MCR3000.h index a3ceeeb9c2e..65c16380ee5 100644 --- a/include/configs/MCR3000.h +++ b/include/configs/MCR3000.h @@ -84,7 +84,6 @@ #define CONFIG_SYS_BOOTMAPSZ (8 << 20) #define CONFIG_SYS_MONITOR_LEN (320 << 10) #define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE -#define CONFIG_SYS_MALLOC_LEN (4096 << 10) /* Environment Configuration */ diff --git a/include/configs/MPC8349EMDS.h b/include/configs/MPC8349EMDS.h index 126a9b6ffeb..2f1fc6a6a2b 100644 --- a/include/configs/MPC8349EMDS.h +++ b/include/configs/MPC8349EMDS.h @@ -110,7 +110,6 @@ #define CONFIG_SYS_INIT_SP_OFFSET CONFIG_SYS_GBL_DATA_OFFSET #define CONFIG_SYS_MONITOR_LEN (512 * 1024) /* Reserve 512 kB for Mon */ -#define CONFIG_SYS_MALLOC_LEN (256 * 1024) /* Reserved for malloc */ /* * Serial Port diff --git a/include/configs/MPC8349EMDS_SDRAM.h b/include/configs/MPC8349EMDS_SDRAM.h index 7e55d20d6c4..d6a151d20ce 100644 --- a/include/configs/MPC8349EMDS_SDRAM.h +++ b/include/configs/MPC8349EMDS_SDRAM.h @@ -107,7 +107,6 @@ #define CONFIG_SYS_INIT_SP_OFFSET CONFIG_SYS_GBL_DATA_OFFSET #define CONFIG_SYS_MONITOR_LEN (512 * 1024) /* Reserve 512 kB for Mon */ -#define CONFIG_SYS_MALLOC_LEN (256 * 1024) /* Reserved for malloc */ /* * The MPC834xEA MDS for 834xE rev3.1 may not be assembled SDRAM memory. diff --git a/include/configs/MPC837XERDB.h b/include/configs/MPC837XERDB.h index f4f139548b1..0e2e034dcd9 100644 --- a/include/configs/MPC837XERDB.h +++ b/include/configs/MPC837XERDB.h @@ -136,7 +136,6 @@ #endif #define CONFIG_SYS_MONITOR_LEN (512 * 1024) /* Reserve 512 kB for Mon */ -#define CONFIG_SYS_MALLOC_LEN (512 * 1024) /* Reserved for malloc */ /* * Initial RAM Base Address Setup diff --git a/include/configs/MPC8540ADS.h b/include/configs/MPC8540ADS.h index a9edf091113..66cf2053f98 100644 --- a/include/configs/MPC8540ADS.h +++ b/include/configs/MPC8540ADS.h @@ -189,7 +189,6 @@ #define CONFIG_SYS_INIT_SP_OFFSET CONFIG_SYS_GBL_DATA_OFFSET #define CONFIG_SYS_MONITOR_LEN (256 * 1024) /* Reserve 256 kB for Mon */ -#define CONFIG_SYS_MALLOC_LEN (128 * 1024) /* Reserved for malloc */ /* Serial Port */ #define CONFIG_SYS_NS16550_SERIAL diff --git a/include/configs/MPC8548CDS.h b/include/configs/MPC8548CDS.h index 5be6981a8c6..f7d05ffa89a 100644 --- a/include/configs/MPC8548CDS.h +++ b/include/configs/MPC8548CDS.h @@ -275,7 +275,6 @@ extern unsigned long get_clock_freq(void); #define CONFIG_SYS_INIT_SP_OFFSET CONFIG_SYS_GBL_DATA_OFFSET #define CONFIG_SYS_MONITOR_LEN (512 * 1024) -#define CONFIG_SYS_MALLOC_LEN (1024 * 1024) /* Reserved for malloc */ /* Serial Port */ #define CONFIG_SYS_NS16550_SERIAL diff --git a/include/configs/MPC8560ADS.h b/include/configs/MPC8560ADS.h index bc35572fbbd..22431436643 100644 --- a/include/configs/MPC8560ADS.h +++ b/include/configs/MPC8560ADS.h @@ -189,7 +189,6 @@ #define CONFIG_SYS_INIT_SP_OFFSET CONFIG_SYS_GBL_DATA_OFFSET #define CONFIG_SYS_MONITOR_LEN (256 * 1024) /* Reserve 256 kB for Mon */ -#define CONFIG_SYS_MALLOC_LEN (128 * 1024) /* Reserved for malloc */ /* Serial Port */ #define CONFIG_CONS_ON_SCC /* define if console on SCC */ diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h index 9738f62f17d..02b0b71ada5 100644 --- a/include/configs/P1010RDB.h +++ b/include/configs/P1010RDB.h @@ -441,7 +441,6 @@ extern unsigned long get_sdram_size(void); #define CONFIG_SYS_INIT_SP_OFFSET CONFIG_SYS_GBL_DATA_OFFSET #define CONFIG_SYS_MONITOR_LEN (768 * 1024) -#define CONFIG_SYS_MALLOC_LEN (1024 * 1024) /* Reserved for malloc*/ /* * Config the L2 Cache as L2 SRAM diff --git a/include/configs/P2041RDB.h b/include/configs/P2041RDB.h index 08d2a5ad72f..6da44e7ab82 100644 --- a/include/configs/P2041RDB.h +++ b/include/configs/P2041RDB.h @@ -233,7 +233,6 @@ unsigned long get_board_sys_clk(unsigned long dummy); #define CONFIG_SYS_INIT_SP_OFFSET CONFIG_SYS_GBL_DATA_OFFSET #define CONFIG_SYS_MONITOR_LEN (768 * 1024) -#define CONFIG_SYS_MALLOC_LEN (1024 * 1024) /* Serial Port - controlled on board with jumper J8 * open - index 2 diff --git a/include/configs/SBx81LIFKW.h b/include/configs/SBx81LIFKW.h index a32151876ce..e7c099511d3 100644 --- a/include/configs/SBx81LIFKW.h +++ b/include/configs/SBx81LIFKW.h @@ -59,7 +59,6 @@ */ #define CONFIG_SYS_MONITOR_LEN (256 << 10) /* Reserve 256 kB for monitor */ -#define CONFIG_SYS_MALLOC_LEN (4 << 20) /* Reserve 4.0 MB for malloc */ /* * For booting Linux, the board info and command line data diff --git a/include/configs/SBx81LIFXCAT.h b/include/configs/SBx81LIFXCAT.h index 4a53dedbb73..3e42ef98a71 100644 --- a/include/configs/SBx81LIFXCAT.h +++ b/include/configs/SBx81LIFXCAT.h @@ -59,7 +59,6 @@ */ #define CONFIG_SYS_MONITOR_LEN (256 << 10) /* Reserve 256 kB for monitor */ -#define CONFIG_SYS_MALLOC_LEN (4 << 20) /* Reserve 4.0 MB for malloc */ /* * For booting Linux, the board info and command line data diff --git a/include/configs/T102xRDB.h b/include/configs/T102xRDB.h index 3fceef2fba3..3ae8a14c944 100644 --- a/include/configs/T102xRDB.h +++ b/include/configs/T102xRDB.h @@ -366,7 +366,6 @@ unsigned long get_board_sys_clk(void); #define CONFIG_SYS_INIT_SP_OFFSET CONFIG_SYS_GBL_DATA_OFFSET #define CONFIG_SYS_MONITOR_LEN (768 * 1024) -#define CONFIG_SYS_MALLOC_LEN (10 * 1024 * 1024) /* Serial Port */ #define CONFIG_SYS_NS16550_SERIAL diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h index 4e993d9fe0e..910baef00c4 100644 --- a/include/configs/T104xRDB.h +++ b/include/configs/T104xRDB.h @@ -348,7 +348,6 @@ #define CONFIG_SYS_INIT_SP_OFFSET CONFIG_SYS_GBL_DATA_OFFSET #define CONFIG_SYS_MONITOR_LEN (768 * 1024) -#define CONFIG_SYS_MALLOC_LEN (4 * 1024 * 1024) /* Serial Port - controlled on board with jumper J8 * open - index 2 diff --git a/include/configs/T208xQDS.h b/include/configs/T208xQDS.h index 1c53a38a189..315d1f7b01a 100644 --- a/include/configs/T208xQDS.h +++ b/include/configs/T208xQDS.h @@ -333,7 +333,6 @@ unsigned long get_board_sys_clk(void); GENERATED_GBL_DATA_SIZE) #define CONFIG_SYS_INIT_SP_OFFSET CONFIG_SYS_GBL_DATA_OFFSET #define CONFIG_SYS_MONITOR_LEN (768 * 1024) -#define CONFIG_SYS_MALLOC_LEN (4 * 1024 * 1024) /* * Serial Port diff --git a/include/configs/T208xRDB.h b/include/configs/T208xRDB.h index 9d12f57d5d9..6824be9e758 100644 --- a/include/configs/T208xRDB.h +++ b/include/configs/T208xRDB.h @@ -291,7 +291,6 @@ unsigned long get_board_sys_clk(void); GENERATED_GBL_DATA_SIZE) #define CONFIG_SYS_INIT_SP_OFFSET CONFIG_SYS_GBL_DATA_OFFSET #define CONFIG_SYS_MONITOR_LEN (768 * 1024) -#define CONFIG_SYS_MALLOC_LEN (4 * 1024 * 1024) /* * Serial Port diff --git a/include/configs/T4240RDB.h b/include/configs/T4240RDB.h index afcbff9a809..54db021ec9a 100644 --- a/include/configs/T4240RDB.h +++ b/include/configs/T4240RDB.h @@ -128,7 +128,6 @@ #define CONFIG_SYS_INIT_SP_OFFSET CONFIG_SYS_GBL_DATA_OFFSET #define CONFIG_SYS_MONITOR_LEN (768 * 1024) -#define CONFIG_SYS_MALLOC_LEN (4 * 1024 * 1024) /* Serial Port - controlled on board with jumper J8 * open - index 2 diff --git a/include/configs/UCP1020.h b/include/configs/UCP1020.h index a3f7a226613..22b8c3f4e01 100644 --- a/include/configs/UCP1020.h +++ b/include/configs/UCP1020.h @@ -264,7 +264,6 @@ #define CONFIG_SYS_INIT_SP_OFFSET CONFIG_SYS_GBL_DATA_OFFSET #define CONFIG_SYS_MONITOR_LEN (256 * 1024)/* Reserve 256 kB for Mon */ -#define CONFIG_SYS_MALLOC_LEN (1024 * 1024)/* Reserved for malloc */ #define CONFIG_SYS_PMC_BASE 0xff980000 #define CONFIG_SYS_PMC_BASE_PHYS CONFIG_SYS_PMC_BASE diff --git a/include/configs/adp-ae3xx.h b/include/configs/adp-ae3xx.h index 3af8ca8d03c..b6a78b1370e 100644 --- a/include/configs/adp-ae3xx.h +++ b/include/configs/adp-ae3xx.h @@ -84,7 +84,6 @@ * Size of malloc() pool */ /* 512kB is suggested, (CONFIG_ENV_SIZE + 128 * 1024) was not enough */ -#define CONFIG_SYS_MALLOC_LEN (512 << 10) /* * Physical Memory Map diff --git a/include/configs/adp-ag101p.h b/include/configs/adp-ag101p.h index 04bda0a53cf..3e78d5ce170 100644 --- a/include/configs/adp-ag101p.h +++ b/include/configs/adp-ag101p.h @@ -82,12 +82,6 @@ * Miscellaneous configurable options */ -/* - * Size of malloc() pool - */ -/* 512kB is suggested, (CONFIG_ENV_SIZE + 128 * 1024) was not enough */ -#define CONFIG_SYS_MALLOC_LEN (512 << 10) - /* * AHB Controller configuration */ diff --git a/include/configs/amcore.h b/include/configs/amcore.h index 8376eb14d2d..4fd02cd75da 100644 --- a/include/configs/amcore.h +++ b/include/configs/amcore.h @@ -54,7 +54,6 @@ /* reserve 128-4KB */ #define CONFIG_SYS_MONITOR_BASE (CONFIG_SYS_FLASH_BASE + 0x400) #define CONFIG_SYS_MONITOR_LEN ((128 - 4) * 1024) -#define CONFIG_SYS_MALLOC_LEN (1 * 1024 * 1024) #define CONFIG_SYS_BOOTPARAMS_LEN (64 * 1024) #define LDS_BOARD_TEXT \ diff --git a/include/configs/ap121.h b/include/configs/ap121.h index 88d85ce82dc..fb2a0b33cc0 100644 --- a/include/configs/ap121.h +++ b/include/configs/ap121.h @@ -12,7 +12,6 @@ #define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE -#define CONFIG_SYS_MALLOC_LEN 0x40000 #define CONFIG_SYS_BOOTPARAMS_LEN 0x20000 #define CONFIG_SYS_SDRAM_BASE 0x80000000 diff --git a/include/configs/ap143.h b/include/configs/ap143.h index 2001ed1f64d..bb9544b8e74 100644 --- a/include/configs/ap143.h +++ b/include/configs/ap143.h @@ -12,7 +12,6 @@ #define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE -#define CONFIG_SYS_MALLOC_LEN 0x40000 #define CONFIG_SYS_BOOTPARAMS_LEN 0x20000 #define CONFIG_SYS_SDRAM_BASE 0x80000000 diff --git a/include/configs/ap152.h b/include/configs/ap152.h index 9e38de17105..766f10b6bea 100644 --- a/include/configs/ap152.h +++ b/include/configs/ap152.h @@ -12,7 +12,6 @@ #define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE -#define CONFIG_SYS_MALLOC_LEN 0x40000 #define CONFIG_SYS_BOOTPARAMS_LEN 0x20000 #define CONFIG_SYS_SDRAM_BASE 0x80000000 diff --git a/include/configs/apalis-imx8.h b/include/configs/apalis-imx8.h index ef03e765c7f..cdc7d734e4c 100644 --- a/include/configs/apalis-imx8.h +++ b/include/configs/apalis-imx8.h @@ -80,9 +80,6 @@ #define CONFIG_SYS_BOOTM_LEN SZ_64M /* Increase max gunzip size */ -/* Size of malloc() pool */ -#define CONFIG_SYS_MALLOC_LEN ((CONFIG_ENV_SIZE + (32 * 1024)) * 1024) - #define CONFIG_SYS_SDRAM_BASE 0x80000000 #define PHYS_SDRAM_1 0x80000000 #define PHYS_SDRAM_2 0x880000000 diff --git a/include/configs/apalis-imx8x.h b/include/configs/apalis-imx8x.h index 9002058d9e9..d030242ea73 100644 --- a/include/configs/apalis-imx8x.h +++ b/include/configs/apalis-imx8x.h @@ -109,9 +109,6 @@ #define CONFIG_SYS_BOOTM_LEN SZ_64M /* Increase max gunzip size */ -/* Size of malloc() pool */ -#define CONFIG_SYS_MALLOC_LEN ((CONFIG_ENV_SIZE + (32 * 1024)) * 1024) - #define CONFIG_SYS_SDRAM_BASE 0x80000000 #define PHYS_SDRAM_1 0x80000000 #define PHYS_SDRAM_2 0x880000000 diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h index 77028099162..839af489dd8 100644 --- a/include/configs/apalis_imx6.h +++ b/include/configs/apalis_imx6.h @@ -29,9 +29,6 @@ #define CONFIG_REVISION_TAG #define CONFIG_SERIAL_TAG -/* Size of malloc() pool */ -#define CONFIG_SYS_MALLOC_LEN (32 * 1024 * 1024) - #define CONFIG_MXC_UART_BASE UART1_BASE /* MMC Configs */ diff --git a/include/configs/armadillo-800eva.h b/include/configs/armadillo-800eva.h index db43e35292f..73f63c5a9f0 100644 --- a/include/configs/armadillo-800eva.h +++ b/include/configs/armadillo-800eva.h @@ -47,7 +47,6 @@ #define CONFIG_SYS_MONITOR_BASE 0x00000000 #define CONFIG_SYS_MONITOR_LEN (256 * 1024) -#define CONFIG_SYS_MALLOC_LEN (1 * 1024 * 1024) #define CONFIG_SYS_BOOTMAPSZ (8 * 1024 * 1024) /* FLASH */ diff --git a/include/configs/aspeed-common.h b/include/configs/aspeed-common.h index df0f5d2e76f..2c7790eb06c 100644 --- a/include/configs/aspeed-common.h +++ b/include/configs/aspeed-common.h @@ -32,8 +32,6 @@ #define CONFIG_SYS_INIT_SP_ADDR (SYS_INIT_RAM_END \ - GENERATED_GBL_DATA_SIZE) -#define CONFIG_SYS_MALLOC_LEN (32 << 20) - /* * NS16550 Configuration */ diff --git a/include/configs/astro_mcf5373l.h b/include/configs/astro_mcf5373l.h index 63e7e120f88..077af08c2be 100644 --- a/include/configs/astro_mcf5373l.h +++ b/include/configs/astro_mcf5373l.h @@ -232,8 +232,6 @@ #define CONFIG_SYS_MONITOR_LEN (256 << 10) #define CONFIG_SYS_BOOTPARAMS_LEN (64 * 1024) -/* Reserve 128 kB for malloc() */ -#define CONFIG_SYS_MALLOC_LEN (128 << 10) /* * For booting Linux, the board info and command line data diff --git a/include/configs/at91-sama5_common.h b/include/configs/at91-sama5_common.h index 8b8e83f4f42..9a73e3afca5 100644 --- a/include/configs/at91-sama5_common.h +++ b/include/configs/at91-sama5_common.h @@ -50,7 +50,4 @@ #endif -/* Size of malloc() pool */ -#define CONFIG_SYS_MALLOC_LEN (4 * 1024 * 1024) - #endif diff --git a/include/configs/at91sam9260ek.h b/include/configs/at91sam9260ek.h index a096d92a0e8..e7fc15f48fc 100644 --- a/include/configs/at91sam9260ek.h +++ b/include/configs/at91sam9260ek.h @@ -131,9 +131,4 @@ "fatload mmc 0:1 0x22000000 uImage; bootm" #endif -/* - * Size of malloc() pool - */ -#define CONFIG_SYS_MALLOC_LEN ROUND(3 * CONFIG_ENV_SIZE + 128*1024, 0x1000) - #endif diff --git a/include/configs/at91sam9261ek.h b/include/configs/at91sam9261ek.h index 73a439d80a2..7b9fa8af80a 100644 --- a/include/configs/at91sam9261ek.h +++ b/include/configs/at91sam9261ek.h @@ -111,9 +111,4 @@ #define CONFIG_BOOTCOMMAND "nand read 0x22000000 0x200000 0x300000; bootm" #endif -/* - * Size of malloc() pool - */ -#define CONFIG_SYS_MALLOC_LEN ROUND(3 * CONFIG_ENV_SIZE + 128*1024, 0x1000) - #endif diff --git a/include/configs/at91sam9263ek.h b/include/configs/at91sam9263ek.h index 692c52c91c5..9ad41e4ced3 100644 --- a/include/configs/at91sam9263ek.h +++ b/include/configs/at91sam9263ek.h @@ -221,9 +221,4 @@ #define CONFIG_BOOTCOMMAND "nand read 0x22000000 0x200000 0x300000; bootm" #endif -/* - * Size of malloc() pool - */ -#define CONFIG_SYS_MALLOC_LEN ROUND(3 * CONFIG_ENV_SIZE + 128*1024, 0x1000) - #endif diff --git a/include/configs/at91sam9m10g45ek.h b/include/configs/at91sam9m10g45ek.h index 309b14caf47..c942e7d9e69 100644 --- a/include/configs/at91sam9m10g45ek.h +++ b/include/configs/at91sam9m10g45ek.h @@ -80,11 +80,6 @@ "bootz 0x72000000 - 0x71000000" #endif -/* - * Size of malloc() pool - */ -#define CONFIG_SYS_MALLOC_LEN ROUND(3 * CONFIG_ENV_SIZE + 128*1024, 0x1000) - /* Defines for SPL */ #define CONFIG_SPL_MAX_SIZE 0x010000 #define CONFIG_SPL_STACK 0x310000 diff --git a/include/configs/at91sam9n12ek.h b/include/configs/at91sam9n12ek.h index 8733a5874af..683fc73d3b2 100644 --- a/include/configs/at91sam9n12ek.h +++ b/include/configs/at91sam9n12ek.h @@ -98,11 +98,6 @@ #endif -/* - * Size of malloc() pool - */ -#define CONFIG_SYS_MALLOC_LEN (4 * 1024 * 1024) - /* SPL */ #define CONFIG_SPL_MAX_SIZE 0x6000 #define CONFIG_SPL_STACK 0x308000 diff --git a/include/configs/at91sam9rlek.h b/include/configs/at91sam9rlek.h index 87f3a6b4088..cdcfb22955a 100644 --- a/include/configs/at91sam9rlek.h +++ b/include/configs/at91sam9rlek.h @@ -81,10 +81,4 @@ "fatload mmc 0:1 0x22000000 zImage; " \ "bootz 0x22000000 - 0x21000000" #endif - -/* - * Size of malloc() pool - */ -#define CONFIG_SYS_MALLOC_LEN ROUND(3 * CONFIG_ENV_SIZE + 128*1024, 0x1000) - #endif diff --git a/include/configs/at91sam9x5ek.h b/include/configs/at91sam9x5ek.h index 162d494134e..5b7634e8000 100644 --- a/include/configs/at91sam9x5ek.h +++ b/include/configs/at91sam9x5ek.h @@ -82,11 +82,6 @@ "bootm 0x22000000" #endif -/* - * Size of malloc() pool - */ -#define CONFIG_SYS_MALLOC_LEN (512 * 1024 + 0x1000) - /* SPL */ #define CONFIG_SPL_MAX_SIZE 0x6000 #define CONFIG_SPL_STACK 0x308000 diff --git a/include/configs/ax25-ae350.h b/include/configs/ax25-ae350.h index 57744298293..66594cc013d 100644 --- a/include/configs/ax25-ae350.h +++ b/include/configs/ax25-ae350.h @@ -47,12 +47,6 @@ */ #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE -/* - * Size of malloc() pool - * 512kB is suggested, (CONFIG_ENV_SIZE + 128 * 1024) was not enough - */ -#define CONFIG_SYS_MALLOC_LEN (512 << 10) - /* DT blob (fdt) address */ #define CONFIG_SYS_FDT_BASE 0x800f0000 diff --git a/include/configs/axs10x.h b/include/configs/axs10x.h index 5baf2cb451b..c02d25c03b7 100644 --- a/include/configs/axs10x.h +++ b/include/configs/axs10x.h @@ -27,7 +27,6 @@ #define CONFIG_SYS_INIT_SP_ADDR \ (CONFIG_SYS_SDRAM_BASE + 0x1000 - GENERATED_GBL_DATA_SIZE) -#define CONFIG_SYS_MALLOC_LEN SZ_2M #define CONFIG_SYS_BOOTM_LEN SZ_128M /* diff --git a/include/configs/bcm7260.h b/include/configs/bcm7260.h index f72d62ec354..d799ffd066e 100644 --- a/include/configs/bcm7260.h +++ b/include/configs/bcm7260.h @@ -15,8 +15,6 @@ #define CONFIG_SYS_TEXT_BASE 0x10100000 #define CONFIG_SYS_INIT_RAM_ADDR 0x10200000 -#define CONFIG_SYS_MALLOC_LEN ((40 * 1024) << 10) /* 40 MiB */ - #include "bcmstb.h" #define BCMSTB_TIMER_LOW 0xf0412008 diff --git a/include/configs/bcm7445.h b/include/configs/bcm7445.h index ce865cb4564..989482ef35a 100644 --- a/include/configs/bcm7445.h +++ b/include/configs/bcm7445.h @@ -15,8 +15,6 @@ #define CONFIG_SYS_TEXT_BASE 0x80100000 #define CONFIG_SYS_INIT_RAM_ADDR 0x80200000 -#define CONFIG_SYS_MALLOC_LEN ((10 * 1024) << 10) /* 10 MiB */ - #include "bcmstb.h" #define BCMSTB_TIMER_LOW 0xf0412008 diff --git a/include/configs/bcm_ns3.h b/include/configs/bcm_ns3.h index 62de1a72346..be60fe78b20 100644 --- a/include/configs/bcm_ns3.h +++ b/include/configs/bcm_ns3.h @@ -25,7 +25,6 @@ */ #define CONFIG_SYS_INIT_SP_ADDR (PHYS_SDRAM_1 + 0x80000000) /* 12MB Malloc size */ -#define CONFIG_SYS_MALLOC_LEN (SZ_8M + SZ_4M) /* console configuration */ #define CONFIG_SYS_NS16550_CLK 25000000 diff --git a/include/configs/bk4r1.h b/include/configs/bk4r1.h index b1afe0168b1..921f30612e6 100644 --- a/include/configs/bk4r1.h +++ b/include/configs/bk4r1.h @@ -63,9 +63,6 @@ /* Enable passing of ATAGs */ #define CONFIG_CMDLINE_TAG -/* Size of malloc() pool */ -#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 4 * SZ_1M) - /* NAND support */ #define CONFIG_SYS_NAND_ONFI_DETECTION #define CONFIG_SYS_MAX_NAND_DEVICE 1 diff --git a/include/configs/bmips_common.h b/include/configs/bmips_common.h index 3cb2d4050d0..0f63239e5a5 100644 --- a/include/configs/bmips_common.h +++ b/include/configs/bmips_common.h @@ -18,7 +18,6 @@ /* Memory usage */ #define CONFIG_SYS_MAXARGS 24 -#define CONFIG_SYS_MALLOC_LEN SZ_2M #define CONFIG_SYS_BOOTPARAMS_LEN SZ_128K #define CONFIG_SYS_CBSIZE SZ_512 diff --git a/include/configs/boston.h b/include/configs/boston.h index 4c7b173ea87..cd70e7bd32b 100644 --- a/include/configs/boston.h +++ b/include/configs/boston.h @@ -33,8 +33,6 @@ #define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE -#define CONFIG_SYS_MALLOC_LEN (256 * 1024) - /* * Console */ diff --git a/include/configs/broadcom_bcm963158.h b/include/configs/broadcom_bcm963158.h index ec9ac151694..6bdca174a66 100644 --- a/include/configs/broadcom_bcm963158.h +++ b/include/configs/broadcom_bcm963158.h @@ -14,7 +14,6 @@ 230400, 500000, 1500000 } /* Memory usage */ #define CONFIG_SYS_MAXARGS 24 -#define CONFIG_SYS_MALLOC_LEN (1024 * 1024) #define CONFIG_SYS_BOOTM_LEN (16 * 1024 * 1024) /* diff --git a/include/configs/broadcom_bcm968360bg.h b/include/configs/broadcom_bcm968360bg.h index 2031f7dca78..66c12675e6d 100644 --- a/include/configs/broadcom_bcm968360bg.h +++ b/include/configs/broadcom_bcm968360bg.h @@ -14,7 +14,6 @@ 230400, 500000, 1500000 } /* Memory usage */ #define CONFIG_SYS_MAXARGS 24 -#define CONFIG_SYS_MALLOC_LEN (1024 * 1024) /* * 6858 diff --git a/include/configs/broadcom_bcm968580xref.h b/include/configs/broadcom_bcm968580xref.h index 88fdb9d22cc..ba5c3d8bb4d 100644 --- a/include/configs/broadcom_bcm968580xref.h +++ b/include/configs/broadcom_bcm968580xref.h @@ -14,7 +14,6 @@ 230400, 500000, 1500000 } /* Memory usage */ #define CONFIG_SYS_MAXARGS 24 -#define CONFIG_SYS_MALLOC_LEN (1024 * 1024) /* * 6858 diff --git a/include/configs/brppt1.h b/include/configs/brppt1.h index f9a0632e543..e58026e783b 100644 --- a/include/configs/brppt1.h +++ b/include/configs/brppt1.h @@ -16,7 +16,6 @@ #include /* ------------------------------------------------------------------------- */ /* memory */ -#define CONFIG_SYS_MALLOC_LEN (5 * 1024 * 1024) #define CONFIG_SYS_BOOTM_LEN SZ_32M /* Clock Defines */ diff --git a/include/configs/brppt2.h b/include/configs/brppt2.h index 548c7dfd5cb..e892b6fd404 100644 --- a/include/configs/brppt2.h +++ b/include/configs/brppt2.h @@ -30,7 +30,6 @@ #define CONFIG_MACH_TYPE 0xFFFFFFFF /* misc */ -#define CONFIG_SYS_MALLOC_LEN (10 * 1024 * 1024) /* Environment */ diff --git a/include/configs/brsmarc1.h b/include/configs/brsmarc1.h index d0cc08baa63..404f52d900e 100644 --- a/include/configs/brsmarc1.h +++ b/include/configs/brsmarc1.h @@ -18,7 +18,6 @@ /* ------------------------------------------------------------------------- */ /* memory */ -#define CONFIG_SYS_MALLOC_LEN (5 * 1024 * 1024) #define CONFIG_SYS_BOOTM_LEN (32 * 1024 * 1024) /* Clock Defines */ diff --git a/include/configs/brxre1.h b/include/configs/brxre1.h index d6a7af1a152..cffd9a897d0 100644 --- a/include/configs/brxre1.h +++ b/include/configs/brxre1.h @@ -18,7 +18,6 @@ #define LCD_BPP LCD_COLOR32 /* memory */ -#define CONFIG_SYS_MALLOC_LEN (5 * 1024 * 1024) /* Clock Defines */ #define V_OSCK 26000000 /* Clock output from T2 */ diff --git a/include/configs/capricorn-common.h b/include/configs/capricorn-common.h index 4c76ef54b5c..59e827e320a 100644 --- a/include/configs/capricorn-common.h +++ b/include/configs/capricorn-common.h @@ -133,9 +133,6 @@ #define CONFIG_MMCROOT "/dev/mmcblk0p2" /* eMMC */ #define CONFIG_SYS_MMC_IMG_LOAD_PART 1 -/* Size of malloc() pool */ -#define CONFIG_SYS_MALLOC_LEN ((CONFIG_ENV_SIZE + (32 * 1024)) * 1024) - #define CONFIG_SYS_SDRAM_BASE 0x80000000 #define PHYS_SDRAM_1 0x80000000 #define PHYS_SDRAM_2 0x880000000 diff --git a/include/configs/cgtqmx8.h b/include/configs/cgtqmx8.h index 55b6186f882..e6564851c6d 100644 --- a/include/configs/cgtqmx8.h +++ b/include/configs/cgtqmx8.h @@ -155,9 +155,6 @@ #define CONFIG_MMCROOT "/dev/mmcblk1p2" /* USDHC2 */ #define CONFIG_SYS_FSL_USDHC_NUM 3 -/* Size of malloc() pool */ -#define CONFIG_SYS_MALLOC_LEN ((CONFIG_ENV_SIZE + (32 * 1024)) * 1024) - #define CONFIG_SYS_SDRAM_BASE 0x80000000 #define PHYS_SDRAM_1 0x80000000 #define PHYS_SDRAM_2 0x880000000 diff --git a/include/configs/ci20.h b/include/configs/ci20.h index 40230fdb6f6..1d4503ba531 100644 --- a/include/configs/ci20.h +++ b/include/configs/ci20.h @@ -16,7 +16,6 @@ /* Memory configuration */ #define CONFIG_SYS_MONITOR_LEN (512 * 1024) -#define CONFIG_SYS_MALLOC_LEN (64 * 1024 * 1024) #define CONFIG_SYS_BOOTPARAMS_LEN (128 * 1024) #define CONFIG_SYS_SDRAM_BASE 0x80000000 /* cached (KSEG0) address */ diff --git a/include/configs/cl-som-imx7.h b/include/configs/cl-som-imx7.h index e8495b387c6..7c7ddadbf5c 100644 --- a/include/configs/cl-som-imx7.h +++ b/include/configs/cl-som-imx7.h @@ -12,9 +12,6 @@ #define CONFIG_MXC_UART_BASE UART1_IPS_BASE_ADDR -/* Size of malloc() pool */ -#define CONFIG_SYS_MALLOC_LEN (32 * SZ_1M) - /* Network */ #define CONFIG_FEC_MXC #define CONFIG_FEC_XCV_TYPE RGMII diff --git a/include/configs/cm_fx6.h b/include/configs/cm_fx6.h index e569b90adb5..2e7d343858c 100644 --- a/include/configs/cm_fx6.h +++ b/include/configs/cm_fx6.h @@ -176,7 +176,6 @@ #define CONFIG_SERIAL_TAG /* misc */ -#define CONFIG_SYS_MALLOC_LEN (10 * 1024 * 1024) /* SPL */ #include "imx6_spl.h" diff --git a/include/configs/cobra5272.h b/include/configs/cobra5272.h index c68cf111406..efc6b5bd1be 100644 --- a/include/configs/cobra5272.h +++ b/include/configs/cobra5272.h @@ -214,7 +214,6 @@ enter a valid image address in flash */ #endif #define CONFIG_SYS_MONITOR_LEN 0x20000 -#define CONFIG_SYS_MALLOC_LEN (256 << 10) #define CONFIG_SYS_BOOTPARAMS_LEN 64*1024 /* diff --git a/include/configs/colibri-imx6ull.h b/include/configs/colibri-imx6ull.h index 4351bfe7d20..d95c838eeb9 100644 --- a/include/configs/colibri-imx6ull.h +++ b/include/configs/colibri-imx6ull.h @@ -15,9 +15,6 @@ #define PHYS_SDRAM_SIZE SZ_512M -/* Size of malloc() pool */ -#define CONFIG_SYS_MALLOC_LEN (32 * SZ_1M) - /* ENET1 */ #define IMX_FEC_BASE ENET2_BASE_ADDR diff --git a/include/configs/colibri-imx8x.h b/include/configs/colibri-imx8x.h index 8ad70dddc27..1c358eec320 100644 --- a/include/configs/colibri-imx8x.h +++ b/include/configs/colibri-imx8x.h @@ -114,9 +114,6 @@ #define CONFIG_SYS_BOOTM_LEN SZ_64M /* Increase max gunzip size */ -/* Size of malloc() pool */ -#define CONFIG_SYS_MALLOC_LEN ((CONFIG_ENV_SIZE + (32 * 1024)) * 1024) - #define CONFIG_SYS_SDRAM_BASE 0x80000000 #define PHYS_SDRAM_1 0x80000000 #define PHYS_SDRAM_2 0x880000000 diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h index 966aa47d732..be0ed457d60 100644 --- a/include/configs/colibri_imx6.h +++ b/include/configs/colibri_imx6.h @@ -27,9 +27,6 @@ #define CONFIG_REVISION_TAG #define CONFIG_SERIAL_TAG -/* Size of malloc() pool */ -#define CONFIG_SYS_MALLOC_LEN (32 * 1024 * 1024) - #define CONFIG_MXC_UART_BASE UART1_BASE /* MMC Configs */ diff --git a/include/configs/colibri_imx7.h b/include/configs/colibri_imx7.h index 4d9de07c84d..65093664396 100644 --- a/include/configs/colibri_imx7.h +++ b/include/configs/colibri_imx7.h @@ -13,9 +13,6 @@ #include "mx7_common.h" -/* Size of malloc() pool */ -#define CONFIG_SYS_MALLOC_LEN (32 * SZ_1M) - /* MMC Config*/ #define CONFIG_SYS_FSL_ESDHC_ADDR 0 #ifdef CONFIG_TARGET_COLIBRI_IMX7_NAND diff --git a/include/configs/colibri_pxa270.h b/include/configs/colibri_pxa270.h index eeb35ea4bee..0a91784ccf9 100644 --- a/include/configs/colibri_pxa270.h +++ b/include/configs/colibri_pxa270.h @@ -19,7 +19,6 @@ /* * Environment settings */ -#define CONFIG_SYS_MALLOC_LEN (128 * 1024) #define CONFIG_BOOTCOMMAND \ "if fatload mmc 0 0xa0000000 uImage; then " \ "bootm 0xa0000000; " \ diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h index 93e95f4ff78..f9d0d926eed 100644 --- a/include/configs/colibri_vf.h +++ b/include/configs/colibri_vf.h @@ -25,9 +25,6 @@ #define DCU_LAYER_MAX_NUM 64 #endif -/* Size of malloc() pool */ -#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 2 * SZ_1M) - /* NAND support */ #define CONFIG_SYS_NAND_ONFI_DETECTION #define CONFIG_SYS_MAX_NAND_DEVICE 1 diff --git a/include/configs/corenet_ds.h b/include/configs/corenet_ds.h index 933a4937a50..2a0a6beaf62 100644 --- a/include/configs/corenet_ds.h +++ b/include/configs/corenet_ds.h @@ -233,7 +233,6 @@ #define CONFIG_SYS_INIT_SP_OFFSET CONFIG_SYS_GBL_DATA_OFFSET #define CONFIG_SYS_MONITOR_LEN (768 * 1024) -#define CONFIG_SYS_MALLOC_LEN (1024 * 1024) /* Reserved for malloc */ /* Serial Port - controlled on board with jumper J8 * open - index 2 diff --git a/include/configs/corvus.h b/include/configs/corvus.h index 988e4f0f0bf..cb9ef6769a5 100644 --- a/include/configs/corvus.h +++ b/include/configs/corvus.h @@ -88,12 +88,6 @@ "nand read 0x70000000 0x200000 0x300000;" \ "bootm 0x70000000" -/* - * Size of malloc() pool - */ -#define CONFIG_SYS_MALLOC_LEN ROUND(3 * CONFIG_ENV_SIZE + \ - SZ_4M, 0x1000) - /* Defines for SPL */ #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 a1a86760102..ef2b4f4692c 100644 --- a/include/configs/da850evm.h +++ b/include/configs/da850evm.h @@ -30,7 +30,6 @@ /* * Memory Info */ -#define CONFIG_SYS_MALLOC_LEN (0x10000 + 1*1024*1024) /* malloc() len */ #define PHYS_SDRAM_1 DAVINCI_DDR_EMIF_DATA_BASE /* DDR Start */ #define PHYS_SDRAM_1_SIZE (64 << 20) /* SDRAM size 64MB */ #define CONFIG_MAX_RAM_BANK_SIZE (512 << 20) /* max size from SPRS586*/ diff --git a/include/configs/dart_6ul.h b/include/configs/dart_6ul.h index 79b0cd7a68a..6f861a09986 100644 --- a/include/configs/dart_6ul.h +++ b/include/configs/dart_6ul.h @@ -29,9 +29,6 @@ #endif #endif -/* Size of malloc() pool */ -#define CONFIG_SYS_MALLOC_LEN (16 * SZ_1M) - /* Environment settings */ /* Environment in SD */ diff --git a/include/configs/devkit3250.h b/include/configs/devkit3250.h index e5edb9bc0a0..4ef61e94c61 100644 --- a/include/configs/devkit3250.h +++ b/include/configs/devkit3250.h @@ -17,7 +17,6 @@ /* * Memory configurations */ -#define CONFIG_SYS_MALLOC_LEN SZ_1M #define CONFIG_SYS_SDRAM_BASE EMC_DYCS0_BASE #define CONFIG_SYS_SDRAM_SIZE SZ_64M diff --git a/include/configs/devkit8000.h b/include/configs/devkit8000.h index 87da4410f5b..9c59fd82543 100644 --- a/include/configs/devkit8000.h +++ b/include/configs/devkit8000.h @@ -36,10 +36,6 @@ #define CONFIG_REVISION_TAG 1 -/* Size of malloc() pool */ -#undef CONFIG_SYS_MALLOC_LEN -#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + (128 << 10)) - /* Hardware drivers */ /* DM9000 */ #define CONFIG_NET_RETRY_COUNT 20 diff --git a/include/configs/dh_imx6.h b/include/configs/dh_imx6.h index ca6dc8e8b3f..e31f726ca40 100644 --- a/include/configs/dh_imx6.h +++ b/include/configs/dh_imx6.h @@ -32,9 +32,6 @@ #define CONFIG_INITRD_TAG #define CONFIG_REVISION_TAG -/* Size of malloc() pool */ -#define CONFIG_SYS_MALLOC_LEN (4 * SZ_1M) - /* Bootcounter */ #define CONFIG_SYS_BOOTCOUNT_BE diff --git a/include/configs/display5.h b/include/configs/display5.h index 40bb3b53a5a..82ef8b00b41 100644 --- a/include/configs/display5.h +++ b/include/configs/display5.h @@ -52,9 +52,6 @@ #define CONFIG_INITRD_TAG #define CONFIG_REVISION_TAG -/* Size of malloc() pool */ -#define CONFIG_SYS_MALLOC_LEN (16 * 1024 * 1024) - #define CONFIG_MXC_UART_BASE UART5_BASE /* I2C Configs */ diff --git a/include/configs/dragonboard410c.h b/include/configs/dragonboard410c.h index 86ea0729535..624f611c8ba 100644 --- a/include/configs/dragonboard410c.h +++ b/include/configs/dragonboard410c.h @@ -81,9 +81,6 @@ REFLASH(dragonboard/u-boot.img, 8)\ "pxefile_addr_r=0x90100000\0"\ BOOTENV -/* Size of malloc() pool */ -#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + SZ_8M) - /* Monitor Command Prompt */ #define CONFIG_SYS_CBSIZE 512 /* Console I/O Buffer Size */ #define CONFIG_SYS_MAXARGS 64 /* max command args */ diff --git a/include/configs/dragonboard820c.h b/include/configs/dragonboard820c.h index 10252fd7144..e71dd24a034 100644 --- a/include/configs/dragonboard820c.h +++ b/include/configs/dragonboard820c.h @@ -49,9 +49,6 @@ "pxefile_addr_r=0x90100000\0"\ BOOTENV -/* Size of malloc() pool */ -#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + SZ_8M) - /* Monitor Command Prompt */ #define CONFIG_SYS_CBSIZE 512 #define CONFIG_SYS_MAXARGS 64 diff --git a/include/configs/durian.h b/include/configs/durian.h index 65cdccd6b17..1dec09b4cea 100644 --- a/include/configs/durian.h +++ b/include/configs/durian.h @@ -13,9 +13,6 @@ #define PHYS_SDRAM_1_SIZE 0x7B000000 #define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1 -/* Size of Malloc Pool */ -#define CONFIG_SYS_MALLOC_LEN (1 * 1024 * 1024 + CONFIG_ENV_SIZE) - #define CONFIG_SYS_INIT_SP_ADDR (0x88000000 - 0x100000) /* PCI CONFIG */ diff --git a/include/configs/ea-lpc3250devkitv2.h b/include/configs/ea-lpc3250devkitv2.h index 2ca0e9d990f..857cf487b34 100644 --- a/include/configs/ea-lpc3250devkitv2.h +++ b/include/configs/ea-lpc3250devkitv2.h @@ -19,7 +19,6 @@ /* * RAM */ -#define CONFIG_SYS_MALLOC_LEN SZ_4M #define CONFIG_SYS_SDRAM_BASE EMC_DYCS0_BASE /* diff --git a/include/configs/eb_cpu5282.h b/include/configs/eb_cpu5282.h index 97eedcf8016..6a5e1d3a753 100644 --- a/include/configs/eb_cpu5282.h +++ b/include/configs/eb_cpu5282.h @@ -102,7 +102,6 @@ #define CONFIG_SYS_SDRAM_SIZE CONFIG_SYS_SDRAM_SIZE0 #define CONFIG_SYS_MONITOR_LEN 0x20000 -#define CONFIG_SYS_MALLOC_LEN (4 * 1024 * 1024) #define CONFIG_SYS_BOOTPARAMS_LEN 64*1024 /* diff --git a/include/configs/edminiv2.h b/include/configs/edminiv2.h index 6bb4a87a844..ca9fd133035 100644 --- a/include/configs/edminiv2.h +++ b/include/configs/edminiv2.h @@ -160,11 +160,6 @@ * Environment variables configurations */ -/* - * Size of malloc() pool - */ -#define CONFIG_SYS_MALLOC_LEN (1024 * 256) /* 256kB for malloc() */ - /* * Other required minimal configurations */ diff --git a/include/configs/el6x_common.h b/include/configs/el6x_common.h index 220da5b80ad..3f71db3219a 100644 --- a/include/configs/el6x_common.h +++ b/include/configs/el6x_common.h @@ -14,9 +14,6 @@ #include "mx6_common.h" -/* Size of malloc() pool */ -#define CONFIG_SYS_MALLOC_LEN (10 * SZ_1M) - #ifdef CONFIG_SPL #include "imx6_spl.h" #endif diff --git a/include/configs/embestmx6boards.h b/include/configs/embestmx6boards.h index d8fa1497b00..9769155bca7 100644 --- a/include/configs/embestmx6boards.h +++ b/include/configs/embestmx6boards.h @@ -17,9 +17,6 @@ #define PHYS_SDRAM_SIZE (1u * 1024 * 1024 * 1024) -/* Size of malloc() pool */ -#define CONFIG_SYS_MALLOC_LEN (10 * SZ_1M) - /* USB Configs */ #define CONFIG_EHCI_HCD_INIT_AFTER_RESET /* For OTG port */ #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) diff --git a/include/configs/emsdp.h b/include/configs/emsdp.h index 2f60e1ff6a9..c99222df9ce 100644 --- a/include/configs/emsdp.h +++ b/include/configs/emsdp.h @@ -15,8 +15,6 @@ #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_SDRAM_BASE + SZ_1M) -#define CONFIG_SYS_MALLOC_LEN SZ_64K - /* * Environment */ diff --git a/include/configs/ethernut5.h b/include/configs/ethernut5.h index d3be77dc0cf..8f8b4722c77 100644 --- a/include/configs/ethernut5.h +++ b/include/configs/ethernut5.h @@ -33,7 +33,6 @@ /* 128MB SDRAM in 1 bank */ #define CONFIG_SYS_SDRAM_BASE 0x20000000 #define CONFIG_SYS_SDRAM_SIZE (128 << 20) -#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + (1 << 20)) /* 512kB on-chip NOR flash */ # define CONFIG_SYS_MAX_FLASH_BANKS 1 diff --git a/include/configs/exynos-common.h b/include/configs/exynos-common.h index 5dfa4e62291..9c778da7e08 100644 --- a/include/configs/exynos-common.h +++ b/include/configs/exynos-common.h @@ -26,9 +26,6 @@ #define CONFIG_CMDLINE_TAG #define CONFIG_INITRD_TAG -/* Size of malloc() pool before and after relocation */ -#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + (80 << 20)) - /* select serial console configuration */ /* PWM */ diff --git a/include/configs/exynos7420-common.h b/include/configs/exynos7420-common.h index a36b48fb0fa..4a1ecbb832c 100644 --- a/include/configs/exynos7420-common.h +++ b/include/configs/exynos7420-common.h @@ -16,9 +16,6 @@ #include /* get chip and board defs */ #include -/* Size of malloc() pool before and after relocation */ -#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + (80 << 20)) - /* Miscellaneous configurable options */ #define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */ #define CONFIG_SYS_PBSIZE 1024 /* Print Buffer Size */ diff --git a/include/configs/flea3.h b/include/configs/flea3.h index 7287a779bc7..7d877c1fd99 100644 --- a/include/configs/flea3.h +++ b/include/configs/flea3.h @@ -28,11 +28,6 @@ #define CONFIG_SETUP_MEMORY_TAGS #define CONFIG_INITRD_TAG -/* - * Size of malloc() pool - */ -#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 1024 * 1024) - /* * Hardware drivers */ diff --git a/include/configs/gardena-smart-gateway-at91sam.h b/include/configs/gardena-smart-gateway-at91sam.h index 49dfeadd481..72852a0d91f 100644 --- a/include/configs/gardena-smart-gateway-at91sam.h +++ b/include/configs/gardena-smart-gateway-at91sam.h @@ -27,8 +27,6 @@ #define CONFIG_SYS_INIT_SP_ADDR \ (CONFIG_SYS_SDRAM_BASE + 16 * 1024 - GENERATED_GBL_DATA_SIZE) -#define CONFIG_SYS_MALLOC_LEN (16 * 1024 * 1024) - /* NAND flash */ #define CONFIG_SYS_MAX_NAND_DEVICE 1 #define CONFIG_SYS_NAND_BASE 0x40000000 diff --git a/include/configs/gardena-smart-gateway-mt7688.h b/include/configs/gardena-smart-gateway-mt7688.h index 6f236549cc8..2ad08936647 100644 --- a/include/configs/gardena-smart-gateway-mt7688.h +++ b/include/configs/gardena-smart-gateway-mt7688.h @@ -41,7 +41,6 @@ /* Memory usage */ #define CONFIG_SYS_MAXARGS 64 -#define CONFIG_SYS_MALLOC_LEN (16 * 1024 * 1024) #define CONFIG_SYS_BOOTPARAMS_LEN (128 * 1024) #define CONFIG_SYS_CBSIZE 512 diff --git a/include/configs/gazerbeam.h b/include/configs/gazerbeam.h index 42912985619..12d108d6d6d 100644 --- a/include/configs/gazerbeam.h +++ b/include/configs/gazerbeam.h @@ -27,7 +27,6 @@ #define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE /* start of monitor */ #define CONFIG_SYS_MONITOR_LEN (512 * 1024) /* Reserve 512 kB for Mon */ -#define CONFIG_SYS_MALLOC_LEN (512 * 1024) /* Reserved for malloc */ /* * Initial RAM Base Address Setup diff --git a/include/configs/ge_b1x5v2.h b/include/configs/ge_b1x5v2.h index 7db6afd88c2..1a5db248002 100644 --- a/include/configs/ge_b1x5v2.h +++ b/include/configs/ge_b1x5v2.h @@ -15,9 +15,6 @@ #include "imx6_spl.h" #define CONFIG_SPL_TARGET "u-boot-with-spl.imx" -/* Size of malloc() pool */ -#define CONFIG_SYS_MALLOC_LEN (10 * SZ_1M) - /* PWM */ #define CONFIG_IMX6_PWM_PER_CLK 66000000 diff --git a/include/configs/ge_bx50v3.h b/include/configs/ge_bx50v3.h index 0c2db293136..ef672a27b7d 100644 --- a/include/configs/ge_bx50v3.h +++ b/include/configs/ge_bx50v3.h @@ -23,7 +23,6 @@ #define CONFIG_SETUP_MEMORY_TAGS #define CONFIG_INITRD_TAG #define CONFIG_REVISION_TAG -#define CONFIG_SYS_MALLOC_LEN (10 * SZ_1M) /* SATA Configs */ #ifdef CONFIG_CMD_SATA diff --git a/include/configs/grpeach.h b/include/configs/grpeach.h index c958006b227..52b4b356ac5 100644 --- a/include/configs/grpeach.h +++ b/include/configs/grpeach.h @@ -21,8 +21,6 @@ #define CONFIG_SYS_INIT_SP_ADDR \ (CONFIG_SYS_SDRAM_BASE + CONFIG_SYS_SDRAM_SIZE - 1024 * 1024) -/* Malloc */ -#define CONFIG_SYS_MALLOC_LEN (1024 * 1024) #define CONFIG_SYS_MONITOR_LEN (512 * 1024) /* Network interface */ diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h index 8f0282d95b1..dbe36989aa9 100644 --- a/include/configs/gw_ventana.h +++ b/include/configs/gw_ventana.h @@ -29,9 +29,6 @@ /* Serial ATAG */ #define CONFIG_SERIAL_TAG -/* Size of malloc() pool */ -#define CONFIG_SYS_MALLOC_LEN (10 * SZ_1M) - /* Serial */ #define CONFIG_MXC_UART_BASE UART2_BASE diff --git a/include/configs/highbank.h b/include/configs/highbank.h index 92bd6584a09..4ef3a46cfb9 100644 --- a/include/configs/highbank.h +++ b/include/configs/highbank.h @@ -12,11 +12,6 @@ #define CONFIG_SYS_TIMER_COUNTER (0xFFF34000 + 0x4) #define CONFIG_SYS_TIMER_COUNTS_DOWN -/* - * Size of malloc() pool - */ -#define CONFIG_SYS_MALLOC_LEN (512 * 1024) - #define CONFIG_PL011_CLOCK 150000000 #define CONFIG_SYS_BOOTCOUNT_LE /* Use little-endian accessors */ diff --git a/include/configs/hikey.h b/include/configs/hikey.h index 194e79ddd3f..eee342e7748 100644 --- a/include/configs/hikey.h +++ b/include/configs/hikey.h @@ -42,9 +42,6 @@ #define GICD_BASE 0xf6801000 #define GICC_BASE 0xf6802000 -/* Size of malloc() pool */ -#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + SZ_8M) - #define CONFIG_HIKEY_GPIO /* BOOTP options */ diff --git a/include/configs/hikey960.h b/include/configs/hikey960.h index 38c03e14ef5..f446ecb8647 100644 --- a/include/configs/hikey960.h +++ b/include/configs/hikey960.h @@ -31,9 +31,6 @@ #define GICD_BASE 0xe82b1000 #define GICC_BASE 0xe82b2000 -/* Size of malloc() pool */ -#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + SZ_8M) - #define BOOT_TARGET_DEVICES(func) \ func(MMC, mmc, 0) #include diff --git a/include/configs/hsdk-4xd.h b/include/configs/hsdk-4xd.h index 9d99d8d6387..21a984a53d4 100644 --- a/include/configs/hsdk-4xd.h +++ b/include/configs/hsdk-4xd.h @@ -29,7 +29,6 @@ #define CONFIG_SYS_INIT_SP_ADDR \ (CONFIG_SYS_SDRAM_BASE + 0x1000 - GENERATED_GBL_DATA_SIZE) -#define CONFIG_SYS_MALLOC_LEN SZ_2M #define CONFIG_SYS_BOOTM_LEN SZ_128M /* diff --git a/include/configs/hsdk.h b/include/configs/hsdk.h index 20d2b85ce4c..c8c28bb4f04 100644 --- a/include/configs/hsdk.h +++ b/include/configs/hsdk.h @@ -28,7 +28,6 @@ #define CONFIG_SYS_INIT_SP_ADDR \ (CONFIG_SYS_SDRAM_BASE + 0x1000 - GENERATED_GBL_DATA_SIZE) -#define CONFIG_SYS_MALLOC_LEN SZ_2M #define CONFIG_SYS_BOOTM_LEN SZ_128M /* diff --git a/include/configs/ids8313.h b/include/configs/ids8313.h index 48c642b72f0..e759db2ff2f 100644 --- a/include/configs/ids8313.h +++ b/include/configs/ids8313.h @@ -212,7 +212,6 @@ */ #define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE #define CONFIG_SYS_MONITOR_LEN (768 * 1024) -#define CONFIG_SYS_MALLOC_LEN (8 * 1024 * 1024) /* * Environment Configuration diff --git a/include/configs/imgtec_xilfpga.h b/include/configs/imgtec_xilfpga.h index 32982e2f98c..fc27ca4fe6f 100644 --- a/include/configs/imgtec_xilfpga.h +++ b/include/configs/imgtec_xilfpga.h @@ -28,7 +28,6 @@ #define CONFIG_SYS_INIT_SP_ADDR \ (CONFIG_SYS_SDRAM_BASE + CONFIG_SYS_SDRAM_SIZE - 0x1000) -#define CONFIG_SYS_MALLOC_LEN (256 << 10) #define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE /*---------------------------------------------------------------------- diff --git a/include/configs/imx27lite-common.h b/include/configs/imx27lite-common.h index c5319713269..5078d0cc438 100644 --- a/include/configs/imx27lite-common.h +++ b/include/configs/imx27lite-common.h @@ -67,8 +67,6 @@ /* * Memory Info */ -/* malloc() len */ -#define CONFIG_SYS_MALLOC_LEN (0x10000 + 512 * 1024) /* memtest start address */ #define PHYS_SDRAM_1 0xA0000000 /* DDR Start */ #define PHYS_SDRAM_1_SIZE 0x08000000 /* DDR size 128MB */ diff --git a/include/configs/imx6-engicam.h b/include/configs/imx6-engicam.h index 50ebc151082..ba938ded6be 100644 --- a/include/configs/imx6-engicam.h +++ b/include/configs/imx6-engicam.h @@ -13,9 +13,6 @@ #include #include "mx6_common.h" -/* Size of malloc() pool */ -#define CONFIG_SYS_MALLOC_LEN (16 * SZ_1M) - /* Total Size of Environment Sector */ /* Environment */ diff --git a/include/configs/imx6_logic.h b/include/configs/imx6_logic.h index cdca31e7cce..e49370305c6 100644 --- a/include/configs/imx6_logic.h +++ b/include/configs/imx6_logic.h @@ -17,9 +17,6 @@ #include "mx6_common.h" -/* Size of malloc() pool */ -#define CONFIG_SYS_MALLOC_LEN (10 * SZ_1M) - /* MMC Configs */ #define CONFIG_SYS_FSL_ESDHC_ADDR 0 #define CONFIG_SYS_FSL_USDHC_NUM 2 diff --git a/include/configs/imx6dl-mamoj.h b/include/configs/imx6dl-mamoj.h index e5af32a0131..367f78d125d 100644 --- a/include/configs/imx6dl-mamoj.h +++ b/include/configs/imx6dl-mamoj.h @@ -13,9 +13,6 @@ #include #include "mx6_common.h" -/* Size of malloc() pool */ -#define CONFIG_SYS_MALLOC_LEN (35 * SZ_1M) - /* Total Size of Environment Sector */ /* Environment */ diff --git a/include/configs/imx7-cm.h b/include/configs/imx7-cm.h index a390bff3353..270c44eb028 100644 --- a/include/configs/imx7-cm.h +++ b/include/configs/imx7-cm.h @@ -12,9 +12,6 @@ #define CONFIG_MXC_UART_BASE UART1_IPS_BASE_ADDR -/* Size of malloc() pool */ -#define CONFIG_SYS_MALLOC_LEN (32 * SZ_1M) - #define CONFIG_ETHPRIME "FEC" #undef CONFIG_SYS_AUTOLOAD diff --git a/include/configs/imx8mm-cl-iot-gate.h b/include/configs/imx8mm-cl-iot-gate.h index dac3077eaf0..9b86e0a9a07 100644 --- a/include/configs/imx8mm-cl-iot-gate.h +++ b/include/configs/imx8mm-cl-iot-gate.h @@ -150,9 +150,6 @@ #define CONFIG_MMCROOT "/dev/mmcblk1p2" /* USDHC2 */ -/* Size of malloc() pool */ -#define CONFIG_SYS_MALLOC_LEN SZ_32M - #define CONFIG_SYS_SDRAM_BASE 0x40000000 #define PHYS_SDRAM 0x40000000 #define PHYS_SDRAM_SIZE 0x80000000 /* 2GB DDR */ diff --git a/include/configs/imx8mm_beacon.h b/include/configs/imx8mm_beacon.h index 2131a01c427..2bdcc0ab725 100644 --- a/include/configs/imx8mm_beacon.h +++ b/include/configs/imx8mm_beacon.h @@ -101,9 +101,6 @@ #define CONFIG_SYS_INIT_SP_ADDR \ (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET) -/* Size of malloc() pool */ -#define CONFIG_SYS_MALLOC_LEN SZ_32M - #define CONFIG_SYS_SDRAM_BASE 0x40000000 #define PHYS_SDRAM 0x40000000 #define PHYS_SDRAM_SIZE 0x80000000 /* 2GB DDR */ diff --git a/include/configs/imx8mm_evk.h b/include/configs/imx8mm_evk.h index 117c98916f8..a03a7a72ec9 100644 --- a/include/configs/imx8mm_evk.h +++ b/include/configs/imx8mm_evk.h @@ -67,9 +67,6 @@ #define CONFIG_MMCROOT "/dev/mmcblk1p2" /* USDHC2 */ -/* Size of malloc() pool */ -#define CONFIG_SYS_MALLOC_LEN SZ_32M - #define CONFIG_SYS_SDRAM_BASE 0x40000000 #define PHYS_SDRAM 0x40000000 #define PHYS_SDRAM_SIZE 0x80000000 /* 2GB DDR */ diff --git a/include/configs/imx8mm_icore_mx8mm.h b/include/configs/imx8mm_icore_mx8mm.h index cceb932d229..4b22ba10a02 100644 --- a/include/configs/imx8mm_icore_mx8mm.h +++ b/include/configs/imx8mm_icore_mx8mm.h @@ -64,8 +64,6 @@ #define CONFIG_SYS_INIT_SP_ADDR \ (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET) -/* Size of malloc() pool */ -#define CONFIG_SYS_MALLOC_LEN SZ_32M #define CONFIG_SYS_SDRAM_BASE 0x40000000 /* SDRAM configuration */ diff --git a/include/configs/imx8mm_venice.h b/include/configs/imx8mm_venice.h index 010705e0f86..63f02bfd01e 100644 --- a/include/configs/imx8mm_venice.h +++ b/include/configs/imx8mm_venice.h @@ -85,8 +85,6 @@ #define CONFIG_SYS_INIT_SP_ADDR \ (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET) -/* Size of malloc() pool */ -#define CONFIG_SYS_MALLOC_LEN SZ_32M #define CONFIG_SYS_SDRAM_BASE 0x40000000 /* SDRAM configuration */ diff --git a/include/configs/imx8mn_beacon.h b/include/configs/imx8mn_beacon.h index 187cf8c6171..cb85c35e54b 100644 --- a/include/configs/imx8mn_beacon.h +++ b/include/configs/imx8mn_beacon.h @@ -118,9 +118,6 @@ #define CONFIG_ENV_OVERWRITE -/* Size of malloc() pool */ -#define CONFIG_SYS_MALLOC_LEN SZ_32M - #define CONFIG_SYS_SDRAM_BASE 0x40000000 #define PHYS_SDRAM 0x40000000 #if CONFIG_IS_ENABLED(IMX8MN_BEACON_2GB_LPDDR) diff --git a/include/configs/imx8mn_evk.h b/include/configs/imx8mn_evk.h index 2be4750f5f9..1e18a879877 100644 --- a/include/configs/imx8mn_evk.h +++ b/include/configs/imx8mn_evk.h @@ -66,9 +66,6 @@ #define CONFIG_MMCROOT "/dev/mmcblk1p2" /* USDHC2 */ -/* Size of malloc() pool */ -#define CONFIG_SYS_MALLOC_LEN SZ_32M - #define CONFIG_SYS_SDRAM_BASE 0x40000000 #define PHYS_SDRAM 0x40000000 #define PHYS_SDRAM_SIZE 0x80000000 /* 2GB DDR */ diff --git a/include/configs/imx8mp_evk.h b/include/configs/imx8mp_evk.h index 742e66c4ac2..6497c70314c 100644 --- a/include/configs/imx8mp_evk.h +++ b/include/configs/imx8mp_evk.h @@ -89,9 +89,6 @@ #define CONFIG_MMCROOT "/dev/mmcblk1p2" /* USDHC2 */ -/* Size of malloc() pool */ -#define CONFIG_SYS_MALLOC_LEN SZ_32M - /* Totally 6GB DDR */ #define CONFIG_SYS_SDRAM_BASE 0x40000000 #define PHYS_SDRAM 0x40000000 diff --git a/include/configs/imx8mq_cm.h b/include/configs/imx8mq_cm.h index 2f7db8e1cb1..9b786620ce3 100644 --- a/include/configs/imx8mq_cm.h +++ b/include/configs/imx8mq_cm.h @@ -75,9 +75,6 @@ #define CONFIG_MMCROOT "/dev/mmcblk1p2" /* USDHC2 */ -/* Size of malloc() pool */ -#define CONFIG_SYS_MALLOC_LEN ((CONFIG_ENV_SIZE + (2 * 1024)) * 1024) - #define CONFIG_SYS_SDRAM_BASE 0x40000000 #define PHYS_SDRAM 0x40000000 #define PHYS_SDRAM_SIZE 0x40000000 /* 1 GB DDR */ diff --git a/include/configs/imx8mq_evk.h b/include/configs/imx8mq_evk.h index 2f302ad2ce6..c61389d6b91 100644 --- a/include/configs/imx8mq_evk.h +++ b/include/configs/imx8mq_evk.h @@ -104,9 +104,6 @@ #define CONFIG_MMCROOT "/dev/mmcblk1p2" /* USDHC2 */ -/* Size of malloc() pool */ -#define CONFIG_SYS_MALLOC_LEN ((CONFIG_ENV_SIZE + (2 * 1024)) * 1024) - #define CONFIG_SYS_SDRAM_BASE 0x40000000 #define PHYS_SDRAM 0x40000000 #define PHYS_SDRAM_SIZE 0xC0000000 /* 3GB DDR */ diff --git a/include/configs/imx8mq_phanbell.h b/include/configs/imx8mq_phanbell.h index 13e75d5730c..945e2cb35b3 100644 --- a/include/configs/imx8mq_phanbell.h +++ b/include/configs/imx8mq_phanbell.h @@ -147,9 +147,6 @@ #define CONFIG_MMCROOT "/dev/mmcblk1p2" /* USDHC2 */ -/* Size of malloc() pool */ -#define CONFIG_SYS_MALLOC_LEN ((CONFIG_ENV_SIZE + (2 * 1024)) * 1024) - #define CONFIG_SYS_SDRAM_BASE 0x40000000 #define PHYS_SDRAM 0x40000000 #define PHYS_SDRAM_SIZE 0x40000000 /* 1GB DDR */ diff --git a/include/configs/imx8qm_mek.h b/include/configs/imx8qm_mek.h index d37c1263a70..c294a99b14e 100644 --- a/include/configs/imx8qm_mek.h +++ b/include/configs/imx8qm_mek.h @@ -156,9 +156,6 @@ #define CONFIG_MMCROOT "/dev/mmcblk1p2" /* USDHC2 */ #define CONFIG_SYS_FSL_USDHC_NUM 2 -/* Size of malloc() pool */ -#define CONFIG_SYS_MALLOC_LEN ((CONFIG_ENV_SIZE + (32 * 1024)) * 1024) - #define CONFIG_SYS_SDRAM_BASE 0x80000000 #define PHYS_SDRAM_1 0x80000000 #define PHYS_SDRAM_2 0x880000000 diff --git a/include/configs/imx8qm_rom7720.h b/include/configs/imx8qm_rom7720.h index 6810f50f96a..392628a1e39 100644 --- a/include/configs/imx8qm_rom7720.h +++ b/include/configs/imx8qm_rom7720.h @@ -143,9 +143,6 @@ #define CONFIG_MMCROOT "/dev/mmcblk2p2" /* USDHC3 */ #define CONFIG_SYS_FSL_USDHC_NUM 3 -/* Size of malloc() pool */ -#define CONFIG_SYS_MALLOC_LEN ((CONFIG_ENV_SIZE + (32 * 1024)) * 1024) - #define CONFIG_SYS_SDRAM_BASE 0x80000000 #define PHYS_SDRAM_1 0x80000000 #define PHYS_SDRAM_2 0x880000000 diff --git a/include/configs/imx8qxp_mek.h b/include/configs/imx8qxp_mek.h index e632aed0865..4e7532ec50a 100644 --- a/include/configs/imx8qxp_mek.h +++ b/include/configs/imx8qxp_mek.h @@ -155,9 +155,6 @@ #define CONFIG_MMCROOT "/dev/mmcblk1p2" /* USDHC2 */ #define CONFIG_SYS_FSL_USDHC_NUM 2 -/* Size of malloc() pool */ -#define CONFIG_SYS_MALLOC_LEN ((CONFIG_ENV_SIZE + (32 * 1024)) * 1024) - #define CONFIG_SYS_SDRAM_BASE 0x80000000 #define PHYS_SDRAM_1 0x80000000 #define PHYS_SDRAM_2 0x880000000 diff --git a/include/configs/imx8ulp_evk.h b/include/configs/imx8ulp_evk.h index 17fd429124d..1621b047d78 100644 --- a/include/configs/imx8ulp_evk.h +++ b/include/configs/imx8ulp_evk.h @@ -85,9 +85,6 @@ #define CONFIG_ENV_OVERWRITE #define CONFIG_MMCROOT "/dev/mmcblk2p2" -/* Size of malloc() pool */ -#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + SZ_16M) - #define CONFIG_SYS_SDRAM_BASE 0x80000000 #define PHYS_SDRAM 0x80000000 #define PHYS_SDRAM_SIZE 0x80000000 /* 2GB DDR */ diff --git a/include/configs/imxrt1020-evk.h b/include/configs/imxrt1020-evk.h index bd5b013fb8a..64c0f5eaf0b 100644 --- a/include/configs/imxrt1020-evk.h +++ b/include/configs/imxrt1020-evk.h @@ -24,7 +24,6 @@ /* * Configuration of the external SDRAM memory */ -#define CONFIG_SYS_MALLOC_LEN (1 * 1024 * 1024) /* For SPL */ #ifdef CONFIG_SUPPORT_SPL diff --git a/include/configs/imxrt1050-evk.h b/include/configs/imxrt1050-evk.h index 2c6433c4abe..1b6754299e7 100644 --- a/include/configs/imxrt1050-evk.h +++ b/include/configs/imxrt1050-evk.h @@ -35,7 +35,6 @@ /* * Configuration of the external SDRAM memory */ -#define CONFIG_SYS_MALLOC_LEN (1 * 1024 * 1024) /* For SPL */ #ifdef CONFIG_SUPPORT_SPL diff --git a/include/configs/integrator-common.h b/include/configs/integrator-common.h index 4b154476efa..cf988341263 100644 --- a/include/configs/integrator-common.h +++ b/include/configs/integrator-common.h @@ -7,7 +7,6 @@ */ #define CONFIG_SYS_TIMERBASE 0x13000100 /* Timer1 */ -#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 128*1024) /* Size of malloc() pool */ #define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */ #define CONFIG_SETUP_MEMORY_TAGS diff --git a/include/configs/iot_devkit.h b/include/configs/iot_devkit.h index 48a229c9f4f..a1b8c066228 100644 --- a/include/configs/iot_devkit.h +++ b/include/configs/iot_devkit.h @@ -57,7 +57,6 @@ #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_SDRAM_BASE + SZ_32K) -#define CONFIG_SYS_MALLOC_LEN SZ_64K #define CONFIG_SYS_BOOTM_LEN SZ_128K #define ROM_BASE CONFIG_SYS_MONITOR_BASE diff --git a/include/configs/km/km-powerpc.h b/include/configs/km/km-powerpc.h index bccf5e831e0..a9a6a41f6b7 100644 --- a/include/configs/km/km-powerpc.h +++ b/include/configs/km/km-powerpc.h @@ -12,9 +12,6 @@ /* EEprom support 24C08, 24C16, 24C64 */ #define CONFIG_SYS_EEPROM_PAGE_WRITE_ENABLE -/* Reserve 4 MB for malloc */ -#define CONFIG_SYS_MALLOC_LEN (4 * 1024 * 1024) - /* Increase max size of compressed kernel */ #define CONFIG_SYS_BOOTM_LEN 0x2000000 /* 32 MB */ diff --git a/include/configs/km/km_arm.h b/include/configs/km/km_arm.h index 82db0919bf5..19543bc2b6f 100644 --- a/include/configs/km/km_arm.h +++ b/include/configs/km/km_arm.h @@ -32,9 +32,6 @@ /* include common defines/options for all Keymile boards */ #include "keymile-common.h" -/* Reserve 4 MB for malloc */ -#define CONFIG_SYS_MALLOC_LEN (4 * 1024 * 1024) - /* Increase max size of compressed kernel */ #define CONFIG_SYS_BOOTM_LEN (32 << 20) diff --git a/include/configs/km/pg-wcom-ls102xa.h b/include/configs/km/pg-wcom-ls102xa.h index 94381ca8400..75d109a88d4 100644 --- a/include/configs/km/pg-wcom-ls102xa.h +++ b/include/configs/km/pg-wcom-ls102xa.h @@ -11,11 +11,6 @@ /* include common defines/options for all Keymile boards */ #include "keymile-common.h" -/* - * Size of malloc() pool - */ -#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 16 * 1024 * 1024) - #define CONFIG_SYS_INIT_RAM_ADDR OCRAM_BASE_ADDR #define CONFIG_SYS_INIT_RAM_SIZE OCRAM_SIZE diff --git a/include/configs/kmcent2.h b/include/configs/kmcent2.h index b221fdd622a..bf876df554f 100644 --- a/include/configs/kmcent2.h +++ b/include/configs/kmcent2.h @@ -359,8 +359,6 @@ #define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE /* start of monitor */ #define CONFIG_SYS_MONITOR_LEN 0xc0000 /* 768k */ -#define CONFIG_SYS_MALLOC_LEN (4 * 1024 * 1024) - /* * Serial Port - controlled on board with jumper J8 * open - index 2 diff --git a/include/configs/kontron_sl28.h b/include/configs/kontron_sl28.h index 21f8e416001..438a189702d 100644 --- a/include/configs/kontron_sl28.h +++ b/include/configs/kontron_sl28.h @@ -40,9 +40,6 @@ /* generic timer */ #define COUNTER_FREQUENCY 25000000 -/* size of malloc() pool */ -#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 2048 * 1024) - /* early heap for SPL DM */ #define CONFIG_MALLOC_F_ADDR CONFIG_SYS_FSL_OCRAM_BASE diff --git a/include/configs/kp_imx53.h b/include/configs/kp_imx53.h index 5d24a0523aa..c1db6eace1a 100644 --- a/include/configs/kp_imx53.h +++ b/include/configs/kp_imx53.h @@ -12,9 +12,6 @@ #define CONFIG_SYS_FSL_CLK -/* Size of malloc() pool */ -#define CONFIG_SYS_MALLOC_LEN (32 * SZ_1M) - /* USB Configs */ #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) #define CONFIG_MXC_USB_FLAGS 0 diff --git a/include/configs/kp_imx6q_tpc.h b/include/configs/kp_imx6q_tpc.h index ce81a66dc40..bbdd53ea8d1 100644 --- a/include/configs/kp_imx6q_tpc.h +++ b/include/configs/kp_imx6q_tpc.h @@ -21,9 +21,6 @@ #define CONFIG_INITRD_TAG #define CONFIG_REVISION_TAG -/* Size of malloc() pool */ -#define CONFIG_SYS_MALLOC_LEN (4 * SZ_1M) - /* FEC ethernet */ #define CONFIG_ARP_TIMEOUT 200UL diff --git a/include/configs/kzm9g.h b/include/configs/kzm9g.h index e447f527a5f..8fe3cad77a7 100644 --- a/include/configs/kzm9g.h +++ b/include/configs/kzm9g.h @@ -48,7 +48,6 @@ #define CONFIG_SYS_SDRAM_SIZE (PHYS_SDRAM_SIZE - CONFIG_SDRAM_OFFSET_FOR_RT) #define CONFIG_SYS_MONITOR_BASE (KZM_FLASH_BASE) -#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 128 * 1024) #define CONFIG_SYS_BOOTMAPSZ (8 * 1024 * 1024) #define CONFIG_STANDALONE_LOAD_ADDR 0x41000000 diff --git a/include/configs/legoev3.h b/include/configs/legoev3.h index c89a7e7e9f0..9565f7c2226 100644 --- a/include/configs/legoev3.h +++ b/include/configs/legoev3.h @@ -26,7 +26,6 @@ /* * Memory Info */ -#define CONFIG_SYS_MALLOC_LEN (0x10000 + 1*1024*1024) /* malloc() len */ #define PHYS_SDRAM_1 DAVINCI_DDR_EMIF_DATA_BASE /* DDR Start */ #define PHYS_SDRAM_1_SIZE (64 << 20) /* SDRAM size 64MB */ #define CONFIG_MAX_RAM_BANK_SIZE (512 << 20) /* max size from SPRS586*/ diff --git a/include/configs/linkit-smart-7688.h b/include/configs/linkit-smart-7688.h index 2f30f675f13..5d838f208ea 100644 --- a/include/configs/linkit-smart-7688.h +++ b/include/configs/linkit-smart-7688.h @@ -42,7 +42,6 @@ /* Memory usage */ #define CONFIG_SYS_MAXARGS 64 -#define CONFIG_SYS_MALLOC_LEN (1024 * 1024) #define CONFIG_SYS_BOOTPARAMS_LEN (128 * 1024) #define CONFIG_SYS_CBSIZE 512 diff --git a/include/configs/liteboard.h b/include/configs/liteboard.h index 041b78855d5..dc6f15a2a22 100644 --- a/include/configs/liteboard.h +++ b/include/configs/liteboard.h @@ -16,9 +16,6 @@ /* SPL options */ #include "imx6_spl.h" -/* Size of malloc() pool */ -#define CONFIG_SYS_MALLOC_LEN (16 * SZ_1M) - #define CONFIG_MXC_UART_BASE UART1_BASE /* MMC Configs */ diff --git a/include/configs/ls1012a_common.h b/include/configs/ls1012a_common.h index 142c6892242..1edea0a2b2f 100644 --- a/include/configs/ls1012a_common.h +++ b/include/configs/ls1012a_common.h @@ -29,9 +29,6 @@ /* CSU */ #define CONFIG_LAYERSCAPE_NS_ACCESS -/* Size of malloc() pool */ -#define CONFIG_SYS_MALLOC_LEN (5 * SZ_1M) - /* PFE */ #define CONFIG_SYS_FMAN_FW_ADDR 0x400d0000 #define CONFIG_SYS_QE_FMAN_FW_LENGTH 0x300000 diff --git a/include/configs/ls1021aiot.h b/include/configs/ls1021aiot.h index 0b39ad1a312..2edcb07378c 100644 --- a/include/configs/ls1021aiot.h +++ b/include/configs/ls1021aiot.h @@ -11,11 +11,6 @@ #define CONFIG_SYS_FSL_CLK -/* - * Size of malloc() pool - */ -#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 16 * 1024 * 1024) - #define CONFIG_SYS_INIT_RAM_ADDR OCRAM_BASE_ADDR #define CONFIG_SYS_INIT_RAM_SIZE OCRAM_SIZE diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h index ca4dfec5987..2f03a9d314b 100644 --- a/include/configs/ls1021aqds.h +++ b/include/configs/ls1021aqds.h @@ -13,11 +13,6 @@ #define CONFIG_DEEP_SLEEP -/* - * Size of malloc() pool - */ -#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 16 * 1024 * 1024) - #define CONFIG_SYS_INIT_RAM_ADDR OCRAM_BASE_ADDR #define CONFIG_SYS_INIT_RAM_SIZE OCRAM_SIZE diff --git a/include/configs/ls1021atsn.h b/include/configs/ls1021atsn.h index 3179c5b35cd..afac6ec91c6 100644 --- a/include/configs/ls1021atsn.h +++ b/include/configs/ls1021atsn.h @@ -12,9 +12,6 @@ #define CONFIG_DEEP_SLEEP -/* Size of malloc() pool */ -#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 16 * 1024 * 1024) - #define CONFIG_SYS_INIT_RAM_ADDR OCRAM_BASE_ADDR #define CONFIG_SYS_INIT_RAM_SIZE OCRAM_SIZE diff --git a/include/configs/ls1021atwr.h b/include/configs/ls1021atwr.h index 7d95cfe9b6d..6d225d94999 100644 --- a/include/configs/ls1021atwr.h +++ b/include/configs/ls1021atwr.h @@ -13,11 +13,6 @@ #define CONFIG_DEEP_SLEEP -/* - * Size of malloc() pool - */ -#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 16 * 1024 * 1024) - #define CONFIG_SYS_INIT_RAM_ADDR OCRAM_BASE_ADDR #define CONFIG_SYS_INIT_RAM_SIZE OCRAM_SIZE diff --git a/include/configs/ls1028a_common.h b/include/configs/ls1028a_common.h index 4d877696b90..50edefb3632 100644 --- a/include/configs/ls1028a_common.h +++ b/include/configs/ls1028a_common.h @@ -31,9 +31,6 @@ /* Generic Timer Definitions */ #define COUNTER_FREQUENCY 25000000 /* 25MHz */ -/* Size of malloc() pool */ -#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 2048 * 1024) - /* GPIO */ #ifdef CONFIG_DM_GPIO #ifndef CONFIG_MPC8XXX_GPIO diff --git a/include/configs/ls1043a_common.h b/include/configs/ls1043a_common.h index 49defe71f6c..f6909d05a04 100644 --- a/include/configs/ls1043a_common.h +++ b/include/configs/ls1043a_common.h @@ -49,9 +49,6 @@ /* Generic Timer Definitions */ #define COUNTER_FREQUENCY 25000000 /* 25MHz */ -/* Size of malloc() pool */ -#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 1024 * 1024) - /* Serial Port */ #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE 1 diff --git a/include/configs/ls1046a_common.h b/include/configs/ls1046a_common.h index 37439dfafe9..1d8adf97d3c 100644 --- a/include/configs/ls1046a_common.h +++ b/include/configs/ls1046a_common.h @@ -49,9 +49,6 @@ /* Generic Timer Definitions */ #define COUNTER_FREQUENCY 25000000 /* 25MHz */ -/* Size of malloc() pool */ -#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 1024 * 1024) - /* Serial Port */ #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE 1 diff --git a/include/configs/ls1088a_common.h b/include/configs/ls1088a_common.h index 666e5db1423..f39f0316c59 100644 --- a/include/configs/ls1088a_common.h +++ b/include/configs/ls1088a_common.h @@ -48,9 +48,6 @@ */ #define CPU_RELEASE_ADDR secondary_boot_addr -/* Size of malloc() pool */ -#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 2048 * 1024) - /* GPIO */ #ifdef CONFIG_DM_GPIO #ifndef CONFIG_MPC8XXX_GPIO diff --git a/include/configs/ls2080a_common.h b/include/configs/ls2080a_common.h index 9c929f76f8b..770f2aaf6f9 100644 --- a/include/configs/ls2080a_common.h +++ b/include/configs/ls2080a_common.h @@ -60,9 +60,6 @@ */ #define COUNTER_FREQUENCY 25000000 /* 25MHz */ -/* Size of malloc() pool */ -#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 2048 * 1024) - /* GPIO */ #ifdef CONFIG_DM_GPIO #ifndef CONFIG_MPC8XXX_GPIO diff --git a/include/configs/lx2160a_common.h b/include/configs/lx2160a_common.h index 52aca521a17..4db19e26c15 100644 --- a/include/configs/lx2160a_common.h +++ b/include/configs/lx2160a_common.h @@ -55,9 +55,6 @@ #define COUNTER_FREQUENCY 25000000 /* 25MHz */ -/* Size of malloc() pool */ -#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 2048 * 1024) - /* Serial Port */ #define CONFIG_PL01X_SERIAL #define CONFIG_PL011_CLOCK (get_bus_freq(0) / 4) diff --git a/include/configs/m53menlo.h b/include/configs/m53menlo.h index 3e053fd620a..34c8da2fcf4 100644 --- a/include/configs/m53menlo.h +++ b/include/configs/m53menlo.h @@ -24,7 +24,6 @@ #define PHYS_SDRAM_2 CSD1_BASE_ADDR #define PHYS_SDRAM_2_SIZE (gd->bd->bi_dram[1].size) #define PHYS_SDRAM_SIZE (gd->ram_size) -#define CONFIG_SYS_MALLOC_LEN (10 * 1024 * 1024) #define CONFIG_SYS_SDRAM_BASE (PHYS_SDRAM_1) #define CONFIG_SYS_INIT_RAM_ADDR (IRAM_BASE_ADDR) diff --git a/include/configs/malta.h b/include/configs/malta.h index 5f89f73be25..8ace0ccd7eb 100644 --- a/include/configs/malta.h +++ b/include/configs/malta.h @@ -38,7 +38,6 @@ #define CONFIG_SYS_INIT_SP_OFFSET 0x400000 -#define CONFIG_SYS_MALLOC_LEN (128 * 1024) #define CONFIG_SYS_BOOTPARAMS_LEN (128 * 1024) #define CONFIG_SYS_BOOTM_LEN (64 * 1024 * 1024) diff --git a/include/configs/mccmon6.h b/include/configs/mccmon6.h index 0c383e94cc0..a0803227c88 100644 --- a/include/configs/mccmon6.h +++ b/include/configs/mccmon6.h @@ -25,9 +25,6 @@ #define CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR (0x1000) #define CONFIG_SPL_FS_LOAD_KERNEL_NAME "fitImage" -/* Size of malloc() pool */ -#define CONFIG_SYS_MALLOC_LEN (10 * SZ_1M) - #define CONFIG_MXC_UART_BASE UART1_BASE /* MMC Configuration */ diff --git a/include/configs/meerkat96.h b/include/configs/meerkat96.h index f5deba33e23..ac9a75bf2de 100644 --- a/include/configs/meerkat96.h +++ b/include/configs/meerkat96.h @@ -14,9 +14,6 @@ #define PHYS_SDRAM_SIZE SZ_512M -/* Size of malloc() pool */ -#define CONFIG_SYS_MALLOC_LEN (32 * SZ_1M) - #define CONFIG_SYS_HZ 1000 /* Physical Memory Map */ diff --git a/include/configs/meesc.h b/include/configs/meesc.h index c0840b00f70..162e02fb446 100644 --- a/include/configs/meesc.h +++ b/include/configs/meesc.h @@ -97,10 +97,4 @@ #define CONFIG_SYS_CBSIZE 512 -/* - * Size of malloc() pool - */ -#define CONFIG_SYS_MALLOC_LEN ROUND(3 * CONFIG_ENV_SIZE + \ - 128*1024, 0x1000) - #endif diff --git a/include/configs/meson64.h b/include/configs/meson64.h index 865055aa31c..b779363b2b0 100644 --- a/include/configs/meson64.h +++ b/include/configs/meson64.h @@ -32,9 +32,6 @@ #define CONFIG_CPU_ARMV8 #define CONFIG_REMAKE_ELF #define CONFIG_SYS_MAXARGS 32 -#ifndef CONFIG_SYS_MALLOC_LEN -#define CONFIG_SYS_MALLOC_LEN (32 << 20) -#endif #define CONFIG_SYS_CBSIZE 1024 #define CONFIG_SYS_SDRAM_BASE 0 diff --git a/include/configs/meson64_android.h b/include/configs/meson64_android.h index 358e0a5c714..fb3ccc329a7 100644 --- a/include/configs/meson64_android.h +++ b/include/configs/meson64_android.h @@ -11,8 +11,6 @@ #include -#define CONFIG_SYS_MALLOC_LEN SZ_128M - #ifndef BOOT_PARTITION #define BOOT_PARTITION "boot" #endif diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h index 6d25b900ae6..e7882fb6078 100644 --- a/include/configs/microblaze-generic.h +++ b/include/configs/microblaze-generic.h @@ -24,8 +24,6 @@ /* setting reset address */ /*#define CONFIG_SYS_RESET_ADDRESS CONFIG_SYS_TEXT_BASE*/ -#define CONFIG_SYS_MALLOC_LEN 0xC0000 - /* Stack location before relocation */ #define CONFIG_SYS_INIT_SP_OFFSET (CONFIG_SYS_TEXT_BASE - \ CONFIG_SYS_MALLOC_F_LEN) diff --git a/include/configs/microchip_mpfs_icicle.h b/include/configs/microchip_mpfs_icicle.h index c3274bd3e87..655c8d6af5d 100644 --- a/include/configs/microchip_mpfs_icicle.h +++ b/include/configs/microchip_mpfs_icicle.h @@ -12,8 +12,6 @@ #define CONFIG_SYS_SDRAM_BASE 0x80000000 #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_SDRAM_BASE + SZ_2M) -#define CONFIG_SYS_MALLOC_LEN SZ_8M - #define CONFIG_SYS_BOOTM_LEN SZ_64M #define CONFIG_STANDALONE_LOAD_ADDR 0x80200000 diff --git a/include/configs/mt7620.h b/include/configs/mt7620.h index 98f5fb50407..b05ac0ade5b 100644 --- a/include/configs/mt7620.h +++ b/include/configs/mt7620.h @@ -13,7 +13,6 @@ #define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE -#define CONFIG_SYS_MALLOC_LEN 0x100000 #define CONFIG_SYS_BOOTPARAMS_LEN 0x20000 #define CONFIG_SYS_SDRAM_BASE 0x80000000 diff --git a/include/configs/mt7622.h b/include/configs/mt7622.h index 3bddbe7bcba..97fcf2f87bd 100644 --- a/include/configs/mt7622.h +++ b/include/configs/mt7622.h @@ -16,8 +16,6 @@ #define CONFIG_SYS_CBSIZE SZ_1K #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \ sizeof(CONFIG_SYS_PROMPT) + 16) -/* Size of malloc() pool */ -#define CONFIG_SYS_MALLOC_LEN SZ_4M #define CONFIG_SYS_NONCACHED_MEMORY SZ_1M /* Uboot definition */ diff --git a/include/configs/mt7623.h b/include/configs/mt7623.h index 70375434144..440776fcb73 100644 --- a/include/configs/mt7623.h +++ b/include/configs/mt7623.h @@ -22,8 +22,6 @@ #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \ sizeof(CONFIG_SYS_PROMPT) + 16) -/* Size of malloc() pool */ -#define CONFIG_SYS_MALLOC_LEN SZ_4M #define CONFIG_SYS_NONCACHED_MEMORY SZ_1M /* Environment */ diff --git a/include/configs/mt7628.h b/include/configs/mt7628.h index 21b24b50b7d..9e35b401b27 100644 --- a/include/configs/mt7628.h +++ b/include/configs/mt7628.h @@ -13,7 +13,6 @@ #define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE -#define CONFIG_SYS_MALLOC_LEN 0x100000 #define CONFIG_SYS_BOOTPARAMS_LEN 0x20000 #define CONFIG_SYS_SDRAM_BASE 0x80000000 diff --git a/include/configs/mt7629.h b/include/configs/mt7629.h index 17efbd8fdc2..c98d79498de 100644 --- a/include/configs/mt7629.h +++ b/include/configs/mt7629.h @@ -22,8 +22,6 @@ #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \ sizeof(CONFIG_SYS_PROMPT) + 16) -/* Size of malloc() pool */ -#define CONFIG_SYS_MALLOC_LEN SZ_4M #define CONFIG_SYS_NONCACHED_MEMORY SZ_1M /* Environment */ diff --git a/include/configs/mt8183.h b/include/configs/mt8183.h index cb11096c26a..ebd2b326ade 100644 --- a/include/configs/mt8183.h +++ b/include/configs/mt8183.h @@ -11,8 +11,6 @@ #include -#define CONFIG_SYS_MALLOC_LEN SZ_4M - #define CONFIG_CPU_ARMV8 #define COUNTER_FREQUENCY 13000000 diff --git a/include/configs/mt8512.h b/include/configs/mt8512.h index 66a88f51ca4..8882a5a4097 100644 --- a/include/configs/mt8512.h +++ b/include/configs/mt8512.h @@ -17,7 +17,6 @@ #define COUNTER_FREQUENCY 13000000 -#define CONFIG_SYS_MALLOC_LEN SZ_32M #define CONFIG_SYS_BOOTM_LEN SZ_64M /* Uboot definition */ diff --git a/include/configs/mt8516.h b/include/configs/mt8516.h index 320c18f8352..12840b883de 100644 --- a/include/configs/mt8516.h +++ b/include/configs/mt8516.h @@ -11,8 +11,6 @@ #include -#define CONFIG_SYS_MALLOC_LEN SZ_4M - #define CONFIG_CPU_ARMV8 #define COUNTER_FREQUENCY 13000000 diff --git a/include/configs/mt8518.h b/include/configs/mt8518.h index f5aa0909fa6..593c6a11d74 100644 --- a/include/configs/mt8518.h +++ b/include/configs/mt8518.h @@ -21,7 +21,6 @@ #define CONFIG_SYS_SDRAM_BASE 0x40000000 #define CONFIG_SYS_SDRAM_SIZE 0x20000000 -#define CONFIG_SYS_MALLOC_LEN SZ_32M #define CONFIG_SYS_BOOTM_LEN SZ_64M /* Uboot definition */ diff --git a/include/configs/mv-common.h b/include/configs/mv-common.h index acd99208b07..052d4b9ca57 100644 --- a/include/configs/mv-common.h +++ b/include/configs/mv-common.h @@ -52,11 +52,6 @@ #define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buff Size */ -/* - * Size of malloc() pool - */ -#define CONFIG_SYS_MALLOC_LEN (1024 * 1024 * 4) /* 4MiB for malloc() */ - /* * Other required minimal configurations */ diff --git a/include/configs/mvebu_armada-37xx.h b/include/configs/mvebu_armada-37xx.h index 31dc58d6597..3380d9efb59 100644 --- a/include/configs/mvebu_armada-37xx.h +++ b/include/configs/mvebu_armada-37xx.h @@ -36,11 +36,6 @@ #define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buff Size */ -/* - * Size of malloc() pool - */ -#define CONFIG_SYS_MALLOC_LEN (4 << 20) /* 4MiB for malloc() */ - /* * Other required minimal configurations */ diff --git a/include/configs/mvebu_armada-8k.h b/include/configs/mvebu_armada-8k.h index dcb48c090cb..b1078552263 100644 --- a/include/configs/mvebu_armada-8k.h +++ b/include/configs/mvebu_armada-8k.h @@ -30,11 +30,6 @@ #define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buff Size */ -/* - * Size of malloc() pool - */ -#define CONFIG_SYS_MALLOC_LEN (4 << 20) /* 4MiB for malloc() */ - /* * Other required minimal configurations */ diff --git a/include/configs/mx51evk.h b/include/configs/mx51evk.h index 25761fb4f1e..0022c334839 100644 --- a/include/configs/mx51evk.h +++ b/include/configs/mx51evk.h @@ -22,11 +22,6 @@ #define CONFIG_REVISION_TAG #define CONFIG_MACH_TYPE MACH_TYPE_MX51_BABBAGE -/* - * Size of malloc() pool - */ -#define CONFIG_SYS_MALLOC_LEN (10 * 1024 * 1024) - /* * Hardware drivers */ diff --git a/include/configs/mx53cx9020.h b/include/configs/mx53cx9020.h index 570131fe713..432e380cca6 100644 --- a/include/configs/mx53cx9020.h +++ b/include/configs/mx53cx9020.h @@ -20,9 +20,6 @@ #define CONFIG_SYS_FSL_CLK -/* Size of malloc() pool */ -#define CONFIG_SYS_MALLOC_LEN (32 * 1024 * 1024) - #define CONFIG_REVISION_TAG #define CONFIG_MXC_UART_BASE UART2_BASE diff --git a/include/configs/mx53loco.h b/include/configs/mx53loco.h index 5f121da50ce..479ffdf02fc 100644 --- a/include/configs/mx53loco.h +++ b/include/configs/mx53loco.h @@ -19,9 +19,6 @@ #define CONFIG_SYS_FSL_CLK -/* Size of malloc() pool */ -#define CONFIG_SYS_MALLOC_LEN (10 * 1024 * 1024) - #define CONFIG_REVISION_TAG #define CONFIG_MXC_UART_BASE UART1_BASE diff --git a/include/configs/mx53ppd.h b/include/configs/mx53ppd.h index 6e51e966169..6dd169a0701 100644 --- a/include/configs/mx53ppd.h +++ b/include/configs/mx53ppd.h @@ -17,9 +17,6 @@ #define CONFIG_SYS_FSL_CLK -/* Size of malloc() pool */ -#define CONFIG_SYS_MALLOC_LEN (10 * 1024 * 1024) - #define CONFIG_REVISION_TAG /* USB Configs */ diff --git a/include/configs/mx6cuboxi.h b/include/configs/mx6cuboxi.h index 9b80646d3b5..da2533637b0 100644 --- a/include/configs/mx6cuboxi.h +++ b/include/configs/mx6cuboxi.h @@ -13,8 +13,6 @@ #include "imx6_spl.h" -#define CONFIG_SYS_MALLOC_LEN (10 * SZ_1M) - /* MMC Configs */ #define CONFIG_SYS_FSL_ESDHC_ADDR USDHC2_BASE_ADDR diff --git a/include/configs/mx6memcal.h b/include/configs/mx6memcal.h index 120297dac86..42d5e248ba1 100644 --- a/include/configs/mx6memcal.h +++ b/include/configs/mx6memcal.h @@ -13,8 +13,6 @@ #include "mx6_common.h" #include "imx6_spl.h" -#define CONFIG_SYS_MALLOC_LEN (64 * 1024 * 1024) - #ifdef CONFIG_SERIAL_CONSOLE_UART1 #if defined(CONFIG_MX6SL) #define CONFIG_MXC_UART_BASE UART1_IPS_BASE_ADDR diff --git a/include/configs/mx6sabre_common.h b/include/configs/mx6sabre_common.h index eb153926926..51f6b3ac462 100644 --- a/include/configs/mx6sabre_common.h +++ b/include/configs/mx6sabre_common.h @@ -12,9 +12,6 @@ #include "mx6_common.h" -/* Size of malloc() pool */ -#define CONFIG_SYS_MALLOC_LEN (10 * SZ_1M) - /* MMC Configs */ #define CONFIG_SYS_FSL_ESDHC_ADDR 0 diff --git a/include/configs/mx6slevk.h b/include/configs/mx6slevk.h index 92d63ebfcb4..4bfeff11ffb 100644 --- a/include/configs/mx6slevk.h +++ b/include/configs/mx6slevk.h @@ -16,9 +16,6 @@ #define CONFIG_MACH_TYPE MACH_TYPE_MX6SL_EVK -/* Size of malloc() pool */ -#define CONFIG_SYS_MALLOC_LEN (3 * SZ_1M) - #define CONFIG_MXC_UART_BASE UART1_IPS_BASE_ADDR /* MMC Configs */ diff --git a/include/configs/mx6sllevk.h b/include/configs/mx6sllevk.h index 0befbff94db..f2bddd13bd0 100644 --- a/include/configs/mx6sllevk.h +++ b/include/configs/mx6sllevk.h @@ -10,9 +10,6 @@ #include "mx6_common.h" -/* Size of malloc() pool */ -#define CONFIG_SYS_MALLOC_LEN (16 * SZ_1M) - #define CONFIG_MXC_UART_BASE UART1_BASE #define CONFIG_EXTRA_ENV_SETTINGS \ diff --git a/include/configs/mx6sxsabreauto.h b/include/configs/mx6sxsabreauto.h index d2a589af1a8..62b8de3c1aa 100644 --- a/include/configs/mx6sxsabreauto.h +++ b/include/configs/mx6sxsabreauto.h @@ -10,9 +10,6 @@ #include "mx6_common.h" -/* Size of malloc() pool */ -#define CONFIG_SYS_MALLOC_LEN (3 * SZ_1M) - #define CONFIG_MXC_UART_BASE UART1_BASE #define CONFIG_EXTRA_ENV_SETTINGS \ diff --git a/include/configs/mx6sxsabresd.h b/include/configs/mx6sxsabresd.h index 49f709cca58..1237ddef8e3 100644 --- a/include/configs/mx6sxsabresd.h +++ b/include/configs/mx6sxsabresd.h @@ -16,9 +16,6 @@ #include "imx6_spl.h" #endif -/* Size of malloc() pool */ -#define CONFIG_SYS_MALLOC_LEN (3 * SZ_1M) - #define CONFIG_MXC_UART_BASE UART1_BASE #ifdef CONFIG_IMX_BOOTAUX diff --git a/include/configs/mx6ul_14x14_evk.h b/include/configs/mx6ul_14x14_evk.h index 2ce852a2f3e..ff2ad094a7d 100644 --- a/include/configs/mx6ul_14x14_evk.h +++ b/include/configs/mx6ul_14x14_evk.h @@ -18,9 +18,6 @@ /* SPL options */ #include "imx6_spl.h" -/* Size of malloc() pool */ -#define CONFIG_SYS_MALLOC_LEN (16 * SZ_1M) - #define CONFIG_MXC_UART_BASE UART1_BASE /* MMC Configs */ diff --git a/include/configs/mx6ullevk.h b/include/configs/mx6ullevk.h index 03dbdfcb3da..247d5e1bcc3 100644 --- a/include/configs/mx6ullevk.h +++ b/include/configs/mx6ullevk.h @@ -16,9 +16,6 @@ #define PHYS_SDRAM_SIZE SZ_512M -/* Size of malloc() pool */ -#define CONFIG_SYS_MALLOC_LEN (16 * SZ_1M) - #define CONFIG_MXC_UART_BASE UART1_BASE /* MMC Configs */ diff --git a/include/configs/mx7dsabresd.h b/include/configs/mx7dsabresd.h index ee7117f8d19..42b729b40bc 100644 --- a/include/configs/mx7dsabresd.h +++ b/include/configs/mx7dsabresd.h @@ -14,9 +14,6 @@ #define CONFIG_MXC_UART_BASE UART1_IPS_BASE_ADDR -/* Size of malloc() pool */ -#define CONFIG_SYS_MALLOC_LEN (32 * SZ_1M) - /* MMC Config*/ #define CONFIG_SYS_FSL_ESDHC_ADDR 0 diff --git a/include/configs/mx7ulp_com.h b/include/configs/mx7ulp_com.h index 52a88ad82b3..f02f3ad04d7 100644 --- a/include/configs/mx7ulp_com.h +++ b/include/configs/mx7ulp_com.h @@ -36,9 +36,6 @@ #define CONFIG_CMDLINE_TAG #define CONFIG_SETUP_MEMORY_TAGS -/* Size of malloc() pool */ -#define CONFIG_SYS_MALLOC_LEN (8 * SZ_1M) - /* UART */ #define LPUART_BASE LPUART4_RBASE diff --git a/include/configs/mx7ulp_evk.h b/include/configs/mx7ulp_evk.h index fc2f8d83b8d..edc26b0e1a0 100644 --- a/include/configs/mx7ulp_evk.h +++ b/include/configs/mx7ulp_evk.h @@ -27,9 +27,6 @@ #define CONFIG_SETUP_MEMORY_TAGS /*#define CONFIG_REVISION_TAG*/ -/* Size of malloc() pool */ -#define CONFIG_SYS_MALLOC_LEN (8 * SZ_1M) - /* UART */ #define LPUART_BASE LPUART4_RBASE diff --git a/include/configs/mxs.h b/include/configs/mxs.h index 325c3ee00ce..2348accae6d 100644 --- a/include/configs/mxs.h +++ b/include/configs/mxs.h @@ -50,7 +50,6 @@ #endif /* Memory sizes */ -#define CONFIG_SYS_MALLOC_LEN 0x00400000 /* 4 MB for malloc */ /* OCRAM at 0x0 ; 32kB on MX23 ; 128kB on MX28 */ #define CONFIG_SYS_INIT_RAM_ADDR 0x00000000 diff --git a/include/configs/mys_6ulx.h b/include/configs/mys_6ulx.h index b68ae1275f1..04c9879ccca 100644 --- a/include/configs/mys_6ulx.h +++ b/include/configs/mys_6ulx.h @@ -15,9 +15,6 @@ #define CONFIG_SYS_FSL_USDHC_NUM 1 -/* Size of malloc() pool */ -#define CONFIG_SYS_MALLOC_LEN (16 * SZ_1M) - /* Console configs */ #define CONFIG_MXC_UART_BASE UART1_BASE diff --git a/include/configs/nitrogen6x.h b/include/configs/nitrogen6x.h index 6250ce42b95..d704b82969c 100644 --- a/include/configs/nitrogen6x.h +++ b/include/configs/nitrogen6x.h @@ -13,9 +13,6 @@ #define CONFIG_MACH_TYPE 3769 -/* Size of malloc() pool */ -#define CONFIG_SYS_MALLOC_LEN (10 * 1024 * 1024) - #define CONFIG_USBD_HS #define CONFIG_MXC_UART_BASE UART2_BASE diff --git a/include/configs/nokia_rx51.h b/include/configs/nokia_rx51.h index 1cdd7d5ec40..4ff797baa69 100644 --- a/include/configs/nokia_rx51.h +++ b/include/configs/nokia_rx51.h @@ -39,12 +39,7 @@ #define CONFIG_REVISION_TAG /* enable passing revision tag*/ #define CONFIG_SETUP_MEMORY_TAGS /* enable memory tag */ -/* - * Size of malloc() pool - */ #define CONFIG_UBI_SIZE (512 << 10) -#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + CONFIG_UBI_SIZE + \ - (128 << 10)) /* * Hardware drivers diff --git a/include/configs/novena.h b/include/configs/novena.h index a866791c668..1a175f13150 100644 --- a/include/configs/novena.h +++ b/include/configs/novena.h @@ -41,8 +41,6 @@ #define CONFIG_SYS_INIT_SP_ADDR \ (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET) -#define CONFIG_SYS_MALLOC_LEN (64 * 1024 * 1024) - /* SPL */ #include "imx6_spl.h" /* common IMX6 SPL configuration */ diff --git a/include/configs/npi_imx6ull.h b/include/configs/npi_imx6ull.h index d90ecf47c1a..70e2898c145 100644 --- a/include/configs/npi_imx6ull.h +++ b/include/configs/npi_imx6ull.h @@ -15,9 +15,6 @@ #define CONFIG_SYS_FSL_USDHC_NUM 1 -/* Size of malloc() poll */ -#define CONFIG_SYS_MALLOC_LEN SZ_2M - /* Console configs */ #define CONFIG_MXC_UART_BASE UART1_BASE diff --git a/include/configs/nsim.h b/include/configs/nsim.h index 5bd097a9025..62169af676f 100644 --- a/include/configs/nsim.h +++ b/include/configs/nsim.h @@ -20,7 +20,6 @@ #define CONFIG_SYS_INIT_SP_ADDR \ (CONFIG_SYS_SDRAM_BASE + 0x1000 - GENERATED_GBL_DATA_SIZE) -#define CONFIG_SYS_MALLOC_LEN SZ_2M #define CONFIG_SYS_BOOTM_LEN SZ_32M /* diff --git a/include/configs/o4-imx6ull-nano.h b/include/configs/o4-imx6ull-nano.h index b9746b9b1c5..72515a32e16 100644 --- a/include/configs/o4-imx6ull-nano.h +++ b/include/configs/o4-imx6ull-nano.h @@ -6,7 +6,6 @@ #include "mx6_common.h" -#define CONFIG_SYS_MALLOC_LEN (10 * SZ_1M) #define PHYS_SDRAM MMDC0_ARB_BASE_ADDR #define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM #define CONFIG_SYS_INIT_RAM_ADDR IRAM_BASE_ADDR diff --git a/include/configs/octeon_common.h b/include/configs/octeon_common.h index 80bbbceedbd..23bb4f676f8 100644 --- a/include/configs/octeon_common.h +++ b/include/configs/octeon_common.h @@ -8,11 +8,9 @@ #define __OCTEON_COMMON_H__ #if defined(CONFIG_RAM_OCTEON) -#define CONFIG_SYS_MALLOC_LEN (16 << 20) #define CONFIG_SYS_INIT_SP_OFFSET 0x20100000 #else /* No DDR init -> run in L2 cache with limited resources */ -#define CONFIG_SYS_MALLOC_LEN (256 << 10) #define CONFIG_SYS_INIT_SP_OFFSET 0x00180000 #endif diff --git a/include/configs/octeontx2_common.h b/include/configs/octeontx2_common.h index 99a1b4d4cfc..5e1c0073b0b 100644 --- a/include/configs/octeontx2_common.h +++ b/include/configs/octeontx2_common.h @@ -18,9 +18,6 @@ /** Stack starting address */ #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_SDRAM_BASE + 0xffff0) -/** Heap size for U-Boot */ -#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 64 * 1024 * 1024) - #define CONFIG_LAST_STAGE_INIT /* Allow environment variable to be overwritten */ diff --git a/include/configs/octeontx_common.h b/include/configs/octeontx_common.h index 4822fd57530..3ceedef1c6e 100644 --- a/include/configs/octeontx_common.h +++ b/include/configs/octeontx_common.h @@ -44,7 +44,6 @@ #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_SDRAM_BASE + 0xffff0) /** Heap size for U-Boot */ -#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 64 * 1024 * 1024) /* Allow environment variable to be overwritten */ #define CONFIG_ENV_OVERWRITE diff --git a/include/configs/omapl138_lcdk.h b/include/configs/omapl138_lcdk.h index 22a1537f978..66bb00065fc 100644 --- a/include/configs/omapl138_lcdk.h +++ b/include/configs/omapl138_lcdk.h @@ -27,7 +27,6 @@ /* * Memory Info */ -#define CONFIG_SYS_MALLOC_LEN (0x10000 + 1*1024*1024) /* malloc() len */ #define PHYS_SDRAM_1 DAVINCI_DDR_EMIF_DATA_BASE /* DDR Start */ #define PHYS_SDRAM_1_SIZE (128 << 20) /* SDRAM size 128MB */ #define CONFIG_MAX_RAM_BANK_SIZE (512 << 20) /* max size from SPRS586*/ diff --git a/include/configs/openpiton-riscv64.h b/include/configs/openpiton-riscv64.h index 47a3a96a0a1..a24b1349751 100644 --- a/include/configs/openpiton-riscv64.h +++ b/include/configs/openpiton-riscv64.h @@ -16,7 +16,6 @@ /* Environment options */ #define CONFIG_SYS_SDRAM_BASE 0x80000000 #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_SDRAM_BASE + SZ_32M) -#define CONFIG_SYS_MALLOC_LEN SZ_256M #define CONFIG_SYS_BOOTM_LEN SZ_256M #ifdef CONFIG_SPL diff --git a/include/configs/opos6uldev.h b/include/configs/opos6uldev.h index d7ec8d00805..33bc30e39d6 100644 --- a/include/configs/opos6uldev.h +++ b/include/configs/opos6uldev.h @@ -18,9 +18,6 @@ #endif #endif -/* Size of malloc() pool */ -#define CONFIG_SYS_MALLOC_LEN (16 << 20) - /* Miscellaneous configurable options */ #define CONFIG_STANDALONE_LOAD_ADDR CONFIG_SYS_LOAD_ADDR diff --git a/include/configs/owl-common.h b/include/configs/owl-common.h index d79033be3f5..96453214eeb 100644 --- a/include/configs/owl-common.h +++ b/include/configs/owl-common.h @@ -16,8 +16,6 @@ /* Generic Timer Definitions */ #define COUNTER_FREQUENCY (24000000) /* 24MHz */ -#define CONFIG_SYS_MALLOC_LEN (32 * 1024 * 1024) - /* Some commands use this as the default load address */ /* diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h index dda71b3b7c4..49dbbf07f88 100644 --- a/include/configs/p1_p2_rdb_pc.h +++ b/include/configs/p1_p2_rdb_pc.h @@ -344,7 +344,6 @@ #define CONFIG_SYS_INIT_SP_OFFSET CONFIG_SYS_GBL_DATA_OFFSET #define CONFIG_SYS_MONITOR_LEN (768 * 1024) -#define CONFIG_SYS_MALLOC_LEN (1024 * 1024)/* Reserved for malloc */ #define CONFIG_SYS_CPLD_BASE 0xffa00000 #ifdef CONFIG_PHYS_64BIT diff --git a/include/configs/pcl063.h b/include/configs/pcl063.h index cb3441ee5b3..f29f6dc5857 100644 --- a/include/configs/pcl063.h +++ b/include/configs/pcl063.h @@ -24,9 +24,6 @@ #define CONFIG_SYS_FSL_USDHC_NUM 1 -/* Size of malloc() pool */ -#define CONFIG_SYS_MALLOC_LEN (16 * SZ_1M) - /* Console configs */ #define CONFIG_MXC_UART_BASE UART1_BASE diff --git a/include/configs/pcl063_ull.h b/include/configs/pcl063_ull.h index a1549cd0482..c1da1a01194 100644 --- a/include/configs/pcl063_ull.h +++ b/include/configs/pcl063_ull.h @@ -18,9 +18,6 @@ #define CONFIG_SYS_FSL_USDHC_NUM 2 -/* Size of malloc() pool */ -#define CONFIG_SYS_MALLOC_LEN (16 * SZ_1M) - /* Environment settings */ /* Environment in SD */ diff --git a/include/configs/pcm052.h b/include/configs/pcm052.h index 4995662db54..6b9436e2b20 100644 --- a/include/configs/pcm052.h +++ b/include/configs/pcm052.h @@ -15,9 +15,6 @@ /* Enable passing of ATAGs */ #define CONFIG_CMDLINE_TAG -/* Size of malloc() pool */ -#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 2 * SZ_1M) - /* NAND support */ #define CONFIG_SYS_NAND_ONFI_DETECTION diff --git a/include/configs/pcm058.h b/include/configs/pcm058.h index bc48e809498..3ca03774506 100644 --- a/include/configs/pcm058.h +++ b/include/configs/pcm058.h @@ -14,9 +14,6 @@ #define PHYS_SDRAM_SIZE (1u * 1024 * 1024 * 1024) -/* Size of malloc() pool */ -#define CONFIG_SYS_MALLOC_LEN (8 * SZ_1M) - /* Enable NAND support */ #define CONFIG_SYS_MAX_NAND_DEVICE 1 #define CONFIG_SYS_NAND_ONFI_DETECTION diff --git a/include/configs/phycore_imx8mm.h b/include/configs/phycore_imx8mm.h index 99e62a56f83..8d1fd153f62 100644 --- a/include/configs/phycore_imx8mm.h +++ b/include/configs/phycore_imx8mm.h @@ -92,8 +92,6 @@ #define CONFIG_MMCROOT "/dev/mmcblk2p2" /* USDHC3 */ -/* Size of malloc() pool */ -#define CONFIG_SYS_MALLOC_LEN SZ_32M #define CONFIG_SYS_SDRAM_BASE 0x40000000 #define PHYS_SDRAM SZ_1G diff --git a/include/configs/phycore_imx8mp.h b/include/configs/phycore_imx8mp.h index f3191e8eacb..3f3b175df72 100644 --- a/include/configs/phycore_imx8mp.h +++ b/include/configs/phycore_imx8mp.h @@ -92,8 +92,6 @@ #define CONFIG_MMCROOT "/dev/mmcblk2p2" /* USDHC3 */ -/* Size of malloc() pool */ -#define CONFIG_SYS_MALLOC_LEN SZ_32M #define CONFIG_SYS_SDRAM_BASE 0x40000000 #define PHYS_SDRAM 0x40000000 diff --git a/include/configs/pic32mzdask.h b/include/configs/pic32mzdask.h index a06ac83a2cd..a83e49ff3ba 100644 --- a/include/configs/pic32mzdask.h +++ b/include/configs/pic32mzdask.h @@ -28,7 +28,6 @@ /* SDRAM Configuration (for final code, data, stack, heap) */ #define CONFIG_SYS_SDRAM_BASE 0x88000000 -#define CONFIG_SYS_MALLOC_LEN (256 << 10) #define CONFIG_SYS_BOOTPARAMS_LEN (4 << 10) #define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE diff --git a/include/configs/pico-imx6.h b/include/configs/pico-imx6.h index 96191708eae..4e72caa45d7 100644 --- a/include/configs/pico-imx6.h +++ b/include/configs/pico-imx6.h @@ -24,9 +24,6 @@ #define CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR 0x1000 /* 2MB */ #endif -/* Size of malloc() pool */ -#define CONFIG_SYS_MALLOC_LEN (35 * SZ_1M) /* Increase due to DFU */ - #define CONFIG_MXC_UART_BASE UART1_BASE /* MMC Configuration */ diff --git a/include/configs/pico-imx6ul.h b/include/configs/pico-imx6ul.h index 20457e3f24a..7e36ceed3fe 100644 --- a/include/configs/pico-imx6ul.h +++ b/include/configs/pico-imx6ul.h @@ -33,9 +33,6 @@ #define CONFIG_FEC_MXC_PHYADDR 0x1 #define CONFIG_FEC_XCV_TYPE RMII -/* Size of malloc() pool */ -#define CONFIG_SYS_MALLOC_LEN (35 * SZ_1M) /* Increase due to DFU */ - #define CONFIG_MXC_UART_BASE UART6_BASE_ADDR /* MMC Configs */ diff --git a/include/configs/pico-imx7d.h b/include/configs/pico-imx7d.h index 2851263dfd6..a1cf8fc7d89 100644 --- a/include/configs/pico-imx7d.h +++ b/include/configs/pico-imx7d.h @@ -24,9 +24,6 @@ #define CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR 0x1000 /* 2MB */ #endif -/* Size of malloc() pool */ -#define CONFIG_SYS_MALLOC_LEN (32 * SZ_1M) - #define CONFIG_MXC_UART_BASE UART5_IPS_BASE_ADDR /* MMC Config */ diff --git a/include/configs/pico-imx8mq.h b/include/configs/pico-imx8mq.h index 935651d6c2c..5d066dcb78e 100644 --- a/include/configs/pico-imx8mq.h +++ b/include/configs/pico-imx8mq.h @@ -126,9 +126,6 @@ #define CONFIG_MMCROOT "/dev/mmcblk1p2" /* USDHC2 */ -/* Size of malloc() pool */ -#define CONFIG_SYS_MALLOC_LEN ((CONFIG_ENV_SIZE + (2 * 1024)) * 1024) - #define CONFIG_SYS_SDRAM_BASE 0x40000000 #define PHYS_SDRAM 0x40000000 #define PHYS_SDRAM_SIZE 0x80000000 /* 2 GiB DDR */ diff --git a/include/configs/pm9261.h b/include/configs/pm9261.h index c142cb127d6..62a2a8f6aa4 100644 --- a/include/configs/pm9261.h +++ b/include/configs/pm9261.h @@ -229,12 +229,6 @@ #error "Undefined memory device" #endif -/* - * Size of malloc() pool - */ -#define CONFIG_SYS_MALLOC_LEN \ - ROUND(3 * CONFIG_ENV_SIZE + 128 * 1024, 0x1000) - #define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_SDRAM_BASE + 16 * 1024 - \ GENERATED_GBL_DATA_SIZE) diff --git a/include/configs/pm9263.h b/include/configs/pm9263.h index ff6bc315d38..d93d23ccfc0 100644 --- a/include/configs/pm9263.h +++ b/include/configs/pm9263.h @@ -263,11 +263,6 @@ #error "Undefined memory device" #endif -/* - * Size of malloc() pool - */ -#define CONFIG_SYS_MALLOC_LEN ROUND(3 * CONFIG_ENV_SIZE + 128 * 1024, 0x1000) - #define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_SDRAM_BASE + 16 * 1024 - \ GENERATED_GBL_DATA_SIZE) diff --git a/include/configs/pm9g45.h b/include/configs/pm9g45.h index 371e72404aa..5803ab55d3f 100644 --- a/include/configs/pm9g45.h +++ b/include/configs/pm9g45.h @@ -70,12 +70,6 @@ "bootz 0x72000000 - 0x71000000" #endif -/* - * Size of malloc() pool - */ -#define CONFIG_SYS_MALLOC_LEN ROUND(3 * CONFIG_ENV_SIZE + \ - 128 * 1024, 0x1000) - /* Defines for SPL */ #define CONFIG_SPL_MAX_SIZE 0x010000 #define CONFIG_SPL_STACK 0x310000 diff --git a/include/configs/poplar.h b/include/configs/poplar.h index 5db5fc46c62..222a14bc8f8 100644 --- a/include/configs/poplar.h +++ b/include/configs/poplar.h @@ -18,7 +18,6 @@ /* SYS */ #define CONFIG_SYS_BOOTM_LEN SZ_64M #define CONFIG_SYS_INIT_SP_ADDR 0x200000 -#define CONFIG_SYS_MALLOC_LEN SZ_32M /* ATF bl33.bin load address (must match) */ diff --git a/include/configs/presidio_asic.h b/include/configs/presidio_asic.h index 692c566c44a..8606eb1ee72 100644 --- a/include/configs/presidio_asic.h +++ b/include/configs/presidio_asic.h @@ -26,9 +26,6 @@ #define GICD_BASE 0xf7011000 #define GICC_BASE 0xf7012000 -/* Size of malloc() pool */ -#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + (8 << 20)) - #define CONFIG_SYS_TIMER_BASE 0xf4321000 /* Use external clock source */ diff --git a/include/configs/qemu-arm.h b/include/configs/qemu-arm.h index 2fdbeafe498..bb4240a1284 100644 --- a/include/configs/qemu-arm.h +++ b/include/configs/qemu-arm.h @@ -14,7 +14,6 @@ /* The DTB generated by QEMU is placed at start of RAM, stay away from there */ #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_SDRAM_BASE + SZ_2M) -#define CONFIG_SYS_MALLOC_LEN SZ_16M #define CONFIG_SYS_BOOTM_LEN SZ_64M diff --git a/include/configs/qemu-ppce500.h b/include/configs/qemu-ppce500.h index d96d18133df..f79e0fea4d5 100644 --- a/include/configs/qemu-ppce500.h +++ b/include/configs/qemu-ppce500.h @@ -69,7 +69,6 @@ extern unsigned long long get_phys_ccsrbar_addr_early(void); #define CONFIG_SYS_INIT_SP_OFFSET CONFIG_SYS_GBL_DATA_OFFSET #define CONFIG_SYS_MONITOR_LEN (512 * 1024) -#define CONFIG_SYS_MALLOC_LEN (4 * 1024 * 1024) #define CONFIG_LBA48 diff --git a/include/configs/qemu-riscv.h b/include/configs/qemu-riscv.h index af53bab8359..ae57f681a53 100644 --- a/include/configs/qemu-riscv.h +++ b/include/configs/qemu-riscv.h @@ -21,8 +21,6 @@ #define CONFIG_SYS_SDRAM_BASE 0x80000000 #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_SDRAM_BASE + SZ_2M) -#define CONFIG_SYS_MALLOC_LEN SZ_8M - #define CONFIG_SYS_BOOTM_LEN SZ_64M #define CONFIG_STANDALONE_LOAD_ADDR 0x80200000 diff --git a/include/configs/r2dplus.h b/include/configs/r2dplus.h index c36dc4c4a11..36930fa3f1a 100644 --- a/include/configs/r2dplus.h +++ b/include/configs/r2dplus.h @@ -18,8 +18,6 @@ /* Address of u-boot image in Flash */ #define CONFIG_SYS_MONITOR_BASE (CONFIG_SYS_FLASH_BASE) #define CONFIG_SYS_MONITOR_LEN (256 * 1024) -/* Size of DRAM reserved for malloc() use */ -#define CONFIG_SYS_MALLOC_LEN (1024 * 1024) #define CONFIG_SYS_BOOTMAPSZ (8 * 1024 * 1024) /* diff --git a/include/configs/rcar-gen2-common.h b/include/configs/rcar-gen2-common.h index 2dedcb052d8..6bf1889140a 100644 --- a/include/configs/rcar-gen2-common.h +++ b/include/configs/rcar-gen2-common.h @@ -31,7 +31,6 @@ #define CONFIG_SYS_MONITOR_BASE 0x00000000 #define CONFIG_SYS_MONITOR_LEN (256 * 1024) -#define CONFIG_SYS_MALLOC_LEN (1 * 1024 * 1024) /* ENV setting */ diff --git a/include/configs/rcar-gen3-common.h b/include/configs/rcar-gen3-common.h index 559b4ee3acf..7c89fc15616 100644 --- a/include/configs/rcar-gen3-common.h +++ b/include/configs/rcar-gen3-common.h @@ -49,7 +49,6 @@ #define CONFIG_SYS_MONITOR_BASE 0x00000000 #define CONFIG_SYS_MONITOR_LEN (1 * 1024 * 1024) -#define CONFIG_SYS_MALLOC_LEN (64 * 1024 * 1024) #define CONFIG_SYS_BOOTM_LEN (64 << 20) /* The HF/QSPI layout permits up to 1 MiB large bootloader blob */ diff --git a/include/configs/rpi.h b/include/configs/rpi.h index 10566341be1..71b91b54e7f 100644 --- a/include/configs/rpi.h +++ b/include/configs/rpi.h @@ -50,7 +50,6 @@ #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_SDRAM_BASE + \ CONFIG_SYS_SDRAM_SIZE - \ GENERATED_GBL_DATA_SIZE) -#define CONFIG_SYS_MALLOC_LEN SZ_4M #ifdef CONFIG_ARM64 #define CONFIG_SYS_BOOTM_LEN SZ_64M diff --git a/include/configs/s5p4418_nanopi2.h b/include/configs/s5p4418_nanopi2.h index 1cacf340682..c482de122ba 100644 --- a/include/configs/s5p4418_nanopi2.h +++ b/include/configs/s5p4418_nanopi2.h @@ -60,8 +60,6 @@ */ #define CONFIG_SYS_SDRAM_SIZE (0xb0000000 - CONFIG_SYS_SDRAM_BASE) -#define CONFIG_SYS_MALLOC_LEN (32 * 1024 * 1024) - #define BMP_LOAD_ADDR 0x78000000 /* kernel load address */ diff --git a/include/configs/s5p_goni.h b/include/configs/s5p_goni.h index fef5e702e6d..85c6e065d33 100644 --- a/include/configs/s5p_goni.h +++ b/include/configs/s5p_goni.h @@ -31,9 +31,6 @@ #define CONFIG_REVISION_TAG #define CONFIG_INITRD_TAG -/* Size of malloc() pool before and after relocation */ -#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + (80 << 20)) - /* MMC */ #define SDHCI_MAX_HOSTS 4 diff --git a/include/configs/sam9x60ek.h b/include/configs/sam9x60ek.h index 472b92f1d66..7d0768fa347 100644 --- a/include/configs/sam9x60ek.h +++ b/include/configs/sam9x60ek.h @@ -75,9 +75,4 @@ "bootz 0x22000000 - 0x21000000" #endif -/* - * Size of malloc() pool - */ -#define CONFIG_SYS_MALLOC_LEN (512 * 1024 + 0x1000) - #endif diff --git a/include/configs/sama7g5ek.h b/include/configs/sama7g5ek.h index 191138cda0d..ddf4f0bb330 100644 --- a/include/configs/sama7g5ek.h +++ b/include/configs/sama7g5ek.h @@ -34,9 +34,6 @@ "bootz 0x62000000 - 0x61000000" #endif -/* Size of malloc() pool */ -#define CONFIG_SYS_MALLOC_LEN (4 * 1024 * 1024) - #define CONFIG_ARP_TIMEOUT 200 #define CONFIG_NET_RETRY_COUNT 50 diff --git a/include/configs/sandbox.h b/include/configs/sandbox.h index ebebe2b9300..24c9a84fa35 100644 --- a/include/configs/sandbox.h +++ b/include/configs/sandbox.h @@ -24,11 +24,7 @@ #define CONFIG_HOST_MAX_DEVICES 4 -/* - * Size of malloc() pool, before and after relocation - */ #define CONFIG_MALLOC_F_ADDR 0x0010000 -#define CONFIG_SYS_MALLOC_LEN (32 << 20) /* 32MB */ #define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */ diff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h index 0972767fd2c..79226865ec7 100644 --- a/include/configs/siemens-am33x-common.h +++ b/include/configs/siemens-am33x-common.h @@ -18,7 +18,6 @@ #define CONFIG_DMA_COHERENT #define CONFIG_DMA_COHERENT_SIZE (1 << 20) -#define CONFIG_SYS_MALLOC_LEN (16 * 1024 * 1024) #ifdef CONFIG_SIEMENS_MACH_TYPE #define CONFIG_MACH_TYPE CONFIG_SIEMENS_MACH_TYPE #endif diff --git a/include/configs/sifive-unleashed.h b/include/configs/sifive-unleashed.h index 4d456cef3c4..85356789eff 100644 --- a/include/configs/sifive-unleashed.h +++ b/include/configs/sifive-unleashed.h @@ -28,8 +28,6 @@ #define CONFIG_SYS_SDRAM_BASE 0x80000000 #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_SDRAM_BASE + SZ_2M) -#define CONFIG_SYS_MALLOC_LEN SZ_8M - #define CONFIG_SYS_BOOTM_LEN SZ_64M #define CONFIG_STANDALONE_LOAD_ADDR 0x80200000 diff --git a/include/configs/sifive-unmatched.h b/include/configs/sifive-unmatched.h index a51becb645d..538cce414c6 100644 --- a/include/configs/sifive-unmatched.h +++ b/include/configs/sifive-unmatched.h @@ -28,8 +28,6 @@ #define CONFIG_SYS_SDRAM_BASE 0x80000000 #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_SDRAM_BASE + SZ_2M) -#define CONFIG_SYS_MALLOC_LEN SZ_8M - #define CONFIG_SYS_BOOTM_LEN SZ_64M #define CONFIG_STANDALONE_LOAD_ADDR 0x80200000 diff --git a/include/configs/sipeed-maix.h b/include/configs/sipeed-maix.h index 34e726eb894..1f74702ea7f 100644 --- a/include/configs/sipeed-maix.h +++ b/include/configs/sipeed-maix.h @@ -10,7 +10,6 @@ /* Start just below the second bank so we don't clobber it during reloc */ #define CONFIG_SYS_INIT_SP_ADDR 0x803FFFFF -#define CONFIG_SYS_MALLOC_LEN SZ_128K #define CONFIG_SYS_SDRAM_BASE 0x80000000 #define CONFIG_SYS_SDRAM_SIZE SZ_8M diff --git a/include/configs/smartweb.h b/include/configs/smartweb.h index 63a0d6ec424..03260c33358 100644 --- a/include/configs/smartweb.h +++ b/include/configs/smartweb.h @@ -68,10 +68,6 @@ * till the beginning of the U-Boot position in RAM. */ -/* Size of malloc() pool */ -#define CONFIG_SYS_MALLOC_LEN \ - ROUND(3 * CONFIG_ENV_SIZE + (4 * SZ_1M), 0x1000) - /* NAND flash settings */ #define CONFIG_SYS_MAX_NAND_DEVICE 1 #define CONFIG_SYS_NAND_BASE ATMEL_BASE_CS3 diff --git a/include/configs/smdkc100.h b/include/configs/smdkc100.h index b400386403b..84c647957c3 100644 --- a/include/configs/smdkc100.h +++ b/include/configs/smdkc100.h @@ -33,12 +33,6 @@ #define CONFIG_CMDLINE_TAG #define CONFIG_INITRD_TAG -/* - * Size of malloc() pool - * 1MB = 0x100000, 0x100000 = 1024 * 1024 - */ -#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + (1 << 20)) - /* * select serial console configuration */ diff --git a/include/configs/smegw01.h b/include/configs/smegw01.h index 0ab2a2c1088..cf80801bd84 100644 --- a/include/configs/smegw01.h +++ b/include/configs/smegw01.h @@ -14,9 +14,6 @@ #define PHYS_SDRAM_SIZE SZ_512M -/* Size of malloc() pool */ -#define CONFIG_SYS_MALLOC_LEN (35 * SZ_1M) - /* MMC Config*/ #define CONFIG_SYS_FSL_ESDHC_ADDR 0 #define CONFIG_SYS_MMC_IMG_LOAD_PART 1 diff --git a/include/configs/snapper9260.h b/include/configs/snapper9260.h index a43103b1013..c5d2c1d889a 100644 --- a/include/configs/snapper9260.h +++ b/include/configs/snapper9260.h @@ -102,7 +102,4 @@ /* Console settings */ -/* U-Boot memory settings */ -#define CONFIG_SYS_MALLOC_LEN (1 << 20) - #endif /* __CONFIG_H */ diff --git a/include/configs/snapper9g45.h b/include/configs/snapper9g45.h index de001b3c631..9b582782c60 100644 --- a/include/configs/snapper9g45.h +++ b/include/configs/snapper9g45.h @@ -90,7 +90,4 @@ /* Console settings */ -/* U-Boot memory settings */ -#define CONFIG_SYS_MALLOC_LEN (1 << 20) - #endif /* __CONFIG_H */ diff --git a/include/configs/sniper.h b/include/configs/sniper.h index 75d44c0a2bc..267a1b851c9 100644 --- a/include/configs/sniper.h +++ b/include/configs/sniper.h @@ -37,8 +37,6 @@ #define CONFIG_SYS_INIT_SP_ADDR (NON_SECURE_SRAM_END - \ GENERATED_GBL_DATA_SIZE) -#define CONFIG_SYS_MALLOC_LEN (1024 * 1024 + CONFIG_ENV_SIZE) - /* * I2C */ diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h index c5e4292f196..91ddef67cbb 100644 --- a/include/configs/socfpga_common.h +++ b/include/configs/socfpga_common.h @@ -18,7 +18,6 @@ * Memory configurations */ #define PHYS_SDRAM_1 0x0 -#define CONFIG_SYS_MALLOC_LEN (64 * 1024 * 1024) #if defined(CONFIG_TARGET_SOCFPGA_GEN5) #define CONFIG_SYS_INIT_RAM_ADDR 0xFFFF0000 #define CONFIG_SYS_INIT_RAM_SIZE SOCFPGA_PHYS_OCRAM_SIZE diff --git a/include/configs/socfpga_soc64_common.h b/include/configs/socfpga_soc64_common.h index 387ad129b35..4a0235de8f5 100644 --- a/include/configs/socfpga_soc64_common.h +++ b/include/configs/socfpga_soc64_common.h @@ -45,7 +45,6 @@ + 0x100000) #endif #define CONFIG_SYS_INIT_SP_OFFSET (CONFIG_SYS_INIT_SP_ADDR) -#define CONFIG_SYS_MALLOC_LEN (5 * 1024 * 1024) /* * U-Boot environment configurations diff --git a/include/configs/socrates.h b/include/configs/socrates.h index 38da633d917..400cea479ef 100644 --- a/include/configs/socrates.h +++ b/include/configs/socrates.h @@ -123,7 +123,6 @@ #define CONFIG_SYS_INIT_SP_OFFSET CONFIG_SYS_GBL_DATA_OFFSET #define CONFIG_SYS_MONITOR_LEN (384 * 1024) /* Reserve 384KiB for Mon */ -#define CONFIG_SYS_MALLOC_LEN (4 << 20) /* Reserve 4 MB for malloc */ /* FPGA and NAND */ #define CONFIG_SYS_FPGA_BASE 0xc0000000 diff --git a/include/configs/somlabs_visionsom_6ull.h b/include/configs/somlabs_visionsom_6ull.h index 3f0bc2ea6ab..6af908afe6a 100644 --- a/include/configs/somlabs_visionsom_6ull.h +++ b/include/configs/somlabs_visionsom_6ull.h @@ -16,9 +16,6 @@ /* SPL options */ #include "imx6_spl.h" -/* Size of malloc() pool */ -#define CONFIG_SYS_MALLOC_LEN (16 * SZ_1M) - #define CONFIG_MXC_UART_BASE UART1_BASE /* MMC Configs */ diff --git a/include/configs/stemmy.h b/include/configs/stemmy.h index d902a0238c6..b3a17c5b4fd 100644 --- a/include/configs/stemmy.h +++ b/include/configs/stemmy.h @@ -15,8 +15,6 @@ */ #define CONFIG_SYS_INIT_SP_ADDR CONFIG_SYS_TEXT_BASE -#define CONFIG_SYS_MALLOC_LEN SZ_2M - /* FIXME: This should be loaded from device tree... */ #define CONFIG_SYS_L2_PL310 #define CONFIG_SYS_PL310_BASE 0xa0412000 diff --git a/include/configs/stih410-b2260.h b/include/configs/stih410-b2260.h index 5369bc0d47d..34a408a1033 100644 --- a/include/configs/stih410-b2260.h +++ b/include/configs/stih410-b2260.h @@ -45,8 +45,6 @@ #define CONFIG_SETUP_MEMORY_TAGS -/* Size of malloc() pool */ -#define CONFIG_SYS_MALLOC_LEN 0x1800000 #define CONFIG_SYS_GBL_DATA_SIZE 1024 /* Global data structures */ #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_TEXT_BASE - \ CONFIG_SYS_MALLOC_LEN - \ diff --git a/include/configs/stm32f429-discovery.h b/include/configs/stm32f429-discovery.h index fdc9a5a4b4f..f47932df00e 100644 --- a/include/configs/stm32f429-discovery.h +++ b/include/configs/stm32f429-discovery.h @@ -32,8 +32,6 @@ #define CONFIG_SYS_CBSIZE 1024 -#define CONFIG_SYS_MALLOC_LEN (2 << 20) - #define CONFIG_BOOTCOMMAND \ "run bootcmd_romfs" diff --git a/include/configs/stm32f429-evaluation.h b/include/configs/stm32f429-evaluation.h index 4bb0a98531a..51b2de2f21b 100644 --- a/include/configs/stm32f429-evaluation.h +++ b/include/configs/stm32f429-evaluation.h @@ -34,8 +34,6 @@ #define CONFIG_SYS_CBSIZE 1024 -#define CONFIG_SYS_MALLOC_LEN (1 * 1024 * 1024) - #define BOOT_TARGET_DEVICES(func) \ func(MMC, mmc, 0) diff --git a/include/configs/stm32f469-discovery.h b/include/configs/stm32f469-discovery.h index a069308fc25..0c4ac64c0fe 100644 --- a/include/configs/stm32f469-discovery.h +++ b/include/configs/stm32f469-discovery.h @@ -34,8 +34,6 @@ #define CONFIG_SYS_CBSIZE 1024 -#define CONFIG_SYS_MALLOC_LEN (1 * 1024 * 1024) - #define BOOT_TARGET_DEVICES(func) \ func(MMC, mmc, 0) diff --git a/include/configs/stm32f746-disco.h b/include/configs/stm32f746-disco.h index 6b527b8f031..15bc43b489f 100644 --- a/include/configs/stm32f746-disco.h +++ b/include/configs/stm32f746-disco.h @@ -36,8 +36,6 @@ #define CONFIG_SYS_CBSIZE 1024 -#define CONFIG_SYS_MALLOC_LEN (1 * 1024 * 1024) - #define BOOT_TARGET_DEVICES(func) \ func(MMC, mmc, 0) diff --git a/include/configs/stm32h743-disco.h b/include/configs/stm32h743-disco.h index 6fe2ac41567..f5620554d17 100644 --- a/include/configs/stm32h743-disco.h +++ b/include/configs/stm32h743-disco.h @@ -24,7 +24,6 @@ #define CONFIG_REVISION_TAG #define CONFIG_SYS_MAXARGS 16 -#define CONFIG_SYS_MALLOC_LEN (1 * 1024 * 1024) #define BOOT_TARGET_DEVICES(func) \ func(MMC, mmc, 0) diff --git a/include/configs/stm32h743-eval.h b/include/configs/stm32h743-eval.h index 94fa4e7ba96..d4f37a34e36 100644 --- a/include/configs/stm32h743-eval.h +++ b/include/configs/stm32h743-eval.h @@ -24,7 +24,6 @@ #define CONFIG_REVISION_TAG #define CONFIG_SYS_MAXARGS 16 -#define CONFIG_SYS_MALLOC_LEN (1 * 1024 * 1024) #define BOOT_TARGET_DEVICES(func) \ func(MMC, mmc, 0) diff --git a/include/configs/stm32h750-art-pi.h b/include/configs/stm32h750-art-pi.h index eeb11a5e633..f35a0cedabd 100644 --- a/include/configs/stm32h750-art-pi.h +++ b/include/configs/stm32h750-art-pi.h @@ -24,7 +24,6 @@ #define CONFIG_REVISION_TAG #define CONFIG_SYS_MAXARGS 16 -#define CONFIG_SYS_MALLOC_LEN (1 * 1024 * 1024) #define BOOT_TARGET_DEVICES(func) \ func(MMC, mmc, 0) diff --git a/include/configs/stmark2.h b/include/configs/stmark2.h index c73c48cef8f..5516ecfcdf5 100644 --- a/include/configs/stmark2.h +++ b/include/configs/stmark2.h @@ -110,8 +110,6 @@ #define CONFIG_SYS_BOOTPARAMS_LEN (64 * 1024) /* Reserve 256 kB for Monitor */ #define CONFIG_SYS_MONITOR_LEN (256 << 10) -/* Reserve 256 kB for malloc() */ -#define CONFIG_SYS_MALLOC_LEN (256 << 10) /* * For booting Linux, the board info and command line data diff --git a/include/configs/stv0991.h b/include/configs/stv0991.h index 250cdad2af4..d3808842bd5 100644 --- a/include/configs/stv0991.h +++ b/include/configs/stv0991.h @@ -13,8 +13,6 @@ #define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1 #define PHYS_SDRAM_1_SIZE 0x00198000 -#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 16 * 1024) - /* user interface */ #define CONFIG_SYS_CBSIZE 1024 diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h index abf1234e0b8..44612305557 100644 --- a/include/configs/sunxi-common.h +++ b/include/configs/sunxi-common.h @@ -135,14 +135,6 @@ #define CONFIG_SYS_MMC_MAX_DEVICE 4 #endif -#ifndef CONFIG_MACH_SUN8I_V3S -/* 64MB of malloc() pool */ -#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + (64 << 20)) -#else -/* 2MB of malloc() pool */ -#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + (2 << 20)) -#endif - /* * Miscellaneous configurable options */ diff --git a/include/configs/synquacer.h b/include/configs/synquacer.h index 9ce4d56e0f0..225d017d17d 100644 --- a/include/configs/synquacer.h +++ b/include/configs/synquacer.h @@ -24,7 +24,6 @@ * Boot info */ #define CONFIG_SYS_INIT_SP_ADDR (0xe0000000) /* stack of init proccess */ -#define CONFIG_SYS_MALLOC_LEN (0x01000000) /* 16Mbyte size of malloc() */ /* * Hardware drivers support diff --git a/include/configs/tam3517-common.h b/include/configs/tam3517-common.h index 518f5dae487..5fafee280b2 100644 --- a/include/configs/tam3517-common.h +++ b/include/configs/tam3517-common.h @@ -25,11 +25,6 @@ #define CONFIG_INITRD_TAG #define CONFIG_REVISION_TAG -/* - * Size of malloc() pool - */ -#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + (128 << 10) + \ - 2 * 1024 * 1024) /* * DDR related */ diff --git a/include/configs/taurus.h b/include/configs/taurus.h index 39e0159d5c4..2ae167fd42a 100644 --- a/include/configs/taurus.h +++ b/include/configs/taurus.h @@ -152,11 +152,6 @@ "upgrade_available=0\0" #endif #endif /* #ifndef CONFIG_SPL_BUILD */ -/* - * Size of malloc() pool - */ -#define CONFIG_SYS_MALLOC_LEN \ - ROUND(3 * CONFIG_ENV_SIZE + SZ_4M, 0x1000) /* Defines for SPL */ #define CONFIG_SPL_MAX_SIZE (31 * SZ_512) diff --git a/include/configs/tb100.h b/include/configs/tb100.h index 4be6e2dc76b..6e31bd5ddb6 100644 --- a/include/configs/tb100.h +++ b/include/configs/tb100.h @@ -20,7 +20,6 @@ #define CONFIG_SYS_INIT_SP_ADDR \ (CONFIG_SYS_SDRAM_BASE + 0x1000 - GENERATED_GBL_DATA_SIZE) -#define CONFIG_SYS_MALLOC_LEN SZ_128K #define CONFIG_SYS_BOOTM_LEN SZ_32M /* diff --git a/include/configs/tbs2910.h b/include/configs/tbs2910.h index a2e59ce6185..acc6e6cffc5 100644 --- a/include/configs/tbs2910.h +++ b/include/configs/tbs2910.h @@ -26,8 +26,6 @@ #define CONFIG_SYS_INIT_SP_ADDR \ (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET) -#define CONFIG_SYS_MALLOC_LEN (128 * 1024 * 1024) - #define CONFIG_SYS_BOOTMAPSZ 0x10000000 /* Serial console */ diff --git a/include/configs/tegra-common-post.h b/include/configs/tegra-common-post.h index 0155b625d44..7cb8d64e440 100644 --- a/include/configs/tegra-common-post.h +++ b/include/configs/tegra-common-post.h @@ -7,17 +7,6 @@ #ifndef __TEGRA_COMMON_POST_H #define __TEGRA_COMMON_POST_H -/* - * Size of malloc() pool - */ -#ifdef CONFIG_DFU_OVER_USB -#define CONFIG_SYS_MALLOC_LEN (SZ_4M + \ - CONFIG_SYS_DFU_DATA_BUF_SIZE + \ - CONFIG_SYS_DFU_MAX_FILE_SIZE) -#else -#define CONFIG_SYS_MALLOC_LEN (4 << 20) /* 4MB */ -#endif - #define CONFIG_SYS_NONCACHED_MEMORY (1 << 20) /* 1 MiB */ #ifndef CONFIG_SPL_BUILD diff --git a/include/configs/thunderx_88xx.h b/include/configs/thunderx_88xx.h index 1692c6da060..1ce03473002 100644 --- a/include/configs/thunderx_88xx.h +++ b/include/configs/thunderx_88xx.h @@ -25,9 +25,6 @@ /* Generic Timer Definitions */ #define COUNTER_FREQUENCY (0x1800000) /* 24MHz */ -/* Size of malloc() pool */ -#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 1024 * 1024) - /* PL011 Serial Configuration */ #define CONFIG_PL011_CLOCK 24000000 diff --git a/include/configs/ti814x_evm.h b/include/configs/ti814x_evm.h index 5fbbfcaf5b2..20848a6b19f 100644 --- a/include/configs/ti814x_evm.h +++ b/include/configs/ti814x_evm.h @@ -18,7 +18,6 @@ #include -#define CONFIG_SYS_MALLOC_LEN (1024 << 10) #define CONFIG_MACH_TYPE MACH_TYPE_TI8148EVM #define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */ diff --git a/include/configs/ti_armv7_common.h b/include/configs/ti_armv7_common.h index ddc82e4d7bc..a6b724e889c 100644 --- a/include/configs/ti_armv7_common.h +++ b/include/configs/ti_armv7_common.h @@ -89,7 +89,6 @@ * we are on so we do not need to rely on the command prompt. We set a * console baudrate of 115200 and use the default baud rate table. */ -#define CONFIG_SYS_MALLOC_LEN SZ_32M /* As stated above, the following choices are optional. */ diff --git a/include/configs/total_compute.h b/include/configs/total_compute.h index 79b733ac4cf..bbeedaf841d 100644 --- a/include/configs/total_compute.h +++ b/include/configs/total_compute.h @@ -18,9 +18,6 @@ #define UART0_BASE 0x7ff80000 -/* Size of malloc() pool */ -#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + (8 << 20)) - /* PL011 Serial Configuration */ #define CONFIG_PL011_CLOCK 7372800 diff --git a/include/configs/tplink_wdr4300.h b/include/configs/tplink_wdr4300.h index a4b45500010..32689e1aecf 100644 --- a/include/configs/tplink_wdr4300.h +++ b/include/configs/tplink_wdr4300.h @@ -12,7 +12,6 @@ #define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE -#define CONFIG_SYS_MALLOC_LEN 0x40000 #define CONFIG_SYS_BOOTPARAMS_LEN 0x20000 #define CONFIG_SYS_SDRAM_BASE 0xa0000000 diff --git a/include/configs/tqma6.h b/include/configs/tqma6.h index 1bb0b84eba9..97113b03432 100644 --- a/include/configs/tqma6.h +++ b/include/configs/tqma6.h @@ -62,9 +62,6 @@ #define CONFIG_ARP_TIMEOUT 200UL -/* Size of malloc() pool */ -#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 2 * SZ_1M) - #if defined(CONFIG_TQMA6X_MMC_BOOT) #define TQMA6_UBOOT_OFFSET SZ_1K diff --git a/include/configs/turris_mox.h b/include/configs/turris_mox.h index 875c192601c..2990b529c00 100644 --- a/include/configs/turris_mox.h +++ b/include/configs/turris_mox.h @@ -41,11 +41,6 @@ #define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buff Size */ -/* - * Size of malloc() pool - */ -#define CONFIG_SYS_MALLOC_LEN (4 << 20) /* 4MiB for malloc() */ - /* * Other required minimal configurations */ diff --git a/include/configs/udoo.h b/include/configs/udoo.h index ed8f31b921a..14b532502b7 100644 --- a/include/configs/udoo.h +++ b/include/configs/udoo.h @@ -15,9 +15,6 @@ /* Provide the MACH_TYPE value that the vendor kernel requires. */ #define CONFIG_MACH_TYPE 4800 -/* Size of malloc() pool */ -#define CONFIG_SYS_MALLOC_LEN (2 * SZ_1M) - #define CONFIG_MXC_UART_BASE UART2_BASE /* SATA Configs */ diff --git a/include/configs/udoo_neo.h b/include/configs/udoo_neo.h index a4b8514c4e6..cf47e3fbe94 100644 --- a/include/configs/udoo_neo.h +++ b/include/configs/udoo_neo.h @@ -14,9 +14,6 @@ #include "imx6_spl.h" -/* Size of malloc() pool */ -#define CONFIG_SYS_MALLOC_LEN (3 * SZ_1M) - /* MMC Configuration */ #define CONFIG_SYS_FSL_ESDHC_ADDR USDHC2_BASE_ADDR diff --git a/include/configs/uniphier.h b/include/configs/uniphier.h index 42a5029da20..d419db1fa4b 100644 --- a/include/configs/uniphier.h +++ b/include/configs/uniphier.h @@ -39,8 +39,6 @@ #define BOOTENV #endif -#define CONFIG_SYS_MALLOC_LEN (4 * 1024 * 1024) - #define CONFIG_TIMESTAMP #define CONFIG_SYS_MONITOR_BASE 0 diff --git a/include/configs/usb_a9263.h b/include/configs/usb_a9263.h index f61a5e1b1a2..c9c72c94ce2 100644 --- a/include/configs/usb_a9263.h +++ b/include/configs/usb_a9263.h @@ -74,9 +74,4 @@ #define CONFIG_EXTRA_ENV_SETTINGS \ "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0" \ -/* - * Size of malloc() pool - */ -#define CONFIG_SYS_MALLOC_LEN ROUND(3 * CONFIG_ENV_SIZE + 128*1024, 0x1000) - #endif diff --git a/include/configs/usbarmory.h b/include/configs/usbarmory.h index 5acdfe29de7..6f5a1c89e82 100644 --- a/include/configs/usbarmory.h +++ b/include/configs/usbarmory.h @@ -79,6 +79,4 @@ #define CONFIG_SYS_INIT_SP_ADDR \ (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET) -#define CONFIG_SYS_MALLOC_LEN (10 * 1024 * 1024) - #endif /* __CONFIG_H */ diff --git a/include/configs/vcoreiii.h b/include/configs/vcoreiii.h index 6b5ca71128b..3b86309b13c 100644 --- a/include/configs/vcoreiii.h +++ b/include/configs/vcoreiii.h @@ -10,7 +10,6 @@ /* Onboard devices */ -#define CONFIG_SYS_MALLOC_LEN 0x1F0000 #define CONFIG_SYS_INIT_SP_OFFSET 0x400000 #if defined(CONFIG_SOC_LUTON) || defined(CONFIG_SOC_SERVAL) diff --git a/include/configs/verdin-imx8mm.h b/include/configs/verdin-imx8mm.h index 6601cedd2be..0f9ec664f37 100644 --- a/include/configs/verdin-imx8mm.h +++ b/include/configs/verdin-imx8mm.h @@ -85,8 +85,6 @@ /* Environment in eMMC, before config block at the end of 1st "boot sector" */ #endif -/* Size of malloc() pool */ -#define CONFIG_SYS_MALLOC_LEN SZ_32M #define CONFIG_SYS_SDRAM_BASE 0x40000000 /* SDRAM configuration */ diff --git a/include/configs/vexpress_aemv8a.h b/include/configs/vexpress_aemv8a.h index 6b7b69da99d..df22584d9ab 100644 --- a/include/configs/vexpress_aemv8a.h +++ b/include/configs/vexpress_aemv8a.h @@ -85,9 +85,6 @@ #endif #endif /* !CONFIG_GICV3 */ -/* Size of malloc() pool */ -#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + (8 << 20)) - #ifndef CONFIG_TARGET_VEXPRESS64_JUNO /* The Vexpress64 simulators use SMSC91C111 */ #define CONFIG_SMC91111 1 diff --git a/include/configs/vexpress_common.h b/include/configs/vexpress_common.h index 4c2c6aa4893..d7d98cd03f8 100644 --- a/include/configs/vexpress_common.h +++ b/include/configs/vexpress_common.h @@ -115,9 +115,6 @@ #define CONFIG_SYS_L2CACHE_OFF 1 #define CONFIG_INITRD_TAG 1 -/* Size of malloc() pool */ -#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 512 * 1024) /* >= 512 KiB */ - #define SCTL_BASE V2M_SYSCTL #define VEXPRESS_FLASHPROG_FLVPPEN (1 << 0) diff --git a/include/configs/vf610twr.h b/include/configs/vf610twr.h index 2b6c27a42d3..b005db8278e 100644 --- a/include/configs/vf610twr.h +++ b/include/configs/vf610twr.h @@ -18,9 +18,6 @@ /* Enable passing of ATAGs */ #define CONFIG_CMDLINE_TAG -/* Size of malloc() pool */ -#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 2 * 1024 * 1024) - /* NAND support */ #define CONFIG_SYS_NAND_ONFI_DETECTION diff --git a/include/configs/vining_2000.h b/include/configs/vining_2000.h index db5f5cfacce..ade0537f871 100644 --- a/include/configs/vining_2000.h +++ b/include/configs/vining_2000.h @@ -14,9 +14,6 @@ #include "imx6_spl.h" #endif -/* Size of malloc() pool */ -#define CONFIG_SYS_MALLOC_LEN (3 * SZ_1M) - #define BOOT_TARGET_DEVICES(func) \ func(MMC, mmc, 0) \ func(MMC, mmc, 1) \ diff --git a/include/configs/vocore2.h b/include/configs/vocore2.h index a0046b87673..58888d4caf0 100644 --- a/include/configs/vocore2.h +++ b/include/configs/vocore2.h @@ -36,7 +36,6 @@ /* Memory usage */ #define CONFIG_SYS_MAXARGS 64 -#define CONFIG_SYS_MALLOC_LEN (16 * 1024 * 1024) #define CONFIG_SYS_BOOTPARAMS_LEN (128 * 1024) #define CONFIG_SYS_CBSIZE 512 diff --git a/include/configs/wandboard.h b/include/configs/wandboard.h index 95a15cb2df0..f9226888c27 100644 --- a/include/configs/wandboard.h +++ b/include/configs/wandboard.h @@ -14,9 +14,6 @@ #define CONFIG_MACH_TYPE MACH_TYPE_WANDBOARD_IMX6 -/* Size of malloc() pool */ -#define CONFIG_SYS_MALLOC_LEN (10 * SZ_1M) - #define CONFIG_MXC_UART_BASE UART1_BASE /* SATA Configs */ diff --git a/include/configs/warp.h b/include/configs/warp.h index b34f0a53c76..d3921dabf6a 100644 --- a/include/configs/warp.h +++ b/include/configs/warp.h @@ -14,9 +14,6 @@ #include "mx6_common.h" -/* Size of malloc() pool */ -#define CONFIG_SYS_MALLOC_LEN (35 * SZ_1M) /* Increase due to DFU */ - #define CONFIG_MXC_UART_BASE UART1_IPS_BASE_ADDR /* MMC Configs */ diff --git a/include/configs/warp7.h b/include/configs/warp7.h index c5e3c4dae32..bb9ba373eb4 100644 --- a/include/configs/warp7.h +++ b/include/configs/warp7.h @@ -13,9 +13,6 @@ #define PHYS_SDRAM_SIZE SZ_512M -/* Size of malloc() pool */ -#define CONFIG_SYS_MALLOC_LEN (35 * SZ_1M) - /* MMC Config*/ #define CONFIG_SYS_FSL_ESDHC_ADDR USDHC3_BASE_ADDR #define CONFIG_SYS_FSL_ESDHC_HAS_DDR_MODE diff --git a/include/configs/work_92105.h b/include/configs/work_92105.h index 0179b0d63de..aa307be06ac 100644 --- a/include/configs/work_92105.h +++ b/include/configs/work_92105.h @@ -22,7 +22,6 @@ /* * Memory configurations */ -#define CONFIG_SYS_MALLOC_LEN SZ_1M #define CONFIG_SYS_SDRAM_BASE EMC_DYCS0_BASE #define CONFIG_SYS_SDRAM_SIZE SZ_128M diff --git a/include/configs/x530.h b/include/configs/x530.h index 4481b1d55a9..1e5d7381052 100644 --- a/include/configs/x530.h +++ b/include/configs/x530.h @@ -61,8 +61,6 @@ /* NAND */ #define CONFIG_SYS_NAND_ONFI_DETECTION -#define CONFIG_SYS_MALLOC_LEN (4 << 20) - #include /* diff --git a/include/configs/x86-common.h b/include/configs/x86-common.h index 3f9e80e5311..4b39faababd 100644 --- a/include/configs/x86-common.h +++ b/include/configs/x86-common.h @@ -59,7 +59,6 @@ #define CONFIG_SYS_STACK_SIZE (32 * 1024) #define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE -#define CONFIG_SYS_MALLOC_LEN 0x200000 /*----------------------------------------------------------------------- * Environment configuration diff --git a/include/configs/xenguest_arm64.h b/include/configs/xenguest_arm64.h index 380084f4ece..c5e3d1678d0 100644 --- a/include/configs/xenguest_arm64.h +++ b/include/configs/xenguest_arm64.h @@ -22,9 +22,6 @@ */ #define CONFIG_LNX_KRNL_IMG_TEXT_OFFSET_BASE CONFIG_SYS_LOAD_ADDR -/* Size of malloc() pool */ -#define CONFIG_SYS_MALLOC_LEN (32 * 1024 * 1024) - /* Monitor Command Prompt */ #define CONFIG_SYS_CBSIZE 1024 #define CONFIG_SYS_MAXARGS 64 diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h index 6864a101b85..251a6c9d8e2 100644 --- a/include/configs/xilinx_zynqmp.h +++ b/include/configs/xilinx_zynqmp.h @@ -25,9 +25,6 @@ # define COUNTER_FREQUENCY 100000000 #endif -/* Size of malloc() pool */ -#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 0x4000000) - /* Serial setup */ #define CONFIG_CPU_ARMV8 diff --git a/include/configs/xilinx_zynqmp_mini.h b/include/configs/xilinx_zynqmp_mini.h index ef9c768e48e..c1064431d24 100644 --- a/include/configs/xilinx_zynqmp_mini.h +++ b/include/configs/xilinx_zynqmp_mini.h @@ -17,7 +17,6 @@ /* Undef unneeded configs */ #undef CONFIG_BOOTCOMMAND #undef CONFIG_EXTRA_ENV_SETTINGS -#undef CONFIG_SYS_MALLOC_LEN #undef CONFIG_SYS_INIT_SP_ADDR /* BOOTP options */ diff --git a/include/configs/xilinx_zynqmp_mini_emmc.h b/include/configs/xilinx_zynqmp_mini_emmc.h index a7ae30d4d70..57c40d61020 100644 --- a/include/configs/xilinx_zynqmp_mini_emmc.h +++ b/include/configs/xilinx_zynqmp_mini_emmc.h @@ -13,6 +13,5 @@ #include #define CONFIG_SYS_INIT_SP_ADDR CONFIG_SYS_TEXT_BASE -#define CONFIG_SYS_MALLOC_LEN 0x800000 #endif /* __CONFIG_ZYNQMP_MINI_EMMC_H */ diff --git a/include/configs/xilinx_zynqmp_mini_nand.h b/include/configs/xilinx_zynqmp_mini_nand.h index 692f6e5d1ae..782e6961682 100644 --- a/include/configs/xilinx_zynqmp_mini_nand.h +++ b/include/configs/xilinx_zynqmp_mini_nand.h @@ -15,6 +15,5 @@ #define CONFIG_SYS_SDRAM_SIZE 0x1000000 #define CONFIG_SYS_SDRAM_BASE 0x0 #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_SDRAM_BASE + 0x40000) -#define CONFIG_SYS_MALLOC_LEN 0x800000 #endif /* __CONFIG_ZYNQMP_MINI_NAND_H */ diff --git a/include/configs/xilinx_zynqmp_mini_qspi.h b/include/configs/xilinx_zynqmp_mini_qspi.h index 205ddb4ae09..3091bae0511 100644 --- a/include/configs/xilinx_zynqmp_mini_qspi.h +++ b/include/configs/xilinx_zynqmp_mini_qspi.h @@ -13,6 +13,5 @@ #include #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_TEXT_BASE + 0x20000) -#define CONFIG_SYS_MALLOC_LEN 0x1a00 #endif /* __CONFIG_ZYNQMP_MINI_QSPI_H */ diff --git a/include/configs/xilinx_zynqmp_r5.h b/include/configs/xilinx_zynqmp_r5.h index b3d6151ba4c..6d5b81e05e1 100644 --- a/include/configs/xilinx_zynqmp_r5.h +++ b/include/configs/xilinx_zynqmp_r5.h @@ -20,8 +20,6 @@ #define CONFIG_SYS_MAXARGS 32 /* max number of command args */ -#define CONFIG_SYS_MALLOC_LEN 0x1400000 - #define CONFIG_SYS_INIT_RAM_ADDR 0xFFFF0000 #define CONFIG_SYS_INIT_RAM_SIZE 0x1000 #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_INIT_RAM_ADDR + \ diff --git a/include/configs/xpress.h b/include/configs/xpress.h index 01c3ee3ddb3..1e2b6c09543 100644 --- a/include/configs/xpress.h +++ b/include/configs/xpress.h @@ -13,9 +13,6 @@ /* SPL options */ #include "imx6_spl.h" -/* Size of malloc() pool */ -#define CONFIG_SYS_MALLOC_LEN (16 << 20) - #define CONFIG_MXC_UART_BASE MX6UL_UART7_BASE_ADDR /* MMC Configs */ diff --git a/include/configs/xtfpga.h b/include/configs/xtfpga.h index 04d58a13ca6..b69834a7fa1 100644 --- a/include/configs/xtfpga.h +++ b/include/configs/xtfpga.h @@ -65,8 +65,6 @@ # define CONFIG_SYS_MONITOR_LEN 0x00040000 /* 256KB */ #endif -#define CONFIG_SYS_MALLOC_LEN (256 << 10) /* heap 256KB */ - /* Linux boot param area in RAM (used only when booting linux) */ #define CONFIG_SYS_BOOTPARAMS_LEN (64 << 10) diff --git a/include/configs/zmx25.h b/include/configs/zmx25.h index 7d747d20dee..8b4b0bfd189 100644 --- a/include/configs/zmx25.h +++ b/include/configs/zmx25.h @@ -80,10 +80,4 @@ * CFI FLASH driver setup */ - -/* - * Size of malloc() pool - */ -#define CONFIG_SYS_MALLOC_LEN (0x400000 - 0x8000) - #endif /* __CONFIG_H */ -- cgit v1.2.3