Convert CONFIG_SYS_CBSIZE to Kconfig
This converts the following to Kconfig:
CONFIG_SYS_CBSIZE
Signed-off-by: Tom Rini <trini@konsulko.com>
diff --git a/include/configs/apalis-imx8.h b/include/configs/apalis-imx8.h
index 69b350f..837c344 100644
--- a/include/configs/apalis-imx8.h
+++ b/include/configs/apalis-imx8.h
@@ -73,8 +73,6 @@
#define PHYS_SDRAM_1_SIZE SZ_2G /* 2 GB */
#define PHYS_SDRAM_2_SIZE SZ_2G /* 2 GB */
-/* Monitor Command Prompt */
-#define CONFIG_SYS_CBSIZE SZ_2K
#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 fc802d1..ee9e9b2 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 console I/O buffer size */
-#undef CONFIG_SYS_CBSIZE
-#define CONFIG_SYS_CBSIZE 1024
-
/* Increase arguments buffer size */
#undef CONFIG_SYS_BARGSIZE
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h
index c825940..74020e2 100644
--- a/include/configs/apalis_imx6.h
+++ b/include/configs/apalis_imx6.h
@@ -119,8 +119,6 @@
"vidargs=mxc_hdmi.only_cea=1 fbmem=32M\0"
/* Miscellaneous configurable options */
-#undef CONFIG_SYS_CBSIZE
-#define CONFIG_SYS_CBSIZE 1024
/* Physical Memory Map */
#define PHYS_SDRAM MMDC0_ARB_BASE_ADDR
diff --git a/include/configs/apalis_t30.h b/include/configs/apalis_t30.h
index 6b169a0..46ccea9 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 console I/O buffer size */
-#undef CONFIG_SYS_CBSIZE
-#define CONFIG_SYS_CBSIZE 1024
-
/* Increase arguments buffer size */
#undef CONFIG_SYS_BARGSIZE
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
diff --git a/include/configs/ax25-ae350.h b/include/configs/ax25-ae350.h
index 0a5fab3..16545ca 100644
--- a/include/configs/ax25-ae350.h
+++ b/include/configs/ax25-ae350.h
@@ -29,7 +29,6 @@
/*
* Miscellaneous configurable options
*/
-#define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */
/*
* Boot Argument Buffer Size
diff --git a/include/configs/bcm_ns3.h b/include/configs/bcm_ns3.h
index cb90c89..85d8e31 100644
--- a/include/configs/bcm_ns3.h
+++ b/include/configs/bcm_ns3.h
@@ -29,7 +29,6 @@
/* console configuration */
#define CONFIG_SYS_NS16550_CLK 25000000
-#define CONFIG_SYS_CBSIZE SZ_1K
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
/*
diff --git a/include/configs/bcmstb.h b/include/configs/bcmstb.h
index 6cf2886..5f8c5de 100644
--- a/include/configs/bcmstb.h
+++ b/include/configs/bcmstb.h
@@ -90,7 +90,6 @@
/*
* CONFIG_SYS_LOAD_ADDR - 1 MiB.
*/
-#define CONFIG_SYS_CBSIZE 512
/*
* Large kernel image bootm configuration.
diff --git a/include/configs/bmips_common.h b/include/configs/bmips_common.h
index 64c9ea1..f85b903 100644
--- a/include/configs/bmips_common.h
+++ b/include/configs/bmips_common.h
@@ -14,6 +14,5 @@
/* Memory usage */
#define CONFIG_SYS_BOOTPARAMS_LEN SZ_128K
-#define CONFIG_SYS_CBSIZE SZ_512
#endif /* __CONFIG_BMIPS_COMMON_H */
diff --git a/include/configs/bur_cfg_common.h b/include/configs/bur_cfg_common.h
index 39fc05b..304abc6 100644
--- a/include/configs/bur_cfg_common.h
+++ b/include/configs/bur_cfg_common.h
@@ -27,7 +27,4 @@
/* As stated above, the following choices are optional. */
-/* Console I/O Buffer Size */
-#define CONFIG_SYS_CBSIZE 512
-
#endif /* __BUR_CFG_COMMON_H__ */
diff --git a/include/configs/capricorn-common.h b/include/configs/capricorn-common.h
index ccc7127..5731a9e 100644
--- a/include/configs/capricorn-common.h
+++ b/include/configs/capricorn-common.h
@@ -118,7 +118,6 @@
#define PHYS_SDRAM_2_SIZE 0x00000000 /* 0 GB */
/* Console buffer and boot args */
-#define CONFIG_SYS_CBSIZE 2048
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
#define BOOTAUX_RESERVED_MEM_BASE 0x88000000
diff --git a/include/configs/ci20.h b/include/configs/ci20.h
index 2d72d99..016e107 100644
--- a/include/configs/ci20.h
+++ b/include/configs/ci20.h
@@ -28,7 +28,6 @@
#define DM9000_IO CONFIG_DM9000_BASE
#define DM9000_DATA (CONFIG_DM9000_BASE + 2)
-#define CONFIG_SYS_CBSIZE 1024 /* Console I/O buffer size */
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
/* Boot argument buffer size */
diff --git a/include/configs/colibri-imx8x.h b/include/configs/colibri-imx8x.h
index 127b540..c94c704 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 */
-/* Monitor Command Prompt */
-#define CONFIG_SYS_CBSIZE SZ_2K
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
/* Generic Timer Definitions */
diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h
index 22a4d7f..b87365a 100644
--- a/include/configs/colibri_imx6.h
+++ b/include/configs/colibri_imx6.h
@@ -106,8 +106,6 @@
"vidargs=fbmem=8M\0"
/* Miscellaneous configurable options */
-#undef CONFIG_SYS_CBSIZE
-#define CONFIG_SYS_CBSIZE 1024
/* Physical Memory Map */
#define PHYS_SDRAM MMDC0_ARB_BASE_ADDR
diff --git a/include/configs/colibri_t20.h b/include/configs/colibri_t20.h
index a67fbec..315e959 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 console I/O buffer size */
-#undef CONFIG_SYS_CBSIZE
-#define CONFIG_SYS_CBSIZE 1024
-
/* Increase arguments buffer size */
#undef CONFIG_SYS_BARGSIZE
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
diff --git a/include/configs/colibri_t30.h b/include/configs/colibri_t30.h
index bf8da9f..36e01dd 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 console I/O buffer size */
-#undef CONFIG_SYS_CBSIZE
-#define CONFIG_SYS_CBSIZE 1024
-
/* Increase arguments buffer size */
#undef CONFIG_SYS_BARGSIZE
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h
index 99b0cbb..d739e46 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_CBSIZE 1024 /* Console I/O Buffer Size */
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
/* Physical memory map */
diff --git a/include/configs/da850evm.h b/include/configs/da850evm.h
index 855711e..842158a 100644
--- a/include/configs/da850evm.h
+++ b/include/configs/da850evm.h
@@ -148,7 +148,6 @@
/*
* U-Boot general configuration
*/
-#define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE /* Boot Args Buffer Size */
/*
diff --git a/include/configs/devkit3250.h b/include/configs/devkit3250.h
index bc5282a..5e8310c1 100644
--- a/include/configs/devkit3250.h
+++ b/include/configs/devkit3250.h
@@ -64,7 +64,6 @@
/*
* U-Boot General Configurations
*/
-#define CONFIG_SYS_CBSIZE 1024
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
/*
diff --git a/include/configs/display5.h b/include/configs/display5.h
index d697b7d..3737503 100644
--- a/include/configs/display5.h
+++ b/include/configs/display5.h
@@ -284,8 +284,6 @@
"\0" \
/* Miscellaneous configurable options */
-#undef CONFIG_SYS_CBSIZE
-#define CONFIG_SYS_CBSIZE 2048
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
diff --git a/include/configs/dragonboard410c.h b/include/configs/dragonboard410c.h
index f8186a1..e3fffbe 100644
--- a/include/configs/dragonboard410c.h
+++ b/include/configs/dragonboard410c.h
@@ -74,7 +74,4 @@
"pxefile_addr_r=0x90100000\0"\
BOOTENV
-/* Monitor Command Prompt */
-#define CONFIG_SYS_CBSIZE 512 /* Console I/O Buffer Size */
-
#endif
diff --git a/include/configs/dragonboard820c.h b/include/configs/dragonboard820c.h
index 11dee56..3723699 100644
--- a/include/configs/dragonboard820c.h
+++ b/include/configs/dragonboard820c.h
@@ -43,7 +43,4 @@
"pxefile_addr_r=0x90100000\0"\
BOOTENV
-/* Monitor Command Prompt */
-#define CONFIG_SYS_CBSIZE 512
-
#endif
diff --git a/include/configs/eb_cpu5282.h b/include/configs/eb_cpu5282.h
index 28bf35c..5ad769c 100644
--- a/include/configs/eb_cpu5282.h
+++ b/include/configs/eb_cpu5282.h
@@ -29,7 +29,6 @@
* Environment is in the second sector of the first 256k of flash *
*----------------------------------------------------------------------*/
-#define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
/*#define CONFIG_SYS_DRAM_TEST 1 */
diff --git a/include/configs/edison.h b/include/configs/edison.h
index 3161776..a6ec638 100644
--- a/include/configs/edison.h
+++ b/include/configs/edison.h
@@ -10,7 +10,6 @@
/* Miscellaneous configurable options */
-#define CONFIG_SYS_CBSIZE 2048
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
#define CONFIG_SYS_STACK_SIZE (32 * 1024)
diff --git a/include/configs/edminiv2.h b/include/configs/edminiv2.h
index 8e2c245..685eb7d 100644
--- a/include/configs/edminiv2.h
+++ b/include/configs/edminiv2.h
@@ -90,8 +90,6 @@
/* auto boot */
-#define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buff Size */
-
/*
* Network
*/
diff --git a/include/configs/exynos-common.h b/include/configs/exynos-common.h
index a6b0f36..7411552 100644
--- a/include/configs/exynos-common.h
+++ b/include/configs/exynos-common.h
@@ -26,7 +26,6 @@
#define CONFIG_PWM
/* Miscellaneous configurable options */
-#define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */
/* Boot Argument Buffer Size */
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
diff --git a/include/configs/exynos7420-common.h b/include/configs/exynos7420-common.h
index 7798023..f9db9a2 100644
--- a/include/configs/exynos7420-common.h
+++ b/include/configs/exynos7420-common.h
@@ -16,7 +16,6 @@
#include <linux/sizes.h>
/* Miscellaneous configurable options */
-#define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */
/* Boot Argument Buffer Size */
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
diff --git a/include/configs/exynos78x0-common.h b/include/configs/exynos78x0-common.h
index a4ac27b..b443370 100644
--- a/include/configs/exynos78x0-common.h
+++ b/include/configs/exynos78x0-common.h
@@ -19,7 +19,6 @@
#include <linux/sizes.h>
/* Miscellaneous configurable options */
-#define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */
/* Boot Argument Buffer Size */
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
diff --git a/include/configs/gardena-smart-gateway-mt7688.h b/include/configs/gardena-smart-gateway-mt7688.h
index 9b78e1f..3c4a13c 100644
--- a/include/configs/gardena-smart-gateway-mt7688.h
+++ b/include/configs/gardena-smart-gateway-mt7688.h
@@ -41,7 +41,6 @@
/* Memory usage */
#define CONFIG_SYS_BOOTPARAMS_LEN (128 * 1024)
-#define CONFIG_SYS_CBSIZE 512
/* Environment settings */
diff --git a/include/configs/gazerbeam.h b/include/configs/gazerbeam.h
index bf222f7..b158918 100644
--- a/include/configs/gazerbeam.h
+++ b/include/configs/gazerbeam.h
@@ -58,8 +58,6 @@
* Miscellaneous configurable options
*/
-#define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */
-
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
/*
diff --git a/include/configs/highbank.h b/include/configs/highbank.h
index 0ff70fd..98b17af 100644
--- a/include/configs/highbank.h
+++ b/include/configs/highbank.h
@@ -19,7 +19,6 @@
/*
* Miscellaneous configurable options
*/
-#define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
#define CONFIG_SYS_64BIT_LBA
diff --git a/include/configs/hikey.h b/include/configs/hikey.h
index 92e401e..646f196 100644
--- a/include/configs/hikey.h
+++ b/include/configs/hikey.h
@@ -61,7 +61,4 @@
/* Preserve environment on eMMC */
-/* Monitor Command Prompt */
-#define CONFIG_SYS_CBSIZE 512 /* Console I/O Buffer Size */
-
#endif /* __HIKEY_H */
diff --git a/include/configs/hsdk-4xd.h b/include/configs/hsdk-4xd.h
index d3d8896..fa86a33 100644
--- a/include/configs/hsdk-4xd.h
+++ b/include/configs/hsdk-4xd.h
@@ -105,7 +105,6 @@
*/
/* Cli configuration */
-#define CONFIG_SYS_CBSIZE SZ_2K
/*
* Callback configuration
diff --git a/include/configs/hsdk.h b/include/configs/hsdk.h
index 64dce52..e142035 100644
--- a/include/configs/hsdk.h
+++ b/include/configs/hsdk.h
@@ -100,7 +100,6 @@
setenv core_iccm_3 0x6; setenv core_dccm_3 0x6;\0"
/* Cli configuration */
-#define CONFIG_SYS_CBSIZE SZ_2K
/*
* Callback configuration
diff --git a/include/configs/ids8313.h b/include/configs/ids8313.h
index 356bf6c..0bd09c0 100644
--- a/include/configs/ids8313.h
+++ b/include/configs/ids8313.h
@@ -216,7 +216,6 @@
/*
* Miscellaneous configurable options
*/
-#define CONFIG_SYS_CBSIZE 1024
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
#define CONFIG_LOADS_ECHO
diff --git a/include/configs/imgtec_xilfpga.h b/include/configs/imgtec_xilfpga.h
index edd24a4..21dee85 100644
--- a/include/configs/imgtec_xilfpga.h
+++ b/include/configs/imgtec_xilfpga.h
@@ -35,7 +35,6 @@
/*------------------------------------------------------------
* Console Configuration
*/
-#define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */
/* -------------------------------------------------
* Environment
diff --git a/include/configs/imx27lite-common.h b/include/configs/imx27lite-common.h
index 6790053..0c8f9fa 100644
--- a/include/configs/imx27lite-common.h
+++ b/include/configs/imx27lite-common.h
@@ -106,7 +106,6 @@
/*
* U-Boot general configuration
*/
-#define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */
/* Boot Argument Buffer Size */
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
diff --git a/include/configs/imx8mm-cl-iot-gate.h b/include/configs/imx8mm-cl-iot-gate.h
index 7a55433..3b07e92 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 UART_BASE_ADDR(3)
-/* Monitor Command Prompt */
-#define CONFIG_SYS_CBSIZE 2048
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
/* USDHC */
diff --git a/include/configs/imx8mm_beacon.h b/include/configs/imx8mm_beacon.h
index 102f8f2..e704fc5 100644
--- a/include/configs/imx8mm_beacon.h
+++ b/include/configs/imx8mm_beacon.h
@@ -93,7 +93,5 @@
#define CONFIG_MXC_UART_BASE UART_BASE_ADDR(2)
-/* Monitor Command Prompt */
-#define CONFIG_SYS_CBSIZE 2048
#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 201d2c6..deae85f 100644
--- a/include/configs/imx8mm_data_modul_edm_sbc.h
+++ b/include/configs/imx8mm_data_modul_edm_sbc.h
@@ -41,8 +41,8 @@
#define PHYS_SDRAM 0x40000000
#define PHYS_SDRAM_SIZE 0x40000000 /* Minimum 1 GiB DDR */
-/* Monitor Command Prompt */
-#define CONFIG_SYS_CBSIZE 2048
+#define CONFIG_MXC_UART_BASE UART3_BASE_ADDR
+
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
/* PHY needs a longer autonegotiation timeout after reset */
diff --git a/include/configs/imx8mm_evk.h b/include/configs/imx8mm_evk.h
index 307bf53..6c6a5b2 100644
--- a/include/configs/imx8mm_evk.h
+++ b/include/configs/imx8mm_evk.h
@@ -70,8 +70,6 @@
#define CONFIG_MXC_UART_BASE UART_BASE_ADDR(2)
-/* Monitor Command Prompt */
-#define CONFIG_SYS_CBSIZE 2048
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
#define CONFIG_FEC_MXC_PHYADDR 0
diff --git a/include/configs/imx8mm_icore_mx8mm.h b/include/configs/imx8mm_icore_mx8mm.h
index 3ee227a..590c764 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 UART_BASE_ADDR(2)
-/* Monitor Command Prompt */
-#define CONFIG_SYS_CBSIZE 2048
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
/* USDHC */
diff --git a/include/configs/imx8mm_venice.h b/include/configs/imx8mm_venice.h
index 2fa8d99..51e3406 100644
--- a/include/configs/imx8mm_venice.h
+++ b/include/configs/imx8mm_venice.h
@@ -104,8 +104,6 @@
/* UART */
#define CONFIG_MXC_UART_BASE UART_BASE_ADDR(2)
-/* Monitor Command Prompt */
-#define CONFIG_SYS_CBSIZE SZ_2K
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
#endif
diff --git a/include/configs/imx8mn_beacon.h b/include/configs/imx8mn_beacon.h
index 62ef52e..5b45de1 100644
--- a/include/configs/imx8mn_beacon.h
+++ b/include/configs/imx8mn_beacon.h
@@ -109,7 +109,5 @@
#define CONFIG_MXC_UART_BASE UART_BASE_ADDR(2)
-/* Monitor Command Prompt */
-#define CONFIG_SYS_CBSIZE 2048
#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 12c332e..8b5a277 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
-/* Monitor Command Prompt */
-#define CONFIG_SYS_CBSIZE SZ_2K
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
/* I2C */
diff --git a/include/configs/imx8mn_evk.h b/include/configs/imx8mn_evk.h
index f558699..4cc9ab0 100644
--- a/include/configs/imx8mn_evk.h
+++ b/include/configs/imx8mn_evk.h
@@ -77,8 +77,6 @@
#define CONFIG_MXC_UART_BASE UART_BASE_ADDR(2)
-/* Monitor Command Prompt */
-#define CONFIG_SYS_CBSIZE 2048
#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 02bb958..a518bbf 100644
--- a/include/configs/imx8mn_var_som.h
+++ b/include/configs/imx8mn_var_som.h
@@ -66,8 +66,6 @@
#define CONFIG_MXC_UART_BASE UART_BASE_ADDR(4)
-/* Monitor Command Prompt */
-#define CONFIG_SYS_CBSIZE SZ_2K
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
/* USDHC */
diff --git a/include/configs/imx8mn_venice.h b/include/configs/imx8mn_venice.h
index a32d986..538b23a 100644
--- a/include/configs/imx8mn_venice.h
+++ b/include/configs/imx8mn_venice.h
@@ -100,8 +100,6 @@
/* UART */
#define CONFIG_MXC_UART_BASE UART_BASE_ADDR(2)
-/* Monitor Command Prompt */
-#define CONFIG_SYS_CBSIZE SZ_2K
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
#endif
diff --git a/include/configs/imx8mp_dhcom_pdk2.h b/include/configs/imx8mp_dhcom_pdk2.h
index a2226e0..d5df08f 100644
--- a/include/configs/imx8mp_dhcom_pdk2.h
+++ b/include/configs/imx8mp_dhcom_pdk2.h
@@ -42,7 +42,6 @@
#define CONFIG_MXC_UART_BASE UART1_BASE_ADDR
/* Monitor Command Prompt */
-#define CONFIG_SYS_CBSIZE 2048
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
/* PHY needs a longer autonegotiation timeout after reset */
diff --git a/include/configs/imx8mp_evk.h b/include/configs/imx8mp_evk.h
index f029c6d..e9392c6 100644
--- a/include/configs/imx8mp_evk.h
+++ b/include/configs/imx8mp_evk.h
@@ -81,8 +81,6 @@
#define CONFIG_MXC_UART_BASE UART_BASE_ADDR(2)
-/* Monitor Command Prompt */
-#define CONFIG_SYS_CBSIZE 2048
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
#endif
diff --git a/include/configs/imx8mp_rsb3720.h b/include/configs/imx8mp_rsb3720.h
index d643532..bc0d297 100644
--- a/include/configs/imx8mp_rsb3720.h
+++ b/include/configs/imx8mp_rsb3720.h
@@ -168,8 +168,8 @@
#define PHYS_SDRAM_2_SIZE 0x80000000 /* 2 GB */
#endif
-/* Monitor Command Prompt */
-#define CONFIG_SYS_CBSIZE 2048
+#define CONFIG_MXC_UART_BASE UART3_BASE_ADDR
+
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
#define CONFIG_SYS_FSL_USDHC_NUM 2
diff --git a/include/configs/imx8mp_venice.h b/include/configs/imx8mp_venice.h
index 5ac72e6..c910d42 100644
--- a/include/configs/imx8mp_venice.h
+++ b/include/configs/imx8mp_venice.h
@@ -100,8 +100,6 @@
/* UART */
#define CONFIG_MXC_UART_BASE UART2_BASE_ADDR
-/* Monitor Command Prompt */
-#define CONFIG_SYS_CBSIZE SZ_2K
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
/* FEC */
diff --git a/include/configs/imx8mq_cm.h b/include/configs/imx8mq_cm.h
index 95aaede..ccaf76c 100644
--- a/include/configs/imx8mq_cm.h
+++ b/include/configs/imx8mq_cm.h
@@ -73,8 +73,6 @@
#define CONFIG_MXC_UART_BASE UART_BASE_ADDR(1)
-/* Monitor Command Prompt */
-#define CONFIG_SYS_CBSIZE 1024
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
#define CONFIG_SYS_FSL_USDHC_NUM 2
diff --git a/include/configs/imx8mq_evk.h b/include/configs/imx8mq_evk.h
index d39c9d3..532fa77 100644
--- a/include/configs/imx8mq_evk.h
+++ b/include/configs/imx8mq_evk.h
@@ -79,8 +79,6 @@
#define CONFIG_MXC_UART_BASE UART_BASE_ADDR(1)
-/* Monitor Command Prompt */
-#define CONFIG_SYS_CBSIZE 1024
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
#define CONFIG_SYS_FSL_USDHC_NUM 2
diff --git a/include/configs/imx8mq_phanbell.h b/include/configs/imx8mq_phanbell.h
index c0e4b86..2b2829f 100644
--- a/include/configs/imx8mq_phanbell.h
+++ b/include/configs/imx8mq_phanbell.h
@@ -107,8 +107,6 @@
#define CONFIG_MXC_UART_BASE UART_BASE_ADDR(1)
-/* Monitor Command Prompt */
-#define CONFIG_SYS_CBSIZE 1024
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
#define CONFIG_SYS_FSL_USDHC_NUM 2
diff --git a/include/configs/imx8qxp_mek.h b/include/configs/imx8qxp_mek.h
index 57a3277..c8decee 100644
--- a/include/configs/imx8qxp_mek.h
+++ b/include/configs/imx8qxp_mek.h
@@ -128,7 +128,6 @@
#endif
/* Misc configuration */
-#define CONFIG_SYS_CBSIZE 2048
#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 e6903a6..3f99c6b 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 */
-/* Monitor Command Prompt */
-#define CONFIG_SYS_CBSIZE 2048
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
/* Using ULP WDOG for reset */
diff --git a/include/configs/km/keymile-common.h b/include/configs/km/keymile-common.h
index 2c00018..76895b4 100644
--- a/include/configs/km/keymile-common.h
+++ b/include/configs/km/keymile-common.h
@@ -12,11 +12,6 @@
/*
* Miscellaneous configurable options
*/
-#if defined(CONFIG_CMD_KGDB)
-#define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */
-#else
-#define CONFIG_SYS_CBSIZE 512 /* Console I/O Buffer Size */
-#endif
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
#define CONFIG_HUSH_INIT_VAR
diff --git a/include/configs/kp_imx53.h b/include/configs/kp_imx53.h
index 534263f..2a37a52 100644
--- a/include/configs/kp_imx53.h
+++ b/include/configs/kp_imx53.h
@@ -61,7 +61,6 @@
#include <config_distro_bootcmd.h>
/* Miscellaneous configurable options */
-#define CONFIG_SYS_CBSIZE 512 /* Console I/O Buffer Size */
/* Physical Memory Map */
#define PHYS_SDRAM_1 CSD0_BASE_ADDR
diff --git a/include/configs/legoev3.h b/include/configs/legoev3.h
index 4c132c6..8e0b6d1 100644
--- a/include/configs/legoev3.h
+++ b/include/configs/legoev3.h
@@ -50,7 +50,6 @@
/*
* U-Boot general configuration
*/
-#define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE /* Boot Args Buffer Size */
/*
diff --git a/include/configs/linkit-smart-7688.h b/include/configs/linkit-smart-7688.h
index 667b2c6..35a6db4 100644
--- a/include/configs/linkit-smart-7688.h
+++ b/include/configs/linkit-smart-7688.h
@@ -42,7 +42,6 @@
/* Memory usage */
#define CONFIG_SYS_BOOTPARAMS_LEN (128 * 1024)
-#define CONFIG_SYS_CBSIZE 512
/* Environment settings */
diff --git a/include/configs/ls1012a_common.h b/include/configs/ls1012a_common.h
index 98cb001..51aa176 100644
--- a/include/configs/ls1012a_common.h
+++ b/include/configs/ls1012a_common.h
@@ -68,9 +68,6 @@
"bootm $kernel_load"
#endif
-/* Monitor Command Prompt */
-#define CONFIG_SYS_CBSIZE 512 /* Console I/O Buffer Size */
-
#define CONFIG_SYS_BOOTM_LEN (64 << 20) /* Increase max gunzip size */
#include <asm/arch/soc.h>
diff --git a/include/configs/ls1021atsn.h b/include/configs/ls1021atsn.h
index 15433cd..2b90c1d 100644
--- a/include/configs/ls1021atsn.h
+++ b/include/configs/ls1021atsn.h
@@ -176,7 +176,6 @@
/* Miscellaneous configurable options */
#define CONFIG_SYS_BOOTMAPSZ (256 << 20)
-#define CONFIG_SYS_CBSIZE 256 /* Console I/O Buffer Size */
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
#define CONFIG_LS102XA_STREAM_ID
diff --git a/include/configs/ls1028a_common.h b/include/configs/ls1028a_common.h
index 151501f..e4b86c2 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;"
-/* Monitor Command Prompt */
-#define CONFIG_SYS_CBSIZE 512 /* Console I/O Buffer Size */
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE /* Boot args buffer */
#define CONFIG_SYS_BOOTM_LEN (64 << 20) /* Increase max gunzip size */
diff --git a/include/configs/ls1043a_common.h b/include/configs/ls1043a_common.h
index bedd444..7457dad 100644
--- a/include/configs/ls1043a_common.h
+++ b/include/configs/ls1043a_common.h
@@ -254,9 +254,6 @@
#endif
#endif
-/* Monitor Command Prompt */
-#define CONFIG_SYS_CBSIZE 512 /* Console I/O Buffer Size */
-
#define CONFIG_SYS_BOOTM_LEN (64 << 20) /* Increase max gunzip size */
#include <asm/arch/soc.h>
diff --git a/include/configs/ls1046a_common.h b/include/configs/ls1046a_common.h
index 5e2b8a6..000f19a 100644
--- a/include/configs/ls1046a_common.h
+++ b/include/configs/ls1046a_common.h
@@ -234,9 +234,6 @@
#endif
-/* Monitor Command Prompt */
-#define CONFIG_SYS_CBSIZE 512 /* Console I/O Buffer Size */
-
#define CONFIG_SYS_BOOTM_LEN (64 << 20) /* Increase max gunzip size */
#include <asm/arch/soc.h>
diff --git a/include/configs/ls1088a_common.h b/include/configs/ls1088a_common.h
index b7373fb..a9922f1 100644
--- a/include/configs/ls1088a_common.h
+++ b/include/configs/ls1088a_common.h
@@ -148,8 +148,6 @@
" 0x580e00000 \0"
#endif
-/* Monitor Command Prompt */
-#define CONFIG_SYS_CBSIZE 512 /* Console I/O Buffer Size */
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE /* Boot args buffer */
#ifdef CONFIG_SPL
diff --git a/include/configs/ls2080a_common.h b/include/configs/ls2080a_common.h
index 21235ff..974e98a 100644
--- a/include/configs/ls2080a_common.h
+++ b/include/configs/ls2080a_common.h
@@ -142,9 +142,6 @@
"mcinitcmd=fsl_mc start mc 0x580a00000" \
" 0x580e00000 \0"
-/* Monitor Command Prompt */
-#define CONFIG_SYS_CBSIZE 512 /* Console I/O Buffer Size */
-
#define CONFIG_SPL_BSS_START_ADDR 0x80100000
#define CONFIG_SPL_BSS_MAX_SIZE 0x00100000
#define CONFIG_SPL_MAX_SIZE 0x16000
diff --git a/include/configs/lx2160a_common.h b/include/configs/lx2160a_common.h
index cc9f863..bc210da 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
-/* Monitor Command Prompt */
-#define CONFIG_SYS_CBSIZE 512 /* Console I/O Buffer Size */
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE /* Boot args buffer */
#define CONFIG_SYS_BOOTM_LEN (64 << 20) /* Increase max gunzip size */
diff --git a/include/configs/m53menlo.h b/include/configs/m53menlo.h
index ea582e5..50941b8 100644
--- a/include/configs/m53menlo.h
+++ b/include/configs/m53menlo.h
@@ -32,7 +32,6 @@
/*
* U-Boot general configurations
*/
-#define CONFIG_SYS_CBSIZE 1024 /* Console I/O buffer size */
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
/* Boot argument buffer size */
diff --git a/include/configs/meesc.h b/include/configs/meesc.h
index 6b6c90e..51f7fd5 100644
--- a/include/configs/meesc.h
+++ b/include/configs/meesc.h
@@ -69,6 +69,4 @@
/* hw-controller addresses */
#define CONFIG_ET1100_BASE 0x70000000
-#define CONFIG_SYS_CBSIZE 512
-
#endif
diff --git a/include/configs/meson64.h b/include/configs/meson64.h
index 3824d24..2935cf4 100644
--- a/include/configs/meson64.h
+++ b/include/configs/meson64.h
@@ -29,8 +29,6 @@
#define STDIN_CFG "serial"
#endif
-#define CONFIG_SYS_CBSIZE 1024
-
#define CONFIG_SYS_SDRAM_BASE 0
#define CONFIG_SYS_INIT_SP_ADDR 0x20000000
#define CONFIG_SYS_BOOTM_LEN (64 << 20) /* 64 MiB */
diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h
index ac7a623..1c4e135 100644
--- a/include/configs/microblaze-generic.h
+++ b/include/configs/microblaze-generic.h
@@ -34,9 +34,6 @@
#define XILINX_DCACHE_BYTE_SIZE 32768
#endif
-/* size of console buffer */
-#define CONFIG_SYS_CBSIZE 512
-
#define CONFIG_HOSTNAME "microblaze-generic"
/* architecture dependent code */
diff --git a/include/configs/mt7620.h b/include/configs/mt7620.h
index af8d6af..1c70def 100644
--- a/include/configs/mt7620.h
+++ b/include/configs/mt7620.h
@@ -18,8 +18,6 @@
#define CONFIG_SYS_BOOTM_LEN 0x1000000
-#define CONFIG_SYS_CBSIZE 1024
-
/* SPL */
#define CONFIG_SYS_UBOOT_START CONFIG_SYS_TEXT_BASE
diff --git a/include/configs/mt7622.h b/include/configs/mt7622.h
index 32db4bc..0101d48 100644
--- a/include/configs/mt7622.h
+++ b/include/configs/mt7622.h
@@ -12,7 +12,6 @@
#include <linux/sizes.h>
#define CONFIG_SYS_BOOTM_LEN SZ_64M
-#define CONFIG_SYS_CBSIZE SZ_1K
#define CONFIG_SYS_NONCACHED_MEMORY SZ_1M
/* Uboot definition */
diff --git a/include/configs/mt7623.h b/include/configs/mt7623.h
index 0ee55c2..5637842 100644
--- a/include/configs/mt7623.h
+++ b/include/configs/mt7623.h
@@ -14,7 +14,6 @@
/* Miscellaneous configurable options */
#define CONFIG_SYS_BOOTM_LEN SZ_64M
-#define CONFIG_SYS_CBSIZE SZ_1K
#define CONFIG_SYS_NONCACHED_MEMORY SZ_1M
diff --git a/include/configs/mt7628.h b/include/configs/mt7628.h
index 21381217..4f934ea 100644
--- a/include/configs/mt7628.h
+++ b/include/configs/mt7628.h
@@ -18,8 +18,6 @@
#define CONFIG_SYS_BOOTM_LEN 0x1000000
-#define CONFIG_SYS_CBSIZE 1024
-
/* Serial SPL */
#if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_SERIAL)
#define CONFIG_SYS_NS16550_MEM32
diff --git a/include/configs/mt7629.h b/include/configs/mt7629.h
index d937d87..24890b6 100644
--- a/include/configs/mt7629.h
+++ b/include/configs/mt7629.h
@@ -14,7 +14,6 @@
/* Miscellaneous configurable options */
#define CONFIG_SYS_BOOTM_LEN SZ_64M
-#define CONFIG_SYS_CBSIZE SZ_1K
#define CONFIG_SYS_NONCACHED_MEMORY SZ_1M
diff --git a/include/configs/mv-common.h b/include/configs/mv-common.h
index 34af204..384a8f7 100644
--- a/include/configs/mv-common.h
+++ b/include/configs/mv-common.h
@@ -50,8 +50,6 @@
/* auto boot */
-#define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buff Size */
-
/*
* Other required minimal configurations
*/
diff --git a/include/configs/mvebu_armada-37xx.h b/include/configs/mvebu_armada-37xx.h
index 276b555..f6eb6bf 100644
--- a/include/configs/mvebu_armada-37xx.h
+++ b/include/configs/mvebu_armada-37xx.h
@@ -25,8 +25,6 @@
4000000, 4500000, 5000000, 5500000, \
6000000 }
-#define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buff Size */
-
/*
* Other required minimal configurations
*/
diff --git a/include/configs/mvebu_armada-8k.h b/include/configs/mvebu_armada-8k.h
index a37586a..d880b89 100644
--- a/include/configs/mvebu_armada-8k.h
+++ b/include/configs/mvebu_armada-8k.h
@@ -19,8 +19,6 @@
#define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, \
115200, 230400, 460800, 921600 }
-#define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buff Size */
-
/*
* Other required minimal configurations
*/
diff --git a/include/configs/mx53cx9020.h b/include/configs/mx53cx9020.h
index fafc5f1..a33132a 100644
--- a/include/configs/mx53cx9020.h
+++ b/include/configs/mx53cx9020.h
@@ -55,7 +55,6 @@
BOOTENV
/* Miscellaneous configurable options */
-#define CONFIG_SYS_CBSIZE 512 /* Console I/O Buffer Size */
/* Physical Memory Map */
#define PHYS_SDRAM_1 CSD0_BASE_ADDR
diff --git a/include/configs/mx53loco.h b/include/configs/mx53loco.h
index 8b9f0a2..1e2e55d 100644
--- a/include/configs/mx53loco.h
+++ b/include/configs/mx53loco.h
@@ -88,7 +88,6 @@
"fi;\0"
/* Miscellaneous configurable options */
-#define CONFIG_SYS_CBSIZE 512 /* Console I/O Buffer Size */
/* Physical Memory Map */
#define PHYS_SDRAM_1 CSD0_BASE_ADDR
diff --git a/include/configs/mx53ppd.h b/include/configs/mx53ppd.h
index fba57ac..002a3e5 100644
--- a/include/configs/mx53ppd.h
+++ b/include/configs/mx53ppd.h
@@ -86,7 +86,6 @@
"lcd:800x480-24@60,monitor=lcd\0" \
/* Miscellaneous configurable options */
-#define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE /* Boot Argument Buffer Size */
diff --git a/include/configs/mx6_common.h b/include/configs/mx6_common.h
index e34a698..75bc27d 100644
--- a/include/configs/mx6_common.h
+++ b/include/configs/mx6_common.h
@@ -26,7 +26,6 @@
#include <asm/mach-imx/gpio.h>
/* Miscellaneous configurable options */
-#define CONFIG_SYS_CBSIZE 512
/* MMC */
diff --git a/include/configs/mx7_common.h b/include/configs/mx7_common.h
index 0ef216e..9f4dbec 100644
--- a/include/configs/mx7_common.h
+++ b/include/configs/mx7_common.h
@@ -23,7 +23,6 @@
#define CONFIG_IOMUX_LPSR
/* Miscellaneous configurable options */
-#define CONFIG_SYS_CBSIZE 512
/* UART */
diff --git a/include/configs/mx7ulp_evk.h b/include/configs/mx7ulp_evk.h
index a6e533c..a91e131 100644
--- a/include/configs/mx7ulp_evk.h
+++ b/include/configs/mx7ulp_evk.h
@@ -23,7 +23,6 @@
#define LPUART_BASE LPUART4_RBASE
/* Miscellaneous configurable options */
-#define CONFIG_SYS_CBSIZE 512
/* Physical Memory Map */
diff --git a/include/configs/mxs.h b/include/configs/mxs.h
index d25b621..7065992 100644
--- a/include/configs/mxs.h
+++ b/include/configs/mxs.h
@@ -78,7 +78,6 @@
*/
/* U-Boot general configuration */
-#define CONFIG_SYS_CBSIZE 1024 /* Console I/O buffer size */
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
/* Boot argument buffer size */
diff --git a/include/configs/octeontx2_common.h b/include/configs/octeontx2_common.h
index 3b34b56..f30851c 100644
--- a/include/configs/octeontx2_common.h
+++ b/include/configs/octeontx2_common.h
@@ -22,8 +22,6 @@
"ethrotate=yes\0" \
"autoload=0\0"
-/* Monitor Command Prompt */
-#define CONFIG_SYS_CBSIZE 1024 /** Console I/O Buffer Size */
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
#define CONFIG_SYS_MMC_MAX_BLK_COUNT 8192
diff --git a/include/configs/octeontx_common.h b/include/configs/octeontx_common.h
index ddc70d4..f79c1c4 100644
--- a/include/configs/octeontx_common.h
+++ b/include/configs/octeontx_common.h
@@ -53,8 +53,6 @@
# define CONFIG_SYS_64BIT_LBA
#endif
-/* Monitor Command Prompt */
-#define CONFIG_SYS_CBSIZE 1024 /** Console I/O Buffer Size */
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
#define CONFIG_SYS_MMC_MAX_BLK_COUNT 8192
diff --git a/include/configs/omapl138_lcdk.h b/include/configs/omapl138_lcdk.h
index 0d69316..a1264bf 100644
--- a/include/configs/omapl138_lcdk.h
+++ b/include/configs/omapl138_lcdk.h
@@ -139,7 +139,6 @@
/*
* U-Boot general configuration
*/
-#define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE /* Boot Args Buffer Size */
/*
diff --git a/include/configs/owl-common.h b/include/configs/owl-common.h
index 8de23e9..d6948cc 100644
--- a/include/configs/owl-common.h
+++ b/include/configs/owl-common.h
@@ -23,7 +23,6 @@
#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_TEXT_BASE + 0x7ff00)
/* Console configuration */
-#define CONFIG_SYS_CBSIZE 1024 /* Console buffer size */
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
#endif
diff --git a/include/configs/phycore_imx8mm.h b/include/configs/phycore_imx8mm.h
index 028bf69..4eec7fb 100644
--- a/include/configs/phycore_imx8mm.h
+++ b/include/configs/phycore_imx8mm.h
@@ -86,8 +86,6 @@
/* UART */
#define CONFIG_MXC_UART_BASE UART_BASE_ADDR(3)
-/* Monitor Command Prompt */
-#define CONFIG_SYS_CBSIZE SZ_2K
#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 734699c..6c59e7b 100644
--- a/include/configs/phycore_imx8mp.h
+++ b/include/configs/phycore_imx8mp.h
@@ -86,8 +86,6 @@
/* UART */
#define CONFIG_MXC_UART_BASE UART_BASE_ADDR(1)
-/* Monitor Command Prompt */
-#define CONFIG_SYS_CBSIZE SZ_2K
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
#endif /* __PHYCORE_IMX8MP_H */
diff --git a/include/configs/pic32mzdask.h b/include/configs/pic32mzdask.h
index ef3b0f7..c18834c 100644
--- a/include/configs/pic32mzdask.h
+++ b/include/configs/pic32mzdask.h
@@ -41,7 +41,6 @@
/*------------------------------------------------------------
* Console Configuration
*/
-#define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */
/*--------------------------------------------------
* USB Configuration
diff --git a/include/configs/pico-imx8mq.h b/include/configs/pico-imx8mq.h
index 74b0090..a586e60 100644
--- a/include/configs/pico-imx8mq.h
+++ b/include/configs/pico-imx8mq.h
@@ -86,8 +86,6 @@
#define CONFIG_MXC_UART_BASE UART_BASE_ADDR(1)
-/* Monitor Command Prompt */
-#define CONFIG_SYS_CBSIZE 1024
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
#define CONFIG_SYS_FSL_USDHC_NUM 2
diff --git a/include/configs/poleg.h b/include/configs/poleg.h
index 0771f94..b58850c 100644
--- a/include/configs/poleg.h
+++ b/include/configs/poleg.h
@@ -11,7 +11,6 @@
#define CONFIG_SYS_PL310_BASE 0xF03FC000 /* L2 - Cache Regs Base (4k Space)*/
#endif
-#define CONFIG_SYS_CBSIZE 256
#define CONFIG_SYS_BOOTMAPSZ (0x30 << 20)
#define CONFIG_SYS_SDRAM_BASE 0x0
#define CONFIG_SYS_INIT_SP_ADDR (0x00008000 - GENERATED_GBL_DATA_SIZE)
diff --git a/include/configs/poplar.h b/include/configs/poplar.h
index 52285db..4cc3f26 100644
--- a/include/configs/poplar.h
+++ b/include/configs/poplar.h
@@ -49,7 +49,4 @@
"ramdisk_addr_r=0x32400000\0" \
BOOTENV
-/* Monitor Command Prompt */
-#define CONFIG_SYS_CBSIZE 512
-
#endif /* _POPLAR_H_ */
diff --git a/include/configs/presidio_asic.h b/include/configs/presidio_asic.h
index 583aa9d..dd03c5c 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_CBSIZE 256
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
#define KSEG1_ATU_XLAT(x) (x)
diff --git a/include/configs/px30_common.h b/include/configs/px30_common.h
index a7f5e91..eaaf8ca 100644
--- a/include/configs/px30_common.h
+++ b/include/configs/px30_common.h
@@ -8,8 +8,6 @@
#include "rockchip-common.h"
-#define CONFIG_SYS_CBSIZE 1024
-
#define CONFIG_SYS_NS16550_MEM32
/* FIXME: ff020000 is pmu_mem (10k), while ff0e0000 is regular int_mem */
diff --git a/include/configs/qemu-arm.h b/include/configs/qemu-arm.h
index 550e26f..c0b5731 100644
--- a/include/configs/qemu-arm.h
+++ b/include/configs/qemu-arm.h
@@ -79,8 +79,6 @@
"ramdisk_addr_r=0x44000000\0" \
BOOTENV
-#define CONFIG_SYS_CBSIZE 512
-
#define CONFIG_SYS_MAX_FLASH_SECT 256 /* Sector: 256K, Bank: 64M */
#endif /* __CONFIG_H */
diff --git a/include/configs/rcar-gen3-common.h b/include/configs/rcar-gen3-common.h
index 2c8000f..ae585bb 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_CBSIZE 2048
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
#define CONFIG_SYS_BAUDRATE_TABLE { 115200, 38400 }
diff --git a/include/configs/rk3036_common.h b/include/configs/rk3036_common.h
index ab2b492..5428935 100644
--- a/include/configs/rk3036_common.h
+++ b/include/configs/rk3036_common.h
@@ -8,8 +8,6 @@
#include <asm/arch-rockchip/hardware.h>
#include "rockchip-common.h"
-#define CONFIG_SYS_CBSIZE 1024
-
#define CONFIG_SYS_HZ_CLOCK 24000000
#define CONFIG_SYS_INIT_SP_ADDR 0x60100000
diff --git a/include/configs/rk3066_common.h b/include/configs/rk3066_common.h
index be7d644..30f0377 100644
--- a/include/configs/rk3066_common.h
+++ b/include/configs/rk3066_common.h
@@ -9,8 +9,6 @@
#include <asm/arch-rockchip/hardware.h>
#include "rockchip-common.h"
-#define CONFIG_SYS_CBSIZE 256
-
#define CONFIG_SYS_INIT_SP_ADDR 0x78000000
#define CONFIG_IRAM_BASE 0x10080000
diff --git a/include/configs/rk3128_common.h b/include/configs/rk3128_common.h
index 8c2e9dc..b7b61ed 100644
--- a/include/configs/rk3128_common.h
+++ b/include/configs/rk3128_common.h
@@ -8,8 +8,6 @@
#include "rockchip-common.h"
-#define CONFIG_SYS_CBSIZE 1024
-
#define CONFIG_SYS_HZ_CLOCK 24000000
#define CONFIG_IRAM_BASE 0x10080000
diff --git a/include/configs/rk3188_common.h b/include/configs/rk3188_common.h
index 7449e81..47f70f1 100644
--- a/include/configs/rk3188_common.h
+++ b/include/configs/rk3188_common.h
@@ -9,8 +9,6 @@
#include <asm/arch-rockchip/hardware.h>
#include "rockchip-common.h"
-#define CONFIG_SYS_CBSIZE 1024
-
#ifdef CONFIG_SPL_ROCKCHIP_BACK_TO_BROM
/* Bootrom will load u-boot binary to 0x60000000 once return from SPL */
#endif
diff --git a/include/configs/rk322x_common.h b/include/configs/rk322x_common.h
index 36191ee..c32e223 100644
--- a/include/configs/rk322x_common.h
+++ b/include/configs/rk322x_common.h
@@ -8,7 +8,6 @@
#include <asm/arch-rockchip/hardware.h>
#include "rockchip-common.h"
-#define CONFIG_SYS_CBSIZE 1024
#define CONFIG_SYS_BOOTM_LEN (64 << 20) /* 64M */
#define CONFIG_SYS_HZ_CLOCK 24000000
diff --git a/include/configs/rk3288_common.h b/include/configs/rk3288_common.h
index 075623f..77ab7ce 100644
--- a/include/configs/rk3288_common.h
+++ b/include/configs/rk3288_common.h
@@ -11,8 +11,6 @@
#define CONFIG_SYS_BOOTM_LEN (64 << 20) /* 64MB */
-#define CONFIG_SYS_CBSIZE 1024
-
#define CONFIG_SYS_HZ_CLOCK 24000000
#ifdef CONFIG_SPL_ROCKCHIP_BACK_TO_BROM
diff --git a/include/configs/rk3308_common.h b/include/configs/rk3308_common.h
index 44a3e7ad..3268181 100644
--- a/include/configs/rk3308_common.h
+++ b/include/configs/rk3308_common.h
@@ -8,7 +8,6 @@
#include "rockchip-common.h"
-#define CONFIG_SYS_CBSIZE 1024
#define CONFIG_SPL_MAX_SIZE 0x20000
#define CONFIG_SPL_BSS_START_ADDR 0x00400000
#define CONFIG_SPL_BSS_MAX_SIZE 0x2000
diff --git a/include/configs/rk3328_common.h b/include/configs/rk3328_common.h
index 2b8d77c..283b644 100644
--- a/include/configs/rk3328_common.h
+++ b/include/configs/rk3328_common.h
@@ -10,8 +10,6 @@
#define CONFIG_IRAM_BASE 0xff090000
-#define CONFIG_SYS_CBSIZE 1024
-
#define CONFIG_SYS_INIT_SP_ADDR 0x00300000
#define CONFIG_SPL_STACK 0x00400000
#define CONFIG_SPL_MAX_SIZE 0x40000
diff --git a/include/configs/rk3368_common.h b/include/configs/rk3368_common.h
index 2f71ce7..cd81caf 100644
--- a/include/configs/rk3368_common.h
+++ b/include/configs/rk3368_common.h
@@ -13,7 +13,6 @@
#define CONFIG_SYS_SDRAM_BASE 0
#define SDRAM_MAX_SIZE 0xff000000
-#define CONFIG_SYS_CBSIZE 1024
#define CONFIG_IRAM_BASE 0xff8c0000
diff --git a/include/configs/rk3399_common.h b/include/configs/rk3399_common.h
index 8e13737..d2f2865 100644
--- a/include/configs/rk3399_common.h
+++ b/include/configs/rk3399_common.h
@@ -8,8 +8,6 @@
#include "rockchip-common.h"
-#define CONFIG_SYS_CBSIZE 1024
-
#define CONFIG_IRAM_BASE 0xff8c0000
#define CONFIG_SYS_INIT_SP_ADDR 0x00300000
diff --git a/include/configs/rk3568_common.h b/include/configs/rk3568_common.h
index e9947ea..0563d90 100644
--- a/include/configs/rk3568_common.h
+++ b/include/configs/rk3568_common.h
@@ -8,8 +8,6 @@
#include "rockchip-common.h"
-#define CONFIG_SYS_CBSIZE 1024
-
#define CONFIG_IRAM_BASE 0xfdcc0000
#define CONFIG_SYS_INIT_SP_ADDR 0x00c00000
diff --git a/include/configs/rpi.h b/include/configs/rpi.h
index 7a5f085..9e2b24a 100644
--- a/include/configs/rpi.h
+++ b/include/configs/rpi.h
@@ -60,7 +60,6 @@
#endif
/* Console configuration */
-#define CONFIG_SYS_CBSIZE 1024
/* Environment */
diff --git a/include/configs/rv1108_common.h b/include/configs/rv1108_common.h
index d0f70b0..54f423c 100644
--- a/include/configs/rv1108_common.h
+++ b/include/configs/rv1108_common.h
@@ -10,8 +10,6 @@
#define CONFIG_IRAM_BASE 0x10080000
-#define CONFIG_SYS_CBSIZE 1024
-
#define CONFIG_SYS_TIMER_RATE (24 * 1000 * 1000)
/* TIMER1,initialized by ddr initialize code */
#define CONFIG_SYS_TIMER_BASE 0x10350020
diff --git a/include/configs/s5p4418_nanopi2.h b/include/configs/s5p4418_nanopi2.h
index e2bdc09..a25dce5 100644
--- a/include/configs/s5p4418_nanopi2.h
+++ b/include/configs/s5p4418_nanopi2.h
@@ -77,8 +77,6 @@
*/
/* board_init_f->init_sequence, call arch_cpu_init */
-/* Console I/O Buffer Size */
-#define CONFIG_SYS_CBSIZE 1024
/* Boot Argument Buffer Size */
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
diff --git a/include/configs/sandbox.h b/include/configs/sandbox.h
index 7b6db46..c22b74f 100644
--- a/include/configs/sandbox.h
+++ b/include/configs/sandbox.h
@@ -12,8 +12,6 @@
#define CONFIG_MALLOC_F_ADDR 0x0010000
-#define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */
-
/* GUIDs for capsule updatable firmware images */
#define SANDBOX_UBOOT_IMAGE_GUID \
EFI_GUID(0x09d7cf52, 0x0720, 0x4710, 0x91, 0xd1, \
diff --git a/include/configs/sdm845.h b/include/configs/sdm845.h
index a69a703..e1b8c61 100644
--- a/include/configs/sdm845.h
+++ b/include/configs/sdm845.h
@@ -24,7 +24,4 @@
/* Size of malloc() pool */
#define CONFIG_SYS_BOOTM_LEN SZ_64M
-/* Monitor Command Prompt */
-#define CONFIG_SYS_CBSIZE 512
-
#endif
diff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h
index 37e6599..5757b63 100644
--- a/include/configs/siemens-am33x-common.h
+++ b/include/configs/siemens-am33x-common.h
@@ -28,7 +28,6 @@
#define V_SCLK (V_OSCK)
/* Console I/O Buffer Size */
-#define CONFIG_SYS_CBSIZE 1024
/* Boot Argument Buffer Size */
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
diff --git a/include/configs/smartweb.h b/include/configs/smartweb.h
index 599a513..b51a520 100644
--- a/include/configs/smartweb.h
+++ b/include/configs/smartweb.h
@@ -88,7 +88,6 @@
#endif
/* General Boot Parameter */
-#define CONFIG_SYS_CBSIZE 512
/*
* The NAND Flash partitions:
diff --git a/include/configs/sniper.h b/include/configs/sniper.h
index ca3da954..2a2609d 100644
--- a/include/configs/sniper.h
+++ b/include/configs/sniper.h
@@ -61,8 +61,6 @@
#define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img"
-#define CONFIG_SYS_CBSIZE 512
-
/*
* Serial
*/
diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h
index 0cdb547..4a09983 100644
--- a/include/configs/socfpga_common.h
+++ b/include/configs/socfpga_common.h
@@ -59,7 +59,6 @@
/*
* U-Boot general configurations
*/
-#define CONFIG_SYS_CBSIZE 1024 /* Console I/O buffer size */
/* Print buffer size */
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
/* Boot argument buffer size */
diff --git a/include/configs/socfpga_soc64_common.h b/include/configs/socfpga_soc64_common.h
index adaa39b..14cc708 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_CBSIZE 2048
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
/* Extend size of kernel image for uncompression */
diff --git a/include/configs/stih410-b2260.h b/include/configs/stih410-b2260.h
index 3e6feae..fba93fd 100644
--- a/include/configs/stih410-b2260.h
+++ b/include/configs/stih410-b2260.h
@@ -47,9 +47,6 @@
CONFIG_SYS_MALLOC_LEN - \
CONFIG_SYS_GBL_DATA_SIZE)
-/* Monitor Command Prompt */
-#define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */
-
/* USB Configs */
#define CONFIG_USB_OHCI_NEW
#define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS 2
diff --git a/include/configs/stm32f429-discovery.h b/include/configs/stm32f429-discovery.h
index 21bab5a..de17c8b 100644
--- a/include/configs/stm32f429-discovery.h
+++ b/include/configs/stm32f429-discovery.h
@@ -19,8 +19,6 @@
#define CONFIG_SYS_HZ_CLOCK 1000000 /* Timer is clocked at 1MHz */
-#define CONFIG_SYS_CBSIZE 1024
-
#define CONFIG_EXTRA_ENV_SETTINGS \
"bootargs_romfs=uclinux.physaddr=0x08180000 root=/dev/mtdblock0\0" \
"bootcmd_romfs=setenv bootargs ${bootargs} ${bootargs_romfs};" \
diff --git a/include/configs/stm32f429-evaluation.h b/include/configs/stm32f429-evaluation.h
index 4c421b9..4efe40f 100644
--- a/include/configs/stm32f429-evaluation.h
+++ b/include/configs/stm32f429-evaluation.h
@@ -24,8 +24,6 @@
#define CONFIG_SYS_HZ_CLOCK 1000000 /* Timer is clocked at 1MHz */
-#define CONFIG_SYS_CBSIZE 1024
-
#define BOOT_TARGET_DEVICES(func) \
func(MMC, mmc, 0)
diff --git a/include/configs/stm32f469-discovery.h b/include/configs/stm32f469-discovery.h
index e91f8da..42e96b0 100644
--- a/include/configs/stm32f469-discovery.h
+++ b/include/configs/stm32f469-discovery.h
@@ -24,8 +24,6 @@
#define CONFIG_SYS_HZ_CLOCK 1000000 /* Timer is clocked at 1MHz */
-#define CONFIG_SYS_CBSIZE 1024
-
#define BOOT_TARGET_DEVICES(func) \
func(MMC, mmc, 0)
diff --git a/include/configs/stm32f746-disco.h b/include/configs/stm32f746-disco.h
index cc3d4b4..375f2a7 100644
--- a/include/configs/stm32f746-disco.h
+++ b/include/configs/stm32f746-disco.h
@@ -26,8 +26,6 @@
#define CONFIG_SYS_HZ_CLOCK 1000000 /* Timer is clocked at 1MHz */
-#define CONFIG_SYS_CBSIZE 1024
-
#define BOOT_TARGET_DEVICES(func) \
func(MMC, mmc, 0)
diff --git a/include/configs/stm32mp15_common.h b/include/configs/stm32mp15_common.h
index 6b40cdb..60947d6 100644
--- a/include/configs/stm32mp15_common.h
+++ b/include/configs/stm32mp15_common.h
@@ -19,7 +19,6 @@
/*
* Console I/O buffer size
*/
-#define CONFIG_SYS_CBSIZE SZ_1K
/*
* For booting Linux, use the first 256 MB of memory, since this is
diff --git a/include/configs/stmark2.h b/include/configs/stmark2.h
index 4989920..9c453fc 100644
--- a/include/configs/stmark2.h
+++ b/include/configs/stmark2.h
@@ -44,7 +44,6 @@
#define CONFIG_EXTRA_CLOCK
#define CONFIG_PRAM 2048 /* 2048 KB */
-#define CONFIG_SYS_CBSIZE 256 /* Console I/O Buffer Size */
/* Boot Argument Buffer Size */
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
diff --git a/include/configs/stv0991.h b/include/configs/stv0991.h
index 1376729..caedd8f 100644
--- a/include/configs/stv0991.h
+++ b/include/configs/stv0991.h
@@ -14,7 +14,6 @@
#define PHYS_SDRAM_1_SIZE 0x00198000
/* user interface */
-#define CONFIG_SYS_CBSIZE 1024
/* MISC */
#define CONFIG_SYS_INIT_RAM_SIZE 0x8000
diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h
index bae5620..c47f475 100644
--- a/include/configs/sunxi-common.h
+++ b/include/configs/sunxi-common.h
@@ -102,7 +102,6 @@
/*
* Miscellaneous configurable options
*/
-#define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */
/* standalone support */
#define CONFIG_STANDALONE_LOAD_ADDR CONFIG_SYS_LOAD_ADDR
diff --git a/include/configs/synquacer.h b/include/configs/synquacer.h
index 44c0606..3278c4b 100644
--- a/include/configs/synquacer.h
+++ b/include/configs/synquacer.h
@@ -40,8 +40,6 @@
#define CONFIG_SYS_FLASH_BASE (0x08000000)
#define CONFIG_SYS_FLASH_BANKS_LIST {CONFIG_SYS_FLASH_BASE}
-#define CONFIG_SYS_CBSIZE 1024
-
/* Since U-Boot 64bit PCIe support is limited, disable 64bit MMIO support */
#define DEFAULT_DFU_ALT_INFO "dfu_alt_info=" \
diff --git a/include/configs/tegra-common.h b/include/configs/tegra-common.h
index dea6f88..55c0f27 100644
--- a/include/configs/tegra-common.h
+++ b/include/configs/tegra-common.h
@@ -35,12 +35,6 @@
*/
#define CONFIG_SYS_MMC_MAX_DEVICE 4
-/*
- * Increasing the size of the IO buffer as default nfsargs size is more
- * than 256 and so it is not possible to edit it
- */
-#define CONFIG_SYS_CBSIZE (1024 * 2) /* Console I/O Buffer Size */
-
/* Boot Argument Buffer Size */
#define CONFIG_SYS_BARGSIZE (CONFIG_SYS_CBSIZE)
diff --git a/include/configs/thunderx_88xx.h b/include/configs/thunderx_88xx.h
index 0282b36..16dc7d0 100644
--- a/include/configs/thunderx_88xx.h
+++ b/include/configs/thunderx_88xx.h
@@ -47,8 +47,6 @@
/* Do not preserve environment */
-/* Monitor Command Prompt */
-#define CONFIG_SYS_CBSIZE 512 /* Console I/O Buffer Size */
#define PLL_REF_CLK 50000000 /* 50 MHz */
#define NS_PER_REF_CLK_TICK (1000000000/PLL_REF_CLK)
diff --git a/include/configs/ti814x_evm.h b/include/configs/ti814x_evm.h
index 95434aa..3ce2c1f 100644
--- a/include/configs/ti814x_evm.h
+++ b/include/configs/ti814x_evm.h
@@ -62,7 +62,6 @@
/* Console I/O Buffer Size */
-#define CONFIG_SYS_CBSIZE 512
/**
* Physical Memory Map
diff --git a/include/configs/ti_armv7_common.h b/include/configs/ti_armv7_common.h
index e28d91a..9e18a6c 100644
--- a/include/configs/ti_armv7_common.h
+++ b/include/configs/ti_armv7_common.h
@@ -89,7 +89,6 @@
/* As stated above, the following choices are optional. */
/* Console I/O Buffer Size */
-#define CONFIG_SYS_CBSIZE 1024
/* Boot Argument Buffer Size */
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
diff --git a/include/configs/total_compute.h b/include/configs/total_compute.h
index a4ab619..7ab7926 100644
--- a/include/configs/total_compute.h
+++ b/include/configs/total_compute.h
@@ -46,9 +46,6 @@
* Else boot FIT image.
*/
-/* Monitor Command Prompt */
-#define CONFIG_SYS_CBSIZE 512 /* Console I/O Buffer Size */
-
#define CONFIG_SYS_FLASH_BASE 0x0C000000
/* 256 x 256KiB sectors */
#define CONFIG_SYS_MAX_FLASH_SECT 256
diff --git a/include/configs/tplink_wdr4300.h b/include/configs/tplink_wdr4300.h
index 1e2c552..30f8376 100644
--- a/include/configs/tplink_wdr4300.h
+++ b/include/configs/tplink_wdr4300.h
@@ -27,7 +27,6 @@
* Command
*/
/* Miscellaneous configurable options */
-#define CONFIG_SYS_CBSIZE 1024 /* Console I/O buffer size */
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
/* Boot argument buffer size */
diff --git a/include/configs/turris_mox.h b/include/configs/turris_mox.h
index 7f1363f..64b049f 100644
--- a/include/configs/turris_mox.h
+++ b/include/configs/turris_mox.h
@@ -11,7 +11,6 @@
#define CONFIG_SYS_BOOTM_LEN (64 << 20)
#define CONFIG_SYS_SDRAM_BASE 0x00000000
#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_TEXT_BASE + 0xFF0000)
-#define CONFIG_SYS_CBSIZE 1024
#define CONFIG_SYS_BAUDRATE_TABLE { 300, 600, 1200, 1800, 2400, 4800, \
9600, 19200, 38400, 57600, 115200, \
230400, 460800, 500000, 576000, \
diff --git a/include/configs/uniphier.h b/include/configs/uniphier.h
index f813f88c..9bea5a2 100644
--- a/include/configs/uniphier.h
+++ b/include/configs/uniphier.h
@@ -41,7 +41,6 @@
#define CONFIG_SYS_MONITOR_LEN 0x00200000 /* 2MB */
-#define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */
/* Boot Argument Buffer Size */
#define CONFIG_SYS_BARGSIZE (CONFIG_SYS_CBSIZE)
diff --git a/include/configs/usbarmory.h b/include/configs/usbarmory.h
index 0faa656..1c3545f 100644
--- a/include/configs/usbarmory.h
+++ b/include/configs/usbarmory.h
@@ -15,7 +15,6 @@
/* U-Boot environment */
/* U-Boot general configurations */
-#define CONFIG_SYS_CBSIZE 512
/* UART */
#define CONFIG_MXC_UART_BASE UART1_BASE
diff --git a/include/configs/verdin-imx8mm.h b/include/configs/verdin-imx8mm.h
index 3d1fd16..b251e2b 100644
--- a/include/configs/verdin-imx8mm.h
+++ b/include/configs/verdin-imx8mm.h
@@ -86,8 +86,6 @@
/* UART */
#define CONFIG_MXC_UART_BASE UART_BASE_ADDR(1)
-/* Monitor Command Prompt */
-#define CONFIG_SYS_CBSIZE SZ_2K
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
/* ENET */
diff --git a/include/configs/verdin-imx8mp.h b/include/configs/verdin-imx8mp.h
index f15bebf..df6dc74 100644
--- a/include/configs/verdin-imx8mp.h
+++ b/include/configs/verdin-imx8mp.h
@@ -102,8 +102,6 @@
/* UART */
#define CONFIG_MXC_UART_BASE UART_BASE_ADDR(3)
-/* Monitor Command Prompt */
-#define CONFIG_SYS_CBSIZE SZ_2K
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
#endif /* __VERDIN_IMX8MP_H */
diff --git a/include/configs/vexpress_aemv8.h b/include/configs/vexpress_aemv8.h
index b672ac5..df76b9a 100644
--- a/include/configs/vexpress_aemv8.h
+++ b/include/configs/vexpress_aemv8.h
@@ -263,9 +263,6 @@
EXTRA_ENV_NAMES \
BOOTENV
-/* Monitor Command Prompt */
-#define CONFIG_SYS_CBSIZE 512 /* Console I/O Buffer Size */
-
#ifdef CONFIG_TARGET_VEXPRESS64_JUNO
#define CONFIG_SYS_FLASH_BASE 0x08000000
/* 255 x 256KiB sectors + 4 x 64KiB sectors at the end = 259 */
diff --git a/include/configs/vexpress_common.h b/include/configs/vexpress_common.h
index 599caac..f27280a 100644
--- a/include/configs/vexpress_common.h
+++ b/include/configs/vexpress_common.h
@@ -197,7 +197,4 @@
#define CONFIG_SYS_FLASH_BANKS_LIST { CONFIG_SYS_FLASH_BASE0, \
CONFIG_SYS_FLASH_BASE1 }
-/* Monitor Command Prompt */
-#define CONFIG_SYS_CBSIZE 512 /* Console I/O Buffer Size */
-
#endif /* VEXPRESS_COMMON_H */
diff --git a/include/configs/vocore2.h b/include/configs/vocore2.h
index 2f3e32c..b924b24 100644
--- a/include/configs/vocore2.h
+++ b/include/configs/vocore2.h
@@ -35,7 +35,6 @@
/* Memory usage */
#define CONFIG_SYS_BOOTPARAMS_LEN (128 * 1024)
-#define CONFIG_SYS_CBSIZE 512
/* Environment settings */
diff --git a/include/configs/work_92105.h b/include/configs/work_92105.h
index 3324537..9b7cc7a 100644
--- a/include/configs/work_92105.h
+++ b/include/configs/work_92105.h
@@ -27,7 +27,6 @@
/*
* U-Boot General Configurations
*/
-#define CONFIG_SYS_CBSIZE 1024
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
/*
diff --git a/include/configs/x86-common.h b/include/configs/x86-common.h
index a22f970..48091b9 100644
--- a/include/configs/x86-common.h
+++ b/include/configs/x86-common.h
@@ -40,7 +40,6 @@
/*
* Miscellaneous configurable options
*/
-#define CONFIG_SYS_CBSIZE 512
/*-----------------------------------------------------------------------
* CPU Features
diff --git a/include/configs/xenguest_arm64.h b/include/configs/xenguest_arm64.h
index ccd4049..322b2cf 100644
--- a/include/configs/xenguest_arm64.h
+++ b/include/configs/xenguest_arm64.h
@@ -13,8 +13,6 @@
#undef CONFIG_SYS_SDRAM_BASE
-/* Monitor Command Prompt */
-#define CONFIG_SYS_CBSIZE 1024
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
#undef CONFIG_EXTRA_ENV_SETTINGS
diff --git a/include/configs/xilinx_versal.h b/include/configs/xilinx_versal.h
index 060e964..d1e2753 100644
--- a/include/configs/xilinx_versal.h
+++ b/include/configs/xilinx_versal.h
@@ -27,9 +27,7 @@
/* Miscellaneous configurable options */
-/* Monitor Command Prompt */
/* Console I/O Buffer Size */
-#define CONFIG_SYS_CBSIZE 2048
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
#if defined(CONFIG_CMD_DFU)
diff --git a/include/configs/xilinx_versal_mini.h b/include/configs/xilinx_versal_mini.h
index a94ab1f..e1f95de 100644
--- a/include/configs/xilinx_versal_mini.h
+++ b/include/configs/xilinx_versal_mini.h
@@ -17,7 +17,4 @@
/* Undef unneeded configs */
#undef CONFIG_EXTRA_ENV_SETTINGS
-#undef CONFIG_SYS_CBSIZE
-#define CONFIG_SYS_CBSIZE 1024
-
#endif /* __CONFIG_VERSAL_MINI_H */
diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h
index 5bfb736..2abf96f 100644
--- a/include/configs/xilinx_zynqmp.h
+++ b/include/configs/xilinx_zynqmp.h
@@ -51,9 +51,7 @@
# define PARTS_DEFAULT
#endif
-/* Monitor Command Prompt */
/* Console I/O Buffer Size */
-#define CONFIG_SYS_CBSIZE 2048
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
/* Ethernet driver */
diff --git a/include/configs/xilinx_zynqmp_mini.h b/include/configs/xilinx_zynqmp_mini.h
index baef561..94f5f0c 100644
--- a/include/configs/xilinx_zynqmp_mini.h
+++ b/include/configs/xilinx_zynqmp_mini.h
@@ -18,7 +18,4 @@
#undef CONFIG_EXTRA_ENV_SETTINGS
#undef CONFIG_SYS_INIT_SP_ADDR
-#undef CONFIG_SYS_CBSIZE
-#define CONFIG_SYS_CBSIZE 1024
-
#endif /* __CONFIG_ZYNQMP_MINI_H */
diff --git a/include/configs/xtfpga.h b/include/configs/xtfpga.h
index 92e5b43..89b6d19 100644
--- a/include/configs/xtfpga.h
+++ b/include/configs/xtfpga.h
@@ -98,7 +98,6 @@
/*==============================*/
/* Console I/O Buffer Size */
-#define CONFIG_SYS_CBSIZE 1024
/* Boot Argument Buffer Size */
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h
index f8c0800..40ca3ce 100644
--- a/include/configs/zynq-common.h
+++ b/include/configs/zynq-common.h
@@ -199,8 +199,6 @@
/* Miscellaneous configurable options */
-#define CONFIG_SYS_CBSIZE 2048 /* Console I/O Buffer Size */
-
#define CONFIG_SYS_INIT_RAM_ADDR 0xFFFF0000
#define CONFIG_SYS_INIT_RAM_SIZE 0x2000
#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_INIT_RAM_ADDR + \
diff --git a/include/configs/zynq_cse.h b/include/configs/zynq_cse.h
index 7eafdfd..79c77c9 100644
--- a/include/configs/zynq_cse.h
+++ b/include/configs/zynq_cse.h
@@ -14,10 +14,6 @@
/* Undef unneeded configs */
#undef CONFIG_EXTRA_ENV_SETTINGS
-#undef CONFIG_SYS_CBSIZE
-
-#define CONFIG_SYS_CBSIZE 1024
-
#undef CONFIG_SYS_INIT_RAM_ADDR
#undef CONFIG_SYS_INIT_RAM_SIZE
#define CONFIG_SYS_INIT_RAM_ADDR 0xFFFDE000