* Patch by Martin Krause, 03 Aug 2004:

  change timing for SM501 graphics controller on TQM5200 module

* Patch by Mark Jonas, 13 July 2004:
  - Total5200 LCD now run in little endian mode. Endianess conversion
    is done in hardware.
  - Removed last reference to "console" environment variable.

diff --git a/CHANGELOG b/CHANGELOG
index ffac5a2dfe0a30e542969007e0df04f9f62c6d1a..e7d1e73f94a7f43453151951cbaa358dd419d077 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,14 @@
 Changes since U-Boot 1.1.1:
 ======================================================================
 
+* Patch by Martin Krause, 03 Aug 2004:
+  change timing for SM501 graphics controller on TQM5200 module
+
+* Patch by Mark Jonas, 13 July 2004:
+  - Total5200 LCD now run in little endian mode. Endianess conversion
+    is done in hardware.
+  - Removed last reference to "console" environment variable. 
+
 * Patches by Lars Munch, 12 Jul 2004:
   - move at45.c to board/at91rm9200dk/ since this is at91rm9200dk
     board specific

diff --git a/Makefile b/Makefile
index 5da162838dad3451459110d01a9461f0ced60694..1bf8a6557e9fcd7fc30bbedbbf5d5f3007883710 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -249,6 +249,21 @@ icecube_5100_config:                       unconfig
                }
        @./mkconfig -a IceCube ppc mpc5xxx icecube
 
+PM520_config \
+PM520_DDR_config \
+PM520_ROMBOOT_config \
+PM520_ROMBOOT_DDR_config:      unconfig
+       @ >include/config.h
+       @[ -z "$(findstring DDR,$@)" ] || \
+               { echo "#define CONFIG_MPC5200_DDR"     >>include/config.h ; \
+                 echo "... DDR memory revision" ; \
+               }
+       @[ -z "$(findstring ROMBOOT,$@)" ] || \
+               { echo "#define CONFIG_BOOT_ROM" >>include/config.h ; \
+                 echo "... booting from 8-bit flash" ; \
+               }
+       @./mkconfig -a PM520 ppc mpc5xxx pm520
+
 MINI5200_config        \
 EVAL5200_config        \
 TOP5200_config:        unconfig
@@ -283,30 +298,15 @@ Total5200_Rev2_lowboot_config:    unconfig
                }
        @./mkconfig -a Total5200 ppc mpc5xxx total5200
 
-PM520_config \
-PM520_DDR_config \
-PM520_ROMBOOT_config \
-PM520_ROMBOOT_DDR_config:      unconfig
-       @ >include/config.h
-       @[ -z "$(findstring DDR,$@)" ] || \
-               { echo "#define CONFIG_MPC5200_DDR"     >>include/config.h ; \
-                 echo "... DDR memory revision" ; \
-               }
-       @[ -z "$(findstring ROMBOOT,$@)" ] || \
-               { echo "#define CONFIG_BOOT_ROM" >>include/config.h ; \
-                 echo "... booting from 8-bit flash" ; \
-               }
-       @./mkconfig -a PM520 ppc mpc5xxx pm520
-
 TQM5200_AA_config      \
 TQM5200_AB_config      \
 TQM5200_AC_config      \
 MiniFAP_config:        unconfig
        @ >include/config.h
-       @[ -z "$(findstring Mini-FAP,$@)" ] || \
+       @[ -z "$(findstring MiniFAP,$@)" ] || \
                { echo "#define CONFIG_MINIFAP" >>include/config.h ; \
                  echo "#define CONFIG_TQM5200_AC"      >>include/config.h ; \
-                 echo "... TQM5200_AC on Mini-FAP" ; \
+                 echo "... TQM5200_AC on MiniFAP" ; \
                }
        @[ -z "$(findstring AA,$@)" ] || \
                { echo "#define CONFIG_TQM5200_AA"      >>include/config.h ; \

diff --git a/drivers/cfb_console.c b/drivers/cfb_console.c
index 3d26ae2d50801817ac70c53899077e703ee1bb0d..1eaac4771ed2b0be00de4d3062ab90c657e91db3 100644 (file)
--- a/drivers/cfb_console.c
+++ b/drivers/cfb_console.c
@@ -123,7 +123,9 @@ CONFIG_VIDEO_HW_CURSOR:          - Uses the hardware cursor capability of the
 /*****************************************************************************/
 #ifdef CONFIG_VIDEO_SED13806
 
+#ifndef CONFIG_TOTAL5200
 #define VIDEO_FB_LITTLE_ENDIAN
+#endif
 #define VIDEO_HW_RECTFILL
 #define VIDEO_HW_BITBLT
 #endif

diff --git a/drivers/sed13806.c b/drivers/sed13806.c
index 114a2470bce247aa1f3c0e3b0be9813cd2349afc..6996ca805ebf9ad6164c2881f5952857fd85cc8c 100644 (file)
--- a/drivers/sed13806.c
+++ b/drivers/sed13806.c
@@ -36,9 +36,13 @@
 #define writeByte(ptrReg,value) \
     *(volatile unsigned char *)(sed13806.isaBase + ptrReg) = value
 
+#ifdef CONFIG_TOTAL5200
+#define writeWord(ptrReg,value) \
+    (*(volatile unsigned short *)(sed13806.isaBase + ptrReg) = value)
+#else
 #define writeWord(ptrReg,value) \
     (*(volatile unsigned short *)(sed13806.isaBase + ptrReg) = ((value >> 8 ) & 0xff) | ((value << 8) & 0xff00))
-
+#endif
 
 GraphicDevice sed13806;
 

diff --git a/include/configs/TQM5200.h b/include/configs/TQM5200.h
index 4b27633646619a88e06a1f31de4144c66caab667..1f83aa53d51cc7348291131339ff2500f93852ad 100644 (file)
--- a/include/configs/TQM5200.h
+++ b/include/configs/TQM5200.h
@@ -474,7 +474,7 @@
 #if defined (CONFIG_TQM5200_AB) || defined (CONFIG_TQM5200_AC)
 #define CFG_CS1_START          0xE0000000
 #define CFG_CS1_SIZE           0x4000000       /* 64 MByte */
-#define CFG_CS1_CFG            0x0148FF70
+#define CFG_CS1_CFG            0x8F48FF70
 #define SM501_MMIO_BASE                CFG_CS1_START + 0x03E00000
 #endif
 

diff --git a/include/configs/Total5200.h b/include/configs/Total5200.h
index 47f24be52069f05c8753b21cfffb311a02052fa7..7e3c11ea69a418bb8550123dfb44dc16afee0601 100644 (file)
--- a/include/configs/Total5200.h
+++ b/include/configs/Total5200.h
@@ -173,7 +173,6 @@
        "net_nfs=tftp 200000 $(bootfile);run nfsargs addip;bootm\0"     \
        "rootpath=/opt/eldk/ppc_82xx\0"                                 \
        "bootfile=/tftpboot/MPC5200/uImage\0"                           \
-       "console=serial\0"                              \
        ""
 
 #define CONFIG_BOOTCOMMAND     "run flash_self"
@@ -357,7 +356,7 @@
 
 #define CFG_CS2_START          CFG_LCD_BASE
 #define CFG_CS2_SIZE           0x00400000      /* 4096 kB */
-#define CFG_CS2_CFG            0x0032FD00      /* 50WS, MX, AL, AA, CE, AS_25, DS_16 */
+#define CFG_CS2_CFG            0x0032FD0C      /* 50WS, MX, AL, AA, CE, AS_25, DS_16, endian swapping */
 
 #if CONFIG_TOTAL5200_REV==1
 #   define CFG_CS3_START       CFG_CPLD_BASE