Merge branch 'master' of git://git.denx.de/u-boot-usb

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

diff --git a/include/configs/inka4x0.h b/include/configs/inka4x0.h
index 3420a39..d651eff 100644 (file)
--- a/include/configs/inka4x0.h
+++ b/include/configs/inka4x0.h
@@ -18,7 +18,6 @@
 
 #define CONFIG_MPC5200         1       /* This is an MPC5200 CPU       */
 #define CONFIG_INKA4X0         1       /* INKA4x0 board                */
-#define CONFIG_DISPLAY_BOARDINFO
 
 /*
  * Valid values for CONFIG_SYS_TEXT_BASE are:
@@ -40,7 +39,6 @@
  * Serial console configuration
  */
 #define CONFIG_PSC_CONSOLE     1       /* console is on PSC1   */
-#define CONFIG_BAUDRATE                115200  /* ... at 115200 bps    */
 #define CONFIG_SYS_BAUDRATE_TABLE      { 9600, 19200, 38400, 57600, 115200, 230400 }
 
 /*
@@ -48,8 +46,6 @@
  * 0x40000000 - 0x4fffffff - PCI Memory
  * 0x50000000 - 0x50ffffff - PCI IO Space
  */
-#define CONFIG_PCI             1
-#define CONFIG_PCI_PNP         1
 #define CONFIG_PCI_SCAN_SHOW   1
 #define CONFIG_PCIAUTO_SKIP_HOST_BRIDGE        1
 
@@ -64,9 +60,6 @@
 #define CONFIG_SYS_XLB_PIPELINING      1
 
 /* Partitions */
-#define CONFIG_MAC_PARTITION
-#define CONFIG_DOS_PARTITION
-#define CONFIG_ISO_PARTITION
 
 /*
  * BOOTP options
@@ -79,8 +72,6 @@
 /*
  * Command line configuration.
  */
-#define CONFIG_CMD_DATE
-#define CONFIG_CMD_IDE
 #define CONFIG_CMD_PCI
 
 #define        CONFIG_TIMESTAMP        1       /* Print image info with timestamp */
@@ -227,86 +218,6 @@
 #define CONFIG_SYS_GPS_PORT_CONFIG     0x01501444
 
 /*
- * RTC configuration
- */
-#define CONFIG_RTC_RTC4543     1       /* use external RTC */
-
-/*
- * Software (bit-bang) three wire serial configuration
- *
- * Note that we need the ifdefs because otherwise compilation of
- * mkimage.c fails.
- */
-#define CONFIG_SOFT_TWS                1
-
-#ifdef TWS_IMPLEMENTATION
-#include <mpc5xxx.h>
-#include <asm/io.h>
-
-#define TWS_CE         MPC5XXX_GPIO_WKUP_PSC1_4 /* GPIO_WKUP_0 */
-#define TWS_WR         MPC5XXX_GPIO_WKUP_PSC2_4 /* GPIO_WKUP_1 */
-#define TWS_DATA       MPC5XXX_GPIO_SINT_PSC3_4 /* GPIO_SINT_0 */
-#define TWS_CLK                MPC5XXX_GPIO_SINT_PSC3_5 /* GPIO_SINT_1 */
-
-static inline void tws_ce(unsigned bit)
-{
-       struct mpc5xxx_wu_gpio *wu_gpio =
-               (struct mpc5xxx_wu_gpio *)MPC5XXX_WU_GPIO;
-       if (bit)
-               setbits_8(&wu_gpio->dvo, TWS_CE);
-       else
-               clrbits_8(&wu_gpio->dvo, TWS_CE);
-}
-
-static inline void tws_wr(unsigned bit)
-{
-       struct mpc5xxx_wu_gpio *wu_gpio =
-               (struct mpc5xxx_wu_gpio *)MPC5XXX_WU_GPIO;
-       if (bit)
-               setbits_8(&wu_gpio->dvo, TWS_WR);
-       else
-               clrbits_8(&wu_gpio->dvo, TWS_WR);
-}
-
-static inline void tws_clk(unsigned bit)
-{
-       struct mpc5xxx_gpio *gpio =
-               (struct mpc5xxx_gpio *)MPC5XXX_GPIO;
-       if (bit)
-               setbits_8(&gpio->sint_dvo, TWS_CLK);
-       else
-               clrbits_8(&gpio->sint_dvo, TWS_CLK);
-}
-
-static inline void tws_data(unsigned bit)
-{
-       struct mpc5xxx_gpio *gpio =
-               (struct mpc5xxx_gpio *)MPC5XXX_GPIO;
-       if (bit)
-               setbits_8(&gpio->sint_dvo, TWS_DATA);
-       else
-               clrbits_8(&gpio->sint_dvo, TWS_DATA);
-}
-
-static inline unsigned tws_data_read(void)
-{
-       struct mpc5xxx_gpio *gpio =
-                       (struct mpc5xxx_gpio *)MPC5XXX_GPIO;
-       return !!(in_8(&gpio->sint_ival) & TWS_DATA);
-}
-
-static inline void tws_data_config_output(unsigned output)
-{
-       struct mpc5xxx_gpio *gpio =
-               (struct mpc5xxx_gpio *)MPC5XXX_GPIO;
-       if (output)
-               setbits_8(&gpio->sint_ddr, TWS_DATA);
-       else
-               clrbits_8(&gpio->sint_ddr, TWS_DATA);
-}
-#endif /* TWS_IMPLEMENTATION */
-
-/*
  * Miscellaneous configurable options
  */
 #define CONFIG_SYS_LONGHELP                    /* undef to save memory     */
@@ -369,7 +280,6 @@ static inline void tws_data_config_output(unsigned output)
 #define CONFIG_USB_OHCI
 #define CONFIG_USB_CLOCK       0x00015555
 #define CONFIG_USB_CONFIG      0x00001000
-#define CONFIG_USB_STORAGE
 
 /*-----------------------------------------------------------------------
  * IDE/ATA stuff Supports IDE harddisk