Skip to content

Commit 6889412

Browse files
trinitrini
committed
Convert CONFIG_SYS_BARGSIZE to Kconfig
This converts the following to Kconfig: CONFIG_SYS_BARGSIZE Signed-off-by: Tom Rini <[email protected]>
1 parent d31466b commit 6889412

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

87 files changed

+21
-172
lines changed

‎Kconfig

+8
Original file line numberDiff line numberDiff line change
@@ -228,6 +228,14 @@ config SYS_BOOT_GET_CMDLINE
228228
Enables allocating and saving kernel cmdline in space between
229229
"bootm_low" and "bootm_low" + BOOTMAPSZ.
230230

231+
config SYS_BARGSIZE
232+
int "Size of kernel command line buffer in bytes"
233+
depends on SYS_BOOT_GET_CMDLINE
234+
default 512
235+
help
236+
Buffer size for Boot Arguments which are passed to the application
237+
(usually a Linux kernel) when it is booted
238+
231239
config SYS_BOOT_GET_KBD
232240
bool "Enable kernel board information setup"
233241
help

‎README

-4
Original file line numberDiff line numberDiff line change
@@ -1853,10 +1853,6 @@ Configuration Settings:
18531853
- CONFIG_SYS_PROMPT: This is what U-Boot prints on the console to
18541854
prompt for user input.
18551855

1856-
- CONFIG_SYS_BARGSIZE: Buffer size for Boot Arguments which are passed to
1857-
the application (usually a Linux kernel) when it is
1858-
booted
1859-
18601856
- CONFIG_SYS_BAUDRATE_TABLE:
18611857
List of legal baudrate settings for this board.
18621858

‎boot/image-board.c

+2-4
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,6 @@
2121
#include <asm/cache.h>
2222
#include <asm/global_data.h>
2323

24-
#ifndef CONFIG_SYS_BARGSIZE
25-
#define CONFIG_SYS_BARGSIZE 512
26-
#endif
27-
2824
DECLARE_GLOBAL_DATA_PTR;
2925

3026
#if CONFIG_IS_ENABLED(LEGACY_IMAGE_FORMAT)
@@ -827,6 +823,7 @@ int boot_get_loadable(int argc, char *const argv[], bootm_headers_t *images,
827823
return 0;
828824
}
829825

826+
#ifdef CONFIG_SYS_BOOT_GET_CMDLINE
830827
/**
831828
* boot_get_cmdline - allocate and initialize kernel cmdline
832829
* @lmb: pointer to lmb handle, will be used for memory mgmt
@@ -900,6 +897,7 @@ int boot_get_kbd(struct lmb *lmb, struct bd_info **kbd)
900897

901898
return 0;
902899
}
900+
#endif
903901

904902
int image_setup_linux(bootm_headers_t *images)
905903
{

‎configs/eb_cpu5282_defconfig

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ CONFIG_SYS_LOAD_ADDR=0x20000
77
CONFIG_ENV_ADDR=0xFF040000
88
CONFIG_TARGET_EB_CPU5282=y
99
CONFIG_MCFTMR=y
10+
CONFIG_SYS_BARGSIZE=1024
1011
CONFIG_SYS_MONITOR_BASE=0xFF000400
1112
CONFIG_BOOTDELAY=5
1213
CONFIG_BOOT_RETRY=y

‎configs/eb_cpu5282_internal_defconfig

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ CONFIG_SYS_LOAD_ADDR=0x20000
77
CONFIG_ENV_ADDR=0xFF040000
88
CONFIG_TARGET_EB_CPU5282=y
99
CONFIG_MCFTMR=y
10+
CONFIG_SYS_BARGSIZE=1024
1011
CONFIG_SYS_MONITOR_BASE=0xF0000418
1112
CONFIG_BOOTDELAY=5
1213
CONFIG_BOOT_RETRY=y

‎configs/gazerbeam_defconfig

+1
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,7 @@ CONFIG_SYS_FPGA_FLAVOR_GAZERBEAM=y
112112
CONFIG_CMD_IOLOOP=y
113113
CONFIG_SYS_MEMTEST_START=0x00001000
114114
CONFIG_SYS_MEMTEST_END=0x07e00000
115+
CONFIG_SYS_BARGSIZE=1024
115116
CONFIG_FIT=y
116117
CONFIG_FIT_SIGNATURE=y
117118
CONFIG_FIT_VERBOSE=y

‎configs/ids8313_defconfig

+1
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,7 @@ CONFIG_ACR_PIPE_DEP_4=y
119119
CONFIG_ACR_RPTCNT_4=y
120120
CONFIG_LCRR_EADC_1=y
121121
CONFIG_LCRR_CLKDIV_2=y
122+
CONFIG_SYS_BARGSIZE=1024
122123
CONFIG_FIT=y
123124
CONFIG_FIT_SIGNATURE=y
124125
CONFIG_LEGACY_IMAGE_FORMAT=y

‎configs/stmark2_defconfig

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ CONFIG_DEFAULT_DEVICE_TREE="stmark2"
88
CONFIG_SYS_LOAD_ADDR=0x40010000
99
CONFIG_TARGET_STMARK2=y
1010
CONFIG_MCFTMR=y
11+
CONFIG_SYS_BARGSIZE=256
1112
CONFIG_TIMESTAMP=y
1213
CONFIG_SYS_MONITOR_BASE=0x47E00400
1314
CONFIG_USE_BOOTARGS=y

‎include/configs/am3517_evm.h

-3
Original file line numberDiff line numberDiff line change
@@ -86,9 +86,6 @@
8686

8787
/* Miscellaneous configurable options */
8888

89-
/* Boot Argument Buffer Size */
90-
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
91-
9289
/* memtest works on */
9390

9491
/* Physical Memory Map */

‎include/configs/apalis-imx8.h

-2
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,4 @@
7373
#define PHYS_SDRAM_1_SIZE SZ_2G /* 2 GB */
7474
#define PHYS_SDRAM_2_SIZE SZ_2G /* 2 GB */
7575

76-
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
77-
7876
#endif /* __APALIS_IMX8_H */

‎include/configs/apalis-tk1.h

-4
Original file line numberDiff line numberDiff line change
@@ -89,10 +89,6 @@
8989
"source ${loadaddr}\0" \
9090
"vidargs=fbcon=map:1\0"
9191

92-
/* Increase arguments buffer size */
93-
#undef CONFIG_SYS_BARGSIZE
94-
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
95-
9692
#include "tegra-common-post.h"
9793

9894
#endif /* __CONFIG_H */

‎include/configs/apalis_t30.h

-4
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,6 @@
2626
/* PCI networking support */
2727
#define CONFIG_E1000_NO_NVM
2828

29-
/* Increase arguments buffer size */
30-
#undef CONFIG_SYS_BARGSIZE
31-
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
32-
3329
#define UBOOT_UPDATE \
3430
"uboot_hwpart=1\0" \
3531
"uboot_blk=0\0" \

‎include/configs/ax25-ae350.h

-5
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,6 @@
3030
* Miscellaneous configurable options
3131
*/
3232

33-
/*
34-
* Boot Argument Buffer Size
35-
*/
36-
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
37-
3833
/* DT blob (fdt) address */
3934
#define CONFIG_SYS_FDT_BASE 0x800f0000
4035

‎include/configs/bcm_ns3.h

-2
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,6 @@
2929
/* console configuration */
3030
#define CONFIG_SYS_NS16550_CLK 25000000
3131

32-
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
33-
3432
/*
3533
* Increase max uncompressed/gunzip size, keeping size same as EMMC linux
3634
* partition.

‎include/configs/capricorn-common.h

-3
Original file line numberDiff line numberDiff line change
@@ -117,9 +117,6 @@
117117
#define PHYS_SDRAM_1_SIZE 0x40000000 /* 1 GB */
118118
#define PHYS_SDRAM_2_SIZE 0x00000000 /* 0 GB */
119119

120-
/* Console buffer and boot args */
121-
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
122-
123120
#define BOOTAUX_RESERVED_MEM_BASE 0x88000000
124121
#define BOOTAUX_RESERVED_MEM_SIZE SZ_128M /* Reserve from second 128MB */
125122

‎include/configs/ci20.h

-3
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,6 @@
2828
#define DM9000_IO CONFIG_DM9000_BASE
2929
#define DM9000_DATA (CONFIG_DM9000_BASE + 2)
3030

31-
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
32-
/* Boot argument buffer size */
33-
3431
/* Miscellaneous configuration options */
3532
#define CONFIG_SYS_BOOTM_LEN (64 << 20)
3633

‎include/configs/colibri-imx8x.h

-2
Original file line numberDiff line numberDiff line change
@@ -106,8 +106,6 @@
106106
#define PHYS_SDRAM_1_SIZE SZ_2G /* 2 GB */
107107
#define PHYS_SDRAM_2_SIZE 0x00000000 /* 0 GB */
108108

109-
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
110-
111109
/* Generic Timer Definitions */
112110

113111
#define BOOTAUX_RESERVED_MEM_BASE 0x88000000

‎include/configs/colibri_t20.h

-4
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,6 @@
2828
"mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0" \
2929
UBOOT_UPDATE
3030

31-
/* Increase arguments buffer size */
32-
#undef CONFIG_SYS_BARGSIZE
33-
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
34-
3531
#include "tegra-common-post.h"
3632

3733
#endif /* __CONFIG_H */

‎include/configs/colibri_t30.h

-4
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,6 @@
2424
#define CONFIG_TEGRA_ENABLE_UARTA
2525
#define CONFIG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE
2626

27-
/* Increase arguments buffer size */
28-
#undef CONFIG_SYS_BARGSIZE
29-
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
30-
3127
#define UBOOT_UPDATE \
3228
"uboot_hwpart=1\0" \
3329
"uboot_blk=0\0" \

‎include/configs/colibri_vf.h

-1
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,6 @@
8282
"video-mode=dcufb:640x480-16@60,monitor=lcd\0"
8383

8484
/* Miscellaneous configurable options */
85-
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
8685

8786
/* Physical memory map */
8887
#define PHYS_SDRAM (0x80000000)

‎include/configs/da850evm.h

-1
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,6 @@
148148
/*
149149
* U-Boot general configuration
150150
*/
151-
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE /* Boot Args Buffer Size */
152151

153152
/*
154153
* Linux Information

‎include/configs/devkit3250.h

-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@
6464
/*
6565
* U-Boot General Configurations
6666
*/
67-
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
6867

6968
/*
7069
* Pass open firmware flat tree

‎include/configs/devkit8000.h

-2
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,6 @@
111111
"fi; " \
112112
"else run nandboot; fi\0"
113113

114-
/* Boot Argument Buffer Size */
115-
116114
/* Defines for SPL */
117115

118116
/* NAND boot config */

‎include/configs/display5.h

-2
Original file line numberDiff line numberDiff line change
@@ -285,8 +285,6 @@
285285

286286
/* Miscellaneous configurable options */
287287

288-
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
289-
290288
#define CONFIG_STANDALONE_LOAD_ADDR 0x10001000
291289

292290
/* Physical Memory Map */

‎include/configs/eb_cpu5282.h

-2
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,6 @@
2929
* Environment is in the second sector of the first 256k of flash *
3030
*----------------------------------------------------------------------*/
3131

32-
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
33-
3432
/*#define CONFIG_SYS_DRAM_TEST 1 */
3533
#undef CONFIG_SYS_DRAM_TEST
3634

‎include/configs/edison.h

-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@
1010

1111
/* Miscellaneous configurable options */
1212

13-
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
14-
1513
#define CONFIG_SYS_STACK_SIZE (32 * 1024)
1614

1715
#define CONFIG_SYS_MONITOR_LEN (256 * 1024)

‎include/configs/exynos-common.h

-3
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,4 @@
2727

2828
/* Miscellaneous configurable options */
2929

30-
/* Boot Argument Buffer Size */
31-
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
32-
3330
#endif /* __CONFIG_H */

‎include/configs/exynos7420-common.h

-3
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@
1717

1818
/* Miscellaneous configurable options */
1919

20-
/* Boot Argument Buffer Size */
21-
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
22-
2320
/* select serial console configuration */
2421

2522
/* IRAM Layout */

‎include/configs/exynos78x0-common.h

-3
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,6 @@
2020

2121
/* Miscellaneous configurable options */
2222

23-
/* Boot Argument Buffer Size */
24-
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
25-
2623
#define CPU_RELEASE_ADDR secondary_boot_addr
2724

2825
#define CONFIG_SYS_BAUDRATE_TABLE \

‎include/configs/gazerbeam.h

-2
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,6 @@
5858
* Miscellaneous configurable options
5959
*/
6060

61-
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
62-
6361
/*
6462
* For booting Linux, the board info and command line data
6563
* have to be in the first 256 MB of memory, since this is

‎include/configs/highbank.h

-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
/*
2020
* Miscellaneous configurable options
2121
*/
22-
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
2322

2423
#define CONFIG_SYS_64BIT_LBA
2524

‎include/configs/ids8313.h

-1
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,6 @@
216216
/*
217217
* Miscellaneous configurable options
218218
*/
219-
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
220219

221220
#define CONFIG_LOADS_ECHO
222221
#undef CONFIG_SYS_LOADS_BAUD_CHANGE

‎include/configs/imx27lite-common.h

-3
Original file line numberDiff line numberDiff line change
@@ -106,9 +106,6 @@
106106
/*
107107
* U-Boot general configuration
108108
*/
109-
/* Boot Argument Buffer Size */
110-
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
111-
112109
#define CONFIG_EXTRA_ENV_SETTINGS \
113110
"netdev=eth0\0" \
114111
"nfsargs=setenv bootargs root=/dev/nfs rw " \

‎include/configs/imx8mm-cl-iot-gate.h

-2
Original file line numberDiff line numberDiff line change
@@ -147,8 +147,6 @@
147147

148148
#define CONFIG_MXC_UART_BASE UART_BASE_ADDR(3)
149149

150-
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
151-
152150
/* USDHC */
153151

154152
#define CONFIG_SYS_FSL_USDHC_NUM 2

‎include/configs/imx8mm_beacon.h

-1
Original file line numberDiff line numberDiff line change
@@ -93,5 +93,4 @@
9393

9494
#define CONFIG_MXC_UART_BASE UART_BASE_ADDR(2)
9595

96-
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
9796
#endif

‎include/configs/imx8mm_data_modul_edm_sbc.h

-2
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,6 @@
4343

4444
#define CONFIG_MXC_UART_BASE UART3_BASE_ADDR
4545

46-
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
47-
4846
/* PHY needs a longer autonegotiation timeout after reset */
4947
#define PHY_ANEG_TIMEOUT 20000
5048

‎include/configs/imx8mm_evk.h

-2
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,6 @@
7070

7171
#define CONFIG_MXC_UART_BASE UART_BASE_ADDR(2)
7272

73-
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
74-
7573
#define CONFIG_FEC_MXC_PHYADDR 0
7674

7775
#endif

‎include/configs/imx8mm_icore_mx8mm.h

-2
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,6 @@
6868
/* UART */
6969
#define CONFIG_MXC_UART_BASE UART_BASE_ADDR(2)
7070

71-
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
72-
7371
/* USDHC */
7472
#define CONFIG_SYS_FSL_USDHC_NUM 2
7573
#define CONFIG_SYS_FSL_ESDHC_ADDR 0

‎include/configs/imx8mm_venice.h

+3-1
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,8 @@
104104
/* UART */
105105
#define CONFIG_MXC_UART_BASE UART_BASE_ADDR(2)
106106

107-
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
107+
/* FEC */
108+
#define CONFIG_FEC_MXC_PHYADDR 0
109+
#define FEC_QUIRK_ENET_MAC
108110

109111
#endif

‎include/configs/imx8mn_beacon.h

-1
Original file line numberDiff line numberDiff line change
@@ -109,5 +109,4 @@
109109

110110
#define CONFIG_MXC_UART_BASE UART_BASE_ADDR(2)
111111

112-
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
113112
#endif

‎include/configs/imx8mn_bsh_smm_s2_common.h

-2
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,6 @@
4747

4848
#define CONFIG_MXC_UART_BASE UART4_BASE_ADDR
4949

50-
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
51-
5250
/* I2C */
5351

5452
#endif /* __IMX8MN_BSH_SMM_S2_COMMON_H */

0 commit comments

Comments
 (0)