TQM8xx* boards: set larger SMC Rx buffer len

Commit 2b3f12c2 added support for configurable SMC Rx buffer length on
8xx systems. Enable this feature on TQM8xx* based boards.

This fixes the problem that pasting text in the middle of a line
(i. e. inserting in edit mode) did not work - only the first two
characters got inserted, the rest was lost.

Signed-off-by: Wolfgang Denk <wd@denx.de>

diff --git a/include/configs/FPS850L.h b/include/configs/FPS850L.h
index aceecd86d44a295def1bd81ce46668afef3a85e4..119065671a1f4bb661d687a7a08682aea055d1cf 100644 (file)
--- a/include/configs/FPS850L.h
+++ b/include/configs/FPS850L.h
@@ -36,9 +36,9 @@
 #define CONFIG_MPC850          1       /* This is a MPC850 CPU         */
 #define CONFIG_FPS850L         1       /* ...on a FingerPrint Sensor   */
 
-#undef CONFIG_8xx_CONS_SMC1
 #define        CONFIG_8xx_CONS_SMC2    1       /* Console is on SMC2           */
-#undef CONFIG_8xx_CONS_NONE
+#define CONFIG_SYS_SMC_RXBUFLEN        128
+#define CONFIG_SYS_MAXIDLE     10
 #define CONFIG_BAUDRATE                115200
 
 #define        CONFIG_BOOTCOUNT_LIMIT

diff --git a/include/configs/FPS860L.h b/include/configs/FPS860L.h
index 4a61d7c759400ed19946f0e24661d2a783532312..73bcccc2ecbf5172776cad4a610c709cdf16d4f0 100644 (file)
--- a/include/configs/FPS860L.h
+++ b/include/configs/FPS860L.h
@@ -36,9 +36,9 @@
 #define CONFIG_MPC860          1       /* This is a MPC860 CPU         */
 #define CONFIG_FPS860L         1       /* ...on a FingerPrint Sensor   */
 
-#undef CONFIG_8xx_CONS_SMC1
 #define        CONFIG_8xx_CONS_SMC2    1       /* Console is on SMC2           */
-#undef CONFIG_8xx_CONS_NONE
+#define CONFIG_SYS_SMC_RXBUFLEN        128
+#define CONFIG_SYS_MAXIDLE     10
 #define CONFIG_BAUDRATE                115200
 
 #define        CONFIG_BOOTCOUNT_LIMIT

diff --git a/include/configs/HMI10.h b/include/configs/HMI10.h
index 6c8e81f0521850b83d0c3a532bb39187f40daa18..88e1946b786f9a630efef88e3c95e7a6df6f8105 100644 (file)
--- a/include/configs/HMI10.h
+++ b/include/configs/HMI10.h
@@ -45,8 +45,8 @@
 #endif
 
 #define CONFIG_8xx_CONS_SMC1   1       /* Console is on SMC1           */
-#undef CONFIG_8xx_CONS_SMC2
-#undef CONFIG_8xx_CONS_NONE
+#define CONFIG_SYS_SMC_RXBUFLEN        128
+#define CONFIG_SYS_MAXIDLE     10
 #define CONFIG_BAUDRATE                115200  /* console baudrate = 115kbps   */
 
 #define CONFIG_PS2KBD                  /* AT-PS/2 Keyboard             */

diff --git a/include/configs/NSCU.h b/include/configs/NSCU.h
index 6abd3f1d9467df6bcb1a051fab5a6f743be75c31..5dd72ffaf4ce85605e51e6ca1b20ee2fcae3fbf2 100644 (file)
--- a/include/configs/NSCU.h
+++ b/include/configs/NSCU.h
@@ -38,6 +38,8 @@
 #define CONFIG_NSCU            1
 
 #define        CONFIG_8xx_CONS_SCC1    1       /* Console is on SMC1           */
+#define CONFIG_SYS_SMC_RXBUFLEN        128
+#define CONFIG_SYS_MAXIDLE     10
 
 #define        CONFIG_66MHz            1       /* running at 66 MHz, 1:1 clock */
 

diff --git a/include/configs/SM850.h b/include/configs/SM850.h
index 4c469e3ba88100b8b60219341f91c8dae3c154de..7266f9add1db0a06472017eb8dfef341cdeffda2 100644 (file)
--- a/include/configs/SM850.h
+++ b/include/configs/SM850.h
@@ -38,15 +38,11 @@
 #define CONFIG_MPC850          1       /* This is a MPC850 CPU         */
 #define CONFIG_SM850           1       /*...on a MPC850 Service Module */
 
-#undef CONFIG_8xx_CONS_SMC1    /* SMC1 not usable because Ethernet on SCC3 */
 #define        CONFIG_8xx_CONS_SMC2    1       /* Console is on SMC2           */
-#undef CONFIG_8xx_CONS_NONE
+#define CONFIG_SYS_SMC_RXBUFLEN        128
+#define CONFIG_SYS_MAXIDLE     10
 #define CONFIG_BAUDRATE                115200
-#if 0
-#define CONFIG_BOOTDELAY       -1      /* autoboot disabled            */
-#else
 #define CONFIG_BOOTDELAY       5       /* autoboot after 5 seconds     */
-#endif
 
 #define        CONFIG_CLOCKS_IN_MHZ    1       /* clocks passsed to Linux in MHz */
 

diff --git a/include/configs/TK885D.h b/include/configs/TK885D.h
index 14ff62c52f4228e6378b16d5b5fe7fcc387758b7..1e6d9cebe07d801059279c42636ef40755d9d104 100644 (file)
--- a/include/configs/TK885D.h
+++ b/include/configs/TK885D.h
@@ -48,7 +48,8 @@
                                                /* 'cpuclk' variable with valid value)  */
 
 #define CONFIG_8xx_CONS_SMC1   1       /* Console is on SMC1           */
-
+#define CONFIG_SYS_SMC_RXBUFLEN        128
+#define CONFIG_SYS_MAXIDLE     10
 #define CONFIG_BAUDRATE                115200  /* console baudrate = 115kbps   */
 
 #define CONFIG_BOOTCOUNT_LIMIT

diff --git a/include/configs/TQM823L.h b/include/configs/TQM823L.h
index 1f816f35a1349284e87a382b4289771aed9d4ffa..966beaea16ea88d3c66be3e7d0cb9c6eaf63d432 100644 (file)
--- a/include/configs/TQM823L.h
+++ b/include/configs/TQM823L.h
@@ -43,8 +43,8 @@
 #endif
 
 #define        CONFIG_8xx_CONS_SMC1    1       /* Console is on SMC1           */
-#undef CONFIG_8xx_CONS_SMC2
-#undef CONFIG_8xx_CONS_NONE
+#define CONFIG_SYS_SMC_RXBUFLEN        128
+#define CONFIG_SYS_MAXIDLE     10
 #define CONFIG_BAUDRATE                115200  /* console baudrate = 115kbps   */
 
 #define        CONFIG_BOOTCOUNT_LIMIT

diff --git a/include/configs/TQM823M.h b/include/configs/TQM823M.h
index 42dcbfc2a31ae0c705f2b10de2d893d79cb21607..cfa693da18aecbdae21ec66858961e237fa5016a 100644 (file)
--- a/include/configs/TQM823M.h
+++ b/include/configs/TQM823M.h
@@ -41,8 +41,8 @@
 #endif
 
 #define        CONFIG_8xx_CONS_SMC1    1       /* Console is on SMC1           */
-#undef CONFIG_8xx_CONS_SMC2
-#undef CONFIG_8xx_CONS_NONE
+#define CONFIG_SYS_SMC_RXBUFLEN        128
+#define CONFIG_SYS_MAXIDLE     10
 #define CONFIG_BAUDRATE                115200  /* console baudrate = 115kbps   */
 
 #define        CONFIG_BOOTCOUNT_LIMIT

diff --git a/include/configs/TQM850L.h b/include/configs/TQM850L.h
index 290e211ad1778bfd7e6ecc01807f23a8a3e101e0..dc0498e7d1ecac18bcaa779b74a5b2de2e95caa7 100644 (file)
--- a/include/configs/TQM850L.h
+++ b/include/configs/TQM850L.h
@@ -37,8 +37,8 @@
 #define CONFIG_TQM850L         1       /* ...on a TQM8xxL module       */
 
 #define        CONFIG_8xx_CONS_SMC1    1       /* Console is on SMC1           */
-#undef CONFIG_8xx_CONS_SMC2
-#undef CONFIG_8xx_CONS_NONE
+#define CONFIG_SYS_SMC_RXBUFLEN        128
+#define CONFIG_SYS_MAXIDLE     10
 #define CONFIG_BAUDRATE                115200  /* console baudrate = 115kbps   */
 
 #define        CONFIG_BOOTCOUNT_LIMIT

diff --git a/include/configs/TQM850M.h b/include/configs/TQM850M.h
index 2170df5dcb11617fa64b2efd3d68b6361c1943d1..cdabc530852f4c49f65f9464961f6a8c0d9f7fee 100644 (file)
--- a/include/configs/TQM850M.h
+++ b/include/configs/TQM850M.h
@@ -37,8 +37,8 @@
 #define CONFIG_TQM850M         1       /* ...on a TQM8xxM module       */
 
 #define        CONFIG_8xx_CONS_SMC1    1       /* Console is on SMC1           */
-#undef CONFIG_8xx_CONS_SMC2
-#undef CONFIG_8xx_CONS_NONE
+#define CONFIG_SYS_SMC_RXBUFLEN        128
+#define CONFIG_SYS_MAXIDLE     10
 #define CONFIG_BAUDRATE                115200  /* console baudrate = 115kbps   */
 
 #define        CONFIG_BOOTCOUNT_LIMIT

diff --git a/include/configs/TQM855L.h b/include/configs/TQM855L.h
index 3d7dc4233bb00f9d1a263a7a1c06817ea00610cc..1255928fb5744063d586e2deeb1a7b8efbed3011 100644 (file)
--- a/include/configs/TQM855L.h
+++ b/include/configs/TQM855L.h
@@ -37,9 +37,8 @@
 #define CONFIG_TQM855L         1       /* ...on a TQM8xxL module       */
 
 #define        CONFIG_8xx_CONS_SMC1    1       /* Console is on SMC1           */
-#undef CONFIG_8xx_CONS_SMC2
-#undef CONFIG_8xx_CONS_NONE
-
+#define CONFIG_SYS_SMC_RXBUFLEN        128
+#define CONFIG_SYS_MAXIDLE     10
 #define CONFIG_BAUDRATE                115200  /* console baudrate = 115kbps   */
 
 #define        CONFIG_BOOTCOUNT_LIMIT

diff --git a/include/configs/TQM855M.h b/include/configs/TQM855M.h
index 35cfa08822765ea32c26cf5e869976cccf485aac..584d40be9380946182f72e7b5add0d493a8f11c2 100644 (file)
--- a/include/configs/TQM855M.h
+++ b/include/configs/TQM855M.h
@@ -37,9 +37,8 @@
 #define CONFIG_TQM855M         1       /* ...on a TQM8xxM module       */
 
 #define        CONFIG_8xx_CONS_SMC1    1       /* Console is on SMC1           */
-#undef CONFIG_8xx_CONS_SMC2
-#undef CONFIG_8xx_CONS_NONE
-
+#define CONFIG_SYS_SMC_RXBUFLEN        128
+#define CONFIG_SYS_MAXIDLE     10
 #define CONFIG_BAUDRATE                115200  /* console baudrate = 115kbps   */
 
 #define        CONFIG_BOOTCOUNT_LIMIT

diff --git a/include/configs/TQM860L.h b/include/configs/TQM860L.h
index 4ac485d3215b8ad5530ee3fc5ec5af62c78eebce..a772a27bec26fdb4651bf4da93475d02c48751d1 100644 (file)
--- a/include/configs/TQM860L.h
+++ b/include/configs/TQM860L.h
@@ -37,9 +37,8 @@
 #define CONFIG_TQM860L         1       /* ...on a TQM8xxL module       */
 
 #define        CONFIG_8xx_CONS_SMC1    1       /* Console is on SMC1           */
-#undef CONFIG_8xx_CONS_SMC2
-#undef CONFIG_8xx_CONS_NONE
-
+#define CONFIG_SYS_SMC_RXBUFLEN        128
+#define CONFIG_SYS_MAXIDLE     10
 #define CONFIG_BAUDRATE                115200  /* console baudrate = 115kbps   */
 
 #define        CONFIG_BOOTCOUNT_LIMIT

diff --git a/include/configs/TQM860M.h b/include/configs/TQM860M.h
index 39da0bbd6ed4c58ca6b72cb5b5ce5db1e0416977..7c347861f0cfd418ea5a393c6325ff67e4ba7790 100644 (file)
--- a/include/configs/TQM860M.h
+++ b/include/configs/TQM860M.h
@@ -37,9 +37,8 @@
 #define CONFIG_TQM860M         1       /* ...on a TQM8xxM module       */
 
 #define        CONFIG_8xx_CONS_SMC1    1       /* Console is on SMC1           */
-#undef CONFIG_8xx_CONS_SMC2
-#undef CONFIG_8xx_CONS_NONE
-
+#define CONFIG_SYS_SMC_RXBUFLEN        128
+#define CONFIG_SYS_MAXIDLE     10
 #define CONFIG_BAUDRATE                115200  /* console baudrate = 115kbps   */
 
 #define        CONFIG_BOOTCOUNT_LIMIT

diff --git a/include/configs/TQM862L.h b/include/configs/TQM862L.h
index 1f79b170dbe90b0c328ed88f3c4c967a04a6eefd..75d2dacba61f9830a811ff3b198dfc0114b223b1 100644 (file)
--- a/include/configs/TQM862L.h
+++ b/include/configs/TQM862L.h
@@ -40,9 +40,8 @@
 #define CONFIG_TQM862L         1       /* ...on a TQM8xxL module       */
 
 #define        CONFIG_8xx_CONS_SMC1    1       /* Console is on SMC1           */
-#undef CONFIG_8xx_CONS_SMC2
-#undef CONFIG_8xx_CONS_NONE
-
+#define CONFIG_SYS_SMC_RXBUFLEN        128
+#define CONFIG_SYS_MAXIDLE     10
 #define CONFIG_BAUDRATE                115200  /* console baudrate = 115kbps   */
 
 #define        CONFIG_BOOTCOUNT_LIMIT

diff --git a/include/configs/TQM862M.h b/include/configs/TQM862M.h
index 86d5b016365a2375df4a508aece27a7f12e437ce..0c7aacdce6457132d274fd26e585d90b98011396 100644 (file)
--- a/include/configs/TQM862M.h
+++ b/include/configs/TQM862M.h
@@ -40,9 +40,8 @@
 #define CONFIG_TQM862M         1       /* ...on a TQM8xxM module       */
 
 #define        CONFIG_8xx_CONS_SMC1    1       /* Console is on SMC1           */
-#undef CONFIG_8xx_CONS_SMC2
-#undef CONFIG_8xx_CONS_NONE
-
+#define CONFIG_SYS_SMC_RXBUFLEN        128
+#define CONFIG_SYS_MAXIDLE     10
 #define CONFIG_BAUDRATE                115200  /* console baudrate = 115kbps   */
 
 #define        CONFIG_BOOTCOUNT_LIMIT

diff --git a/include/configs/TQM866M.h b/include/configs/TQM866M.h
index 04f538ce517d09246627ebc7082c4d9e6dc54c55..071afd4f3fb6f4717cf4afee9813329f323c5eb7 100644 (file)
--- a/include/configs/TQM866M.h
+++ b/include/configs/TQM866M.h
@@ -51,7 +51,8 @@
 #endif
 
 #define CONFIG_8xx_CONS_SMC1   1       /* Console is on SMC1           */
-
+#define CONFIG_SYS_SMC_RXBUFLEN        128
+#define CONFIG_SYS_MAXIDLE     10
 #define CONFIG_BAUDRATE                115200  /* console baudrate = 115kbps   */
 
 #define CONFIG_BOOTCOUNT_LIMIT

diff --git a/include/configs/TQM885D.h b/include/configs/TQM885D.h
index 4c80bad133e187af4a2109591d261537a27421d4..d435819aaaa4328d1b9d81967149cc59e7782ef6 100644 (file)
--- a/include/configs/TQM885D.h
+++ b/include/configs/TQM885D.h
@@ -47,7 +47,8 @@
                                                /* 'cpuclk' variable with valid value)  */
 
 #define CONFIG_8xx_CONS_SMC1   1       /* Console is on SMC1           */
-
+#define CONFIG_SYS_SMC_RXBUFLEN        128
+#define CONFIG_SYS_MAXIDLE     10
 #define CONFIG_BAUDRATE                115200  /* console baudrate = 115kbps   */
 
 #define CONFIG_BOOTCOUNT_LIMIT

diff --git a/include/configs/virtlab2.h b/include/configs/virtlab2.h
index 9ebafcccbca4ca35177eefca0248e8acc65705f5..f7813a1ff67a9ec033531b90ba6836c66fbed4c0 100644 (file)
--- a/include/configs/virtlab2.h
+++ b/include/configs/virtlab2.h
@@ -38,8 +38,8 @@
 #define        CONFIG_TQM8xxL          1
 
 #define        CONFIG_8xx_CONS_SMC1    1       /* Console is on SMC1           */
-#undef CONFIG_8xx_CONS_SMC2
-#undef CONFIG_8xx_CONS_NONE
+#define CONFIG_SYS_SMC_RXBUFLEN        128
+#define CONFIG_SYS_MAXIDLE     10
 #define CONFIG_BAUDRATE                115200  /* console baudrate = 115kbps   */
 
 #define        CONFIG_BOOTCOUNT_LIMIT