Socrates: config file cleanup.

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

diff --git a/include/configs/taihu.h b/include/configs/taihu.h
index a450c5b3d1ae58ab8c4dd0f92fb7a63c7d14462b..c060b1e340b91fc1f6a3ee37deca4fe7fe7b1f39 100644 (file)
--- a/include/configs/taihu.h
+++ b/include/configs/taihu.h
@@ -99,7 +99,7 @@
        "load=tftp 200000 /tftpboot/taihu/u-boot.bin\0"                 \
        "update=protect off FFFC0000 FFFFFFFF;era FFFC0000 FFFFFFFF;"   \
                "cp.b 200000 FFFC0000 40000\0"                          \
-       "upd=run load;run update\0"                                     \
+       "upd=run load update\0"                                         \
        ""
 #define CONFIG_BOOTCOMMAND     "run flash_self"
 
@@ -114,6 +114,7 @@
 
 #define CONFIG_MII             1       /* MII PHY management           */
 #define CONFIG_PHY_ADDR                0x14    /* PHY address                  */
+#define CONFIG_HAS_ETH0
 #define CONFIG_HAS_ETH1
 #define CONFIG_PHY1_ADDR       0x10    /* EMAC1 PHY address            */
 #define CONFIG_NET_MULTI       1
@@ -362,7 +363,7 @@ unsigned char spi_read(void);
 { GPIO_BASE, GPIO_IN,  GPIO_ALT1, GPIO_OUT_NO_CHG }, /* GPIO25 UART0_DSR               */      \
 { GPIO_BASE, GPIO_IN,  GPIO_ALT1, GPIO_OUT_NO_CHG }, /* GPIO26 UART0_RI                */      \
 { GPIO_BASE, GPIO_OUT, GPIO_ALT1, GPIO_OUT_NO_CHG }, /* GPIO27 UART0_DTR               */      \
-{ GPIO_BASE, GPIO_IN,  GPIO_ALT1, GPIO_OUT_NO_CHG }, /* GPIO28 UART1_Rx    UART0       */      \
+{ GPIO_BASE, GPIO_IN,  GPIO_ALT1, GPIO_OUT_NO_CHG }, /* GPIO28 UART1_Rx    UART0       */      \
 { GPIO_BASE, GPIO_OUT, GPIO_ALT1, GPIO_OUT_NO_CHG }, /* GPIO29 UART1_Tx                */      \
 { GPIO_BASE, GPIO_OUT, GPIO_SEL,  GPIO_OUT_NO_CHG }, /* GPIO30 RejectPkt0  User LED1   */      \
 { GPIO_BASE, GPIO_OUT, GPIO_SEL,  GPIO_OUT_NO_CHG }, /* GPIO31 RejectPkt1  User LED2   */      \
@@ -433,4 +434,8 @@ unsigned char spi_read(void);
 #define CONFIG_KGDB_SER_INDEX  2       /* which serial port to use */
 #endif
 
+/* pass open firmware flat tree */
+#define CONFIG_OF_LIBFDT       1
+#define CONFIG_OF_BOARD_SETUP  1
+
 #endif /* __CONFIG_H */