MPC5xxx: Change names of defines related to IPB and PCI clocks.

[platform/kernel/u-boot.git] / include / configs / hmi1001.h

diff --git a/include/configs/hmi1001.h b/include/configs/hmi1001.h
index 9da15ed..45a28c7 100644 (file)
--- a/include/configs/hmi1001.h
+++ b/include/configs/hmi1001.h
@@ -60,13 +60,14 @@
  */
 #define CONFIG_COMMANDS               (CONFIG_CMD_DFL  | \
                                CFG_CMD_DATE    | \
+                               CFG_CMD_DISPLAY | \
                                CFG_CMD_DHCP    | \
                                CFG_CMD_EEPROM  | \
                                CFG_CMD_I2C     | \
                                CFG_CMD_IDE     | \
                                CFG_CMD_NFS     | \
                                CFG_CMD_PCI     | \
-                               CFG_CMD_SNTP)
+                               CFG_CMD_SNTP    )
 
 /* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
 #include <cmd_confdefs.h>
@@ -91,23 +92,25 @@
 #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"                                \
-       "net_nfs=tftp 200000 $(bootfile);run nfsargs addip;bootm\0"     \
+               "bootm ${kernel_addr}\0"                                \
+       "net_nfs=tftp 200000 ${bootfile};run nfsargs addip;bootm\0"     \
        "rootpath=/opt/eldk/ppc_82xx\0"                                 \
        ""
 
 #define CONFIG_BOOTCOMMAND     "run net_nfs"
 
+#define CONFIG_MISC_INIT_R     1
+
 /*
  * IPB Bus clocking configuration.
  */
-#undef CFG_IPBSPEED_133                /* define for 133MHz speed */
+#undef CFG_IPBCLK_EQUALS_XLBCLK                /* define for 133MHz speed */
 
 /*
  * I2C configuration
@@ -166,6 +169,9 @@
 #define CFG_MBAR               0xF0000000
 #define CFG_SDRAM_BASE         0x00000000
 #define CFG_DEFAULT_MBAR       0x80000000
+#define CFG_DISPLAY_BASE       0x80600000
+#define CFG_STATUS1_BASE       0x80600200
+#define CFG_STATUS2_BASE       0x80600300
 
 /* Settings for XLB = 132 MHz */
 #define SDRAM_DDR       1
@@ -269,8 +275,8 @@
 
 /* Display H1, Status Inputs, EPLD @0x80600000 */
 #define CFG_CS3_START          0x80600000
-#define CFG_CS3_SIZE           0x00000210
-#define CFG_CS3_CFG            0x9800
+#define CFG_CS3_SIZE           0x00100000
+#define CFG_CS3_CFG            0x00019800
 
 #define CFG_CS_BURST           0x00000000
 #define CFG_CS_DEADCYCLE       0x33333333
@@ -308,6 +314,11 @@
 
 #define CONFIG_ATAPI            1
 
+#define CONFIG_VIDEO_SMI_LYNXEM
+#define CONFIG_CFB_CONSOLE
+#define CONFIG_VGA_AS_SINGLE_DEVICE
+#define CONFIG_VIDEO_LOGO
+
 /*
  * PCI Mapping:
  * 0x40000000 - 0x4fffffff - PCI Memory
@@ -325,4 +336,13 @@
 #define CONFIG_PCI_IO_PHYS     CONFIG_PCI_IO_BUS
 #define CONFIG_PCI_IO_SIZE     0x01000000
 
+#define CFG_ISA_IO             CONFIG_PCI_IO_BUS
+
+/*---------------------------------------------------------------------*/
+/* Display addresses                                                  */
+/*---------------------------------------------------------------------*/
+
+#define CFG_DISP_CHR_RAM       (CFG_DISPLAY_BASE + 0x38)
+#define CFG_DISP_CWORD         (CFG_DISPLAY_BASE + 0x30)
+
 #endif /* __CONFIG_H */