i2c, soft-i2c: switch to new multibus/multiadapter support

[karo-tx-uboot.git] / include / configs / p3p440.h

diff --git a/include/configs/p3p440.h b/include/configs/p3p440.h
index 6edf91ecc67acd731b245a6803de684283f9da51..3c33da73bb86e26433716bafa9c0c9905125ec66 100644 (file)
--- a/include/configs/p3p440.h
+++ b/include/configs/p3p440.h
@@ -39,6 +39,9 @@
 #define CONFIG_4xx             1           /* ... PPC4xx family        */
 #define CONFIG_BOARD_EARLY_INIT_F 1        /* Call board_early_init_f  */
 #define CONFIG_MISC_INIT_R     1           /* Call misc_init_r         */
+
+#define        CONFIG_SYS_TEXT_BASE    0xFFFC0000
+
 #define CONFIG_SYS_CLK_FREQ    33333333    /* external freq to pll     */
 
 /*-----------------------------------------------------------------------
@@ -58,10 +61,9 @@
  * Initial RAM & stack pointer (placed in internal SRAM)
  *----------------------------------------------------------------------*/
 #define CONFIG_SYS_INIT_RAM_ADDR       CONFIG_SYS_ISRAM_BASE  /* Initial RAM address   */
-#define CONFIG_SYS_INIT_RAM_END        0x2000      /* End of used area in RAM  */
-#define CONFIG_SYS_GBL_DATA_SIZE       128         /* num bytes initial data   */
+#define CONFIG_SYS_INIT_RAM_SIZE       0x2000      /* Size of used area in RAM */
 
-#define CONFIG_SYS_GBL_DATA_OFFSET     (CONFIG_SYS_INIT_RAM_END - CONFIG_SYS_GBL_DATA_SIZE)
+#define CONFIG_SYS_GBL_DATA_OFFSET     (CONFIG_SYS_INIT_RAM_SIZE - GENERATED_GBL_DATA_SIZE)
 #define CONFIG_SYS_INIT_SP_OFFSET      CONFIG_SYS_GBL_DATA_OFFSET
 
 #define CONFIG_SYS_MONITOR_LEN         (256 * 1024)    /* Reserve 256 kB for Mon*/
@@ -96,7 +98,6 @@
  * I2C
  *----------------------------------------------------------------------*/
 #define CONFIG_HARD_I2C                1       /* I2C with hardware support    */
-#undef CONFIG_SOFT_I2C                 /* I2C bit-banged               */
 #define CONFIG_PPC4XX_I2C              /* use PPC4xx driver            */
 #define CONFIG_SYS_I2C_SPEED           100000  /* I2C speed and slave address  */
 #define CONFIG_SYS_I2C_SLAVE           0x7F
@@ -169,7 +170,6 @@
 #define CONFIG_PHY_ADDR                0x1c    /* PHY address                  */
 #define CONFIG_HAS_ETH1
 #define CONFIG_PHY1_ADDR       0x1d    /* EMAC1 PHY address            */
-#define CONFIG_NET_MULTI       1
 #define CONFIG_SYS_RX_ETH_BUFFER       32      /* Number of ethernet rx buffers & descriptors */
 
 #define CONFIG_NETCONSOLE              /* include NetConsole support   */
@@ -240,6 +240,7 @@
  *----------------------------------------------------------------------*/
 /* General PCI */
 #define CONFIG_PCI                                 /* include pci support              */
+#define        CONFIG_PCI_INDIRECT_BRIDGE 1    /* indirect PCI bridge support */
 #define CONFIG_PCI_PNP                         /* do pci plug-and-play         */
 #define CONFIG_PCI_SCAN_SHOW            /* show pci devices on startup  */
 #define CONFIG_SYS_PCI_TARGBASE    0x80000000  /* PCIaddr mapped to CONFIG_SYS_PCI_MEMBASE */
@@ -318,14 +319,6 @@
  */
 #define CONFIG_SYS_BOOTMAPSZ           (8 << 20)       /* Initial Memory map for Linux */
 
-/*
- * Internal Definitions
- *
- * Boot Flags
- */
-#define BOOTFLAG_COLD  0x01            /* Normal Power-On: Boot from FLASH     */
-#define BOOTFLAG_WARM  0x02            /* Software reboot                      */
-
 #if defined(CONFIG_CMD_KGDB)
 #define CONFIG_KGDB_BAUDRATE   230400  /* speed to run kgdb serial port */
 #define CONFIG_KGDB_SER_INDEX  2       /* which serial port to use */