Merge with /home/m8/git/u-boot

[oweals/u-boot.git] / include / configs / Total5200.h

diff --git a/include/configs/Total5200.h b/include/configs/Total5200.h
index 29c627c6286be0a3881f4abd6fb140973966ffe6..817570323621a8df5930f86d0b5d805ae4fc7b3d 100644 (file)
--- a/include/configs/Total5200.h
+++ b/include/configs/Total5200.h
@@ -60,6 +60,26 @@
 #define CONFIG_BAUDRATE                115200  /* ... at 115200 bps */
 #define CFG_BAUDRATE_TABLE     { 9600, 19200, 38400, 57600, 115200, 230400 }
 
+/*
+ * Video console
+ */
+#if 1
+#define CONFIG_VIDEO
+#define CONFIG_VIDEO_SED13806
+#define CONFIG_VIDEO_SED13806_16BPP
+
+#define CONFIG_CFB_CONSOLE
+#define CONFIG_VIDEO_LOGO
+/* #define CONFIG_VIDEO_BMP_LOGO */
+#define CONFIG_CONSOLE_EXTRA_INFO
+#define CONFIG_VGA_AS_SINGLE_DEVICE
+#define CONFIG_VIDEO_SW_CURSOR
+#define CONFIG_SPLASH_SCREEN
+
+#define ADD_VIDEO_CMD  CFG_CMD_BMP
+#else
+#define ADD_VIDEO_CMD  0
+#endif
 
 #ifdef CONFIG_MPC5200  /* MGT5100 PCI is not supported yet. */
 /*
@@ -80,6 +100,7 @@
 #define CONFIG_PCI_IO_SIZE     0x01000000
 
 #define CONFIG_NET_MULTI       1
+#define CONFIG_MII             1
 #define CONFIG_EEPRO100                1
 #define CFG_RX_ETH_BUFFER      8  /* use 8 rx buffer on eepro100  */
 #define CONFIG_NS8382X         1
@@ -88,6 +109,7 @@
 
 #else  /* MGT5100 */
 
+#define CONFIG_MII             1
 #define ADD_PCI_CMD            0  /* no CFG_CMD_PCI */
 
 #endif
@@ -114,6 +136,7 @@
                                 CFG_CMD_EEPROM | \
                                 CFG_CMD_FAT    | \
                                 CFG_CMD_IDE    | \
+                                ADD_VIDEO_CMD  | \
                                 ADD_PCI_CMD    | \
                                 ADD_USB_CMD)
 
@@ -129,7 +152,9 @@
  */
 #define CONFIG_BOOTDELAY       5       /* autoboot after 5 seconds */
 
-#define CONFIG_PREBOOT "echo;" \
+#define CONFIG_PREBOOT \
+       "setenv stdout serial;setenv stderr serial;" \
+       "echo;" \
        "echo Type \"run flash_nfs\" to mount root filesystem over NFS;" \
        "echo"
 
@@ -138,16 +163,16 @@
 #define        CONFIG_EXTRA_ENV_SETTINGS                                       \
        "netdev=eth0\0"                                                 \
        "nfsargs=setenv bootargs root=/dev/nfs rw "                     \
-               "nfsroot=$(serverip):$(rootpath)\0"                     \
+               "nfsroot=${serverip}:${rootpath}\0"                     \
        "ramargs=setenv bootargs root=/dev/ram rw\0"                    \
-       "addip=setenv bootargs $(bootargs) "                            \
-               "ip=$(ipaddr):$(serverip):$(gatewayip):$(netmask)"      \
-               ":$(hostname):$(netdev):off panic=1\0"                  \
+       "addip=setenv bootargs ${bootargs} "                            \
+               "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}"      \
+               ":${hostname}:${netdev}:off panic=1\0"                  \
        "flash_nfs=run nfsargs addip;"                                  \
-               "bootm $(kernel_addr)\0"                                \
+               "bootm ${kernel_addr}\0"                                \
        "flash_self=run ramargs addip;"                                 \
-               "bootm $(kernel_addr) $(ramdisk_addr)\0"                \
-       "net_nfs=tftp 200000 $(bootfile);run nfsargs addip;bootm\0"     \
+               "bootm ${kernel_addr} ${ramdisk_addr}\0"                \
+       "net_nfs=tftp 200000 ${bootfile};run nfsargs addip;bootm\0"     \
        "rootpath=/opt/eldk/ppc_82xx\0"                                 \
        "bootfile=/tftpboot/MPC5200/uImage\0"                           \
        ""
@@ -201,7 +226,7 @@
 #   define CFG_FLASH_SIZE      0x06000000
 #endif /* CONFIG_TOTAL5200_REV */
 
-#if !defined(CFG_LOWBOOT)
+#if defined(CFG_LOWBOOT)
 #   define CFG_ENV_ADDR                0xFE040000
 #else  /* CFG_LOWBOOT */
 #   define CFG_ENV_ADDR                0xFFF40000
@@ -223,7 +248,7 @@
 #define CFG_MBAR               0xF0000000      /*   64 kB */
 #define CFG_FPGA_BASE          0xF0010000      /*   64 kB */
 #define CFG_CPLD_BASE          0xF0020000      /*   64 kB */
-#define CFG_LCD_BASE           0xF0100000      /* 2048 kB */
+#define CFG_LCD_BASE           0xF1000000      /* 4096 kB */
 
 /* Use SRAM until RAM will be available */
 #define CFG_INIT_RAM_ADDR      MPC5XXX_SRAM
@@ -332,8 +357,8 @@
 #define CFG_CS1_CFG            0x0019FF00      /* 25WS, MX, AL, AA, CE, AS_25, DS_32 */
 
 #define CFG_CS2_START          CFG_LCD_BASE
-#define CFG_CS2_SIZE           0x00200000      /* 2048 kB */
-#define CFG_CS2_CFG            0x0019FD00      /* 25WS, MX, AL, AA, CE, AS_25, DS_16 */
+#define CFG_CS2_SIZE           0x00400000      /* 4096 kB */
+#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