diff options
| -rw-r--r-- | include/configs/FPS850L.h | 4 | ||||
| -rw-r--r-- | include/configs/FPS860L.h | 4 | ||||
| -rw-r--r-- | include/configs/HMI10.h | 4 | ||||
| -rw-r--r-- | include/configs/NSCU.h | 2 | ||||
| -rw-r--r-- | include/configs/SM850.h | 8 | ||||
| -rw-r--r-- | include/configs/TK885D.h | 3 | ||||
| -rw-r--r-- | include/configs/TQM823L.h | 4 | ||||
| -rw-r--r-- | include/configs/TQM823M.h | 4 | ||||
| -rw-r--r-- | include/configs/TQM850L.h | 4 | ||||
| -rw-r--r-- | include/configs/TQM850M.h | 4 | ||||
| -rw-r--r-- | include/configs/TQM855L.h | 5 | ||||
| -rw-r--r-- | include/configs/TQM855M.h | 5 | ||||
| -rw-r--r-- | include/configs/TQM860L.h | 5 | ||||
| -rw-r--r-- | include/configs/TQM860M.h | 5 | ||||
| -rw-r--r-- | include/configs/TQM862L.h | 5 | ||||
| -rw-r--r-- | include/configs/TQM862M.h | 5 | ||||
| -rw-r--r-- | include/configs/TQM866M.h | 3 | ||||
| -rw-r--r-- | include/configs/TQM885D.h | 3 | ||||
| -rw-r--r-- | include/configs/virtlab2.h | 4 | 
19 files changed, 38 insertions, 43 deletions
| diff --git a/include/configs/FPS850L.h b/include/configs/FPS850L.h index aceecd86d..119065671 100644 --- 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 4a61d7c75..73bcccc2e 100644 --- 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 6c8e81f05..88e1946b7 100644 --- 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 6abd3f1d9..5dd72ffaf 100644 --- 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 4c469e3ba..7266f9add 100644 --- 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 14ff62c52..1e6d9cebe 100644 --- 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 1f816f35a..966beaea1 100644 --- 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 42dcbfc2a..cfa693da1 100644 --- 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 290e211ad..dc0498e7d 100644 --- 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 2170df5dc..cdabc5308 100644 --- 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 3d7dc4233..1255928fb 100644 --- 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 35cfa0882..584d40be9 100644 --- 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 4ac485d32..a772a27be 100644 --- 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 39da0bbd6..7c347861f 100644 --- 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 1f79b170d..75d2dacba 100644 --- 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 86d5b0163..0c7aacdce 100644 --- 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 04f538ce5..071afd4f3 100644 --- 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 4c80bad13..d435819aa 100644 --- 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 9ebafcccb..f7813a1ff 100644 --- 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 |