From ae3af05ec986a8ac66dadb5eafe13db2d4a02c5c Mon Sep 17 00:00:00 2001 From: wdenk Date: Thu, 7 Aug 2003 22:18:11 +0000 Subject: Update for TQM board defaults: disable clocks_in_mhz, enable boot count limit --- CHANGELOG | 3 +++ Makefile | 6 ++++++ include/configs/TQM823L.h | 10 ++++------ include/configs/TQM823M.h | 9 +++------ include/configs/TQM8260.h | 15 ++++++++------- include/configs/TQM850L.h | 10 ++++------ include/configs/TQM850M.h | 7 +------ include/configs/TQM855L.h | 5 +++-- include/configs/TQM855M.h | 4 ++-- include/configs/TQM860L.h | 5 +++-- include/configs/TQM860M.h | 4 ++-- include/configs/TQM862L.h | 5 +++-- include/configs/TQM862M.h | 4 ++-- 13 files changed, 44 insertions(+), 43 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 715aea5522..a4c8782cc0 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -2,6 +2,9 @@ Changes for U-Boot 0.4.5: ====================================================================== +* Update for TQM board defaults: + disable clocks_in_mhz, enable boot count limit + * Removed tools/gdb from "make all" target. Added make target "gdbtools" in toplevel directory instead. Removed astest.c from tools/gdb because it is no longer relevant. diff --git a/Makefile b/Makefile index 249a067f8c..f46103fc25 100644 --- a/Makefile +++ b/Makefile @@ -417,6 +417,12 @@ TQM860L_80MHz_config \ TQM862L_config \ TQM862L_66MHz_config \ TQM862L_80MHz_config \ +TQM823M_config \ +TQM823M_66MHz_config \ +TQM823M_80MHz_config \ +TQM850M_config \ +TQM850M_66MHz_config \ +TQM850M_80MHz_config \ TQM855M_config \ TQM855M_66MHz_config \ TQM855M_80MHz_config \ diff --git a/include/configs/TQM823L.h b/include/configs/TQM823L.h index be6e2f9d71..e53304ebfa 100644 --- a/include/configs/TQM823L.h +++ b/include/configs/TQM823L.h @@ -44,13 +44,10 @@ #undef CONFIG_8xx_CONS_SMC2 #undef CONFIG_8xx_CONS_NONE #define CONFIG_BAUDRATE 115200 /* console baudrate = 115kbps */ -#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 */ +#define CONFIG_BOOTCOUNT_LIMIT + +#define CONFIG_BOOTDELAY 5 /* autoboot after 5 seconds */ #define CONFIG_BOARD_TYPES 1 /* support board types */ @@ -59,6 +56,7 @@ #undef CONFIG_BOOTARGS #define CONFIG_EXTRA_ENV_SETTINGS \ + "netdev=eth0\0" \ "nfsargs=setenv bootargs root=/dev/nfs rw " \ "nfsroot=$(serverip):$(rootpath)\0" \ "ramargs=setenv bootargs root=/dev/ram rw\0" \ diff --git a/include/configs/TQM823M.h b/include/configs/TQM823M.h index 7f3a766cf3..9720828b9d 100644 --- a/include/configs/TQM823M.h +++ b/include/configs/TQM823M.h @@ -44,13 +44,10 @@ #undef CONFIG_8xx_CONS_SMC2 #undef CONFIG_8xx_CONS_NONE #define CONFIG_BAUDRATE 115200 /* console baudrate = 115kbps */ -#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 */ +#define CONFIG_BOOTCOUNT_LIMIT + +#define CONFIG_BOOTDELAY 5 /* autoboot after 5 seconds */ #define CONFIG_BOARD_TYPES 1 /* support board types */ diff --git a/include/configs/TQM8260.h b/include/configs/TQM8260.h index a84f0dd358..2dd69123be 100644 --- a/include/configs/TQM8260.h +++ b/include/configs/TQM8260.h @@ -56,13 +56,20 @@ #define CONFIG_BOOTDELAY 5 /* autoboot after 5 seconds */ -#define CONFIG_CLOCKS_IN_MHZ 1 /* clocks passsed to Linux in MHz */ +#define CONFIG_BOOTCOUNT_LIMIT + +#if defined(CONFIG_CONS_NONE) || defined(CONFIG_CONS_USE_EXTC) +#define CONFIG_BAUDRATE 230400 +#else +#define CONFIG_BAUDRATE 9600 +#endif #define CONFIG_PREBOOT "echo;echo Type \"run flash_nfs\" to mount root filesystem over NFS;echo" #undef CONFIG_BOOTARGS #define CONFIG_EXTRA_ENV_SETTINGS \ + "netdev=eth0\0" \ "nfsargs=setenv bootargs root=/dev/nfs rw " \ "nfsroot=$(serverip):$(rootpath)\0" \ "ramargs=setenv bootargs root=/dev/ram rw\0" \ @@ -204,12 +211,6 @@ # endif #endif /* CONFIG_MPC8255 */ -#if defined(CONFIG_CONS_NONE) || defined(CONFIG_CONS_USE_EXTC) -#define CONFIG_BAUDRATE 230400 -#else -#define CONFIG_BAUDRATE 9600 -#endif - #define CONFIG_LOADS_ECHO 1 /* echo on for serial download */ #undef CFG_LOADS_BAUD_CHANGE /* don't allow baudrate change */ diff --git a/include/configs/TQM850L.h b/include/configs/TQM850L.h index a1020c1c6e..f93a7f6f85 100644 --- a/include/configs/TQM850L.h +++ b/include/configs/TQM850L.h @@ -40,13 +40,10 @@ #undef CONFIG_8xx_CONS_SMC2 #undef CONFIG_8xx_CONS_NONE #define CONFIG_BAUDRATE 115200 /* console baudrate = 115kbps */ -#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 */ +#define CONFIG_BOOTCOUNT_LIMIT + +#define CONFIG_BOOTDELAY 5 /* autoboot after 5 seconds */ #define CONFIG_BOARD_TYPES 1 /* support board types */ @@ -55,6 +52,7 @@ #undef CONFIG_BOOTARGS #define CONFIG_EXTRA_ENV_SETTINGS \ + "netdev=eth0\0" \ "nfsargs=setenv bootargs root=/dev/nfs rw " \ "nfsroot=$(serverip):$(rootpath)\0" \ "ramargs=setenv bootargs root=/dev/ram rw\0" \ diff --git a/include/configs/TQM850M.h b/include/configs/TQM850M.h index d67669d71a..d565300506 100644 --- a/include/configs/TQM850M.h +++ b/include/configs/TQM850M.h @@ -40,13 +40,8 @@ #undef CONFIG_8xx_CONS_SMC2 #undef CONFIG_8xx_CONS_NONE #define CONFIG_BAUDRATE 115200 /* console baudrate = 115kbps */ -#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 */ +#define CONFIG_BOOTCOUNT_LIMIT #define CONFIG_BOARD_TYPES 1 /* support board types */ diff --git a/include/configs/TQM855L.h b/include/configs/TQM855L.h index e9e1e08228..2420f0bffd 100644 --- a/include/configs/TQM855L.h +++ b/include/configs/TQM855L.h @@ -42,9 +42,9 @@ #define CONFIG_BAUDRATE 115200 /* console baudrate = 115kbps */ -#define CONFIG_BOOTDELAY 5 /* autoboot after 5 seconds */ +#define CONFIG_BOOTCOUNT_LIMIT -#define CONFIG_CLOCKS_IN_MHZ 1 /* clocks passsed to Linux in MHz */ +#define CONFIG_BOOTDELAY 5 /* autoboot after 5 seconds */ #define CONFIG_BOARD_TYPES 1 /* support board types */ @@ -55,6 +55,7 @@ #undef CONFIG_BOOTARGS #define CONFIG_EXTRA_ENV_SETTINGS \ + "netdev=eth0\0" \ "nfsargs=setenv bootargs root=/dev/nfs rw " \ "nfsroot=$(serverip):$(rootpath)\0" \ "ramargs=setenv bootargs root=/dev/ram rw\0" \ diff --git a/include/configs/TQM855M.h b/include/configs/TQM855M.h index a9211792fe..e926d933c2 100644 --- a/include/configs/TQM855M.h +++ b/include/configs/TQM855M.h @@ -42,9 +42,9 @@ #define CONFIG_BAUDRATE 115200 /* console baudrate = 115kbps */ -#define CONFIG_BOOTDELAY 5 /* autoboot after 5 seconds */ +#define CONFIG_BOOTCOUNT_LIMIT -#define CONFIG_CLOCKS_IN_MHZ 1 /* clocks passsed to Linux in MHz */ +#define CONFIG_BOOTDELAY 5 /* autoboot after 5 seconds */ #define CONFIG_BOARD_TYPES 1 /* support board types */ diff --git a/include/configs/TQM860L.h b/include/configs/TQM860L.h index 598ad6afd7..ba2198f0a0 100644 --- a/include/configs/TQM860L.h +++ b/include/configs/TQM860L.h @@ -42,9 +42,9 @@ #define CONFIG_BAUDRATE 115200 /* console baudrate = 115kbps */ -#define CONFIG_BOOTDELAY 5 /* autoboot after 5 seconds */ +#define CONFIG_BOOTCOUNT_LIMIT -#define CONFIG_CLOCKS_IN_MHZ 1 /* clocks passsed to Linux in MHz */ +#define CONFIG_BOOTDELAY 5 /* autoboot after 5 seconds */ #define CONFIG_BOARD_TYPES 1 /* support board types */ @@ -55,6 +55,7 @@ #undef CONFIG_BOOTARGS #define CONFIG_EXTRA_ENV_SETTINGS \ + "netdev=eth0\0" \ "nfsargs=setenv bootargs root=/dev/nfs rw " \ "nfsroot=$(serverip):$(rootpath)\0" \ "ramargs=setenv bootargs root=/dev/ram rw\0" \ diff --git a/include/configs/TQM860M.h b/include/configs/TQM860M.h index 581b2a9f90..3f6edb8040 100644 --- a/include/configs/TQM860M.h +++ b/include/configs/TQM860M.h @@ -42,9 +42,9 @@ #define CONFIG_BAUDRATE 115200 /* console baudrate = 115kbps */ -#define CONFIG_BOOTDELAY 5 /* autoboot after 5 seconds */ +#define CONFIG_BOOTCOUNT_LIMIT -#define CONFIG_CLOCKS_IN_MHZ 1 /* clocks passsed to Linux in MHz */ +#define CONFIG_BOOTDELAY 5 /* autoboot after 5 seconds */ #define CONFIG_BOARD_TYPES 1 /* support board types */ diff --git a/include/configs/TQM862L.h b/include/configs/TQM862L.h index 9541e2f1bf..23e7d1f05b 100644 --- a/include/configs/TQM862L.h +++ b/include/configs/TQM862L.h @@ -45,9 +45,9 @@ #define CONFIG_BAUDRATE 115200 /* console baudrate = 115kbps */ -#define CONFIG_BOOTDELAY 5 /* autoboot after 5 seconds */ +#define CONFIG_BOOTCOUNT_LIMIT -#define CONFIG_CLOCKS_IN_MHZ 1 /* clocks passsed to Linux in MHz */ +#define CONFIG_BOOTDELAY 5 /* autoboot after 5 seconds */ #define CONFIG_BOARD_TYPES 1 /* support board types */ @@ -58,6 +58,7 @@ #undef CONFIG_BOOTARGS #define CONFIG_EXTRA_ENV_SETTINGS \ + "netdev=eth0\0" \ "nfsargs=setenv bootargs root=/dev/nfs rw " \ "nfsroot=$(serverip):$(rootpath)\0" \ "ramargs=setenv bootargs root=/dev/ram rw\0" \ diff --git a/include/configs/TQM862M.h b/include/configs/TQM862M.h index da2fc46be8..914e28a82c 100644 --- a/include/configs/TQM862M.h +++ b/include/configs/TQM862M.h @@ -45,9 +45,9 @@ #define CONFIG_BAUDRATE 115200 /* console baudrate = 115kbps */ -#define CONFIG_BOOTDELAY 5 /* autoboot after 5 seconds */ +#define CONFIG_BOOTCOUNT_LIMIT -#define CONFIG_CLOCKS_IN_MHZ 1 /* clocks passsed to Linux in MHz */ +#define CONFIG_BOOTDELAY 5 /* autoboot after 5 seconds */ #define CONFIG_BOARD_TYPES 1 /* support board types */ -- cgit v1.2.1