diff --git a/Kconfig b/Kconfig
index 797038b0371d..81781ab8fd04 100644
--- a/Kconfig
+++ b/Kconfig
@@ -228,6 +228,14 @@ config SYS_BOOT_GET_CMDLINE
 	  Enables allocating and saving kernel cmdline in space between
 	  "bootm_low" and "bootm_low" + BOOTMAPSZ.
 
+config SYS_BARGSIZE
+	int "Size of kernel command line buffer in bytes"
+	depends on SYS_BOOT_GET_CMDLINE
+	default 512
+	help
+	  Buffer size for Boot Arguments which are passed to the application
+	  (usually a Linux kernel) when it is booted
+
 config SYS_BOOT_GET_KBD
 	bool "Enable kernel board information setup"
 	help
diff --git a/README b/README
index e738fa9273f6..e686839637f7 100644
--- a/README
+++ b/README
@@ -1853,10 +1853,6 @@ Configuration Settings:
 - CONFIG_SYS_PROMPT:	This is what U-Boot prints on the console to
 		prompt for user input.
 
-- CONFIG_SYS_BARGSIZE: Buffer size for Boot Arguments which are passed to
-		the application (usually a Linux kernel) when it is
-		booted
-
 - CONFIG_SYS_BAUDRATE_TABLE:
 		List of legal baudrate settings for this board.
 
diff --git a/boot/image-board.c b/boot/image-board.c
index 0d2e0fc9692e..cfc1c658e3a6 100644
--- a/boot/image-board.c
+++ b/boot/image-board.c
@@ -21,10 +21,6 @@
 #include <asm/cache.h>
 #include <asm/global_data.h>
 
-#ifndef CONFIG_SYS_BARGSIZE
-#define CONFIG_SYS_BARGSIZE 512
-#endif
-
 DECLARE_GLOBAL_DATA_PTR;
 
 #if CONFIG_IS_ENABLED(LEGACY_IMAGE_FORMAT)
@@ -827,6 +823,7 @@ int boot_get_loadable(int argc, char *const argv[], bootm_headers_t *images,
 	return 0;
 }
 
+#ifdef CONFIG_SYS_BOOT_GET_CMDLINE
 /**
  * boot_get_cmdline - allocate and initialize kernel cmdline
  * @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)
 
 	return 0;
 }
+#endif
 
 int image_setup_linux(bootm_headers_t *images)
 {
diff --git a/configs/eb_cpu5282_defconfig b/configs/eb_cpu5282_defconfig
index f8c0198d25e1..5a33e2f0ae2d 100644
--- a/configs/eb_cpu5282_defconfig
+++ b/configs/eb_cpu5282_defconfig
@@ -7,6 +7,7 @@ CONFIG_SYS_LOAD_ADDR=0x20000
 CONFIG_ENV_ADDR=0xFF040000
 CONFIG_TARGET_EB_CPU5282=y
 CONFIG_MCFTMR=y
+CONFIG_SYS_BARGSIZE=1024
 CONFIG_SYS_MONITOR_BASE=0xFF000400
 CONFIG_BOOTDELAY=5
 CONFIG_BOOT_RETRY=y
diff --git a/configs/eb_cpu5282_internal_defconfig b/configs/eb_cpu5282_internal_defconfig
index 93b860d83705..d23b7170cdd1 100644
--- a/configs/eb_cpu5282_internal_defconfig
+++ b/configs/eb_cpu5282_internal_defconfig
@@ -7,6 +7,7 @@ CONFIG_SYS_LOAD_ADDR=0x20000
 CONFIG_ENV_ADDR=0xFF040000
 CONFIG_TARGET_EB_CPU5282=y
 CONFIG_MCFTMR=y
+CONFIG_SYS_BARGSIZE=1024
 CONFIG_SYS_MONITOR_BASE=0xF0000418
 CONFIG_BOOTDELAY=5
 CONFIG_BOOT_RETRY=y
diff --git a/configs/gazerbeam_defconfig b/configs/gazerbeam_defconfig
index 2f3b29e9918a..c48541a9ec5c 100644
--- a/configs/gazerbeam_defconfig
+++ b/configs/gazerbeam_defconfig
@@ -112,6 +112,7 @@ CONFIG_SYS_FPGA_FLAVOR_GAZERBEAM=y
 CONFIG_CMD_IOLOOP=y
 CONFIG_SYS_MEMTEST_START=0x00001000
 CONFIG_SYS_MEMTEST_END=0x07e00000
+CONFIG_SYS_BARGSIZE=1024
 CONFIG_FIT=y
 CONFIG_FIT_SIGNATURE=y
 CONFIG_FIT_VERBOSE=y
diff --git a/configs/ids8313_defconfig b/configs/ids8313_defconfig
index c885de7663d0..b8070e7351a6 100644
--- a/configs/ids8313_defconfig
+++ b/configs/ids8313_defconfig
@@ -119,6 +119,7 @@ CONFIG_ACR_PIPE_DEP_4=y
 CONFIG_ACR_RPTCNT_4=y
 CONFIG_LCRR_EADC_1=y
 CONFIG_LCRR_CLKDIV_2=y
+CONFIG_SYS_BARGSIZE=1024
 CONFIG_FIT=y
 CONFIG_FIT_SIGNATURE=y
 CONFIG_LEGACY_IMAGE_FORMAT=y
diff --git a/configs/stmark2_defconfig b/configs/stmark2_defconfig
index 64ac6614e9e9..e56ca93d4b8e 100644
--- a/configs/stmark2_defconfig
+++ b/configs/stmark2_defconfig
@@ -8,6 +8,7 @@ CONFIG_DEFAULT_DEVICE_TREE="stmark2"
 CONFIG_SYS_LOAD_ADDR=0x40010000
 CONFIG_TARGET_STMARK2=y
 CONFIG_MCFTMR=y
+CONFIG_SYS_BARGSIZE=256
 CONFIG_TIMESTAMP=y
 CONFIG_SYS_MONITOR_BASE=0x47E00400
 CONFIG_USE_BOOTARGS=y
diff --git a/include/configs/am3517_evm.h b/include/configs/am3517_evm.h
index 8b96f8168336..db3298781d1c 100644
--- a/include/configs/am3517_evm.h
+++ b/include/configs/am3517_evm.h
@@ -86,9 +86,6 @@
 
 /* Miscellaneous configurable options */
 
-/* Boot Argument Buffer Size */
-#define CONFIG_SYS_BARGSIZE		CONFIG_SYS_CBSIZE
-
 /* memtest works on */
 
 /* Physical Memory Map */
diff --git a/include/configs/apalis-imx8.h b/include/configs/apalis-imx8.h
index 837c344b7a30..3a0d19613be2 100644
--- a/include/configs/apalis-imx8.h
+++ b/include/configs/apalis-imx8.h
@@ -73,6 +73,4 @@
 #define PHYS_SDRAM_1_SIZE		SZ_2G		/* 2 GB */
 #define PHYS_SDRAM_2_SIZE		SZ_2G		/* 2 GB */
 
-#define CONFIG_SYS_BARGSIZE		CONFIG_SYS_CBSIZE
-
 #endif /* __APALIS_IMX8_H */
diff --git a/include/configs/apalis-tk1.h b/include/configs/apalis-tk1.h
index ee9e9b2103f9..19e6a1e04eeb 100644
--- a/include/configs/apalis-tk1.h
+++ b/include/configs/apalis-tk1.h
@@ -89,10 +89,6 @@
 		"source ${loadaddr}\0" \
 	"vidargs=fbcon=map:1\0"
 
-/* Increase arguments buffer size */
-#undef CONFIG_SYS_BARGSIZE
-#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
-
 #include "tegra-common-post.h"
 
 #endif /* __CONFIG_H */
diff --git a/include/configs/apalis_t30.h b/include/configs/apalis_t30.h
index 46ccea9c3e22..104c4135e284 100644
--- a/include/configs/apalis_t30.h
+++ b/include/configs/apalis_t30.h
@@ -26,10 +26,6 @@
 /* PCI networking support */
 #define CONFIG_E1000_NO_NVM
 
-/* Increase arguments buffer size */
-#undef CONFIG_SYS_BARGSIZE
-#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
-
 #define UBOOT_UPDATE \
 	"uboot_hwpart=1\0" \
 	"uboot_blk=0\0" \
diff --git a/include/configs/ax25-ae350.h b/include/configs/ax25-ae350.h
index 16545ca94131..633be8f61414 100644
--- a/include/configs/ax25-ae350.h
+++ b/include/configs/ax25-ae350.h
@@ -30,11 +30,6 @@
  * Miscellaneous configurable options
  */
 
-/*
- * Boot Argument Buffer Size
- */
-#define CONFIG_SYS_BARGSIZE	CONFIG_SYS_CBSIZE
-
 /* DT blob (fdt) address */
 #define CONFIG_SYS_FDT_BASE		0x800f0000
 
diff --git a/include/configs/bcm_ns3.h b/include/configs/bcm_ns3.h
index 85d8e31ef08f..87c9f5e2dde7 100644
--- a/include/configs/bcm_ns3.h
+++ b/include/configs/bcm_ns3.h
@@ -29,8 +29,6 @@
 /* console configuration */
 #define CONFIG_SYS_NS16550_CLK		25000000
 
-#define CONFIG_SYS_BARGSIZE		CONFIG_SYS_CBSIZE
-
 /*
  * Increase max uncompressed/gunzip size, keeping size same as EMMC linux
  * partition.
diff --git a/include/configs/capricorn-common.h b/include/configs/capricorn-common.h
index 5731a9e11105..63d02c5b44fb 100644
--- a/include/configs/capricorn-common.h
+++ b/include/configs/capricorn-common.h
@@ -117,9 +117,6 @@
 #define PHYS_SDRAM_1_SIZE		0x40000000	/* 1 GB */
 #define PHYS_SDRAM_2_SIZE		0x00000000	/* 0 GB */
 
-/* Console buffer and boot args */
-#define CONFIG_SYS_BARGSIZE		CONFIG_SYS_CBSIZE
-
 #define BOOTAUX_RESERVED_MEM_BASE	0x88000000
 #define BOOTAUX_RESERVED_MEM_SIZE	SZ_128M /* Reserve from second 128MB */
 
diff --git a/include/configs/ci20.h b/include/configs/ci20.h
index 016e1079309a..4af11496cb15 100644
--- a/include/configs/ci20.h
+++ b/include/configs/ci20.h
@@ -28,9 +28,6 @@
 #define DM9000_IO			CONFIG_DM9000_BASE
 #define DM9000_DATA			(CONFIG_DM9000_BASE + 2)
 
-#define CONFIG_SYS_BARGSIZE	CONFIG_SYS_CBSIZE
-						/* Boot argument buffer size */
-
 /* Miscellaneous configuration options */
 #define CONFIG_SYS_BOOTM_LEN		(64 << 20)
 
diff --git a/include/configs/colibri-imx8x.h b/include/configs/colibri-imx8x.h
index c94c704dc784..852e81658743 100644
--- a/include/configs/colibri-imx8x.h
+++ b/include/configs/colibri-imx8x.h
@@ -106,8 +106,6 @@
 #define PHYS_SDRAM_1_SIZE		SZ_2G		/* 2 GB */
 #define PHYS_SDRAM_2_SIZE		0x00000000	/* 0 GB */
 
-#define CONFIG_SYS_BARGSIZE		CONFIG_SYS_CBSIZE
-
 /* Generic Timer Definitions */
 
 #define BOOTAUX_RESERVED_MEM_BASE 0x88000000
diff --git a/include/configs/colibri_t20.h b/include/configs/colibri_t20.h
index 315e95998fb4..1e6561dc281b 100644
--- a/include/configs/colibri_t20.h
+++ b/include/configs/colibri_t20.h
@@ -28,10 +28,6 @@
 	"mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0" \
 	UBOOT_UPDATE
 
-/* Increase arguments buffer size */
-#undef CONFIG_SYS_BARGSIZE
-#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
-
 #include "tegra-common-post.h"
 
 #endif /* __CONFIG_H */
diff --git a/include/configs/colibri_t30.h b/include/configs/colibri_t30.h
index 36e01dd9d892..c9d384e2bdbe 100644
--- a/include/configs/colibri_t30.h
+++ b/include/configs/colibri_t30.h
@@ -24,10 +24,6 @@
 #define CONFIG_TEGRA_ENABLE_UARTA
 #define CONFIG_SYS_NS16550_COM1		NV_PA_APB_UARTA_BASE
 
-/* Increase arguments buffer size */
-#undef CONFIG_SYS_BARGSIZE
-#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
-
 #define UBOOT_UPDATE \
 	"uboot_hwpart=1\0" \
 	"uboot_blk=0\0" \
diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h
index d739e461e79c..7c313f94fe9b 100644
--- a/include/configs/colibri_vf.h
+++ b/include/configs/colibri_vf.h
@@ -82,7 +82,6 @@
 	"video-mode=dcufb:640x480-16@60,monitor=lcd\0"
 
 /* Miscellaneous configurable options */
-#define CONFIG_SYS_BARGSIZE		CONFIG_SYS_CBSIZE
 
 /* Physical memory map */
 #define PHYS_SDRAM			(0x80000000)
diff --git a/include/configs/da850evm.h b/include/configs/da850evm.h
index 842158ae6d6f..12f5bbf51278 100644
--- a/include/configs/da850evm.h
+++ b/include/configs/da850evm.h
@@ -148,7 +148,6 @@
 /*
  * U-Boot general configuration
  */
-#define CONFIG_SYS_BARGSIZE	CONFIG_SYS_CBSIZE /* Boot Args Buffer Size */
 
 /*
  * Linux Information
diff --git a/include/configs/devkit3250.h b/include/configs/devkit3250.h
index 5e8310c1933e..93a704cc31d6 100644
--- a/include/configs/devkit3250.h
+++ b/include/configs/devkit3250.h
@@ -64,7 +64,6 @@
 /*
  * U-Boot General Configurations
  */
-#define CONFIG_SYS_BARGSIZE		CONFIG_SYS_CBSIZE
 
 /*
  * Pass open firmware flat tree
diff --git a/include/configs/devkit8000.h b/include/configs/devkit8000.h
index 5dbd126a2a0f..efb20eacd1e7 100644
--- a/include/configs/devkit8000.h
+++ b/include/configs/devkit8000.h
@@ -111,8 +111,6 @@
 			"fi; " \
 		"else run nandboot; fi\0"
 
-/* Boot Argument Buffer Size */
-
 /* Defines for SPL */
 
 /* NAND boot config */
diff --git a/include/configs/display5.h b/include/configs/display5.h
index 3737503c0c51..93dcec5612bd 100644
--- a/include/configs/display5.h
+++ b/include/configs/display5.h
@@ -285,8 +285,6 @@
 
 /* Miscellaneous configurable options */
 
-#define CONFIG_SYS_BARGSIZE		CONFIG_SYS_CBSIZE
-
 #define CONFIG_STANDALONE_LOAD_ADDR	0x10001000
 
 /* Physical Memory Map */
diff --git a/include/configs/eb_cpu5282.h b/include/configs/eb_cpu5282.h
index 5ad769cce994..9374928a9e4b 100644
--- a/include/configs/eb_cpu5282.h
+++ b/include/configs/eb_cpu5282.h
@@ -29,8 +29,6 @@
  * Environment is in the second sector of the first 256k of flash	*
  *----------------------------------------------------------------------*/
 
-#define CONFIG_SYS_BARGSIZE	CONFIG_SYS_CBSIZE
-
 /*#define CONFIG_SYS_DRAM_TEST		1 */
 #undef CONFIG_SYS_DRAM_TEST
 
diff --git a/include/configs/edison.h b/include/configs/edison.h
index a6ec6389b073..34536ecf8505 100644
--- a/include/configs/edison.h
+++ b/include/configs/edison.h
@@ -10,8 +10,6 @@
 
 /* Miscellaneous configurable options */
 
-#define CONFIG_SYS_BARGSIZE	CONFIG_SYS_CBSIZE
-
 #define CONFIG_SYS_STACK_SIZE			(32 * 1024)
 
 #define CONFIG_SYS_MONITOR_LEN			(256 * 1024)
diff --git a/include/configs/exynos-common.h b/include/configs/exynos-common.h
index 7411552b9bae..cbcef261f432 100644
--- a/include/configs/exynos-common.h
+++ b/include/configs/exynos-common.h
@@ -27,7 +27,4 @@
 
 /* Miscellaneous configurable options */
 
-/* Boot Argument Buffer Size */
-#define CONFIG_SYS_BARGSIZE		CONFIG_SYS_CBSIZE
-
 #endif	/* __CONFIG_H */
diff --git a/include/configs/exynos7420-common.h b/include/configs/exynos7420-common.h
index f9db9a269f0f..e8aed567102e 100644
--- a/include/configs/exynos7420-common.h
+++ b/include/configs/exynos7420-common.h
@@ -17,9 +17,6 @@
 
 /* Miscellaneous configurable options */
 
-/* Boot Argument Buffer Size */
-#define CONFIG_SYS_BARGSIZE		CONFIG_SYS_CBSIZE
-
 /* select serial console configuration */
 
 /* IRAM Layout */
diff --git a/include/configs/exynos78x0-common.h b/include/configs/exynos78x0-common.h
index b443370067a4..3c2a293e5347 100644
--- a/include/configs/exynos78x0-common.h
+++ b/include/configs/exynos78x0-common.h
@@ -20,9 +20,6 @@
 
 /* Miscellaneous configurable options */
 
-/* Boot Argument Buffer Size */
-#define CONFIG_SYS_BARGSIZE		CONFIG_SYS_CBSIZE
-
 #define CPU_RELEASE_ADDR		secondary_boot_addr
 
 #define CONFIG_SYS_BAUDRATE_TABLE \
diff --git a/include/configs/gazerbeam.h b/include/configs/gazerbeam.h
index b15891857754..040fd00bb350 100644
--- a/include/configs/gazerbeam.h
+++ b/include/configs/gazerbeam.h
@@ -58,8 +58,6 @@
  * Miscellaneous configurable options
  */
 
-#define CONFIG_SYS_BARGSIZE	CONFIG_SYS_CBSIZE
-
 /*
  * For booting Linux, the board info and command line data
  * have to be in the first 256 MB of memory, since this is
diff --git a/include/configs/highbank.h b/include/configs/highbank.h
index 98b17af489f6..200cba3e705d 100644
--- a/include/configs/highbank.h
+++ b/include/configs/highbank.h
@@ -19,7 +19,6 @@
 /*
  * Miscellaneous configurable options
  */
-#define CONFIG_SYS_BARGSIZE		CONFIG_SYS_CBSIZE
 
 #define CONFIG_SYS_64BIT_LBA
 
diff --git a/include/configs/ids8313.h b/include/configs/ids8313.h
index 0bd09c00db7e..3fd441e30ba0 100644
--- a/include/configs/ids8313.h
+++ b/include/configs/ids8313.h
@@ -216,7 +216,6 @@
 /*
  * Miscellaneous configurable options
  */
-#define CONFIG_SYS_BARGSIZE		CONFIG_SYS_CBSIZE
 
 #define CONFIG_LOADS_ECHO
 #undef	CONFIG_SYS_LOADS_BAUD_CHANGE
diff --git a/include/configs/imx27lite-common.h b/include/configs/imx27lite-common.h
index 8a214c65b32d..7843f09bb9c7 100644
--- a/include/configs/imx27lite-common.h
+++ b/include/configs/imx27lite-common.h
@@ -106,9 +106,6 @@
 /*
  * U-Boot general configuration
  */
-/* Boot Argument Buffer Size */
-#define CONFIG_SYS_BARGSIZE	CONFIG_SYS_CBSIZE
-
 #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 f31168b1674d..bb29bdce03e0 100644
--- a/include/configs/imx8mm-cl-iot-gate.h
+++ b/include/configs/imx8mm-cl-iot-gate.h
@@ -147,8 +147,6 @@
 
 #define CONFIG_MXC_UART_BASE		UART3_BASE_ADDR
 
-#define CONFIG_SYS_BARGSIZE		CONFIG_SYS_CBSIZE
-
 /* USDHC */
 
 #define CONFIG_SYS_FSL_USDHC_NUM	2
diff --git a/include/configs/imx8mm_beacon.h b/include/configs/imx8mm_beacon.h
index e9d304ce3a24..155ad57f9e1a 100644
--- a/include/configs/imx8mm_beacon.h
+++ b/include/configs/imx8mm_beacon.h
@@ -92,6 +92,4 @@
 #define PHYS_SDRAM_SIZE		0x80000000 /* 2GB DDR */
 
 #define CONFIG_MXC_UART_BASE		UART2_BASE_ADDR
-
-#define CONFIG_SYS_BARGSIZE		CONFIG_SYS_CBSIZE
 #endif
diff --git a/include/configs/imx8mm_data_modul_edm_sbc.h b/include/configs/imx8mm_data_modul_edm_sbc.h
index 7fec59844e06..8105f33be723 100644
--- a/include/configs/imx8mm_data_modul_edm_sbc.h
+++ b/include/configs/imx8mm_data_modul_edm_sbc.h
@@ -43,8 +43,6 @@
 
 #define CONFIG_MXC_UART_BASE		UART3_BASE_ADDR
 
-#define CONFIG_SYS_BARGSIZE		CONFIG_SYS_CBSIZE
-
 /* PHY needs a longer autonegotiation timeout after reset */
 #define PHY_ANEG_TIMEOUT		20000
 #define FEC_QUIRK_ENET_MAC
diff --git a/include/configs/imx8mm_evk.h b/include/configs/imx8mm_evk.h
index ad9da0dbcf68..e086e979dd9c 100644
--- a/include/configs/imx8mm_evk.h
+++ b/include/configs/imx8mm_evk.h
@@ -70,8 +70,6 @@
 
 #define CONFIG_MXC_UART_BASE		UART2_BASE_ADDR
 
-#define CONFIG_SYS_BARGSIZE		CONFIG_SYS_CBSIZE
-
 #define CONFIG_FEC_MXC_PHYADDR          0
 #define FEC_QUIRK_ENET_MAC
 
diff --git a/include/configs/imx8mm_icore_mx8mm.h b/include/configs/imx8mm_icore_mx8mm.h
index 3ec1d06e1c3d..f034f6f7049a 100644
--- a/include/configs/imx8mm_icore_mx8mm.h
+++ b/include/configs/imx8mm_icore_mx8mm.h
@@ -68,8 +68,6 @@
 /* UART */
 #define CONFIG_MXC_UART_BASE		UART2_BASE_ADDR
 
-#define CONFIG_SYS_BARGSIZE		CONFIG_SYS_CBSIZE
-
 /* USDHC */
 #define CONFIG_SYS_FSL_USDHC_NUM	2
 #define CONFIG_SYS_FSL_ESDHC_ADDR	0
diff --git a/include/configs/imx8mm_venice.h b/include/configs/imx8mm_venice.h
index 33ff7f8509e3..0fda754dcca8 100644
--- a/include/configs/imx8mm_venice.h
+++ b/include/configs/imx8mm_venice.h
@@ -104,8 +104,6 @@
 /* UART */
 #define CONFIG_MXC_UART_BASE		UART2_BASE_ADDR
 
-#define CONFIG_SYS_BARGSIZE		CONFIG_SYS_CBSIZE
-
 /* FEC */
 #define CONFIG_FEC_MXC_PHYADDR          0
 #define FEC_QUIRK_ENET_MAC
diff --git a/include/configs/imx8mn_beacon.h b/include/configs/imx8mn_beacon.h
index 36eccc8ea853..77e4dd810460 100644
--- a/include/configs/imx8mn_beacon.h
+++ b/include/configs/imx8mn_beacon.h
@@ -108,6 +108,4 @@
 #endif
 
 #define CONFIG_MXC_UART_BASE		UART2_BASE_ADDR
-
-#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
 #endif
diff --git a/include/configs/imx8mn_bsh_smm_s2_common.h b/include/configs/imx8mn_bsh_smm_s2_common.h
index 8b5a2771447c..367b9ee06072 100644
--- a/include/configs/imx8mn_bsh_smm_s2_common.h
+++ b/include/configs/imx8mn_bsh_smm_s2_common.h
@@ -47,8 +47,6 @@
 
 #define CONFIG_MXC_UART_BASE		UART4_BASE_ADDR
 
-#define CONFIG_SYS_BARGSIZE		CONFIG_SYS_CBSIZE
-
 /* I2C */
 
 #endif /* __IMX8MN_BSH_SMM_S2_COMMON_H */
diff --git a/include/configs/imx8mn_evk.h b/include/configs/imx8mn_evk.h
index 5cfefd3c4ed7..395b8b078028 100644
--- a/include/configs/imx8mn_evk.h
+++ b/include/configs/imx8mn_evk.h
@@ -77,6 +77,4 @@
 
 #define CONFIG_MXC_UART_BASE		UART2_BASE_ADDR
 
-#define CONFIG_SYS_BARGSIZE		CONFIG_SYS_CBSIZE
-
 #endif
diff --git a/include/configs/imx8mn_var_som.h b/include/configs/imx8mn_var_som.h
index d75e334ebebf..03e7341398c7 100644
--- a/include/configs/imx8mn_var_som.h
+++ b/include/configs/imx8mn_var_som.h
@@ -66,8 +66,6 @@
 
 #define CONFIG_MXC_UART_BASE		UART4_BASE_ADDR
 
-#define CONFIG_SYS_BARGSIZE		CONFIG_SYS_CBSIZE
-
 /* USDHC */
 #define CONFIG_SYS_FSL_ESDHC_ADDR	0
 
diff --git a/include/configs/imx8mn_venice.h b/include/configs/imx8mn_venice.h
index 8d67d51df6b7..687801e5c22d 100644
--- a/include/configs/imx8mn_venice.h
+++ b/include/configs/imx8mn_venice.h
@@ -100,8 +100,6 @@
 /* UART */
 #define CONFIG_MXC_UART_BASE		UART2_BASE_ADDR
 
-#define CONFIG_SYS_BARGSIZE		CONFIG_SYS_CBSIZE
-
 /* FEC */
 #define CONFIG_FEC_MXC_PHYADDR          0
 #define FEC_QUIRK_ENET_MAC
diff --git a/include/configs/imx8mp_evk.h b/include/configs/imx8mp_evk.h
index e3a6c422aa0b..cbea3d5625e1 100644
--- a/include/configs/imx8mp_evk.h
+++ b/include/configs/imx8mp_evk.h
@@ -82,6 +82,4 @@
 
 #define CONFIG_MXC_UART_BASE		UART2_BASE_ADDR
 
-#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
-
 #endif
diff --git a/include/configs/imx8mp_rsb3720.h b/include/configs/imx8mp_rsb3720.h
index 09d525ef0ba1..4e45ed7b4985 100644
--- a/include/configs/imx8mp_rsb3720.h
+++ b/include/configs/imx8mp_rsb3720.h
@@ -171,8 +171,6 @@
 
 #define CONFIG_MXC_UART_BASE		UART3_BASE_ADDR
 
-#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
-
 #define CONFIG_SYS_FSL_USDHC_NUM	2
 #define CONFIG_SYS_FSL_ESDHC_ADDR	0
 
diff --git a/include/configs/imx8mp_venice.h b/include/configs/imx8mp_venice.h
index e2a4c80aa1e0..68313856f04b 100644
--- a/include/configs/imx8mp_venice.h
+++ b/include/configs/imx8mp_venice.h
@@ -99,6 +99,4 @@
 
 /* UART */
 #define CONFIG_MXC_UART_BASE		UART2_BASE_ADDR
-
-#define CONFIG_SYS_BARGSIZE		CONFIG_SYS_CBSIZE
 #endif
diff --git a/include/configs/imx8mq_cm.h b/include/configs/imx8mq_cm.h
index b25837599224..31a8274d578a 100644
--- a/include/configs/imx8mq_cm.h
+++ b/include/configs/imx8mq_cm.h
@@ -73,8 +73,6 @@
 
 #define CONFIG_MXC_UART_BASE		UART1_BASE_ADDR
 
-#define CONFIG_SYS_BARGSIZE		CONFIG_SYS_CBSIZE
-
 #define CONFIG_SYS_FSL_USDHC_NUM		2
 #define CONFIG_SYS_FSL_ESDHC_ADDR       0
 
diff --git a/include/configs/imx8mq_evk.h b/include/configs/imx8mq_evk.h
index 3a69e8e16ea0..b31d7534bd0d 100644
--- a/include/configs/imx8mq_evk.h
+++ b/include/configs/imx8mq_evk.h
@@ -80,8 +80,6 @@
 
 #define CONFIG_MXC_UART_BASE		UART1_BASE_ADDR
 
-#define CONFIG_SYS_BARGSIZE		CONFIG_SYS_CBSIZE
-
 #define CONFIG_SYS_FSL_USDHC_NUM	2
 #define CONFIG_SYS_FSL_ESDHC_ADDR       0
 
diff --git a/include/configs/imx8mq_phanbell.h b/include/configs/imx8mq_phanbell.h
index 41af9ae405a3..1950de567eab 100644
--- a/include/configs/imx8mq_phanbell.h
+++ b/include/configs/imx8mq_phanbell.h
@@ -108,8 +108,6 @@
 
 #define CONFIG_MXC_UART_BASE		UART1_BASE_ADDR
 
-#define CONFIG_SYS_BARGSIZE		CONFIG_SYS_CBSIZE
-
 #define CONFIG_SYS_FSL_USDHC_NUM	2
 #define CONFIG_SYS_FSL_ESDHC_ADDR       0
 
diff --git a/include/configs/imx8qxp_mek.h b/include/configs/imx8qxp_mek.h
index c8decee03376..8eb6ab8552b8 100644
--- a/include/configs/imx8qxp_mek.h
+++ b/include/configs/imx8qxp_mek.h
@@ -128,6 +128,5 @@
 #endif
 
 /* Misc configuration */
-#define CONFIG_SYS_BARGSIZE	CONFIG_SYS_CBSIZE
 
 #endif /* __IMX8QXP_MEK_H */
diff --git a/include/configs/imx8ulp_evk.h b/include/configs/imx8ulp_evk.h
index 3f99c6b41440..66bf816ecf0e 100644
--- a/include/configs/imx8ulp_evk.h
+++ b/include/configs/imx8ulp_evk.h
@@ -70,8 +70,6 @@
 #define PHYS_SDRAM			0x80000000
 #define PHYS_SDRAM_SIZE			0x80000000 /* 2GB DDR */
 
-#define CONFIG_SYS_BARGSIZE		CONFIG_SYS_CBSIZE
-
 /* Using ULP WDOG for reset */
 #define WDOG_BASE_ADDR			WDG3_RBASE
 #endif
diff --git a/include/configs/km/keymile-common.h b/include/configs/km/keymile-common.h
index 76895b4462c1..64d121bb5b51 100644
--- a/include/configs/km/keymile-common.h
+++ b/include/configs/km/keymile-common.h
@@ -12,7 +12,6 @@
 /*
  * Miscellaneous configurable options
  */
-#define CONFIG_SYS_BARGSIZE		CONFIG_SYS_CBSIZE
 
 #define CONFIG_HUSH_INIT_VAR
 
diff --git a/include/configs/legoev3.h b/include/configs/legoev3.h
index 8e0b6d118425..a717bb0ae72c 100644
--- a/include/configs/legoev3.h
+++ b/include/configs/legoev3.h
@@ -50,7 +50,6 @@
 /*
  * U-Boot general configuration
  */
-#define CONFIG_SYS_BARGSIZE	CONFIG_SYS_CBSIZE /* Boot Args Buffer Size */
 
 /*
  * Linux Information
diff --git a/include/configs/ls1021atsn.h b/include/configs/ls1021atsn.h
index 2b90c1d69679..577ba6dfc046 100644
--- a/include/configs/ls1021atsn.h
+++ b/include/configs/ls1021atsn.h
@@ -176,8 +176,6 @@
 /* Miscellaneous configurable options */
 #define CONFIG_SYS_BOOTMAPSZ		(256 << 20)
 
-#define CONFIG_SYS_BARGSIZE		CONFIG_SYS_CBSIZE
-
 #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 e4b86c224090..5b198ad8df02 100644
--- a/include/configs/ls1028a_common.h
+++ b/include/configs/ls1028a_common.h
@@ -58,8 +58,6 @@
 	"run emmc_hdploadcmd; run distro_bootcmd;run emmc_bootcmd; " \
 	"env exists secureboot && esbc_halt;"
 
-#define CONFIG_SYS_BARGSIZE		CONFIG_SYS_CBSIZE /* Boot args buffer */
-
 #define CONFIG_SYS_BOOTM_LEN   (64 << 20)      /* Increase max gunzip size */
 
 #define OCRAM_NONSECURE_SIZE		0x00010000
diff --git a/include/configs/ls1088a_common.h b/include/configs/ls1088a_common.h
index a9922f15ab74..78d3d57eec3a 100644
--- a/include/configs/ls1088a_common.h
+++ b/include/configs/ls1088a_common.h
@@ -148,8 +148,6 @@ unsigned long long get_qixis_addr(void);
 	" 0x580e00000 \0"
 #endif
 
-#define CONFIG_SYS_BARGSIZE		CONFIG_SYS_CBSIZE /* Boot args buffer */
-
 #ifdef CONFIG_SPL
 #define CONFIG_SPL_BSS_START_ADDR      0x80100000
 #define CONFIG_SPL_BSS_MAX_SIZE                0x00100000
diff --git a/include/configs/lx2160a_common.h b/include/configs/lx2160a_common.h
index bc210dab9161..5717a3dd3174 100644
--- a/include/configs/lx2160a_common.h
+++ b/include/configs/lx2160a_common.h
@@ -115,8 +115,6 @@
 #define CONFIG_HWCONFIG
 #define HWCONFIG_BUFFER_SIZE		128
 
-#define CONFIG_SYS_BARGSIZE		CONFIG_SYS_CBSIZE /* Boot args buffer */
-
 #define CONFIG_SYS_BOOTM_LEN   (64 << 20)      /* Increase max gunzip size */
 
 /* Initial environment variables */
diff --git a/include/configs/m53menlo.h b/include/configs/m53menlo.h
index 50941b818d2e..0e89dae7701c 100644
--- a/include/configs/m53menlo.h
+++ b/include/configs/m53menlo.h
@@ -32,8 +32,6 @@
 /*
  * U-Boot general configurations
  */
-#define CONFIG_SYS_BARGSIZE	CONFIG_SYS_CBSIZE
-						/* Boot argument buffer size */
 
 /*
  * Serial Driver
diff --git a/include/configs/mx53ppd.h b/include/configs/mx53ppd.h
index 002a3e5adb12..46b4cce3f8ae 100644
--- a/include/configs/mx53ppd.h
+++ b/include/configs/mx53ppd.h
@@ -87,8 +87,6 @@
 
 /* Miscellaneous configurable options */
 
-#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE /* Boot Argument Buffer Size */
-
 #define CONFIG_SYS_BOOTMAPSZ (256 << 20)     /* 256M */
 
 /* Physical Memory Map */
diff --git a/include/configs/mxs.h b/include/configs/mxs.h
index 7065992a864d..5118c53ad3d0 100644
--- a/include/configs/mxs.h
+++ b/include/configs/mxs.h
@@ -78,8 +78,6 @@
  */
 
 /* U-Boot general configuration */
-#define CONFIG_SYS_BARGSIZE	CONFIG_SYS_CBSIZE
-						/* Boot argument buffer size */
 
 /*
  * Drivers
diff --git a/include/configs/octeontx2_common.h b/include/configs/octeontx2_common.h
index f30851cc8780..4df3be1b1ea9 100644
--- a/include/configs/octeontx2_common.h
+++ b/include/configs/octeontx2_common.h
@@ -22,8 +22,6 @@
 					"ethrotate=yes\0"	\
 					"autoload=0\0"
 
-#define CONFIG_SYS_BARGSIZE		CONFIG_SYS_CBSIZE
-
 #define CONFIG_SYS_MMC_MAX_BLK_COUNT	8192
 
 #if defined(CONFIG_MMC_OCTEONTX)
diff --git a/include/configs/octeontx_common.h b/include/configs/octeontx_common.h
index f79c1c4fdb56..959f3d1347d0 100644
--- a/include/configs/octeontx_common.h
+++ b/include/configs/octeontx_common.h
@@ -53,8 +53,6 @@
 # define CONFIG_SYS_64BIT_LBA
 #endif
 
-#define CONFIG_SYS_BARGSIZE		CONFIG_SYS_CBSIZE
-
 #define CONFIG_SYS_MMC_MAX_BLK_COUNT	8192
 
 /** EMMC specific defines */
diff --git a/include/configs/omapl138_lcdk.h b/include/configs/omapl138_lcdk.h
index a1264bf4db24..b7698c86454c 100644
--- a/include/configs/omapl138_lcdk.h
+++ b/include/configs/omapl138_lcdk.h
@@ -139,7 +139,6 @@
 /*
  * U-Boot general configuration
  */
-#define CONFIG_SYS_BARGSIZE	CONFIG_SYS_CBSIZE /* Boot Args Buffer Size */
 
 /*
  * USB Configs
diff --git a/include/configs/owl-common.h b/include/configs/owl-common.h
index d6948cca2890..0372bd7c79d7 100644
--- a/include/configs/owl-common.h
+++ b/include/configs/owl-common.h
@@ -23,6 +23,5 @@
 #define CONFIG_SYS_INIT_SP_ADDR		(CONFIG_SYS_TEXT_BASE + 0x7ff00)
 
 /* Console configuration */
-#define CONFIG_SYS_BARGSIZE		CONFIG_SYS_CBSIZE
 
 #endif
diff --git a/include/configs/phycore_imx8mm.h b/include/configs/phycore_imx8mm.h
index 4e5dc84c72d9..170d000827e8 100644
--- a/include/configs/phycore_imx8mm.h
+++ b/include/configs/phycore_imx8mm.h
@@ -86,6 +86,4 @@
 /* UART */
 #define CONFIG_MXC_UART_BASE		UART3_BASE_ADDR
 
-#define CONFIG_SYS_BARGSIZE		CONFIG_SYS_CBSIZE
-
 #endif /* __PHYCORE_IMX8MM_H */
diff --git a/include/configs/phycore_imx8mp.h b/include/configs/phycore_imx8mp.h
index 07679f1ce4ff..545845f73380 100644
--- a/include/configs/phycore_imx8mp.h
+++ b/include/configs/phycore_imx8mp.h
@@ -86,6 +86,4 @@
 /* UART */
 #define CONFIG_MXC_UART_BASE		UART1_BASE_ADDR
 
-#define CONFIG_SYS_BARGSIZE		CONFIG_SYS_CBSIZE
-
 #endif /* __PHYCORE_IMX8MP_H */
diff --git a/include/configs/pico-imx8mq.h b/include/configs/pico-imx8mq.h
index 7a0c9c25a9df..11bb1ad28aca 100644
--- a/include/configs/pico-imx8mq.h
+++ b/include/configs/pico-imx8mq.h
@@ -87,8 +87,6 @@
 
 #define CONFIG_MXC_UART_BASE		UART1_BASE_ADDR
 
-#define CONFIG_SYS_BARGSIZE		CONFIG_SYS_CBSIZE
-
 #define CONFIG_SYS_FSL_USDHC_NUM	2
 #define CONFIG_SYS_FSL_ESDHC_ADDR	0
 
diff --git a/include/configs/presidio_asic.h b/include/configs/presidio_asic.h
index dd03c5c03c09..fcec8b0038a2 100644
--- a/include/configs/presidio_asic.h
+++ b/include/configs/presidio_asic.h
@@ -42,7 +42,6 @@
 #define CONFIG_SYS_SDRAM_BASE		PHYS_SDRAM_1
 
 /* Console I/O Buffer Size */
-#define CONFIG_SYS_BARGSIZE		CONFIG_SYS_CBSIZE
 
 #define KSEG1_ATU_XLAT(x) (x)
 
diff --git a/include/configs/rcar-gen3-common.h b/include/configs/rcar-gen3-common.h
index ae585bb2c026..e65ab72ca9c6 100644
--- a/include/configs/rcar-gen3-common.h
+++ b/include/configs/rcar-gen3-common.h
@@ -24,7 +24,6 @@
 #define GICC_BASE	0xF1020000
 
 /* console */
-#define CONFIG_SYS_BARGSIZE		CONFIG_SYS_CBSIZE
 #define CONFIG_SYS_BAUDRATE_TABLE	{ 115200, 38400 }
 
 /* PHY needs a longer autoneg timeout */
diff --git a/include/configs/s5p4418_nanopi2.h b/include/configs/s5p4418_nanopi2.h
index a25dce59da4a..0c2b05dc8c27 100644
--- a/include/configs/s5p4418_nanopi2.h
+++ b/include/configs/s5p4418_nanopi2.h
@@ -77,9 +77,6 @@
  */
 /* board_init_f->init_sequence, call arch_cpu_init */
 
-/* Boot Argument Buffer Size */
-#define CONFIG_SYS_BARGSIZE		CONFIG_SYS_CBSIZE
-
 /*-----------------------------------------------------------------------
  * serial console configuration
  */
diff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h
index 5757b63ab18c..322fd24302fa 100644
--- a/include/configs/siemens-am33x-common.h
+++ b/include/configs/siemens-am33x-common.h
@@ -29,9 +29,6 @@
 
 /* Console I/O Buffer Size */
 
-/* Boot Argument Buffer Size */
-#define CONFIG_SYS_BARGSIZE		CONFIG_SYS_CBSIZE
-
 /*
  * memtest works on 8 MB in DRAM after skipping 32MB from
  * start addr of ram disk
diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h
index 4a099837e931..e8ee53969c49 100644
--- a/include/configs/socfpga_common.h
+++ b/include/configs/socfpga_common.h
@@ -60,8 +60,6 @@
  * U-Boot general configurations
  */
 						/* Print buffer size */
-#define CONFIG_SYS_BARGSIZE	CONFIG_SYS_CBSIZE
-						/* Boot argument buffer size */
 
 /*
  * Cache
diff --git a/include/configs/socfpga_soc64_common.h b/include/configs/socfpga_soc64_common.h
index 14cc708079ab..045e66492e48 100644
--- a/include/configs/socfpga_soc64_common.h
+++ b/include/configs/socfpga_soc64_common.h
@@ -20,7 +20,6 @@
 /*
  * U-Boot console configurations
  */
-#define CONFIG_SYS_BARGSIZE		CONFIG_SYS_CBSIZE
 
 /* Extend size of kernel image for uncompression */
 #define CONFIG_SYS_BOOTM_LEN		(32 * 1024 * 1024)
diff --git a/include/configs/stmark2.h b/include/configs/stmark2.h
index 9c453fce6f71..a56bc4e15401 100644
--- a/include/configs/stmark2.h
+++ b/include/configs/stmark2.h
@@ -45,9 +45,6 @@
 
 #define CONFIG_PRAM			2048	/* 2048 KB */
 
-/* Boot Argument Buffer Size    */
-#define CONFIG_SYS_BARGSIZE		CONFIG_SYS_CBSIZE
-
 #define CONFIG_SYS_MBAR			0xFC000000
 
 /*
diff --git a/include/configs/tegra-common.h b/include/configs/tegra-common.h
index 55c0f27d71fd..eb0359b4db19 100644
--- a/include/configs/tegra-common.h
+++ b/include/configs/tegra-common.h
@@ -35,9 +35,6 @@
  */
 #define CONFIG_SYS_MMC_MAX_DEVICE 4
 
-/* Boot Argument Buffer Size */
-#define CONFIG_SYS_BARGSIZE		(CONFIG_SYS_CBSIZE)
-
 #ifdef CONFIG_ARM64
 #define FDTFILE "nvidia/" CONFIG_DEFAULT_DEVICE_TREE ".dtb"
 #else
diff --git a/include/configs/ti_armv7_common.h b/include/configs/ti_armv7_common.h
index 9e18a6c6d068..90dfb1feeb7d 100644
--- a/include/configs/ti_armv7_common.h
+++ b/include/configs/ti_armv7_common.h
@@ -89,9 +89,6 @@
 /* As stated above, the following choices are optional. */
 
 /* Console I/O Buffer Size */
-/* Boot Argument Buffer Size */
-#define CONFIG_SYS_BARGSIZE		CONFIG_SYS_CBSIZE
-
 /*
  * When we have SPI, NOR or NAND flash we expect to be making use of
  * mtdparts, both for ease of use in U-Boot and for passing information
diff --git a/include/configs/tplink_wdr4300.h b/include/configs/tplink_wdr4300.h
index 30f8376b7e03..bdb77cfc2c70 100644
--- a/include/configs/tplink_wdr4300.h
+++ b/include/configs/tplink_wdr4300.h
@@ -27,8 +27,6 @@
  * Command
  */
 /* Miscellaneous configurable options */
-#define CONFIG_SYS_BARGSIZE	CONFIG_SYS_CBSIZE
-						/* Boot argument buffer size */
 
 /* USB, USB storage, USB ethernet */
 #define CONFIG_EHCI_MMIO_BIG_ENDIAN
diff --git a/include/configs/uniphier.h b/include/configs/uniphier.h
index 9bea5a26077f..cbdb2d91bdad 100644
--- a/include/configs/uniphier.h
+++ b/include/configs/uniphier.h
@@ -41,9 +41,6 @@
 
 #define CONFIG_SYS_MONITOR_LEN		0x00200000	/* 2MB */
 
-/* Boot Argument Buffer Size */
-#define CONFIG_SYS_BARGSIZE		(CONFIG_SYS_CBSIZE)
-
 #if !defined(CONFIG_ARM64)
 /* Time clock 1MHz */
 #define CONFIG_SYS_TIMER_RATE			1000000
diff --git a/include/configs/verdin-imx8mm.h b/include/configs/verdin-imx8mm.h
index 3ca54c42095c..ccb7124371e8 100644
--- a/include/configs/verdin-imx8mm.h
+++ b/include/configs/verdin-imx8mm.h
@@ -86,8 +86,6 @@
 /* UART */
 #define CONFIG_MXC_UART_BASE		UART1_BASE_ADDR
 
-#define CONFIG_SYS_BARGSIZE		CONFIG_SYS_CBSIZE
-
 /* ENET */
 #define CONFIG_FEC_MXC_PHYADDR          7
 #define FEC_QUIRK_ENET_MAC
diff --git a/include/configs/verdin-imx8mp.h b/include/configs/verdin-imx8mp.h
index 976e0c842f62..f2b49d03a9a6 100644
--- a/include/configs/verdin-imx8mp.h
+++ b/include/configs/verdin-imx8mp.h
@@ -103,6 +103,4 @@
 /* UART */
 #define CONFIG_MXC_UART_BASE		UART3_BASE_ADDR
 
-#define CONFIG_SYS_BARGSIZE		CONFIG_SYS_CBSIZE
-
 #endif /* __VERDIN_IMX8MP_H */
diff --git a/include/configs/work_92105.h b/include/configs/work_92105.h
index 9b7cc7a4c4f8..4d46ce024f16 100644
--- a/include/configs/work_92105.h
+++ b/include/configs/work_92105.h
@@ -27,7 +27,6 @@
 /*
  * U-Boot General Configurations
  */
-#define CONFIG_SYS_BARGSIZE		CONFIG_SYS_CBSIZE
 
 /*
  * NAND chip timings for FIXME: which one?
diff --git a/include/configs/xenguest_arm64.h b/include/configs/xenguest_arm64.h
index 322b2cfef820..364dae0cd934 100644
--- a/include/configs/xenguest_arm64.h
+++ b/include/configs/xenguest_arm64.h
@@ -13,8 +13,6 @@
 
 #undef CONFIG_SYS_SDRAM_BASE
 
-#define CONFIG_SYS_BARGSIZE           CONFIG_SYS_CBSIZE
-
 #undef CONFIG_EXTRA_ENV_SETTINGS
 #define CONFIG_EXTRA_ENV_SETTINGS	\
 	"loadimage=ext4load pvblock 0 0x90000000 /boot/Image;\0" \
diff --git a/include/configs/xilinx_versal.h b/include/configs/xilinx_versal.h
index d1e2753cbbe5..3221bd20a71f 100644
--- a/include/configs/xilinx_versal.h
+++ b/include/configs/xilinx_versal.h
@@ -28,7 +28,6 @@
 /* Miscellaneous configurable options */
 
 /* Console I/O Buffer Size */
-#define CONFIG_SYS_BARGSIZE		CONFIG_SYS_CBSIZE
 
 #if defined(CONFIG_CMD_DFU)
 #define DFU_DEFAULT_POLL_TIMEOUT	300
diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h
index 8007020bfa85..6c28be1ac530 100644
--- a/include/configs/xilinx_zynqmp.h
+++ b/include/configs/xilinx_zynqmp.h
@@ -52,7 +52,6 @@
 #endif
 
 /* Console I/O Buffer Size */
-#define CONFIG_SYS_BARGSIZE		CONFIG_SYS_CBSIZE
 
 /* Ethernet driver */
 #if defined(CONFIG_ZYNQ_GEM)
diff --git a/include/configs/xtfpga.h b/include/configs/xtfpga.h
index 89b6d198d7fb..4218015c3776 100644
--- a/include/configs/xtfpga.h
+++ b/include/configs/xtfpga.h
@@ -98,9 +98,6 @@
 /*==============================*/
 
 	/* Console I/O Buffer Size  */
-	/* Boot Argument Buffer Size */
-#define CONFIG_SYS_BARGSIZE		CONFIG_SYS_CBSIZE
-
 /*==============================*/
 /* U-Boot autoboot configuration */
 /*==============================*/
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index a829e75d6177..035aa9a433ad 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -635,7 +635,6 @@ CONFIG_SYS_AT91_SLOW_CLOCK
 CONFIG_SYS_AUTOLOAD
 CONFIG_SYS_AUTOMATIC_SDRAM_DETECTION
 CONFIG_SYS_AUXCORE_BOOTDATA
-CONFIG_SYS_BARGSIZE
 CONFIG_SYS_BAUDRATE_TABLE
 CONFIG_SYS_BFTIC3_BASE
 CONFIG_SYS_BFTIC3_SIZE
