Update for TQM board defaults:

disable clocks_in_mhz, enable boot count limit

diff --git a/CHANGELOG b/CHANGELOG
index 715aea55227433f4f2eb907b215ce667aab98104..a4c8782cc013954096bd857bb35adb0ecba4971c 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 249a067f8c4f96b7b23d2771b136c734346b0363..f46103fc2520c07a54c279b37ceebb6d41c91577 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 be6e2f9d7179603f0961999a3e461b17af050bb7..e53304ebfa4b648e4bf4fe2eb91ecb64d3ffb9d3 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 7f3a766cf3c6c4abc4320e94b22434d820ba3189..9720828b9d7dbc87482fb9b3b3976eb491008117 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 a84f0dd358281915b3e98a8ca230c89eabc3da91..2dd69123be382b2aa93ec4e022733441ddadc3ce 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 a1020c1c6e2edae7a056391057eb6bbfd5fc00e6..f93a7f6f85fd55fbdfa02635e6d5362f01267a4c 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 d67669d71a60f0bac12bcf0f42a2bf1af129bc09..d565300506b0bba116446fcdc74c631c2a8c9242 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 e9e1e082287b998e71cc7443643c18a67e538f76..2420f0bffd25ac666d7a6d681d37f567e088758c 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 a9211792fea9bc1d3a5b7cd0565e48798f71a9ec..e926d933c27cfc27937ae07c0c70eaaee4d12ee7 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 598ad6afd7bd20e74374c7d3bc2a53b8071cb207..ba2198f0a076f7560debc5446957c6534d2482f3 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 581b2a9f906bd71a955c0e98a3a805e711c7304b..3f6edb8040c1dfb2466a5a6d7bdb597c52a18154 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 9541e2f1bf7e9f7a0a9914fc99f2ab677281d695..23e7d1f05bd589393dc6f9d8ce83a7c55b8afc8d 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 da2fc46be88b0902beac276d7fd01189a888c75c..914e28a82c58594c3d01f93a91b540d7f95aba06 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          */