Update for TQM board defaults:

disable clocks_in_mhz, enable boot count limit

diff --git a/CHANGELOG b/CHANGELOG
index 715aea5..a4c8782 100644 (file)
--- 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 249a067..f46103f 100644 (file)
--- 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 be6e2f9..e53304e 100644 (file)
--- 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 7f3a766..9720828 100644 (file)
--- 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 a84f0dd..2dd6912 100644 (file)
--- 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 a1020c1..f93a7f6 100644 (file)
--- 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 d67669d..d565300 100644 (file)
--- 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 e9e1e08..2420f0b 100644 (file)
--- 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 a921179..e926d93 100644 (file)
--- 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 598ad6a..ba2198f 100644 (file)
--- 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 581b2a9..3f6edb8 100644 (file)
--- 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 9541e2f..23e7d1f 100644 (file)
--- 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 da2fc46..914e28a 100644 (file)
--- 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          */