[U-Boot] [PATCH 4/8] include/configs: drop default definitions of CONFIG_SYS_PBSIZE

Thomas Petazzoni
2017-08-23T20:59:02Z

Now that the fallback value of CONFIG_SYS_PBSIZE in
include/config_fallbacks.h has been adjusted, remove its definition
from a large number of board configuration files.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
include/configs/10m50_devboard.h | 3 ---
include/configs/3c120_devboard.h | 3 ---
include/configs/B4860QDS.h | 1 -
include/configs/BSC9131RDB.h | 2 --
include/configs/BSC9132QDS.h | 2 --
include/configs/C29XPCIE.h | 2 --
include/configs/M5208EVBE.h | 1 -
include/configs/M52277EVB.h | 1 -
include/configs/M5235EVB.h | 1 -
include/configs/M5249EVB.h | 1 -
include/configs/M5253DEMO.h | 1 -
include/configs/M5253EVBE.h | 1 -
include/configs/M5272C3.h | 1 -
include/configs/M5275EVB.h | 1 -
include/configs/M5282EVB.h | 1 -
include/configs/M53017EVB.h | 1 -
include/configs/M5329EVB.h | 1 -
include/configs/M5373EVB.h | 1 -
include/configs/M54418TWR.h | 3 ---
include/configs/M54451EVB.h | 1 -
include/configs/M54455EVB.h | 1 -
include/configs/M5475EVB.h | 1 -
include/configs/M5485EVB.h | 1 -
include/configs/MCR3000.h | 1 -
include/configs/MPC8308RDB.h | 2 --
include/configs/MPC8313ERDB.h | 3 ---
include/configs/MPC8315ERDB.h | 2 --
include/configs/MPC8323ERDB.h | 2 --
include/configs/MPC832XEMDS.h | 2 --
include/configs/MPC8349EMDS.h | 2 --
include/configs/MPC8349ITX.h | 2 --
include/configs/MPC837XEMDS.h | 2 --
include/configs/MPC837XERDB.h | 2 --
include/configs/MPC8536DS.h | 2 --
include/configs/MPC8540ADS.h | 1 -
include/configs/MPC8541CDS.h | 1 -
include/configs/MPC8544DS.h | 1 -
include/configs/MPC8548CDS.h | 1 -
include/configs/MPC8555CDS.h | 1 -
include/configs/MPC8560ADS.h | 1 -
include/configs/MPC8568MDS.h | 1 -
include/configs/MPC8569MDS.h | 2 --
include/configs/MPC8572DS.h | 1 -
include/configs/MPC8610HPCD.h | 1 -
include/configs/MPC8641HPCN.h | 1 -
include/configs/P1010RDB.h | 2 --
include/configs/P1022DS.h | 2 --
include/configs/P1023RDB.h | 2 --
include/configs/P2041RDB.h | 3 ---
include/configs/T102xQDS.h | 1 -
include/configs/T102xRDB.h | 1 -
include/configs/T1040QDS.h | 1 -
include/configs/T104xRDB.h | 1 -
include/configs/T208xQDS.h | 1 -
include/configs/T208xRDB.h | 1 -
include/configs/T4240RDB.h | 1 -
include/configs/TQM834x.h | 2 --
include/configs/UCP1020.h | 2 --
include/configs/adp-ae3xx.h | 4 ----
include/configs/adp-ag101p.h | 4 ----
include/configs/advantech_dms-ba16.h | 2 --
include/configs/am3517_crane.h | 3 ---
include/configs/am3517_evm.h | 3 ---
include/configs/amcore.h | 3 ---
include/configs/ap121.h | 2 --
include/configs/ap143.h | 2 --
include/configs/apalis-tk1.h | 3 ---
include/configs/apalis_t30.h | 3 ---
include/configs/apf27.h | 3 ---
include/configs/aristainetos-common.h | 3 ---
include/configs/aspeed-common.h | 3 ---
include/configs/astro_mcf5373l.h | 1 -
include/configs/at91rm9200ek.h | 3 ---
include/configs/axs10x.h | 2 --
include/configs/bcm23550_w1d.h | 2 --
include/configs/bcm28155_ap.h | 2 --
include/configs/bcm_ep_board.h | 2 --
include/configs/bcm_northstar2.h | 2 --
include/configs/boston.h | 2 --
include/configs/bur_cfg_common.h | 3 ---
include/configs/calimain.h | 1 -
include/configs/cm_fx6.h | 4 ----
include/configs/cm_t35.h | 3 ---
include/configs/cm_t3517.h | 3 ---
include/configs/cobra5272.h | 1 -
include/configs/colibri_pxa270.h | 2 --
include/configs/colibri_t20.h | 3 ---
include/configs/colibri_t30.h | 3 ---
include/configs/colibri_vf.h | 2 --
include/configs/controlcenterd.h | 2 --
include/configs/corenet_ds.h | 1 -
include/configs/corvus.h | 2 --
include/configs/cyrus.h | 1 -
include/configs/da850evm.h | 1 -
include/configs/dbau1x00.h | 1 -
include/configs/devkit3250.h | 2 --
include/configs/dragonboard410c.h | 2 --
include/configs/ea20.h | 1 -
include/configs/eb_cpu5282.h | 1 -
include/configs/edb93xx.h | 2 --
include/configs/edison.h | 1 -
include/configs/edminiv2.h | 2 --
include/configs/embestmx6boards.h | 3 ---
include/configs/ethernut5.h | 2 --
include/configs/ge_bx50v3.h | 2 --
include/configs/gw_ventana.h | 3 ---
include/configs/h2200.h | 4 ----
include/configs/highbank.h | 3 ---
include/configs/hikey.h | 2 --
include/configs/hrcon.h | 2 --
include/configs/hsdk.h | 2 --
include/configs/ids8313.h | 2 --
include/configs/imx27lite-common.h | 3 ---
include/configs/imx31_phycore.h | 3 ---
include/configs/integrator-common.h | 1 -
include/configs/ipam390.h | 1 -
include/configs/kc1.h | 2 --
include/configs/km/keymile-common.h | 1 -
include/configs/legoev3.h | 1 -
include/configs/ls1012a_common.h | 2 --
include/configs/ls1021aiot.h | 2 --
include/configs/ls1021aqds.h | 2 --
include/configs/ls1021atwr.h | 2 --
include/configs/ls1043a_common.h | 2 --
include/configs/ls1043aqds.h | 2 --
include/configs/ls1046a_common.h | 2 --
include/configs/ls1046aqds.h | 2 --
include/configs/ls2080a_common.h | 2 --
include/configs/m53evk.h | 3 ---
include/configs/malta.h | 2 --
include/configs/mcx.h | 3 ---
include/configs/meesc.h | 2 --
include/configs/meson-gxbb-common.h | 4 ----
include/configs/microblaze-generic.h | 3 ---
include/configs/mpc8308_p1m.h | 2 --
include/configs/mpr2.h | 1 -
include/configs/mv-common.h | 2 --
include/configs/mvebu_armada-37xx.h | 2 --
include/configs/mvebu_armada-8k.h | 2 --
include/configs/mx25pdk.h | 3 ---
include/configs/mx31ads.h | 2 --
include/configs/mx53ard.h | 2 --
include/configs/mx53evk.h | 2 --
include/configs/mx53smd.h | 2 --
include/configs/mx7ulp_evk.h | 2 --
include/configs/nokia_rx51.h | 3 ---
include/configs/nsim.h | 2 --
include/configs/omapl138_lcdk.h | 1 -
include/configs/ot1200.h | 3 ---
include/configs/p1_p2_rdb_pc.h | 2 --
include/configs/p1_twr.h | 2 --
include/configs/pb1x00.h | 1 -
include/configs/pcm052.h | 2 --
include/configs/pic32mzdask.h | 2 --
include/configs/picosam9g45.h | 2 --
include/configs/platinum.h | 4 ----
include/configs/pm9261.h | 2 --
include/configs/pm9263.h | 2 --
include/configs/pm9g45.h | 2 --
include/configs/poplar.h | 2 --
include/configs/qemu-mips.h | 2 --
include/configs/qemu-mips64.h | 2 --
include/configs/qemu-ppce500.h | 1 -
include/configs/r0p7734.h | 3 ---
include/configs/rcar-gen3-common.h | 2 --
include/configs/rpi.h | 2 --
include/configs/rsk7203.h | 1 -
include/configs/s32v234evb.h | 2 --
include/configs/sandbox.h | 2 --
include/configs/sbc8349.h | 2 --
include/configs/sbc8548.h | 1 -
include/configs/sbc8641d.h | 1 -
include/configs/secomx6quq7.h | 4 ----
include/configs/siemens-am33x-common.h | 4 ----
include/configs/smartweb.h | 2 --
include/configs/snapper9260.h | 2 --
include/configs/snapper9g45.h | 2 --
include/configs/sniper.h | 2 --
include/configs/socfpga_common.h | 2 --
include/configs/socrates.h | 1 -
include/configs/spear-common.h | 2 --
include/configs/stm32f429-discovery.h | 2 --
include/configs/stm32f746-disco.h | 2 --
include/configs/strider.h | 2 --
include/configs/stv0991.h | 2 --
include/configs/t4qds.h | 1 -
include/configs/tam3517-common.h | 3 ---
include/configs/tao3530.h | 3 ---
include/configs/taurus.h | 2 --
include/configs/tb100.h | 2 --
include/configs/tegra-common.h | 2 --
include/configs/thunderx_88xx.h | 2 --
include/configs/ti814x_evm.h | 4 ----
include/configs/ti_armv7_common.h | 3 ---
include/configs/titanium.h | 4 ----
include/configs/tricorder.h | 3 ---
include/configs/ts4800.h | 2 --
include/configs/udoo.h | 3 ---
include/configs/uniphier.h | 2 --
include/configs/usb_a9263.h | 2 --
include/configs/usbarmory.h | 1 -
include/configs/vct.h | 2 --
include/configs/ve8313.h | 1 -
include/configs/vexpress_aemv8a.h | 2 --
include/configs/vexpress_common.h | 3 ---
include/configs/vf610twr.h | 2 --
include/configs/vme8349.h | 1 -
include/configs/woodburn_common.h | 2 --
include/configs/work_92105.h | 2 --
include/configs/x600.h | 2 --
include/configs/x86-common.h | 3 ---
include/configs/xilinx_zynqmp.h | 2 --
include/configs/xpedite517x.h | 1 -
include/configs/xpedite520x.h | 1 -
include/configs/xpedite537x.h | 1 -
include/configs/xpedite550x.h | 1 -
include/configs/xtfpga.h | 3 ---
include/configs/zipitz2.h | 2 +-
include/configs/zmx25.h | 2 --
include/configs/zynq-common.h | 2 --
220 files changed, 1 insertion(+), 433 deletions(-)

diff --git a/include/configs/10m50_devboard.h b/include/configs/10m50_devboard.h
index d15cc44..940a1b5 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 463e978..b6e44b0 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 4273c2d..d6b470d 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 19c772c..2c93779 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 c02aad1..7d25bc8 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 697b355..11608ba 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 477b826..96411b2 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 9e74fad..933e4fb 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 82675cc..4ecdc30 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 c808677..c3d5db5 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 424d424..e5ec94f 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 300cfd8..d73dad6 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 d9b6c80..a2e78f1 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 eb65308..34c16cd 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 d2919c6..822592d 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 422e36d..2a9f3ea 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 7fd2500..64feddf 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 4c1962b..bfb59fb 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 f90c014..27e1b6b 100644
--- a/include/configs/M54418TWR.h
+++ b/include/configs/M54418TWR.h
@@ -178,9 +178,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 6761631..27895c2 100644
--- a/include/configs/M54451EVB.h
+++ b/include/configs/M54451EVB.h
@@ -142,7 +142,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 4bc411d..f675574 100644
--- a/include/configs/M54455EVB.h
+++ b/include/configs/M54455EVB.h
@@ -193,7 +193,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 a3badbe..80a605e 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 957f5ba..78ba3af 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 d1d4fe1..082d93a 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 8460b81..80fde2f 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 3a031a8..b9675b7 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 41cbcbc..0c5db2a 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 a3d760f..5875479 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 04f6b77..4dbc6f7 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 b65552a..f81b46f 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 07f0f22..36ac8cd 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 580a050..5389091 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 3ca52de..808cf0b 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 b57461a..347aa7b 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 ca4d3f8..4181bfd 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 bed9e46..5926f1b 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 7876119..0555bfa 100644
--- a/include/configs/MPC8544DS.h
+++ b/include/configs/MPC8544DS.h
@@ -361,7 +361,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 3d2506e..d89ce7f 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 8e2e642..1911516 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 7b896dd..21b804c 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 dd8a84e..b207e69 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 1e6e94e..861c8dd 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 d0e8217..2741ab5 100644
--- a/include/configs/MPC8572DS.h
+++ b/include/configs/MPC8572DS.h
@@ -559,7 +559,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 e7e5e8f..985eec8 100644
--- a/include/configs/MPC8610HPCD.h
+++ b/include/configs/MPC8610HPCD.h
@@ -434,7 +434,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 a0254f9..b3aac99 100644
--- a/include/configs/MPC8641HPCN.h
+++ b/include/configs/MPC8641HPCN.h
@@ -591,7 +591,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 15f1996..6f17ef1 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 778346a..dc22f5c 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 4d77ed5..5f02fe3 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 5ef274e..d53bf00 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 c1334c6..f39dea8 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 1b7d451..f3be445 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 cd18b32..d941928 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 ec6c9da..5711c52 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 70f24f1..e0763f4 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 501b411..e57e42d 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 dc9718d..bace3dc 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 930e061..e4d2165 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 c461b53..3e32ffa 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 66e98c9..c7691c0 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 cffff46..f506124 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 6329bf6..0d36f05 100644
--- a/include/configs/advantech_dms-ba16.h
+++ b/include/configs/advantech_dms-ba16.h
@@ -211,8 +211,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 0502b56..da41f73 100644
--- a/include/configs/am3517_crane.h
+++ b/include/configs/am3517_crane.h
@@ -167,9 +167,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 e957a28..23c5a6e 100644
--- a/include/configs/am3517_evm.h
+++ b/include/configs/am3517_evm.h
@@ -235,9 +235,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 9be523b..bd37b08 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 1db7ea6..ecc818b 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 4475e62..9ca4178 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 f750d5f..e6d119e 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 c814c73..16dce4a 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 12bb085..a5d27a2 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 1c28fcf..d24d564 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 f1b0025..ade85a0 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 ec2e2e7..9de0592 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 ca03f6b..968e909 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 f365054..7e0f26b 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 049b4e0..7824855 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 08d1e4e..2e2aa3d 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 8bd1e30..fd893e6 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 2352b98..3605d86 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 d7fdb8c..76c9bde 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 3f967bb..45b6eb9 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 06554c1..4886458 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 4f45be1..2d6132d 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 70880d1..1e3f0ad 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 3a9fd2a..800d4be 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 ee33b47..0a39089 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 d5255e7..ca49d21 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 c1d4b62..8172eaa 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 91433af..298b66d 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 cc1f919..0645bb7 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 7a07d5c..c9ae281 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 f4f0d74..6e07172 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 2088695..f6161e0 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 48240c9..fa6e2fb 100644
--- a/include/configs/cyrus.h
+++ b/include/configs/cyrus.h
@@ -430,7 +430,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 0736b39..48e6320 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 0360bf9..6106920 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 226c1d2..3c4de83 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 2610358..baebdef 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 158eea6..58c2ac3 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 755e788..0d7246a 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 9170a94..cf705bd 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 dfac340..329d52c 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 235b746..fb44514 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 d1dec80..cb776b2 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 430acc0..d67200b 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 d090cdd..ef1233f 100644
--- a/include/configs/ge_bx50v3.h
+++ b/include/configs/ge_bx50v3.h
@@ -242,8 +242,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 aeacd46..a764e30 100644
--- a/include/configs/gw_ventana.h
+++ b/include/configs/gw_ventana.h
@@ -171,9 +171,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 9d2e9e8..8bb149e 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 0328c41..1946cad 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 f12f13c..da44cd2 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 565a5aa..f8cfc0d 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 8062d01..3b306c7 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 0c22ca8..3c6e67a 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 e2b6fca..ba4bfb0 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 13d874d..83ef161 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 cd91741..ef9f429 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 d2fc81b..9e7874a 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 36c01c0..6bea290 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 8e827d0..1971ba4 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 2e6147d..bc953d7 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 9d85341..c88db4a 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 c203945..5eda555 100644
--- a/include/configs/ls1021aiot.h
+++ b/include/configs/ls1021aiot.h
@@ -246,8 +246,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 390a1b7..bee5ee0 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 b528bb5..ccabd9b 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 00af52d..189dd8a 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 af58e61..cc35880 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 b922139..1b446a1 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 ef2f47c..b656b7c 100644
--- a/include/configs/ls1046aqds.h
+++ b/include/configs/ls1046aqds.h
@@ -420,8 +420,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 20cfc25..b7a4902 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 4dc6e16..547c13f 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 54edb23..3f4bea8 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 7047e3f..940a61b 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 f256dcb..32abba1 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 14dac4a..1b52cda 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 e190493..2cc4b8a 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 755e05d..33c08e8 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 28da200..aa1b676 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 18003e1..7c2bab2 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 71975ed..af8adb7 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 633218c..a1123ed 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 8b472bf..a010371 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 61f069e..77275a2 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 50152a9..2505783 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 1b17673..19fd1e5 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 151935d..66d7a42 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 532f47e..af39893 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 57a2c90..d843531 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 f670241..bba285c 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 0085559..7d0ff2f 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 d4fd722..55e716a 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 6050ef5..bf4dc39 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 6cf2257..cd0fc3d 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 ba9c998..ce5b7e2 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 b078d88..3ff6bab 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 57b265c..31d90e5 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 2c98977..563b501 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 4801cb2..bb0e929 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 221dd74..44750aa 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 7708122..52658b2 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 6247ced..a5fed7a 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 d2ecd0d..b1b3561 100644
--- a/include/configs/poplar.h
+++ b/include/configs/poplar.h
@@ -77,8 +77,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 ee6853a..62a3ff0 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 b44b823..f2928d0 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 6f061b5..6554a9d 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 9e6b10a..1408fc9 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 44d3e9c..49b1b5a 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 8ae4019..05a6d7a 100644
--- a/include/configs/rpi.h
+++ b/include/configs/rpi.h
@@ -87,8 +87,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 c90d3f2..6455886 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 e1f2cb3..a740589 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 f790803..e799ebf 100644
--- a/include/configs/sandbox.h
+++ b/include/configs/sandbox.h
@@ -40,8 +40,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 1539324..61c16d8 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 51d6d66..2605c9a 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 ddf1382..45e1ead 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 c3a4961..3fb7e5e 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 5ed4658..25854fd 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 fe24b3a..bf01cf7 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 88b9581..c4b2f53 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 521a7f5..1951870 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 2306e7c..b888003 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 175b01e..8b7f2f7 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 3c3f042..eb2cacd 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 09251f6..d149d4d 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 eab79b3..52a7529 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 470722d..ec0c2a6 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 c6cb51c..582c74b 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 3b5831d..0adab5b 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 6ef5605..c68041e 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 54223c4..04ec011 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 1c9f68d..cebe069 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 f479cad..d88aa4b 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 699c18a..9b4c7a9 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 723435e..e2225cd 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 f2d0d22..54aee47 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 129ae4c..e31c9b4 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 ac3eb5d..91e1398 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 3fb63f3..882b1d7 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 77f8cbd..46ffaaf 100644
--- a/include/configs/tricorder.h
+++ b/include/configs/tricorder.h
@@ -211,9 +211,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 14cf26b..d9b0795 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 26a1a6f..bcce41d 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 6f53139..3c62ce7 100644
--- a/include/configs/uniphier.h
+++ b/include/configs/uniphier.h
@@ -62,8 +62,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 787f0ac..5a4945f 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 95e2324..5952216 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 e7c3d4b..e01bc03 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 38c67cd..5ba7dc4 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 c06f19d..037639e 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 8f9ba91..cbaae91 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 df445d2..809777f 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 693f770..b28a7ca 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 f680df1..4294e0b 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 628797d..ce8c227 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 43a6c65..87a959c 100644
--- a/include/configs/x600.h
+++ b/include/configs/x600.h
@@ -126,8 +126,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 687f8df..8028e42 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 6dcc8e5..633d379 100644
--- a/include/configs/xilinx_zynqmp.h
+++ b/include/configs/xilinx_zynqmp.h
@@ -135,8 +135,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 09c09d1..d9800e6 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 76c24a4..e860d69 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 2657e81..d3a4b3b 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 b4546d0..97669f3 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 df983d9..4ac3158 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 87f3a4c..b4577a7 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 463f0de..204cd30 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 cea07e2..b9599c7 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
--
2.9.4