Add configuration for cam5200 board (based on TQM5200S).

diff --git a/CHANGELOG b/CHANGELOG
index 557e3196055fe65073aa57abe6f8c030d65f23a7..ee832bc86619f239cbb657dc43e4b4d700345909 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,8 @@
 Changes since U-Boot 1.1.4:
 ======================================================================
 
+* Add configuration for cam5200 board (based on TQM5200S).
+
 * More code cleanup
 
 * Disabled kvme080 board in MAKEALL because of build problems.

diff --git a/Makefile b/Makefile
index 42ea681ee345623429cfca8bec8ab735a6d39817..5879079ba1b789981df1851598a37a3babbcb8df 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -406,18 +406,18 @@ TQM5200_B_HIGHBOOT_config \
 TQM5200S_config \
 TQM5200S_HIGHBOOT_config \
 TQM5200_STK100_config \
-cameron_config \
+cam5200_config \
 MiniFAP_config:        unconfig
        @ >include/config.h
        @[ -z "$(findstring MiniFAP,$@)" ] || \
                { echo "#define CONFIG_MINIFAP" >>include/config.h ; \
                  echo "... TQM5200_AC on MiniFAP" ; \
                }
-       @[ -z "$(findstring cameron,$@)" ] || \
-               { echo "#define CONFIG_CAMERON" >>include/config.h ; \
+       @[ -z "$(findstring cam5200,$@)" ] || \
+               { echo "#define CONFIG_CAM5200" >>include/config.h ; \
                  echo "#define CONFIG_TQM5200S"        >>include/config.h ; \
                  echo "#define CONFIG_TQM5200_B"       >>include/config.h ; \
-                 echo "... TQM5200S on Cameron" ; \
+                 echo "... TQM5200S on Cam5200" ; \
                }
        @[ -z "$(findstring STK100,$@)" ] || \
                { echo "#define CONFIG_STK52XX_REV100"  >>include/config.h ; \

diff --git a/board/tqm5200/tqm5200.c b/board/tqm5200/tqm5200.c
index 8ed44d84a1603380212ad63f834c44e6603a0ede..d6f7737d5bd90cc41f18c21ef9a941060feadcdf 100644 (file)
--- a/board/tqm5200/tqm5200.c
+++ b/board/tqm5200/tqm5200.c
@@ -288,8 +288,8 @@ int checkboard (void)
 # define CARRIER_NAME  "STK52xx"
 #elif defined(CONFIG_TB5200)
 # define CARRIER_NAME  "TB5200"
-#elif defined(CONFIG_CAMERON)
-# define CARRIER_NAME  "Cameron"
+#elif defined(CONFIG_CAM5200)
+# define CARRIER_NAME  "Cam5200"
 #else
 # error "Unknown carrier board"
 #endif

diff --git a/include/configs/TQM5200.h b/include/configs/TQM5200.h
index 342cf1be45ff709df04c0292ecdeff54a5396056..717af86b909cc44d919a9bf85edb7ab84ee30552 100644 (file)
--- a/include/configs/TQM5200.h
+++ b/include/configs/TQM5200.h
@@ -37,7 +37,7 @@
 #define CONFIG_TQM5200         1       /* ... on TQM5200 module                */
 #undef CONFIG_TQM5200_REV100           /*  define for revision 100 modules     */
 
-#ifndef CONFIG_CAMERON                 /* On a Cameron board or ...            */
+#ifndef CONFIG_CAM5200                 /* On a Cameron board or ...            */
 #define CONFIG_STK52XX         1       /* ... on a STK52XX board               */
 #endif
 
@@ -132,7 +132,7 @@
 #define ADD_USB_CMD            0
 #endif
 
-#ifndef CONFIG_CAMERON
+#ifndef CONFIG_CAM5200
 /* POST support */
 #define CONFIG_POST            (CFG_POST_MEMORY   | \
                                 CFG_POST_CPU      | \
@@ -218,7 +218,7 @@
                "cp.b 200000 FC000000 ${filesize};"                     \
                "protect on FC000000 FC05FFFF\0"
 # endif /* CONFIG_TQM5200_B */
-#elif defined (CONFIG_CAMERON)
+#elif defined (CONFIG_CAM5200)
 #   define ENV_UPDT                                                    \
        "update=protect off FC000000 FC03FFFF;"                         \
                "erase FC000000 FC03FFFF;"                              \
@@ -331,7 +331,7 @@
 #define CFG_MAX_FLASH_SECT     512     /* max num of sects on one chip */
 #define CFG_FLASH_USE_BUFFER_WRITE     1
 
-#if defined (CONFIG_CAMERON)
+#if defined (CONFIG_CAM5200)
 # define CFG_ENV_ADDR          (CFG_FLASH_BASE + 0x00040000)
 #elif defined(CONFIG_TQM5200_B)
 # define CFG_ENV_ADDR          (CFG_FLASH_BASE + 0x00080000)
@@ -371,7 +371,7 @@
                                                "8m(misc),"             \
                                                "16m(big-fs)"
 # endif /* CONFIG_TQM5200_B */
-#elif defined (CONFIG_CAMERON)
+#elif defined (CONFIG_CAM5200)
 #   define MTDPARTS_DEFAULT    "mtdparts=TQM5200-0:768k(firmware),"    \
                                                "1792k(kernel),"        \
                                                "3584k(small-fs),"      \
@@ -421,7 +421,7 @@
 #   define CFG_RAMBOOT         1
 #endif
 
-#if defined (CONFIG_CAMERON)
+#if defined (CONFIG_CAM5200)
 # define CFG_MONITOR_LEN       (256 << 10)     /* Reserve 256 kB for Monitor   */
 #elif defined(CONFIG_TQM5200_B)
 # define CFG_MONITOR_LEN       (512 << 10)     /* Reserve 512 kB for Monitor   */