diff --git a/include/configs/10m50_devboard.h b/include/configs/10m50_devboard.h
index d15cc44e78dcff27e5d8a1dcb6c1a8bf8bc787d3..940a1b5c2183e92a1c3aa3bd57de356e485a3b49 100644
--- a/include/configs/10m50_devboard.h
+++ b/include/configs/10m50_devboard.h
@@ -80,9 +80,6 @@
#define CONFIG_SYS_LONGHELP /* Provide extended help */
#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 + \
- sizeof(CONFIG_SYS_PROMPT) + \
- 16) /* Print buf size */
#define CONFIG_SYS_LOAD_ADDR 0xcc000000 /* Half of RAM */
#define CONFIG_LOADADDR CONFIG_SYS_LOAD_ADDR
#define CONFIG_SYS_MEMTEST_START CONFIG_SYS_SDRAM_BASE
diff --git a/include/configs/3c120_devboard.h b/include/configs/3c120_devboard.h
index 463e978ccd2a7e7a233188e0375c79457a0c07e7..b6e44b0e40059f7c9323504a0490935eac2e191e 100644
--- a/include/configs/3c120_devboard.h
+++ b/include/configs/3c120_devboard.h
@@ -83,9 +83,6 @@
#define CONFIG_SYS_LONGHELP /* Provide extended help */
#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 + \
- sizeof(CONFIG_SYS_PROMPT) + \
- 16) /* Print buf size */
#define CONFIG_SYS_LOAD_ADDR 0xd4000000 /* Half of RAM */
#define CONFIG_LOADADDR CONFIG_SYS_LOAD_ADDR
#define CONFIG_SYS_MEMTEST_START CONFIG_SYS_SDRAM_BASE
diff --git a/include/configs/B4860QDS.h b/include/configs/B4860QDS.h
index 4273c2d3d3e514adda0e46070e9ea0d922ff602e..d6b470d88a0a0efaee813bea834e915b36bb520a 100644
--- a/include/configs/B4860QDS.h
+++ b/include/configs/B4860QDS.h
@@ -708,7 +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 */
-#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/BSC9131RDB.h b/include/configs/BSC9131RDB.h
index 19c772c9685bc84ac618dba70d522b519689f0eb..2c93779001a1dbdf363efa6f0980733c45a2820e 100644
--- a/include/configs/BSC9131RDB.h
+++ b/include/configs/BSC9131RDB.h
@@ -297,8 +297,6 @@ extern unsigned long get_sdram_size(void);
#else
#define CONFIG_SYS_CBSIZE 1024 /* 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/BSC9132QDS.h b/include/configs/BSC9132QDS.h
index c02aad1ad8976e0994e1925366e3e0ed3485d18d..7d25bc81d2908c4e10ab403000d331f100da8bbd 100644
--- a/include/configs/BSC9132QDS.h
+++ b/include/configs/BSC9132QDS.h
@@ -515,8 +515,6 @@ combinations. this should be removed later
#define CONFIG_AUTO_COMPLETE /* add autocompletion support */
#define CONFIG_SYS_LOAD_ADDR 0x2000000 /* default load address */
-#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/C29XPCIE.h b/include/configs/C29XPCIE.h
index 697b355858401268b2081529e3323c00a7e5eb95..11608ba94f6b35d2c9059d959798b4b2b98e8c2f 100644
--- a/include/configs/C29XPCIE.h
+++ b/include/configs/C29XPCIE.h
@@ -433,8 +433,6 @@
#define CONFIG_AUTO_COMPLETE /* add autocompletion support */
#define CONFIG_SYS_LOAD_ADDR 0x2000000 /* default load address */
-#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/M5208EVBE.h b/include/configs/M5208EVBE.h
index addcaabe55376ddf453b6a326b3398032c668e1f..90456196823e2bb3d758cc6b583078f83a3ed012 100644
--- a/include/configs/M5208EVBE.h
+++ b/include/configs/M5208EVBE.h
@@ -80,7 +80,6 @@
#define CONFIG_PRAM 512 /* 512 KB */
#define CONFIG_SYS_LONGHELP /* undef to save memory */
-#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 */
#define CONFIG_SYS_LOAD_ADDR 0x40010000
diff --git a/include/configs/M52277EVB.h b/include/configs/M52277EVB.h
index 9e74fad137f940a721585db83e4c18675324a247..933e4fb798f2429f978a2183e7fc4247fc3e8848 100644
--- a/include/configs/M52277EVB.h
+++ b/include/configs/M52277EVB.h
@@ -131,7 +131,6 @@
#define CONFIG_SYS_LONGHELP /* undef to save memory */
-#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 4403ba1e1b3e282b4e1e53a265d7ff7346ec8772..e29a2d4a0b3226a7002bcfd1aa5461a83003cb7c 100644
--- a/include/configs/M5235EVB.h
+++ b/include/configs/M5235EVB.h
@@ -95,7 +95,6 @@
#define CONFIG_PRAM 512 /* 512 KB */
#define CONFIG_SYS_LONGHELP /* undef to save memory */
-#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 */
#define CONFIG_SYS_LOAD_ADDR (CONFIG_SYS_SDRAM_BASE+0x20000)
diff --git a/include/configs/M5249EVB.h b/include/configs/M5249EVB.h
index 594052f0b7ddf275d44a4769d472957760d7799d..053321cf7a398ac5724a6c5bfbac6f586e463b2a 100644
--- a/include/configs/M5249EVB.h
+++ b/include/configs/M5249EVB.h
@@ -41,7 +41,6 @@
#define CONFIG_SYS_LONGHELP /* undef to save memory */
-#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 4667de42f485723cfa5148f542a2e9157ce168c3..46a6e00896afc03fb57e1136e7be38eb946aa42d 100644
--- a/include/configs/M5253DEMO.h
+++ b/include/configs/M5253DEMO.h
@@ -94,7 +94,6 @@
#define CONFIG_SYS_LONGHELP /* undef to save memory */
-#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 023dd7e79e0d583358232cf75ff054f642b0efa5..5e444a80789433f283f9199f696a0b3684d99c91 100644
--- a/include/configs/M5253EVBE.h
+++ b/include/configs/M5253EVBE.h
@@ -64,7 +64,6 @@
#define CONFIG_SYS_LONGHELP /* undef to save memory */
-#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 67a1455fa399b085cd11eb00c0504641ff9a7ca5..66a745f90fb19fdda07ef322cdca6c77226cbbe5 100644
--- a/include/configs/M5272C3.h
+++ b/include/configs/M5272C3.h
@@ -98,7 +98,6 @@
#define CONFIG_SYS_LONGHELP /* undef to save memory */
-#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 */
#define CONFIG_SYS_LOAD_ADDR 0x20000
diff --git a/include/configs/M5275EVB.h b/include/configs/M5275EVB.h
index dcc2e5c3010355c843c8ee74cd225a04595141d7..d3213cec305bcfe9689f31244ff3a0995d64454a 100644
--- a/include/configs/M5275EVB.h
+++ b/include/configs/M5275EVB.h
@@ -90,7 +90,6 @@
#define CONFIG_SYS_LONGHELP /* undef to save memory */
-#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 08226a71ac807681a6552fb6b33d2a7f47107a8a..0864f927509f068d8b94c0b8c80a224735d512c7 100644
--- a/include/configs/M5282EVB.h
+++ b/include/configs/M5282EVB.h
@@ -90,7 +90,6 @@
#define CONFIG_SYS_LONGHELP /* undef to save memory */
-#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 5200817654d4a85cc214dc6cb0bf35230798c6bb..c83a20110a690b5c805ab1fd94e58f758fcbe5e6 100644
--- a/include/configs/M53017EVB.h
+++ b/include/configs/M53017EVB.h
@@ -97,7 +97,6 @@
#define CONFIG_PRAM 512 /* 512 KB */
#define CONFIG_SYS_LONGHELP /* undef to save memory */
-#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 */
#define CONFIG_SYS_LOAD_ADDR 0x40010000
diff --git a/include/configs/M5329EVB.h b/include/configs/M5329EVB.h
index c4fc4141511b17585bab5c9b95a665e3afa398bc..a18c3e7b04a38e682ee6c5a88097d575a5612808 100644
--- a/include/configs/M5329EVB.h
+++ b/include/configs/M5329EVB.h
@@ -89,7 +89,6 @@
#define CONFIG_PRAM 512 /* 512 KB */
#define CONFIG_SYS_LONGHELP /* undef to save memory */
-#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 */
#define CONFIG_SYS_LOAD_ADDR 0x40010000
diff --git a/include/configs/M5373EVB.h b/include/configs/M5373EVB.h
index c78f55137d3b66541f72dbf8ef7ce2733b957140..81250cf4fbdd5c469aa4c34c5c3c47e5515ae2a5 100644
--- a/include/configs/M5373EVB.h
+++ b/include/configs/M5373EVB.h
@@ -89,7 +89,6 @@
#define CONFIG_PRAM 512 /* 512 KB */
#define CONFIG_SYS_LONGHELP /* undef to save memory */
-#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 */
#define CONFIG_SYS_LOAD_ADDR 0x40010000
diff --git a/include/configs/M54418TWR.h b/include/configs/M54418TWR.h
index 0e8d855a62b1c3258854992b5c007e50c2a77217..8907f587a241c41445c8713fe4ca9671f9562f11 100644
--- a/include/configs/M54418TWR.h
+++ b/include/configs/M54418TWR.h
@@ -180,9 +180,6 @@
#define CONFIG_SYS_LONGHELP /* undef to save memory */
-/* 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 */
/* Boot Argument Buffer Size */
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
diff --git a/include/configs/M54451EVB.h b/include/configs/M54451EVB.h
index c64ab8a3cb202c61db9528f1e957eb13d55f0c8a..7faa180cd3d5011e634164a49f88cb7a4029bfc5 100644
--- a/include/configs/M54451EVB.h
+++ b/include/configs/M54451EVB.h
@@ -144,7 +144,6 @@
#define CONFIG_SYS_LONGHELP /* undef to save memory */
-#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 3caf5b9bb9eaca83fd13ad8021125da3c4c57536..77e4dc9ee0aefb21b70053cdfbaeae30a10158d0 100644
--- a/include/configs/M54455EVB.h
+++ b/include/configs/M54455EVB.h
@@ -195,7 +195,6 @@
#define CONFIG_SYS_LONGHELP /* undef to save memory */
-#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 a3badbe5d467fea2bae1c5a030ce86ea03d7a847..80a605ec3e03eec615da05216d96fd54e45421b0 100644
--- a/include/configs/M5475EVB.h
+++ b/include/configs/M5475EVB.h
@@ -126,7 +126,6 @@
#define CONFIG_PRAM 512 /* 512 KB */
#define CONFIG_SYS_LONGHELP /* undef to save memory */
-#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 */
#define CONFIG_SYS_LOAD_ADDR 0x00010000
diff --git a/include/configs/M5485EVB.h b/include/configs/M5485EVB.h
index 957f5ba3606b56725bfb89e4e2c39a4e8c3649f6..78ba3afb936d2cf1bd1bfc3e39934364d522ae24 100644
--- a/include/configs/M5485EVB.h
+++ b/include/configs/M5485EVB.h
@@ -114,7 +114,6 @@
#define CONFIG_PRAM 512 /* 512 KB */
#define CONFIG_SYS_LONGHELP /* undef to save memory */
-#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 */
#define CONFIG_SYS_LOAD_ADDR 0x00010000
diff --git a/include/configs/MCR3000.h b/include/configs/MCR3000.h
index d1d4fe12de95ec30bc82ada1a1df0cb133edb0a0..082d93a50285c9bc08628b3d398dde1ffa5db4eb 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_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/MPC8308RDB.h b/include/configs/MPC8308RDB.h
index 8460b814adc4cb596c5d5faba2ab2bfd63f74a56..80fde2fa507442eb2831c804e0f6bcdb04dc3b4e 100644
--- a/include/configs/MPC8308RDB.h
+++ b/include/configs/MPC8308RDB.h
@@ -426,8 +426,6 @@
#define CONFIG_SYS_CBSIZE 1024 /* 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 */
/* Boot Argument Buffer Size */
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
diff --git a/include/configs/MPC8313ERDB.h b/include/configs/MPC8313ERDB.h
index 3a031a833a792badebfeb87bdd856d6e21f5913f..b9675b757fd37377b051a31c01083f9c71118ce8 100644
--- a/include/configs/MPC8313ERDB.h
+++ b/include/configs/MPC8313ERDB.h
@@ -474,9 +474,6 @@
#define CONFIG_SYS_LOAD_ADDR 0x2000000 /* default load address */
#define CONFIG_SYS_CBSIZE 1024 /* 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 */
/* Boot Argument Buffer Size */
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
diff --git a/include/configs/MPC8315ERDB.h b/include/configs/MPC8315ERDB.h
index 41cbcbc1c6201664825fa239c242ecd6d1d1b1db..0c5db2ab7b4a4e1341f3163d652ee79009fae8ef 100644
--- a/include/configs/MPC8315ERDB.h
+++ b/include/configs/MPC8315ERDB.h
@@ -454,8 +454,6 @@
#define CONFIG_SYS_LONGHELP /* undef to save memory */
#define CONFIG_SYS_LOAD_ADDR 0x2000000 /* default load address */
- /* 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 */
/* Boot Argument Buffer Size */
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
diff --git a/include/configs/MPC8323ERDB.h b/include/configs/MPC8323ERDB.h
index a3d760fb484c02aee730f060e9929096f94d8503..587547939ec102b2c4a140fe153270f085b48ca0 100644
--- a/include/configs/MPC8323ERDB.h
+++ b/include/configs/MPC8323ERDB.h
@@ -327,8 +327,6 @@
#define CONFIG_SYS_LONGHELP /* undef to save memory */
#define CONFIG_SYS_LOAD_ADDR 0x2000000 /* default load address */
- /* 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 */
/* Boot Argument Buffer Size */
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
diff --git a/include/configs/MPC832XEMDS.h b/include/configs/MPC832XEMDS.h
index 04f6b77d45b89b6d65acd03922ef6828887ebb52..4dbc6f7f344347f9b4d12a02b461e5cbc257bf2e 100644
--- a/include/configs/MPC832XEMDS.h
+++ b/include/configs/MPC832XEMDS.h
@@ -411,8 +411,6 @@
#define CONFIG_SYS_LONGHELP /* undef to save memory */
#define CONFIG_SYS_LOAD_ADDR 0x2000000 /* default load address */
- /* 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 */
/* Boot Argument Buffer Size */
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
diff --git a/include/configs/MPC8349EMDS.h b/include/configs/MPC8349EMDS.h
index b65552af41420b1b96e0d4a0abc4965ea829e871..f81b46f1089e6cbe2e167064f4d79410c0ccd087 100644
--- a/include/configs/MPC8349EMDS.h
+++ b/include/configs/MPC8349EMDS.h
@@ -470,8 +470,6 @@
#define CONFIG_SYS_LONGHELP /* undef to save memory */
#define CONFIG_SYS_LOAD_ADDR 0x2000000 /* default load address */
- /* 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 */
/* Boot Argument Buffer Size */
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
diff --git a/include/configs/MPC8349ITX.h b/include/configs/MPC8349ITX.h
index 07f0f22295635fb152eebf467fdbbae866056298..36ac8cd2acd137fac8c5178727317ee0f49a61bb 100644
--- a/include/configs/MPC8349ITX.h
+++ b/include/configs/MPC8349ITX.h
@@ -493,8 +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 */
- /* 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 */
/* Boot Argument Buffer Size */
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
diff --git a/include/configs/MPC837XEMDS.h b/include/configs/MPC837XEMDS.h
index 580a0509a54ef6fd4b481ba10449b126d271ac98..5389091afe032057e0184d13c596a918f108187c 100644
--- a/include/configs/MPC837XEMDS.h
+++ b/include/configs/MPC837XEMDS.h
@@ -482,8 +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 */
- /* 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 */
/* Boot Argument Buffer Size */
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
diff --git a/include/configs/MPC837XERDB.h b/include/configs/MPC837XERDB.h
index 3ca52dee4807d564ff15e027f99c6f3f962ff673..808cf0b6660d58c06b58dfa04876f91006dfef47 100644
--- a/include/configs/MPC837XERDB.h
+++ b/include/configs/MPC837XERDB.h
@@ -496,8 +496,6 @@
#define CONFIG_SYS_LONGHELP /* undef to save memory */
#define CONFIG_SYS_LOAD_ADDR 0x2000000 /* default load address */
- /* 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 */
/* Boot Argument Buffer Size */
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
diff --git a/include/configs/MPC8536DS.h b/include/configs/MPC8536DS.h
index b57461a7fe3ecc3eef83074c512a9054c09266c3..347aa7b3290b89c552cf43329ff0c55465147e16 100644
--- a/include/configs/MPC8536DS.h
+++ b/include/configs/MPC8536DS.h
@@ -603,8 +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 */
-#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/MPC8540ADS.h b/include/configs/MPC8540ADS.h
index ca4d3f8c849207c0c9c996e6579236995f536d38..4181bfdb020a85b5bc6f6994449871e3bed5ceec 100644
--- a/include/configs/MPC8540ADS.h
+++ b/include/configs/MPC8540ADS.h
@@ -324,7 +324,6 @@
#define CONFIG_AUTO_COMPLETE /* add autocompletion support */
#define CONFIG_SYS_LOAD_ADDR 0x2000000 /* default load address */
-#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 bed9e4612fc9ad1903139576932053d2704e51de..5926f1b18fded2ea0bf751459bc06fb8f2133d4f 100644
--- a/include/configs/MPC8541CDS.h
+++ b/include/configs/MPC8541CDS.h
@@ -347,7 +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 */
-#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 2a5f6db04272f3bfd87dcfb8a1303ffcdb8729b4..d34a47168bcbd8d6d2b21e8bd32f580c94233e03 100644
--- a/include/configs/MPC8544DS.h
+++ b/include/configs/MPC8544DS.h
@@ -360,7 +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 */
-#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 3d2506ef66a4fd6bf7d243f45a5108e481e3c4dd..d89ce7f8f5b3240446c02ec63b4b279223ee0c1e 100644
--- a/include/configs/MPC8548CDS.h
+++ b/include/configs/MPC8548CDS.h
@@ -465,7 +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 */
-#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 8e2e642a565ca0f920f59c40c5b731568d81ec10..19115169e43da120a7400feae4375487bf4f8fdf 100644
--- a/include/configs/MPC8555CDS.h
+++ b/include/configs/MPC8555CDS.h
@@ -345,7 +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 */
-#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 7b896dd5353e27a63cf6171104f0890a08340777..21b804cfd0440713eed7a30a814d4a8bb694f7a3 100644
--- a/include/configs/MPC8560ADS.h
+++ b/include/configs/MPC8560ADS.h
@@ -359,7 +359,6 @@
#define CONFIG_AUTO_COMPLETE /* add autocompletion support */
#define CONFIG_SYS_LOAD_ADDR 0x1000000 /* default load address */
-#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 dd8a84e5242f53a1818b61f55222a3fd931ba19c..b207e692d52eea89701f3d835288925652d05890 100644
--- a/include/configs/MPC8568MDS.h
+++ b/include/configs/MPC8568MDS.h
@@ -360,7 +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 */
-#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/MPC8569MDS.h b/include/configs/MPC8569MDS.h
index 1e6e94e4a681036e62f0f1c29c13042676744165..861c8dd9ff6590633a9c0fee165e7b67e76c982c 100644
--- a/include/configs/MPC8569MDS.h
+++ b/include/configs/MPC8569MDS.h
@@ -463,8 +463,6 @@ extern unsigned long get_clock_freq(void);
#else
#define CONFIG_SYS_CBSIZE 512 /* 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 32 /* 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 96f8ef92bfc7a63769addb221929d1752b642cf0..e22656e7a9dacd678c80b746b1e5d67ee6c84205 100644
--- a/include/configs/MPC8572DS.h
+++ b/include/configs/MPC8572DS.h
@@ -558,7 +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 */
-#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 b69c086f4f1ec62c3919467a4a9ec4735082619d..1a63dbb7d782ee5036d8a90eb027f5ffdd69d683 100644
--- a/include/configs/MPC8610HPCD.h
+++ b/include/configs/MPC8610HPCD.h
@@ -433,7 +433,6 @@
#define CONFIG_CMDLINE_EDITING /* Command-line editing */
#define CONFIG_SYS_LOAD_ADDR 0x2000000 /* default load address */
-#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 ed1415ba48cfe14130b6ba53fa67877c2efa24ea..9df9e020decfc48e1336f5add4acd9522b53150b 100644
--- a/include/configs/MPC8641HPCN.h
+++ b/include/configs/MPC8641HPCN.h
@@ -590,7 +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 */
-#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/P1010RDB.h b/include/configs/P1010RDB.h
index 15f1996159fa81c5436af689e87c0638fcb6b6fe..6f17ef1b90657305bbe42c1a8d96978ff2042b97 100644
--- a/include/configs/P1010RDB.h
+++ b/include/configs/P1010RDB.h
@@ -723,8 +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 */
-#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/P1022DS.h b/include/configs/P1022DS.h
index 778346a3bfe15d803b6c956f6edbf30383178b7d..dc22f5c7554c5ed957bf4a9d5f5d382566440e7c 100644
--- a/include/configs/P1022DS.h
+++ b/include/configs/P1022DS.h
@@ -598,8 +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 */
-/* Print Buffer Size */
-#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/P1023RDB.h b/include/configs/P1023RDB.h
index 4d77ed54d99446431e494bb8197c34564cc0d0af..5f02fe30788e51e770abfbf2e0d3dad4fa98209b 100644
--- a/include/configs/P1023RDB.h
+++ b/include/configs/P1023RDB.h
@@ -253,8 +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 */
-/* 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 */
/* Boot Argument Buffer Size */
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
diff --git a/include/configs/P2041RDB.h b/include/configs/P2041RDB.h
index 5ef274ecd990cc173930011f2d35f081b44abc80..d53bf0039e8ef586c44a9379ec753d5ff0505937 100644
--- a/include/configs/P2041RDB.h
+++ b/include/configs/P2041RDB.h
@@ -594,9 +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 */
-/* 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 */
/* Boot Argument Buffer Size */
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
diff --git a/include/configs/T102xQDS.h b/include/configs/T102xQDS.h
index c1334c6d68e6eb1cbf888c1043b12cc5fca459eb..f39dea88a4a6ea5dd1b359cd8de95b2576814fcd 100644
--- a/include/configs/T102xQDS.h
+++ b/include/configs/T102xQDS.h
@@ -774,7 +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 */
-#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 1b7d451010a7b75ee326f2b7d5183df2f3a9bd83..f3be445d85bcc892ec3396709deeab7c2564ae39 100644
--- a/include/configs/T102xRDB.h
+++ b/include/configs/T102xRDB.h
@@ -785,7 +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 */
-#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 cd18b32f77dd0c8dd6c6b30fe009f1356bc92380..d941928a7488b1f23e1435f8a62dbcd927b8f565 100644
--- a/include/configs/T1040QDS.h
+++ b/include/configs/T1040QDS.h
@@ -653,7 +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 */
-#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 ec6c9daf1cb334dfa68b52cb27e8586b01dabf44..5711c5235542f8f07ecef2bacd9fe325716eae1e 100644
--- a/include/configs/T104xRDB.h
+++ b/include/configs/T104xRDB.h
@@ -768,7 +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 */
-#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 70f24f18dd87e904cacae13c92708a486dc99923..e0763f4e2257a18820a85a606c327c77e7620326 100644
--- a/include/configs/T208xQDS.h
+++ b/include/configs/T208xQDS.h
@@ -739,7 +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 */
-#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 501b411ea0d2710e366c958d81a24465ddd19d21..e57e42db5e04204c0195c847749fffa6d50670dc 100644
--- a/include/configs/T208xRDB.h
+++ b/include/configs/T208xRDB.h
@@ -685,7 +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 */
-#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 dc9718d2d1c9c321ff3d25295a733667e43e3111..bace3dc53925ababa773a3cd61fda65a31cf2016 100644
--- a/include/configs/T4240RDB.h
+++ b/include/configs/T4240RDB.h
@@ -276,7 +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 */
-#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 930e06132f1926ce275bfe3d48e79156c3d594c2..e4d2165beb68144183e89e8d3f4ee75663bc9d14 100644
--- a/include/configs/TQM834x.h
+++ b/include/configs/TQM834x.h
@@ -273,8 +273,6 @@
#define CONFIG_CMDLINE_EDITING 1 /* add command line history */
#define CONFIG_AUTO_COMPLETE /* add autocompletion support */
- /* 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 */
/* Boot Argument Buffer Size */
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
diff --git a/include/configs/UCP1020.h b/include/configs/UCP1020.h
index c461b5349d528aa983a76e452c20e6b82291060f..3e32ffab46136b6cbb824bf150888c20bc096b91 100644
--- a/include/configs/UCP1020.h
+++ b/include/configs/UCP1020.h
@@ -441,8 +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 */
-#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 */
#define CONFIG_SYS_HZ 1000 /* decrementer freq: 1ms tick */
diff --git a/include/configs/adp-ae3xx.h b/include/configs/adp-ae3xx.h
index 66e98c9e141506ae553132280fed3fc746cf9eaf..c7691c096be9011a49bb86da8c32824050692cee 100644
--- a/include/configs/adp-ae3xx.h
+++ b/include/configs/adp-ae3xx.h
@@ -101,10 +101,6 @@
*/
#define CONFIG_SYS_LONGHELP /* undef to save memory */
-/* Print Buffer Size */
-#define CONFIG_SYS_PBSIZE \
- (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
-
/* max number of command args */
#define CONFIG_SYS_MAXARGS 16
diff --git a/include/configs/adp-ag101p.h b/include/configs/adp-ag101p.h
index cffff46ba08447615c1681dd282de2e0b942410e..f506124c3da43b3eb6d793febeda6d0fa955b46f 100644
--- a/include/configs/adp-ag101p.h
+++ b/include/configs/adp-ag101p.h
@@ -107,10 +107,6 @@
*/
#define CONFIG_SYS_LONGHELP /* undef to save memory */
-/* Print Buffer Size */
-#define CONFIG_SYS_PBSIZE \
- (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
-
/* max number of command args */
#define CONFIG_SYS_MAXARGS 16
diff --git a/include/configs/advantech_dms-ba16.h b/include/configs/advantech_dms-ba16.h
index d722f2e045b4b7d554a6aba174f7f7078e73af0e..a4a87991610e8333d88da1fb35e50c1f6a6043db 100644
--- a/include/configs/advantech_dms-ba16.h
+++ b/include/configs/advantech_dms-ba16.h
@@ -208,8 +208,6 @@
#define CONFIG_SYS_LONGHELP
#define CONFIG_AUTO_COMPLETE
-/* Print Buffer Size */
-#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
#define CONFIG_SYS_MEMTEST_START 0x10000000
diff --git a/include/configs/am3517_crane.h b/include/configs/am3517_crane.h
index 9bd16060b066989c7d53e3d2dbc90d12da6dc171..ce9d4f8f50cfccc7de31b306176a0f06ba1a5d50 100644
--- a/include/configs/am3517_crane.h
+++ b/include/configs/am3517_crane.h
@@ -166,9 +166,6 @@
*/
#define CONFIG_SYS_LONGHELP /* undef to save memory */
#define CONFIG_SYS_CBSIZE 512 /* Console I/O Buffer Size */
-/* Print Buffer Size */
-#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \
- sizeof(CONFIG_SYS_PROMPT) + 16)
#define CONFIG_SYS_MAXARGS 32 /* max number of command */
/* args */
/* Boot Argument Buffer Size */
diff --git a/include/configs/am3517_evm.h b/include/configs/am3517_evm.h
index e7ef3dde8f09f346f25fe2639a33335e028a6f13..f8f19eb6e67a9d631e6fcc575114fd254bb43dbc 100644
--- a/include/configs/am3517_evm.h
+++ b/include/configs/am3517_evm.h
@@ -233,9 +233,6 @@
/* Console I/O Buffer Size */
#define CONFIG_SYS_CBSIZE 512
-/* Print Buffer Size */
-#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE \
- + sizeof(CONFIG_SYS_PROMPT) + 16)
/* Boot Argument Buffer Size */
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
diff --git a/include/configs/amcore.h b/include/configs/amcore.h
index c0bb118388220bc1d5105110309f159319e80ef0..01884ad769b62f42432fe8f3d4091e3e96859b41 100644
--- a/include/configs/amcore.h
+++ b/include/configs/amcore.h
@@ -33,9 +33,6 @@
/* undef to save memory */
#undef CONFIG_SYS_LONGHELP
-/* Print buffer size */
-#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \
- sizeof(CONFIG_SYS_PROMPT)+16)
/* max number of command args */
#define CONFIG_SYS_MAXARGS 16
/* Boot argument buffer size */
diff --git a/include/configs/ap121.h b/include/configs/ap121.h
index 1db7ea61751eca086eb3057b841dfadb29589838..ecc818b85bdcbb5c92a110929fde687111312fbb 100644
--- a/include/configs/ap121.h
+++ b/include/configs/ap121.h
@@ -44,8 +44,6 @@
/* Miscellaneous configurable options */
#define CONFIG_SYS_MAXARGS 16
-#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \
- sizeof(CONFIG_SYS_PROMPT) + 16)
#define CONFIG_SYS_LONGHELP
#define CONFIG_CMDLINE_EDITING
#define CONFIG_AUTO_COMPLETE
diff --git a/include/configs/ap143.h b/include/configs/ap143.h
index 4475e628216ae026b2378b071d0fef85706e9c05..9ca4178b99e68689809360a8af7e209fa95aeff7 100644
--- a/include/configs/ap143.h
+++ b/include/configs/ap143.h
@@ -48,8 +48,6 @@
/* Miscellaneous configurable options */
#define CONFIG_SYS_MAXARGS 16
-#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \
- sizeof(CONFIG_SYS_PROMPT) + 16)
#define CONFIG_SYS_LONGHELP
#define CONFIG_CMDLINE_EDITING
#define CONFIG_AUTO_COMPLETE
diff --git a/include/configs/apalis-tk1.h b/include/configs/apalis-tk1.h
index f750d5fbf9cba5169cdf12877a6a783dd1119456..e6d119eb06fe6b8d9881febdc96e6de0e5f40d11 100644
--- a/include/configs/apalis-tk1.h
+++ b/include/configs/apalis-tk1.h
@@ -145,9 +145,6 @@
#undef CONFIG_SYS_BARGSIZE
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
-/* Increase print buffer size */
-#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
-
/* Increase maximum number of arguments */
#undef CONFIG_SYS_MAXARGS
#define CONFIG_SYS_MAXARGS 32
diff --git a/include/configs/apalis_t30.h b/include/configs/apalis_t30.h
index c814c73b4073650833b438c00f73402bec1839eb..16dce4af9e88515313d583e5a39d208df794322f 100644
--- a/include/configs/apalis_t30.h
+++ b/include/configs/apalis_t30.h
@@ -52,9 +52,6 @@
#undef CONFIG_SYS_BARGSIZE
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
-/* Increase print buffer size */
-#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
-
/* Increase maximum number of arguments */
#undef CONFIG_SYS_MAXARGS
#define CONFIG_SYS_MAXARGS 32
diff --git a/include/configs/apf27.h b/include/configs/apf27.h
index 12bb0855a8c5ab2c4e8849d6e8bc39af473f0bb5..a5d27a293518406daf82b5541436ab11e2e86111 100644
--- a/include/configs/apf27.h
+++ b/include/configs/apf27.h
@@ -103,9 +103,6 @@
*/
#define CONFIG_SYS_LONGHELP
#define CONFIG_SYS_CBSIZE 2048 /* console I/O buffer */
-#define CONFIG_SYS_PBSIZE \
- (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16)
- /* Print buffer size */
#define CONFIG_SYS_MAXARGS 16 /* max command args */
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
/* Boot argument buffer size */
diff --git a/include/configs/aristainetos-common.h b/include/configs/aristainetos-common.h
index 1c28fcf0a7c32be535a975156a647b14d44bed11..d24d564d480a44e7fd63934b856a8e90b226c224 100644
--- a/include/configs/aristainetos-common.h
+++ b/include/configs/aristainetos-common.h
@@ -135,9 +135,6 @@
#define CONFIG_ARP_TIMEOUT 200UL
-/* Print Buffer Size */
-#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
-
#define CONFIG_SYS_MEMTEST_START PHYS_SDRAM
#define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + 0x100000)
#define CONFIG_SYS_MEMTEST_SCRATCH 0x10800000
diff --git a/include/configs/aspeed-common.h b/include/configs/aspeed-common.h
index f1b00251b717d02bd2e3c3e2f75072c4e1c37cde..ade85a0a783f0a4421e05df35c86afab8ca34d91 100644
--- a/include/configs/aspeed-common.h
+++ b/include/configs/aspeed-common.h
@@ -58,9 +58,6 @@
*/
#define CONFIG_SYS_LONGHELP
-/* Print Buffer Size */
-#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/astro_mcf5373l.h b/include/configs/astro_mcf5373l.h
index fe575876985a392072a978b808a9ac9df8978a29..c06010528efa62e86848086c11eb85ca02a0cb00 100644
--- a/include/configs/astro_mcf5373l.h
+++ b/include/configs/astro_mcf5373l.h
@@ -178,7 +178,6 @@
#define CONFIG_SYS_LONGHELP
-#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/at91rm9200ek.h b/include/configs/at91rm9200ek.h
index ca03f6b769f4c39d6a3538baba3e2c6527571a5a..968e9098327cd11c7b1ac24cb63dda449c34fb5d 100644
--- a/include/configs/at91rm9200ek.h
+++ b/include/configs/at91rm9200ek.h
@@ -175,9 +175,6 @@
#define CONFIG_SYS_LONGHELP
#define CONFIG_AUTO_COMPLETE
#define CONFIG_SYS_MAXARGS 16 /* max number of command args */
-/* Print Buffer Size */
-#define CONFIG_SYS_PBSIZE \
- (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
/*
* Size of malloc() pool
diff --git a/include/configs/axs10x.h b/include/configs/axs10x.h
index f3650543220dad750f8b0363e17e89d1abe5d276..7e0f26baafb6fe3c88b325f8b769aefb3bbf2e07 100644
--- a/include/configs/axs10x.h
+++ b/include/configs/axs10x.h
@@ -82,8 +82,6 @@
*/
#define CONFIG_SYS_LONGHELP
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
-#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \
- sizeof(CONFIG_SYS_PROMPT) + 16)
/*
* Misc utility configuration
diff --git a/include/configs/bcm23550_w1d.h b/include/configs/bcm23550_w1d.h
index e376090e61e8ca8427601fbaeb76a2d9e42be441..26bad43699c3718162ab62d0e5174dabc424d5d9 100644
--- a/include/configs/bcm23550_w1d.h
+++ b/include/configs/bcm23550_w1d.h
@@ -87,8 +87,6 @@
/* console configuration */
#define CONFIG_SYS_CBSIZE 1024 /* Console buffer size */
-#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \
- sizeof(CONFIG_SYS_PROMPT) + 16) /* Printbuffer size */
#define CONFIG_SYS_MAXARGS 64
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
diff --git a/include/configs/bcm28155_ap.h b/include/configs/bcm28155_ap.h
index 08d1e4e69f34432979cbbddfbb8bd8017934fef3..2e2aa3dea2aea5f3f39afb57f8300ae34616fe18 100644
--- a/include/configs/bcm28155_ap.h
+++ b/include/configs/bcm28155_ap.h
@@ -86,8 +86,6 @@
/* console configuration */
#define CONFIG_SYS_CBSIZE 1024 /* Console buffer size */
-#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \
- sizeof(CONFIG_SYS_PROMPT) + 16) /* Printbuffer size */
#define CONFIG_SYS_MAXARGS 64
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
diff --git a/include/configs/bcm_ep_board.h b/include/configs/bcm_ep_board.h
index 8bd1e301a9cec4ddc9b9de024b66b79509de5c02..fd893e6b10cfccf4fc894935d492317499a0f300 100644
--- a/include/configs/bcm_ep_board.h
+++ b/include/configs/bcm_ep_board.h
@@ -49,8 +49,6 @@
/* console configuration */
#define CONFIG_SYS_CBSIZE 1024 /* Console buffer size */
-#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \
- sizeof(CONFIG_SYS_PROMPT) + 16) /* Printbuffer size */
#define CONFIG_SYS_MAXARGS 64
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
diff --git a/include/configs/bcm_northstar2.h b/include/configs/bcm_northstar2.h
index 2352b98f6221f979c20cf5145d923d6b9c15342a..3605d869388592f5eea55f2f74580bda826f3ee6 100644
--- a/include/configs/bcm_northstar2.h
+++ b/include/configs/bcm_northstar2.h
@@ -41,8 +41,6 @@
/* console configuration */
#define CONFIG_SYS_CBSIZE SZ_1K
-#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \
- sizeof(CONFIG_SYS_PROMPT) + 16)
#define CONFIG_SYS_MAXARGS 64
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
diff --git a/include/configs/boston.h b/include/configs/boston.h
index d7fdb8cdcc2c02a0455150606737322afa215cde..76c9bde11b208c65783101ff9ee85cde480912f7 100644
--- a/include/configs/boston.h
+++ b/include/configs/boston.h
@@ -45,8 +45,6 @@
* Console
*/
#define CONFIG_SYS_MAXARGS 16
-#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \
- sizeof(CONFIG_SYS_PROMPT) + 16)
#define CONFIG_SYS_LONGHELP
/*
diff --git a/include/configs/bur_cfg_common.h b/include/configs/bur_cfg_common.h
index 3f967bb1b502fc410212598b1a544b4704099a5f..45b6eb938b4976d3ba5187fb988fae41ebe3c83a 100644
--- a/include/configs/bur_cfg_common.h
+++ b/include/configs/bur_cfg_common.h
@@ -49,9 +49,6 @@
/* Console I/O Buffer Size */
#define CONFIG_SYS_CBSIZE 512
-/* Print Buffer Size */
-#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE +\
- sizeof(CONFIG_SYS_PROMPT) + 16)
/* Boot Argument Buffer Size */
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
diff --git a/include/configs/calimain.h b/include/configs/calimain.h
index 06554c101bbec1f96adddc13526a0a84e5f04b82..488645809cd9172d8328d76c0f92264e7d8b1ac8 100644
--- a/include/configs/calimain.h
+++ b/include/configs/calimain.h
@@ -187,7 +187,6 @@
*/
#define CONFIG_BOOTFILE "uImage" /* Boot file name */
#define CONFIG_SYS_CBSIZE 1024 /* 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 Args Buffer Size */
#define CONFIG_SYS_LOAD_ADDR (PHYS_SDRAM_1 + 0x700000)
diff --git a/include/configs/cm_fx6.h b/include/configs/cm_fx6.h
index 4f45be1bdbdb550d247cad5f0d779350996596ed..2d6132df9b51e7efbac0cdd5ef36602a566578a2 100644
--- a/include/configs/cm_fx6.h
+++ b/include/configs/cm_fx6.h
@@ -40,10 +40,6 @@
#define CONFIG_MXC_UART_BASE UART4_BASE
#define CONFIG_SYS_BAUDRATE_TABLE {9600, 19200, 38400, 57600, 115200}
-/* Shell */
-#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \
- sizeof(CONFIG_SYS_PROMPT) + 16)
-
/* SPI flash */
#define CONFIG_SF_DEFAULT_BUS 0
#define CONFIG_SF_DEFAULT_CS 0
diff --git a/include/configs/cm_t35.h b/include/configs/cm_t35.h
index c8822d4f88f8de1c17ade6ffb9a79c19d6547bcf..92c402e0a300630e8c351f31c3bfc0151547fa6e 100644
--- a/include/configs/cm_t35.h
+++ b/include/configs/cm_t35.h
@@ -175,9 +175,6 @@
#define CONFIG_TIMESTAMP
#define CONFIG_SYS_AUTOLOAD "no"
#define CONFIG_SYS_LONGHELP /* undef to save memory */
-/* 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 */
/* Boot Argument Buffer Size */
#define CONFIG_SYS_BARGSIZE (CONFIG_SYS_CBSIZE)
diff --git a/include/configs/cm_t3517.h b/include/configs/cm_t3517.h
index 3a9fd2ac6c550eb4edfe9a057a55f31fb55ea3cf..800d4be45573fb7bff28be37ce797ebc350256c9 100644
--- a/include/configs/cm_t3517.h
+++ b/include/configs/cm_t3517.h
@@ -180,9 +180,6 @@
#define CONFIG_SYS_AUTOLOAD "no"
#define CONFIG_SYS_LONGHELP /* undef to save memory */
#define CONFIG_SYS_CBSIZE 512 /* Console I/O Buffer Size */
-/* Print Buffer Size */
-#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \
- sizeof(CONFIG_SYS_PROMPT) + 16)
#define CONFIG_SYS_MAXARGS 32 /* max number of command args */
/* Boot Argument Buffer Size */
#define CONFIG_SYS_BARGSIZE (CONFIG_SYS_CBSIZE)
diff --git a/include/configs/cobra5272.h b/include/configs/cobra5272.h
index 42c8f845aa6ff3e62d022a833abdf43f6d7ae020..16cc302302aabdda2c9664b8fe3a72e407c7d0ab 100644
--- a/include/configs/cobra5272.h
+++ b/include/configs/cobra5272.h
@@ -169,7 +169,6 @@ from which user programs will be started */
#define CONFIG_SYS_LONGHELP /* undef to save memory */
-#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 d5255e7e0a135a281d871f1ebe18a9a1f9404660..ca49d21cfe610cdb18016efdd88bfed202a708a2 100644
--- a/include/configs/colibri_pxa270.h
+++ b/include/configs/colibri_pxa270.h
@@ -84,8 +84,6 @@
#endif
#undef CONFIG_SYS_LONGHELP /* Saves 10 KB */
-#define CONFIG_SYS_PBSIZE \
- (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16)
#define CONFIG_SYS_MAXARGS 16
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
#define CONFIG_SYS_DEVICE_NULLDEV 1
diff --git a/include/configs/colibri_t20.h b/include/configs/colibri_t20.h
index c1d4b6238509a2ceb61d9a4f50d54fd742bd5a14..8172eaa3e2ab5d9ca79739a1415bf4fad02fd604 100644
--- a/include/configs/colibri_t20.h
+++ b/include/configs/colibri_t20.h
@@ -70,9 +70,6 @@
#undef CONFIG_SYS_BARGSIZE
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
-/* Increase print buffer size */
-#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
-
/* Increase maximum number of arguments */
#undef CONFIG_SYS_MAXARGS
#define CONFIG_SYS_MAXARGS 32
diff --git a/include/configs/colibri_t30.h b/include/configs/colibri_t30.h
index 91433afaccf2fa5ce9a0b2989cef7bc3e909bbf3..298b66df27fad584ef149aafc49b58c18a54d266 100644
--- a/include/configs/colibri_t30.h
+++ b/include/configs/colibri_t30.h
@@ -51,9 +51,6 @@
#undef CONFIG_SYS_BARGSIZE
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
-/* Increase print buffer size */
-#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
-
/* Increase maximum number of arguments */
#undef CONFIG_SYS_MAXARGS
#define CONFIG_SYS_MAXARGS 32
diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h
index cc1f919f67ee3f4c20d04ea4f468b976a4cd528d..0645bb730ceba9dc92f785d85898c152f953aeba 100644
--- a/include/configs/colibri_vf.h
+++ b/include/configs/colibri_vf.h
@@ -141,8 +141,6 @@
#define CONFIG_SYS_LONGHELP /* undef to save memory */
#undef CONFIG_AUTO_COMPLETE
#define CONFIG_SYS_CBSIZE 1024 /* 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
diff --git a/include/configs/controlcenterd.h b/include/configs/controlcenterd.h
index 7a07d5cbefe0759b67a2c592f67f7d9dbf4d0b7d..c9ae2816fcd0596c9e5922d6cea291616ed61ff8 100644
--- a/include/configs/controlcenterd.h
+++ b/include/configs/controlcenterd.h
@@ -322,8 +322,6 @@
#endif /* CONFIG_TRAILBLAZER */
#define CONFIG_SYS_LOAD_ADDR 0x2000000 /* default load address */
-/* Print Buffer Size */
-#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/corenet_ds.h b/include/configs/corenet_ds.h
index f4f0d74655dfa61104fb2e6a67dbfc174913b068..6e07172e04b94124e6073bc72d1a97adadca7c43 100644
--- a/include/configs/corenet_ds.h
+++ b/include/configs/corenet_ds.h
@@ -603,7 +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 */
-#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 20886959b17a935bacbd849faf64b6f8dd44fb8a..f6161e07542f0b36342ce2203aadd2c7f61e1514 100644
--- a/include/configs/corvus.h
+++ b/include/configs/corvus.h
@@ -107,8 +107,6 @@
"bootm 0x70000000"
#define CONFIG_SYS_MAXARGS 16
-#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \
- sizeof(CONFIG_SYS_PROMPT) + 16)
#define CONFIG_SYS_LONGHELP
#define CONFIG_CMDLINE_EDITING
#define CONFIG_AUTO_COMPLETE
diff --git a/include/configs/cyrus.h b/include/configs/cyrus.h
index e4e346ed22a37514bcab89cc13da2322bcf900b9..19279ea8880a987d1c621de872ca96305412b00f 100644
--- a/include/configs/cyrus.h
+++ b/include/configs/cyrus.h
@@ -429,7 +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 */
-#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/da850evm.h b/include/configs/da850evm.h
index 0736b395aede6016b81292e8100e887f6526ec2c..48e63205462448ba83a43686a082f966ab716b51 100644
--- a/include/configs/da850evm.h
+++ b/include/configs/da850evm.h
@@ -242,7 +242,6 @@
#define CONFIG_MISC_INIT_R
#define CONFIG_BOOTFILE "uImage" /* Boot file name */
#define CONFIG_SYS_CBSIZE 1024 /* 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 Args Buffer Size */
#define CONFIG_SYS_LOAD_ADDR (PHYS_SDRAM_1 + 0x700000)
diff --git a/include/configs/dbau1x00.h b/include/configs/dbau1x00.h
index 0360bf9150eeac87918fbdf11025b623588d201a..6106920c7cea2727fd1fc55afcded1cdac0f0877 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_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_MALLOC_LEN 128*1024
diff --git a/include/configs/devkit3250.h b/include/configs/devkit3250.h
index 226c1d2bba9293131bea06197d3e17f81eb1f42c..3c4de83c5a3e98a23ad30dab5bfb642a032835fb 100644
--- a/include/configs/devkit3250.h
+++ b/include/configs/devkit3250.h
@@ -120,8 +120,6 @@
*/
#define CONFIG_SYS_LONGHELP
#define CONFIG_SYS_CBSIZE 1024
-#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/dragonboard410c.h b/include/configs/dragonboard410c.h
index 26103583ab008114ccdd3d35504fa10646e37a4a..baebdefc445c9e03297f40c335a487c2b2caff99 100644
--- a/include/configs/dragonboard410c.h
+++ b/include/configs/dragonboard410c.h
@@ -114,8 +114,6 @@ REFLASH(dragonboard/u-boot.img, 8)\
/* Monitor Command Prompt */
#define CONFIG_SYS_CBSIZE 512 /* Console I/O Buffer Size */
-#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \
- sizeof(CONFIG_SYS_PROMPT) + 16)
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
#define CONFIG_SYS_MAXARGS 64 /* max command args */
diff --git a/include/configs/ea20.h b/include/configs/ea20.h
index 158eea60181f642539de8d9eabe0ab16121e58c0..58c2ac33b0be9c51f77ab0f11173c5e63020207e 100644
--- a/include/configs/ea20.h
+++ b/include/configs/ea20.h
@@ -105,7 +105,6 @@
*/
#define CONFIG_BOOTFILE "uImage" /* Boot file name */
#define CONFIG_SYS_CBSIZE 1024 /* 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 Args Buffer Size */
#define CONFIG_SYS_LOAD_ADDR (PHYS_SDRAM_1 + 0x700000)
diff --git a/include/configs/eb_cpu5282.h b/include/configs/eb_cpu5282.h
index 755e7887df804a199e7b1ec6ebda6395ab000f57..0d7246aeb0fd1efedb1a1cb27ab88aa75745144e 100644
--- a/include/configs/eb_cpu5282.h
+++ b/include/configs/eb_cpu5282.h
@@ -62,7 +62,6 @@
#define CONFIG_SYS_LONGHELP 1
#define CONFIG_SYS_CBSIZE 1024 /* 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
diff --git a/include/configs/edb93xx.h b/include/configs/edb93xx.h
index 9170a94e364ffbc4169c5a101007d74f8fd8faa8..cf705bd57fc0dba7c4d21bfd82ea34eebe8567d9 100644
--- a/include/configs/edb93xx.h
+++ b/include/configs/edb93xx.h
@@ -78,8 +78,6 @@
#define CONFIG_SYS_LONGHELP /* Enable "long" help in mon */
#define CONFIG_SYS_CBSIZE 1024 /* Console I/O buffer size */
-/* Print buffer size */
-#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16)
/* Boot argument buffer size */
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
#define CONFIG_SYS_MAXARGS 16 /* Max number of command args */
diff --git a/include/configs/edison.h b/include/configs/edison.h
index 399fbc7d9c42793e4ea77768d3af06b1816b0550..d25b50c0768bfa0fec5a51fed69cc25fd6af7a4c 100644
--- a/include/configs/edison.h
+++ b/include/configs/edison.h
@@ -19,7 +19,6 @@
#define CONFIG_SYS_LONGHELP
#define CONFIG_SYS_CBSIZE 2048
-#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
#define CONFIG_SYS_MAXARGS 128
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
diff --git a/include/configs/edminiv2.h b/include/configs/edminiv2.h
index 235b7461f503b3bc12975fc4e9684df68f0bf465..fb44514289fc3b7dbbb78a41000b90247ac3a873 100644
--- a/include/configs/edminiv2.h
+++ b/include/configs/edminiv2.h
@@ -113,8 +113,6 @@
#define CONFIG_SETUP_MEMORY_TAGS 1 /* enable memory tag */
#define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buff Size */
-#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE \
- +sizeof(CONFIG_SYS_PROMPT) + 16) /* Print Buff */
/*
* Commands configuration
*/
diff --git a/include/configs/embestmx6boards.h b/include/configs/embestmx6boards.h
index d1dec80f8f6204a8af2c5d6cfb2c6e0b6ebabe2d..cb776b24bbf8391ceecb4832a301126064d836a6 100644
--- a/include/configs/embestmx6boards.h
+++ b/include/configs/embestmx6boards.h
@@ -63,9 +63,6 @@
#define CONFIG_ARP_TIMEOUT 200UL
-/* Print Buffer Size */
-#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
-
#define CONFIG_SYS_MEMTEST_START 0x10000000
#define CONFIG_SYS_MEMTEST_END 0x10010000
#define CONFIG_SYS_MEMTEST_SCRATCH 0x10800000
diff --git a/include/configs/ethernut5.h b/include/configs/ethernut5.h
index 430acc09fb2732c734eb2c5aef06d582f37bc0b6..d67200b8b198f00ddd6b2f3fd889bf93c3f48041 100644
--- a/include/configs/ethernut5.h
+++ b/include/configs/ethernut5.h
@@ -167,8 +167,6 @@
/* Misc. u-boot settings */
#define CONFIG_SYS_MAXARGS 16
-#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + 16 \
- + sizeof(CONFIG_SYS_PROMPT))
#define CONFIG_SYS_LONGHELP
#define CONFIG_CMDLINE_EDITING
diff --git a/include/configs/ge_bx50v3.h b/include/configs/ge_bx50v3.h
index 731b904048c82b30e17946675a82899dd138ed58..787409323746de7788f41d69093761b99668f1a3 100644
--- a/include/configs/ge_bx50v3.h
+++ b/include/configs/ge_bx50v3.h
@@ -233,8 +233,6 @@
#define CONFIG_SYS_LONGHELP
#define CONFIG_AUTO_COMPLETE
-/* Print Buffer Size */
-#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
#define CONFIG_SYS_MEMTEST_START 0x10000000
diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h
index 0ef78cb6ecb366e82897b45ba52cc7c923215c5b..5edd8adca8a3952a4e63df532a542c41c2062a25 100644
--- a/include/configs/gw_ventana.h
+++ b/include/configs/gw_ventana.h
@@ -170,9 +170,6 @@
#define CONFIG_HWCONFIG
#define CONFIG_PREBOOT
-/* Print Buffer Size */
-#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
-
/* Memory configuration */
#define CONFIG_SYS_MEMTEST_START 0x10000000
#define CONFIG_SYS_MEMTEST_END 0x10010000
diff --git a/include/configs/h2200.h b/include/configs/h2200.h
index 9d2e9e8dc7357dc69327c946fb9e5a3f98aad94f..8bb149e56b2613405a617efec1be5ee08539346d 100644
--- a/include/configs/h2200.h
+++ b/include/configs/h2200.h
@@ -114,10 +114,6 @@
/* Monitor Command Prompt */
-/* Print Buffer Size */
-#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \
- sizeof(CONFIG_SYS_PROMPT) + 16)
-
#define CONFIG_USB_DEV_PULLUP_GPIO 33
/* USB VBUS GPIO 3 */
diff --git a/include/configs/highbank.h b/include/configs/highbank.h
index 0328c4100b28666334b705530c8456edb7ad5f87..1946cad77ef345dd164bb31987bddbe5674ae0bf 100644
--- a/include/configs/highbank.h
+++ b/include/configs/highbank.h
@@ -56,9 +56,6 @@
#define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */
#define CONFIG_SYS_MAXARGS 16 /* max number of cmd args */
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
-/* Print Buffer Size */
-#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \
- sizeof(CONFIG_SYS_PROMPT)+16)
#define CONFIG_SYS_LOAD_ADDR 0x800000
#define CONFIG_SYS_64BIT_LBA
diff --git a/include/configs/hikey.h b/include/configs/hikey.h
index f12f13c8366989c28a9f5e85c26e025ca7d9f0c4..da44cd27377e97ca2cd4139b9b8c7a6b030fe4b2 100644
--- a/include/configs/hikey.h
+++ b/include/configs/hikey.h
@@ -107,8 +107,6 @@
/* Monitor Command Prompt */
#define CONFIG_SYS_CBSIZE 512 /* Console I/O Buffer Size */
-#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \
- sizeof(CONFIG_SYS_PROMPT) + 16)
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
#define CONFIG_SYS_LONGHELP
#define CONFIG_CMDLINE_EDITING
diff --git a/include/configs/hrcon.h b/include/configs/hrcon.h
index 565a5aae93a5ac6ccbb388a5346b2a5e4ef3bf31..f8cfc0d182b0d5e08b9dd59e1b642eecda27cfe8 100644
--- a/include/configs/hrcon.h
+++ b/include/configs/hrcon.h
@@ -522,8 +522,6 @@ void fpga_control_clear(unsigned int bus, int pin);
#define CONFIG_SYS_CBSIZE 1024 /* 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 */
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
diff --git a/include/configs/hsdk.h b/include/configs/hsdk.h
index 8062d01fff911c3268665d702bca1b1050587f97..3b306c70ad182f5553e77c016d1e03440cc78660 100644
--- a/include/configs/hsdk.h
+++ b/include/configs/hsdk.h
@@ -75,8 +75,6 @@
#define CONFIG_SYS_LONGHELP
#define CONFIG_SYS_MAXARGS 16
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
-#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \
- sizeof(CONFIG_SYS_PROMPT) + 16)
/*
* Misc utility configuration
diff --git a/include/configs/ids8313.h b/include/configs/ids8313.h
index 0c22ca8b9ed0ba088ac05736e29ba3aafd299f1d..3c6e67a797aab00ce830dc832b607887bcca5c5b 100644
--- a/include/configs/ids8313.h
+++ b/include/configs/ids8313.h
@@ -451,8 +451,6 @@
*/
#define CONFIG_SYS_LONGHELP
#define CONFIG_SYS_CBSIZE 1024
-#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/imx27lite-common.h b/include/configs/imx27lite-common.h
index e2b6fca5431b9091bb2db95be16cbf76a89b7462..ba4bfb0f40e6ea7d0a0fd8e6e70315e62aa9d637 100644
--- a/include/configs/imx27lite-common.h
+++ b/include/configs/imx27lite-common.h
@@ -141,9 +141,6 @@
* U-Boot general configuration
*/
#define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */
-/* Print buffer sz */
-#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \
- sizeof(CONFIG_SYS_PROMPT) + 16)
#define CONFIG_SYS_MAXARGS 16 /* max number of command args */
/* Boot Argument Buffer Size */
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
diff --git a/include/configs/imx31_phycore.h b/include/configs/imx31_phycore.h
index 13d874db3f7b0142a1673b7e134e17a4b73a4d97..83ef16179597a382cd5ac3b1439ce05be51b48e4 100644
--- a/include/configs/imx31_phycore.h
+++ b/include/configs/imx31_phycore.h
@@ -93,9 +93,6 @@
* Miscellaneous configurable options
*/
#define CONFIG_SYS_LONGHELP /* undef to save memory */
-/* Print Buffer Size */
-#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \
- sizeof(CONFIG_SYS_PROMPT) + 16)
/* max number of command args */
#define CONFIG_SYS_MAXARGS 16
/* Boot Argument Buffer Size */
diff --git a/include/configs/integrator-common.h b/include/configs/integrator-common.h
index cd91741beccbb848912df7880979824264f8b6da..ef9f429ec8670fc903f213720cf244ea25edee2c 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_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*/
#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 128*1024) /* Size of malloc() pool */
diff --git a/include/configs/ipam390.h b/include/configs/ipam390.h
index d2fc81bfe0b810bd62c436ad5c75e9dc1abbc121..9e7874a26a6bbdc78097651c95062aa47d9f5d79 100644
--- a/include/configs/ipam390.h
+++ b/include/configs/ipam390.h
@@ -197,7 +197,6 @@
#define CONFIG_MISC_INIT_R
#define CONFIG_BOOTFILE "uImage" /* Boot file name */
#define CONFIG_SYS_CBSIZE 1024 /* 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 Args Buffer Size */
#define CONFIG_SYS_LOAD_ADDR (PHYS_SDRAM_1 + 0x700000)
diff --git a/include/configs/kc1.h b/include/configs/kc1.h
index 49b24d1e8c3cd518f576757db5dc88ef75eebdfc..d1f7a48a81b9e912420f692ce69e6975ab845045 100644
--- a/include/configs/kc1.h
+++ b/include/configs/kc1.h
@@ -98,8 +98,6 @@
#define CONFIG_SYS_MAXARGS 16
#define CONFIG_SYS_CBSIZE 512
-#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) \
- + 16)
/*
* Serial
diff --git a/include/configs/km/keymile-common.h b/include/configs/km/keymile-common.h
index 8e827d006dfaac1183e08057d504d3c54adfe33f..1971ba4f7e033d7d3242d32d091dbc84e39d0ef1 100644
--- a/include/configs/km/keymile-common.h
+++ b/include/configs/km/keymile-common.h
@@ -21,7 +21,6 @@
#else
#define CONFIG_SYS_CBSIZE 512 /* Console I/O Buffer Size */
#endif
-#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16)
#define CONFIG_SYS_MAXARGS 32 /* max number of command args */
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
#define CONFIG_CMDLINE_EDITING
diff --git a/include/configs/legoev3.h b/include/configs/legoev3.h
index 2e6147d8228d27d210477301638e2de36870b66f..bc953d71ee802d99bcb823b77e8a23c363675caa 100644
--- a/include/configs/legoev3.h
+++ b/include/configs/legoev3.h
@@ -143,7 +143,6 @@
*/
#define CONFIG_BOOTFILE "uImage" /* Boot file name */
#define CONFIG_SYS_CBSIZE 1024 /* 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 Args Buffer Size */
#define CONFIG_SYS_LOAD_ADDR (PHYS_SDRAM_1 + 0x700000)
diff --git a/include/configs/ls1012a_common.h b/include/configs/ls1012a_common.h
index 9d85341499257ac07b712eee5e7bb8b5ad1fbced..c88db4aebac56388e97b0a292fa040e42cf78372 100644
--- a/include/configs/ls1012a_common.h
+++ b/include/configs/ls1012a_common.h
@@ -107,8 +107,6 @@
/* Monitor Command Prompt */
#define CONFIG_SYS_CBSIZE 512 /* Console I/O Buffer Size */
-#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \
- sizeof(CONFIG_SYS_PROMPT) + 16)
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE /* Boot args buffer */
#define CONFIG_SYS_LONGHELP
#define CONFIG_CMDLINE_EDITING 1
diff --git a/include/configs/ls1021aiot.h b/include/configs/ls1021aiot.h
index 8be2110c6468a749a1bc4907757a691c4f7eaa12..57686b9c52a7b598224dc8b8b8c4187149e65cf3 100644
--- a/include/configs/ls1021aiot.h
+++ b/include/configs/ls1021aiot.h
@@ -240,8 +240,6 @@
#define CONFIG_SYS_LONGHELP /* undef to save memory */
#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
#define CONFIG_AUTO_COMPLETE
-#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
diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h
index 390a1b7dd85f437a88490d6d9fbbfe03c146604d..bee5ee04b20e8ce7e92d17c8d62ecd292f7a988a 100644
--- a/include/configs/ls1021aqds.h
+++ b/include/configs/ls1021aqds.h
@@ -512,8 +512,6 @@ unsigned long get_board_ddr_clk(void);
*/
#define CONFIG_SYS_LONGHELP /* undef to save memory */
#define CONFIG_AUTO_COMPLETE
-#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
diff --git a/include/configs/ls1021atwr.h b/include/configs/ls1021atwr.h
index b528bb5397bd719505bfdb50464097a4c939e857..ccabd9b2e522af350f7831158343129159a77244 100644
--- a/include/configs/ls1021atwr.h
+++ b/include/configs/ls1021atwr.h
@@ -489,8 +489,6 @@
*/
#define CONFIG_SYS_LONGHELP /* undef to save memory */
#define CONFIG_AUTO_COMPLETE
-#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
diff --git a/include/configs/ls1043a_common.h b/include/configs/ls1043a_common.h
index 00af52d4115ffda4892f31afbeadea46b495c37c..189dd8a6455786baf0ad4372fe8b09bb116685fe 100644
--- a/include/configs/ls1043a_common.h
+++ b/include/configs/ls1043a_common.h
@@ -330,8 +330,6 @@
/* Monitor Command Prompt */
#define CONFIG_SYS_CBSIZE 512 /* Console I/O Buffer Size */
-#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \
- sizeof(CONFIG_SYS_PROMPT) + 16)
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE /* Boot args buffer */
#define CONFIG_SYS_LONGHELP
diff --git a/include/configs/ls1043aqds.h b/include/configs/ls1043aqds.h
index af58e614f56ec8b2592712d0d3e14dfa9bd70d43..cc35880bf170489003926e1fd228850733e5d012 100644
--- a/include/configs/ls1043aqds.h
+++ b/include/configs/ls1043aqds.h
@@ -383,8 +383,6 @@ unsigned long get_board_ddr_clk(void);
#define CONFIG_MISC_INIT_R
#define CONFIG_SYS_LONGHELP /* undef to save memory */
#define CONFIG_AUTO_COMPLETE
-#define CONFIG_SYS_PBSIZE \
- (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
#define CONFIG_SYS_MEMTEST_START 0x80000000
diff --git a/include/configs/ls1046a_common.h b/include/configs/ls1046a_common.h
index b9221398df54bf17bca5eb78cc7d1be2fa20c5e2..1b446a1e01cef942dd199ea41667653c81471e3e 100644
--- a/include/configs/ls1046a_common.h
+++ b/include/configs/ls1046a_common.h
@@ -268,8 +268,6 @@
/* Monitor Command Prompt */
#define CONFIG_SYS_CBSIZE 512 /* Console I/O Buffer Size */
-#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \
- sizeof(CONFIG_SYS_PROMPT) + 16)
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE /* Boot args buffer */
#define CONFIG_SYS_LONGHELP
diff --git a/include/configs/ls1046aqds.h b/include/configs/ls1046aqds.h
index 325ac2c0e81416dd2195bc8dab5aae7a2ef3494c..bf48b2f831ff0bee41e2bc987bb24453c6e00e6f 100644
--- a/include/configs/ls1046aqds.h
+++ b/include/configs/ls1046aqds.h
@@ -417,8 +417,6 @@ unsigned long get_board_ddr_clk(void);
#define CONFIG_MISC_INIT_R
#define CONFIG_SYS_LONGHELP /* undef to save memory */
#define CONFIG_AUTO_COMPLETE
-#define CONFIG_SYS_PBSIZE \
- (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
#define CONFIG_SYS_MEMTEST_START 0x80000000
diff --git a/include/configs/ls2080a_common.h b/include/configs/ls2080a_common.h
index 20cfc25cce0dcf413d1b984e0d1ee3acf4b57781..b7a4902318b1061395b834813e7204b4c45f4bf3 100644
--- a/include/configs/ls2080a_common.h
+++ b/include/configs/ls2080a_common.h
@@ -216,8 +216,6 @@ unsigned long long get_qixis_addr(void);
/* Monitor Command Prompt */
#define CONFIG_SYS_CBSIZE 512 /* Console I/O Buffer Size */
-#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \
- sizeof(CONFIG_SYS_PROMPT) + 16)
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE /* Boot args buffer */
#define CONFIG_SYS_LONGHELP
#define CONFIG_CMDLINE_EDITING 1
diff --git a/include/configs/m53evk.h b/include/configs/m53evk.h
index 4dc6e16fac81a0fa7d3a26fd04dc2bd434fb5698..547c13f8b806cde9a1723cdb946344dbab9570bf 100644
--- a/include/configs/m53evk.h
+++ b/include/configs/m53evk.h
@@ -46,9 +46,6 @@
*/
#define CONFIG_SYS_LONGHELP
#define CONFIG_SYS_CBSIZE 1024 /* Console I/O buffer size */
-#define CONFIG_SYS_PBSIZE \
- (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
- /* Print buffer size */
#define CONFIG_SYS_MAXARGS 32 /* Max number of command args */
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
/* Boot argument buffer size */
diff --git a/include/configs/malta.h b/include/configs/malta.h
index 54edb23d67534d52caba7ffc89ddb06dba9357b6..3f4bea80fd505333e1a76a9fda3d20c33b3c328f 100644
--- a/include/configs/malta.h
+++ b/include/configs/malta.h
@@ -52,8 +52,6 @@
#define CONFIG_SYS_BOOTPARAMS_LEN (128 * 1024)
#define CONFIG_SYS_BOOTM_LEN (64 * 1024 * 1024)
-#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \
- sizeof(CONFIG_SYS_PROMPT) + 16)
#define CONFIG_SYS_MAXARGS 16
#define CONFIG_AUTO_COMPLETE
diff --git a/include/configs/mcx.h b/include/configs/mcx.h
index 7047e3f5457c48b2f8b3c2af962e8de28fc25885..940a61b38c552eb59f4c4c18d1f68b794d3e323b 100644
--- a/include/configs/mcx.h
+++ b/include/configs/mcx.h
@@ -213,9 +213,6 @@
*/
#define CONFIG_SYS_LONGHELP /* undef to save memory */
#define CONFIG_SYS_CBSIZE 1024/* 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 */
/* Boot Argument Buffer Size */
diff --git a/include/configs/meesc.h b/include/configs/meesc.h
index f256dcb47fd14508c085fdf2ca82d64ceb897168..32abba163491d68348dbce1ead3de7c025507d3e 100644
--- a/include/configs/meesc.h
+++ b/include/configs/meesc.h
@@ -119,8 +119,6 @@
#define CONFIG_SYS_CBSIZE 512
#define CONFIG_SYS_MAXARGS 16
-#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \
- sizeof(CONFIG_SYS_PROMPT) + 16)
#define CONFIG_SYS_LONGHELP
#define CONFIG_CMDLINE_EDITING
#define CONFIG_AUTO_COMPLETE
diff --git a/include/configs/meson-gxbb-common.h b/include/configs/meson-gxbb-common.h
index 14dac4a72962a8454a3656688098352f209a9248..1b52cdaa47ae0e874efd0ead520277ff681ccfe3 100644
--- a/include/configs/meson-gxbb-common.h
+++ b/include/configs/meson-gxbb-common.h
@@ -25,10 +25,6 @@
#define GICD_BASE 0xc4301000
#define GICC_BASE 0xc4302000
-/* Monitor Command Prompt */
-/* Console I/O Buffer Size */
-#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \
- sizeof(CONFIG_SYS_PROMPT) + 16)
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
#define CONFIG_SYS_LONGHELP
#define CONFIG_CMDLINE_EDITING
diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h
index e190493c334206e55636fbbcf7388356a4dc7e54..2cc4b8a1a36c1c91bdd10e6cebffb1fb48baae26 100644
--- a/include/configs/microblaze-generic.h
+++ b/include/configs/microblaze-generic.h
@@ -182,9 +182,6 @@
/* size of console buffer */
#define CONFIG_SYS_CBSIZE 512
- /* print buffer size */
-#define CONFIG_SYS_PBSIZE \
- (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
/* max number of command args */
#define CONFIG_SYS_MAXARGS 15
#define CONFIG_SYS_LONGHELP
diff --git a/include/configs/mpc8308_p1m.h b/include/configs/mpc8308_p1m.h
index 755e05deda38ce296a771b27e4bee28ae676de21..33c08e8ad1de4be5cf91c709cc9b28517657b846 100644
--- a/include/configs/mpc8308_p1m.h
+++ b/include/configs/mpc8308_p1m.h
@@ -393,8 +393,6 @@
#define CONFIG_SYS_CBSIZE 1024 /* 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 */
/* Boot Argument Buffer Size */
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
diff --git a/include/configs/mpr2.h b/include/configs/mpr2.h
index 28da200f6e6ca64f1a887cd9b597927d7f4343bb..aa1b676cf9907aa9f0f0fc946dee9b919804da97 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_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 */
#define CONFIG_SYS_BAUDRATE_TABLE { 115200 } /* List of legal baudrate settings for this board */
diff --git a/include/configs/mv-common.h b/include/configs/mv-common.h
index 18003e1eba5f246824651ce51f9286c4179951ad..7c2bab2fc6eb8d4b2bb61c9641fcabb56b4b7df6 100644
--- a/include/configs/mv-common.h
+++ b/include/configs/mv-common.h
@@ -68,8 +68,6 @@
#define CONFIG_SETUP_MEMORY_TAGS 1 /* enable memory tag */
#define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buff Size */
-#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE \
- +sizeof(CONFIG_SYS_PROMPT) + 16) /* Print Buff */
/*
* Size of malloc() pool
diff --git a/include/configs/mvebu_armada-37xx.h b/include/configs/mvebu_armada-37xx.h
index 71975ed542480bb71c8e28a5bbfa57fd254406e5..af8adb7f8fc8a09d849d75ffb8dbc6868f4a3965 100644
--- a/include/configs/mvebu_armada-37xx.h
+++ b/include/configs/mvebu_armada-37xx.h
@@ -35,8 +35,6 @@
#define CONFIG_SETUP_MEMORY_TAGS /* enable memory tag */
#define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buff Size */
-#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE \
- +sizeof(CONFIG_SYS_PROMPT) + 16) /* Print Buff */
/*
* Size of malloc() pool
diff --git a/include/configs/mvebu_armada-8k.h b/include/configs/mvebu_armada-8k.h
index 633218cd940a08f662b9611f7deadd5a9ccf0dd6..a1123ed902744817fcf558930c571d8a37c95135 100644
--- a/include/configs/mvebu_armada-8k.h
+++ b/include/configs/mvebu_armada-8k.h
@@ -37,8 +37,6 @@
#define CONFIG_SETUP_MEMORY_TAGS /* enable memory tag */
#define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buff Size */
-#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE \
- +sizeof(CONFIG_SYS_PROMPT) + 16) /* Print Buff */
/*
* Size of malloc() pool
diff --git a/include/configs/mx25pdk.h b/include/configs/mx25pdk.h
index 8b472bf0f08d4d409dab621699641bc634ec5740..a010371e2fab88f8348326c0308d04b2af8b83a1 100644
--- a/include/configs/mx25pdk.h
+++ b/include/configs/mx25pdk.h
@@ -63,9 +63,6 @@
/* U-Boot general configuration */
#define CONFIG_AUTO_COMPLETE
#define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */
-/* Print buffer sz */
-#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \
- sizeof(CONFIG_SYS_PROMPT) + 16)
#define CONFIG_SYS_MAXARGS 16 /* max number of command args */
/* Boot Argument Buffer Size */
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
diff --git a/include/configs/mx31ads.h b/include/configs/mx31ads.h
index 61f069ea46ff9d96e199be86adf02289a565a3e9..77275a2d7a9dc3ef7c804583a7425354a8397d65 100644
--- a/include/configs/mx31ads.h
+++ b/include/configs/mx31ads.h
@@ -95,8 +95,6 @@
* Miscellaneous configurable options
*/
#define CONFIG_SYS_LONGHELP /* undef to save memory */
-/* 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 */
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE /* Boot Argument Buffer Size */
diff --git a/include/configs/mx53ard.h b/include/configs/mx53ard.h
index 50152a95b2ebfcab396307c8bd8ac148d8decc6f..2505783e391e4e35aab3a03cdef23970924ad9c3 100644
--- a/include/configs/mx53ard.h
+++ b/include/configs/mx53ard.h
@@ -162,8 +162,6 @@
#define CONFIG_SYS_LONGHELP /* undef to save memory */
#define CONFIG_AUTO_COMPLETE
-/* 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 */
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE /* Boot Argument Buffer Size */
diff --git a/include/configs/mx53evk.h b/include/configs/mx53evk.h
index 1b17673720efca00b162051b1a70cac21c8b4b5b..19fd1e52111fbcd96f8d36d5988affc802048ee6 100644
--- a/include/configs/mx53evk.h
+++ b/include/configs/mx53evk.h
@@ -109,8 +109,6 @@
#define CONFIG_SYS_LONGHELP /* undef to save memory */
#define CONFIG_AUTO_COMPLETE
-/* 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 */
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE /* Boot Argument Buffer Size */
diff --git a/include/configs/mx53smd.h b/include/configs/mx53smd.h
index 151935da4965d21c067d14a82081fc89f4ac4a24..66d7a4293f75f2a5ecb55b4e8c9fed4836b91989 100644
--- a/include/configs/mx53smd.h
+++ b/include/configs/mx53smd.h
@@ -101,8 +101,6 @@
#define CONFIG_SYS_LONGHELP /* undef to save memory */
#define CONFIG_AUTO_COMPLETE
-/* 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 */
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE /* Boot Argument Buffer Size */
diff --git a/include/configs/mx7ulp_evk.h b/include/configs/mx7ulp_evk.h
index 532f47ea4f3ab8988fe48e59be2e46d8760bda86..af39893ca4c83f4ed2d7f8d7f41082b3de8c400c 100644
--- a/include/configs/mx7ulp_evk.h
+++ b/include/configs/mx7ulp_evk.h
@@ -78,10 +78,8 @@
#define CONFIG_SYS_PROMPT "=> "
#define CONFIG_SYS_CBSIZE 512
-/* Print Buffer Size */
#define CONFIG_SYS_MAXARGS 256
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
-#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
#define CONFIG_CMDLINE_EDITING
diff --git a/include/configs/nokia_rx51.h b/include/configs/nokia_rx51.h
index 57a2c9037bc19b4b4504ca7db98e1ae649c7d098..d8435312686971104daaafdb1935dabcafadee24 100644
--- a/include/configs/nokia_rx51.h
+++ b/include/configs/nokia_rx51.h
@@ -331,9 +331,6 @@ int rx51_kp_getc(struct stdio_dev *sdev);
* Miscellaneous configurable options
*/
#define CONFIG_SYS_LONGHELP /* undef to save memory */
-/* 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 */
/* Boot Argument Buffer Size */
#define CONFIG_SYS_BARGSIZE (CONFIG_SYS_CBSIZE)
diff --git a/include/configs/nsim.h b/include/configs/nsim.h
index f6702410eba09f119e97a43f9375bf9a1aacd0a6..bba285c7d5b2034ad872d00a9061cb00fd2cd0e3 100644
--- a/include/configs/nsim.h
+++ b/include/configs/nsim.h
@@ -56,7 +56,5 @@
*/
#define CONFIG_SYS_LONGHELP
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
-#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \
- sizeof(CONFIG_SYS_PROMPT) + 16)
#endif /* _CONFIG_NSIM_H_ */
diff --git a/include/configs/omapl138_lcdk.h b/include/configs/omapl138_lcdk.h
index 0085559ef9f049292723c8c28dc267ca501a0b25..7d0ff2f84f3872d0a10e49d04d92e8e2d62c43c9 100644
--- a/include/configs/omapl138_lcdk.h
+++ b/include/configs/omapl138_lcdk.h
@@ -236,7 +236,6 @@
#define CONFIG_MISC_INIT_R
#define CONFIG_BOOTFILE "zImage" /* Boot file name */
#define CONFIG_SYS_CBSIZE 1024 /* 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 Args Buffer Size */
#define CONFIG_SYS_LOAD_ADDR (PHYS_SDRAM_1 + 0x700000)
diff --git a/include/configs/ot1200.h b/include/configs/ot1200.h
index d4fd722f9981a7b18bf8e30461c0229c23f7d443..55e716a22aa1bcaaad154421e170173dfbf0a2eb 100644
--- a/include/configs/ot1200.h
+++ b/include/configs/ot1200.h
@@ -95,9 +95,6 @@
/* Thermal support */
#define CONFIG_IMX_THERMAL
-/* Print Buffer Size */
-#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
-
/* Physical Memory Map */
#define CONFIG_NR_DRAM_BANKS 1
#define PHYS_SDRAM MMDC0_ARB_BASE_ADDR
diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h
index 6050ef54af206122bd5899dc565211b81c18a745..bf4dc396a8b346999ccb1aa7d6e39fe0c4d44079 100644
--- a/include/configs/p1_p2_rdb_pc.h
+++ b/include/configs/p1_p2_rdb_pc.h
@@ -825,8 +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 */
-#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/p1_twr.h b/include/configs/p1_twr.h
index 6cf2257d51e072b7abad0eee19fde82b3ea3fa71..cd0fc3d39ee7bd4a1d12c2b24425d8c6d91bc15b 100644
--- a/include/configs/p1_twr.h
+++ b/include/configs/p1_twr.h
@@ -397,8 +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 */
-#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/pb1x00.h b/include/configs/pb1x00.h
index ba9c99850c6fa95a115f3dad3e1a8bab72ecb826..ce5b7e2c25b701adc0e7a0fc5260e8b41a48e0e3 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_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_MALLOC_LEN 128*1024
diff --git a/include/configs/pcm052.h b/include/configs/pcm052.h
index b078d883f04e4b28ba2dcc6d848527031f180356..3ff6bab9c216bda17c92ff4057abc0e814cc260e 100644
--- a/include/configs/pcm052.h
+++ b/include/configs/pcm052.h
@@ -203,8 +203,6 @@
#define CONFIG_SYS_LONGHELP /* undef to save memory */
#define CONFIG_AUTO_COMPLETE
#define CONFIG_CMDLINE_EDITING
-#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
diff --git a/include/configs/pic32mzdask.h b/include/configs/pic32mzdask.h
index 57b265ce144ad4ce3a5a3fd527781bd9074d4802..31d90e51db642b78ca552edc7b66c40bb1d6634f 100644
--- a/include/configs/pic32mzdask.h
+++ b/include/configs/pic32mzdask.h
@@ -59,8 +59,6 @@
*/
#define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */
#define CONFIG_SYS_MAXARGS 16 /* max number of command args*/
-#define CONFIG_SYS_PBSIZE \
- (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
#define CONFIG_CMDLINE_EDITING 1
/*-----------------------------------------------------------------------
diff --git a/include/configs/picosam9g45.h b/include/configs/picosam9g45.h
index 2c9897794d24a7b531829609af2bb60134cc62ef..563b501db2dec913720a6e738f522924fae12e36 100644
--- a/include/configs/picosam9g45.h
+++ b/include/configs/picosam9g45.h
@@ -112,8 +112,6 @@
#endif
#define CONFIG_SYS_MAXARGS 16
-#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE \
- + sizeof(CONFIG_SYS_PROMPT) + 16)
#define CONFIG_SYS_LONGHELP
#define CONFIG_CMDLINE_EDITING
#define CONFIG_AUTO_COMPLETE
diff --git a/include/configs/platinum.h b/include/configs/platinum.h
index 4801cb22babd0f4d215c560dc28f05293473ec06..bb0e9294046011ce1c54b983a9c6c26951d30096 100644
--- a/include/configs/platinum.h
+++ b/include/configs/platinum.h
@@ -112,10 +112,6 @@
/* Miscellaneous configurable options */
#define CONFIG_PREBOOT
-/* Print Buffer Size */
-#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \
- sizeof(CONFIG_SYS_PROMPT) + 16)
-
/* MTD/UBI/UBIFS config */
#define CONFIG_MTD_DEVICE
#define CONFIG_MTD_PARTITIONS
diff --git a/include/configs/pm9261.h b/include/configs/pm9261.h
index 221dd74d9519ed96fd0d42eeeea29aeb85bb0c27..44750aa27071ff6c69b78071aad36d8a71ece0d1 100644
--- a/include/configs/pm9261.h
+++ b/include/configs/pm9261.h
@@ -279,8 +279,6 @@
#endif
#define CONFIG_SYS_MAXARGS 16
-#define CONFIG_SYS_PBSIZE \
- (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
#define CONFIG_SYS_LONGHELP 1
#define CONFIG_CMDLINE_EDITING 1
diff --git a/include/configs/pm9263.h b/include/configs/pm9263.h
index 7708122bc2ab82fbdeb97fe5383e9de202c448ed..52658b2d566c7143624283de8d496f4e7e93d8c4 100644
--- a/include/configs/pm9263.h
+++ b/include/configs/pm9263.h
@@ -310,8 +310,6 @@
#endif
#define CONFIG_SYS_MAXARGS 16
-#define CONFIG_SYS_PBSIZE \
- (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
#define CONFIG_SYS_LONGHELP 1
#define CONFIG_CMDLINE_EDITING 1
diff --git a/include/configs/pm9g45.h b/include/configs/pm9g45.h
index 6247ced2ccae5a24924fb5538b3754ba8f525909..a5fed7a270515c0ad9500348a1af30a91220ad8e 100644
--- a/include/configs/pm9g45.h
+++ b/include/configs/pm9g45.h
@@ -120,8 +120,6 @@
#define CONFIG_BOOTCOMMAND "nand read 0x72000000 0x200000 0x200000; bootm"
#define CONFIG_SYS_MAXARGS 16
-#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \
- sizeof(CONFIG_SYS_PROMPT) + 16)
#define CONFIG_SYS_LONGHELP 1
#define CONFIG_CMDLINE_EDITING 1
#define CONFIG_AUTO_COMPLETE
diff --git a/include/configs/poplar.h b/include/configs/poplar.h
index bb49ad155dcf5c6e949b902a7530c91625a13344..151ccb5018c8d9d139a373db1159ab270f876721 100644
--- a/include/configs/poplar.h
+++ b/include/configs/poplar.h
@@ -76,8 +76,6 @@
#define CONFIG_SYS_LONGHELP
#define CONFIG_SYS_CBSIZE 512
#define CONFIG_SYS_MAXARGS 64
-#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \
- sizeof(CONFIG_SYS_PROMPT) + 16)
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
#endif /* _POPLAR_H_ */
diff --git a/include/configs/qemu-mips.h b/include/configs/qemu-mips.h
index ee6853a2cee9c98a8c6cc46744e903dc2d2ca8ff..62a3ff0350acd3340f520e5507f7f4dcb9bdbe02 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
-/* Print Buffer Size */
-#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16)
/* max number of command args */
#define CONFIG_SYS_MAXARGS 16
diff --git a/include/configs/qemu-mips64.h b/include/configs/qemu-mips64.h
index b44b8233409da96b6aa77033e703c4a90cb48df8..f2928d06c0744340967abc2ac1b7fb4d11cbc59b 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
-/* Print Buffer Size */
-#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16)
/* max number of command args */
#define CONFIG_SYS_MAXARGS 16
diff --git a/include/configs/qemu-ppce500.h b/include/configs/qemu-ppce500.h
index 6f061b520f017adf9ec9ac847ffa167593410243..6554a9d98f0400f36c4352d18e393b124876d7e4 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_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 9e6b10a6d8325abf69b6486d99eb56438a817e15..1408fc95926bc682d6231c53ac4d6fa8092782d8 100644
--- a/include/configs/r0p7734.h
+++ b/include/configs/r0p7734.h
@@ -36,9 +36,6 @@
/* undef to save memory */
#define CONFIG_SYS_LONGHELP
-/* Monitor Command Prompt */
-/* Buffer size for Console output */
-#define CONFIG_SYS_PBSIZE 256
/* max args accepted for monitor commands */
#define CONFIG_SYS_MAXARGS 16
/* Buffer size for Boot Arguments passed to kernel */
diff --git a/include/configs/rcar-gen3-common.h b/include/configs/rcar-gen3-common.h
index 44d3e9c7269ebda0b7e6c0973ce988983aabeeeb..49b1b5ade4393cee0615018068ea3e163fd99743 100644
--- a/include/configs/rcar-gen3-common.h
+++ b/include/configs/rcar-gen3-common.h
@@ -39,8 +39,6 @@
/* console */
#define CONFIG_SYS_CBSIZE 2048
-#define CONFIG_SYS_PBSIZE \
- (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
#define CONFIG_SYS_LONGHELP
#define CONFIG_SYS_MAXARGS 64
diff --git a/include/configs/rpi.h b/include/configs/rpi.h
index 439bdbcd26a356583fc6d7c90e1d404394f962c5..3a956dbf0b48e2d5130b3fc35d9715e6a21b3d48 100644
--- a/include/configs/rpi.h
+++ b/include/configs/rpi.h
@@ -86,8 +86,6 @@
/* Console configuration */
#define CONFIG_SYS_CBSIZE 1024
-#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \
- sizeof(CONFIG_SYS_PROMPT) + 16)
/* Environment */
#define CONFIG_ENV_SIZE SZ_16K
diff --git a/include/configs/rsk7203.h b/include/configs/rsk7203.h
index c90d3f25cd27ed27a632903eadfcba157f61bcd1..6455886778153d9c93143812ecaedf8d70c83ea5 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_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 */
#define CONFIG_SYS_BARGSIZE 512
diff --git a/include/configs/s32v234evb.h b/include/configs/s32v234evb.h
index e1f2cb30d3f27d208d3ecc6c363123e6fcded459..a7405893bc08f23bb97b94760e4aa8d52c3a9989 100644
--- a/include/configs/s32v234evb.h
+++ b/include/configs/s32v234evb.h
@@ -164,8 +164,6 @@
#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
#define CONFIG_SYS_PROMPT "=> "
#undef CONFIG_AUTO_COMPLETE
-#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
#define CONFIG_CMDLINE_EDITING
diff --git a/include/configs/sandbox.h b/include/configs/sandbox.h
index 720a6ce5166aafdda4259d0f57e2131146f84b3e..18d1b6bea78cbf64c64a9c4139274e85156731b1 100644
--- a/include/configs/sandbox.h
+++ b/include/configs/sandbox.h
@@ -39,8 +39,6 @@
#define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */
#define CONFIG_DISPLAY_BOARDINFO_LATE
-/* Print Buffer Size */
-#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
#define CONFIG_SYS_MAXARGS 16
/* turn on command-line edit/c/auto */
diff --git a/include/configs/sbc8349.h b/include/configs/sbc8349.h
index 15393246af48cc172c7682c6cd002c53ebc720b4..61c16d88019bd7bac523a3750a9a6ab1c7428d2b 100644
--- a/include/configs/sbc8349.h
+++ b/include/configs/sbc8349.h
@@ -406,8 +406,6 @@
#define CONFIG_SYS_LONGHELP /* undef to save memory */
#define CONFIG_SYS_LOAD_ADDR 0x2000000 /* default load address */
- /* 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 */
/* Boot Argument Buffer Size */
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
diff --git a/include/configs/sbc8548.h b/include/configs/sbc8548.h
index 51d6d66d12a5c90f85317bd61b0eade63e04ad6f..2605c9aee6e11c0bdaaf3bdd21f95595d1ac24f2 100644
--- a/include/configs/sbc8548.h
+++ b/include/configs/sbc8548.h
@@ -515,7 +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 */
-#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 ddf1382be7c4b3d44f51c12a9a47c167d8a273f5..45e1ead33d1d391ef17e686d3a0ab1a889b2e207 100644
--- a/include/configs/sbc8641d.h
+++ b/include/configs/sbc8641d.h
@@ -459,7 +459,6 @@
#define CONFIG_SYS_LOAD_ADDR 0x2000000 /* default load address */
#define CONFIG_CMDLINE_EDITING 1 /* add command line history */
-#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/secomx6quq7.h b/include/configs/secomx6quq7.h
index c3a4961b0d83763e29245a007319edf3129a6e94..3fb7e5e7683b86a9d4de263c5783c5b99602bdb0 100644
--- a/include/configs/secomx6quq7.h
+++ b/include/configs/secomx6quq7.h
@@ -63,10 +63,6 @@
"stdout=serial\0" \
"stderr=serial\0"
-/* Print Buffer Size */
-#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \
- sizeof(CONFIG_SYS_PROMPT) + 16)
-
#define CONFIG_SYS_HZ 1000
/* Physical Memory Map */
diff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h
index 4ea3a0bd899c90ee41862701e9eae49e11eaf307..2314a2d2ef35473626ee7995874f3ad34ccad0b8 100644
--- a/include/configs/siemens-am33x-common.h
+++ b/include/configs/siemens-am33x-common.h
@@ -54,10 +54,6 @@
/* Console I/O Buffer Size */
#define CONFIG_SYS_CBSIZE 1024
-/* Print Buffer Size */
-#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE \
- + sizeof(CONFIG_SYS_PROMPT) + 16)
-
/* Boot Argument Buffer Size */
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
diff --git a/include/configs/smartweb.h b/include/configs/smartweb.h
index fe24b3a16088d03a36508fb10f508fe1cbcc3ae5..bf01cf791d5dd8f7c0d85f87799391f1a4fd82b1 100644
--- a/include/configs/smartweb.h
+++ b/include/configs/smartweb.h
@@ -166,8 +166,6 @@
/* General Boot Parameter */
#define CONFIG_BOOTCOMMAND "run flashboot"
#define CONFIG_SYS_CBSIZE 512
-#define CONFIG_SYS_PBSIZE \
- (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
#define CONFIG_SYS_LONGHELP
#define CONFIG_CMDLINE_EDITING
diff --git a/include/configs/snapper9260.h b/include/configs/snapper9260.h
index 88b95816b3b76a88fc5b1072c96cb7609e5cabc3..c4b2f53cade15ad688cbd46a5c122d61fd9e2271 100644
--- a/include/configs/snapper9260.h
+++ b/include/configs/snapper9260.h
@@ -125,8 +125,6 @@
/* Console settings */
#define CONFIG_SYS_MAXARGS 16
-#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \
- sizeof(CONFIG_SYS_PROMPT) + 16)
#define CONFIG_SYS_LONGHELP
#define CONFIG_CMDLINE_EDITING
#define CONFIG_AUTO_COMPLETE
diff --git a/include/configs/snapper9g45.h b/include/configs/snapper9g45.h
index e5694bd0cb8618fa71e49062549f268a43ca159b..6f2ac38caf4bb079ab00f7b25cd6f896d4a2d3d8 100644
--- a/include/configs/snapper9g45.h
+++ b/include/configs/snapper9g45.h
@@ -111,8 +111,6 @@
/* Console settings */
#define CONFIG_SYS_MAXARGS 16
-#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \
- sizeof(CONFIG_SYS_PROMPT) + 16)
#define CONFIG_SYS_LONGHELP
#define CONFIG_CMDLINE_EDITING
#define CONFIG_AUTO_COMPLETE
diff --git a/include/configs/sniper.h b/include/configs/sniper.h
index 54c312f7d29db7a3b101fcfb7db58b3360518e73..785df25b5a8d001778dc2a832e95445f2774b0ae 100644
--- a/include/configs/sniper.h
+++ b/include/configs/sniper.h
@@ -94,8 +94,6 @@
#define CONFIG_SYS_MAXARGS 16
#define CONFIG_SYS_CBSIZE 512
-#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) \
- + 16)
/*
* Serial
diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h
index 73a9744176085933ee6e1d1d7bfd8091a4d35522..9897e11b5913461c4ced0d99e4b495249da98099 100644
--- a/include/configs/socfpga_common.h
+++ b/include/configs/socfpga_common.h
@@ -54,8 +54,6 @@
*/
#define CONFIG_SYS_LONGHELP
#define CONFIG_SYS_CBSIZE 1024 /* Console I/O buffer size */
-#define CONFIG_SYS_PBSIZE \
- (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
/* Print buffer size */
#define CONFIG_SYS_MAXARGS 32 /* Max number of command args */
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
diff --git a/include/configs/socrates.h b/include/configs/socrates.h
index 3c3f0424286edac9443bdf46039c5284d8cb78ee..eb2cacd094b696af4cd2667e4544a924cc66db98 100644
--- a/include/configs/socrates.h
+++ b/include/configs/socrates.h
@@ -281,7 +281,6 @@
#define CONFIG_SYS_LONGHELP /* undef to save memory */
#define CONFIG_SYS_LOAD_ADDR 0x2000000 /* default load address */
-#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 09251f6b257628c215902d7eba1b0c7dd1cdb629..d149d4d50453a4183a7310c7c67c560a2bb36858 100644
--- a/include/configs/spear-common.h
+++ b/include/configs/spear-common.h
@@ -168,8 +168,6 @@
#define CONFIG_SYS_MALLOC_LEN (1024*1024)
#define CONFIG_SYS_LONGHELP
#define CONFIG_CMDLINE_EDITING
-#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \
- sizeof(CONFIG_SYS_PROMPT) + 16)
#define CONFIG_SYS_MAXARGS 16
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
#define CONFIG_SYS_LOAD_ADDR 0x00800000
diff --git a/include/configs/stm32f429-discovery.h b/include/configs/stm32f429-discovery.h
index eab79b329bfe004defe73a293a9fc44f87d27fdc..52a752916efed8bdc7b58d93ff820b8d3e2c5d68 100644
--- a/include/configs/stm32f429-discovery.h
+++ b/include/configs/stm32f429-discovery.h
@@ -58,8 +58,6 @@
#define CONFIG_REVISION_TAG
#define CONFIG_SYS_CBSIZE 1024
-#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE \
- + sizeof(CONFIG_SYS_PROMPT) + 16)
#define CONFIG_SYS_MAXARGS 16
diff --git a/include/configs/stm32f746-disco.h b/include/configs/stm32f746-disco.h
index 470722d693bd270bb35ec7afb80392db466113a8..ec0c2a65707b696eaf7b343b1d15862095be3a20 100644
--- a/include/configs/stm32f746-disco.h
+++ b/include/configs/stm32f746-disco.h
@@ -47,8 +47,6 @@
#define CONFIG_REVISION_TAG
#define CONFIG_SYS_CBSIZE 1024
-#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE \
- + sizeof(CONFIG_SYS_PROMPT) + 16)
#define CONFIG_SYS_MAXARGS 16
#define CONFIG_SYS_MALLOC_LEN (1 * 1024 * 1024)
diff --git a/include/configs/strider.h b/include/configs/strider.h
index c6cb51c36b99a2a16402270f767878f29c743b51..582c74b33043c9e132e83fa27cddd24805a47b66 100644
--- a/include/configs/strider.h
+++ b/include/configs/strider.h
@@ -556,8 +556,6 @@ void fpga_control_clear(unsigned int bus, int pin);
#define CONFIG_SYS_CBSIZE 1024 /* 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 */
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
diff --git a/include/configs/stv0991.h b/include/configs/stv0991.h
index 3b5831d46e6a657b90d2123925b68803f5ba8857..0adab5b599ebd2bfa19ebc19388a551ed7f89707 100644
--- a/include/configs/stv0991.h
+++ b/include/configs/stv0991.h
@@ -31,8 +31,6 @@
/* user interface */
#define CONFIG_SYS_CBSIZE 1024
-#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE \
- +sizeof(CONFIG_SYS_PROMPT) + 16)
/* MISC */
#define CONFIG_SYS_LOAD_ADDR 0x00000000
diff --git a/include/configs/t4qds.h b/include/configs/t4qds.h
index 6ef5605b3797e3fd4de46b460a3a62ccbcc5902d..c68041e1a275c4afb104413052ceeedc25200b70 100644
--- a/include/configs/t4qds.h
+++ b/include/configs/t4qds.h
@@ -245,7 +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 */
-#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/tam3517-common.h b/include/configs/tam3517-common.h
index 433625105a5050a0c57443b0cf75984431593c0e..e4c446487293aaaf91a0edd1d7a23af2b70c132b 100644
--- a/include/configs/tam3517-common.h
+++ b/include/configs/tam3517-common.h
@@ -95,9 +95,6 @@
#define CONFIG_AUTO_COMPLETE
#define CONFIG_SYS_CBSIZE 512 /* Console I/O Buffer Size */
-/* Print Buffer Size */
-#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \
- sizeof(CONFIG_SYS_PROMPT) + 16)
#define CONFIG_SYS_MAXARGS 32 /* max number of command */
/* args */
/* Boot Argument Buffer Size */
diff --git a/include/configs/tao3530.h b/include/configs/tao3530.h
index b3a519b3416709bb040cbdc9eccfbefa293a7b4e..1e5548bfb917f8a037aee0340bfa434a51b7c56c 100644
--- a/include/configs/tao3530.h
+++ b/include/configs/tao3530.h
@@ -153,9 +153,6 @@
#define CONFIG_CMDLINE_EDITING
#define CONFIG_AUTO_COMPLETE
-/* 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 */
/* Boot Argument Buffer Size */
#define CONFIG_SYS_BARGSIZE (CONFIG_SYS_CBSIZE)
diff --git a/include/configs/taurus.h b/include/configs/taurus.h
index f479cad29873ad0dc4c285e774ead25fbde0e7af..d88aa4bcda8cb33863c4d38e67a96ab27fcb0a35 100644
--- a/include/configs/taurus.h
+++ b/include/configs/taurus.h
@@ -144,8 +144,6 @@
#define CONFIG_BOOTCOMMAND "nand read 0x22000000 0x200000 0x300000; bootm"
#define CONFIG_SYS_MAXARGS 16
-#define CONFIG_SYS_PBSIZE \
- (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
#define CONFIG_SYS_LONGHELP
#define CONFIG_CMDLINE_EDITING
#define CONFIG_AUTO_COMPLETE
diff --git a/include/configs/tb100.h b/include/configs/tb100.h
index 699c18ae3b33e618029846855518e22a461b8c80..9b4c7a9a358ab0c6f09798966e49d90a57165d3e 100644
--- a/include/configs/tb100.h
+++ b/include/configs/tb100.h
@@ -74,7 +74,5 @@
*/
#define CONFIG_SYS_LONGHELP
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
-#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \
- sizeof(CONFIG_SYS_PROMPT) + 16)
#endif /* _CONFIG_TB100_H_ */
diff --git a/include/configs/tegra-common.h b/include/configs/tegra-common.h
index 723435e0ae2cc1f31afa1ff266af4d1ab783a77a..e2225cd812effd2f5bd113e193827d995421313b 100644
--- a/include/configs/tegra-common.h
+++ b/include/configs/tegra-common.h
@@ -59,8 +59,6 @@
*/
#define CONFIG_SYS_CBSIZE (1024 * 2) /* Console I/O Buffer Size */
/* Print Buffer Size */
-#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \
- sizeof(CONFIG_SYS_PROMPT) + 16)
#define CONFIG_SYS_MAXARGS 64 /* max number of command args */
/* Boot Argument Buffer Size */
diff --git a/include/configs/thunderx_88xx.h b/include/configs/thunderx_88xx.h
index f2d0d22ad3d204fb0c1eb3bb3f3fa3e38ab443fc..54aee474f19fa46983f5c282a99c992a2a05e209 100644
--- a/include/configs/thunderx_88xx.h
+++ b/include/configs/thunderx_88xx.h
@@ -74,8 +74,6 @@
/* Monitor Command Prompt */
#define CONFIG_SYS_CBSIZE 512 /* Console I/O Buffer Size */
-#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \
- sizeof(CONFIG_SYS_PROMPT) + 16)
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
#define CONFIG_SYS_LONGHELP
#define CONFIG_CMDLINE_EDITING 1
diff --git a/include/configs/ti814x_evm.h b/include/configs/ti814x_evm.h
index 129ae4c4665658fb1c9aa2549f8b970ee8784409..e31c9b40e0451d89e2653b5c7cd2511179136c91 100644
--- a/include/configs/ti814x_evm.h
+++ b/include/configs/ti814x_evm.h
@@ -93,10 +93,6 @@
/* Console I/O Buffer Size */
#define CONFIG_SYS_CBSIZE 512
-/* Print Buffer Size */
-#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE \
- + sizeof(CONFIG_SYS_PROMPT) + 16)
-
/* Boot Argument Buffer Size */
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
diff --git a/include/configs/ti_armv7_common.h b/include/configs/ti_armv7_common.h
index ac3eb5d729a7b08b4d64844d5010137245f16110..91e139853c6a0dd6cb5e340f39b7c4bce284d8c0 100644
--- a/include/configs/ti_armv7_common.h
+++ b/include/configs/ti_armv7_common.h
@@ -126,9 +126,6 @@
/* Console I/O Buffer Size */
#define CONFIG_SYS_CBSIZE 1024
-/* Print Buffer Size */
-#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE \
- + sizeof(CONFIG_SYS_PROMPT) + 16)
/* Boot Argument Buffer Size */
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
diff --git a/include/configs/titanium.h b/include/configs/titanium.h
index 3fb63f30146d38d4aed974d9b2fd3c8011766171..882b1d7f5f0ad75c127585f007296796a7b56266 100644
--- a/include/configs/titanium.h
+++ b/include/configs/titanium.h
@@ -128,10 +128,6 @@
#define CONFIG_BOOTCOMMAND "run nand_ubifs"
-/* Print Buffer Size */
-#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \
- sizeof(CONFIG_SYS_PROMPT) + 16)
-
/* Physical Memory Map */
#define CONFIG_NR_DRAM_BANKS 1
#define PHYS_SDRAM MMDC0_ARB_BASE_ADDR
diff --git a/include/configs/tricorder.h b/include/configs/tricorder.h
index 3820096d78a695a557ab374b7c5d456f36ba26a7..dd33030df3e99960f25cb2c3093d8d2cb21d492e 100644
--- a/include/configs/tricorder.h
+++ b/include/configs/tricorder.h
@@ -210,9 +210,6 @@
#define CONFIG_CMDLINE_EDITING /* enable cmdline history */
#define CONFIG_AUTO_COMPLETE
#define CONFIG_SYS_CBSIZE 512 /* 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 */
/* Boot Argument Buffer Size */
diff --git a/include/configs/ts4800.h b/include/configs/ts4800.h
index 14cf26b386c8c209259b974b6bc2d845d567bef7..d9b07958fd2708f34cbcf3f7209753fce6def004 100644
--- a/include/configs/ts4800.h
+++ b/include/configs/ts4800.h
@@ -122,8 +122,6 @@
*/
#define CONFIG_SYS_LONGHELP /* undef to save memory */
#define CONFIG_AUTO_COMPLETE
-/* 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 */
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE /* Boot Argument Buffer Size */
diff --git a/include/configs/udoo.h b/include/configs/udoo.h
index 26a1a6f9b348307c2cb49d1f4039d80e602978f9..bcce41db8a4caddf1a66cc0ad9d3db3c3824c3b0 100644
--- a/include/configs/udoo.h
+++ b/include/configs/udoo.h
@@ -146,9 +146,6 @@
"fi; " \
"else run netboot; fi"
-/* Print Buffer Size */
-#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
-
/* Physical Memory Map */
#define CONFIG_NR_DRAM_BANKS 1
#define PHYS_SDRAM MMDC0_ARB_BASE_ADDR
diff --git a/include/configs/uniphier.h b/include/configs/uniphier.h
index bfce4e5b1b87a9687a5df81c06cc5c10c1b20226..88223d9bf2ff5f08fef7b996992dff33b12236c3 100644
--- a/include/configs/uniphier.h
+++ b/include/configs/uniphier.h
@@ -60,8 +60,6 @@
#define CONFIG_CMDLINE_EDITING /* add command line history */
#define CONFIG_SYS_CBSIZE 1024 /* 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 */
/* Boot Argument Buffer Size */
#define CONFIG_SYS_BARGSIZE (CONFIG_SYS_CBSIZE)
diff --git a/include/configs/usb_a9263.h b/include/configs/usb_a9263.h
index 787f0ac3621dbeb6cd0aebe742d2cfb4e816c792..5a4945f6445e8c5bfe6ac73ee93d2f294bfa4868 100644
--- a/include/configs/usb_a9263.h
+++ b/include/configs/usb_a9263.h
@@ -99,8 +99,6 @@
"mtdparts=" MTDPARTS_DEFAULT "\0" \
#define CONFIG_SYS_MAXARGS 16
-#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \
- sizeof(CONFIG_SYS_PROMPT) + 16)
#define CONFIG_CMDLINE_EDITING
#define CONFIG_AUTO_COMPLETE
#define CONFIG_SYS_LONGHELP
diff --git a/include/configs/usbarmory.h b/include/configs/usbarmory.h
index 95e232429f714d44eba4ecb23f32c297b88ecab2..595221698855ce38d9daf956ae9ee4af7be5355f 100644
--- a/include/configs/usbarmory.h
+++ b/include/configs/usbarmory.h
@@ -25,7 +25,6 @@
/* U-Boot general configurations */
#define CONFIG_SYS_CBSIZE 512
-#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/vct.h b/include/configs/vct.h
index e7c3d4b589fdf2bc5cc920e18485bb3e3a8e9938..e01bc03e362ce5949ed20ec5ac59e35fe63bfaa7 100644
--- a/include/configs/vct.h
+++ b/include/configs/vct.h
@@ -119,8 +119,6 @@
*/
#define CONFIG_SYS_LONGHELP /* undef to save memory */
#define CONFIG_SYS_CBSIZE 512 /* 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_TIMESTAMP /* Print image info with timestamp */
#define CONFIG_CMDLINE_EDITING /* add command line history */
diff --git a/include/configs/ve8313.h b/include/configs/ve8313.h
index 38c67cd10998943776b3f598e71aa3a3a7c92451..5ba7dc433b5ccfd1a7616701a02589c8c708c41f 100644
--- a/include/configs/ve8313.h
+++ b/include/configs/ve8313.h
@@ -323,7 +323,6 @@
#define CONFIG_SYS_LOAD_ADDR 0x100000 /* default load address */
#define CONFIG_SYS_CBSIZE 1024 /* 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 cmd args */
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE /* Boot arg Buffer size */
diff --git a/include/configs/vexpress_aemv8a.h b/include/configs/vexpress_aemv8a.h
index c06f19d5a585e914fbe806ab616e5e3378d555e2..037639e35e32865c8abb5c7e71c1e6069e811242 100644
--- a/include/configs/vexpress_aemv8a.h
+++ b/include/configs/vexpress_aemv8a.h
@@ -230,8 +230,6 @@
/* Monitor Command Prompt */
#define CONFIG_SYS_CBSIZE 512 /* Console I/O Buffer Size */
-#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \
- sizeof(CONFIG_SYS_PROMPT) + 16)
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
#define CONFIG_SYS_LONGHELP
#define CONFIG_CMDLINE_EDITING
diff --git a/include/configs/vexpress_common.h b/include/configs/vexpress_common.h
index 8f9ba91641d39d7e1c5b61b5e7bdcde7631072a3..cbaae91b1e646f89b6f555fbccf9a055c25ed099 100644
--- a/include/configs/vexpress_common.h
+++ b/include/configs/vexpress_common.h
@@ -273,9 +273,6 @@
/* Monitor Command Prompt */
#define CONFIG_SYS_CBSIZE 512 /* Console I/O Buffer Size */
-#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \
- sizeof(CONFIG_SYS_PROMPT) + 16)
-
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE /* Boot args buffer */
#define CONFIG_SYS_LONGHELP
#define CONFIG_SYS_MAXARGS 16 /* max command args */
diff --git a/include/configs/vf610twr.h b/include/configs/vf610twr.h
index df445d2d36a73a44f31571ba54a4a15f577af6e0..809777fc747cb7e07783715c973fd58c069d66ad 100644
--- a/include/configs/vf610twr.h
+++ b/include/configs/vf610twr.h
@@ -189,8 +189,6 @@
/* Miscellaneous configurable options */
#define CONFIG_SYS_LONGHELP /* undef to save memory */
#undef CONFIG_AUTO_COMPLETE
-#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
diff --git a/include/configs/vme8349.h b/include/configs/vme8349.h
index 693f7704a65edbafac9766df8c652b6ee39d384f..b28a7ca5a08d09fed519ab4f1dc0804780247113 100644
--- a/include/configs/vme8349.h
+++ b/include/configs/vme8349.h
@@ -355,7 +355,6 @@
#define CONFIG_SYS_LONGHELP /* undef to save memory */
#define CONFIG_SYS_LOAD_ADDR 0x2000000 /* default load address */
-#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 f680df1f815a6a9201ba191edc379cebbdfc01c5..4294e0b120b9c1803c31cdc0ac62a772ea4d6c39 100644
--- a/include/configs/woodburn_common.h
+++ b/include/configs/woodburn_common.h
@@ -102,8 +102,6 @@
#define CONFIG_CMDLINE_EDITING
#define CONFIG_AUTO_COMPLETE
-/* 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 */
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE /* Boot Argument Buffer Size */
diff --git a/include/configs/work_92105.h b/include/configs/work_92105.h
index 628797d2c58dab4ae2acf480e168d8828a8666e8..ce8c2277010c0616b682395a4d622dad73c8c4be 100644
--- a/include/configs/work_92105.h
+++ b/include/configs/work_92105.h
@@ -87,8 +87,6 @@
*/
#define CONFIG_SYS_LONGHELP
#define CONFIG_SYS_CBSIZE 1024
-#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/x600.h b/include/configs/x600.h
index 7b750a0d6fffaf2d1fdca53bff1b36498e375aa2..1953a9c12b7cf5ac8c75eceb26db07e56895f187 100644
--- a/include/configs/x600.h
+++ b/include/configs/x600.h
@@ -125,8 +125,6 @@
#define CONFIG_SYS_LONGHELP
#define CONFIG_CMDLINE_EDITING
#define CONFIG_AUTO_COMPLETE
-#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \
- sizeof(CONFIG_SYS_PROMPT) + 16)
#define CONFIG_SYS_MAXARGS 16
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
#define CONFIG_SYS_LOAD_ADDR 0x00800000
diff --git a/include/configs/x86-common.h b/include/configs/x86-common.h
index fd953258b862b0151abc5c348126541e32c2a335..53d1c11af46a72d5ed8ecdc2446b13b07459f0ae 100644
--- a/include/configs/x86-common.h
+++ b/include/configs/x86-common.h
@@ -79,9 +79,6 @@
*/
#define CONFIG_SYS_LONGHELP
#define CONFIG_SYS_CBSIZE 512
-#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/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h
index b382d84451ca8c8595db561d99f3cdade0e14fbc..6025706964a3a255b483200ef7689782f6365539 100644
--- a/include/configs/xilinx_zynqmp.h
+++ b/include/configs/xilinx_zynqmp.h
@@ -125,8 +125,6 @@
/* Monitor Command Prompt */
/* Console I/O Buffer Size */
#define CONFIG_SYS_CBSIZE 2048
-#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \
- sizeof(CONFIG_SYS_PROMPT) + 16)
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
#define CONFIG_SYS_LONGHELP
#define CONFIG_CMDLINE_EDITING
diff --git a/include/configs/xpedite517x.h b/include/configs/xpedite517x.h
index 09c09d115735362a6c54b52a265e9c776ae1b409..d9800e6afd0d904423aee1f53d212f3bef8ccd77 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_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 */
#define CONFIG_CMDLINE_EDITING 1 /* Command-line editing */
diff --git a/include/configs/xpedite520x.h b/include/configs/xpedite520x.h
index 76c24a4d7e755dcf85d5b8a152824cd4e894a075..e860d697f2c0d7f09f7b2d92d844e6e803d3f924 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_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 */
#define CONFIG_CMDLINE_EDITING 1 /* add command line history */
diff --git a/include/configs/xpedite537x.h b/include/configs/xpedite537x.h
index 2657e81686fe21cf848a6cf94837de8e9ea7f09f..d3a4b3b5b7356c70f89a941583954ce739d1f6e5 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_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 */
#define CONFIG_CMDLINE_EDITING 1 /* add command line history */
diff --git a/include/configs/xpedite550x.h b/include/configs/xpedite550x.h
index b4546d0215be3626872279aee1ea48d651ad9413..97669f324d9993f9d1fd5902beee5e723d5833f8 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_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 */
#define CONFIG_CMDLINE_EDITING 1 /* add command line history */
diff --git a/include/configs/xtfpga.h b/include/configs/xtfpga.h
index df983d9f1e5ae7167d1357c3a154c07f15b058cc..4ac3158f816d4a27b71367437abbb05554d9a1c1 100644
--- a/include/configs/xtfpga.h
+++ b/include/configs/xtfpga.h
@@ -115,9 +115,6 @@
#define CONFIG_BOOTFILE "uImage"
/* Console I/O Buffer Size */
#define CONFIG_SYS_CBSIZE 1024
- /* Prt buf */
-#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \
- sizeof(CONFIG_SYS_PROMPT) + 16)
/* max number of command args */
#define CONFIG_SYS_MAXARGS 16
/* Boot Argument Buffer Size */
diff --git a/include/configs/zipitz2.h b/include/configs/zipitz2.h
index 87f3a4c336a934edaa8b0a119a3da7e5dc7f3696..b4577a73acea2ebe8103dfb7114fc2593ef145f8 100644
--- a/include/configs/zipitz2.h
+++ b/include/configs/zipitz2.h
@@ -80,7 +80,7 @@ unsigned char zipitz2_spi_read(void);
#endif
#define CONFIG_SYS_LONGHELP /* undef to save memory */
-#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 */
#define CONFIG_SYS_DEVICE_NULLDEV 1
diff --git a/include/configs/zmx25.h b/include/configs/zmx25.h
index 463f0deb513768630069426ca7a6eb9909ffd714..204cd300266fc1e94928ba0a8aa97b60de064f31 100644
--- a/include/configs/zmx25.h
+++ b/include/configs/zmx25.h
@@ -118,8 +118,6 @@
#define CONFIG_SYS_MEMTEST_END (PHYS_SDRAM + PHYS_SDRAM_SIZE)
#define CONFIG_SYS_MAXARGS 16
-#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \
- sizeof(CONFIG_SYS_PROMPT) + 16)
#define CONFIG_SYS_LONGHELP
#define CONFIG_CMDLINE_EDITING
diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h
index cea07e2c54ffd766f8e7d2af983c424c5a7d4adb..b9599c73a673d51e6c2b5bfc1bad5ba64ef21bf1 100644
--- a/include/configs/zynq-common.h
+++ b/include/configs/zynq-common.h
@@ -276,8 +276,6 @@
#define CONFIG_SYS_LONGHELP
#define CONFIG_CLOCKS
#define CONFIG_SYS_MAXARGS 32 /* max number of command args */
-#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \
- sizeof(CONFIG_SYS_PROMPT) + 16)
#ifndef CONFIG_NR_DRAM_BANKS
# define CONFIG_NR_DRAM_BANKS 1