This converts the following to Kconfig: CONFIG_SYS_BOOTPARAMS_LEN
Signed-off-by: Tom Rini trini@konsulko.com --- common/Kconfig | 12 ++++++++++++ common/board_r.c | 4 ++-- configs/M5208EVBE_defconfig | 1 + configs/M5235EVB_Flash32_defconfig | 1 + configs/M5235EVB_defconfig | 1 + configs/M5249EVB_defconfig | 1 + configs/M5253DEMO_defconfig | 1 + configs/M5272C3_defconfig | 1 + configs/M5275EVB_defconfig | 1 + configs/M5282EVB_defconfig | 1 + configs/M53017EVB_defconfig | 1 + configs/M5329AFEE_defconfig | 1 + configs/M5329BFEE_defconfig | 1 + configs/M5373EVB_defconfig | 1 + configs/amcore_defconfig | 1 + configs/ap121_defconfig | 1 + configs/ap143_defconfig | 1 + configs/ap152_defconfig | 1 + configs/astro_mcf5373l_defconfig | 1 + configs/bcm968380gerg_ram_defconfig | 1 + configs/ci20_mmc_defconfig | 1 + configs/cobra5272_defconfig | 1 + configs/comtrend_ar5315u_ram_defconfig | 1 + configs/comtrend_ar5387un_ram_defconfig | 1 + configs/comtrend_ct5361_ram_defconfig | 1 + configs/comtrend_vr3032u_ram_defconfig | 1 + configs/comtrend_wap5813n_ram_defconfig | 1 + configs/eb_cpu5282_defconfig | 1 + configs/eb_cpu5282_internal_defconfig | 1 + configs/gardena-smart-gateway-mt7688_defconfig | 1 + configs/hihope_rzg2_defconfig | 1 + configs/huawei_hg556a_ram_defconfig | 1 + configs/linkit-smart-7688_defconfig | 1 + configs/malta64_defconfig | 1 + configs/malta64el_defconfig | 1 + configs/malta_defconfig | 1 + configs/maltael_defconfig | 1 + configs/mt7620_mt7530_rfb_defconfig | 1 + configs/mt7620_rfb_defconfig | 1 + configs/mt7628_rfb_defconfig | 1 + configs/netgear_cg3100d_ram_defconfig | 1 + configs/netgear_dgnd3700v2_ram_defconfig | 1 + configs/pic32mzdask_defconfig | 2 ++ configs/r8a77970_eagle_defconfig | 1 + configs/r8a77980_condor_defconfig | 1 + configs/r8a77990_ebisu_defconfig | 1 + configs/r8a77995_draak_defconfig | 1 + configs/r8a779a0_falcon_defconfig | 1 + configs/rcar3_salvator-x_defconfig | 1 + configs/rcar3_ulcb_defconfig | 1 + configs/rzg2_beacon_defconfig | 1 + configs/sagem_f@st1704_ram_defconfig | 1 + configs/sfr_nb4-ser_ram_defconfig | 1 + configs/silinux_ek874_defconfig | 1 + configs/stmark2_defconfig | 1 + configs/tplink_wdr4300_defconfig | 1 + configs/vocore2_defconfig | 1 + configs/xtfpga_defconfig | 1 + include/configs/M5208EVBE.h | 2 -- include/configs/M5235EVB.h | 2 -- 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 | 2 -- include/configs/M5329EVB.h | 2 -- include/configs/M5373EVB.h | 2 -- include/configs/amcore.h | 1 - include/configs/ap121.h | 2 -- include/configs/ap143.h | 2 -- include/configs/ap152.h | 2 -- include/configs/astro_mcf5373l.h | 2 -- include/configs/bmips_common.h | 3 --- include/configs/ci20.h | 1 - include/configs/cobra5272.h | 1 - include/configs/eb_cpu5282.h | 1 - include/configs/gardena-smart-gateway-mt7688.h | 3 --- include/configs/linkit-smart-7688.h | 3 --- include/configs/malta.h | 1 - include/configs/mt7620.h | 2 -- include/configs/mt7628.h | 2 -- include/configs/pic32mzdask.h | 1 - include/configs/rcar-gen3-common.h | 2 -- include/configs/stmark2.h | 1 - include/configs/tplink_wdr4300.h | 2 -- include/configs/vocore2.h | 3 --- include/configs/xtfpga.h | 3 --- scripts/config_whitelist.txt | 1 - 89 files changed, 71 insertions(+), 56 deletions(-)
diff --git a/common/Kconfig b/common/Kconfig index a96842a5c11d..84db2e43f155 100644 --- a/common/Kconfig +++ b/common/Kconfig @@ -659,6 +659,18 @@ config MISC_INIT_R help Enabling this option calls 'misc_init_r' function
+config SYS_MALLOC_BOOTPARAMS + bool "Malloc a buffer to use for bootparams" + help + In some cases rather than using a known location to store the + bi_boot_params portion of gd we need to allocate it from our malloc pool. + +config SYS_BOOTPARAMS_LEN + hex "Size of the bootparam buffer to malloc in bytes" + depends on SYS_MALLOC_BOOTPARAMS + default 0x20000 if MIPS || RCAR_GEN3 + default 0x10000 + config ID_EEPROM bool "Enable I2C connected system identifier EEPROM" help diff --git a/common/board_r.c b/common/board_r.c index 6f4aca2077d6..22b5deaa8c22 100644 --- a/common/board_r.c +++ b/common/board_r.c @@ -457,7 +457,7 @@ static int initr_env(void) return 0; }
-#ifdef CONFIG_SYS_BOOTPARAMS_LEN +#ifdef CONFIG_SYS_MALLOC_BOOTPARAMS static int initr_malloc_bootparams(void) { gd->bd->bi_boot_params = (ulong)malloc(CONFIG_SYS_BOOTPARAMS_LEN); @@ -713,7 +713,7 @@ static init_fnc_t init_sequence_r[] = { initr_pvblock, #endif initr_env, -#ifdef CONFIG_SYS_BOOTPARAMS_LEN +#ifdef CONFIG_SYS_MALLOC_BOOTPARAMS initr_malloc_bootparams, #endif INIT_FUNC_WATCHDOG_RESET diff --git a/configs/M5208EVBE_defconfig b/configs/M5208EVBE_defconfig index df4da884355b..757792f9b0f4 100644 --- a/configs/M5208EVBE_defconfig +++ b/configs/M5208EVBE_defconfig @@ -11,6 +11,7 @@ CONFIG_MCFTMR=y CONFIG_SYS_MONITOR_BASE=0x00000400 CONFIG_BOOTDELAY=1 # CONFIG_DISPLAY_BOARDINFO is not set +CONFIG_SYS_MALLOC_BOOTPARAMS=y # CONFIG_CMDLINE_EDITING is not set # CONFIG_AUTO_COMPLETE is not set CONFIG_SYS_PROMPT="-> " diff --git a/configs/M5235EVB_Flash32_defconfig b/configs/M5235EVB_Flash32_defconfig index 5789d89047f8..1ed127ca3c27 100644 --- a/configs/M5235EVB_Flash32_defconfig +++ b/configs/M5235EVB_Flash32_defconfig @@ -12,6 +12,7 @@ CONFIG_MCFTMR=y CONFIG_SYS_MONITOR_BASE=0xFFC00400 CONFIG_BOOTDELAY=1 # CONFIG_DISPLAY_BOARDINFO is not set +CONFIG_SYS_MALLOC_BOOTPARAMS=y # CONFIG_CMDLINE_EDITING is not set # CONFIG_AUTO_COMPLETE is not set CONFIG_SYS_PBSIZE=276 diff --git a/configs/M5235EVB_defconfig b/configs/M5235EVB_defconfig index 43a584f8e460..fed386c164ad 100644 --- a/configs/M5235EVB_defconfig +++ b/configs/M5235EVB_defconfig @@ -11,6 +11,7 @@ CONFIG_MCFTMR=y CONFIG_SYS_MONITOR_BASE=0xFFE00400 CONFIG_BOOTDELAY=1 # CONFIG_DISPLAY_BOARDINFO is not set +CONFIG_SYS_MALLOC_BOOTPARAMS=y # CONFIG_CMDLINE_EDITING is not set # CONFIG_AUTO_COMPLETE is not set CONFIG_SYS_PROMPT="-> " diff --git a/configs/M5249EVB_defconfig b/configs/M5249EVB_defconfig index 65606c42c3cf..171df12564ff 100644 --- a/configs/M5249EVB_defconfig +++ b/configs/M5249EVB_defconfig @@ -13,6 +13,7 @@ CONFIG_SYS_MONITOR_BASE=0xFFE00400 CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_SYS_DEVICE_NULLDEV=y # CONFIG_DISPLAY_BOARDINFO is not set +CONFIG_SYS_MALLOC_BOOTPARAMS=y # CONFIG_CMDLINE_EDITING is not set CONFIG_SYS_PBSIZE=276 CONFIG_CMD_IMLS=y diff --git a/configs/M5253DEMO_defconfig b/configs/M5253DEMO_defconfig index b8a0cb493124..b3e6277a7e6d 100644 --- a/configs/M5253DEMO_defconfig +++ b/configs/M5253DEMO_defconfig @@ -11,6 +11,7 @@ CONFIG_MCFTMR=y CONFIG_SYS_MONITOR_BASE=0xFF800400 CONFIG_BOOTDELAY=5 # CONFIG_DISPLAY_BOARDINFO is not set +CONFIG_SYS_MALLOC_BOOTPARAMS=y # CONFIG_CMDLINE_EDITING is not set # CONFIG_AUTO_COMPLETE is not set CONFIG_SYS_PBSIZE=276 diff --git a/configs/M5272C3_defconfig b/configs/M5272C3_defconfig index 59c49223d7e6..376fb4253060 100644 --- a/configs/M5272C3_defconfig +++ b/configs/M5272C3_defconfig @@ -11,6 +11,7 @@ CONFIG_MCFTMR=y CONFIG_SYS_MONITOR_BASE=0xFFE00400 CONFIG_BOOTDELAY=5 # CONFIG_DISPLAY_BOARDINFO is not set +CONFIG_SYS_MALLOC_BOOTPARAMS=y # CONFIG_CMDLINE_EDITING is not set # CONFIG_AUTO_COMPLETE is not set CONFIG_SYS_PROMPT="-> " diff --git a/configs/M5275EVB_defconfig b/configs/M5275EVB_defconfig index 9774e77b6e92..3420934caf71 100644 --- a/configs/M5275EVB_defconfig +++ b/configs/M5275EVB_defconfig @@ -13,6 +13,7 @@ CONFIG_BOOTDELAY=5 CONFIG_USE_BOOTCOMMAND=y CONFIG_BOOTCOMMAND="bootm ffe40000" # CONFIG_DISPLAY_BOARDINFO is not set +CONFIG_SYS_MALLOC_BOOTPARAMS=y # CONFIG_CMDLINE_EDITING is not set # CONFIG_AUTO_COMPLETE is not set CONFIG_SYS_PROMPT="-> " diff --git a/configs/M5282EVB_defconfig b/configs/M5282EVB_defconfig index 7d77f6c47f19..8f38710b0742 100644 --- a/configs/M5282EVB_defconfig +++ b/configs/M5282EVB_defconfig @@ -11,6 +11,7 @@ CONFIG_MCFTMR=y CONFIG_SYS_MONITOR_BASE=0xFFE00400 CONFIG_BOOTDELAY=5 # CONFIG_DISPLAY_BOARDINFO is not set +CONFIG_SYS_MALLOC_BOOTPARAMS=y # CONFIG_CMDLINE_EDITING is not set # CONFIG_AUTO_COMPLETE is not set CONFIG_SYS_PROMPT="-> " diff --git a/configs/M53017EVB_defconfig b/configs/M53017EVB_defconfig index 45656a34f20a..246bc8a3bed7 100644 --- a/configs/M53017EVB_defconfig +++ b/configs/M53017EVB_defconfig @@ -13,6 +13,7 @@ CONFIG_BOOTDELAY=1 CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="root=/dev/mtdblock3 rw rootfstype=jffs2" # CONFIG_DISPLAY_BOARDINFO is not set +CONFIG_SYS_MALLOC_BOOTPARAMS=y # CONFIG_CMDLINE_EDITING is not set # CONFIG_AUTO_COMPLETE is not set CONFIG_SYS_PROMPT="-> " diff --git a/configs/M5329AFEE_defconfig b/configs/M5329AFEE_defconfig index 940196f73a0a..3536b4432de4 100644 --- a/configs/M5329AFEE_defconfig +++ b/configs/M5329AFEE_defconfig @@ -11,6 +11,7 @@ CONFIG_MCFTMR=y CONFIG_SYS_MONITOR_BASE=0x00000400 CONFIG_BOOTDELAY=1 # CONFIG_DISPLAY_BOARDINFO is not set +CONFIG_SYS_MALLOC_BOOTPARAMS=y # CONFIG_CMDLINE_EDITING is not set # CONFIG_AUTO_COMPLETE is not set CONFIG_SYS_PROMPT="-> " diff --git a/configs/M5329BFEE_defconfig b/configs/M5329BFEE_defconfig index a885281d1b7e..a020775c87d0 100644 --- a/configs/M5329BFEE_defconfig +++ b/configs/M5329BFEE_defconfig @@ -11,6 +11,7 @@ CONFIG_MCFTMR=y CONFIG_SYS_MONITOR_BASE=0x00000400 CONFIG_BOOTDELAY=1 # CONFIG_DISPLAY_BOARDINFO is not set +CONFIG_SYS_MALLOC_BOOTPARAMS=y # CONFIG_CMDLINE_EDITING is not set # CONFIG_AUTO_COMPLETE is not set CONFIG_SYS_PROMPT="-> " diff --git a/configs/M5373EVB_defconfig b/configs/M5373EVB_defconfig index c7c619ff693d..b008b91fdd54 100644 --- a/configs/M5373EVB_defconfig +++ b/configs/M5373EVB_defconfig @@ -11,6 +11,7 @@ CONFIG_MCFTMR=y CONFIG_SYS_MONITOR_BASE=0x00000400 CONFIG_BOOTDELAY=1 # CONFIG_DISPLAY_BOARDINFO is not set +CONFIG_SYS_MALLOC_BOOTPARAMS=y # CONFIG_CMDLINE_EDITING is not set # CONFIG_AUTO_COMPLETE is not set CONFIG_SYS_PROMPT="-> " diff --git a/configs/amcore_defconfig b/configs/amcore_defconfig index 53bfbcf57109..ad549c02c152 100644 --- a/configs/amcore_defconfig +++ b/configs/amcore_defconfig @@ -15,6 +15,7 @@ CONFIG_USE_BOOTCOMMAND=y CONFIG_BOOTCOMMAND="bootm ffc20000" CONFIG_SYS_CONSOLE_INFO_QUIET=y # CONFIG_DISPLAY_BOARDINFO is not set +CONFIG_SYS_MALLOC_BOOTPARAMS=y # CONFIG_CMDLINE_EDITING is not set # CONFIG_SYS_LONGHELP is not set CONFIG_SYS_PROMPT="amcore $ " diff --git a/configs/ap121_defconfig b/configs/ap121_defconfig index 0baa4c8d12ed..648cf227e3c9 100644 --- a/configs/ap121_defconfig +++ b/configs/ap121_defconfig @@ -20,6 +20,7 @@ CONFIG_USE_BOOTCOMMAND=y CONFIG_BOOTCOMMAND="sf probe;mtdparts default;bootm 0x9f650000" CONFIG_DISPLAY_CPUINFO=y CONFIG_BOARD_EARLY_INIT_F=y +CONFIG_SYS_MALLOC_BOOTPARAMS=y CONFIG_SYS_PROMPT="ap121 # " CONFIG_SYS_CBSIZE=256 CONFIG_SYS_PBSIZE=281 diff --git a/configs/ap143_defconfig b/configs/ap143_defconfig index b6ab065c6d6b..272d1c2e3960 100644 --- a/configs/ap143_defconfig +++ b/configs/ap143_defconfig @@ -22,6 +22,7 @@ CONFIG_USE_BOOTCOMMAND=y CONFIG_BOOTCOMMAND="sf probe;mtdparts default;bootm 0x9f680000" CONFIG_DISPLAY_CPUINFO=y CONFIG_BOARD_EARLY_INIT_F=y +CONFIG_SYS_MALLOC_BOOTPARAMS=y CONFIG_SYS_PROMPT="ap143 # " CONFIG_SYS_CBSIZE=256 CONFIG_SYS_PBSIZE=281 diff --git a/configs/ap152_defconfig b/configs/ap152_defconfig index 0ee5f828ab0b..67c36cdab81a 100644 --- a/configs/ap152_defconfig +++ b/configs/ap152_defconfig @@ -22,6 +22,7 @@ CONFIG_USE_BOOTCOMMAND=y CONFIG_BOOTCOMMAND="sf probe;mtdparts default;bootm 0x9f060000" CONFIG_DISPLAY_CPUINFO=y CONFIG_BOARD_EARLY_INIT_F=y +CONFIG_SYS_MALLOC_BOOTPARAMS=y CONFIG_SYS_PROMPT="ap152 # " CONFIG_SYS_CBSIZE=256 CONFIG_SYS_PBSIZE=281 diff --git a/configs/astro_mcf5373l_defconfig b/configs/astro_mcf5373l_defconfig index 4c2121116a2b..3a44c7e8ec9d 100644 --- a/configs/astro_mcf5373l_defconfig +++ b/configs/astro_mcf5373l_defconfig @@ -16,6 +16,7 @@ CONFIG_USE_BOOTCOMMAND=y CONFIG_BOOTCOMMAND="protect off 0x80000 0x1ffffff;run env_check;run xilinxload&&run alteraload&&bootm 0x80000;update;reset" # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_MISC_INIT_R=y +CONFIG_SYS_MALLOC_BOOTPARAMS=y CONFIG_HUSH_PARSER=y # CONFIG_AUTO_COMPLETE is not set CONFIG_SYS_PROMPT="URMEL > " diff --git a/configs/bcm968380gerg_ram_defconfig b/configs/bcm968380gerg_ram_defconfig index d35a2ba54619..0475535e9910 100644 --- a/configs/bcm968380gerg_ram_defconfig +++ b/configs/bcm968380gerg_ram_defconfig @@ -16,6 +16,7 @@ CONFIG_MIPS_BOOT_FDT=y # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_DISPLAY_CPUINFO=y +CONFIG_SYS_MALLOC_BOOTPARAMS=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="bcm968380gerg # " CONFIG_SYS_MAXARGS=24 diff --git a/configs/ci20_mmc_defconfig b/configs/ci20_mmc_defconfig index a533706fac18..4d963c3eb35e 100644 --- a/configs/ci20_mmc_defconfig +++ b/configs/ci20_mmc_defconfig @@ -22,6 +22,7 @@ CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_DISPLAY_CPUINFO=y CONFIG_BOARD_EARLY_INIT_F=y CONFIG_MISC_INIT_R=y +CONFIG_SYS_MALLOC_BOOTPARAMS=y # CONFIG_SPL_BANNER_PRINT is not set CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR=y CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x1c diff --git a/configs/cobra5272_defconfig b/configs/cobra5272_defconfig index c6eff7d93527..42f6087d83c9 100644 --- a/configs/cobra5272_defconfig +++ b/configs/cobra5272_defconfig @@ -11,6 +11,7 @@ CONFIG_MCFTMR=y CONFIG_SYS_MONITOR_BASE=0xFFE00400 CONFIG_BOOTDELAY=5 # CONFIG_DISPLAY_BOARDINFO is not set +CONFIG_SYS_MALLOC_BOOTPARAMS=y # CONFIG_CMDLINE_EDITING is not set # CONFIG_AUTO_COMPLETE is not set CONFIG_SYS_PROMPT="COBRA > " diff --git a/configs/comtrend_ar5315u_ram_defconfig b/configs/comtrend_ar5315u_ram_defconfig index c62531681a00..170b766089d0 100644 --- a/configs/comtrend_ar5315u_ram_defconfig +++ b/configs/comtrend_ar5315u_ram_defconfig @@ -17,6 +17,7 @@ CONFIG_MIPS_BOOT_FDT=y CONFIG_REMAKE_ELF=y CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_DISPLAY_CPUINFO=y +CONFIG_SYS_MALLOC_BOOTPARAMS=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="AR-5315un # " CONFIG_SYS_MAXARGS=24 diff --git a/configs/comtrend_ar5387un_ram_defconfig b/configs/comtrend_ar5387un_ram_defconfig index 67fa622769a7..599fda481aa8 100644 --- a/configs/comtrend_ar5387un_ram_defconfig +++ b/configs/comtrend_ar5387un_ram_defconfig @@ -17,6 +17,7 @@ CONFIG_MIPS_BOOT_FDT=y CONFIG_REMAKE_ELF=y CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_DISPLAY_CPUINFO=y +CONFIG_SYS_MALLOC_BOOTPARAMS=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="AR-5387un # " CONFIG_SYS_MAXARGS=24 diff --git a/configs/comtrend_ct5361_ram_defconfig b/configs/comtrend_ct5361_ram_defconfig index 0e6e8234c1e0..b1ad57b5a56c 100644 --- a/configs/comtrend_ct5361_ram_defconfig +++ b/configs/comtrend_ct5361_ram_defconfig @@ -17,6 +17,7 @@ CONFIG_MIPS_BOOT_FDT=y CONFIG_REMAKE_ELF=y CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_DISPLAY_CPUINFO=y +CONFIG_SYS_MALLOC_BOOTPARAMS=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="CT-5361 # " CONFIG_SYS_MAXARGS=24 diff --git a/configs/comtrend_vr3032u_ram_defconfig b/configs/comtrend_vr3032u_ram_defconfig index 5f8db634acd8..d07895de9b82 100644 --- a/configs/comtrend_vr3032u_ram_defconfig +++ b/configs/comtrend_vr3032u_ram_defconfig @@ -17,6 +17,7 @@ CONFIG_MIPS_BOOT_FDT=y CONFIG_REMAKE_ELF=y CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_DISPLAY_CPUINFO=y +CONFIG_SYS_MALLOC_BOOTPARAMS=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="VR-3032u # " CONFIG_SYS_MAXARGS=24 diff --git a/configs/comtrend_wap5813n_ram_defconfig b/configs/comtrend_wap5813n_ram_defconfig index 36cd978bfaab..ca370e66a346 100644 --- a/configs/comtrend_wap5813n_ram_defconfig +++ b/configs/comtrend_wap5813n_ram_defconfig @@ -17,6 +17,7 @@ CONFIG_MIPS_BOOT_FDT=y CONFIG_REMAKE_ELF=y CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_DISPLAY_CPUINFO=y +CONFIG_SYS_MALLOC_BOOTPARAMS=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="WAP-5813n # " CONFIG_SYS_MAXARGS=24 diff --git a/configs/eb_cpu5282_defconfig b/configs/eb_cpu5282_defconfig index 5a33e2f0ae2d..d634280de5d3 100644 --- a/configs/eb_cpu5282_defconfig +++ b/configs/eb_cpu5282_defconfig @@ -17,6 +17,7 @@ CONFIG_USE_BOOTCOMMAND=y CONFIG_BOOTCOMMAND="printenv" # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_MISC_INIT_R=y +CONFIG_SYS_MALLOC_BOOTPARAMS=y # CONFIG_AUTO_COMPLETE is not set CONFIG_SYS_PROMPT="\nEB+CPU5282> " CONFIG_SYS_CBSIZE=1024 diff --git a/configs/eb_cpu5282_internal_defconfig b/configs/eb_cpu5282_internal_defconfig index d23b7170cdd1..a726fdb56e37 100644 --- a/configs/eb_cpu5282_internal_defconfig +++ b/configs/eb_cpu5282_internal_defconfig @@ -17,6 +17,7 @@ CONFIG_USE_BOOTCOMMAND=y CONFIG_BOOTCOMMAND="printenv" # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_MISC_INIT_R=y +CONFIG_SYS_MALLOC_BOOTPARAMS=y # CONFIG_AUTO_COMPLETE is not set CONFIG_SYS_CBSIZE=1024 CONFIG_CMD_IMLS=y diff --git a/configs/gardena-smart-gateway-mt7688_defconfig b/configs/gardena-smart-gateway-mt7688_defconfig index 7b0b2a5c5888..b07e7c78d06f 100644 --- a/configs/gardena-smart-gateway-mt7688_defconfig +++ b/configs/gardena-smart-gateway-mt7688_defconfig @@ -36,6 +36,7 @@ CONFIG_BOOTCOMMAND="cp.b 83000000 84000000 10000 && dhcp uEnv.txt && env import CONFIG_USE_PREBOOT=y CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_BOARD_EARLY_INIT_F=y +CONFIG_SYS_MALLOC_BOOTPARAMS=y CONFIG_SPL_SYS_MALLOC_SIMPLE=y CONFIG_SPL_NOR_SUPPORT=y CONFIG_HUSH_PARSER=y diff --git a/configs/hihope_rzg2_defconfig b/configs/hihope_rzg2_defconfig index 4470cc7fb339..8bf14e09d47f 100644 --- a/configs/hihope_rzg2_defconfig +++ b/configs/hihope_rzg2_defconfig @@ -20,6 +20,7 @@ CONFIG_USE_BOOTCOMMAND=y CONFIG_BOOTCOMMAND="tftp 0x48080000 Image; tftp 0x48000000 Image-r8a774a1-hihope-rzg2m.dtb; booti 0x48080000 - 0x48000000" CONFIG_DEFAULT_FDT_FILE="r8a774a1-hihope-rzg2m.dtb" # CONFIG_BOARD_EARLY_INIT_F is not set +CONFIG_SYS_MALLOC_BOOTPARAMS=y CONFIG_HUSH_PARSER=y CONFIG_SYS_MAXARGS=64 CONFIG_SYS_PBSIZE=2068 diff --git a/configs/huawei_hg556a_ram_defconfig b/configs/huawei_hg556a_ram_defconfig index fbdbf4b8d76e..1c43ae262d81 100644 --- a/configs/huawei_hg556a_ram_defconfig +++ b/configs/huawei_hg556a_ram_defconfig @@ -17,6 +17,7 @@ CONFIG_MIPS_BOOT_FDT=y CONFIG_REMAKE_ELF=y CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_DISPLAY_CPUINFO=y +CONFIG_SYS_MALLOC_BOOTPARAMS=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="HG556a # " CONFIG_SYS_MAXARGS=24 diff --git a/configs/linkit-smart-7688_defconfig b/configs/linkit-smart-7688_defconfig index b137edd7e6a0..d50c77d8b63d 100644 --- a/configs/linkit-smart-7688_defconfig +++ b/configs/linkit-smart-7688_defconfig @@ -28,6 +28,7 @@ CONFIG_LEGACY_IMAGE_FORMAT=y CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_BOARD_EARLY_INIT_F=y +CONFIG_SYS_MALLOC_BOOTPARAMS=y CONFIG_SPL_SYS_MALLOC_SIMPLE=y CONFIG_SPL_NOR_SUPPORT=y CONFIG_HUSH_PARSER=y diff --git a/configs/malta64_defconfig b/configs/malta64_defconfig index 944d0fd8a8db..cbea4fadff7e 100644 --- a/configs/malta64_defconfig +++ b/configs/malta64_defconfig @@ -12,6 +12,7 @@ CONFIG_CPU_MIPS64_R2=y # CONFIG_AUTOBOOT is not set CONFIG_BOARD_EARLY_INIT_F=y CONFIG_MISC_INIT_R=y +CONFIG_SYS_MALLOC_BOOTPARAMS=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="malta # " CONFIG_SYS_CBSIZE=256 diff --git a/configs/malta64el_defconfig b/configs/malta64el_defconfig index 907fd19328bd..b268e33a379f 100644 --- a/configs/malta64el_defconfig +++ b/configs/malta64el_defconfig @@ -14,6 +14,7 @@ CONFIG_CPU_MIPS64_R2=y # CONFIG_AUTOBOOT is not set CONFIG_BOARD_EARLY_INIT_F=y CONFIG_MISC_INIT_R=y +CONFIG_SYS_MALLOC_BOOTPARAMS=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="maltael # " CONFIG_SYS_CBSIZE=256 diff --git a/configs/malta_defconfig b/configs/malta_defconfig index f2b507e200cc..7b1b50547a4d 100644 --- a/configs/malta_defconfig +++ b/configs/malta_defconfig @@ -11,6 +11,7 @@ CONFIG_TARGET_MALTA=y # CONFIG_AUTOBOOT is not set CONFIG_BOARD_EARLY_INIT_F=y CONFIG_MISC_INIT_R=y +CONFIG_SYS_MALLOC_BOOTPARAMS=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="malta # " CONFIG_SYS_CBSIZE=256 diff --git a/configs/maltael_defconfig b/configs/maltael_defconfig index 866f34f8326b..540864b57327 100644 --- a/configs/maltael_defconfig +++ b/configs/maltael_defconfig @@ -13,6 +13,7 @@ CONFIG_SYS_LITTLE_ENDIAN=y # CONFIG_AUTOBOOT is not set CONFIG_BOARD_EARLY_INIT_F=y CONFIG_MISC_INIT_R=y +CONFIG_SYS_MALLOC_BOOTPARAMS=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="maltael # " CONFIG_SYS_CBSIZE=256 diff --git a/configs/mt7620_mt7530_rfb_defconfig b/configs/mt7620_mt7530_rfb_defconfig index af1282c99044..5bf12729050a 100644 --- a/configs/mt7620_mt7530_rfb_defconfig +++ b/configs/mt7620_mt7530_rfb_defconfig @@ -23,6 +23,7 @@ CONFIG_MIPS_BOOT_FDT=y CONFIG_DEBUG_UART=y CONFIG_FIT=y # CONFIG_ARCH_FIXUP_FDT_MEMORY is not set +CONFIG_SYS_MALLOC_BOOTPARAMS=y CONFIG_SPL_SYS_MALLOC_SIMPLE=y CONFIG_SPL_NOR_SUPPORT=y # CONFIG_CMD_ELF is not set diff --git a/configs/mt7620_rfb_defconfig b/configs/mt7620_rfb_defconfig index ac7a56ef1ead..8a4124e95cab 100644 --- a/configs/mt7620_rfb_defconfig +++ b/configs/mt7620_rfb_defconfig @@ -22,6 +22,7 @@ CONFIG_MIPS_BOOT_FDT=y CONFIG_DEBUG_UART=y CONFIG_FIT=y # CONFIG_ARCH_FIXUP_FDT_MEMORY is not set +CONFIG_SYS_MALLOC_BOOTPARAMS=y CONFIG_SPL_SYS_MALLOC_SIMPLE=y CONFIG_SPL_NOR_SUPPORT=y # CONFIG_CMD_ELF is not set diff --git a/configs/mt7628_rfb_defconfig b/configs/mt7628_rfb_defconfig index 5862295871b1..3ca36cdede31 100644 --- a/configs/mt7628_rfb_defconfig +++ b/configs/mt7628_rfb_defconfig @@ -22,6 +22,7 @@ CONFIG_MIPS_BOOT_FDT=y CONFIG_FIT=y # CONFIG_ARCH_FIXUP_FDT_MEMORY is not set CONFIG_SYS_CONSOLE_INFO_QUIET=y +CONFIG_SYS_MALLOC_BOOTPARAMS=y CONFIG_SPL_SYS_MALLOC_SIMPLE=y CONFIG_SPL_NOR_SUPPORT=y # CONFIG_CMD_ELF is not set diff --git a/configs/netgear_cg3100d_ram_defconfig b/configs/netgear_cg3100d_ram_defconfig index 05ab61beb16d..4336116f5770 100644 --- a/configs/netgear_cg3100d_ram_defconfig +++ b/configs/netgear_cg3100d_ram_defconfig @@ -15,6 +15,7 @@ CONFIG_MIPS_BOOT_FDT=y # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_DISPLAY_CPUINFO=y +CONFIG_SYS_MALLOC_BOOTPARAMS=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="CG3100D # " CONFIG_SYS_MAXARGS=24 diff --git a/configs/netgear_dgnd3700v2_ram_defconfig b/configs/netgear_dgnd3700v2_ram_defconfig index e1f9ceed0801..bbfa9e13fa3c 100644 --- a/configs/netgear_dgnd3700v2_ram_defconfig +++ b/configs/netgear_dgnd3700v2_ram_defconfig @@ -18,6 +18,7 @@ CONFIG_REMAKE_ELF=y CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_DISPLAY_CPUINFO=y CONFIG_BOARD_EARLY_INIT_F=y +CONFIG_SYS_MALLOC_BOOTPARAMS=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="DGND3700v2 # " CONFIG_SYS_MAXARGS=24 diff --git a/configs/pic32mzdask_defconfig b/configs/pic32mzdask_defconfig index 21f407c1f35e..12cff6ab0b96 100644 --- a/configs/pic32mzdask_defconfig +++ b/configs/pic32mzdask_defconfig @@ -15,6 +15,8 @@ CONFIG_DISTRO_DEFAULTS=y CONFIG_TIMESTAMP=y CONFIG_BOOTDELAY=5 CONFIG_BOOTCOMMAND="run distro_bootcmd || run legacy_bootcmd" +CONFIG_SYS_MALLOC_BOOTPARAMS=y +CONFIG_SYS_BOOTPARAMS_LEN=0x1000 CONFIG_SYS_PROMPT="dask # " CONFIG_SYS_PBSIZE=1048 # CONFIG_CMD_SAVEENV is not set diff --git a/configs/r8a77970_eagle_defconfig b/configs/r8a77970_eagle_defconfig index 4f4bd7a40b3f..b37577b46efe 100644 --- a/configs/r8a77970_eagle_defconfig +++ b/configs/r8a77970_eagle_defconfig @@ -21,6 +21,7 @@ CONFIG_USE_BOOTARGS=y CONFIG_USE_BOOTCOMMAND=y CONFIG_BOOTCOMMAND="tftp 0x48080000 Image; tftp 0x48000000 Image-r8a77970-eagle.dtb; booti 0x48080000 - 0x48000000" CONFIG_DEFAULT_FDT_FILE="r8a77970-eagle.dtb" +CONFIG_SYS_MALLOC_BOOTPARAMS=y CONFIG_HUSH_PARSER=y CONFIG_SYS_MAXARGS=64 CONFIG_SYS_PBSIZE=2068 diff --git a/configs/r8a77980_condor_defconfig b/configs/r8a77980_condor_defconfig index 17df03cbe994..a5da38ed7b60 100644 --- a/configs/r8a77980_condor_defconfig +++ b/configs/r8a77980_condor_defconfig @@ -22,6 +22,7 @@ CONFIG_USE_BOOTCOMMAND=y CONFIG_BOOTCOMMAND="tftp 0x48080000 Image; tftp 0x48000000 Image-r8a77980-condor.dtb; booti 0x48080000 - 0x48000000" CONFIG_DEFAULT_FDT_FILE="r8a77980-condor.dtb" # CONFIG_BOARD_EARLY_INIT_F is not set +CONFIG_SYS_MALLOC_BOOTPARAMS=y CONFIG_HUSH_PARSER=y CONFIG_SYS_MAXARGS=64 CONFIG_SYS_PBSIZE=2068 diff --git a/configs/r8a77990_ebisu_defconfig b/configs/r8a77990_ebisu_defconfig index b3bc8a754d17..7ba55737d841 100644 --- a/configs/r8a77990_ebisu_defconfig +++ b/configs/r8a77990_ebisu_defconfig @@ -22,6 +22,7 @@ CONFIG_USE_BOOTCOMMAND=y CONFIG_BOOTCOMMAND="tftp 0x48080000 Image; tftp 0x48000000 Image-r8a77990-ebisu.dtb; booti 0x48080000 - 0x48000000" CONFIG_DEFAULT_FDT_FILE="r8a77990-ebisu.dtb" # CONFIG_BOARD_EARLY_INIT_F is not set +CONFIG_SYS_MALLOC_BOOTPARAMS=y CONFIG_UPDATE_TFTP=y CONFIG_HUSH_PARSER=y CONFIG_SYS_MAXARGS=64 diff --git a/configs/r8a77995_draak_defconfig b/configs/r8a77995_draak_defconfig index 1d73756f9527..e2a7e5f636dd 100644 --- a/configs/r8a77995_draak_defconfig +++ b/configs/r8a77995_draak_defconfig @@ -21,6 +21,7 @@ CONFIG_USE_BOOTARGS=y CONFIG_USE_BOOTCOMMAND=y CONFIG_BOOTCOMMAND="tftp 0x48080000 Image; tftp 0x48000000 Image-r8a77995-draak.dtb; booti 0x48080000 - 0x48000000" CONFIG_DEFAULT_FDT_FILE="r8a77995-draak.dtb" +CONFIG_SYS_MALLOC_BOOTPARAMS=y CONFIG_UPDATE_TFTP=y CONFIG_HUSH_PARSER=y CONFIG_SYS_MAXARGS=64 diff --git a/configs/r8a779a0_falcon_defconfig b/configs/r8a779a0_falcon_defconfig index 41353538f2ba..e15884222a07 100644 --- a/configs/r8a779a0_falcon_defconfig +++ b/configs/r8a779a0_falcon_defconfig @@ -24,6 +24,7 @@ CONFIG_BOOTARGS="root=/dev/nfs rw nfsroot=192.168.0.1:/export/rfs ip=192.168.0.2 CONFIG_USE_BOOTCOMMAND=y CONFIG_BOOTCOMMAND="tftp 0x48080000 Image; tftp 0x48000000 Image-r8a779a0-falcon.dtb; booti 0x48080000 - 0x48000000" CONFIG_DEFAULT_FDT_FILE="r8a779a0-falcon.dtb" +CONFIG_SYS_MALLOC_BOOTPARAMS=y CONFIG_HUSH_PARSER=y CONFIG_SYS_MAXARGS=64 CONFIG_SYS_PBSIZE=2068 diff --git a/configs/rcar3_salvator-x_defconfig b/configs/rcar3_salvator-x_defconfig index d2233d7eef12..7bcbb3a13394 100644 --- a/configs/rcar3_salvator-x_defconfig +++ b/configs/rcar3_salvator-x_defconfig @@ -21,6 +21,7 @@ CONFIG_USE_BOOTARGS=y CONFIG_USE_BOOTCOMMAND=y CONFIG_BOOTCOMMAND="tftp 0x48080000 Image; tftp 0x48000000 Image-r8a77950-salvator-x.dtb; booti 0x48080000 - 0x48000000" CONFIG_DEFAULT_FDT_FILE="r8a77950-salvator-x.dtb" +CONFIG_SYS_MALLOC_BOOTPARAMS=y CONFIG_UPDATE_TFTP=y CONFIG_HUSH_PARSER=y CONFIG_SYS_MAXARGS=64 diff --git a/configs/rcar3_ulcb_defconfig b/configs/rcar3_ulcb_defconfig index 8402634cc011..c953299c0d0f 100644 --- a/configs/rcar3_ulcb_defconfig +++ b/configs/rcar3_ulcb_defconfig @@ -21,6 +21,7 @@ CONFIG_USE_BOOTARGS=y CONFIG_USE_BOOTCOMMAND=y CONFIG_BOOTCOMMAND="tftp 0x48080000 Image; tftp 0x48000000 Image-r8a77950-ulcb.dtb; booti 0x48080000 - 0x48000000" CONFIG_DEFAULT_FDT_FILE="r8a77950-ulcb.dtb" +CONFIG_SYS_MALLOC_BOOTPARAMS=y CONFIG_UPDATE_TFTP=y CONFIG_HUSH_PARSER=y CONFIG_SYS_MAXARGS=64 diff --git a/configs/rzg2_beacon_defconfig b/configs/rzg2_beacon_defconfig index 930e3e60776e..1451a40dd933 100644 --- a/configs/rzg2_beacon_defconfig +++ b/configs/rzg2_beacon_defconfig @@ -19,6 +19,7 @@ CONFIG_USE_BOOTCOMMAND=y CONFIG_BOOTCOMMAND="mmc dev ${mmcdev}; if mmc rescan; then if run loadbootscript; then run bootscript; else if run loadimage; then run mmcboot; else run netboot; fi; fi; else booti ${loadaddr} - ${fdt_addr}; fi" CONFIG_DEFAULT_FDT_FILE="r8a774a1-beacon-rzg2m-kit.dtb" # CONFIG_BOARD_EARLY_INIT_F is not set +CONFIG_SYS_MALLOC_BOOTPARAMS=y CONFIG_HUSH_PARSER=y CONFIG_SYS_MAXARGS=64 CONFIG_SYS_PBSIZE=2068 diff --git a/configs/sagem_f@st1704_ram_defconfig b/configs/sagem_f@st1704_ram_defconfig index 4aff0f34a604..875ae210de40 100644 --- a/configs/sagem_f@st1704_ram_defconfig +++ b/configs/sagem_f@st1704_ram_defconfig @@ -16,6 +16,7 @@ CONFIG_MIPS_BOOT_FDT=y # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_DISPLAY_CPUINFO=y +CONFIG_SYS_MALLOC_BOOTPARAMS=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="F@ST1704 # " CONFIG_SYS_MAXARGS=24 diff --git a/configs/sfr_nb4-ser_ram_defconfig b/configs/sfr_nb4-ser_ram_defconfig index 13da31e3004c..6f261882faae 100644 --- a/configs/sfr_nb4-ser_ram_defconfig +++ b/configs/sfr_nb4-ser_ram_defconfig @@ -18,6 +18,7 @@ CONFIG_MIPS_BOOT_FDT=y CONFIG_REMAKE_ELF=y CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_DISPLAY_CPUINFO=y +CONFIG_SYS_MALLOC_BOOTPARAMS=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="NB4-SER # " CONFIG_SYS_MAXARGS=24 diff --git a/configs/silinux_ek874_defconfig b/configs/silinux_ek874_defconfig index 08553661d913..74523483926c 100644 --- a/configs/silinux_ek874_defconfig +++ b/configs/silinux_ek874_defconfig @@ -23,6 +23,7 @@ CONFIG_USE_BOOTCOMMAND=y CONFIG_BOOTCOMMAND="tftp 0x48080000 Image; tftp 0x48000000 Image-r8a774c0-ek874.dtb; booti 0x48080000 - 0x48000000" CONFIG_DEFAULT_FDT_FILE="r8a774c0-ek874.dtb" # CONFIG_BOARD_EARLY_INIT_F is not set +CONFIG_SYS_MALLOC_BOOTPARAMS=y CONFIG_HUSH_PARSER=y CONFIG_SYS_MAXARGS=64 CONFIG_SYS_PBSIZE=2068 diff --git a/configs/stmark2_defconfig b/configs/stmark2_defconfig index e56ca93d4b8e..dfec23e75187 100644 --- a/configs/stmark2_defconfig +++ b/configs/stmark2_defconfig @@ -16,6 +16,7 @@ CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/ram0 rw rootfstype=ramfs rdinit= CONFIG_USE_BOOTCOMMAND=y CONFIG_BOOTCOMMAND="sf probe 0:1 50000000; sf read ${loadaddr} 0x100000 ${kern_size}; bootm ${loadaddr}" # CONFIG_DISPLAY_BOARDINFO is not set +CONFIG_SYS_MALLOC_BOOTPARAMS=y CONFIG_HUSH_PARSER=y # CONFIG_CMDLINE_EDITING is not set CONFIG_SYS_PROMPT="stmark2 $ " diff --git a/configs/tplink_wdr4300_defconfig b/configs/tplink_wdr4300_defconfig index 62d9ec297bb2..6a0686b32cc9 100644 --- a/configs/tplink_wdr4300_defconfig +++ b/configs/tplink_wdr4300_defconfig @@ -15,6 +15,7 @@ CONFIG_USE_BOOTCOMMAND=y CONFIG_BOOTCOMMAND="dhcp 192.168.1.1:wdr4300.fit && bootm $loadaddr" CONFIG_DISPLAY_CPUINFO=y CONFIG_BOARD_EARLY_INIT_F=y +CONFIG_SYS_MALLOC_BOOTPARAMS=y CONFIG_HUSH_PARSER=y CONFIG_SYS_MAXARGS=32 # CONFIG_CMD_ELF is not set diff --git a/configs/vocore2_defconfig b/configs/vocore2_defconfig index ff7a0ddd18e6..33d27ad4b62d 100644 --- a/configs/vocore2_defconfig +++ b/configs/vocore2_defconfig @@ -30,6 +30,7 @@ CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_LOGLEVEL=8 # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y +CONFIG_SYS_MALLOC_BOOTPARAMS=y CONFIG_SPL_SYS_MALLOC_SIMPLE=y CONFIG_SPL_NOR_SUPPORT=y CONFIG_HUSH_PARSER=y diff --git a/configs/xtfpga_defconfig b/configs/xtfpga_defconfig index ec7c5637e4a9..e98af5ec7e63 100644 --- a/configs/xtfpga_defconfig +++ b/configs/xtfpga_defconfig @@ -15,6 +15,7 @@ CONFIG_AUTOBOOT_KEYED=y CONFIG_AUTOBOOT_PROMPT="Autobooting in %d seconds, press <SPACE> to stop\n" CONFIG_AUTOBOOT_STOP_STR=" " CONFIG_MISC_INIT_R=y +CONFIG_SYS_MALLOC_BOOTPARAMS=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="U-Boot> " CONFIG_SYS_PBSIZE=1049 diff --git a/include/configs/M5208EVBE.h b/include/configs/M5208EVBE.h index 275fb5665fd8..135dec0ebb4d 100644 --- a/include/configs/M5208EVBE.h +++ b/include/configs/M5208EVBE.h @@ -83,8 +83,6 @@
#define CONFIG_SYS_MONITOR_LEN (256 << 10) /* Reserve 256 kB for Monitor */
-#define CONFIG_SYS_BOOTPARAMS_LEN 64*1024 - /* * 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/M5235EVB.h b/include/configs/M5235EVB.h index 13743dab52db..88f5f155633c 100644 --- a/include/configs/M5235EVB.h +++ b/include/configs/M5235EVB.h @@ -88,8 +88,6 @@
#define CONFIG_SYS_MONITOR_LEN (256 << 10) /* Reserve 256 kB for Monitor */
-#define CONFIG_SYS_BOOTPARAMS_LEN 64*1024 - /* * 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/M5249EVB.h b/include/configs/M5249EVB.h index f68eb979bddc..1a604f5c81ea 100644 --- a/include/configs/M5249EVB.h +++ b/include/configs/M5249EVB.h @@ -65,7 +65,6 @@ #endif
#define CONFIG_SYS_MONITOR_LEN 0x20000 -#define CONFIG_SYS_BOOTPARAMS_LEN 64*1024
/* * For booting Linux, the board info and command line data diff --git a/include/configs/M5253DEMO.h b/include/configs/M5253DEMO.h index 079675be5bcb..0a416dc12266 100644 --- a/include/configs/M5253DEMO.h +++ b/include/configs/M5253DEMO.h @@ -91,7 +91,6 @@ #define CONFIG_SYS_SDRAM_SIZE 16 /* SDRAM size in MB */
#define CONFIG_SYS_MONITOR_LEN 0x40000 -#define CONFIG_SYS_BOOTPARAMS_LEN (64*1024)
/* * For booting Linux, the board info and command line data diff --git a/include/configs/M5272C3.h b/include/configs/M5272C3.h index b8918680c14a..6b4028c17ca2 100644 --- a/include/configs/M5272C3.h +++ b/include/configs/M5272C3.h @@ -89,7 +89,6 @@ #define CONFIG_SYS_FLASH_BASE 0xffe00000
#define CONFIG_SYS_MONITOR_LEN 0x20000 -#define CONFIG_SYS_BOOTPARAMS_LEN 64*1024
/* * For booting Linux, the board info and command line data diff --git a/include/configs/M5275EVB.h b/include/configs/M5275EVB.h index 68e3c89a1cd8..99412aabdec9 100644 --- a/include/configs/M5275EVB.h +++ b/include/configs/M5275EVB.h @@ -91,7 +91,6 @@ #define CONFIG_SYS_FLASH_BASE CONFIG_SYS_CS0_BASE
#define CONFIG_SYS_MONITOR_LEN 0x20000 -#define CONFIG_SYS_BOOTPARAMS_LEN 64*1024
/* * For booting Linux, the board info and command line data diff --git a/include/configs/M5282EVB.h b/include/configs/M5282EVB.h index b6e569d82025..fe04a70b61e9 100644 --- a/include/configs/M5282EVB.h +++ b/include/configs/M5282EVB.h @@ -92,7 +92,6 @@ #define CONFIG_SYS_INT_FLASH_ENABLE 0x21
#define CONFIG_SYS_MONITOR_LEN 0x20000 -#define CONFIG_SYS_BOOTPARAMS_LEN 64*1024
/* * For booting Linux, the board info and command line data diff --git a/include/configs/M53017EVB.h b/include/configs/M53017EVB.h index 34b5ceb20c4d..9b84d3693a31 100644 --- a/include/configs/M53017EVB.h +++ b/include/configs/M53017EVB.h @@ -97,8 +97,6 @@
#define CONFIG_SYS_MONITOR_LEN (256 << 10) /* Reserve 256 kB for Monitor */
-#define CONFIG_SYS_BOOTPARAMS_LEN 64*1024 - /* * 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/M5329EVB.h b/include/configs/M5329EVB.h index 673b0dc2e8db..7e65f9914f4d 100644 --- a/include/configs/M5329EVB.h +++ b/include/configs/M5329EVB.h @@ -93,8 +93,6 @@
#define CONFIG_SYS_MONITOR_LEN (256 << 10) /* Reserve 256 kB for Monitor */
-#define CONFIG_SYS_BOOTPARAMS_LEN 64*1024 - /* * 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/M5373EVB.h b/include/configs/M5373EVB.h index 4c9fc43fd6ca..b131aefd6dd1 100644 --- a/include/configs/M5373EVB.h +++ b/include/configs/M5373EVB.h @@ -95,8 +95,6 @@
#define CONFIG_SYS_MONITOR_LEN (256 << 10) /* Reserve 256 kB for Monitor */
-#define CONFIG_SYS_BOOTPARAMS_LEN 64*1024 - /* * 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/amcore.h b/include/configs/amcore.h index 898978eb96ab..e80c9f6d680e 100644 --- a/include/configs/amcore.h +++ b/include/configs/amcore.h @@ -46,7 +46,6 @@ #define CONFIG_SYS_WRITE_SWAPPED_DATA /* reserve 128-4KB */ #define CONFIG_SYS_MONITOR_LEN ((128 - 4) * 1024) -#define CONFIG_SYS_BOOTPARAMS_LEN (64 * 1024)
#define LDS_BOARD_TEXT \ . = DEFINED(env_offset) ? env_offset : .; \ diff --git a/include/configs/ap121.h b/include/configs/ap121.h index e1c2e066131c..711406a55053 100644 --- a/include/configs/ap121.h +++ b/include/configs/ap121.h @@ -9,8 +9,6 @@ #define CONFIG_SYS_MHZ 200 #define CONFIG_SYS_MIPS_TIMER_FREQ (CONFIG_SYS_MHZ * 1000000)
-#define CONFIG_SYS_BOOTPARAMS_LEN 0x20000 - #define CONFIG_SYS_SDRAM_BASE 0x80000000
#define CONFIG_SYS_INIT_RAM_ADDR 0xbd000000 diff --git a/include/configs/ap143.h b/include/configs/ap143.h index 37fc196514f6..f89c41a74424 100644 --- a/include/configs/ap143.h +++ b/include/configs/ap143.h @@ -9,8 +9,6 @@ #define CONFIG_SYS_MHZ 325 #define CONFIG_SYS_MIPS_TIMER_FREQ (CONFIG_SYS_MHZ * 1000000)
-#define CONFIG_SYS_BOOTPARAMS_LEN 0x20000 - #define CONFIG_SYS_SDRAM_BASE 0x80000000
#define CONFIG_SYS_INIT_RAM_ADDR 0xbd000000 diff --git a/include/configs/ap152.h b/include/configs/ap152.h index 9f4763337108..9a0d7d2c6d6c 100644 --- a/include/configs/ap152.h +++ b/include/configs/ap152.h @@ -9,8 +9,6 @@ #define CONFIG_SYS_MHZ 375 #define CONFIG_SYS_MIPS_TIMER_FREQ (CONFIG_SYS_MHZ * 1000000)
-#define CONFIG_SYS_BOOTPARAMS_LEN 0x20000 - #define CONFIG_SYS_SDRAM_BASE 0x80000000
#define CONFIG_SYS_INIT_RAM_ADDR 0xbd000000 diff --git a/include/configs/astro_mcf5373l.h b/include/configs/astro_mcf5373l.h index 9d1203f39780..8362fb5ce3c4 100644 --- a/include/configs/astro_mcf5373l.h +++ b/include/configs/astro_mcf5373l.h @@ -204,8 +204,6 @@ /* Reserve 256 kB for Monitor */ #define CONFIG_SYS_MONITOR_LEN (256 << 10)
-#define CONFIG_SYS_BOOTPARAMS_LEN (64 * 1024) - /* * 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/bmips_common.h b/include/configs/bmips_common.h index f85b9039fdd5..7e358a6314bf 100644 --- a/include/configs/bmips_common.h +++ b/include/configs/bmips_common.h @@ -12,7 +12,4 @@ #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, \ 230400, 500000, 1500000 }
-/* Memory usage */ -#define CONFIG_SYS_BOOTPARAMS_LEN SZ_128K - #endif /* __CONFIG_BMIPS_COMMON_H */ diff --git a/include/configs/ci20.h b/include/configs/ci20.h index 4af11496cb15..d2cb2f4b6f2d 100644 --- a/include/configs/ci20.h +++ b/include/configs/ci20.h @@ -15,7 +15,6 @@
/* Memory configuration */ #define CONFIG_SYS_MONITOR_LEN (512 * 1024) -#define CONFIG_SYS_BOOTPARAMS_LEN (128 * 1024)
#define CONFIG_SYS_SDRAM_BASE 0x80000000 /* cached (KSEG0) address */ #define CONFIG_SYS_INIT_SP_OFFSET 0x400000 diff --git a/include/configs/cobra5272.h b/include/configs/cobra5272.h index 1822ce5120ac..f1a4df726f42 100644 --- a/include/configs/cobra5272.h +++ b/include/configs/cobra5272.h @@ -190,7 +190,6 @@ enter a valid image address in flash */ #define CONFIG_SYS_FLASH_BASE 0xffe00000
#define CONFIG_SYS_MONITOR_LEN 0x20000 -#define CONFIG_SYS_BOOTPARAMS_LEN 64*1024
/* * For booting Linux, the board info and command line data diff --git a/include/configs/eb_cpu5282.h b/include/configs/eb_cpu5282.h index 9374928a9e4b..70ee288aa72e 100644 --- a/include/configs/eb_cpu5282.h +++ b/include/configs/eb_cpu5282.h @@ -81,7 +81,6 @@ #define CONFIG_SYS_SDRAM_SIZE CONFIG_SYS_SDRAM_SIZE0
#define CONFIG_SYS_MONITOR_LEN 0x20000 -#define CONFIG_SYS_BOOTPARAMS_LEN 64*1024
/* * For booting Linux, the board info and command line data diff --git a/include/configs/gardena-smart-gateway-mt7688.h b/include/configs/gardena-smart-gateway-mt7688.h index 3c4a13cd0d57..3fe37eae8bfa 100644 --- a/include/configs/gardena-smart-gateway-mt7688.h +++ b/include/configs/gardena-smart-gateway-mt7688.h @@ -39,9 +39,6 @@
/* RAM */
-/* Memory usage */ -#define CONFIG_SYS_BOOTPARAMS_LEN (128 * 1024) - /* Environment settings */
#endif /* __CONFIG_GARDENA_SMART_GATEWAY_H */ diff --git a/include/configs/linkit-smart-7688.h b/include/configs/linkit-smart-7688.h index 35a6db4c1869..b0d77d1c6245 100644 --- a/include/configs/linkit-smart-7688.h +++ b/include/configs/linkit-smart-7688.h @@ -40,9 +40,6 @@
/* RAM */
-/* Memory usage */ -#define CONFIG_SYS_BOOTPARAMS_LEN (128 * 1024) - /* Environment settings */
#endif /* __CONFIG_LINKIT_SMART_7688_H */ diff --git a/include/configs/malta.h b/include/configs/malta.h index 84e5f985b1aa..225ed7cd5cdc 100644 --- a/include/configs/malta.h +++ b/include/configs/malta.h @@ -37,7 +37,6 @@
#define CONFIG_SYS_INIT_SP_OFFSET 0x400000
-#define CONFIG_SYS_BOOTPARAMS_LEN (128 * 1024) #define CONFIG_SYS_BOOTM_LEN (64 * 1024 * 1024)
/* diff --git a/include/configs/mt7620.h b/include/configs/mt7620.h index 1c70deff70be..bcbc70b0945c 100644 --- a/include/configs/mt7620.h +++ b/include/configs/mt7620.h @@ -10,8 +10,6 @@
#define CONFIG_SYS_MIPS_TIMER_FREQ 290000000
-#define CONFIG_SYS_BOOTPARAMS_LEN 0x20000 - #define CONFIG_SYS_SDRAM_BASE 0x80000000
#define CONFIG_SYS_INIT_SP_OFFSET 0x400000 diff --git a/include/configs/mt7628.h b/include/configs/mt7628.h index 4f934ea40d0b..efda683b4a79 100644 --- a/include/configs/mt7628.h +++ b/include/configs/mt7628.h @@ -10,8 +10,6 @@
#define CONFIG_SYS_MIPS_TIMER_FREQ 290000000
-#define CONFIG_SYS_BOOTPARAMS_LEN 0x20000 - #define CONFIG_SYS_SDRAM_BASE 0x80000000
#define CONFIG_SYS_INIT_SP_OFFSET 0x80000 diff --git a/include/configs/pic32mzdask.h b/include/configs/pic32mzdask.h index c18834c437d4..10795df37615 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_BOOTPARAMS_LEN (4 << 10)
#define CONFIG_SYS_MONITOR_LEN (192 << 10)
diff --git a/include/configs/rcar-gen3-common.h b/include/configs/rcar-gen3-common.h index e65ab72ca9c6..a0ba0c2ea78e 100644 --- a/include/configs/rcar-gen3-common.h +++ b/include/configs/rcar-gen3-common.h @@ -15,8 +15,6 @@ #define CONFIG_SPL_TARGET "spl/u-boot-spl.scif" #endif
-#define CONFIG_SYS_BOOTPARAMS_LEN SZ_128K - /* boot option */
/* Generic Interrupt Controller Definitions */ diff --git a/include/configs/stmark2.h b/include/configs/stmark2.h index a56bc4e15401..b0a89734feb7 100644 --- a/include/configs/stmark2.h +++ b/include/configs/stmark2.h @@ -73,7 +73,6 @@ #define CONFIG_SERIAL_BOOT #endif
-#define CONFIG_SYS_BOOTPARAMS_LEN (64 * 1024) /* Reserve 256 kB for Monitor */ #define CONFIG_SYS_MONITOR_LEN (256 << 10)
diff --git a/include/configs/tplink_wdr4300.h b/include/configs/tplink_wdr4300.h index bdb77cfc2c70..daeaab807185 100644 --- a/include/configs/tplink_wdr4300.h +++ b/include/configs/tplink_wdr4300.h @@ -9,8 +9,6 @@ #define CONFIG_SYS_MHZ 280 #define CONFIG_SYS_MIPS_TIMER_FREQ (CONFIG_SYS_MHZ * 1000000)
-#define CONFIG_SYS_BOOTPARAMS_LEN 0x20000 - #define CONFIG_SYS_SDRAM_BASE 0xa0000000
#define CONFIG_SYS_INIT_RAM_ADDR 0xbd000000 diff --git a/include/configs/vocore2.h b/include/configs/vocore2.h index b924b24c62c2..af792c78ee2c 100644 --- a/include/configs/vocore2.h +++ b/include/configs/vocore2.h @@ -33,9 +33,6 @@
/* RAM */
-/* Memory usage */ -#define CONFIG_SYS_BOOTPARAMS_LEN (128 * 1024) - /* Environment settings */
#endif //__VOCORE2_CONFIG_H__ diff --git a/include/configs/xtfpga.h b/include/configs/xtfpga.h index 4218015c3776..215b7592d2ae 100644 --- a/include/configs/xtfpga.h +++ b/include/configs/xtfpga.h @@ -62,9 +62,6 @@ # define CONFIG_SYS_MONITOR_LEN 0x00040000 /* 256KB */ #endif
-/* Linux boot param area in RAM (used only when booting linux) */ -#define CONFIG_SYS_BOOTPARAMS_LEN (64 << 10) - /* Memory test is destructive so default must not overlap vectors or U-Boot*/
/* Load address for stand-alone applications. diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 7c114cd227f5..06a76b6398ce 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -653,7 +653,6 @@ CONFIG_SYS_BOOTCOUNT_BE CONFIG_SYS_BOOTCOUNT_LE CONFIG_SYS_BOOTMAPSZ CONFIG_SYS_BOOTM_LEN -CONFIG_SYS_BOOTPARAMS_LEN CONFIG_SYS_BOOT_BLOCK CONFIG_SYS_BOOT_RAMDISK_HIGH CONFIG_SYS_CACHE_ACR0