Add support for BMS2003 board

(featuring a NEC NL6448BC33-54. 10.4", 640x480 TFT display).
Fix NEC display names (it's 6440 [for 640x480], not 6640).

diff --git a/CHANGELOG b/CHANGELOG
index 6046633fb49f34db21e83065c406b6b6a15748dc..0da9bfb9af126687f3917cf1eedf154c05ad98c6 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,9 @@
 Changes since U-Boot 1.0.0:
 ======================================================================
 
+* Added BMS2003 board
+  add support for NEC NL6448BC33-54. 10.4", 640x480 TFT display
+
 * Fix flash driver for TRAB board (must use Unlock Bypass Reset
   command to exit Unlock Bypass Mode); adjust timings for flash, SRAM
   and CPLD

diff --git a/Makefile b/Makefile
index ef7e4fcb17e4c72e9e5123bce4f6da9b020e1ebe..474683785825527ed6dfbd3c405aa6ed3dfc4957 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -241,6 +241,12 @@ ADS860_config:     unconfig
 AMX860_config  :       unconfig
        @./mkconfig $(@:_config=) ppc mpc8xx amx860 westel
 
+bms2003_config :       unconfig
+       @echo "#define CONFIG_BMS2003" >include/config.h
+       @echo "#define CONFIG_LCD" >>include/config.h
+       @echo "#define CONFIG_NEC_NL6448BC33_54" >>include/config.h
+       @./mkconfig -a TQM823L ppc mpc8xx tqm8xx
+
 c2mon_config:          unconfig
        @./mkconfig $(@:_config=) ppc mpc8xx c2mon
 
@@ -473,7 +479,7 @@ TQM862M_100MHz_config:      unconfig
                }
        @[ -z "$(findstring _LCD,$@)" ] || \
                { echo "#define CONFIG_LCD"             >>include/config.h ; \
-                 echo "#define CONFIG_NEC_NL6648BC20"  >>include/config.h ; \
+                 echo "#define CONFIG_NEC_NL6448BC20"  >>include/config.h ; \
                  echo "... with LCD display" ; \
                }
        @./mkconfig -a $(call xtract_8xx,$@) ppc mpc8xx tqm8xx

diff --git a/README b/README
index 7c10e39b01dc0fa1c7fec2ee293833ab848b425f..a1c6a96ba3c8e6171b47a34a88cca9ee0f2e4e64 100644 (file)
--- a/README
+++ b/README
@@ -850,13 +850,18 @@ The following options need to be configured:
                display); also select one of the supported displays
                by defining one of these:
 
-               CONFIG_NEC_NL6648AC33:
+               CONFIG_NEC_NL6448AC33:
 
-                       NEC NL6648AC33-18. Active, color, single scan.
+                       NEC NL6448AC33-18. Active, color, single scan.
 
-               CONFIG_NEC_NL6648BC20
+               CONFIG_NEC_NL6448BC20
 
-                       NEC NL6648BC20-08. 6.5", 640x480.
+                       NEC NL6448BC20-08. 6.5", 640x480.
+                       Active, color, single scan.
+
+               CONFIG_NEC_NL6448BC33_54
+
+                       NEC NL6448BC33-54. 10.4", 640x480.
                        Active, color, single scan.
 
                CONFIG_SHARP_16x9

diff --git a/board/tqm8xx/tqm8xx.c b/board/tqm8xx/tqm8xx.c
index badc7940116e4c395d66fe4cd02186b6c0270a96..5f74650d54f39274a2675e7469f53d9ce36e2dfb 100644 (file)
--- a/board/tqm8xx/tqm8xx.c
+++ b/board/tqm8xx/tqm8xx.c
@@ -328,7 +328,7 @@ long int initdram (int board_type)
        memctl->memc_br3 = CFG_BR3_CAN;
 
        /* Initialize MBMR */
-       memctl->memc_mbmr = MAMR_GPL_B4DIS;     /* GPL_B4 ouput line Disable */
+       memctl->memc_mbmr = MBMR_GPL_B4DIS;     /* GPL_B4 ouput line Disable */
 
        /* Initialize UPMB for CAN: single read */
        memctl->memc_mdr = 0xFFFFC004;

diff --git a/cpu/mpc8xx/lcd.c b/cpu/mpc8xx/lcd.c
index ca5f2492afd8f4e86e6a46930e2de42fa54b6ff0..5405cb431c48d535ac2159c87dadf180f5154a97 100644 (file)
--- a/cpu/mpc8xx/lcd.c
+++ b/cpu/mpc8xx/lcd.c
@@ -150,28 +150,40 @@ static vidinfo_t panel_info = {
 /*----------------------------------------------------------------------*/
 
 /*----------------------------------------------------------------------*/
-#ifdef CONFIG_NEC_NL6648AC33
+#ifdef CONFIG_NEC_NL6448AC33
 /*
- *  NEC NL6648AC33-18. Active, color, single scan.
+ *  NEC NL6448AC33-18. Active, color, single scan.
  */
 static vidinfo_t panel_info = {
     640, 480, 132, 99, CFG_HIGH, CFG_HIGH, CFG_LOW, CFG_LOW, CFG_HIGH,
     3, 0, 0, 1, 1, 144, 2, 0, 33
                /* wbl, vpw, lcdac, wbf */
 };
-#endif /* CONFIG_NEC_NL6648AC33 */
+#endif /* CONFIG_NEC_NL6448AC33 */
 /*----------------------------------------------------------------------*/
 
-#ifdef CONFIG_NEC_NL6648BC20
+#ifdef CONFIG_NEC_NL6448BC20
 /*
- *  NEC NL6648BC20-08. 6.5", 640x480. Active, color, single scan.
+ *  NEC NL6448BC20-08.  6.5", 640x480. Active, color, single scan.
  */
 static vidinfo_t panel_info = {
     640, 480, 132, 99, CFG_HIGH, CFG_HIGH, CFG_LOW, CFG_LOW, CFG_HIGH,
     3, 0, 0, 1, 1, 144, 2, 0, 33
                /* wbl, vpw, lcdac, wbf */
 };
-#endif /* CONFIG_NEC_NL6648BC20 */
+#endif /* CONFIG_NEC_NL6448BC20 */
+/*----------------------------------------------------------------------*/
+
+#ifdef CONFIG_NEC_NL6448BC33_54
+/*
+ *  NEC NL6448BC33-54. 10.4", 640x480. Active, color, single scan.
+ */
+static vidinfo_t panel_info = {
+    640, 480, 212, 158, CFG_HIGH, CFG_HIGH, CFG_LOW, CFG_LOW, CFG_HIGH,
+    3, 0, 0, 1, 1, 144, 2, 0, 33
+               /* wbl, vpw, lcdac, wbf */
+};
+#endif /* CONFIG_NEC_NL6448BC33_54 */
 /*----------------------------------------------------------------------*/
 
 #ifdef CONFIG_SHARP_LQ104V7DS01

diff --git a/include/configs/TQM823L.h b/include/configs/TQM823L.h
index e53304ebfa4b648e4bf4fe2eb91ecb64d3ffb9d3..020cc8312db570b9bfccfdbd2fe5af7396411ee7 100644 (file)
--- a/include/configs/TQM823L.h
+++ b/include/configs/TQM823L.h
@@ -86,7 +86,11 @@
 # define CONFIG_STATUS_LED     1       /* Status LED enabled           */
 #endif /* CONFIG_LCD */
 
-#undef CONFIG_CAN_DRIVER               /* CAN Driver support disabled  */
+#ifdef CONFIG_BMS2003
+# define CONFIG_CAN_DRIVER     1       /* CAN Driver support enabled   */
+#else
+# undef        CONFIG_CAN_DRIVER               /* CAN Driver support disabled  */
+#endif
 
 #define CONFIG_BOOTP_MASK      (CONFIG_BOOTP_DEFAULT | CONFIG_BOOTP_BOOTFILESIZE)
 

diff --git a/include/configs/TQM823M.h b/include/configs/TQM823M.h
index 9720828b9d7dbc87482fb9b3b3976eb491008117..7ca9153207c7574eced14def2d9467a76d238146 100644 (file)
--- a/include/configs/TQM823M.h
+++ b/include/configs/TQM823M.h
@@ -37,7 +37,7 @@
 #define CONFIG_TQM823M         1       /* ...on a TQM8xxM module       */
 
 #ifdef CONFIG_LCD                      /* with LCD controller ?        */
-/* #define CONFIG_NEC_NL6648BC20 1 / * use NEC NL6648BC20 display      */
+/* #define CONFIG_NEC_NL6448BC20 1 / * use NEC NL6448BC20 display      */
 #endif
 
 #define        CONFIG_8xx_CONS_SMC1    1       /* Console is on SMC1           */

diff --git a/include/configs/svm_sc8xx.h b/include/configs/svm_sc8xx.h
index e9e86f6d811e0f5761714dede748ab42e6e67393..9589050a6d130a015cdc5e86612bb1647226aa20 100644 (file)
--- a/include/configs/svm_sc8xx.h
+++ b/include/configs/svm_sc8xx.h
@@ -71,7 +71,7 @@
 #define CONFIG_SVM_SC8xx               1       /* ...on SVM SC8xx series       */
 
 #ifdef CONFIG_LCD                      /* with LCD controller ?        */
-/* #define CONFIG_NEC_NL6648BC20 1 / * use NEC NL6648BC20 display      */
+/* #define CONFIG_NEC_NL6448BC20 1 / * use NEC NL6448BC20 display      */
 #endif
 
 #define        CONFIG_8xx_CONS_SMC1    1       /* Console is on SMC1           */