diff --git a/include/configs/10m50_devboard.h b/include/configs/10m50_devboard.h
index 892ceff5e6402099f63b3d29cfd4b8c803250c04..d15cc44e78dcff27e5d8a1dcb6c1a8bf8bc787d3 100644
--- a/include/configs/10m50_devboard.h
+++ b/include/configs/10m50_devboard.h
@@ -78,7 +78,6 @@
  * MISC
  */
 #define CONFIG_SYS_LONGHELP		/* Provide extended help */
-#define CONFIG_SYS_CBSIZE		256	/* Console I/O buf size */
 #define CONFIG_SYS_MAXARGS		16	/* Max command args	*/
 #define CONFIG_SYS_BARGSIZE		CONFIG_SYS_CBSIZE /* Bootarg buf size */
 #define CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE + \
diff --git a/include/configs/3c120_devboard.h b/include/configs/3c120_devboard.h
index 3869d9065c777c9420a53bb09da543a94c970728..463e978ccd2a7e7a233188e0375c79457a0c07e7 100644
--- a/include/configs/3c120_devboard.h
+++ b/include/configs/3c120_devboard.h
@@ -81,7 +81,6 @@
  * MISC
  */
 #define CONFIG_SYS_LONGHELP		/* Provide extended help */
-#define CONFIG_SYS_CBSIZE		256	/* Console I/O buf size */
 #define CONFIG_SYS_MAXARGS		16	/* Max command args	*/
 #define CONFIG_SYS_BARGSIZE		CONFIG_SYS_CBSIZE /* Bootarg buf size */
 #define CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE + \
diff --git a/include/configs/B4860QDS.h b/include/configs/B4860QDS.h
index f2313a5cca08fb68ad2ff3663cce141d8afbdc18..4273c2d3d3e514adda0e46070e9ea0d922ff602e 100644
--- a/include/configs/B4860QDS.h
+++ b/include/configs/B4860QDS.h
@@ -708,11 +708,6 @@ unsigned long get_board_ddr_clk(void);
 #define CONFIG_CMDLINE_EDITING			/* Command-line editing */
 #define CONFIG_AUTO_COMPLETE			/* add autocompletion support */
 #define CONFIG_SYS_LOAD_ADDR	0x2000000	/* default load address */
-#ifdef CONFIG_CMD_KGDB
-#define CONFIG_SYS_CBSIZE	1024		/* Console I/O Buffer Size */
-#else
-#define CONFIG_SYS_CBSIZE	256		/* Console I/O Buffer Size */
-#endif
 #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16)
 #define CONFIG_SYS_MAXARGS	16		/* max number of command args */
 #define CONFIG_SYS_BARGSIZE	CONFIG_SYS_CBSIZE/* Boot Argument Buffer Size */
diff --git a/include/configs/BSC9132QDS.h b/include/configs/BSC9132QDS.h
index 92ff88bebc645ed68a0be0b3ac0d4fb15a5723ef..c02aad1ad8976e0994e1925366e3e0ed3485d18d 100644
--- a/include/configs/BSC9132QDS.h
+++ b/include/configs/BSC9132QDS.h
@@ -515,11 +515,6 @@ combinations. this should be removed later
 #define CONFIG_AUTO_COMPLETE			/* add autocompletion support */
 #define CONFIG_SYS_LOAD_ADDR	0x2000000	/* default load address */
 
-#if defined(CONFIG_CMD_KGDB)
-#define CONFIG_SYS_CBSIZE	1024		/* Console I/O Buffer Size */
-#else
-#define CONFIG_SYS_CBSIZE	256		/* Console I/O Buffer Size */
-#endif
 #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16)
 						/* Print Buffer Size */
 #define CONFIG_SYS_MAXARGS	16		/* max number of command args */
diff --git a/include/configs/C29XPCIE.h b/include/configs/C29XPCIE.h
index 8c664b184d071b8303c7a0e5384dbbdae127ea73..697b355858401268b2081529e3323c00a7e5eb95 100644
--- a/include/configs/C29XPCIE.h
+++ b/include/configs/C29XPCIE.h
@@ -433,7 +433,6 @@
 #define CONFIG_AUTO_COMPLETE			/* add autocompletion support */
 #define CONFIG_SYS_LOAD_ADDR	0x2000000	/* default load address */
 
-#define CONFIG_SYS_CBSIZE	256		/* Console I/O Buffer Size */
 #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
 						/* Print Buffer Size */
 #define CONFIG_SYS_MAXARGS	16		/* max number of command args */
diff --git a/include/configs/M5208EVBE.h b/include/configs/M5208EVBE.h
index c56cbd9f54f488d85ecbda04a66f0f953d7e8003..addcaabe55376ddf453b6a326b3398032c668e1f 100644
--- a/include/configs/M5208EVBE.h
+++ b/include/configs/M5208EVBE.h
@@ -80,12 +80,6 @@
 #define CONFIG_PRAM		512	/* 512 KB */
 #define CONFIG_SYS_LONGHELP	/* undef to save memory */
 
-#ifdef CONFIG_CMD_KGDB
-#	define CONFIG_SYS_CBSIZE	1024	/* Console I/O Buffer Size */
-#else
-#	define CONFIG_SYS_CBSIZE	256	/* Console I/O Buffer Size */
-#endif
-
 #define CONFIG_SYS_PBSIZE	(CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16)	/* Print Buffer Size */
 #define CONFIG_SYS_MAXARGS	16		/* max number of cmd args */
 #define CONFIG_SYS_BARGSIZE	CONFIG_SYS_CBSIZE	/* Boot Arg Buf Sz */
diff --git a/include/configs/M52277EVB.h b/include/configs/M52277EVB.h
index 21a0309c6e910bac3e6443ec795493c2deca9904..9e74fad137f940a721585db83e4c18675324a247 100644
--- a/include/configs/M52277EVB.h
+++ b/include/configs/M52277EVB.h
@@ -131,11 +131,6 @@
 
 #define CONFIG_SYS_LONGHELP		/* undef to save memory */
 
-#if defined(CONFIG_CMD_KGDB)
-#define CONFIG_SYS_CBSIZE	1024	/* Console I/O Buffer Size */
-#else
-#define CONFIG_SYS_CBSIZE	256	/* Console I/O Buffer Size */
-#endif
 #define CONFIG_SYS_PBSIZE	(CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16)	/* Print Buffer Size */
 #define CONFIG_SYS_MAXARGS	16	/* max number of command args */
 #define CONFIG_SYS_BARGSIZE	CONFIG_SYS_CBSIZE	/* Boot Argument Buffer Size    */
diff --git a/include/configs/M5235EVB.h b/include/configs/M5235EVB.h
index 57bc57817d23fe0237d92dd2b5282bc582bef3e5..4403ba1e1b3e282b4e1e53a265d7ff7346ec8772 100644
--- a/include/configs/M5235EVB.h
+++ b/include/configs/M5235EVB.h
@@ -95,12 +95,6 @@
 #define CONFIG_PRAM		512	/* 512 KB */
 #define CONFIG_SYS_LONGHELP		/* undef to save memory */
 
-#if defined(CONFIG_KGDB)
-#	define CONFIG_SYS_CBSIZE		1024	/* Console I/O Buffer Size */
-#else
-#	define CONFIG_SYS_CBSIZE		256	/* Console I/O Buffer Size */
-#endif
-
 #define CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16)	/* Print Buffer Size */
 #define CONFIG_SYS_MAXARGS		16	/* max number of command args */
 #define CONFIG_SYS_BARGSIZE		CONFIG_SYS_CBSIZE	/* Boot Argument Buffer Size    */
diff --git a/include/configs/M5249EVB.h b/include/configs/M5249EVB.h
index df0733e6c2050f0babccb1f10beab2cb3faef922..594052f0b7ddf275d44a4769d472957760d7799d 100644
--- a/include/configs/M5249EVB.h
+++ b/include/configs/M5249EVB.h
@@ -41,11 +41,6 @@
 
 #define CONFIG_SYS_LONGHELP				/* undef to save memory		*/
 
-#if defined(CONFIG_CMD_KGDB)
-#define CONFIG_SYS_CBSIZE		1024		/* Console I/O Buffer Size	*/
-#else
-#define CONFIG_SYS_CBSIZE		256		/* Console I/O Buffer Size	*/
-#endif
 #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16) /* Print Buffer Size */
 #define CONFIG_SYS_MAXARGS		16		/* max number of command args	*/
 #define CONFIG_SYS_BARGSIZE		CONFIG_SYS_CBSIZE	/* Boot Argument Buffer Size	*/
diff --git a/include/configs/M5253DEMO.h b/include/configs/M5253DEMO.h
index da8333ac6fdafd12d584a01fb10abc7a49bbfaf9..4667de42f485723cfa5148f542a2e9157ce168c3 100644
--- a/include/configs/M5253DEMO.h
+++ b/include/configs/M5253DEMO.h
@@ -94,11 +94,6 @@
 
 #define CONFIG_SYS_LONGHELP		/* undef to save memory */
 
-#if defined(CONFIG_CMD_KGDB)
-#	define CONFIG_SYS_CBSIZE		1024	/* Console I/O Buffer Size */
-#else
-#	define CONFIG_SYS_CBSIZE		256	/* Console I/O Buffer Size */
-#endif
 #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16)	/* Print Buffer Size */
 #define CONFIG_SYS_MAXARGS		16	/* max number of command args */
 #define CONFIG_SYS_BARGSIZE		CONFIG_SYS_CBSIZE	/* Boot Argument Buffer Size */
diff --git a/include/configs/M5253EVBE.h b/include/configs/M5253EVBE.h
index 5a2f0e204f654147cdab0e2955eb23a4243d3b95..023dd7e79e0d583358232cf75ff054f642b0efa5 100644
--- a/include/configs/M5253EVBE.h
+++ b/include/configs/M5253EVBE.h
@@ -64,11 +64,6 @@
 
 #define CONFIG_SYS_LONGHELP		/* undef to save memory */
 
-#if defined(CONFIG_CMD_KGDB)
-#define CONFIG_SYS_CBSIZE		1024	/* Console I/O Buffer Size */
-#else
-#define CONFIG_SYS_CBSIZE		256	/* Console I/O Buffer Size */
-#endif
 #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16)	/* Print Buffer Size */
 #define CONFIG_SYS_MAXARGS		16	/* max number of command args */
 #define CONFIG_SYS_BARGSIZE		CONFIG_SYS_CBSIZE	/* Boot Argument Buffer Size */
diff --git a/include/configs/M5272C3.h b/include/configs/M5272C3.h
index f5693d81780805b1ca20939eaae6c528b2c84147..67a1455fa399b085cd11eb00c0504641ff9a7ca5 100644
--- a/include/configs/M5272C3.h
+++ b/include/configs/M5272C3.h
@@ -98,12 +98,6 @@
 
 #define CONFIG_SYS_LONGHELP		/* undef to save memory */
 
-#if defined(CONFIG_CMD_KGDB)
-#define CONFIG_SYS_CBSIZE		1024	/* Console I/O Buffer Size      */
-#else
-#define CONFIG_SYS_CBSIZE		256	/* Console I/O Buffer Size      */
-#endif
-
 #define CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16)	/* Print Buffer Size */
 #define CONFIG_SYS_MAXARGS		16	/* max number of command args   */
 #define CONFIG_SYS_BARGSIZE		CONFIG_SYS_CBSIZE	/* Boot Argument Buffer Size    */
diff --git a/include/configs/M5275EVB.h b/include/configs/M5275EVB.h
index 339a03c7b10559da5ad3a63c0d74d78a9f1119ab..dcc2e5c3010355c843c8ee74cd225a04595141d7 100644
--- a/include/configs/M5275EVB.h
+++ b/include/configs/M5275EVB.h
@@ -90,11 +90,6 @@
 
 #define CONFIG_SYS_LONGHELP		/* undef to save memory	*/
 
-#if (CONFIG_CMD_KGDB)
-#	define CONFIG_SYS_CBSIZE	1024
-#else
-#	define CONFIG_SYS_CBSIZE	256
-#endif
 #define CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
 #define CONFIG_SYS_MAXARGS		16
 #define CONFIG_SYS_BARGSIZE		CONFIG_SYS_CBSIZE
diff --git a/include/configs/M5282EVB.h b/include/configs/M5282EVB.h
index 3f2d9a9bacda052701cd77717ce9677855d9c617..08226a71ac807681a6552fb6b33d2a7f47107a8a 100644
--- a/include/configs/M5282EVB.h
+++ b/include/configs/M5282EVB.h
@@ -90,11 +90,6 @@
 
 #define	CONFIG_SYS_LONGHELP		/* undef to save memory         */
 
-#if defined(CONFIG_CMD_KGDB)
-#define	CONFIG_SYS_CBSIZE		1024	/* Console I/O Buffer Size      */
-#else
-#define	CONFIG_SYS_CBSIZE		256	/* Console I/O Buffer Size      */
-#endif
 #define	CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16)	/* Print Buffer Size */
 #define	CONFIG_SYS_MAXARGS		16	/* max number of command args   */
 #define CONFIG_SYS_BARGSIZE		CONFIG_SYS_CBSIZE	/* Boot Argument Buffer Size    */
diff --git a/include/configs/M53017EVB.h b/include/configs/M53017EVB.h
index 45e4be2f017d1532d8263a7bfa2ca0931a13d85d..5200817654d4a85cc214dc6cb0bf35230798c6bb 100644
--- a/include/configs/M53017EVB.h
+++ b/include/configs/M53017EVB.h
@@ -97,12 +97,6 @@
 #define CONFIG_PRAM		512	/* 512 KB */
 #define CONFIG_SYS_LONGHELP	/* undef to save memory */
 
-#ifdef CONFIG_CMD_KGDB
-#	define CONFIG_SYS_CBSIZE	1024	/* Console I/O Buffer Size */
-#else
-#	define CONFIG_SYS_CBSIZE	256	/* Console I/O Buffer Size */
-#endif
-
 #define CONFIG_SYS_PBSIZE	(CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16)	/* Print Buffer Size */
 #define CONFIG_SYS_MAXARGS	16		/* max number of cmd args */
 #define CONFIG_SYS_BARGSIZE	CONFIG_SYS_CBSIZE	/* Boot Arg Buf Sz */
diff --git a/include/configs/M5329EVB.h b/include/configs/M5329EVB.h
index 1b5cae2dfebc69b7ae86edbc713ff87662d94a7c..c4fc4141511b17585bab5c9b95a665e3afa398bc 100644
--- a/include/configs/M5329EVB.h
+++ b/include/configs/M5329EVB.h
@@ -89,12 +89,6 @@
 #define CONFIG_PRAM		512	/* 512 KB */
 #define CONFIG_SYS_LONGHELP		/* undef to save memory */
 
-#ifdef CONFIG_CMD_KGDB
-#	define CONFIG_SYS_CBSIZE	1024	/* Console I/O Buffer Size */
-#else
-#	define CONFIG_SYS_CBSIZE	256	/* Console I/O Buffer Size */
-#endif
-
 #define CONFIG_SYS_PBSIZE			(CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16)	/* Print Buffer Size */
 #define CONFIG_SYS_MAXARGS		16	/* max number of command args */
 #define CONFIG_SYS_BARGSIZE		CONFIG_SYS_CBSIZE	/* Boot Argument Buffer Size    */
diff --git a/include/configs/M5373EVB.h b/include/configs/M5373EVB.h
index a0e582e2b8938ad7244af8a811da46d68f861ec5..c78f55137d3b66541f72dbf8ef7ce2733b957140 100644
--- a/include/configs/M5373EVB.h
+++ b/include/configs/M5373EVB.h
@@ -89,12 +89,6 @@
 #define CONFIG_PRAM		512	/* 512 KB */
 #define CONFIG_SYS_LONGHELP		/* undef to save memory */
 
-#ifdef CONFIG_CMD_KGDB
-#	define CONFIG_SYS_CBSIZE	1024	/* Console I/O Buffer Size */
-#else
-#	define CONFIG_SYS_CBSIZE	256	/* Console I/O Buffer Size */
-#endif
-
 #define CONFIG_SYS_PBSIZE			(CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16)	/* Print Buffer Size */
 #define CONFIG_SYS_MAXARGS		16	/* max number of command args */
 #define CONFIG_SYS_BARGSIZE		CONFIG_SYS_CBSIZE	/* Boot Argument Buffer Size    */
diff --git a/include/configs/M54418TWR.h b/include/configs/M54418TWR.h
index 66a17f25401f9731fc926f6f5015d292a986464d..0e8d855a62b1c3258854992b5c007e50c2a77217 100644
--- a/include/configs/M54418TWR.h
+++ b/include/configs/M54418TWR.h
@@ -180,11 +180,6 @@
 
 #define CONFIG_SYS_LONGHELP		/* undef to save memory */
 
-#if defined(CONFIG_CMD_KGDB)
-#define CONFIG_SYS_CBSIZE		1024	/* Console I/O Buffer Size */
-#else
-#define CONFIG_SYS_CBSIZE		256	/* Console I/O Buffer Size */
-#endif
 /* Print Buffer Size */
 #define CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE + \
 					sizeof(CONFIG_SYS_PROMPT) + 16)
diff --git a/include/configs/M54451EVB.h b/include/configs/M54451EVB.h
index 6d55bdd38b4f5f519308a8343f9fcd6dc4a56c75..c64ab8a3cb202c61db9528f1e957eb13d55f0c8a 100644
--- a/include/configs/M54451EVB.h
+++ b/include/configs/M54451EVB.h
@@ -144,11 +144,6 @@
 
 #define CONFIG_SYS_LONGHELP		/* undef to save memory */
 
-#if defined(CONFIG_CMD_KGDB)
-#define CONFIG_SYS_CBSIZE			1024	/* Console I/O Buffer Size */
-#else
-#define CONFIG_SYS_CBSIZE			256	/* Console I/O Buffer Size */
-#endif
 #define CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16)	/* Print Buffer Size */
 #define CONFIG_SYS_MAXARGS		16	/* max number of command args */
 #define CONFIG_SYS_BARGSIZE		CONFIG_SYS_CBSIZE	/* Boot Argument Buffer Size    */
diff --git a/include/configs/M54455EVB.h b/include/configs/M54455EVB.h
index 8e0056aebb0a4dfedca1972684bbee892df89247..3caf5b9bb9eaca83fd13ad8021125da3c4c57536 100644
--- a/include/configs/M54455EVB.h
+++ b/include/configs/M54455EVB.h
@@ -195,11 +195,6 @@
 
 #define CONFIG_SYS_LONGHELP		/* undef to save memory */
 
-#if defined(CONFIG_CMD_KGDB)
-#define CONFIG_SYS_CBSIZE			1024	/* Console I/O Buffer Size */
-#else
-#define CONFIG_SYS_CBSIZE			256	/* Console I/O Buffer Size */
-#endif
 #define CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16)	/* Print Buffer Size */
 #define CONFIG_SYS_MAXARGS		16	/* max number of command args */
 #define CONFIG_SYS_BARGSIZE		CONFIG_SYS_CBSIZE	/* Boot Argument Buffer Size    */
diff --git a/include/configs/M5475EVB.h b/include/configs/M5475EVB.h
index b51d69568a62076f941b89fa66ec1c37e0f9e758..a3badbe5d467fea2bae1c5a030ce86ea03d7a847 100644
--- a/include/configs/M5475EVB.h
+++ b/include/configs/M5475EVB.h
@@ -126,12 +126,6 @@
 #define CONFIG_PRAM		512	/* 512 KB */
 #define CONFIG_SYS_LONGHELP		/* undef to save memory */
 
-#ifdef CONFIG_CMD_KGDB
-#	define CONFIG_SYS_CBSIZE	1024	/* Console I/O Buffer Size */
-#else
-#	define CONFIG_SYS_CBSIZE	256	/* Console I/O Buffer Size */
-#endif
-
 #define CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16)	/* Print Buffer Size */
 #define CONFIG_SYS_MAXARGS		16	/* max number of command args */
 #define CONFIG_SYS_BARGSIZE		CONFIG_SYS_CBSIZE	/* Boot Argument Buffer Size    */
diff --git a/include/configs/M5485EVB.h b/include/configs/M5485EVB.h
index 56af0e3a5fb1db4734ca3287f06231c580735af2..957f5ba3606b56725bfb89e4e2c39a4e8c3649f6 100644
--- a/include/configs/M5485EVB.h
+++ b/include/configs/M5485EVB.h
@@ -114,12 +114,6 @@
 #define CONFIG_PRAM		512	/* 512 KB */
 #define CONFIG_SYS_LONGHELP		/* undef to save memory */
 
-#ifdef CONFIG_CMD_KGDB
-#	define CONFIG_SYS_CBSIZE	1024	/* Console I/O Buffer Size */
-#else
-#	define CONFIG_SYS_CBSIZE	256	/* Console I/O Buffer Size */
-#endif
-
 #define CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16)	/* Print Buffer Size */
 #define CONFIG_SYS_MAXARGS		16	/* max number of command args */
 #define CONFIG_SYS_BARGSIZE		CONFIG_SYS_CBSIZE	/* Boot Argument Buffer Size    */
diff --git a/include/configs/MCR3000.h b/include/configs/MCR3000.h
index 1e6d057fd8f96e121b3883d12c09385bafe654dc..d1d4fe12de95ec30bc82ada1a1df0cb133edb0a0 100644
--- a/include/configs/MCR3000.h
+++ b/include/configs/MCR3000.h
@@ -70,7 +70,6 @@
 
 /* Miscellaneous configurable options */
 #define	CONFIG_SYS_LONGHELP
-#define	CONFIG_SYS_CBSIZE		256
 #define	CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
 #define	CONFIG_SYS_MAXARGS		16
 #define CONFIG_SYS_BARGSIZE		CONFIG_SYS_CBSIZE
diff --git a/include/configs/MPC8315ERDB.h b/include/configs/MPC8315ERDB.h
index e2cc815dd57d81e8a22dbfce3642d51bbb4cb325..41cbcbc1c6201664825fa239c242ecd6d1d1b1db 100644
--- a/include/configs/MPC8315ERDB.h
+++ b/include/configs/MPC8315ERDB.h
@@ -454,12 +454,6 @@
 #define CONFIG_SYS_LONGHELP		/* undef to save memory */
 #define CONFIG_SYS_LOAD_ADDR		0x2000000 /* default load address */
 
-#if defined(CONFIG_CMD_KGDB)
-	#define CONFIG_SYS_CBSIZE	1024 /* Console I/O Buffer Size */
-#else
-	#define CONFIG_SYS_CBSIZE	256 /* Console I/O Buffer Size */
-#endif
-
 				/* Print Buffer Size */
 #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16)
 #define CONFIG_SYS_MAXARGS	16	/* max number of command args */
diff --git a/include/configs/MPC8323ERDB.h b/include/configs/MPC8323ERDB.h
index 7f99bd2888ef8c486cdf3ecd2bc5dcf06355ca81..a3d760fb484c02aee730f060e9929096f94d8503 100644
--- a/include/configs/MPC8323ERDB.h
+++ b/include/configs/MPC8323ERDB.h
@@ -327,12 +327,6 @@
 #define CONFIG_SYS_LONGHELP			/* undef to save memory */
 #define CONFIG_SYS_LOAD_ADDR	0x2000000	/* default load address */
 
-#if (CONFIG_CMD_KGDB)
-	#define CONFIG_SYS_CBSIZE	1024	/* Console I/O Buffer Size */
-#else
-	#define CONFIG_SYS_CBSIZE	256	/* Console I/O Buffer Size */
-#endif
-
 				/* Print Buffer Size */
 #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16)
 #define CONFIG_SYS_MAXARGS	16		/* max number of command args */
diff --git a/include/configs/MPC832XEMDS.h b/include/configs/MPC832XEMDS.h
index a60f1b38e77aa5066d03fc641c59ffd6d2ffabc0..04f6b77d45b89b6d65acd03922ef6828887ebb52 100644
--- a/include/configs/MPC832XEMDS.h
+++ b/include/configs/MPC832XEMDS.h
@@ -411,12 +411,6 @@
 #define CONFIG_SYS_LONGHELP	/* undef to save memory */
 #define CONFIG_SYS_LOAD_ADDR	0x2000000	/* default load address */
 
-#if defined(CONFIG_CMD_KGDB)
-	#define CONFIG_SYS_CBSIZE	1024	/* Console I/O Buffer Size */
-#else
-	#define CONFIG_SYS_CBSIZE	256	/* Console I/O Buffer Size */
-#endif
-
 				/* Print Buffer Size */
 #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16)
 #define CONFIG_SYS_MAXARGS	16	/* max number of command args */
diff --git a/include/configs/MPC8349EMDS.h b/include/configs/MPC8349EMDS.h
index b984ea5175b7e1b984b7f04c001cc4fcb768ff9d..b65552af41420b1b96e0d4a0abc4965ea829e871 100644
--- a/include/configs/MPC8349EMDS.h
+++ b/include/configs/MPC8349EMDS.h
@@ -470,12 +470,6 @@
 #define CONFIG_SYS_LONGHELP			/* undef to save memory */
 #define CONFIG_SYS_LOAD_ADDR	0x2000000	/* default load address */
 
-#if defined(CONFIG_CMD_KGDB)
-	#define CONFIG_SYS_CBSIZE	1024	/* Console I/O Buffer Size */
-#else
-	#define CONFIG_SYS_CBSIZE	256	/* Console I/O Buffer Size */
-#endif
-
 				/* Print Buffer Size */
 #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16)
 #define CONFIG_SYS_MAXARGS	16	/* max number of command args */
diff --git a/include/configs/MPC8349ITX.h b/include/configs/MPC8349ITX.h
index fac4a2278050a48cd375bfbf74df8b3737a5860d..07f0f22295635fb152eebf467fdbbae866056298 100644
--- a/include/configs/MPC8349ITX.h
+++ b/include/configs/MPC8349ITX.h
@@ -493,12 +493,6 @@ boards, we say we have two, but don't display a message if we find only one. */
 #define CONFIG_SYS_LOAD_ADDR	0x2000000	/* default load address */
 #define CONFIG_LOADADDR	800000	/* default location for tftp and bootm */
 
-#if defined(CONFIG_CMD_KGDB)
-	#define CONFIG_SYS_CBSIZE	1024	/* Console I/O Buffer Size */
-#else
-	#define CONFIG_SYS_CBSIZE	256	/* Console I/O Buffer Size */
-#endif
-
 				/* Print Buffer Size */
 #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
 #define CONFIG_SYS_MAXARGS	16	/* max number of command args */
diff --git a/include/configs/MPC837XEMDS.h b/include/configs/MPC837XEMDS.h
index badb233f7e7a891dc77edf4548e838b589083fe9..580a0509a54ef6fd4b481ba10449b126d271ac98 100644
--- a/include/configs/MPC837XEMDS.h
+++ b/include/configs/MPC837XEMDS.h
@@ -482,12 +482,6 @@ extern int board_pci_host_broken(void);
 #define CONFIG_SYS_LONGHELP		/* undef to save memory */
 #define CONFIG_SYS_LOAD_ADDR		0x2000000 /* default load address */
 
-#if defined(CONFIG_CMD_KGDB)
-	#define CONFIG_SYS_CBSIZE	1024 /* Console I/O Buffer Size */
-#else
-	#define CONFIG_SYS_CBSIZE	256 /* Console I/O Buffer Size */
-#endif
-
 				/* Print Buffer Size */
 #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16)
 #define CONFIG_SYS_MAXARGS	16	/* max number of command args */
diff --git a/include/configs/MPC837XERDB.h b/include/configs/MPC837XERDB.h
index 11bd0c3f95c7f9ab54face6f83e333daf45afc31..3ca52dee4807d564ff15e027f99c6f3f962ff673 100644
--- a/include/configs/MPC837XERDB.h
+++ b/include/configs/MPC837XERDB.h
@@ -496,12 +496,6 @@
 #define CONFIG_SYS_LONGHELP	/* undef to save memory */
 #define CONFIG_SYS_LOAD_ADDR	0x2000000 /* default load address */
 
-#if defined(CONFIG_CMD_KGDB)
-	#define CONFIG_SYS_CBSIZE	1024 /* Console I/O Buffer Size */
-#else
-	#define CONFIG_SYS_CBSIZE	256 /* Console I/O Buffer Size */
-#endif
-
 				/* Print Buffer Size */
 #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16)
 #define CONFIG_SYS_MAXARGS	16	/* max number of command args */
diff --git a/include/configs/MPC8536DS.h b/include/configs/MPC8536DS.h
index da127d126fef60df64876a42dba83acabe28257d..b57461a7fe3ecc3eef83074c512a9054c09266c3 100644
--- a/include/configs/MPC8536DS.h
+++ b/include/configs/MPC8536DS.h
@@ -603,11 +603,6 @@
 #define CONFIG_CMDLINE_EDITING			/* Command-line editing */
 #define CONFIG_AUTO_COMPLETE			/* add autocompletion support */
 #define CONFIG_SYS_LOAD_ADDR	0x2000000	/* default load address */
-#if defined(CONFIG_CMD_KGDB)
-#define CONFIG_SYS_CBSIZE	1024		/* Console I/O Buffer Size */
-#else
-#define CONFIG_SYS_CBSIZE	256		/* Console I/O Buffer Size */
-#endif
 #define CONFIG_SYS_PBSIZE	(CONFIG_SYS_CBSIZE \
 		+ sizeof(CONFIG_SYS_PROMPT) + 16) /* Print Buffer Size */
 #define CONFIG_SYS_MAXARGS	16		/* max number of command args */
diff --git a/include/configs/MPC8540ADS.h b/include/configs/MPC8540ADS.h
index e0ff8e151b9da651267e31fb1ee4a145b4c4ebd5..ca4d3f8c849207c0c9c996e6579236995f536d38 100644
--- a/include/configs/MPC8540ADS.h
+++ b/include/configs/MPC8540ADS.h
@@ -324,12 +324,6 @@
 #define CONFIG_AUTO_COMPLETE			/* add autocompletion support */
 #define CONFIG_SYS_LOAD_ADDR	0x2000000	/* default load address */
 
-#if defined(CONFIG_CMD_KGDB)
-    #define CONFIG_SYS_CBSIZE	1024		/* Console I/O Buffer Size */
-#else
-    #define CONFIG_SYS_CBSIZE	256		/* Console I/O Buffer Size */
-#endif
-
 #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16) /* Print Buffer Size */
 #define CONFIG_SYS_MAXARGS	16		/* max number of command args */
 #define CONFIG_SYS_BARGSIZE	CONFIG_SYS_CBSIZE	/* Boot Argument Buffer Size */
diff --git a/include/configs/MPC8541CDS.h b/include/configs/MPC8541CDS.h
index f13926fdd36b99cf59efdf5b85df7caed8afef07..bed9e4612fc9ad1903139576932053d2704e51de 100644
--- a/include/configs/MPC8541CDS.h
+++ b/include/configs/MPC8541CDS.h
@@ -347,11 +347,6 @@ extern unsigned long get_clock_freq(void);
 #define CONFIG_CMDLINE_EDITING			/* Command-line editing */
 #define CONFIG_AUTO_COMPLETE			/* add autocompletion support */
 #define CONFIG_SYS_LOAD_ADDR	0x2000000	/* default load address */
-#if defined(CONFIG_CMD_KGDB)
-#define CONFIG_SYS_CBSIZE	1024		/* Console I/O Buffer Size */
-#else
-#define CONFIG_SYS_CBSIZE	256		/* Console I/O Buffer Size */
-#endif
 #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16) /* Print Buffer Size */
 #define CONFIG_SYS_MAXARGS	16		/* max number of command args */
 #define CONFIG_SYS_BARGSIZE	CONFIG_SYS_CBSIZE	/* Boot Argument Buffer Size */
diff --git a/include/configs/MPC8544DS.h b/include/configs/MPC8544DS.h
index 77c391032678d0b53b53ed0d0e2da6c2489aaea6..2a5f6db04272f3bfd87dcfb8a1303ffcdb8729b4 100644
--- a/include/configs/MPC8544DS.h
+++ b/include/configs/MPC8544DS.h
@@ -360,11 +360,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
 #define CONFIG_CMDLINE_EDITING			/* Command-line editing */
 #define CONFIG_AUTO_COMPLETE			/* add autocompletion support */
 #define CONFIG_SYS_LOAD_ADDR	0x2000000	/* default load address */
-#if defined(CONFIG_CMD_KGDB)
-#define CONFIG_SYS_CBSIZE	1024		/* Console I/O Buffer Size */
-#else
-#define CONFIG_SYS_CBSIZE	256		/* Console I/O Buffer Size */
-#endif
 #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16) /* Print Buffer Size */
 #define CONFIG_SYS_MAXARGS	16		/* max number of command args */
 #define CONFIG_SYS_BARGSIZE	CONFIG_SYS_CBSIZE	/* Boot Argument Buffer Size */
diff --git a/include/configs/MPC8548CDS.h b/include/configs/MPC8548CDS.h
index 20251fd88808352bdd5f8419d9615fefaf2dcd75..3d2506ef66a4fd6bf7d243f45a5108e481e3c4dd 100644
--- a/include/configs/MPC8548CDS.h
+++ b/include/configs/MPC8548CDS.h
@@ -465,11 +465,6 @@ extern unsigned long get_clock_freq(void);
 #define CONFIG_CMDLINE_EDITING			/* Command-line editing */
 #define CONFIG_AUTO_COMPLETE			/* add autocompletion support */
 #define CONFIG_SYS_LOAD_ADDR	0x2000000	/* default load address */
-#if defined(CONFIG_CMD_KGDB)
-#define CONFIG_SYS_CBSIZE	1024		/* Console I/O Buffer Size */
-#else
-#define CONFIG_SYS_CBSIZE	256		/* Console I/O Buffer Size */
-#endif
 #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16) /* Print Buffer Size */
 #define CONFIG_SYS_MAXARGS	16		/* max number of command args */
 #define CONFIG_SYS_BARGSIZE	CONFIG_SYS_CBSIZE	/* Boot Argument Buffer Size */
diff --git a/include/configs/MPC8555CDS.h b/include/configs/MPC8555CDS.h
index 3db0cafb06166dff08dde2594fbe5d6735c072bf..8e2e642a565ca0f920f59c40c5b731568d81ec10 100644
--- a/include/configs/MPC8555CDS.h
+++ b/include/configs/MPC8555CDS.h
@@ -345,11 +345,6 @@ extern unsigned long get_clock_freq(void);
 #define CONFIG_CMDLINE_EDITING			/* Command-line editing */
 #define CONFIG_AUTO_COMPLETE			/* add autocompletion support */
 #define CONFIG_SYS_LOAD_ADDR	0x2000000	/* default load address */
-#if defined(CONFIG_CMD_KGDB)
-#define CONFIG_SYS_CBSIZE	1024		/* Console I/O Buffer Size */
-#else
-#define CONFIG_SYS_CBSIZE	256		/* Console I/O Buffer Size */
-#endif
 #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16) /* Print Buffer Size */
 #define CONFIG_SYS_MAXARGS	16		/* max number of command args */
 #define CONFIG_SYS_BARGSIZE	CONFIG_SYS_CBSIZE	/* Boot Argument Buffer Size */
diff --git a/include/configs/MPC8560ADS.h b/include/configs/MPC8560ADS.h
index c03e53f66e767969e1131b02e1b69537b6fa537b..7b896dd5353e27a63cf6171104f0890a08340777 100644
--- a/include/configs/MPC8560ADS.h
+++ b/include/configs/MPC8560ADS.h
@@ -359,12 +359,6 @@
 #define CONFIG_AUTO_COMPLETE			/* add autocompletion support */
 #define CONFIG_SYS_LOAD_ADDR	0x1000000	/* default load address */
 
-#if defined(CONFIG_CMD_KGDB)
-    #define CONFIG_SYS_CBSIZE	1024		/* Console I/O Buffer Size */
-#else
-    #define CONFIG_SYS_CBSIZE	256		/* Console I/O Buffer Size */
-#endif
-
 #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16) /* Print Buffer Size */
 #define CONFIG_SYS_MAXARGS	16		/* max number of command args */
 #define CONFIG_SYS_BARGSIZE	CONFIG_SYS_CBSIZE	/* Boot Argument Buffer Size */
diff --git a/include/configs/MPC8568MDS.h b/include/configs/MPC8568MDS.h
index 9be25a99cb3eaafb264c8cbf7173f58ec9d84143..dd8a84e5242f53a1818b61f55222a3fd931ba19c 100644
--- a/include/configs/MPC8568MDS.h
+++ b/include/configs/MPC8568MDS.h
@@ -360,11 +360,6 @@ extern unsigned long get_clock_freq(void);
 #define CONFIG_CMDLINE_EDITING			/* Command-line editing */
 #define CONFIG_AUTO_COMPLETE			/* add autocompletion support */
 #define CONFIG_SYS_LOAD_ADDR	0x2000000	/* default load address */
-#if defined(CONFIG_CMD_KGDB)
-#define CONFIG_SYS_CBSIZE	1024		/* Console I/O Buffer Size */
-#else
-#define CONFIG_SYS_CBSIZE	256			/* Console I/O Buffer Size */
-#endif
 #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16) /* Print Buffer Size */
 #define CONFIG_SYS_MAXARGS	16		/* max number of command args */
 #define CONFIG_SYS_BARGSIZE	CONFIG_SYS_CBSIZE	/* Boot Argument Buffer Size */
diff --git a/include/configs/MPC8572DS.h b/include/configs/MPC8572DS.h
index 218d2126080fe9408497356cfb3d11189fdccbae..96f8ef92bfc7a63769addb221929d1752b642cf0 100644
--- a/include/configs/MPC8572DS.h
+++ b/include/configs/MPC8572DS.h
@@ -558,11 +558,6 @@
 #define CONFIG_CMDLINE_EDITING			/* Command-line editing */
 #define CONFIG_AUTO_COMPLETE			/* add autocompletion support */
 #define CONFIG_SYS_LOAD_ADDR	0x2000000	/* default load address */
-#if defined(CONFIG_CMD_KGDB)
-#define CONFIG_SYS_CBSIZE	1024		/* Console I/O Buffer Size */
-#else
-#define CONFIG_SYS_CBSIZE	256		/* Console I/O Buffer Size */
-#endif
 #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16) /* Print Buffer Size */
 #define CONFIG_SYS_MAXARGS	16		/* max number of command args */
 #define CONFIG_SYS_BARGSIZE	CONFIG_SYS_CBSIZE	/* Boot Argument Buffer Size */
diff --git a/include/configs/MPC8610HPCD.h b/include/configs/MPC8610HPCD.h
index d27ed522edf8bb8399af3bf93a46e13890302e54..b69c086f4f1ec62c3919467a4a9ec4735082619d 100644
--- a/include/configs/MPC8610HPCD.h
+++ b/include/configs/MPC8610HPCD.h
@@ -433,12 +433,6 @@
 #define CONFIG_CMDLINE_EDITING          /* Command-line editing */
 #define CONFIG_SYS_LOAD_ADDR	0x2000000	/* default load address */
 
-#if defined(CONFIG_CMD_KGDB)
-#define CONFIG_SYS_CBSIZE	1024		/* Console I/O Buffer Size */
-#else
-#define CONFIG_SYS_CBSIZE	256		/* Console I/O Buffer Size */
-#endif
-
 #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16) /* Print Buffer Size */
 #define CONFIG_SYS_MAXARGS	16		/* max number of command args */
 #define CONFIG_SYS_BARGSIZE	CONFIG_SYS_CBSIZE	/* Boot Argument Buffer Size */
diff --git a/include/configs/MPC8641HPCN.h b/include/configs/MPC8641HPCN.h
index f9269e9340504604c273f9ebd96ebebffd552847..ed1415ba48cfe14130b6ba53fa67877c2efa24ea 100644
--- a/include/configs/MPC8641HPCN.h
+++ b/include/configs/MPC8641HPCN.h
@@ -590,12 +590,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
 #define CONFIG_CMDLINE_EDITING		/* Command-line editing */
 #define CONFIG_SYS_LOAD_ADDR	0x2000000	/* default load address */
 
-#if defined(CONFIG_CMD_KGDB)
-    #define CONFIG_SYS_CBSIZE	1024		/* Console I/O Buffer Size */
-#else
-    #define CONFIG_SYS_CBSIZE	256		/* Console I/O Buffer Size */
-#endif
-
 #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16) /* Print Buffer Size */
 #define CONFIG_SYS_MAXARGS	16		/* max number of command args */
 #define CONFIG_SYS_BARGSIZE	CONFIG_SYS_CBSIZE	/* Boot Argument Buffer Size */
diff --git a/include/configs/MigoR.h b/include/configs/MigoR.h
index 1c4eb1cea56c53ba97b0a5dec0147a0e73e08cee..464ad46c95dce3c84eb5609fd6cbb1fef15000d2 100644
--- a/include/configs/MigoR.h
+++ b/include/configs/MigoR.h
@@ -26,7 +26,6 @@
 
 #define CONFIG_SYS_TEXT_BASE	0x8FFC0000
 #define CONFIG_SYS_LONGHELP			/* undef to save memory	*/
-#define CONFIG_SYS_CBSIZE		256		/* Buffer size for input from the Console */
 #define CONFIG_SYS_PBSIZE		256		/* Buffer size for Console output */
 #define CONFIG_SYS_MAXARGS		16		/* max args accepted for monitor commands */
 #define CONFIG_SYS_BARGSIZE	512		/* Buffer size for Boot Arguments passed to kernel */
diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h
index c19339b86a961a7412413120618474d3806c08b4..15f1996159fa81c5436af689e87c0638fcb6b6fe 100644
--- a/include/configs/P1010RDB.h
+++ b/include/configs/P1010RDB.h
@@ -723,11 +723,6 @@ extern unsigned long get_sdram_size(void);
 #define CONFIG_AUTO_COMPLETE			/* add autocompletion support */
 #define CONFIG_SYS_LOAD_ADDR	0x2000000	/* default load address */
 
-#if defined(CONFIG_CMD_KGDB)
-#define CONFIG_SYS_CBSIZE	1024		/* Console I/O Buffer Size */
-#else
-#define CONFIG_SYS_CBSIZE	256		/* Console I/O Buffer Size */
-#endif
 #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16)
 						/* Print Buffer Size */
 #define CONFIG_SYS_MAXARGS	16		/* max number of command args */
diff --git a/include/configs/P1022DS.h b/include/configs/P1022DS.h
index 8c83f2d34b2e47f96ad1c18ad0ffc751757f273b..778346a3bfe15d803b6c956f6edbf30383178b7d 100644
--- a/include/configs/P1022DS.h
+++ b/include/configs/P1022DS.h
@@ -598,11 +598,6 @@
 #define CONFIG_CMDLINE_EDITING			/* Command-line editing */
 #define CONFIG_AUTO_COMPLETE			/* add autocompletion support */
 #define CONFIG_SYS_LOAD_ADDR	0x2000000	/* default load address */
-#ifdef CONFIG_CMD_KGDB
-#define CONFIG_SYS_CBSIZE	1024		/* Console I/O Buffer Size */
-#else
-#define CONFIG_SYS_CBSIZE	256		/* Console I/O Buffer Size */
-#endif
 /* Print Buffer Size */
 #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
 #define CONFIG_SYS_MAXARGS	16
diff --git a/include/configs/P1023RDB.h b/include/configs/P1023RDB.h
index 1e410353542d245b94c9e62555ea81234a8ec7c2..4d77ed54d99446431e494bb8197c34564cc0d0af 100644
--- a/include/configs/P1023RDB.h
+++ b/include/configs/P1023RDB.h
@@ -253,11 +253,6 @@ extern unsigned long get_clock_freq(void);
 #define CONFIG_SYS_LONGHELP			/* undef to save memory	*/
 #define CONFIG_CMDLINE_EDITING		/* Command-line editing */
 #define CONFIG_SYS_LOAD_ADDR	0x2000000	/* default load address */
-#if defined(CONFIG_CMD_KGDB)
-#define CONFIG_SYS_CBSIZE	1024		/* Console I/O Buffer Size */
-#else
-#define CONFIG_SYS_CBSIZE	256		/* Console I/O Buffer Size */
-#endif
 /* Print Buffer Size */
 #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT)+16)
 #define CONFIG_SYS_MAXARGS	16		/* max number of command args */
diff --git a/include/configs/P2041RDB.h b/include/configs/P2041RDB.h
index 64698177c1ce68c8d1de50709497c6f21c10a0a0..5ef274ecd990cc173930011f2d35f081b44abc80 100644
--- a/include/configs/P2041RDB.h
+++ b/include/configs/P2041RDB.h
@@ -594,11 +594,6 @@ unsigned long get_board_sys_clk(unsigned long dummy);
 #define CONFIG_CMDLINE_EDITING			/* Command-line editing */
 #define CONFIG_AUTO_COMPLETE			/* add autocompletion support */
 #define CONFIG_SYS_LOAD_ADDR	0x2000000	/* default load address */
-#ifdef CONFIG_CMD_KGDB
-#define CONFIG_SYS_CBSIZE	1024		/* Console I/O Buffer Size */
-#else
-#define CONFIG_SYS_CBSIZE	256		/* Console I/O Buffer Size */
-#endif
 /* Print Buffer Size */
 #define CONFIG_SYS_PBSIZE	(CONFIG_SYS_CBSIZE + \
 				sizeof(CONFIG_SYS_PROMPT)+16)
diff --git a/include/configs/T102xQDS.h b/include/configs/T102xQDS.h
index d58af7b8438933f19e33ff03dd45ce6de4faf0e8..c1334c6d68e6eb1cbf888c1043b12cc5fca459eb 100644
--- a/include/configs/T102xQDS.h
+++ b/include/configs/T102xQDS.h
@@ -774,11 +774,6 @@ unsigned long get_board_ddr_clk(void);
 #define CONFIG_CMDLINE_EDITING			/* Command-line editing */
 #define CONFIG_AUTO_COMPLETE			/* add autocompletion support */
 #define CONFIG_SYS_LOAD_ADDR	0x2000000	/* default load address */
-#ifdef CONFIG_CMD_KGDB
-#define CONFIG_SYS_CBSIZE	1024		/* Console I/O Buffer Size */
-#else
-#define CONFIG_SYS_CBSIZE	256		/* Console I/O Buffer Size */
-#endif
 #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16)
 #define CONFIG_SYS_MAXARGS	16		/* max number of command args */
 #define CONFIG_SYS_BARGSIZE  CONFIG_SYS_CBSIZE  /* Boot Argument Buffer Size */
diff --git a/include/configs/T102xRDB.h b/include/configs/T102xRDB.h
index c94b837ce4f3fcf9ba6149f929d011e9aa53e0da..1b7d451010a7b75ee326f2b7d5183df2f3a9bd83 100644
--- a/include/configs/T102xRDB.h
+++ b/include/configs/T102xRDB.h
@@ -785,11 +785,6 @@ unsigned long get_board_ddr_clk(void);
 #define CONFIG_CMDLINE_EDITING			/* Command-line editing */
 #define CONFIG_AUTO_COMPLETE			/* add autocompletion support */
 #define CONFIG_SYS_LOAD_ADDR	0x2000000	/* default load address */
-#ifdef CONFIG_CMD_KGDB
-#define CONFIG_SYS_CBSIZE	1024		/* Console I/O Buffer Size */
-#else
-#define CONFIG_SYS_CBSIZE	256		/* Console I/O Buffer Size */
-#endif
 #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16)
 #define CONFIG_SYS_MAXARGS	16		/* max number of command args */
 #define CONFIG_SYS_BARGSIZE  CONFIG_SYS_CBSIZE  /* Boot Argument Buffer Size */
diff --git a/include/configs/T1040QDS.h b/include/configs/T1040QDS.h
index 98cee8a600dbc48e762dc08572beb11c31a2a2d0..cd18b32f77dd0c8dd6c6b30fe009f1356bc92380 100644
--- a/include/configs/T1040QDS.h
+++ b/include/configs/T1040QDS.h
@@ -653,11 +653,6 @@ unsigned long get_board_ddr_clk(void);
 #define CONFIG_CMDLINE_EDITING			/* Command-line editing */
 #define CONFIG_AUTO_COMPLETE			/* add autocompletion support */
 #define CONFIG_SYS_LOAD_ADDR	0x2000000	/* default load address */
-#ifdef CONFIG_CMD_KGDB
-#define CONFIG_SYS_CBSIZE	1024		/* Console I/O Buffer Size */
-#else
-#define CONFIG_SYS_CBSIZE	256		/* Console I/O Buffer Size */
-#endif
 #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16)
 #define CONFIG_SYS_MAXARGS	16		/* max number of command args */
 #define CONFIG_SYS_BARGSIZE	CONFIG_SYS_CBSIZE/* Boot Argument Buffer Size */
diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h
index a54e17c349c08d3679947a109aea9cc87584f55f..ec6c9daf1cb334dfa68b52cb27e8586b01dabf44 100644
--- a/include/configs/T104xRDB.h
+++ b/include/configs/T104xRDB.h
@@ -768,11 +768,6 @@ $(SRCTREE)/board/freescale/t104xrdb/t1042d4_sd_rcw.cfg
 #define CONFIG_CMDLINE_EDITING			/* Command-line editing */
 #define CONFIG_AUTO_COMPLETE			/* add autocompletion support */
 #define CONFIG_SYS_LOAD_ADDR	0x2000000	/* default load address */
-#ifdef CONFIG_CMD_KGDB
-#define CONFIG_SYS_CBSIZE	1024		/* Console I/O Buffer Size */
-#else
-#define CONFIG_SYS_CBSIZE	256		/* Console I/O Buffer Size */
-#endif
 #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16)
 #define CONFIG_SYS_MAXARGS	16		/* max number of command args */
 #define CONFIG_SYS_BARGSIZE	CONFIG_SYS_CBSIZE/* Boot Argument Buffer Size */
diff --git a/include/configs/T208xQDS.h b/include/configs/T208xQDS.h
index c1c3fa13d8bd31a133925a9faba93ff9236eeaec..70f24f18dd87e904cacae13c92708a486dc99923 100644
--- a/include/configs/T208xQDS.h
+++ b/include/configs/T208xQDS.h
@@ -739,11 +739,6 @@ unsigned long get_board_ddr_clk(void);
 #define CONFIG_CMDLINE_EDITING		/* Command-line editing */
 #define CONFIG_AUTO_COMPLETE		/* add autocompletion support */
 #define CONFIG_SYS_LOAD_ADDR	0x2000000 /* default load address */
-#ifdef CONFIG_CMD_KGDB
-#define CONFIG_SYS_CBSIZE	1024	  /* Console I/O Buffer Size */
-#else
-#define CONFIG_SYS_CBSIZE	256	  /* Console I/O Buffer Size */
-#endif
 #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16)
 #define CONFIG_SYS_MAXARGS	16	/* max number of command args */
 #define CONFIG_SYS_BARGSIZE	CONFIG_SYS_CBSIZE/* Boot Argument Buffer Size */
diff --git a/include/configs/T208xRDB.h b/include/configs/T208xRDB.h
index 803d8fbe5fc1e4d8d750c7c669afac227e43ab18..501b411ea0d2710e366c958d81a24465ddd19d21 100644
--- a/include/configs/T208xRDB.h
+++ b/include/configs/T208xRDB.h
@@ -685,11 +685,6 @@ unsigned long get_board_ddr_clk(void);
 #define CONFIG_CMDLINE_EDITING		/* Command-line editing */
 #define CONFIG_AUTO_COMPLETE		/* add autocompletion support */
 #define CONFIG_SYS_LOAD_ADDR	0x2000000 /* default load address */
-#ifdef CONFIG_CMD_KGDB
-#define CONFIG_SYS_CBSIZE	1024	  /* Console I/O Buffer Size */
-#else
-#define CONFIG_SYS_CBSIZE	256	  /* Console I/O Buffer Size */
-#endif
 #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16)
 #define CONFIG_SYS_MAXARGS	16	/* max number of command args */
 #define CONFIG_SYS_BARGSIZE	CONFIG_SYS_CBSIZE/* Boot Argument Buffer Size */
diff --git a/include/configs/T4240RDB.h b/include/configs/T4240RDB.h
index fee8b8fe45b689cb4d35beaeb6b0c014f0328160..dc9718d2d1c9c321ff3d25295a733667e43e3111 100644
--- a/include/configs/T4240RDB.h
+++ b/include/configs/T4240RDB.h
@@ -276,11 +276,6 @@
 #define CONFIG_CMDLINE_EDITING			/* Command-line editing */
 #define CONFIG_AUTO_COMPLETE			/* add autocompletion support */
 #define CONFIG_SYS_LOAD_ADDR	0x2000000	/* default load address */
-#ifdef CONFIG_CMD_KGDB
-#define CONFIG_SYS_CBSIZE	1024		/* Console I/O Buffer Size */
-#else
-#define CONFIG_SYS_CBSIZE	256		/* Console I/O Buffer Size */
-#endif
 #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16)
 #define CONFIG_SYS_MAXARGS	16		/* max number of command args */
 #define CONFIG_SYS_BARGSIZE	CONFIG_SYS_CBSIZE/* Boot Argument Buffer Size */
diff --git a/include/configs/TQM834x.h b/include/configs/TQM834x.h
index 45c54a01118242137ce90b813babd17723340c13..930e06132f1926ce275bfe3d48e79156c3d594c2 100644
--- a/include/configs/TQM834x.h
+++ b/include/configs/TQM834x.h
@@ -273,12 +273,6 @@
 #define CONFIG_CMDLINE_EDITING	1	/* add command line history */
 #define CONFIG_AUTO_COMPLETE		/* add autocompletion support */
 
-#if defined(CONFIG_CMD_KGDB)
-	#define CONFIG_SYS_CBSIZE	1024	/* Console I/O Buffer Size */
-#else
-	#define CONFIG_SYS_CBSIZE	256	/* Console I/O Buffer Size */
-#endif
-
 				/* Print Buffer Size */
 #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16)
 #define CONFIG_SYS_MAXARGS	16	/* max number of command args */
diff --git a/include/configs/UCP1020.h b/include/configs/UCP1020.h
index 293496b256ad8a7cce830157557b4c2fa2781292..c461b5349d528aa983a76e452c20e6b82291060f 100644
--- a/include/configs/UCP1020.h
+++ b/include/configs/UCP1020.h
@@ -441,11 +441,6 @@
 #define CONFIG_SYS_LONGHELP			/* undef to save memory */
 #define CONFIG_CMDLINE_EDITING			/* Command-line editing */
 #define CONFIG_SYS_LOAD_ADDR	0x2000000	/* default load address */
-#if defined(CONFIG_CMD_KGDB)
-#define CONFIG_SYS_CBSIZE	1024		/* Console I/O Buffer Size */
-#else
-#define CONFIG_SYS_CBSIZE	256		/* Console I/O Buffer Size */
-#endif
 #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
 	/* Print Buffer Size */
 #define CONFIG_SYS_MAXARGS	16	/* max number of command args */
diff --git a/include/configs/adp-ae3xx.h b/include/configs/adp-ae3xx.h
index cef1eddeb629386044804a6c4ae8c0c07586656e..66e98c9e141506ae553132280fed3fc746cf9eaf 100644
--- a/include/configs/adp-ae3xx.h
+++ b/include/configs/adp-ae3xx.h
@@ -100,7 +100,6 @@
  * Miscellaneous configurable options
  */
 #define CONFIG_SYS_LONGHELP			/* undef to save memory */
-#define CONFIG_SYS_CBSIZE	256		/* Console I/O Buffer Size */
 
 /* Print Buffer Size */
 #define CONFIG_SYS_PBSIZE	\
diff --git a/include/configs/adp-ag101p.h b/include/configs/adp-ag101p.h
index f9662780de52ca3a621a3e28b6e79c5d63ac714c..cffff46ba08447615c1681dd282de2e0b942410e 100644
--- a/include/configs/adp-ag101p.h
+++ b/include/configs/adp-ag101p.h
@@ -106,7 +106,6 @@
  * Miscellaneous configurable options
  */
 #define CONFIG_SYS_LONGHELP			/* undef to save memory */
-#define CONFIG_SYS_CBSIZE	256		/* Console I/O Buffer Size */
 
 /* Print Buffer Size */
 #define CONFIG_SYS_PBSIZE	\
diff --git a/include/configs/amcore.h b/include/configs/amcore.h
index 5f8b6c5518f72bc28d08904754d616db36a5658f..c0bb118388220bc1d5105110309f159319e80ef0 100644
--- a/include/configs/amcore.h
+++ b/include/configs/amcore.h
@@ -33,12 +33,6 @@
 /* undef to save memory	*/
 #undef	CONFIG_SYS_LONGHELP
 
-#if defined(CONFIG_CMD_KGDB)
-/* Console I/O buff. size */
-#define CONFIG_SYS_CBSIZE		1024
-#else
-#define CONFIG_SYS_CBSIZE		256
-#endif
 /* Print buffer size */
 #define CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE + \
 					 sizeof(CONFIG_SYS_PROMPT)+16)
diff --git a/include/configs/ap121.h b/include/configs/ap121.h
index 860f38509d0a27de9e420f0e4218303ee78f085f..1db7ea61751eca086eb3057b841dfadb29589838 100644
--- a/include/configs/ap121.h
+++ b/include/configs/ap121.h
@@ -43,7 +43,6 @@
 #define CONFIG_ENV_SIZE                 0x10000
 
 /* Miscellaneous configurable options */
-#define CONFIG_SYS_CBSIZE               256
 #define CONFIG_SYS_MAXARGS              16
 #define CONFIG_SYS_PBSIZE               (CONFIG_SYS_CBSIZE + \
 					sizeof(CONFIG_SYS_PROMPT) + 16)
diff --git a/include/configs/ap143.h b/include/configs/ap143.h
index 068007eb3519b0deb4e538f271dd0b33a05f5aae..4475e628216ae026b2378b071d0fef85706e9c05 100644
--- a/include/configs/ap143.h
+++ b/include/configs/ap143.h
@@ -47,7 +47,6 @@
 #define CONFIG_ENV_SIZE                 0x10000
 
 /* Miscellaneous configurable options */
-#define CONFIG_SYS_CBSIZE               256
 #define CONFIG_SYS_MAXARGS              16
 #define CONFIG_SYS_PBSIZE               (CONFIG_SYS_CBSIZE + \
 					sizeof(CONFIG_SYS_PROMPT) + 16)
diff --git a/include/configs/ap325rxa.h b/include/configs/ap325rxa.h
index 9c234fbc085b07ec02a90084069c6eb4fedefc64..46a4f95c969555003884c6e350afc03a2c0230b3 100644
--- a/include/configs/ap325rxa.h
+++ b/include/configs/ap325rxa.h
@@ -31,8 +31,6 @@
 /* undef to save memory	*/
 #define CONFIG_SYS_LONGHELP
 /* Monitor Command Prompt */
-/* Buffer size for input from the Console */
-#define CONFIG_SYS_CBSIZE		256
 /* Buffer size for Console output */
 #define CONFIG_SYS_PBSIZE		256
 /* max args accepted for monitor commands */
diff --git a/include/configs/ap_sh4a_4a.h b/include/configs/ap_sh4a_4a.h
index 0105a660d52125be89dbdae6cf66644d5f02152a..e5949b7679a750f48976ea320cd9239aa0566663 100644
--- a/include/configs/ap_sh4a_4a.h
+++ b/include/configs/ap_sh4a_4a.h
@@ -31,8 +31,6 @@
 /* undef to save memory	*/
 #define CONFIG_SYS_LONGHELP
 /* Monitor Command Prompt */
-/* Buffer size for input from the Console */
-#define CONFIG_SYS_CBSIZE		256
 /* Buffer size for Console output */
 #define CONFIG_SYS_PBSIZE		256
 /* max args accepted for monitor commands */
diff --git a/include/configs/armadillo-800eva.h b/include/configs/armadillo-800eva.h
index 7ed530e766f2cc99db857719e0a24acbf55e769e..862ed4063e155c956e11e2cb6bbb0f236032fea1 100644
--- a/include/configs/armadillo-800eva.h
+++ b/include/configs/armadillo-800eva.h
@@ -35,7 +35,6 @@
 #define ARMADILLO_800EVA_SDRAM_SIZE	(512 * 1024 * 1024)
 
 #define CONFIG_SYS_LONGHELP
-#define CONFIG_SYS_CBSIZE		256
 #define CONFIG_SYS_PBSIZE		256
 #define CONFIG_SYS_MAXARGS		16
 #define CONFIG_SYS_BARGSIZE		512
diff --git a/include/configs/aspeed-common.h b/include/configs/aspeed-common.h
index 2226b9802c3d8ded8100b2648423acdc07c676fa..f1b00251b717d02bd2e3c3e2f75072c4e1c37cde 100644
--- a/include/configs/aspeed-common.h
+++ b/include/configs/aspeed-common.h
@@ -57,7 +57,6 @@
  * Miscellaneous configurable options
  */
 #define CONFIG_SYS_LONGHELP
-#define CONFIG_SYS_CBSIZE		256
 
 /* Print Buffer Size */
 #define CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE \
diff --git a/include/configs/astro_mcf5373l.h b/include/configs/astro_mcf5373l.h
index 563732a5c44ed5639eb90d1b1c000af10610113e..fe575876985a392072a978b808a9ac9df8978a29 100644
--- a/include/configs/astro_mcf5373l.h
+++ b/include/configs/astro_mcf5373l.h
@@ -178,11 +178,6 @@
 
 #define CONFIG_SYS_LONGHELP
 
-#if (CONFIG_COMMANDS & CONFIG_CMD_KGDB)
-#define CONFIG_SYS_CBSIZE		1024
-#else
-#define CONFIG_SYS_CBSIZE		256
-#endif
 #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16)
 #define CONFIG_SYS_MAXARGS		16
 #define CONFIG_SYS_BARGSIZE		CONFIG_SYS_CBSIZE
diff --git a/include/configs/at91-sama5_common.h b/include/configs/at91-sama5_common.h
index 108842f9565f42232c306436d6c090f5605791a6..f8ee9681cf813116262681da14a74a99d6aee7b3 100644
--- a/include/configs/at91-sama5_common.h
+++ b/include/configs/at91-sama5_common.h
@@ -86,7 +86,6 @@
 
 #endif
 
-#define CONFIG_SYS_CBSIZE		256
 #define CONFIG_SYS_MAXARGS		16
 #define CONFIG_SYS_LONGHELP
 #define CONFIG_CMDLINE_EDITING
diff --git a/include/configs/at91rm9200ek.h b/include/configs/at91rm9200ek.h
index cb6dae71e9b64c01259ff2b8611895b80b9557b9..ca03f6b769f4c39d6a3538baba3e2c6527571a5a 100644
--- a/include/configs/at91rm9200ek.h
+++ b/include/configs/at91rm9200ek.h
@@ -174,7 +174,6 @@
 #define CONFIG_CMDLINE_EDITING
 #define CONFIG_SYS_LONGHELP
 #define CONFIG_AUTO_COMPLETE
-#define CONFIG_SYS_CBSIZE		256	/* Console I/O Buffer Size */
 #define CONFIG_SYS_MAXARGS		16	/* max number of command args */
 /* Print Buffer Size */
 #define CONFIG_SYS_PBSIZE		\
diff --git a/include/configs/at91sam9260ek.h b/include/configs/at91sam9260ek.h
index 92add6219fcbf176858a6fbda3bcc8c874a9e383..2add7d4a9c95a704d9f6b74afee27ad24d58e974 100644
--- a/include/configs/at91sam9260ek.h
+++ b/include/configs/at91sam9260ek.h
@@ -159,7 +159,6 @@
 	"fatload mmc 0:1 0x22000000 uImage; bootm"
 #endif
 
-#define CONFIG_SYS_CBSIZE		256
 #define CONFIG_SYS_MAXARGS		16
 #define CONFIG_SYS_LONGHELP		1
 #define CONFIG_CMDLINE_EDITING	1
diff --git a/include/configs/at91sam9261ek.h b/include/configs/at91sam9261ek.h
index a6d37515a16aaabcfb2d5db5b5d8f3ad2bdcd45e..bf9e4aac589c32e05f23c3a62b00324a2491adb0 100644
--- a/include/configs/at91sam9261ek.h
+++ b/include/configs/at91sam9261ek.h
@@ -136,7 +136,6 @@
 #define CONFIG_BOOTCOMMAND	"nand read 0x22000000 0x200000 0x300000; bootm"
 #endif
 
-#define CONFIG_SYS_CBSIZE		256
 #define CONFIG_SYS_MAXARGS		16
 #define CONFIG_SYS_LONGHELP
 #define CONFIG_CMDLINE_EDITING
diff --git a/include/configs/at91sam9263ek.h b/include/configs/at91sam9263ek.h
index 24ff6b5ea5dfa6a2a5333077545d794b8efbf806..57da7ae360c2fb06196401971fc4ddc84fc99e0e 100644
--- a/include/configs/at91sam9263ek.h
+++ b/include/configs/at91sam9263ek.h
@@ -252,7 +252,6 @@
 #define CONFIG_BOOTCOMMAND	"nand read 0x22000000 0x200000 0x300000; bootm"
 #endif
 
-#define CONFIG_SYS_CBSIZE		256
 #define CONFIG_SYS_MAXARGS		16
 #define CONFIG_SYS_LONGHELP		1
 #define CONFIG_CMDLINE_EDITING		1
diff --git a/include/configs/at91sam9m10g45ek.h b/include/configs/at91sam9m10g45ek.h
index 2ce58e13ba4a0a41f6a5a94f86b675748a54ddfa..114dc4343cd3967a5fa9be8ed6f5b7e9b1fbddcf 100644
--- a/include/configs/at91sam9m10g45ek.h
+++ b/include/configs/at91sam9m10g45ek.h
@@ -100,7 +100,6 @@
 				"bootz 0x72000000 - 0x71000000"
 #endif
 
-#define CONFIG_SYS_CBSIZE		256
 #define CONFIG_SYS_MAXARGS		16
 #define CONFIG_SYS_LONGHELP
 #define CONFIG_CMDLINE_EDITING
diff --git a/include/configs/at91sam9n12ek.h b/include/configs/at91sam9n12ek.h
index 089b865ac2427e254d795e9ce0dce32d9a301e42..83ae9b56d34382823471cb85a21cd66ad0b8fd7b 100644
--- a/include/configs/at91sam9n12ek.h
+++ b/include/configs/at91sam9n12ek.h
@@ -159,7 +159,6 @@
 
 #endif
 
-#define CONFIG_SYS_CBSIZE	256
 #define CONFIG_SYS_MAXARGS	16
 #define CONFIG_SYS_LONGHELP
 #define CONFIG_CMDLINE_EDITING
diff --git a/include/configs/at91sam9rlek.h b/include/configs/at91sam9rlek.h
index 2ed4ea87fc7acecdecf32bee236b97940e48eb54..6209899b591ea44dfc8b60406179c84b81258b7c 100644
--- a/include/configs/at91sam9rlek.h
+++ b/include/configs/at91sam9rlek.h
@@ -107,7 +107,6 @@
 				"bootz 0x22000000 - 0x21000000"
 #endif
 
-#define CONFIG_SYS_CBSIZE		256
 #define CONFIG_SYS_MAXARGS		16
 #define CONFIG_SYS_LONGHELP		1
 #define CONFIG_CMDLINE_EDITING		1
diff --git a/include/configs/at91sam9x5ek.h b/include/configs/at91sam9x5ek.h
index eeb29763c91c94e8f69abd44280877679a1f9563..ff53e6712d0a567a99a283f89bba5885523bbb98 100644
--- a/include/configs/at91sam9x5ek.h
+++ b/include/configs/at91sam9x5ek.h
@@ -135,7 +135,6 @@
 #define CONFIG_ENV_SIZE		0x4000
 #endif
 
-#define CONFIG_SYS_CBSIZE	256
 #define CONFIG_SYS_MAXARGS	16
 #define CONFIG_SYS_LONGHELP
 #define CONFIG_CMDLINE_EDITING
diff --git a/include/configs/axs10x.h b/include/configs/axs10x.h
index 8f516eaa4f00878108be38fa0e36e5da9cab1aba..f3650543220dad750f8b0363e17e89d1abe5d276 100644
--- a/include/configs/axs10x.h
+++ b/include/configs/axs10x.h
@@ -81,7 +81,6 @@
  * Console configuration
  */
 #define CONFIG_SYS_LONGHELP
-#define CONFIG_SYS_CBSIZE		SZ_256
 #define CONFIG_SYS_BARGSIZE		CONFIG_SYS_CBSIZE
 #define CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE + \
 						sizeof(CONFIG_SYS_PROMPT) + 16)
diff --git a/include/configs/boston.h b/include/configs/boston.h
index 86dd0433c8e4b67b54e3b3aacd222687fb065bd2..d7fdb8cdcc2c02a0455150606737322afa215cde 100644
--- a/include/configs/boston.h
+++ b/include/configs/boston.h
@@ -45,7 +45,6 @@
  * Console
  */
 #define CONFIG_SYS_MAXARGS		16
-#define CONFIG_SYS_CBSIZE		256
 #define CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE + \
 					 sizeof(CONFIG_SYS_PROMPT) + 16)
 #define CONFIG_SYS_LONGHELP
diff --git a/include/configs/cm_t35.h b/include/configs/cm_t35.h
index e0f5765ecaf1cbd5704ed05bfc4bdf57df8162e8..c8822d4f88f8de1c17ade6ffb9a79c19d6547bcf 100644
--- a/include/configs/cm_t35.h
+++ b/include/configs/cm_t35.h
@@ -175,7 +175,6 @@
 #define CONFIG_TIMESTAMP
 #define CONFIG_SYS_AUTOLOAD		"no"
 #define CONFIG_SYS_LONGHELP		/* undef to save memory */
-#define CONFIG_SYS_CBSIZE		256	/* Console I/O Buffer Size */
 /* Print Buffer Size */
 #define CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE + \
 					sizeof(CONFIG_SYS_PROMPT) + 16)
diff --git a/include/configs/cobra5272.h b/include/configs/cobra5272.h
index 9adf7a35f0ed32227dfab9eb8332b18a64922aa9..42c8f845aa6ff3e62d022a833abdf43f6d7ae020 100644
--- a/include/configs/cobra5272.h
+++ b/include/configs/cobra5272.h
@@ -169,11 +169,6 @@ from which user programs will be started */
 
 #define CONFIG_SYS_LONGHELP				/* undef to save memory		*/
 
-#if defined(CONFIG_CMD_KGDB)
-#define CONFIG_SYS_CBSIZE		1024		/* Console I/O Buffer Size	*/
-#else
-#define CONFIG_SYS_CBSIZE		256		/* Console I/O Buffer Size	*/
-#endif
 #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16) /* Print Buffer Size */
 #define CONFIG_SYS_MAXARGS		16		/* max number of command args	*/
 #define CONFIG_SYS_BARGSIZE		CONFIG_SYS_CBSIZE	/* Boot Argument Buffer Size	*/
diff --git a/include/configs/colibri_pxa270.h b/include/configs/colibri_pxa270.h
index 326fececd719042ae2fddf44bf386ef85a49abc6..d5255e7e0a135a281d871f1ebe18a9a1f9404660 100644
--- a/include/configs/colibri_pxa270.h
+++ b/include/configs/colibri_pxa270.h
@@ -84,7 +84,6 @@
 #endif
 
 #undef	CONFIG_SYS_LONGHELP		/* Saves 10 KB */
-#define	CONFIG_SYS_CBSIZE		256
 #define	CONFIG_SYS_PBSIZE		\
 	(CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16)
 #define	CONFIG_SYS_MAXARGS		16
diff --git a/include/configs/controlcenterd.h b/include/configs/controlcenterd.h
index 52be713af47e551e4acafee051f4360fc97a26fa..7a07d5cbefe0759b67a2c592f67f7d9dbf4d0b7d 100644
--- a/include/configs/controlcenterd.h
+++ b/include/configs/controlcenterd.h
@@ -322,11 +322,6 @@
 #endif /* CONFIG_TRAILBLAZER */
 
 #define CONFIG_SYS_LOAD_ADDR	0x2000000	/* default load address */
-#ifdef CONFIG_CMD_KGDB
-#define CONFIG_SYS_CBSIZE	1024		/* Console I/O Buffer Size */
-#else
-#define CONFIG_SYS_CBSIZE	256		/* Console I/O Buffer Size */
-#endif
 /* Print Buffer Size */
 #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
 #define CONFIG_SYS_MAXARGS	16
diff --git a/include/configs/corenet_ds.h b/include/configs/corenet_ds.h
index 1d4524e05ae6aa5ffbf712918381fda9bc778360..f4f0d74655dfa61104fb2e6a67dbfc174913b068 100644
--- a/include/configs/corenet_ds.h
+++ b/include/configs/corenet_ds.h
@@ -603,11 +603,6 @@
 #define CONFIG_CMDLINE_EDITING			/* Command-line editing */
 #define CONFIG_AUTO_COMPLETE			/* add autocompletion support */
 #define CONFIG_SYS_LOAD_ADDR	0x2000000	/* default load address */
-#ifdef CONFIG_CMD_KGDB
-#define CONFIG_SYS_CBSIZE	1024		/* Console I/O Buffer Size */
-#else
-#define CONFIG_SYS_CBSIZE	256		/* Console I/O Buffer Size */
-#endif
 #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16) /* Print Buffer Size */
 #define CONFIG_SYS_MAXARGS	16		/* max number of command args */
 #define CONFIG_SYS_BARGSIZE	CONFIG_SYS_CBSIZE	/* Boot Argument Buffer Size */
diff --git a/include/configs/corvus.h b/include/configs/corvus.h
index e47f06bda3a9b499f21c503610de81a7298ff556..20886959b17a935bacbd849faf64b6f8dd44fb8a 100644
--- a/include/configs/corvus.h
+++ b/include/configs/corvus.h
@@ -106,7 +106,6 @@
 	"nand read 0x70000000 0x200000 0x300000;"			\
 	"bootm 0x70000000"
 
-#define CONFIG_SYS_CBSIZE		256
 #define CONFIG_SYS_MAXARGS		16
 #define CONFIG_SYS_PBSIZE	(CONFIG_SYS_CBSIZE +	\
 				 sizeof(CONFIG_SYS_PROMPT) + 16)
diff --git a/include/configs/cyrus.h b/include/configs/cyrus.h
index ae4d43b2ac527a5588ffed3c6699bea8082040b9..e4e346ed22a37514bcab89cc13da2322bcf900b9 100644
--- a/include/configs/cyrus.h
+++ b/include/configs/cyrus.h
@@ -429,11 +429,6 @@
 #define CONFIG_CMDLINE_EDITING			/* Command-line editing */
 #define CONFIG_AUTO_COMPLETE			/* add autocompletion support */
 #define CONFIG_SYS_LOAD_ADDR	0x2000000	/* default load address */
-#ifdef CONFIG_CMD_KGDB
-#define CONFIG_SYS_CBSIZE	1024		/* Console I/O Buffer Size */
-#else
-#define CONFIG_SYS_CBSIZE	256		/* Console I/O Buffer Size */
-#endif
 #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16) /* Print Buffer Size */
 #define CONFIG_SYS_MAXARGS	16		/* max number of command args */
 #define CONFIG_SYS_BARGSIZE	CONFIG_SYS_CBSIZE	/* Boot Argument Buffer Size */
diff --git a/include/configs/dbau1x00.h b/include/configs/dbau1x00.h
index ce91f109326529da77b50aa28307efec5b8cdd34..0360bf9150eeac87918fbdf11025b623588d201a 100644
--- a/include/configs/dbau1x00.h
+++ b/include/configs/dbau1x00.h
@@ -71,7 +71,6 @@
  */
 #define	CONFIG_SYS_LONGHELP				/* undef to save memory      */
 
-#define	CONFIG_SYS_CBSIZE		256		/* Console I/O Buffer Size   */
 #define	CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16)  /* Print Buffer Size */
 #define	CONFIG_SYS_MAXARGS		16		/* max number of command args*/
 
diff --git a/include/configs/ecovec.h b/include/configs/ecovec.h
index 86fcea190b379fa0a770a4cb4ae002c22b02ad91..1b697e85131f993109d311a2faa2e413abecd138 100644
--- a/include/configs/ecovec.h
+++ b/include/configs/ecovec.h
@@ -64,8 +64,6 @@
 /* undef to save memory	*/
 #define CONFIG_SYS_LONGHELP
 /* Monitor Command Prompt */
-/* Buffer size for input from the Console */
-#define CONFIG_SYS_CBSIZE		256
 /* Buffer size for Console output */
 #define CONFIG_SYS_PBSIZE		256
 /* max args accepted for monitor commands */
diff --git a/include/configs/espt.h b/include/configs/espt.h
index 778e672332216e994e7ca6b93e75cc63e25bf9d0..2d18018d6c4c6886eaf1f4e2234ff5e5e75c1ad5 100644
--- a/include/configs/espt.h
+++ b/include/configs/espt.h
@@ -24,7 +24,6 @@
 
 #define CONFIG_SYS_TEXT_BASE	0x8FFC0000
 #define CONFIG_SYS_LONGHELP		/* undef to save memory */
-#define CONFIG_SYS_CBSIZE		256	/* Buffer size for input from the Console */
 #define CONFIG_SYS_PBSIZE		256	/* Buffer size for Console output */
 #define CONFIG_SYS_MAXARGS		16	/* max args accepted for monitor commands */
 #define CONFIG_SYS_BARGSIZE	512	/* Buffer size for Boot Arguments
diff --git a/include/configs/ethernut5.h b/include/configs/ethernut5.h
index ecd35e9e0fcc94e0f3de822be5d25359054efe65..430acc09fb2732c734eb2c5aef06d582f37bc0b6 100644
--- a/include/configs/ethernut5.h
+++ b/include/configs/ethernut5.h
@@ -166,7 +166,6 @@
 				"bootm 0x22000000"
 
 /* Misc. u-boot settings */
-#define CONFIG_SYS_CBSIZE		256
 #define CONFIG_SYS_MAXARGS		16
 #define CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE + 16 \
 					+ sizeof(CONFIG_SYS_PROMPT))
diff --git a/include/configs/h2200.h b/include/configs/h2200.h
index def9e21cf053dc6472a6a1432ccb0b41cbb17bfc..9d2e9e8dc7357dc69327c946fb9e5a3f98aad94f 100644
--- a/include/configs/h2200.h
+++ b/include/configs/h2200.h
@@ -114,9 +114,6 @@
 
 /* Monitor Command Prompt */
 
-/* Console I/O Buffer Size */
-#define CONFIG_SYS_CBSIZE		256
-
 /* Print Buffer Size */
 #define CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE + \
 					sizeof(CONFIG_SYS_PROMPT) + 16)
diff --git a/include/configs/hsdk.h b/include/configs/hsdk.h
index 3a90eeaa05674c0fcc663a5519cc37c046feda37..8062d01fff911c3268665d702bca1b1050587f97 100644
--- a/include/configs/hsdk.h
+++ b/include/configs/hsdk.h
@@ -74,7 +74,6 @@
 #define CONFIG_CMDLINE_EDITING
 #define CONFIG_SYS_LONGHELP
 #define CONFIG_SYS_MAXARGS		16
-#define CONFIG_SYS_CBSIZE		SZ_256
 #define CONFIG_SYS_BARGSIZE		CONFIG_SYS_CBSIZE
 #define CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE + \
 						sizeof(CONFIG_SYS_PROMPT) + 16)
diff --git a/include/configs/imx31_phycore.h b/include/configs/imx31_phycore.h
index 0a8501bd5cfaf9ffc78e5d48f69fd1f1f0e31a79..13d874db3f7b0142a1673b7e134e17a4b73a4d97 100644
--- a/include/configs/imx31_phycore.h
+++ b/include/configs/imx31_phycore.h
@@ -93,8 +93,6 @@
  * Miscellaneous configurable options
  */
 #define CONFIG_SYS_LONGHELP		/* undef to save memory */
-/* Console I/O Buffer Size */
-#define CONFIG_SYS_CBSIZE		256
 /* Print Buffer Size */
 #define CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE + \
 					 sizeof(CONFIG_SYS_PROMPT) + 16)
diff --git a/include/configs/integrator-common.h b/include/configs/integrator-common.h
index dca60dfddd9610e8649e095214f870c00df63da6..cd91741beccbb848912df7880979824264f8b6da 100644
--- a/include/configs/integrator-common.h
+++ b/include/configs/integrator-common.h
@@ -13,7 +13,6 @@
 #define CONFIG_SYS_TIMERBASE		0x13000100	/* Timer1 */
 #define CONFIG_SYS_LOAD_ADDR		0x7fc0	/* default load address */
 #define CONFIG_SYS_LONGHELP
-#define CONFIG_SYS_CBSIZE		256	/* Console I/O Buffer Size*/
 #define CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16)
 #define CONFIG_SYS_MAXARGS		16	/* max number of command args */
 #define CONFIG_SYS_BARGSIZE		CONFIG_SYS_CBSIZE /* Boot Argument Buffer Size*/
diff --git a/include/configs/kzm9g.h b/include/configs/kzm9g.h
index 4daeb49e966c3325ec28d208b6da2254d122f270..fc9214530a8ae8636f993fcdde0e292b3a050f1a 100644
--- a/include/configs/kzm9g.h
+++ b/include/configs/kzm9g.h
@@ -40,7 +40,6 @@
 
 /* prompt */
 #define CONFIG_SYS_LONGHELP
-#define CONFIG_SYS_CBSIZE		256
 #define CONFIG_SYS_PBSIZE		256
 #define CONFIG_SYS_MAXARGS		16
 #define CONFIG_SYS_BARGSIZE		512
diff --git a/include/configs/ls1021aiot.h b/include/configs/ls1021aiot.h
index 7c1b488ad7daead305acce454c44697567f2ff38..8be2110c6468a749a1bc4907757a691c4f7eaa12 100644
--- a/include/configs/ls1021aiot.h
+++ b/include/configs/ls1021aiot.h
@@ -240,7 +240,6 @@
 #define CONFIG_SYS_LONGHELP		/* undef to save memory */
 #define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 #define CONFIG_AUTO_COMPLETE
-#define CONFIG_SYS_CBSIZE	256	/* Console I/O Buffer Size */
 #define CONFIG_SYS_PBSIZE		\
 	(CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
 #define CONFIG_SYS_MAXARGS	16	/* max number of command args */
diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h
index b934d10b472ffd3674f0e7d3237b7e80267c2163..390a1b7dd85f437a88490d6d9fbbfe03c146604d 100644
--- a/include/configs/ls1021aqds.h
+++ b/include/configs/ls1021aqds.h
@@ -512,7 +512,6 @@ unsigned long get_board_ddr_clk(void);
  */
 #define CONFIG_SYS_LONGHELP		/* undef to save memory */
 #define CONFIG_AUTO_COMPLETE
-#define CONFIG_SYS_CBSIZE		256	/* Console I/O Buffer Size */
 #define CONFIG_SYS_PBSIZE		\
 		(CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
 #define CONFIG_SYS_MAXARGS		16	/* max number of command args */
diff --git a/include/configs/ls1021atwr.h b/include/configs/ls1021atwr.h
index 0fecd54eea418c3d6c771512bcc50964b78dd9b1..b528bb5397bd719505bfdb50464097a4c939e857 100644
--- a/include/configs/ls1021atwr.h
+++ b/include/configs/ls1021atwr.h
@@ -489,7 +489,6 @@
  */
 #define CONFIG_SYS_LONGHELP		/* undef to save memory */
 #define CONFIG_AUTO_COMPLETE
-#define CONFIG_SYS_CBSIZE		256	/* Console I/O Buffer Size */
 #define CONFIG_SYS_PBSIZE		\
 		(CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
 #define CONFIG_SYS_MAXARGS		16	/* max number of command args */
diff --git a/include/configs/malta.h b/include/configs/malta.h
index b0b9664f57582e826e54956ac283a83c1cec2403..54edb23d67534d52caba7ffc89ddb06dba9357b6 100644
--- a/include/configs/malta.h
+++ b/include/configs/malta.h
@@ -52,7 +52,6 @@
 #define CONFIG_SYS_BOOTPARAMS_LEN	(128 * 1024)
 #define CONFIG_SYS_BOOTM_LEN		(64 * 1024 * 1024)
 
-#define CONFIG_SYS_CBSIZE		256
 #define CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE + \
 					 sizeof(CONFIG_SYS_PROMPT) + 16)
 #define CONFIG_SYS_MAXARGS		16
diff --git a/include/configs/mpr2.h b/include/configs/mpr2.h
index edaca0e1c5c38d41769508d0f6b9d67801e0f7c1..28da200f6e6ca64f1a887cd9b597927d7f4343bb 100644
--- a/include/configs/mpr2.h
+++ b/include/configs/mpr2.h
@@ -24,7 +24,6 @@
 
 /* U-Boot internals */
 #define CONFIG_SYS_LONGHELP			/* undef to save memory	*/
-#define CONFIG_SYS_CBSIZE		256	/* Buffer size for input from the Console */
 #define CONFIG_SYS_PBSIZE		256	/* Buffer size for Console output */
 #define CONFIG_SYS_MAXARGS		16	/* max args accepted for monitor commands */
 #define CONFIG_SYS_BARGSIZE		512	/* Buffer size for Boot Arguments passed to kernel */
diff --git a/include/configs/ms7720se.h b/include/configs/ms7720se.h
index cc3217b82e01fc0ef6a418cde48edf15f234f91f..08adb0bca20778c87b20a8da8bbd742ee44bb77b 100644
--- a/include/configs/ms7720se.h
+++ b/include/configs/ms7720se.h
@@ -25,7 +25,6 @@
 
 #define CONFIG_SYS_TEXT_BASE	0x8FFC0000
 #define CONFIG_SYS_LONGHELP		/* undef to save memory	*/
-#define CONFIG_SYS_CBSIZE	256	/* Buffer size for input from the Console */
 #define CONFIG_SYS_PBSIZE	256	/* Buffer size for Console output */
 #define CONFIG_SYS_MAXARGS	16	/* max args accepted for monitor commands */
 /* Buffer size for Boot Arguments passed to kernel */
diff --git a/include/configs/ms7722se.h b/include/configs/ms7722se.h
index 2fec968c77d85b82fb3e84abd569d35dbdfc5f2a..a7f2ca8b06297f2049d2c05798f2b1747a53d908 100644
--- a/include/configs/ms7722se.h
+++ b/include/configs/ms7722se.h
@@ -26,7 +26,6 @@
 
 #define CONFIG_SYS_TEXT_BASE	0x8FFC0000
 #define CONFIG_SYS_LONGHELP				/* undef to save memory	*/
-#define CONFIG_SYS_CBSIZE		256		/* Buffer size for input from the Console */
 #define CONFIG_SYS_PBSIZE		256		/* Buffer size for Console output */
 #define CONFIG_SYS_MAXARGS		16		/* max args accepted for monitor commands */
 #define CONFIG_SYS_BARGSIZE		512		/* Buffer size for Boot Arguments passed to kernel */
diff --git a/include/configs/ms7750se.h b/include/configs/ms7750se.h
index 5410cbba0d29689670f01a338639274441e39e90..a875a700ff97e7a2d5ba4d7aa5cbef668692dcc4 100644
--- a/include/configs/ms7750se.h
+++ b/include/configs/ms7750se.h
@@ -29,7 +29,6 @@
 #define CONFIG_SYS_SDRAM_SIZE		(64 * 1024 * 1024)
 
 #define CONFIG_SYS_LONGHELP
-#define CONFIG_SYS_CBSIZE		256
 #define CONFIG_SYS_PBSIZE		256
 #define CONFIG_SYS_MAXARGS		16
 #define CONFIG_SYS_BARGSIZE		512
diff --git a/include/configs/mx31ads.h b/include/configs/mx31ads.h
index 80b6e16818b8a8ad3d81fb29f24432aec1e65f59..61f069ea46ff9d96e199be86adf02289a565a3e9 100644
--- a/include/configs/mx31ads.h
+++ b/include/configs/mx31ads.h
@@ -95,7 +95,6 @@
  * Miscellaneous configurable options
  */
 #define CONFIG_SYS_LONGHELP		/* undef to save memory */
-#define CONFIG_SYS_CBSIZE		256		/* Console I/O Buffer Size */
 /* Print Buffer Size */
 #define CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
 #define CONFIG_SYS_MAXARGS		16		/* max number of command args */
diff --git a/include/configs/mx31pdk.h b/include/configs/mx31pdk.h
index 2bb24a1545e396e855354c06780ff2f4a93ecd07..4e0ccc9b3a774e0c8df57444bb9a9772b961ecc5 100644
--- a/include/configs/mx31pdk.h
+++ b/include/configs/mx31pdk.h
@@ -87,7 +87,6 @@
  * Miscellaneous configurable options
  */
 #define CONFIG_SYS_LONGHELP	/* undef to save memory */
-#define CONFIG_SYS_CBSIZE	256	/* Console I/O Buffer Size */
 /* max number of command args */
 #define CONFIG_SYS_MAXARGS	16
 /* Boot Argument Buffer Size */
diff --git a/include/configs/mx35pdk.h b/include/configs/mx35pdk.h
index 526f794bd12f519b728d4031c98126b3e8759ad4..659effb2162b8c0fbe316f3681c11a4ef1b3a960 100644
--- a/include/configs/mx35pdk.h
+++ b/include/configs/mx35pdk.h
@@ -110,7 +110,6 @@
 #define CONFIG_CMDLINE_EDITING
 
 #define CONFIG_AUTO_COMPLETE
-#define CONFIG_SYS_CBSIZE	256	/* Console I/O Buffer Size */
 #define CONFIG_SYS_MAXARGS	16	/* max number of command args */
 #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE /* Boot Argument Buffer Size */
 
diff --git a/include/configs/mx51evk.h b/include/configs/mx51evk.h
index 5daa50d169f4cb0c4f0200e7eeaf828f72a41799..3692f54b183cd192a46f45c07a6d748c5396e823 100644
--- a/include/configs/mx51evk.h
+++ b/include/configs/mx51evk.h
@@ -175,7 +175,6 @@
  */
 #define CONFIG_SYS_LONGHELP		/* undef to save memory */
 #define CONFIG_AUTO_COMPLETE
-#define CONFIG_SYS_CBSIZE		256	/* Console I/O Buffer Size */
 #define CONFIG_SYS_MAXARGS	16	/* max number of command args */
 #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE /* Boot Argument Buffer Size */
 
diff --git a/include/configs/mx53ard.h b/include/configs/mx53ard.h
index 1f1c45e3ec39135bca246eb0675db55e1b1ce3a3..50152a95b2ebfcab396307c8bd8ac148d8decc6f 100644
--- a/include/configs/mx53ard.h
+++ b/include/configs/mx53ard.h
@@ -161,7 +161,6 @@
 /* Miscellaneous configurable options */
 #define CONFIG_SYS_LONGHELP		/* undef to save memory */
 #define CONFIG_AUTO_COMPLETE
-#define CONFIG_SYS_CBSIZE		256	/* Console I/O Buffer Size */
 
 /* Print Buffer Size */
 #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
diff --git a/include/configs/mx53evk.h b/include/configs/mx53evk.h
index 11d1278349a5dd4114588aff8411f3b456587b94..1b17673720efca00b162051b1a70cac21c8b4b5b 100644
--- a/include/configs/mx53evk.h
+++ b/include/configs/mx53evk.h
@@ -108,7 +108,6 @@
 /* Miscellaneous configurable options */
 #define CONFIG_SYS_LONGHELP		/* undef to save memory */
 #define CONFIG_AUTO_COMPLETE
-#define CONFIG_SYS_CBSIZE		256	/* Console I/O Buffer Size */
 
 /* Print Buffer Size */
 #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
diff --git a/include/configs/mx53smd.h b/include/configs/mx53smd.h
index 2990e1637204980b20494d81126978e2ca7c1a12..151935da4965d21c067d14a82081fc89f4ac4a24 100644
--- a/include/configs/mx53smd.h
+++ b/include/configs/mx53smd.h
@@ -100,7 +100,6 @@
 /* Miscellaneous configurable options */
 #define CONFIG_SYS_LONGHELP		/* undef to save memory */
 #define CONFIG_AUTO_COMPLETE
-#define CONFIG_SYS_CBSIZE		256	/* Console I/O Buffer Size */
 
 /* Print Buffer Size */
 #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
diff --git a/include/configs/nokia_rx51.h b/include/configs/nokia_rx51.h
index a072708d616ce1ea2af08a8c732edc08164f8b65..57a2c9037bc19b4b4504ca7db98e1ae649c7d098 100644
--- a/include/configs/nokia_rx51.h
+++ b/include/configs/nokia_rx51.h
@@ -331,7 +331,6 @@ int rx51_kp_getc(struct stdio_dev *sdev);
  * Miscellaneous configurable options
  */
 #define CONFIG_SYS_LONGHELP			/* undef to save memory */
-#define CONFIG_SYS_CBSIZE		256	/* Console I/O Buffer Size */
 /* Print Buffer Size */
 #define CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE + \
 						sizeof(CONFIG_SYS_PROMPT) + 16)
diff --git a/include/configs/nsim.h b/include/configs/nsim.h
index b51ac6e1978f9f76eb8271cfcba840a467af402e..f6702410eba09f119e97a43f9375bf9a1aacd0a6 100644
--- a/include/configs/nsim.h
+++ b/include/configs/nsim.h
@@ -55,7 +55,6 @@
  * Console configuration
  */
 #define CONFIG_SYS_LONGHELP
-#define CONFIG_SYS_CBSIZE		SZ_256
 #define CONFIG_SYS_BARGSIZE		CONFIG_SYS_CBSIZE
 #define CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE + \
 						sizeof(CONFIG_SYS_PROMPT) + 16)
diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h
index 81e7fa4a3089921d5ee84b95ae38204321180e17..6050ef54af206122bd5899dc565211b81c18a745 100644
--- a/include/configs/p1_p2_rdb_pc.h
+++ b/include/configs/p1_p2_rdb_pc.h
@@ -825,11 +825,6 @@
 #define CONFIG_SYS_LONGHELP			/* undef to save memory */
 #define CONFIG_CMDLINE_EDITING			/* Command-line editing */
 #define CONFIG_SYS_LOAD_ADDR	0x2000000	/* default load address */
-#if defined(CONFIG_CMD_KGDB)
-#define CONFIG_SYS_CBSIZE	1024		/* Console I/O Buffer Size */
-#else
-#define CONFIG_SYS_CBSIZE	256		/* Console I/O Buffer Size */
-#endif
 #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
 	/* Print Buffer Size */
 #define CONFIG_SYS_MAXARGS	16	/* max number of command args */
diff --git a/include/configs/p1_twr.h b/include/configs/p1_twr.h
index 459086e0d454e254644a265ef0c43d7871050342..6cf2257d51e072b7abad0eee19fde82b3ea3fa71 100644
--- a/include/configs/p1_twr.h
+++ b/include/configs/p1_twr.h
@@ -397,11 +397,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
 #define CONFIG_SYS_LONGHELP			/* undef to save memory */
 #define CONFIG_CMDLINE_EDITING			/* Command-line editing */
 #define CONFIG_SYS_LOAD_ADDR	0x2000000	/* default load address */
-#if defined(CONFIG_CMD_KGDB)
-#define CONFIG_SYS_CBSIZE	1024		/* Console I/O Buffer Size */
-#else
-#define CONFIG_SYS_CBSIZE	256		/* Console I/O Buffer Size */
-#endif
 #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
 	/* Print Buffer Size */
 #define CONFIG_SYS_MAXARGS	16	/* max number of command args */
diff --git a/include/configs/pb1x00.h b/include/configs/pb1x00.h
index 369e82f621bdd22dd0382fd9719989bbb45138ef..ba9c99850c6fa95a115f3dad3e1a8bab72ecb826 100644
--- a/include/configs/pb1x00.h
+++ b/include/configs/pb1x00.h
@@ -45,7 +45,6 @@
  * Miscellaneous configurable options
  */
 #define	CONFIG_SYS_LONGHELP				/* undef to save memory      */
-#define	CONFIG_SYS_CBSIZE		256		/* Console I/O Buffer Size   */
 #define	CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16)  /* Print Buffer Size */
 #define	CONFIG_SYS_MAXARGS		16		/* max number of command args*/
 
diff --git a/include/configs/pcm052.h b/include/configs/pcm052.h
index b4b60ac865b46ba82eb272e32f9ac9914b84c1ef..b078d883f04e4b28ba2dcc6d848527031f180356 100644
--- a/include/configs/pcm052.h
+++ b/include/configs/pcm052.h
@@ -203,7 +203,6 @@
 #define CONFIG_SYS_LONGHELP		/* undef to save memory */
 #define CONFIG_AUTO_COMPLETE
 #define CONFIG_CMDLINE_EDITING
-#define CONFIG_SYS_CBSIZE		256	/* Console I/O Buffer Size */
 #define CONFIG_SYS_PBSIZE		\
 			(CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
 #define CONFIG_SYS_MAXARGS		16	/* max number of command args */
diff --git a/include/configs/picosam9g45.h b/include/configs/picosam9g45.h
index 3998edaeb0d0a5ed9be4fe4ea738c03bd933ef77..2c9897794d24a7b531829609af2bb60134cc62ef 100644
--- a/include/configs/picosam9g45.h
+++ b/include/configs/picosam9g45.h
@@ -111,7 +111,6 @@
 				"bootz 0x22000000 - 0x21000000"
 #endif
 
-#define CONFIG_SYS_CBSIZE	256
 #define CONFIG_SYS_MAXARGS	16
 #define CONFIG_SYS_PBSIZE	(CONFIG_SYS_CBSIZE  \
 					+ sizeof(CONFIG_SYS_PROMPT) + 16)
diff --git a/include/configs/pm9261.h b/include/configs/pm9261.h
index 38668deffff0ed194afa2283a1aa47d4a28675b8..221dd74d9519ed96fd0d42eeeea29aeb85bb0c27 100644
--- a/include/configs/pm9261.h
+++ b/include/configs/pm9261.h
@@ -278,7 +278,6 @@
 #error "Undefined memory device"
 #endif
 
-#define CONFIG_SYS_CBSIZE		256
 #define CONFIG_SYS_MAXARGS		16
 #define CONFIG_SYS_PBSIZE		\
 		(CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
diff --git a/include/configs/pm9263.h b/include/configs/pm9263.h
index 667d68f960aa48fa62afbc8b37459c2d182023ab..7708122bc2ab82fbdeb97fe5383e9de202c448ed 100644
--- a/include/configs/pm9263.h
+++ b/include/configs/pm9263.h
@@ -309,7 +309,6 @@
 #error "Undefined memory device"
 #endif
 
-#define CONFIG_SYS_CBSIZE		256
 #define CONFIG_SYS_MAXARGS		16
 #define CONFIG_SYS_PBSIZE		\
 		(CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
diff --git a/include/configs/pm9g45.h b/include/configs/pm9g45.h
index 4f7bb0df113044b833af3f0eb922c3b7cb59f9e7..6247ced2ccae5a24924fb5538b3754ba8f525909 100644
--- a/include/configs/pm9g45.h
+++ b/include/configs/pm9g45.h
@@ -119,7 +119,6 @@
 #define CONFIG_ENV_SIZE			0x20000		/* 1 sector = 128 kB */
 #define CONFIG_BOOTCOMMAND	"nand read 0x72000000 0x200000 0x200000; bootm"
 
-#define CONFIG_SYS_CBSIZE		256
 #define CONFIG_SYS_MAXARGS		16
 #define CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE + \
 					sizeof(CONFIG_SYS_PROMPT) + 16)
diff --git a/include/configs/qemu-mips.h b/include/configs/qemu-mips.h
index 1151da5a78483417560686c0db2fb45629f73122..ee6853a2cee9c98a8c6cc46744e903dc2d2ca8ff 100644
--- a/include/configs/qemu-mips.h
+++ b/include/configs/qemu-mips.h
@@ -70,8 +70,6 @@
 #define CONFIG_AUTO_COMPLETE
 #define CONFIG_CMDLINE_EDITING
 
-/* Console I/O Buffer Size */
-#define CONFIG_SYS_CBSIZE		256
 /* Print Buffer Size */
 #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16)
 /* max number of command args */
diff --git a/include/configs/qemu-mips64.h b/include/configs/qemu-mips64.h
index 97fd24eb1f31e66f1ed4a49b56a82539b2de711c..b44b8233409da96b6aa77033e703c4a90cb48df8 100644
--- a/include/configs/qemu-mips64.h
+++ b/include/configs/qemu-mips64.h
@@ -70,8 +70,6 @@
 #define CONFIG_AUTO_COMPLETE
 #define CONFIG_CMDLINE_EDITING
 
-/* Console I/O Buffer Size */
-#define CONFIG_SYS_CBSIZE		256
 /* Print Buffer Size */
 #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16)
 /* max number of command args */
diff --git a/include/configs/qemu-ppce500.h b/include/configs/qemu-ppce500.h
index e0cc873e0665280883c4e962b74317ff5c70c383..6f061b520f017adf9ec9ac847ffa167593410243 100644
--- a/include/configs/qemu-ppce500.h
+++ b/include/configs/qemu-ppce500.h
@@ -131,7 +131,6 @@ extern unsigned long long get_phys_ccsrbar_addr_early(void);
 #define CONFIG_CMDLINE_EDITING			/* Command-line editing */
 #define CONFIG_AUTO_COMPLETE			/* add autocompletion support */
 #define CONFIG_SYS_LOAD_ADDR	0x2000000	/* default load address */
-#define CONFIG_SYS_CBSIZE	256		/* Console I/O Buffer Size */
 #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16)
 #define CONFIG_SYS_MAXARGS	16		/* max number of command args */
 #define CONFIG_SYS_BARGSIZE	CONFIG_SYS_CBSIZE/* Boot Argument Buffer Size */
diff --git a/include/configs/r0p7734.h b/include/configs/r0p7734.h
index e39fee0db23d8c565368ce85d71a33293b6b5360..9e6b10a6d8325abf69b6486d99eb56438a817e15 100644
--- a/include/configs/r0p7734.h
+++ b/include/configs/r0p7734.h
@@ -37,8 +37,6 @@
 /* undef to save memory	*/
 #define CONFIG_SYS_LONGHELP
 /* Monitor Command Prompt */
-/* Buffer size for input from the Console */
-#define CONFIG_SYS_CBSIZE		256
 /* Buffer size for Console output */
 #define CONFIG_SYS_PBSIZE		256
 /* max args accepted for monitor commands */
diff --git a/include/configs/r2dplus.h b/include/configs/r2dplus.h
index 19eb73318de2afcf115a56ce366deaeed7fedd6b..8bddb4ee7a52349105139af4cd7c1553b7b232c4 100644
--- a/include/configs/r2dplus.h
+++ b/include/configs/r2dplus.h
@@ -19,7 +19,6 @@
 
 #define CONFIG_SYS_TEXT_BASE		0x8FE00000
 #define CONFIG_SYS_LONGHELP
-#define CONFIG_SYS_CBSIZE		256
 #define CONFIG_SYS_PBSIZE		256
 #define CONFIG_SYS_MAXARGS		16
 #define CONFIG_SYS_BARGSIZE		512
diff --git a/include/configs/r7780mp.h b/include/configs/r7780mp.h
index 4f40df9b5962d05838e444121f9a73f3b6194b2d..951cfca089868130b99860ffd438e41aee4c54d2 100644
--- a/include/configs/r7780mp.h
+++ b/include/configs/r7780mp.h
@@ -26,7 +26,6 @@
 #define CONFIG_SYS_SDRAM_SIZE		(128 * 1024 * 1024)
 
 #define CONFIG_SYS_LONGHELP
-#define CONFIG_SYS_CBSIZE		256
 #define CONFIG_SYS_PBSIZE		256
 #define CONFIG_SYS_MAXARGS		16
 #define CONFIG_SYS_BARGSIZE	512
diff --git a/include/configs/rcar-gen2-common.h b/include/configs/rcar-gen2-common.h
index 89ddd00705f591b6cf9787d1b2e60cebbf8a8ede..68e3a23500fd83e6c4874ebd337c05c109ed0fcd 100644
--- a/include/configs/rcar-gen2-common.h
+++ b/include/configs/rcar-gen2-common.h
@@ -31,7 +31,6 @@
 /* console */
 
 #define CONFIG_SYS_LONGHELP
-#define CONFIG_SYS_CBSIZE		256
 #define CONFIG_SYS_PBSIZE		256
 #define CONFIG_SYS_MAXARGS		16
 #define CONFIG_SYS_BARGSIZE		512
diff --git a/include/configs/rsk7203.h b/include/configs/rsk7203.h
index a478cc88b26174af307802deb40eefd04fa8a5c4..c90d3f25cd27ed27a632903eadfcba157f61bcd1 100644
--- a/include/configs/rsk7203.h
+++ b/include/configs/rsk7203.h
@@ -25,7 +25,6 @@
 
 #define CONFIG_SYS_TEXT_BASE	0x0C7C0000
 #define CONFIG_SYS_LONGHELP		/* undef to save memory	*/
-#define CONFIG_SYS_CBSIZE	256	/* Buffer size for input from the Console */
 #define CONFIG_SYS_PBSIZE	256	/* Buffer size for Console output */
 #define CONFIG_SYS_MAXARGS	16	/* max args accepted for monitor commands */
 /* Buffer size for Boot Arguments passed to kernel */
diff --git a/include/configs/rsk7264.h b/include/configs/rsk7264.h
index 5feaedc70b3824d449ce21fdb308c4588367db83..b958e21fcc52baef0c28786464cf1e3441d48e08 100644
--- a/include/configs/rsk7264.h
+++ b/include/configs/rsk7264.h
@@ -19,7 +19,6 @@
 #define CONFIG_SYS_BAUDRATE_TABLE	{ CONFIG_BAUDRATE }
 
 #define CONFIG_SYS_LONGHELP	1	/* undef to save memory	*/
-#define CONFIG_SYS_CBSIZE	256	/* Buffer size for input from the Console */
 #define CONFIG_SYS_PBSIZE	256	/* Buffer size for Console output */
 #define CONFIG_SYS_MAXARGS	16	/* max args accepted for monitor commands */
 
diff --git a/include/configs/rsk7269.h b/include/configs/rsk7269.h
index 76e33c51872a1d5ee9ae79ff47b1be3de21f2bdf..8fc6083d3d98518ff1893b3441615af81e3890ad 100644
--- a/include/configs/rsk7269.h
+++ b/include/configs/rsk7269.h
@@ -18,7 +18,6 @@
 #define CONFIG_SYS_BAUDRATE_TABLE	{ CONFIG_BAUDRATE }
 
 #define CONFIG_SYS_LONGHELP		/* undef to save memory	*/
-#define CONFIG_SYS_CBSIZE	256	/* Boot Argument Buffer Size */
 #define CONFIG_SYS_PBSIZE	256	/* Print Buffer Size */
 #define CONFIG_SYS_MAXARGS	16	/* max number of command args */
 
diff --git a/include/configs/s32v234evb.h b/include/configs/s32v234evb.h
index 4cfcd5aa7da9d54e8d3b2174240b0a85154a6c0d..e1f2cb30d3f27d208d3ecc6c363123e6fcded459 100644
--- a/include/configs/s32v234evb.h
+++ b/include/configs/s32v234evb.h
@@ -164,7 +164,6 @@
 #define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 #define CONFIG_SYS_PROMPT		"=> "
 #undef CONFIG_AUTO_COMPLETE
-#define CONFIG_SYS_CBSIZE		256	/* Console I/O Buffer Size */
 #define CONFIG_SYS_PBSIZE		\
 			(CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
 #define CONFIG_SYS_MAXARGS		16	/* max number of command args */
diff --git a/include/configs/s5p_goni.h b/include/configs/s5p_goni.h
index 11d244339a93f9e9eaf707fadbc23a7822d6cea6..448e923a72c7f94030046ec289049f323ae5a088 100644
--- a/include/configs/s5p_goni.h
+++ b/include/configs/s5p_goni.h
@@ -168,7 +168,6 @@
 	"dfu_alt_info=" CONFIG_DFU_ALT "\0"
 
 #define CONFIG_SYS_LONGHELP		/* undef to save memory */
-#define CONFIG_SYS_CBSIZE	256	/* Console I/O Buffer Size */
 #define CONFIG_SYS_PBSIZE	384	/* Print Buffer Size */
 #define CONFIG_SYS_MAXARGS	16	/* max number of command args */
 /* Boot Argument Buffer Size */
diff --git a/include/configs/sbc8349.h b/include/configs/sbc8349.h
index 6de9d204b6f33d3334fd5febe9b89b283d674242..15393246af48cc172c7682c6cd002c53ebc720b4 100644
--- a/include/configs/sbc8349.h
+++ b/include/configs/sbc8349.h
@@ -406,12 +406,6 @@
 #define CONFIG_SYS_LONGHELP			/* undef to save memory */
 #define CONFIG_SYS_LOAD_ADDR	0x2000000	/* default load address */
 
-#if defined(CONFIG_CMD_KGDB)
-	#define CONFIG_SYS_CBSIZE	1024	/* Console I/O Buffer Size */
-#else
-	#define CONFIG_SYS_CBSIZE	256	/* Console I/O Buffer Size */
-#endif
-
 				/* Print Buffer Size */
 #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16)
 #define CONFIG_SYS_MAXARGS	16	/* max number of command args */
diff --git a/include/configs/sbc8548.h b/include/configs/sbc8548.h
index cbd2f753844de3d2b757ce17d30e40ae81e3aabc..51d6d66d12a5c90f85317bd61b0eade63e04ad6f 100644
--- a/include/configs/sbc8548.h
+++ b/include/configs/sbc8548.h
@@ -515,11 +515,6 @@
 #define CONFIG_AUTO_COMPLETE			/* add autocompletion support */
 #define CONFIG_SYS_LONGHELP			/* undef to save memory	*/
 #define CONFIG_SYS_LOAD_ADDR	0x2000000	/* default load address */
-#if defined(CONFIG_CMD_KGDB)
-#define CONFIG_SYS_CBSIZE	1024		/* Console I/O Buffer Size */
-#else
-#define CONFIG_SYS_CBSIZE	256		/* Console I/O Buffer Size */
-#endif
 #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16) /* Print Buffer Size */
 #define CONFIG_SYS_MAXARGS	16		/* max number of command args */
 #define CONFIG_SYS_BARGSIZE	CONFIG_SYS_CBSIZE	/* Boot Argument Buffer Size */
diff --git a/include/configs/sbc8641d.h b/include/configs/sbc8641d.h
index 8f12de7a8550fc3e0700f1b90a211bdb88e61d55..ddf1382be7c4b3d44f51c12a9a47c167d8a273f5 100644
--- a/include/configs/sbc8641d.h
+++ b/include/configs/sbc8641d.h
@@ -459,12 +459,6 @@
 #define CONFIG_SYS_LOAD_ADDR	0x2000000	/* default load address */
 #define CONFIG_CMDLINE_EDITING	1		/* add command line history */
 
-#if defined(CONFIG_CMD_KGDB)
-    #define CONFIG_SYS_CBSIZE	1024		/* Console I/O Buffer Size */
-#else
-    #define CONFIG_SYS_CBSIZE	256		/* Console I/O Buffer Size */
-#endif
-
 #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16) /* Print Buffer Size */
 #define CONFIG_SYS_MAXARGS	16		/* max number of command args */
 #define CONFIG_SYS_BARGSIZE	CONFIG_SYS_CBSIZE	/* Boot Argument Buffer Size */
diff --git a/include/configs/sh7752evb.h b/include/configs/sh7752evb.h
index 8db1ac4fa97d9f7ba16826858404c9a1470dc6f4..e70b9cdc369337142c6375ba4186eb0f508978b0 100644
--- a/include/configs/sh7752evb.h
+++ b/include/configs/sh7752evb.h
@@ -24,7 +24,6 @@
 #define SH7752EVB_SDRAM_SIZE		(512 * 1024 * 1024)
 
 #define CONFIG_SYS_LONGHELP
-#define CONFIG_SYS_CBSIZE		256
 #define CONFIG_SYS_PBSIZE		256
 #define CONFIG_SYS_MAXARGS		16
 #define CONFIG_SYS_BARGSIZE		512
diff --git a/include/configs/sh7753evb.h b/include/configs/sh7753evb.h
index 4eb8ffba63df045706fb57f8a4c0ac10c5c6b6e3..2a29cb9de3aef7bf35129f275d362cd71e91650b 100644
--- a/include/configs/sh7753evb.h
+++ b/include/configs/sh7753evb.h
@@ -24,7 +24,6 @@
 #define SH7753EVB_SDRAM_SIZE		(512 * 1024 * 1024)
 
 #define CONFIG_SYS_LONGHELP
-#define CONFIG_SYS_CBSIZE		256
 #define CONFIG_SYS_PBSIZE		256
 #define CONFIG_SYS_MAXARGS		16
 #define CONFIG_SYS_BARGSIZE		512
diff --git a/include/configs/sh7757lcr.h b/include/configs/sh7757lcr.h
index fe65fbdc6460d9a9403a9e6bbce2ebe03e56d9cf..566f7ae40953cea7de272445e0729141ea449892 100644
--- a/include/configs/sh7757lcr.h
+++ b/include/configs/sh7757lcr.h
@@ -25,7 +25,6 @@
 #define SH7757LCR_SDRAM_DVC_SIZE	(16 * 1024 * 1024)
 
 #define CONFIG_SYS_LONGHELP
-#define CONFIG_SYS_CBSIZE		256
 #define CONFIG_SYS_PBSIZE		256
 #define CONFIG_SYS_MAXARGS		16
 #define CONFIG_SYS_BARGSIZE		512
diff --git a/include/configs/sh7763rdp.h b/include/configs/sh7763rdp.h
index acb9f3ca4164470477236a9cd823a538e248fe45..7501e0345c74ee303bc66d13f9571d5bfd72e6ec 100644
--- a/include/configs/sh7763rdp.h
+++ b/include/configs/sh7763rdp.h
@@ -24,7 +24,6 @@
 
 #define CONFIG_SYS_TEXT_BASE	0x8FFC0000
 #define CONFIG_SYS_LONGHELP		/* undef to save memory */
-#define CONFIG_SYS_CBSIZE		256	/* Buffer size for input from the Console */
 #define CONFIG_SYS_PBSIZE		256	/* Buffer size for Console output */
 #define CONFIG_SYS_MAXARGS		16	/* max args accepted for monitor commands */
 #define CONFIG_SYS_BARGSIZE	512	/* Buffer size for Boot Arguments
diff --git a/include/configs/sh7785lcr.h b/include/configs/sh7785lcr.h
index 7c8707c8704a800a3f5d9e5801ee011620a3011f..0e573558e92c47ca38b555b5eac959cb76b367b4 100644
--- a/include/configs/sh7785lcr.h
+++ b/include/configs/sh7785lcr.h
@@ -40,7 +40,6 @@
 #endif
 
 #define CONFIG_SYS_LONGHELP
-#define CONFIG_SYS_CBSIZE		256
 #define CONFIG_SYS_PBSIZE		256
 #define CONFIG_SYS_MAXARGS		16
 #define CONFIG_SYS_BARGSIZE		512
diff --git a/include/configs/shmin.h b/include/configs/shmin.h
index 3755eba167d63e5040980c434e0985cdab5c2ee6..0673e126dc63d3b1562a5c53a8c081dd8ebb36b3 100644
--- a/include/configs/shmin.h
+++ b/include/configs/shmin.h
@@ -28,7 +28,6 @@
 
 #define CONFIG_SYS_TEXT_BASE	0x8DFB0000
 #define CONFIG_SYS_LONGHELP		/* undef to save memory	*/
-#define CONFIG_SYS_CBSIZE	256	/* Buffer size for input from the Console */
 #define CONFIG_SYS_PBSIZE	256	/* Buffer size for Console output */
 #define CONFIG_SYS_MAXARGS	16	/* max args accepted for monitor commands */
 /* Buffer size for Boot Arguments passed to kernel */
diff --git a/include/configs/smdkc100.h b/include/configs/smdkc100.h
index 0a9c638b5ff41e6c2d497b3b47b56e7b235c6688..5bf557c76467c418a527060e58818caa6584e1ff 100644
--- a/include/configs/smdkc100.h
+++ b/include/configs/smdkc100.h
@@ -128,7 +128,6 @@
  * Miscellaneous configurable options
  */
 #define CONFIG_SYS_LONGHELP		/* undef to save memory */
-#define CONFIG_SYS_CBSIZE	256	/* Console I/O Buffer Size */
 #define CONFIG_SYS_PBSIZE	384	/* Print Buffer Size */
 #define CONFIG_SYS_MAXARGS	16	/* max number of command args */
 /* Boot Argument Buffer Size */
diff --git a/include/configs/snapper9260.h b/include/configs/snapper9260.h
index 153f68ed57d8742b5629fd4e46d482148a1f186c..88b95816b3b76a88fc5b1072c96cb7609e5cabc3 100644
--- a/include/configs/snapper9260.h
+++ b/include/configs/snapper9260.h
@@ -124,7 +124,6 @@
 #define CONFIG_ENV_OVERWRITE
 
 /* Console settings */
-#define CONFIG_SYS_CBSIZE		256
 #define CONFIG_SYS_MAXARGS		16
 #define CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE +		\
 					 sizeof(CONFIG_SYS_PROMPT) + 16)
diff --git a/include/configs/snapper9g45.h b/include/configs/snapper9g45.h
index dbfd0e882e220a3010bc433aa55aa2a3689dd040..e5694bd0cb8618fa71e49062549f268a43ca159b 100644
--- a/include/configs/snapper9g45.h
+++ b/include/configs/snapper9g45.h
@@ -110,7 +110,6 @@
 	"altbootcmd=run boot_mmc ; run boot_usb ; run boot_safe ; run boot_working\0"
 
 /* Console settings */
-#define CONFIG_SYS_CBSIZE		256
 #define CONFIG_SYS_MAXARGS		16
 #define CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE +		\
 					 sizeof(CONFIG_SYS_PROMPT) + 16)
diff --git a/include/configs/socrates.h b/include/configs/socrates.h
index 94287c1c314d39e68e6cba9a07c21fa1ea83001f..3c3f0424286edac9443bdf46039c5284d8cb78ee 100644
--- a/include/configs/socrates.h
+++ b/include/configs/socrates.h
@@ -281,12 +281,6 @@
 #define CONFIG_SYS_LONGHELP			/* undef to save memory		*/
 #define CONFIG_SYS_LOAD_ADDR	0x2000000	/* default load address		*/
 
-#if defined(CONFIG_CMD_KGDB)
-    #define CONFIG_SYS_CBSIZE	1024		/* Console I/O Buffer Size	*/
-#else
-    #define CONFIG_SYS_CBSIZE	256		/* Console I/O Buffer Size	*/
-#endif
-
 #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16) /* Print Buf Size	*/
 #define CONFIG_SYS_MAXARGS	16		/* max number of command args	*/
 #define CONFIG_SYS_BARGSIZE	CONFIG_SYS_CBSIZE	/* Boot Argument Buffer Size	*/
diff --git a/include/configs/spear-common.h b/include/configs/spear-common.h
index 0603db588110d9468f20cefb51f33c344d27e42e..09251f6b257628c215902d7eba1b0c7dd1cdb629 100644
--- a/include/configs/spear-common.h
+++ b/include/configs/spear-common.h
@@ -168,7 +168,6 @@
 #define CONFIG_SYS_MALLOC_LEN			(1024*1024)
 #define CONFIG_SYS_LONGHELP
 #define CONFIG_CMDLINE_EDITING
-#define CONFIG_SYS_CBSIZE			256
 #define CONFIG_SYS_PBSIZE			(CONFIG_SYS_CBSIZE + \
 						sizeof(CONFIG_SYS_PROMPT) + 16)
 #define CONFIG_SYS_MAXARGS			16
diff --git a/include/configs/stih410-b2260.h b/include/configs/stih410-b2260.h
index c71413cc53c8bd3f6ac5fe51649fd0fa55b0b868..51ac95201e7da374363bc4edaefab13f5adc2eae 100644
--- a/include/configs/stih410-b2260.h
+++ b/include/configs/stih410-b2260.h
@@ -8,8 +8,6 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
-#include <config.h>
-
 /* ram memory-related information */
 #define CONFIG_NR_DRAM_BANKS		1
 #define PHYS_SDRAM_1			0x40000000
diff --git a/include/configs/t4qds.h b/include/configs/t4qds.h
index bd98cc650efcb1a1d85b618f4edb96c825b80ba1..6ef5605b3797e3fd4de46b460a3a62ccbcc5902d 100644
--- a/include/configs/t4qds.h
+++ b/include/configs/t4qds.h
@@ -245,11 +245,6 @@
 #define CONFIG_CMDLINE_EDITING			/* Command-line editing */
 #define CONFIG_AUTO_COMPLETE			/* add autocompletion support */
 #define CONFIG_SYS_LOAD_ADDR	0x2000000	/* default load address */
-#ifdef CONFIG_CMD_KGDB
-#define CONFIG_SYS_CBSIZE	1024		/* Console I/O Buffer Size */
-#else
-#define CONFIG_SYS_CBSIZE	256		/* Console I/O Buffer Size */
-#endif
 #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16)
 #define CONFIG_SYS_MAXARGS	16		/* max number of command args */
 #define CONFIG_SYS_BARGSIZE	CONFIG_SYS_CBSIZE/* Boot Argument Buffer Size */
diff --git a/include/configs/tao3530.h b/include/configs/tao3530.h
index 9f6e243ef517d30e3ee1e54b8345ad749789b448..b3a519b3416709bb040cbdc9eccfbefa293a7b4e 100644
--- a/include/configs/tao3530.h
+++ b/include/configs/tao3530.h
@@ -148,7 +148,6 @@
  * Miscellaneous configurable options
  */
 #define CONFIG_SYS_LONGHELP		/* undef to save memory */
-#define CONFIG_SYS_CBSIZE		256	/* Console I/O Buffer Size */
 
 /* turn on command-line edit/hist/auto */
 #define CONFIG_CMDLINE_EDITING
diff --git a/include/configs/taurus.h b/include/configs/taurus.h
index 55f47f8454c820d4ef498db47e7804714776d986..f479cad29873ad0dc4c285e774ead25fbde0e7af 100644
--- a/include/configs/taurus.h
+++ b/include/configs/taurus.h
@@ -143,7 +143,6 @@
 #define CONFIG_ENV_SIZE		(SZ_128K)	/* 1 sector = 128 kB */
 #define CONFIG_BOOTCOMMAND	"nand read 0x22000000 0x200000 0x300000; bootm"
 
-#define CONFIG_SYS_CBSIZE		256
 #define CONFIG_SYS_MAXARGS		16
 #define CONFIG_SYS_PBSIZE \
 	(CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
diff --git a/include/configs/tb100.h b/include/configs/tb100.h
index 09d571897110976d6e84d1f0ad22ed432bc29588..699c18ae3b33e618029846855518e22a461b8c80 100644
--- a/include/configs/tb100.h
+++ b/include/configs/tb100.h
@@ -73,7 +73,6 @@
  * Console configuration
  */
 #define CONFIG_SYS_LONGHELP
-#define CONFIG_SYS_CBSIZE		256
 #define CONFIG_SYS_BARGSIZE		CONFIG_SYS_CBSIZE
 #define CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE + \
 						sizeof(CONFIG_SYS_PROMPT) + 16)
diff --git a/include/configs/ts4800.h b/include/configs/ts4800.h
index 0219376f10cd25c3cb0c390c93b64817cc609ead..14cf26b386c8c209259b974b6bc2d845d567bef7 100644
--- a/include/configs/ts4800.h
+++ b/include/configs/ts4800.h
@@ -122,7 +122,6 @@
  */
 #define CONFIG_SYS_LONGHELP		/* undef to save memory */
 #define CONFIG_AUTO_COMPLETE
-#define CONFIG_SYS_CBSIZE		256	/* Console I/O Buffer Size */
 /* Print Buffer Size */
 #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
 #define CONFIG_SYS_MAXARGS	16	/* max number of command args */
diff --git a/include/configs/usb_a9263.h b/include/configs/usb_a9263.h
index 753d821a45beabb70db9ae39f62ec9e738fcf906..787f0ac3621dbeb6cd0aebe742d2cfb4e816c792 100644
--- a/include/configs/usb_a9263.h
+++ b/include/configs/usb_a9263.h
@@ -98,7 +98,6 @@
 #define CONFIG_EXTRA_ENV_SETTINGS \
 	"mtdparts=" MTDPARTS_DEFAULT "\0" \
 
-#define CONFIG_SYS_CBSIZE		256
 #define CONFIG_SYS_MAXARGS		16
 #define CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE + \
 					 sizeof(CONFIG_SYS_PROMPT) + 16)
diff --git a/include/configs/vf610twr.h b/include/configs/vf610twr.h
index 6aaa4d1a28e303b449cb98a4f842d6821273e818..df445d2d36a73a44f31571ba54a4a15f577af6e0 100644
--- a/include/configs/vf610twr.h
+++ b/include/configs/vf610twr.h
@@ -189,7 +189,6 @@
 /* Miscellaneous configurable options */
 #define CONFIG_SYS_LONGHELP		/* undef to save memory */
 #undef CONFIG_AUTO_COMPLETE
-#define CONFIG_SYS_CBSIZE		256	/* Console I/O Buffer Size */
 #define CONFIG_SYS_PBSIZE		\
 			(CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
 #define CONFIG_SYS_MAXARGS		16	/* max number of command args */
diff --git a/include/configs/vme8349.h b/include/configs/vme8349.h
index 23dc884b12312d558a27d5a82b790cb2f2da9e2e..693f7704a65edbafac9766df8c652b6ee39d384f 100644
--- a/include/configs/vme8349.h
+++ b/include/configs/vme8349.h
@@ -355,12 +355,6 @@
 #define CONFIG_SYS_LONGHELP			/* undef to save memory */
 #define CONFIG_SYS_LOAD_ADDR	0x2000000	/* default load address */
 
-#if defined(CONFIG_CMD_KGDB)
-	#define CONFIG_SYS_CBSIZE	1024	/* Console I/O Buffer Size */
-#else
-	#define CONFIG_SYS_CBSIZE	256	/* Console I/O Buffer Size */
-#endif
-
 #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
 #define CONFIG_SYS_MAXARGS	16		/* max num of command args */
 #define CONFIG_SYS_BARGSIZE	CONFIG_SYS_CBSIZE /* Boot Argument Buf Size */
diff --git a/include/configs/woodburn_common.h b/include/configs/woodburn_common.h
index f3eba9c66dbdf053f2ae28629a80e3ebef099402..f680df1f815a6a9201ba191edc379cebbdfc01c5 100644
--- a/include/configs/woodburn_common.h
+++ b/include/configs/woodburn_common.h
@@ -102,7 +102,6 @@
 #define CONFIG_CMDLINE_EDITING
 
 #define CONFIG_AUTO_COMPLETE
-#define CONFIG_SYS_CBSIZE	256	/* Console I/O Buffer Size */
 /* Print Buffer Size */
 #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
 #define CONFIG_SYS_MAXARGS	16	/* max number of command args */
diff --git a/include/configs/x600.h b/include/configs/x600.h
index 93c36374ad48d068e3c7e8d0ba415e4105508169..7b750a0d6fffaf2d1fdca53bff1b36498e375aa2 100644
--- a/include/configs/x600.h
+++ b/include/configs/x600.h
@@ -125,7 +125,6 @@
 #define CONFIG_SYS_LONGHELP
 #define CONFIG_CMDLINE_EDITING
 #define CONFIG_AUTO_COMPLETE
-#define CONFIG_SYS_CBSIZE			256
 #define CONFIG_SYS_PBSIZE			(CONFIG_SYS_CBSIZE + \
 						 sizeof(CONFIG_SYS_PROMPT) + 16)
 #define CONFIG_SYS_MAXARGS			16
diff --git a/include/configs/xpedite517x.h b/include/configs/xpedite517x.h
index c4cd74999c4c2ef545ef45b44c0b2058e57395f0..09c09d115735362a6c54b52a265e9c776ae1b409 100644
--- a/include/configs/xpedite517x.h
+++ b/include/configs/xpedite517x.h
@@ -485,7 +485,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
  */
 #define CONFIG_SYS_LONGHELP			/* undef to save memory	*/
 #define CONFIG_SYS_LOAD_ADDR	0x2000000	/* default load address */
-#define CONFIG_SYS_CBSIZE	256		/* Console I/O Buffer Size */
 #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16) /* Print Buffer Size */
 #define CONFIG_SYS_MAXARGS	16		/* max number of command args */
 #define CONFIG_SYS_BARGSIZE	CONFIG_SYS_CBSIZE	/* Boot Argument Buffer Size */
diff --git a/include/configs/xpedite520x.h b/include/configs/xpedite520x.h
index 8fb05416045a3b96e0363b37c170b42a5aa1fc4b..76c24a4d7e755dcf85d5b8a152824cd4e894a075 100644
--- a/include/configs/xpedite520x.h
+++ b/include/configs/xpedite520x.h
@@ -288,7 +288,6 @@
  */
 #define CONFIG_SYS_LONGHELP			/* undef to save memory	*/
 #define CONFIG_SYS_LOAD_ADDR	0x2000000	/* default load address */
-#define CONFIG_SYS_CBSIZE	256		/* Console I/O Buffer Size */
 #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16) /* Print Buffer Size */
 #define CONFIG_SYS_MAXARGS	16		/* max number of command args */
 #define CONFIG_SYS_BARGSIZE	CONFIG_SYS_CBSIZE	/* Boot Argument Buffer Size */
diff --git a/include/configs/xpedite537x.h b/include/configs/xpedite537x.h
index 85faaf0ca3ec3dbe706cce08222286cd76ef9249..2657e81686fe21cf848a6cf94837de8e9ea7f09f 100644
--- a/include/configs/xpedite537x.h
+++ b/include/configs/xpedite537x.h
@@ -338,7 +338,6 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy);
  */
 #define CONFIG_SYS_LONGHELP			/* undef to save memory	*/
 #define CONFIG_SYS_LOAD_ADDR	0x2000000	/* default load address */
-#define CONFIG_SYS_CBSIZE	256		/* Console I/O Buffer Size */
 #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16) /* Print Buffer Size */
 #define CONFIG_SYS_MAXARGS	16		/* max number of command args */
 #define CONFIG_SYS_BARGSIZE	CONFIG_SYS_CBSIZE	/* Boot Argument Buffer Size */
diff --git a/include/configs/xpedite550x.h b/include/configs/xpedite550x.h
index 033537ca4ae85f3d78713a46194a3f7d7e39d5ea..b4546d0215be3626872279aee1ea48d651ad9413 100644
--- a/include/configs/xpedite550x.h
+++ b/include/configs/xpedite550x.h
@@ -337,7 +337,6 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy);
  */
 #define CONFIG_SYS_LONGHELP			/* undef to save memory	*/
 #define CONFIG_SYS_LOAD_ADDR	0x2000000	/* default load address */
-#define CONFIG_SYS_CBSIZE	256		/* Console I/O Buffer Size */
 #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16) /* Print Buffer Size */
 #define CONFIG_SYS_MAXARGS	16		/* max number of command args */
 #define CONFIG_SYS_BARGSIZE	CONFIG_SYS_CBSIZE	/* Boot Argument Buffer Size */
diff --git a/include/configs/zipitz2.h b/include/configs/zipitz2.h
index 5279f54a921e2f535c9e0a99967b6c623a82acf5..87f3a4c336a934edaa8b0a119a3da7e5dc7f3696 100644
--- a/include/configs/zipitz2.h
+++ b/include/configs/zipitz2.h
@@ -80,7 +80,6 @@ unsigned char zipitz2_spi_read(void);
 #endif
 
 #define	CONFIG_SYS_LONGHELP				/* undef to save memory	*/
-#define	CONFIG_SYS_CBSIZE		256		/* Console I/O Buffer Size */
 #define	CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16)	/* Print Buffer Size */
 #define	CONFIG_SYS_MAXARGS		16		/* max number of command args */
 #define	CONFIG_SYS_BARGSIZE		CONFIG_SYS_CBSIZE	/* Boot Argument Buffer Size */
diff --git a/include/configs/zmx25.h b/include/configs/zmx25.h
index 21a78c4bfac0b7ea9f568f7bb2ffaab9a9ff60f6..463f0deb513768630069426ca7a6eb9909ffd714 100644
--- a/include/configs/zmx25.h
+++ b/include/configs/zmx25.h
@@ -117,7 +117,6 @@
 #define CONFIG_SYS_MEMTEST_START	(PHYS_SDRAM + (512*1024))
 #define CONFIG_SYS_MEMTEST_END		(PHYS_SDRAM + PHYS_SDRAM_SIZE)
 
-#define CONFIG_SYS_CBSIZE	256
 #define CONFIG_SYS_MAXARGS	16
 #define CONFIG_SYS_PBSIZE	(CONFIG_SYS_CBSIZE + \
 				sizeof(CONFIG_SYS_PROMPT) + 16)
diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h
index 6359587738dd774a58a725f17b63aa634841d26a..cea07e2c54ffd766f8e7d2af983c424c5a7d4adb 100644
--- a/include/configs/zynq-common.h
+++ b/include/configs/zynq-common.h
@@ -276,7 +276,6 @@
 #define CONFIG_SYS_LONGHELP
 #define CONFIG_CLOCKS
 #define CONFIG_SYS_MAXARGS		32 /* max number of command args */
-#define CONFIG_SYS_CBSIZE		256 /* Console I/O Buffer Size */
 #define CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE + \
 					sizeof(CONFIG_SYS_PROMPT) + 16)