diff --git a/include/configs/10m50_devboard.h b/include/configs/10m50_devboard.h
index 940a1b5c2183e92a1c3aa3bd57de356e485a3b49..617fbe7240c7f60c7d7cbef0166446a179739007 100644
--- a/include/configs/10m50_devboard.h
+++ b/include/configs/10m50_devboard.h
@@ -78,7 +78,6 @@
* MISC
*/
#define CONFIG_SYS_LONGHELP /* Provide extended help */
-#define CONFIG_SYS_MAXARGS 16 /* Max command args */
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE /* Bootarg buf size */
#define CONFIG_SYS_LOAD_ADDR 0xcc000000 /* Half of RAM */
#define CONFIG_LOADADDR CONFIG_SYS_LOAD_ADDR
diff --git a/include/configs/3c120_devboard.h b/include/configs/3c120_devboard.h
index b6e44b0e40059f7c9323504a0490935eac2e191e..9952dc649351b3ceab176f2a203125394e8ee5db 100644
--- a/include/configs/3c120_devboard.h
+++ b/include/configs/3c120_devboard.h
@@ -81,7 +81,6 @@
* MISC
*/
#define CONFIG_SYS_LONGHELP /* Provide extended help */
-#define CONFIG_SYS_MAXARGS 16 /* Max command args */
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE /* Bootarg buf size */
#define CONFIG_SYS_LOAD_ADDR 0xd4000000 /* Half of RAM */
#define CONFIG_LOADADDR CONFIG_SYS_LOAD_ADDR
diff --git a/include/configs/B4860QDS.h b/include/configs/B4860QDS.h
index d6b470d88a0a0efaee813bea834e915b36bb520a..65d6ec8cddd0cede57bdf3f3c79485e353d87ea6 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_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 2c93779001a1dbdf363efa6f0980733c45a2820e..62a9a13962d542c425c46830205b450dff4d1cc4 100644
--- a/include/configs/BSC9131RDB.h
+++ b/include/configs/BSC9131RDB.h
@@ -297,7 +297,6 @@ extern unsigned long get_sdram_size(void);
#else
#define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */
#endif
-#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 7d25bc81d2908c4e10ab403000d331f100da8bbd..cc6245155c612575dcd01df2be58c32c7a2eb034 100644
--- a/include/configs/BSC9132QDS.h
+++ b/include/configs/BSC9132QDS.h
@@ -515,7 +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_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 11608ba94f6b35d2c9059d959798b4b2b98e8c2f..b68092ad6a94b125bb2ec133306c662a0a35ff88 100644
--- a/include/configs/C29XPCIE.h
+++ b/include/configs/C29XPCIE.h
@@ -433,7 +433,6 @@
#define CONFIG_AUTO_COMPLETE /* add autocompletion support */
#define CONFIG_SYS_LOAD_ADDR 0x2000000 /* default load address */
-#define CONFIG_SYS_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 90456196823e2bb3d758cc6b583078f83a3ed012..f618d7a541844b276275d11c5c7c8e4e73567259 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_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 933e4fb798f2429f978a2183e7fc4247fc3e8848..f2b8aeb28e1fe6d4840aaab5d66648df8f89c6e8 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_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 + 0x10000)
diff --git a/include/configs/M5235EVB.h b/include/configs/M5235EVB.h
index e29a2d4a0b3226a7002bcfd1aa5461a83003cb7c..061ad1b9c10b22991d55cbe939f70d8fd404bf91 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_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 053321cf7a398ac5724a6c5bfbac6f586e463b2a..fbb34930d84c567eb3eb289fa250a1f2b9b5a92e 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_MAXARGS 16 /* max number of command args */
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE /* Boot Argument Buffer Size */
#define CONFIG_SYS_DEVICE_NULLDEV 1 /* include nulldev device */
diff --git a/include/configs/M5253DEMO.h b/include/configs/M5253DEMO.h
index 46a6e00896afc03fb57e1136e7be38eb946aa42d..af4e51c863b7c265f20ce2b0625cfdfdcb7e6407 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_MAXARGS 16 /* max number of command args */
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE /* Boot Argument Buffer Size */
#define CONFIG_SYS_LOAD_ADDR 0x00100000
diff --git a/include/configs/M5253EVBE.h b/include/configs/M5253EVBE.h
index 5e444a80789433f283f9199f696a0b3684d99c91..77355e7dac34fa985aebca131ebc8ff7674387a6 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_MAXARGS 16 /* max number of command args */
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE /* Boot Argument Buffer Size */
#define CONFIG_SYS_LOAD_ADDR 0x00100000
diff --git a/include/configs/M5272C3.h b/include/configs/M5272C3.h
index 66a745f90fb19fdda07ef322cdca6c77226cbbe5..4f2c909645e51d98d8f27d6f68139de6806cd95a 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_MAXARGS 16 /* max number of command args */
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE /* Boot Argument Buffer Size */
#define CONFIG_SYS_LOAD_ADDR 0x20000
#define CONFIG_SYS_MEMTEST_START 0x400
diff --git a/include/configs/M5275EVB.h b/include/configs/M5275EVB.h
index d3213cec305bcfe9689f31244ff3a0995d64454a..a456089316b2e769d3948fd96798c8c8f3a4d89a 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_MAXARGS 16
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
#define CONFIG_SYS_LOAD_ADDR 0x800000
diff --git a/include/configs/M5282EVB.h b/include/configs/M5282EVB.h
index 0864f927509f068d8b94c0b8c80a224735d512c7..56991e301156c1c030d21d14136d47f86abaa9e4 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_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/M53017EVB.h b/include/configs/M53017EVB.h
index c83a20110a690b5c805ab1fd94e58f758fcbe5e6..dee1859fd6dcd1dc6a1dc50f0565291d9026703a 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_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 a18c3e7b04a38e682ee6c5a88097d575a5612808..ef4fc7a974152c21f788b56c2cf2f53f899baddd 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_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 81250cf4fbdd5c469aa4c34c5c3c47e5515ae2a5..53028468ac284ed7572319ce73ce0ba005463ee2 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_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 8907f587a241c41445c8713fe4ca9671f9562f11..f75e4e90e6aa9eaecde882d56e197aa0643b9d31 100644
--- a/include/configs/M54418TWR.h
+++ b/include/configs/M54418TWR.h
@@ -180,7 +180,6 @@
#define CONFIG_SYS_LONGHELP /* undef to save memory */
-#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 7faa180cd3d5011e634164a49f88cb7a4029bfc5..ebc8277ec48d9bd2edde32c637b9c79ec9ded1d7 100644
--- a/include/configs/M54451EVB.h
+++ b/include/configs/M54451EVB.h
@@ -144,7 +144,6 @@
#define CONFIG_SYS_LONGHELP /* undef to save memory */
-#define CONFIG_SYS_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 + 0x10000)
diff --git a/include/configs/M54455EVB.h b/include/configs/M54455EVB.h
index 77e4dc9ee0aefb21b70053cdfbaeae30a10158d0..3a48c964c6ebcedcd22543b6084754d4abf8afb7 100644
--- a/include/configs/M54455EVB.h
+++ b/include/configs/M54455EVB.h
@@ -195,7 +195,6 @@
#define CONFIG_SYS_LONGHELP /* undef to save memory */
-#define CONFIG_SYS_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 + 0x10000)
diff --git a/include/configs/M5475EVB.h b/include/configs/M5475EVB.h
index 80a605ec3e03eec615da05216d96fd54e45421b0..4c44a822019e7f216131f35ea6d4be4650a6c125 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_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 78ba3afb936d2cf1bd1bfc3e39934364d522ae24..026919287741b9aa296ff2f5646b7751236fed03 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_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 082d93a50285c9bc08628b3d398dde1ffa5db4eb..cb46191c266cb9c59d7b9ca80b860b8979a0ce7e 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_MAXARGS 16
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
#define CONFIG_CMDLINE_EDITING 1
diff --git a/include/configs/MPC8308RDB.h b/include/configs/MPC8308RDB.h
index 80fde2fa507442eb2831c804e0f6bcdb04dc3b4e..bd0cb6fddcbbd77dad3e4d607fa783c6fc8fceba 100644
--- a/include/configs/MPC8308RDB.h
+++ b/include/configs/MPC8308RDB.h
@@ -426,7 +426,6 @@
#define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */
-#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 b9675b757fd37377b051a31c01083f9c71118ce8..78e6811eceeb37bf12cd95f443886e444f11a1b6 100644
--- a/include/configs/MPC8313ERDB.h
+++ b/include/configs/MPC8313ERDB.h
@@ -474,7 +474,6 @@
#define CONFIG_SYS_LOAD_ADDR 0x2000000 /* default load address */
#define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */
-#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 0c5db2ab7b4a4e1341f3163d652ee79009fae8ef..4cd406489fe37e216cd8a4ae99276081d361bdb6 100644
--- a/include/configs/MPC8315ERDB.h
+++ b/include/configs/MPC8315ERDB.h
@@ -454,7 +454,6 @@
#define CONFIG_SYS_LONGHELP /* undef to save memory */
#define CONFIG_SYS_LOAD_ADDR 0x2000000 /* default load address */
-#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 587547939ec102b2c4a140fe153270f085b48ca0..87efe56efd92199010c4af55d45224660a45f200 100644
--- a/include/configs/MPC8323ERDB.h
+++ b/include/configs/MPC8323ERDB.h
@@ -327,7 +327,6 @@
#define CONFIG_SYS_LONGHELP /* undef to save memory */
#define CONFIG_SYS_LOAD_ADDR 0x2000000 /* default load address */
-#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 4dbc6f7f344347f9b4d12a02b461e5cbc257bf2e..3290e1b2a98dd67617708f1812323bb8b799b914 100644
--- a/include/configs/MPC832XEMDS.h
+++ b/include/configs/MPC832XEMDS.h
@@ -411,7 +411,6 @@
#define CONFIG_SYS_LONGHELP /* undef to save memory */
#define CONFIG_SYS_LOAD_ADDR 0x2000000 /* default load address */
-#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 f81b46f1089e6cbe2e167064f4d79410c0ccd087..9604079fa7952c4371a80220ca8fe237430239de 100644
--- a/include/configs/MPC8349EMDS.h
+++ b/include/configs/MPC8349EMDS.h
@@ -470,7 +470,6 @@
#define CONFIG_SYS_LONGHELP /* undef to save memory */
#define CONFIG_SYS_LOAD_ADDR 0x2000000 /* default load address */
-#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 36ac8cd2acd137fac8c5178727317ee0f49a61bb..26f8fb5b81911e28820a8a7a86de90910ed5a4e1 100644
--- a/include/configs/MPC8349ITX.h
+++ b/include/configs/MPC8349ITX.h
@@ -493,7 +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 */
-#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 5389091afe032057e0184d13c596a918f108187c..10b77649ba5efe2fa58ede416bff877dd243eef7 100644
--- a/include/configs/MPC837XEMDS.h
+++ b/include/configs/MPC837XEMDS.h
@@ -482,7 +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 */
-#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 808cf0b6660d58c06b58dfa04876f91006dfef47..de923257a325c600c27ac868ac7f73eee779f9b6 100644
--- a/include/configs/MPC837XERDB.h
+++ b/include/configs/MPC837XERDB.h
@@ -496,7 +496,6 @@
#define CONFIG_SYS_LONGHELP /* undef to save memory */
#define CONFIG_SYS_LOAD_ADDR 0x2000000 /* default load address */
-#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 347aa7b3290b89c552cf43329ff0c55465147e16..5df93eb720375ebb3f37df67c9b58cad62715cb2 100644
--- a/include/configs/MPC8536DS.h
+++ b/include/configs/MPC8536DS.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_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 4181bfdb020a85b5bc6f6994449871e3bed5ceec..b8c04753611e095f16f885468bc7784ed06941ef 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_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 5926f1b18fded2ea0bf751459bc06fb8f2133d4f..5e8e37828cde6433a1a33971804bb81ecc16100a 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_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 d34a47168bcbd8d6d2b21e8bd32f580c94233e03..224cfb634a79284e19c1d5266f6af97a4bf7a60e 100644
--- a/include/configs/MPC8544DS.h
+++ b/include/configs/MPC8544DS.h
@@ -360,7 +360,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
#define CONFIG_CMDLINE_EDITING /* Command-line editing */
#define CONFIG_AUTO_COMPLETE /* add autocompletion support */
#define CONFIG_SYS_LOAD_ADDR 0x2000000 /* default load address */
-#define CONFIG_SYS_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 d89ce7f8f5b3240446c02ec63b4b279223ee0c1e..13af1e1f8b301f42dfa3565205db266ae9c94984 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_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 19115169e43da120a7400feae4375487bf4f8fdf..784264f96f4ef724cd7117b6ab4b946703548be8 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_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 21b804cfd0440713eed7a30a814d4a8bb694f7a3..fe116e0a8220f33e766604373d37cddf589d6fa0 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_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 b207e692d52eea89701f3d835288925652d05890..7b791b3da15851b19bc4f99df72f9a3450f69f5f 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_MAXARGS 16 /* max number of command args */
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE /* Boot Argument Buffer Size */
/*
diff --git a/include/configs/MPC8572DS.h b/include/configs/MPC8572DS.h
index e22656e7a9dacd678c80b746b1e5d67ee6c84205..5c24a599dff38f39121340fd321f5d6a980f17eb 100644
--- a/include/configs/MPC8572DS.h
+++ b/include/configs/MPC8572DS.h
@@ -558,7 +558,6 @@
#define CONFIG_CMDLINE_EDITING /* Command-line editing */
#define CONFIG_AUTO_COMPLETE /* add autocompletion support */
#define CONFIG_SYS_LOAD_ADDR 0x2000000 /* default load address */
-#define CONFIG_SYS_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 1a63dbb7d782ee5036d8a90eb027f5ffdd69d683..66534a2700d8cbf93d768f4e4a63b1a2b3e856e3 100644
--- a/include/configs/MPC8610HPCD.h
+++ b/include/configs/MPC8610HPCD.h
@@ -433,7 +433,6 @@
#define CONFIG_CMDLINE_EDITING /* Command-line editing */
#define CONFIG_SYS_LOAD_ADDR 0x2000000 /* default load address */
-#define CONFIG_SYS_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 9df9e020decfc48e1336f5add4acd9522b53150b..040944448dba6f5f7a0cca41b80db270a40b2976 100644
--- a/include/configs/MPC8641HPCN.h
+++ b/include/configs/MPC8641HPCN.h
@@ -590,7 +590,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
#define CONFIG_CMDLINE_EDITING /* Command-line editing */
#define CONFIG_SYS_LOAD_ADDR 0x2000000 /* default load address */
-#define CONFIG_SYS_MAXARGS 16 /* max number of command args */
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE /* Boot Argument Buffer Size */
/*
diff --git a/include/configs/MigoR.h b/include/configs/MigoR.h
index 464ad46c95dce3c84eb5609fd6cbb1fef15000d2..cd1037204888f35cdacd6bf8b19fe6c84d12f068 100644
--- a/include/configs/MigoR.h
+++ b/include/configs/MigoR.h
@@ -27,7 +27,6 @@
#define CONFIG_SYS_TEXT_BASE 0x8FFC0000
#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/P1010RDB.h b/include/configs/P1010RDB.h
index 6f17ef1b90657305bbe42c1a8d96978ff2042b97..d229f0e5ad8e10d99133debb2630cdf8d9c51547 100644
--- a/include/configs/P1010RDB.h
+++ b/include/configs/P1010RDB.h
@@ -723,7 +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_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 dc22f5c7554c5ed957bf4a9d5f5d382566440e7c..f7d43335df0f345a5452b5686745c558e367504f 100644
--- a/include/configs/P1022DS.h
+++ b/include/configs/P1022DS.h
@@ -598,7 +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 */
-#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 5f02fe30788e51e770abfbf2e0d3dad4fa98209b..7eced3421d11501387c6a9af7e699731706aa6ae 100644
--- a/include/configs/P1023RDB.h
+++ b/include/configs/P1023RDB.h
@@ -253,7 +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 */
-#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 d53bf0039e8ef586c44a9379ec753d5ff0505937..c29881d8a102c87653af8b6a182270cdadf5dcf7 100644
--- a/include/configs/P2041RDB.h
+++ b/include/configs/P2041RDB.h
@@ -594,7 +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 */
-#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 f39dea88a4a6ea5dd1b359cd8de95b2576814fcd..3cbd01488d578cef2291e98a0477b12acb8ba085 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_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 f3be445d85bcc892ec3396709deeab7c2564ae39..bc7e809517f5142e341722bfd257b0df4ad84c0e 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_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 d941928a7488b1f23e1435f8a62dbcd927b8f565..c1379b208a2d4ddf1a5d7495bc1558b4637acccb 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_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 5711c5235542f8f07ecef2bacd9fe325716eae1e..f8f177e83997c8ad6b1ddd7f1a5f17aa07829119 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_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 e0763f4e2257a18820a85a606c327c77e7620326..3623b625958277a58d774e77ce3783a206d79d3a 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_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 e57e42db5e04204c0195c847749fffa6d50670dc..1124de4986074f7b0e11af69c28aecfdf0d0ca0c 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_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 bace3dc53925ababa773a3cd61fda65a31cf2016..c9571b8ac3bba609f5d1c4c54ec0f1d21730e585 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_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 e4d2165beb68144183e89e8d3f4ee75663bc9d14..00faa9f4723bee39946df1f732f05fb73aaa599c 100644
--- a/include/configs/TQM834x.h
+++ b/include/configs/TQM834x.h
@@ -273,7 +273,6 @@
#define CONFIG_CMDLINE_EDITING 1 /* add command line history */
#define CONFIG_AUTO_COMPLETE /* add autocompletion support */
-#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 3e32ffab46136b6cbb824bf150888c20bc096b91..34e29de03038151d979012bd976ef896ac92f75f 100644
--- a/include/configs/UCP1020.h
+++ b/include/configs/UCP1020.h
@@ -441,7 +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_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 c7691c096be9011a49bb86da8c32824050692cee..2e86b5d732f05c19d8f5323abbb93a6e29424068 100644
--- a/include/configs/adp-ae3xx.h
+++ b/include/configs/adp-ae3xx.h
@@ -101,9 +101,6 @@
*/
#define CONFIG_SYS_LONGHELP /* undef to save memory */
-/* max number of command args */
-#define CONFIG_SYS_MAXARGS 16
-
/* Boot Argument Buffer Size */
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
diff --git a/include/configs/adp-ag101p.h b/include/configs/adp-ag101p.h
index f506124c3da43b3eb6d793febeda6d0fa955b46f..2187445b31acb3c15157bd58e51ce4c986d5aee6 100644
--- a/include/configs/adp-ag101p.h
+++ b/include/configs/adp-ag101p.h
@@ -107,9 +107,6 @@
*/
#define CONFIG_SYS_LONGHELP /* undef to save memory */
-/* max number of command args */
-#define CONFIG_SYS_MAXARGS 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 01884ad769b62f42432fe8f3d4091e3e96859b41..77fc1ef61b86b47fbea8d0b67c304e12c67c062f 100644
--- a/include/configs/amcore.h
+++ b/include/configs/amcore.h
@@ -33,8 +33,6 @@
/* undef to save memory */
#undef CONFIG_SYS_LONGHELP
-/* max number of command args */
-#define CONFIG_SYS_MAXARGS 16
/* Boot argument buffer size */
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
diff --git a/include/configs/ap121.h b/include/configs/ap121.h
index ecc818b85bdcbb5c92a110929fde687111312fbb..a71b8a5079718da43d70285a9a5b7249cefa81f4 100644
--- a/include/configs/ap121.h
+++ b/include/configs/ap121.h
@@ -43,7 +43,6 @@
#define CONFIG_ENV_SIZE 0x10000
/* Miscellaneous configurable options */
-#define CONFIG_SYS_MAXARGS 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 9ca4178b99e68689809360a8af7e209fa95aeff7..5f7ea9d98b428c1487a9f28af5f100e8b62367a2 100644
--- a/include/configs/ap143.h
+++ b/include/configs/ap143.h
@@ -47,7 +47,6 @@
#define CONFIG_ENV_SIZE 0x10000
/* Miscellaneous configurable options */
-#define CONFIG_SYS_MAXARGS 16
#define CONFIG_SYS_LONGHELP
#define CONFIG_CMDLINE_EDITING
#define CONFIG_AUTO_COMPLETE
diff --git a/include/configs/ap325rxa.h b/include/configs/ap325rxa.h
index 46a4f95c969555003884c6e350afc03a2c0230b3..c63913a175c092f8c22b4e710686a727a4783fc4 100644
--- a/include/configs/ap325rxa.h
+++ b/include/configs/ap325rxa.h
@@ -33,8 +33,6 @@
/* 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 */
#define CONFIG_SYS_BARGSIZE 512
/* List of legal baudrate settings for this board */
diff --git a/include/configs/ap_sh4a_4a.h b/include/configs/ap_sh4a_4a.h
index e5949b7679a750f48976ea320cd9239aa0566663..8acaee1a877a9121154a94468e8030c7d2803310 100644
--- a/include/configs/ap_sh4a_4a.h
+++ b/include/configs/ap_sh4a_4a.h
@@ -33,8 +33,6 @@
/* 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 */
#define CONFIG_SYS_BARGSIZE 512
/* List of legal baudrate settings for this board */
diff --git a/include/configs/apf27.h b/include/configs/apf27.h
index a5d27a293518406daf82b5541436ab11e2e86111..c8eacdd7f8a9929418794bcb2bd78c6da7d43c32 100644
--- a/include/configs/apf27.h
+++ b/include/configs/apf27.h
@@ -103,7 +103,6 @@
*/
#define CONFIG_SYS_LONGHELP
#define CONFIG_SYS_CBSIZE 2048 /* console I/O buffer */
-#define CONFIG_SYS_MAXARGS 16 /* max command args */
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
/* Boot argument buffer size */
#define CONFIG_AUTO_COMPLETE
diff --git a/include/configs/armadillo-800eva.h b/include/configs/armadillo-800eva.h
index 862ed4063e155c956e11e2cb6bbb0f236032fea1..bea1e726338dbfb4d79bca1c609136ed7178f4f6 100644
--- a/include/configs/armadillo-800eva.h
+++ b/include/configs/armadillo-800eva.h
@@ -36,7 +36,6 @@
#define CONFIG_SYS_LONGHELP
#define CONFIG_SYS_PBSIZE 256
-#define CONFIG_SYS_MAXARGS 16
#define CONFIG_SYS_BARGSIZE 512
#define CONFIG_SYS_BAUDRATE_TABLE { 115200 }
diff --git a/include/configs/aspeed-common.h b/include/configs/aspeed-common.h
index ade85a0a783f0a4421e05df35c86afab8ca34d91..0a510945157cb455aaa9cce3b425893ee64ce21f 100644
--- a/include/configs/aspeed-common.h
+++ b/include/configs/aspeed-common.h
@@ -58,7 +58,6 @@
*/
#define CONFIG_SYS_LONGHELP
-#define CONFIG_SYS_MAXARGS 16
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
#define CONFIG_BOOTCOMMAND "bootm 20080000 20300000"
diff --git a/include/configs/astro_mcf5373l.h b/include/configs/astro_mcf5373l.h
index c06010528efa62e86848086c11eb85ca02a0cb00..e2bdf2380f389797f05158246f2c04f21f5d8a71 100644
--- a/include/configs/astro_mcf5373l.h
+++ b/include/configs/astro_mcf5373l.h
@@ -178,7 +178,6 @@
#define CONFIG_SYS_LONGHELP
-#define CONFIG_SYS_MAXARGS 16
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
#define CONFIG_FPGA_COUNT 1
diff --git a/include/configs/at91-sama5_common.h b/include/configs/at91-sama5_common.h
index f8ee9681cf813116262681da14a74a99d6aee7b3..ff17b4eb4b519f1887f592670f06b410bd141683 100644
--- a/include/configs/at91-sama5_common.h
+++ b/include/configs/at91-sama5_common.h
@@ -86,7 +86,6 @@
#endif
-#define CONFIG_SYS_MAXARGS 16
#define CONFIG_SYS_LONGHELP
#define CONFIG_CMDLINE_EDITING
#define CONFIG_AUTO_COMPLETE
diff --git a/include/configs/at91rm9200ek.h b/include/configs/at91rm9200ek.h
index 968e9098327cd11c7b1ac24cb63dda449c34fb5d..8dcd6f41e53377e65a29a288a809d34fc8d490c1 100644
--- a/include/configs/at91rm9200ek.h
+++ b/include/configs/at91rm9200ek.h
@@ -174,7 +174,6 @@
#define CONFIG_CMDLINE_EDITING
#define CONFIG_SYS_LONGHELP
#define CONFIG_AUTO_COMPLETE
-#define CONFIG_SYS_MAXARGS 16 /* max number of command args */
/*
* Size of malloc() pool
diff --git a/include/configs/at91sam9260ek.h b/include/configs/at91sam9260ek.h
index 2add7d4a9c95a704d9f6b74afee27ad24d58e974..ea7478b70d22d954714eb4dede93fea3197ff208 100644
--- a/include/configs/at91sam9260ek.h
+++ b/include/configs/at91sam9260ek.h
@@ -159,7 +159,6 @@
"fatload mmc 0:1 0x22000000 uImage; bootm"
#endif
-#define CONFIG_SYS_MAXARGS 16
#define CONFIG_SYS_LONGHELP 1
#define CONFIG_CMDLINE_EDITING 1
#define CONFIG_AUTO_COMPLETE
diff --git a/include/configs/at91sam9261ek.h b/include/configs/at91sam9261ek.h
index bf9e4aac589c32e05f23c3a62b00324a2491adb0..39e4b3805236684b865068c99d19dc1a409203ec 100644
--- a/include/configs/at91sam9261ek.h
+++ b/include/configs/at91sam9261ek.h
@@ -136,7 +136,6 @@
#define CONFIG_BOOTCOMMAND "nand read 0x22000000 0x200000 0x300000; bootm"
#endif
-#define CONFIG_SYS_MAXARGS 16
#define CONFIG_SYS_LONGHELP
#define CONFIG_CMDLINE_EDITING
#define CONFIG_AUTO_COMPLETE
diff --git a/include/configs/at91sam9263ek.h b/include/configs/at91sam9263ek.h
index 57da7ae360c2fb06196401971fc4ddc84fc99e0e..943177738488d55b138d0c84bb9e3e3a9756bd71 100644
--- a/include/configs/at91sam9263ek.h
+++ b/include/configs/at91sam9263ek.h
@@ -252,7 +252,6 @@
#define CONFIG_BOOTCOMMAND "nand read 0x22000000 0x200000 0x300000; bootm"
#endif
-#define CONFIG_SYS_MAXARGS 16
#define CONFIG_SYS_LONGHELP 1
#define CONFIG_CMDLINE_EDITING 1
#define CONFIG_AUTO_COMPLETE
diff --git a/include/configs/at91sam9m10g45ek.h b/include/configs/at91sam9m10g45ek.h
index 114dc4343cd3967a5fa9be8ed6f5b7e9b1fbddcf..22db94772dbe4d31ca05874f37f5e3582da5d140 100644
--- a/include/configs/at91sam9m10g45ek.h
+++ b/include/configs/at91sam9m10g45ek.h
@@ -100,7 +100,6 @@
"bootz 0x72000000 - 0x71000000"
#endif
-#define CONFIG_SYS_MAXARGS 16
#define CONFIG_SYS_LONGHELP
#define CONFIG_CMDLINE_EDITING
#define CONFIG_AUTO_COMPLETE
diff --git a/include/configs/at91sam9n12ek.h b/include/configs/at91sam9n12ek.h
index 83ae9b56d34382823471cb85a21cd66ad0b8fd7b..7d70d8892a90c3363b720b7074a26daf8140b96d 100644
--- a/include/configs/at91sam9n12ek.h
+++ b/include/configs/at91sam9n12ek.h
@@ -159,7 +159,6 @@
#endif
-#define CONFIG_SYS_MAXARGS 16
#define CONFIG_SYS_LONGHELP
#define CONFIG_CMDLINE_EDITING
#define CONFIG_AUTO_COMPLETE
diff --git a/include/configs/at91sam9rlek.h b/include/configs/at91sam9rlek.h
index 6209899b591ea44dfc8b60406179c84b81258b7c..c08fb2e2f203872ef2625be1497fcfc4c61b6b5f 100644
--- a/include/configs/at91sam9rlek.h
+++ b/include/configs/at91sam9rlek.h
@@ -107,7 +107,6 @@
"bootz 0x22000000 - 0x21000000"
#endif
-#define CONFIG_SYS_MAXARGS 16
#define CONFIG_SYS_LONGHELP 1
#define CONFIG_CMDLINE_EDITING 1
#define CONFIG_AUTO_COMPLETE
diff --git a/include/configs/at91sam9x5ek.h b/include/configs/at91sam9x5ek.h
index ff53e6712d0a567a99a283f89bba5885523bbb98..c50e0b816f37a5b549601a6bd15b7f0c973bd77a 100644
--- a/include/configs/at91sam9x5ek.h
+++ b/include/configs/at91sam9x5ek.h
@@ -135,7 +135,6 @@
#define CONFIG_ENV_SIZE 0x4000
#endif
-#define CONFIG_SYS_MAXARGS 16
#define CONFIG_SYS_LONGHELP
#define CONFIG_CMDLINE_EDITING
#define CONFIG_AUTO_COMPLETE
diff --git a/include/configs/axs10x.h b/include/configs/axs10x.h
index 7e0f26baafb6fe3c88b325f8b769aefb3bbf2e07..c7d2ac80a97482677b7dc4e6434b23675d7b7592 100644
--- a/include/configs/axs10x.h
+++ b/include/configs/axs10x.h
@@ -63,7 +63,6 @@
#define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS 1
#define CONFIG_AUTO_COMPLETE
-#define CONFIG_SYS_MAXARGS 16
#define CONFIG_CMDLINE_EDITING
/*
diff --git a/include/configs/boston.h b/include/configs/boston.h
index 76c9bde11b208c65783101ff9ee85cde480912f7..ee4e4a37eacf51ba706029d529fdba62fe217dff 100644
--- a/include/configs/boston.h
+++ b/include/configs/boston.h
@@ -44,7 +44,6 @@
/*
* Console
*/
-#define CONFIG_SYS_MAXARGS 16
#define CONFIG_SYS_LONGHELP
/*
diff --git a/include/configs/calimain.h b/include/configs/calimain.h
index 488645809cd9172d8328d76c0f92264e7d8b1ac8..60068d1fbb91f534fb8da3081414c3eaa450b72d 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_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)
#define CONFIG_LOADADDR 0xc0700000
diff --git a/include/configs/cm_t35.h b/include/configs/cm_t35.h
index 92c402e0a300630e8c351f31c3bfc0151547fa6e..42149d11e404b07609fe4498dda415c301c73ce5 100644
--- a/include/configs/cm_t35.h
+++ b/include/configs/cm_t35.h
@@ -175,7 +175,6 @@
#define CONFIG_TIMESTAMP
#define CONFIG_SYS_AUTOLOAD "no"
#define CONFIG_SYS_LONGHELP /* undef to save memory */
-#define CONFIG_SYS_MAXARGS 16 /* 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 16cc302302aabdda2c9664b8fe3a72e407c7d0ab..b1404c568e396f94740e398232060a5ba64600e8 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_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 ca49d21cfe610cdb18016efdd88bfed202a708a2..981a3fe4c2fd384442791d0c51ba509e77a871c2 100644
--- a/include/configs/colibri_pxa270.h
+++ b/include/configs/colibri_pxa270.h
@@ -84,7 +84,6 @@
#endif
#undef CONFIG_SYS_LONGHELP /* Saves 10 KB */
-#define CONFIG_SYS_MAXARGS 16
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
#define CONFIG_SYS_DEVICE_NULLDEV 1
#undef CONFIG_CMDLINE_EDITING /* Saves 2.5 KB */
diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h
index 0645bb730ceba9dc92f785d85898c152f953aeba..8166aa4afb190e41f8a6955523485b0f502d5fb4 100644
--- a/include/configs/colibri_vf.h
+++ b/include/configs/colibri_vf.h
@@ -141,7 +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_MAXARGS 16 /* max number of command args */
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
#define CONFIG_SYS_MEMTEST_START 0x80010000
diff --git a/include/configs/controlcenterd.h b/include/configs/controlcenterd.h
index c9ae2816fcd0596c9e5922d6cea291616ed61ff8..3dc597aef2243a93f965ca31a420ebddda3f346e 100644
--- a/include/configs/controlcenterd.h
+++ b/include/configs/controlcenterd.h
@@ -322,7 +322,6 @@
#endif /* CONFIG_TRAILBLAZER */
#define CONFIG_SYS_LOAD_ADDR 0x2000000 /* default load address */
-#define CONFIG_SYS_MAXARGS 16
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
#ifndef CONFIG_TRAILBLAZER
diff --git a/include/configs/corenet_ds.h b/include/configs/corenet_ds.h
index 6e07172e04b94124e6073bc72d1a97adadca7c43..a58c12a4545d6a6398cd8d7a5c3dcc29dbed2707 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_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 f6161e07542f0b36342ce2203aadd2c7f61e1514..cc671f25a8f9a9ae4411da1743436d87ae0a816e 100644
--- a/include/configs/corvus.h
+++ b/include/configs/corvus.h
@@ -106,7 +106,6 @@
"nand read 0x70000000 0x200000 0x300000;" \
"bootm 0x70000000"
-#define CONFIG_SYS_MAXARGS 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 19279ea8880a987d1c621de872ca96305412b00f..b47845449695c8e282204e22c52cabfe3d90f454 100644
--- a/include/configs/cyrus.h
+++ b/include/configs/cyrus.h
@@ -429,7 +429,6 @@
#define CONFIG_CMDLINE_EDITING /* Command-line editing */
#define CONFIG_AUTO_COMPLETE /* add autocompletion support */
#define CONFIG_SYS_LOAD_ADDR 0x2000000 /* default load address */
-#define CONFIG_SYS_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 48e63205462448ba83a43686a082f966ab716b51..c05c64cad731bd7356f4097ee0b4adfae977352f 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_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)
#define CONFIG_AUTO_COMPLETE
diff --git a/include/configs/dbau1x00.h b/include/configs/dbau1x00.h
index 6106920c7cea2727fd1fc55afcded1cdac0f0877..b0707143c267619785f43348eba688437028f6d8 100644
--- a/include/configs/dbau1x00.h
+++ b/include/configs/dbau1x00.h
@@ -71,8 +71,6 @@
*/
#define CONFIG_SYS_LONGHELP /* undef to save memory */
-#define CONFIG_SYS_MAXARGS 16 /* max number of command args*/
-
#define CONFIG_SYS_MALLOC_LEN 128*1024
#define CONFIG_SYS_BOOTPARAMS_LEN 128*1024
diff --git a/include/configs/devkit3250.h b/include/configs/devkit3250.h
index 3c4de83c5a3e98a23ad30dab5bfb642a032835fb..4ad4570caa0d5420be3cb028c39769325f6e642d 100644
--- a/include/configs/devkit3250.h
+++ b/include/configs/devkit3250.h
@@ -120,7 +120,6 @@
*/
#define CONFIG_SYS_LONGHELP
#define CONFIG_SYS_CBSIZE 1024
-#define CONFIG_SYS_MAXARGS 16
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
#define CONFIG_AUTO_COMPLETE
diff --git a/include/configs/ea20.h b/include/configs/ea20.h
index 58c2ac33b0be9c51f77ab0f11173c5e63020207e..c5e6e9ef725896a49dc2dc7ac2568e788aa5fa3c 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_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)
#define CONFIG_AUTO_COMPLETE
diff --git a/include/configs/eb_cpu5282.h b/include/configs/eb_cpu5282.h
index 0d7246aeb0fd1efedb1a1cb27ab88aa75745144e..17c7fa757eb9abc68316b90107433e254f685c34 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_MAXARGS 16 /* max number of command args */
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
#define CONFIG_SYS_LOAD_ADDR 0x20000
diff --git a/include/configs/ecovec.h b/include/configs/ecovec.h
index 1b697e85131f993109d311a2faa2e413abecd138..8c8f68f31f34d28408e48527940467099112002b 100644
--- a/include/configs/ecovec.h
+++ b/include/configs/ecovec.h
@@ -66,8 +66,6 @@
/* 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 */
#define CONFIG_SYS_BARGSIZE 512
/* List of legal baudrate settings for this board */
diff --git a/include/configs/edb93xx.h b/include/configs/edb93xx.h
index cf705bd57fc0dba7c4d21bfd82ea34eebe8567d9..fc06814761345f79d6e09d642cdd35f152851d79 100644
--- a/include/configs/edb93xx.h
+++ b/include/configs/edb93xx.h
@@ -80,7 +80,6 @@
#define CONFIG_SYS_CBSIZE 1024 /* Console I/O buffer size */
/* Boot argument buffer size */
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
-#define CONFIG_SYS_MAXARGS 16 /* Max number of command args */
/* Serial port hardware configuration */
#define CONFIG_PL010_SERIAL
diff --git a/include/configs/edminiv2.h b/include/configs/edminiv2.h
index fb44514289fc3b7dbbb78a41000b90247ac3a873..17d23839b8f25de57ab7770f02cfe5f98e68c1b7 100644
--- a/include/configs/edminiv2.h
+++ b/include/configs/edminiv2.h
@@ -203,7 +203,6 @@
#define CONFIG_SYS_MEMTEST_START 0x00400000
#define CONFIG_SYS_MEMTEST_END 0x007fffff
#define CONFIG_SYS_RESET_ADDRESS 0xffff0000
-#define CONFIG_SYS_MAXARGS 16
/* Enable command line editing */
#define CONFIG_CMDLINE_EDITING
diff --git a/include/configs/espt.h b/include/configs/espt.h
index 2d18018d6c4c6886eaf1f4e2234ff5e5e75c1ad5..934b52ac2f958c91f7902811f43fc91d76ea7936 100644
--- a/include/configs/espt.h
+++ b/include/configs/espt.h
@@ -25,7 +25,6 @@
#define CONFIG_SYS_TEXT_BASE 0x8FFC0000
#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
diff --git a/include/configs/ethernut5.h b/include/configs/ethernut5.h
index d67200b8b198f00ddd6b2f3fd889bf93c3f48041..9bf35328c69d90830ef0d3c436aa94a27111cfcf 100644
--- a/include/configs/ethernut5.h
+++ b/include/configs/ethernut5.h
@@ -166,7 +166,6 @@
"bootm 0x22000000"
/* Misc. u-boot settings */
-#define CONFIG_SYS_MAXARGS 16
#define CONFIG_SYS_LONGHELP
#define CONFIG_CMDLINE_EDITING
diff --git a/include/configs/exynos-common.h b/include/configs/exynos-common.h
index 031586b0dfc4112469d7243353cff4bde6329977..1670dac34ec7b7605422ecb73e8bce3604684b49 100644
--- a/include/configs/exynos-common.h
+++ b/include/configs/exynos-common.h
@@ -44,7 +44,6 @@
/* Miscellaneous configurable options */
#define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */
#define CONFIG_SYS_PBSIZE 1024 /* Print Buffer Size */
-#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/exynos7420-common.h b/include/configs/exynos7420-common.h
index b4b034fb3537de7381976757cb3ae14c76df3ff0..0aeec3900afcfe6a684b6cd0c608018a666b25f4 100644
--- a/include/configs/exynos7420-common.h
+++ b/include/configs/exynos7420-common.h
@@ -25,7 +25,6 @@
/* Miscellaneous configurable options */
#define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */
#define CONFIG_SYS_PBSIZE 1024 /* Print Buffer Size */
-#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/h2200.h b/include/configs/h2200.h
index 8bb149e56b2613405a617efec1be5ee08539346d..870014ddf4750d13bd999b27278bf789c5174c72 100644
--- a/include/configs/h2200.h
+++ b/include/configs/h2200.h
@@ -26,7 +26,6 @@
#define CONFIG_ENV_SIZE 0x00040000
#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 128*1024)
-#define CONFIG_SYS_MAXARGS 16
#define CONFIG_SYS_LOAD_ADDR 0xa3000000 /* default load address */
/*
diff --git a/include/configs/highbank.h b/include/configs/highbank.h
index 1946cad77ef345dd164bb31987bddbe5674ae0bf..b2b2c2500aff5f0b4860906a46952cb9412e09f4 100644
--- a/include/configs/highbank.h
+++ b/include/configs/highbank.h
@@ -54,7 +54,6 @@
* Miscellaneous configurable options
*/
#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
#define CONFIG_SYS_LOAD_ADDR 0x800000
diff --git a/include/configs/hrcon.h b/include/configs/hrcon.h
index f8cfc0d182b0d5e08b9dd59e1b642eecda27cfe8..95db26c971ece35e87085f350d02e5b5b7cb4f58 100644
--- a/include/configs/hrcon.h
+++ b/include/configs/hrcon.h
@@ -522,7 +522,6 @@ void fpga_control_clear(unsigned int bus, int pin);
#define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */
-#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 3b306c70ad182f5553e77c016d1e03440cc78660..5e8b3dda1b980f3b88eceac98b6f7076eb3130d0 100644
--- a/include/configs/hsdk.h
+++ b/include/configs/hsdk.h
@@ -73,7 +73,6 @@
#define CONFIG_AUTO_COMPLETE
#define CONFIG_CMDLINE_EDITING
#define CONFIG_SYS_LONGHELP
-#define CONFIG_SYS_MAXARGS 16
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
/*
diff --git a/include/configs/ids8313.h b/include/configs/ids8313.h
index 3c6e67a797aab00ce830dc832b607887bcca5c5b..1a8c27353374a96f4a8de4a1394aac2ac53e797c 100644
--- a/include/configs/ids8313.h
+++ b/include/configs/ids8313.h
@@ -451,7 +451,6 @@
*/
#define CONFIG_SYS_LONGHELP
#define CONFIG_SYS_CBSIZE 1024
-#define CONFIG_SYS_MAXARGS 16
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
#define CONFIG_SYS_MEMTEST_START 0x00001000
diff --git a/include/configs/imgtec_xilfpga.h b/include/configs/imgtec_xilfpga.h
index 934b76ecaf5c9f59da6fa9a87af082a9660dc754..4ae64bbcb7d311dd36c1b642916889ce69ee424c 100644
--- a/include/configs/imgtec_xilfpga.h
+++ b/include/configs/imgtec_xilfpga.h
@@ -46,7 +46,6 @@
* Console Configuration
*/
#define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */
-#define CONFIG_SYS_MAXARGS 16 /* max number of command args*/
/* -------------------------------------------------
* Environment
diff --git a/include/configs/imx27lite-common.h b/include/configs/imx27lite-common.h
index ba4bfb0f40e6ea7d0a0fd8e6e70315e62aa9d637..7c680954cb2d120bfc1f211a62b2bd4664961ee1 100644
--- a/include/configs/imx27lite-common.h
+++ b/include/configs/imx27lite-common.h
@@ -141,7 +141,6 @@
* U-Boot general configuration
*/
#define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */
-#define CONFIG_SYS_MAXARGS 16 /* max number of command args */
/* Boot Argument Buffer Size */
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
#define CONFIG_CMDLINE_EDITING
diff --git a/include/configs/imx31_phycore.h b/include/configs/imx31_phycore.h
index 83ef16179597a382cd5ac3b1439ce05be51b48e4..5f2ee28b5e41c598501554c51b0992ccab421c15 100644
--- a/include/configs/imx31_phycore.h
+++ b/include/configs/imx31_phycore.h
@@ -93,8 +93,6 @@
* Miscellaneous configurable options
*/
#define CONFIG_SYS_LONGHELP /* undef to save memory */
-/* max number of command args */
-#define CONFIG_SYS_MAXARGS 16
/* Boot Argument Buffer Size */
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
diff --git a/include/configs/integrator-common.h b/include/configs/integrator-common.h
index ef9f429ec8670fc903f213720cf244ea25edee2c..8d9ec33c49403697ff8429cb0b78cc91f17d99a6 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_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 9e7874a26a6bbdc78097651c95062aa47d9f5d79..1899732e5fb9cc5e88ddbf6f8ec612f273d09337 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_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)
#define CONFIG_AUTO_COMPLETE
diff --git a/include/configs/kc1.h b/include/configs/kc1.h
index d1f7a48a81b9e912420f692ce69e6975ab845045..8d8dc26616d01d1d0966df0481fbebb13b67d893 100644
--- a/include/configs/kc1.h
+++ b/include/configs/kc1.h
@@ -96,7 +96,6 @@
#define CONFIG_SYS_LONGHELP
-#define CONFIG_SYS_MAXARGS 16
#define CONFIG_SYS_CBSIZE 512
/*
diff --git a/include/configs/kzm9g.h b/include/configs/kzm9g.h
index fc9214530a8ae8636f993fcdde0e292b3a050f1a..b408cd4489f293c0a92a93b6be36060ba1911ddc 100644
--- a/include/configs/kzm9g.h
+++ b/include/configs/kzm9g.h
@@ -41,7 +41,6 @@
/* prompt */
#define CONFIG_SYS_LONGHELP
#define CONFIG_SYS_PBSIZE 256
-#define CONFIG_SYS_MAXARGS 16
#define CONFIG_SYS_BARGSIZE 512
#define CONFIG_SYS_BAUDRATE_TABLE { 115200 }
diff --git a/include/configs/legoev3.h b/include/configs/legoev3.h
index bc953d71ee802d99bcb823b77e8a23c363675caa..c27373c56c24ec84b4427c5eca6b861f426a24af 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_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)
#define CONFIG_AUTO_COMPLETE
diff --git a/include/configs/ls1021aiot.h b/include/configs/ls1021aiot.h
index 57686b9c52a7b598224dc8b8b8c4187149e65cf3..15aeea1433faab11e411ef4a130f4c06ab6ccaf5 100644
--- a/include/configs/ls1021aiot.h
+++ b/include/configs/ls1021aiot.h
@@ -240,7 +240,6 @@
#define CONFIG_SYS_LONGHELP /* undef to save memory */
#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
#define CONFIG_AUTO_COMPLETE
-#define CONFIG_SYS_MAXARGS 16 /* max number of command args */
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
#define CONFIG_CMD_GREPENV
diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h
index bee5ee04b20e8ce7e92d17c8d62ecd292f7a988a..9b6284635e62b612e6da1b0a21f74427f2c180cd 100644
--- a/include/configs/ls1021aqds.h
+++ b/include/configs/ls1021aqds.h
@@ -512,7 +512,6 @@ unsigned long get_board_ddr_clk(void);
*/
#define CONFIG_SYS_LONGHELP /* undef to save memory */
#define CONFIG_AUTO_COMPLETE
-#define CONFIG_SYS_MAXARGS 16 /* max number of command args */
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
#define CONFIG_SYS_MEMTEST_START 0x80000000
diff --git a/include/configs/ls1021atwr.h b/include/configs/ls1021atwr.h
index ccabd9b2e522af350f7831158343129159a77244..2bf91d0aff1bbc3de101b0c2337e198864642a85 100644
--- a/include/configs/ls1021atwr.h
+++ b/include/configs/ls1021atwr.h
@@ -489,7 +489,6 @@
*/
#define CONFIG_SYS_LONGHELP /* undef to save memory */
#define CONFIG_AUTO_COMPLETE
-#define CONFIG_SYS_MAXARGS 16 /* max number of command args */
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
#define CONFIG_SYS_MEMTEST_START 0x80000000
diff --git a/include/configs/malta.h b/include/configs/malta.h
index 3f4bea80fd505333e1a76a9fda3d20c33b3c328f..e15c6bba7544da8f9452698a1dc2ee488a6cc654 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_MAXARGS 16
-
#define CONFIG_AUTO_COMPLETE
#define CONFIG_CMDLINE_EDITING
diff --git a/include/configs/mcx.h b/include/configs/mcx.h
index 940a61b38c552eb59f4c4c18d1f68b794d3e323b..c06d618af2d202e38138dba77cdd6a2749b87394 100644
--- a/include/configs/mcx.h
+++ b/include/configs/mcx.h
@@ -213,8 +213,6 @@
*/
#define CONFIG_SYS_LONGHELP /* undef to save memory */
#define CONFIG_SYS_CBSIZE 1024/* Console I/O Buffer Size */
-#define CONFIG_SYS_MAXARGS 16 /* max number of command */
- /* args */
/* Boot Argument Buffer Size */
#define CONFIG_SYS_BARGSIZE (CONFIG_SYS_CBSIZE)
/* memtest works on */
diff --git a/include/configs/meesc.h b/include/configs/meesc.h
index 32abba163491d68348dbce1ead3de7c025507d3e..15402217b439e976513b0077e79acf341e874844 100644
--- a/include/configs/meesc.h
+++ b/include/configs/meesc.h
@@ -118,7 +118,6 @@
#endif
#define CONFIG_SYS_CBSIZE 512
-#define CONFIG_SYS_MAXARGS 16
#define CONFIG_SYS_LONGHELP
#define CONFIG_CMDLINE_EDITING
#define CONFIG_AUTO_COMPLETE
diff --git a/include/configs/mpc8308_p1m.h b/include/configs/mpc8308_p1m.h
index 33c08e8ad1de4be5cf91c709cc9b28517657b846..f97773146adcef0055a3da5568ef75c64fccd6c9 100644
--- a/include/configs/mpc8308_p1m.h
+++ b/include/configs/mpc8308_p1m.h
@@ -393,7 +393,6 @@
#define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */
-#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 aa1b676cf9907aa9f0f0fc946dee9b919804da97..761558cf7ecfb8127cf546926de447657f8a20db 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_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 */
#define CONFIG_SYS_LOAD_ADDR (CONFIG_SYS_SDRAM_BASE + 32 * 1024 * 1024)
diff --git a/include/configs/ms7720se.h b/include/configs/ms7720se.h
index 08adb0bca20778c87b20a8da8bbd742ee44bb77b..19cbe8686d0cedd260d3dbddb0d61c20a4e645d7 100644
--- a/include/configs/ms7720se.h
+++ b/include/configs/ms7720se.h
@@ -26,7 +26,6 @@
#define CONFIG_SYS_TEXT_BASE 0x8FFC0000
#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
/* List of legal baudrate settings for this board */
diff --git a/include/configs/ms7722se.h b/include/configs/ms7722se.h
index a7f2ca8b06297f2049d2c05798f2b1747a53d908..ca9fcd429f70bcfec8cf2328d9f3293dbf7a259d 100644
--- a/include/configs/ms7722se.h
+++ b/include/configs/ms7722se.h
@@ -27,7 +27,6 @@
#define CONFIG_SYS_TEXT_BASE 0x8FFC0000
#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/ms7750se.h b/include/configs/ms7750se.h
index a875a700ff97e7a2d5ba4d7aa5cbef668692dcc4..f67912dd8ee0cd2683c32e4c5b1d8332347a2457 100644
--- a/include/configs/ms7750se.h
+++ b/include/configs/ms7750se.h
@@ -30,7 +30,6 @@
#define CONFIG_SYS_LONGHELP
#define CONFIG_SYS_PBSIZE 256
-#define CONFIG_SYS_MAXARGS 16
#define CONFIG_SYS_BARGSIZE 512
#define CONFIG_SYS_TEXT_BASE 0x8FFC0000
diff --git a/include/configs/mx25pdk.h b/include/configs/mx25pdk.h
index a010371e2fab88f8348326c0308d04b2af8b83a1..6f98bb07e8feb5767c3bf5a8c6863bdf640d6c1f 100644
--- a/include/configs/mx25pdk.h
+++ b/include/configs/mx25pdk.h
@@ -63,7 +63,6 @@
/* U-Boot general configuration */
#define CONFIG_AUTO_COMPLETE
#define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */
-#define CONFIG_SYS_MAXARGS 16 /* max number of command args */
/* Boot Argument Buffer Size */
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
#define CONFIG_CMDLINE_EDITING
@@ -200,7 +199,6 @@
#define CONFIG_SYS_LONGHELP
#define CONFIG_AUTO_COMPLETE
-#define CONFIG_SYS_MAXARGS 16
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
#endif /* __CONFIG_H */
diff --git a/include/configs/mx31ads.h b/include/configs/mx31ads.h
index 77275a2d7a9dc3ef7c804583a7425354a8397d65..d6eaabf812384ac64f099f24c076066c9b266bae 100644
--- a/include/configs/mx31ads.h
+++ b/include/configs/mx31ads.h
@@ -95,7 +95,6 @@
* Miscellaneous configurable options
*/
#define CONFIG_SYS_LONGHELP /* undef to save memory */
-#define CONFIG_SYS_MAXARGS 16 /* max number of command args */
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE /* Boot Argument Buffer Size */
#define CONFIG_SYS_MEMTEST_START 0 /* memtest works on */
diff --git a/include/configs/mx31pdk.h b/include/configs/mx31pdk.h
index 4e0ccc9b3a774e0c8df57444bb9a9772b961ecc5..63db73b7d322de04f75d2ff826888808c8364ab5 100644
--- a/include/configs/mx31pdk.h
+++ b/include/configs/mx31pdk.h
@@ -87,8 +87,6 @@
* Miscellaneous configurable options
*/
#define CONFIG_SYS_LONGHELP /* undef to save memory */
-/* max number of command args */
-#define CONFIG_SYS_MAXARGS 16
/* Boot Argument Buffer Size */
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
diff --git a/include/configs/mx35pdk.h b/include/configs/mx35pdk.h
index 659effb2162b8c0fbe316f3681c11a4ef1b3a960..93846a9d06d72bf7d972c1895f643e2c4e63c441 100644
--- a/include/configs/mx35pdk.h
+++ b/include/configs/mx35pdk.h
@@ -110,7 +110,6 @@
#define CONFIG_CMDLINE_EDITING
#define CONFIG_AUTO_COMPLETE
-#define CONFIG_SYS_MAXARGS 16 /* max number of command args */
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE /* Boot Argument Buffer Size */
#define CONFIG_SYS_MEMTEST_START 0 /* memtest works on */
diff --git a/include/configs/mx51evk.h b/include/configs/mx51evk.h
index 3692f54b183cd192a46f45c07a6d748c5396e823..0620354daf5f59d3f2785e2be5d6f16fdacab0dc 100644
--- a/include/configs/mx51evk.h
+++ b/include/configs/mx51evk.h
@@ -175,7 +175,6 @@
*/
#define CONFIG_SYS_LONGHELP /* undef to save memory */
#define CONFIG_AUTO_COMPLETE
-#define CONFIG_SYS_MAXARGS 16 /* max number of command args */
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE /* Boot Argument Buffer Size */
#define CONFIG_SYS_MEMTEST_START 0x90000000
diff --git a/include/configs/mx53ard.h b/include/configs/mx53ard.h
index 2505783e391e4e35aab3a03cdef23970924ad9c3..c3ab5f5a39cae3a0397b621f7c7e8799a4e3e636 100644
--- a/include/configs/mx53ard.h
+++ b/include/configs/mx53ard.h
@@ -162,7 +162,6 @@
#define CONFIG_SYS_LONGHELP /* undef to save memory */
#define CONFIG_AUTO_COMPLETE
-#define CONFIG_SYS_MAXARGS 16 /* max number of command args */
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE /* Boot Argument Buffer Size */
#define CONFIG_SYS_MEMTEST_START 0x70000000
diff --git a/include/configs/mx53cx9020.h b/include/configs/mx53cx9020.h
index 8243aeab53b8785aad3a692be36e8b6b509f7cac..6273fb8a49765e75c2b1c4753e950177d2bbc463 100644
--- a/include/configs/mx53cx9020.h
+++ b/include/configs/mx53cx9020.h
@@ -146,7 +146,6 @@
#define CONFIG_AUTO_COMPLETE
#define CONFIG_SYS_CBSIZE 512 /* Console I/O Buffer Size */
-#define CONFIG_SYS_MAXARGS 16 /* max number of command args */
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE /* Boot Argument Buffer Size */
#define CONFIG_SYS_MEMTEST_START 0x70000000
diff --git a/include/configs/mx53evk.h b/include/configs/mx53evk.h
index 19fd1e52111fbcd96f8d36d5988affc802048ee6..8394bf1b1aecf21d5c65be1fe8d75a5df6f6502e 100644
--- a/include/configs/mx53evk.h
+++ b/include/configs/mx53evk.h
@@ -109,7 +109,6 @@
#define CONFIG_SYS_LONGHELP /* undef to save memory */
#define CONFIG_AUTO_COMPLETE
-#define CONFIG_SYS_MAXARGS 16 /* max number of command args */
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE /* Boot Argument Buffer Size */
#define CONFIG_SYS_MEMTEST_START 0x70000000
diff --git a/include/configs/mx53loco.h b/include/configs/mx53loco.h
index 3828b21a8e0d4dc0439d3ba5a533fd6c39342067..49eef460d9477a19cb6981e457c34ef77cadfa68 100644
--- a/include/configs/mx53loco.h
+++ b/include/configs/mx53loco.h
@@ -156,7 +156,6 @@
#define CONFIG_AUTO_COMPLETE
#define CONFIG_SYS_CBSIZE 512 /* Console I/O Buffer Size */
-#define CONFIG_SYS_MAXARGS 16 /* max number of command args */
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE /* Boot Argument Buffer Size */
#define CONFIG_SYS_MEMTEST_START 0x70000000
diff --git a/include/configs/mx53smd.h b/include/configs/mx53smd.h
index 66d7a4293f75f2a5ecb55b4e8c9fed4836b91989..2e5660534b99309541bc291be5cd8555d81483ea 100644
--- a/include/configs/mx53smd.h
+++ b/include/configs/mx53smd.h
@@ -101,7 +101,6 @@
#define CONFIG_SYS_LONGHELP /* undef to save memory */
#define CONFIG_AUTO_COMPLETE
-#define CONFIG_SYS_MAXARGS 16 /* max number of command args */
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE /* Boot Argument Buffer Size */
#define CONFIG_SYS_MEMTEST_START 0x70000000
diff --git a/include/configs/nokia_rx51.h b/include/configs/nokia_rx51.h
index d8435312686971104daaafdb1935dabcafadee24..1a486806c1def60a7612bf41d9d064be18e48177 100644
--- a/include/configs/nokia_rx51.h
+++ b/include/configs/nokia_rx51.h
@@ -331,7 +331,6 @@ int rx51_kp_getc(struct stdio_dev *sdev);
* Miscellaneous configurable options
*/
#define CONFIG_SYS_LONGHELP /* undef to save memory */
-#define CONFIG_SYS_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 bba285c7d5b2034ad872d00a9061cb00fd2cd0e3..c62fe82081bdf77b6c6d4df5183c50821081c3f2 100644
--- a/include/configs/nsim.h
+++ b/include/configs/nsim.h
@@ -36,7 +36,6 @@
* Command line configuration
*/
#define CONFIG_AUTO_COMPLETE
-#define CONFIG_SYS_MAXARGS 16
#define CONFIG_CMDLINE_EDITING
/*
diff --git a/include/configs/omapl138_lcdk.h b/include/configs/omapl138_lcdk.h
index 7d0ff2f84f3872d0a10e49d04d92e8e2d62c43c9..58b683a481c34f79acd6926fd638c655af02b812 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_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)
#define CONFIG_AUTO_COMPLETE
diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h
index bf4dc396a8b346999ccb1aa7d6e39fe0c4d44079..b757edbcb3fc60302dabe005477bbc8a21e3bfae 100644
--- a/include/configs/p1_p2_rdb_pc.h
+++ b/include/configs/p1_p2_rdb_pc.h
@@ -825,7 +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_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 cd0fc3d39ee7bd4a1d12c2b24425d8c6d91bc15b..0d8ef1e8e2b2ab778bccc2a96d89a247182c5ba0 100644
--- a/include/configs/p1_twr.h
+++ b/include/configs/p1_twr.h
@@ -397,7 +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_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 ce5b7e2c25b701adc0e7a0fc5260e8b41a48e0e3..a9092d4b6d2e3e5895c4b9dabe2555c92aed2cb3 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_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 3ff6bab9c216bda17c92ff4057abc0e814cc260e..6d0d85dd2660fba08d81b5843c97edbff61ab20c 100644
--- a/include/configs/pcm052.h
+++ b/include/configs/pcm052.h
@@ -203,7 +203,6 @@
#define CONFIG_SYS_LONGHELP /* undef to save memory */
#define CONFIG_AUTO_COMPLETE
#define CONFIG_CMDLINE_EDITING
-#define CONFIG_SYS_MAXARGS 16 /* max number of command args */
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
#define CONFIG_SYS_MEMTEST_START 0x80010000
diff --git a/include/configs/pic32mzdask.h b/include/configs/pic32mzdask.h
index 31d90e51db642b78ca552edc7b66c40bb1d6634f..97636fee38593a73264dc1c6f93961ac0454f73b 100644
--- a/include/configs/pic32mzdask.h
+++ b/include/configs/pic32mzdask.h
@@ -58,7 +58,6 @@
* Console Configuration
*/
#define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */
-#define CONFIG_SYS_MAXARGS 16 /* max number of command args*/
#define CONFIG_CMDLINE_EDITING 1
/*-----------------------------------------------------------------------
diff --git a/include/configs/picosam9g45.h b/include/configs/picosam9g45.h
index 563b501db2dec913720a6e738f522924fae12e36..dc7a67d77cb1985ad56bdb5de71abbea97413d35 100644
--- a/include/configs/picosam9g45.h
+++ b/include/configs/picosam9g45.h
@@ -111,7 +111,6 @@
"bootz 0x22000000 - 0x21000000"
#endif
-#define CONFIG_SYS_MAXARGS 16
#define CONFIG_SYS_LONGHELP
#define CONFIG_CMDLINE_EDITING
#define CONFIG_AUTO_COMPLETE
diff --git a/include/configs/pm9261.h b/include/configs/pm9261.h
index 44750aa27071ff6c69b78071aad36d8a71ece0d1..51a72a46b0fd6ceba60a401bcf73e0cfdb3e3d84 100644
--- a/include/configs/pm9261.h
+++ b/include/configs/pm9261.h
@@ -278,7 +278,6 @@
#error "Undefined memory device"
#endif
-#define CONFIG_SYS_MAXARGS 16
#define CONFIG_SYS_LONGHELP 1
#define CONFIG_CMDLINE_EDITING 1
diff --git a/include/configs/pm9263.h b/include/configs/pm9263.h
index 52658b2d566c7143624283de8d496f4e7e93d8c4..8edd8cae4ca3479fcbab8979c2611652034991fc 100644
--- a/include/configs/pm9263.h
+++ b/include/configs/pm9263.h
@@ -309,7 +309,6 @@
#error "Undefined memory device"
#endif
-#define CONFIG_SYS_MAXARGS 16
#define CONFIG_SYS_LONGHELP 1
#define CONFIG_CMDLINE_EDITING 1
diff --git a/include/configs/pm9g45.h b/include/configs/pm9g45.h
index a5fed7a270515c0ad9500348a1af30a91220ad8e..e11c67fc1c85acbcdcf4baaabb3bcdda46410dfb 100644
--- a/include/configs/pm9g45.h
+++ b/include/configs/pm9g45.h
@@ -119,7 +119,6 @@
#define CONFIG_ENV_SIZE 0x20000 /* 1 sector = 128 kB */
#define CONFIG_BOOTCOMMAND "nand read 0x72000000 0x200000 0x200000; bootm"
-#define CONFIG_SYS_MAXARGS 16
#define CONFIG_SYS_LONGHELP 1
#define CONFIG_CMDLINE_EDITING 1
#define CONFIG_AUTO_COMPLETE
diff --git a/include/configs/qemu-mips.h b/include/configs/qemu-mips.h
index 62a3ff0350acd3340f520e5507f7f4dcb9bdbe02..271440430fd246a26d4ed9b133ab8decaac2e5cc 100644
--- a/include/configs/qemu-mips.h
+++ b/include/configs/qemu-mips.h
@@ -70,9 +70,6 @@
#define CONFIG_AUTO_COMPLETE
#define CONFIG_CMDLINE_EDITING
-/* max number of command args */
-#define CONFIG_SYS_MAXARGS 16
-
#define CONFIG_SYS_MALLOC_LEN (256 << 10)
#define CONFIG_SYS_BOOTPARAMS_LEN 128*1024
diff --git a/include/configs/qemu-mips64.h b/include/configs/qemu-mips64.h
index f2928d06c0744340967abc2ac1b7fb4d11cbc59b..063e504e7a0cc2bf42a853ab0cba4dbb4067a524 100644
--- a/include/configs/qemu-mips64.h
+++ b/include/configs/qemu-mips64.h
@@ -70,9 +70,6 @@
#define CONFIG_AUTO_COMPLETE
#define CONFIG_CMDLINE_EDITING
-/* max number of command args */
-#define CONFIG_SYS_MAXARGS 16
-
#define CONFIG_SYS_MALLOC_LEN (256 << 10)
#define CONFIG_SYS_BOOTPARAMS_LEN 128*1024
diff --git a/include/configs/qemu-ppce500.h b/include/configs/qemu-ppce500.h
index 6554a9d98f0400f36c4352d18e393b124876d7e4..20cc594686a31e404f4471ad40f721a5a0514718 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_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 1408fc95926bc682d6231c53ac4d6fa8092782d8..1550976d4894e90b24045b3e6930a74a5efa6022 100644
--- a/include/configs/r0p7734.h
+++ b/include/configs/r0p7734.h
@@ -36,8 +36,6 @@
/* undef to save memory */
#define CONFIG_SYS_LONGHELP
-/* max args accepted for monitor commands */
-#define CONFIG_SYS_MAXARGS 16
/* Buffer size for Boot Arguments passed to kernel */
#define CONFIG_SYS_BARGSIZE 512
/* List of legal baudrate settings for this board */
diff --git a/include/configs/r2dplus.h b/include/configs/r2dplus.h
index 8bddb4ee7a52349105139af4cd7c1553b7b232c4..5728ef08b25865515eda7f79f19c134ab0e501bb 100644
--- a/include/configs/r2dplus.h
+++ b/include/configs/r2dplus.h
@@ -20,7 +20,6 @@
#define CONFIG_SYS_TEXT_BASE 0x8FE00000
#define CONFIG_SYS_LONGHELP
#define CONFIG_SYS_PBSIZE 256
-#define CONFIG_SYS_MAXARGS 16
#define CONFIG_SYS_BARGSIZE 512
#define CONFIG_SYS_MEMTEST_START (CONFIG_SYS_SDRAM_BASE)
diff --git a/include/configs/r7780mp.h b/include/configs/r7780mp.h
index 951cfca089868130b99860ffd438e41aee4c54d2..857fc10b5af9afd9c1bf0b1287db30b48b85c2e3 100644
--- a/include/configs/r7780mp.h
+++ b/include/configs/r7780mp.h
@@ -27,7 +27,6 @@
#define CONFIG_SYS_LONGHELP
#define CONFIG_SYS_PBSIZE 256
-#define CONFIG_SYS_MAXARGS 16
#define CONFIG_SYS_BARGSIZE 512
#define CONFIG_SYS_MEMTEST_START (CONFIG_SYS_SDRAM_BASE)
diff --git a/include/configs/rcar-gen2-common.h b/include/configs/rcar-gen2-common.h
index 68e3a23500fd83e6c4874ebd337c05c109ed0fcd..a137ac474564a345d1b8ff090b757c483f3e06a5 100644
--- a/include/configs/rcar-gen2-common.h
+++ b/include/configs/rcar-gen2-common.h
@@ -32,7 +32,6 @@
#define CONFIG_SYS_LONGHELP
#define CONFIG_SYS_PBSIZE 256
-#define CONFIG_SYS_MAXARGS 16
#define CONFIG_SYS_BARGSIZE 512
#define CONFIG_SYS_BAUDRATE_TABLE { 38400, 115200 }
diff --git a/include/configs/rk3036_common.h b/include/configs/rk3036_common.h
index d78de6012aedf44c729b23dfdc06ab78806d164a..6441b7559efd33ac3850ae1ea5aa371d5d23405b 100644
--- a/include/configs/rk3036_common.h
+++ b/include/configs/rk3036_common.h
@@ -11,7 +11,6 @@
#define CONFIG_NR_DRAM_BANKS 1
#define CONFIG_ENV_SIZE 0x2000
-#define CONFIG_SYS_MAXARGS 16
#define CONFIG_SYS_MALLOC_LEN (32 << 20)
#define CONFIG_SYS_CBSIZE 1024
#define CONFIG_SKIP_LOWLEVEL_INIT
diff --git a/include/configs/rk3188_common.h b/include/configs/rk3188_common.h
index 324aa95578825959a31fca67a9e47e73d08738ba..51386885f8978261f0abf434a5e93a4379aa9461 100644
--- a/include/configs/rk3188_common.h
+++ b/include/configs/rk3188_common.h
@@ -15,7 +15,6 @@
#define CONFIG_SKIP_LOWLEVEL_INIT_ONLY
#define CONFIG_NR_DRAM_BANKS 1
#define CONFIG_ENV_SIZE 0x2000
-#define CONFIG_SYS_MAXARGS 16
#define CONFIG_SYS_MALLOC_LEN (32 << 20)
#define CONFIG_SYS_CBSIZE 1024
diff --git a/include/configs/rk322x_common.h b/include/configs/rk322x_common.h
index 224687643009f5079c6b84745872c35809f50460..4a373ccc7b25e6d412ea2694990d9ccd2b9e6ef4 100644
--- a/include/configs/rk322x_common.h
+++ b/include/configs/rk322x_common.h
@@ -11,7 +11,6 @@
#define CONFIG_SKIP_LOWLEVEL_INIT
#define CONFIG_ENV_SIZE 0x2000
-#define CONFIG_SYS_MAXARGS 16
#define CONFIG_SYS_MALLOC_LEN (32 << 20)
#define CONFIG_SYS_CBSIZE 1024
#define CONFIG_SYS_BOOTM_LEN (64 << 20) /* 64M */
diff --git a/include/configs/rk3288_common.h b/include/configs/rk3288_common.h
index dfdb500763d53c26dc4c43e1d65c0141fc2efd20..c7757f023f6ad19b05a5403fb2d7e8b213f562fb 100644
--- a/include/configs/rk3288_common.h
+++ b/include/configs/rk3288_common.h
@@ -13,7 +13,6 @@
#define CONFIG_SKIP_LOWLEVEL_INIT_ONLY
#define CONFIG_NR_DRAM_BANKS 1
#define CONFIG_ENV_SIZE 0x2000
-#define CONFIG_SYS_MAXARGS 16
#define CONFIG_SYS_MALLOC_LEN (32 << 20)
#define CONFIG_SYS_CBSIZE 1024
diff --git a/include/configs/rk3328_common.h b/include/configs/rk3328_common.h
index 906c821aeffb76dcc2fd375b2022aba93d3f42db..9819b22ce23662f779a8faa843cd620536489ff1 100644
--- a/include/configs/rk3328_common.h
+++ b/include/configs/rk3328_common.h
@@ -10,7 +10,6 @@
#include "rockchip-common.h"
#define CONFIG_ENV_SIZE 0x2000
-#define CONFIG_SYS_MAXARGS 16
#define CONFIG_SYS_MALLOC_LEN (32 << 20)
#define CONFIG_SYS_CBSIZE 1024
#define CONFIG_SKIP_LOWLEVEL_INIT
diff --git a/include/configs/rk3368_common.h b/include/configs/rk3368_common.h
index a89c69a72b5158cc0aa74625b5ac9e4cb2955533..8cba92c56de225b03b07418f5b9d05bc15ba1c3f 100644
--- a/include/configs/rk3368_common.h
+++ b/include/configs/rk3368_common.h
@@ -15,7 +15,6 @@
#define CONFIG_SYS_SDRAM_BASE 0
#define SDRAM_MAX_SIZE 0xff000000
#define CONFIG_NR_DRAM_BANKS 1
-#define CONFIG_SYS_MAXARGS 16
#define CONFIG_BAUDRATE 115200
#define CONFIG_SYS_MALLOC_LEN (32 << 20)
#define CONFIG_SYS_CBSIZE 1024
diff --git a/include/configs/rk3399_common.h b/include/configs/rk3399_common.h
index 33178879e24abe88e8a89284fea4fac88ad01f7a..35c763fe353f7b361c2807811603ff46ef077c24 100644
--- a/include/configs/rk3399_common.h
+++ b/include/configs/rk3399_common.h
@@ -11,7 +11,6 @@
#define CONFIG_NR_DRAM_BANKS 1
#define CONFIG_ENV_SIZE 0x2000
-#define CONFIG_SYS_MAXARGS 16
#define CONFIG_SYS_MALLOC_LEN (32 << 20)
#define CONFIG_SYS_CBSIZE 1024
#define CONFIG_SKIP_LOWLEVEL_INIT
diff --git a/include/configs/rpi.h b/include/configs/rpi.h
index 3a956dbf0b48e2d5130b3fc35d9715e6a21b3d48..b94f75278215753fc8cd249817f6c8bf20cee609 100644
--- a/include/configs/rpi.h
+++ b/include/configs/rpi.h
@@ -94,7 +94,6 @@
#define CONFIG_PREBOOT "usb start"
/* Shell */
-#define CONFIG_SYS_MAXARGS 16
#define CONFIG_CMDLINE_EDITING
/* ATAGs support for bootm/bootz */
diff --git a/include/configs/rsk7203.h b/include/configs/rsk7203.h
index 6455886778153d9c93143812ecaedf8d70c83ea5..2f847462e26a22d3175719d1894db7be8a2a9e39 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_MAXARGS 16 /* max args accepted for monitor commands */
/* Buffer size for Boot Arguments passed to kernel */
#define CONFIG_SYS_BARGSIZE 512
/* List of legal baudrate settings for this board */
diff --git a/include/configs/rsk7264.h b/include/configs/rsk7264.h
index b958e21fcc52baef0c28786464cf1e3441d48e08..d717562f8e2112ba42d2fd02e2bef0c6a8a7878f 100644
--- a/include/configs/rsk7264.h
+++ b/include/configs/rsk7264.h
@@ -20,7 +20,6 @@
#define CONFIG_SYS_LONGHELP 1 /* 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 */
/* Serial */
#define CONFIG_CONS_SCIF3 1
diff --git a/include/configs/rsk7269.h b/include/configs/rsk7269.h
index 8fc6083d3d98518ff1893b3441615af81e3890ad..ac53f198c6bf573d7ac6d153212287c3a2b0205d 100644
--- a/include/configs/rsk7269.h
+++ b/include/configs/rsk7269.h
@@ -19,7 +19,6 @@
#define CONFIG_SYS_LONGHELP /* undef to save memory */
#define CONFIG_SYS_PBSIZE 256 /* Print Buffer Size */
-#define CONFIG_SYS_MAXARGS 16 /* max number of command args */
/* Serial */
#define CONFIG_CONS_SCIF7
diff --git a/include/configs/rv1108_common.h b/include/configs/rv1108_common.h
index 2b63abce467f5b8181cd9ae2b47983d68f632c8c..04779162d00c347ac90e96c0ce944e602987f4b2 100644
--- a/include/configs/rv1108_common.h
+++ b/include/configs/rv1108_common.h
@@ -10,7 +10,6 @@
#include "rockchip-common.h"
#define CONFIG_ENV_SIZE 0x2000
-#define CONFIG_SYS_MAXARGS 16
#define CONFIG_SYS_MALLOC_LEN (32 << 20)
#define CONFIG_SYS_CBSIZE 1024
#define CONFIG_SKIP_LOWLEVEL_INIT
diff --git a/include/configs/s32v234evb.h b/include/configs/s32v234evb.h
index a7405893bc08f23bb97b94760e4aa8d52c3a9989..4602bd6b40d4488b637f2bb1869b98250a8ff6ef 100644
--- a/include/configs/s32v234evb.h
+++ b/include/configs/s32v234evb.h
@@ -164,7 +164,6 @@
#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
#define CONFIG_SYS_PROMPT "=> "
#undef CONFIG_AUTO_COMPLETE
-#define CONFIG_SYS_MAXARGS 16 /* max number of command args */
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
#define CONFIG_CMDLINE_EDITING
diff --git a/include/configs/s5p_goni.h b/include/configs/s5p_goni.h
index 448e923a72c7f94030046ec289049f323ae5a088..4df42f0456edb9a7d9f1f8f01171f1f8a1368afb 100644
--- a/include/configs/s5p_goni.h
+++ b/include/configs/s5p_goni.h
@@ -169,7 +169,6 @@
#define CONFIG_SYS_LONGHELP /* undef to save memory */
#define CONFIG_SYS_PBSIZE 384 /* Print Buffer Size */
-#define CONFIG_SYS_MAXARGS 16 /* max number of command args */
/* Boot Argument Buffer Size */
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
/* memtest works on */
diff --git a/include/configs/sandbox.h b/include/configs/sandbox.h
index 18d1b6bea78cbf64c64a9c4139274e85156731b1..71c2ae3b3951aeb3ab5b3e4a72053a62cc4a03ce 100644
--- a/include/configs/sandbox.h
+++ b/include/configs/sandbox.h
@@ -39,8 +39,6 @@
#define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */
#define CONFIG_DISPLAY_BOARDINFO_LATE
-#define CONFIG_SYS_MAXARGS 16
-
/* turn on command-line edit/c/auto */
#define CONFIG_CMDLINE_EDITING
#define CONFIG_AUTO_COMPLETE
diff --git a/include/configs/sbc8349.h b/include/configs/sbc8349.h
index 61c16d88019bd7bac523a3750a9a6ab1c7428d2b..65fe93107ae2ee89a6f5ada31e7143e91634a505 100644
--- a/include/configs/sbc8349.h
+++ b/include/configs/sbc8349.h
@@ -406,7 +406,6 @@
#define CONFIG_SYS_LONGHELP /* undef to save memory */
#define CONFIG_SYS_LOAD_ADDR 0x2000000 /* default load address */
-#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 2605c9aee6e11c0bdaaf3bdd21f95595d1ac24f2..325382c7aed65f5e2da1b5bd0f379722106c0a72 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_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 45e1ead33d1d391ef17e686d3a0ab1a889b2e207..8f2d9a4301d492ea290fab14a7c5304a5e0e8cbf 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_MAXARGS 16 /* max number of command args */
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE /* Boot Argument Buffer Size */
/*
diff --git a/include/configs/sh7752evb.h b/include/configs/sh7752evb.h
index e70b9cdc369337142c6375ba4186eb0f508978b0..52ed06fcffcdf7066a5c8b1d171d2cae8b7321b0 100644
--- a/include/configs/sh7752evb.h
+++ b/include/configs/sh7752evb.h
@@ -25,7 +25,6 @@
#define CONFIG_SYS_LONGHELP
#define CONFIG_SYS_PBSIZE 256
-#define CONFIG_SYS_MAXARGS 16
#define CONFIG_SYS_BARGSIZE 512
#define CONFIG_SYS_BAUDRATE_TABLE { 115200 }
diff --git a/include/configs/sh7753evb.h b/include/configs/sh7753evb.h
index 2a29cb9de3aef7bf35129f275d362cd71e91650b..b97e4033ba1e276380f4009932508f767c92bfdf 100644
--- a/include/configs/sh7753evb.h
+++ b/include/configs/sh7753evb.h
@@ -25,7 +25,6 @@
#define CONFIG_SYS_LONGHELP
#define CONFIG_SYS_PBSIZE 256
-#define CONFIG_SYS_MAXARGS 16
#define CONFIG_SYS_BARGSIZE 512
#define CONFIG_SYS_BAUDRATE_TABLE { 115200 }
diff --git a/include/configs/sh7757lcr.h b/include/configs/sh7757lcr.h
index 566f7ae40953cea7de272445e0729141ea449892..0c0a669113dae1ef7e54f890cac002b514f29eef 100644
--- a/include/configs/sh7757lcr.h
+++ b/include/configs/sh7757lcr.h
@@ -26,7 +26,6 @@
#define CONFIG_SYS_LONGHELP
#define CONFIG_SYS_PBSIZE 256
-#define CONFIG_SYS_MAXARGS 16
#define CONFIG_SYS_BARGSIZE 512
#define CONFIG_SYS_BAUDRATE_TABLE { 115200 }
diff --git a/include/configs/sh7763rdp.h b/include/configs/sh7763rdp.h
index 7501e0345c74ee303bc66d13f9571d5bfd72e6ec..00f3576d57d562761a4c240ea930505fa0f74bc7 100644
--- a/include/configs/sh7763rdp.h
+++ b/include/configs/sh7763rdp.h
@@ -25,7 +25,6 @@
#define CONFIG_SYS_TEXT_BASE 0x8FFC0000
#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
diff --git a/include/configs/sh7785lcr.h b/include/configs/sh7785lcr.h
index 0e573558e92c47ca38b555b5eac959cb76b367b4..8ad83d8a4d6dc08ebdd675980b899b9f8c5a0097 100644
--- a/include/configs/sh7785lcr.h
+++ b/include/configs/sh7785lcr.h
@@ -41,7 +41,6 @@
#define CONFIG_SYS_LONGHELP
#define CONFIG_SYS_PBSIZE 256
-#define CONFIG_SYS_MAXARGS 16
#define CONFIG_SYS_BARGSIZE 512
#define CONFIG_SYS_BAUDRATE_TABLE { 115200 }
diff --git a/include/configs/shmin.h b/include/configs/shmin.h
index 0673e126dc63d3b1562a5c53a8c081dd8ebb36b3..c5eacc616f3d8b68855a84e240de820cbefebb23 100644
--- a/include/configs/shmin.h
+++ b/include/configs/shmin.h
@@ -29,7 +29,6 @@
#define CONFIG_SYS_TEXT_BASE 0x8DFB0000
#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
/* List of legal baudrate settings for this board */
diff --git a/include/configs/smdkc100.h b/include/configs/smdkc100.h
index 5bf557c76467c418a527060e58818caa6584e1ff..9c5cc7d926fcc415275ca73c2eba96dd99f96992 100644
--- a/include/configs/smdkc100.h
+++ b/include/configs/smdkc100.h
@@ -129,7 +129,6 @@
*/
#define CONFIG_SYS_LONGHELP /* undef to save memory */
#define CONFIG_SYS_PBSIZE 384 /* Print Buffer Size */
-#define CONFIG_SYS_MAXARGS 16 /* max number of command args */
/* Boot Argument Buffer Size */
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
/* memtest works on */
diff --git a/include/configs/snapper9260.h b/include/configs/snapper9260.h
index c4b2f53cade15ad688cbd46a5c122d61fd9e2271..b4ac12e0f569220c1da250429f9118ae49d7307f 100644
--- a/include/configs/snapper9260.h
+++ b/include/configs/snapper9260.h
@@ -124,7 +124,6 @@
#define CONFIG_ENV_OVERWRITE
/* Console settings */
-#define CONFIG_SYS_MAXARGS 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 6f2ac38caf4bb079ab00f7b25cd6f896d4a2d3d8..f0e1a1d39861314e7511530405fcb051107ff72c 100644
--- a/include/configs/snapper9g45.h
+++ b/include/configs/snapper9g45.h
@@ -110,7 +110,6 @@
"altbootcmd=run boot_mmc ; run boot_usb ; run boot_safe ; run boot_working\0"
/* Console settings */
-#define CONFIG_SYS_MAXARGS 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 785df25b5a8d001778dc2a832e95445f2774b0ae..5997902961c5f2cb1e891c6c2018cb5fcb3b4895 100644
--- a/include/configs/sniper.h
+++ b/include/configs/sniper.h
@@ -92,7 +92,6 @@
#define CONFIG_SYS_LONGHELP
-#define CONFIG_SYS_MAXARGS 16
#define CONFIG_SYS_CBSIZE 512
/*
diff --git a/include/configs/socrates.h b/include/configs/socrates.h
index eb2cacd094b696af4cd2667e4544a924cc66db98..15bead5386d5967edadf68a5ebcef54fe271fcd6 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_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 d149d4d50453a4183a7310c7c67c560a2bb36858..fe61824e33ae9d729a5f466cfc85b19d881f8309 100644
--- a/include/configs/spear-common.h
+++ b/include/configs/spear-common.h
@@ -168,7 +168,6 @@
#define CONFIG_SYS_MALLOC_LEN (1024*1024)
#define CONFIG_SYS_LONGHELP
#define CONFIG_CMDLINE_EDITING
-#define CONFIG_SYS_MAXARGS 16
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
#define CONFIG_SYS_LOAD_ADDR 0x00800000
diff --git a/include/configs/stih410-b2260.h b/include/configs/stih410-b2260.h
index 51ac95201e7da374363bc4edaefab13f5adc2eae..e07dd0e10300377f52f0337a157eb678d21f7993 100644
--- a/include/configs/stih410-b2260.h
+++ b/include/configs/stih410-b2260.h
@@ -41,7 +41,6 @@
/* Monitor Command Prompt */
#define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */
-#define CONFIG_SYS_MAXARGS 16 /* max number of command args */
#define CONFIG_SYS_MAX_FLASH_BANKS 1
#define CONFIG_SKIP_LOWLEVEL_INIT
diff --git a/include/configs/stm32f429-discovery.h b/include/configs/stm32f429-discovery.h
index 52a752916efed8bdc7b58d93ff820b8d3e2c5d68..024d75af3b12151c25441e6792fcda3c9e685c17 100644
--- a/include/configs/stm32f429-discovery.h
+++ b/include/configs/stm32f429-discovery.h
@@ -59,8 +59,6 @@
#define CONFIG_SYS_CBSIZE 1024
-#define CONFIG_SYS_MAXARGS 16
-
#define CONFIG_SYS_MALLOC_LEN (2 << 20)
#define CONFIG_BOOTCOMMAND \
diff --git a/include/configs/stm32f746-disco.h b/include/configs/stm32f746-disco.h
index ec0c2a65707b696eaf7b343b1d15862095be3a20..b51c9194fec3a45e9b89bf871d09c13d5c5f7829 100644
--- a/include/configs/stm32f746-disco.h
+++ b/include/configs/stm32f746-disco.h
@@ -48,7 +48,6 @@
#define CONFIG_SYS_CBSIZE 1024
-#define CONFIG_SYS_MAXARGS 16
#define CONFIG_SYS_MALLOC_LEN (1 * 1024 * 1024)
#define CONFIG_BOOTCOMMAND \
diff --git a/include/configs/strider.h b/include/configs/strider.h
index 582c74b33043c9e132e83fa27cddd24805a47b66..85aeded40eefb3ac030cf5e1aca1b013f3db0682 100644
--- a/include/configs/strider.h
+++ b/include/configs/strider.h
@@ -556,7 +556,6 @@ void fpga_control_clear(unsigned int bus, int pin);
#define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */
-#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 0adab5b599ebd2bfa19ebc19388a551ed7f89707..27d7a4bf6b66e43a90856a0e22e4ddce8b3a6a0e 100644
--- a/include/configs/stv0991.h
+++ b/include/configs/stv0991.h
@@ -23,7 +23,6 @@
#define CONFIG_ENV_OFFSET 0x30000
#define CONFIG_ENV_ADDR \
(PHYS_SDRAM_1_SIZE - CONFIG_ENV_SIZE)
-#define CONFIG_SYS_MAXARGS 16
#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 16 * 1024)
/* serial port (PL011) configuration */
diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h
index 7a22ef6a2deb701ebde381b483a3a4ecf97fc7e5..32082065b825adb13122dbe136c80f92c1ac233a 100644
--- a/include/configs/sunxi-common.h
+++ b/include/configs/sunxi-common.h
@@ -167,7 +167,6 @@
*/
#define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */
#define CONFIG_SYS_PBSIZE 1024 /* Print Buffer Size */
-#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/t4qds.h b/include/configs/t4qds.h
index c68041e1a275c4afb104413052ceeedc25200b70..23003d4d76b19e75a75e1cf4b2c1dba351b9d3a6 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_MAXARGS 16 /* max number of command args */
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE/* Boot Argument Buffer Size */
/*
diff --git a/include/configs/tao3530.h b/include/configs/tao3530.h
index 1e5548bfb917f8a037aee0340bfa434a51b7c56c..da26820a1212d5dc895ac5bd3d2892b503b11ae1 100644
--- a/include/configs/tao3530.h
+++ b/include/configs/tao3530.h
@@ -153,7 +153,6 @@
#define CONFIG_CMDLINE_EDITING
#define CONFIG_AUTO_COMPLETE
-#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 d88aa4bcda8cb33863c4d38e67a96ab27fcb0a35..ce06f7bb5f98267162ba386bc0daa29826248ad8 100644
--- a/include/configs/taurus.h
+++ b/include/configs/taurus.h
@@ -143,7 +143,6 @@
#define CONFIG_ENV_SIZE (SZ_128K) /* 1 sector = 128 kB */
#define CONFIG_BOOTCOMMAND "nand read 0x22000000 0x200000 0x300000; bootm"
-#define CONFIG_SYS_MAXARGS 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 9b4c7a9a358ab0c6f09798966e49d90a57165d3e..47d4f47c365fcdcc92403bf19c5c267e2df2267f 100644
--- a/include/configs/tb100.h
+++ b/include/configs/tb100.h
@@ -54,7 +54,6 @@
*/
#define CONFIG_AUTO_COMPLETE
-#define CONFIG_SYS_MAXARGS 16
#define CONFIG_CMDLINE_EDITING
/*
diff --git a/include/configs/ti814x_evm.h b/include/configs/ti814x_evm.h
index e31c9b40e0451d89e2653b5c7cd2511179136c91..212ff4e0fd21f4c41402b6cf3340764af5a4b3de 100644
--- a/include/configs/ti814x_evm.h
+++ b/include/configs/ti814x_evm.h
@@ -87,8 +87,6 @@
#define V_OSCK 24000000 /* Clock output from T2 */
#define V_SCLK (V_OSCK >> 1)
-/* max number of command args */
-#define CONFIG_SYS_MAXARGS 16
/* Console I/O Buffer Size */
#define CONFIG_SYS_CBSIZE 512
diff --git a/include/configs/tricorder.h b/include/configs/tricorder.h
index dd33030df3e99960f25cb2c3093d8d2cb21d492e..f4dd11b82d0a6dddab4357ca9f0d2185ed7bfe2a 100644
--- a/include/configs/tricorder.h
+++ b/include/configs/tricorder.h
@@ -210,7 +210,6 @@
#define CONFIG_CMDLINE_EDITING /* enable cmdline history */
#define CONFIG_AUTO_COMPLETE
#define CONFIG_SYS_CBSIZE 512 /* Console I/O Buffer Size */
-#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/ts4800.h b/include/configs/ts4800.h
index d9b07958fd2708f34cbcf3f7209753fce6def004..1bd93b9cd410282456b6db43663b08e15cae9e00 100644
--- a/include/configs/ts4800.h
+++ b/include/configs/ts4800.h
@@ -122,7 +122,6 @@
*/
#define CONFIG_SYS_LONGHELP /* undef to save memory */
#define CONFIG_AUTO_COMPLETE
-#define CONFIG_SYS_MAXARGS 16 /* max number of command args */
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE /* Boot Argument Buffer Size */
#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR
diff --git a/include/configs/uniphier.h b/include/configs/uniphier.h
index 88223d9bf2ff5f08fef7b996992dff33b12236c3..1d3bf987c09de9c3fe524db449e50a84ec8827de 100644
--- a/include/configs/uniphier.h
+++ b/include/configs/uniphier.h
@@ -60,7 +60,6 @@
#define CONFIG_CMDLINE_EDITING /* add command line history */
#define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */
-#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 5a4945f6445e8c5bfe6ac73ee93d2f294bfa4868..d8cb43a7cb59df8439985f8864e7fa06495966b9 100644
--- a/include/configs/usb_a9263.h
+++ b/include/configs/usb_a9263.h
@@ -98,7 +98,6 @@
#define CONFIG_EXTRA_ENV_SETTINGS \
"mtdparts=" MTDPARTS_DEFAULT "\0" \
-#define CONFIG_SYS_MAXARGS 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 595221698855ce38d9daf956ae9ee4af7be5355f..b21ca86ade3f91763854875f40855fa2c48d0af0 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_MAXARGS 16
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
/* UART */
diff --git a/include/configs/vct.h b/include/configs/vct.h
index e01bc03e362ce5949ed20ec5ac59e35fe63bfaa7..d223bcebf1c0260e5bf9eda5e09b97e5d152e274 100644
--- a/include/configs/vct.h
+++ b/include/configs/vct.h
@@ -119,7 +119,6 @@
*/
#define CONFIG_SYS_LONGHELP /* undef to save memory */
#define CONFIG_SYS_CBSIZE 512 /* Console I/O Buffer Size */
-#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 5ba7dc433b5ccfd1a7616701a02589c8c708c41f..3ac11ccb8f0adad876a3078ab2b44f37f0b81e57 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_MAXARGS 16 /* max number of cmd args */
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE /* Boot arg Buffer size */
/*
diff --git a/include/configs/vexpress_common.h b/include/configs/vexpress_common.h
index cbaae91b1e646f89b6f555fbccf9a055c25ed099..b386ed4d1d512247c774409b6b19db1f258df3e0 100644
--- a/include/configs/vexpress_common.h
+++ b/include/configs/vexpress_common.h
@@ -275,6 +275,5 @@
#define CONFIG_SYS_CBSIZE 512 /* Console I/O Buffer Size */
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE /* Boot args buffer */
#define CONFIG_SYS_LONGHELP
-#define CONFIG_SYS_MAXARGS 16 /* max command args */
#endif /* VEXPRESS_COMMON_H */
diff --git a/include/configs/vf610twr.h b/include/configs/vf610twr.h
index 809777fc747cb7e07783715c973fd58c069d66ad..7fd59a103386de50d7e0ac068480c02acf8307d6 100644
--- a/include/configs/vf610twr.h
+++ b/include/configs/vf610twr.h
@@ -189,7 +189,6 @@
/* Miscellaneous configurable options */
#define CONFIG_SYS_LONGHELP /* undef to save memory */
#undef CONFIG_AUTO_COMPLETE
-#define CONFIG_SYS_MAXARGS 16 /* max number of command args */
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
#define CONFIG_SYS_MEMTEST_START 0x80010000
diff --git a/include/configs/vme8349.h b/include/configs/vme8349.h
index b28a7ca5a08d09fed519ab4f1dc0804780247113..13fc2aa28a2f44746bbed4ea947e667588912d18 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_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 4294e0b120b9c1803c31cdc0ac62a772ea4d6c39..8a41982dda27a832c24d22d262ae3b82557160d6 100644
--- a/include/configs/woodburn_common.h
+++ b/include/configs/woodburn_common.h
@@ -102,7 +102,6 @@
#define CONFIG_CMDLINE_EDITING
#define CONFIG_AUTO_COMPLETE
-#define CONFIG_SYS_MAXARGS 16 /* max number of command args */
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE /* Boot Argument Buffer Size */
#define CONFIG_SYS_MEMTEST_START 0 /* memtest works on */
diff --git a/include/configs/work_92105.h b/include/configs/work_92105.h
index ce8c2277010c0616b682395a4d622dad73c8c4be..7faab4e0737173a1bbcdaaa07516fe8b9131876f 100644
--- a/include/configs/work_92105.h
+++ b/include/configs/work_92105.h
@@ -87,7 +87,6 @@
*/
#define CONFIG_SYS_LONGHELP
#define CONFIG_SYS_CBSIZE 1024
-#define CONFIG_SYS_MAXARGS 16
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
#define CONFIG_AUTO_COMPLETE
diff --git a/include/configs/x600.h b/include/configs/x600.h
index 1953a9c12b7cf5ac8c75eceb26db07e56895f187..2c2a2c17380a860d8f33e2229c4a860779a6751f 100644
--- a/include/configs/x600.h
+++ b/include/configs/x600.h
@@ -125,7 +125,6 @@
#define CONFIG_SYS_LONGHELP
#define CONFIG_CMDLINE_EDITING
#define CONFIG_AUTO_COMPLETE
-#define CONFIG_SYS_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 53d1c11af46a72d5ed8ecdc2446b13b07459f0ae..6fb7786a0e4232d90ba059ea9e08993d64f8574b 100644
--- a/include/configs/x86-common.h
+++ b/include/configs/x86-common.h
@@ -79,7 +79,6 @@
*/
#define CONFIG_SYS_LONGHELP
#define CONFIG_SYS_CBSIZE 512
-#define CONFIG_SYS_MAXARGS 16
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
#define CONFIG_SYS_MEMTEST_START 0x00100000
diff --git a/include/configs/xpedite517x.h b/include/configs/xpedite517x.h
index d9800e6afd0d904423aee1f53d212f3bef8ccd77..8c34f739603b609364b453e5919576801b541f34 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_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 */
#define CONFIG_LOADADDR 0x1000000 /* default location for tftp and bootm */
diff --git a/include/configs/xpedite520x.h b/include/configs/xpedite520x.h
index e860d697f2c0d7f09f7b2d92d844e6e803d3f924..58a0f4c022b7559d7124db09ecbde209adc44a2f 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_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 */
#define CONFIG_AUTO_COMPLETE 1 /* add autocompletion support */
diff --git a/include/configs/xpedite537x.h b/include/configs/xpedite537x.h
index d3a4b3b5b7356c70f89a941583954ce739d1f6e5..2d370a965eaa406cf6bb54352f7389616cc45677 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_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 */
#define CONFIG_AUTO_COMPLETE 1 /* add autocompletion support */
diff --git a/include/configs/xpedite550x.h b/include/configs/xpedite550x.h
index 97669f324d9993f9d1fd5902beee5e723d5833f8..d8ea5d7cab308f65e86db45c3811f12270681802 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_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 */
#define CONFIG_AUTO_COMPLETE 1 /* add autocompletion support */
diff --git a/include/configs/xtfpga.h b/include/configs/xtfpga.h
index 4ac3158f816d4a27b71367437abbb05554d9a1c1..3050f17b814d59039a4b88febe6f097167feffac 100644
--- a/include/configs/xtfpga.h
+++ b/include/configs/xtfpga.h
@@ -115,8 +115,6 @@
#define CONFIG_BOOTFILE "uImage"
/* Console I/O Buffer Size */
#define CONFIG_SYS_CBSIZE 1024
- /* max number of command args */
-#define CONFIG_SYS_MAXARGS 16
/* Boot Argument Buffer Size */
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
diff --git a/include/configs/zipitz2.h b/include/configs/zipitz2.h
index b4577a73acea2ebe8103dfb7114fc2593ef145f8..71428b661b02048a0b9361bded571e3a1af0800f 100644
--- a/include/configs/zipitz2.h
+++ b/include/configs/zipitz2.h
@@ -81,7 +81,6 @@ unsigned char zipitz2_spi_read(void);
#define CONFIG_SYS_LONGHELP /* undef to save memory */
-#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 204cd300266fc1e94928ba0a8aa97b60de064f31..d566fe5a2f3d80c741eeb3faea865196548728dc 100644
--- a/include/configs/zmx25.h
+++ b/include/configs/zmx25.h
@@ -117,7 +117,6 @@
#define CONFIG_SYS_MEMTEST_START (PHYS_SDRAM + (512*1024))
#define CONFIG_SYS_MEMTEST_END (PHYS_SDRAM + PHYS_SDRAM_SIZE)
-#define CONFIG_SYS_MAXARGS 16
#define CONFIG_SYS_LONGHELP
#define CONFIG_CMDLINE_EDITING