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

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

diff --git a/include/configs/KAREF.h b/include/configs/KAREF.h
index 403081d0d2b981b4e62fa2e69099775f3fc61920..8d5e8ff653f64f209010f800e6adbbdd00ba7e48 100644 (file)
--- a/include/configs/KAREF.h
+++ b/include/configs/KAREF.h
@@ -43,6 +43,9 @@
 #define CONFIG_BOARD_EARLY_INIT_F 1         /* Call board_pre_init     */
 #define CONFIG_MISC_INIT_F       1          /* Call board misc_init_f  */
 #define CONFIG_MISC_INIT_R       1          /* Call board misc_init_r  */
+
+#define        CONFIG_SYS_TEXT_BASE    0xFFF80000
+
 #undef CONFIG_SYS_DRAM_TEST                         /* Disable-takes long time!*/
 #define CONFIG_SYS_CLK_FREQ      66666666   /* external freq to pll    */
 
@@ -59,7 +62,6 @@
 #define CONFIG_SYS_FLASH_BASE         0xfff80000    /* start of FLASH          */
 #define CONFIG_SYS_MONITOR_BASE       0xfff80000    /* start of monitor        */
 #define CONFIG_SYS_PCI_MEMBASE        0x80000000    /* mapped pci memory       */
-#define CONFIG_SYS_PERIPHERAL_BASE    0xe0000000    /* internal peripherals    */
 #define CONFIG_SYS_ISRAM_BASE         0xc0000000    /* internal SRAM           */
 #define CONFIG_SYS_PCI_BASE           0xd0000000    /* internal PCI regs       */
 
@@ -78,12 +80,10 @@
 #define CONFIG_SYS_TEMP_STACK_OCM    1
 #define CONFIG_SYS_OCM_DATA_ADDR     CONFIG_SYS_ISRAM_BASE
 #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_POST_WORD_ADDR    (CONFIG_SYS_GBL_DATA_OFFSET - 0x4)
-#define CONFIG_SYS_INIT_SP_OFFSET    CONFIG_SYS_POST_WORD_ADDR
+#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 - 0x4)
 
 #define CONFIG_SYS_MONITOR_LEN       (256 * 1024)   /* Rsrv 256kB for Mon      */
 #define CONFIG_SYS_MALLOC_LEN        (128 * 1024)   /* Rsrv 128kB for malloc   */
@@ -91,8 +91,11 @@
 /*-----------------------------------------------------------------------
  * Serial Port
  *----------------------------------------------------------------------*/
-#undef CONFIG_SERIAL_SOFTWARE_FIFO
-#define CONFIG_SERIAL_MULTI   1
+#define CONFIG_CONS_INDEX      1       /* Use UART0                    */
+#define CONFIG_SYS_NS16550
+#define CONFIG_SYS_NS16550_SERIAL
+#define CONFIG_SYS_NS16550_REG_SIZE    1
+#define CONFIG_SYS_NS16550_CLK         get_serial_clock()
 #define CONFIG_BAUDRATE              9600
 
 #define CONFIG_SYS_BAUDRATE_TABLE  \
@@ -132,6 +135,7 @@
  *----------------------------------------------------------------------*/
 #define CONFIG_HARD_I2C              1              /* I2C hardware support    */
 #undef CONFIG_SOFT_I2C                      /* I2C !bit-banged         */
+#define CONFIG_PPC4XX_I2C              /* use PPC4xx driver            */
 #define CONFIG_SYS_I2C_SPEED         400000         /* I2C speed 400kHz        */
 #define CONFIG_SYS_I2C_SLAVE         0x7F           /* I2C slave address       */
 #define CONFIG_SYS_I2C_NOPROBES      {0x69}         /* Don't probe these addrs */
@@ -157,8 +161,8 @@
 /*-----------------------------------------------------------------------
  * Networking
  *----------------------------------------------------------------------*/
+#define CONFIG_PPC4xx_EMAC
 #define CONFIG_MII           1              /* MII PHY management      */
-#define CONFIG_NET_MULTI      1
 #define CONFIG_PHY_ADDR              0xff           /* no phy on EMAC0         */
 #define CONFIG_PHY1_ADDR      0xff          /* no phy on EMAC1         */
 #define CONFIG_PHY2_ADDR      0x08          /* PHY addr, MGMT, EMAC2   */
@@ -218,7 +222,6 @@
 #define CONFIG_SYS_PROMPT            "KaRefDes=> "  /* Monitor Command Prompt  */
 
 #define CONFIG_SYS_HUSH_PARSER        1             /* HUSH for ext'd cli      */
-#define CONFIG_SYS_PROMPT_HUSH_PS2    "> "
 
 
 /*-----------------------------------------------------------------------
@@ -265,6 +268,7 @@
  *----------------------------------------------------------------------*/
 /* General PCI */
 #define CONFIG_PCI                          /* include pci support     */
+#define CONFIG_PCI_INDIRECT_BRIDGE     /* indirect PCI bridge support */
 #define CONFIG_PCI_PNP                      /* do pci plug-and-play    */
 #define CONFIG_PCI_SCAN_SHOW                /* show pci devices        */
 #define CONFIG_SYS_PCI_TARGBASE      (CONFIG_SYS_PCI_MEMBASE)
@@ -282,14 +286,6 @@
  */
 #define CONFIG_SYS_BOOTMAPSZ           (8 << 20) /* Initial Memory map for Linux */
 
-/*
- * Internal Definitions
- *
- * Boot Flags
- */
-#define BOOTFLAG_COLD        0x01           /* Normal PowerOn: Boot from FLASH */
-#define BOOTFLAG_WARM        0x02           /* Software reboot */
-
 #if defined(CONFIG_CMD_KGDB)
 #define CONFIG_KGDB_BAUDRATE  230400        /* kgdb serial port baud   */
 #define CONFIG_KGDB_SER_INDEX 2                     /* kgdb serial port        */