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

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

diff --git a/include/configs/mpc7448hpc2.h b/include/configs/mpc7448hpc2.h
index 483bc53..700dcda 100644 (file)
--- a/include/configs/mpc7448hpc2.h
+++ b/include/configs/mpc7448hpc2.h
@@ -42,11 +42,13 @@
 #define CONFIG_HIGH_BATS       /* High BATs supported */
 #define CONFIG_ALTIVEC         /* undef to disable */
 
+#define        CONFIG_SYS_TEXT_BASE    0xFF000000
+
 #define CONFIG_SYS_BOARD_NAME          "MPC7448 HPC II"
 #define CONFIG_IDENT_STRING    " Freescale MPC7448 HPC II"
 
 #define CONFIG_SYS_OCN_CLK             133000000       /* 133 MHz */
-#define CONFIG_SYS_CONFIG_BUS_CLK      133000000
+#define CONFIG_SYS_BUS_CLK             133000000
 
 #define CONFIG_SYS_CLK_SPREAD          /* Enable Spread-Spectrum Clock generation */
 
@@ -79,7 +81,6 @@
 #define CONFIG_OF_LIBFDT       1
 #define CONFIG_OF_BOARD_SETUP  1
 
-#define OF_CPU                 "PowerPC,7448@0"
 #define OF_TSI                 "tsi108@c0000000"
 #define OF_TBCLK               (bd->bi_busfreq / 8)
 #define OF_STDOUT_PATH         "/tsi108@c0000000/serial@7808"
@@ -124,12 +125,9 @@
 
 /* Networking Configuration */
 
-#define KSEG1ADDR(a)   (a)     /* Needed by the rtl8139 driver */
-
 #define CONFIG_TSI108_ETH
 #define CONFIG_TSI108_ETH_NUM_PORTS    2
 
-#define CONFIG_NET_MULTI
 
 #define CONFIG_BOOTFILE                zImage.initrd.elf
 #define CONFIG_LOADADDR                0x400000
@@ -163,7 +161,7 @@
 #define CONFIG_CMD_SDRAM
 #define CONFIG_CMD_EEPROM
 #define CONFIG_CMD_FLASH
-#define CONFIG_CMD_ENV
+#define CONFIG_CMD_SAVEENV
 #define CONFIG_CMD_BSP
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_PING
@@ -179,6 +177,7 @@
  */
 #define CONFIG_VERSION_VARIABLE                1
 #define CONFIG_TSI108_I2C
+#define CONFIG_SYS_I2C_SPEED           100000  /* I2C speed */
 
 #define CONFIG_SYS_I2C_EEPROM_ADDR             0x50    /* I2C EEPROM page 1 */
 #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN         1       /* Bytes of address */
@@ -221,10 +220,9 @@
  */
 #undef  CONFIG_SYS_INIT_RAM_LOCK
 #define CONFIG_SYS_INIT_RAM_ADDR       0x07d00000      /* unused memory region */
-#define CONFIG_SYS_INIT_RAM_END        0x4000/* larger space - we have SDRAM initialized */
+#define CONFIG_SYS_INIT_RAM_SIZE       0x4000/* larger space - we have SDRAM initialized */
 
-#define CONFIG_SYS_GBL_DATA_SIZE       128/* size in bytes reserved for init data */
-#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)
 
 /*-----------------------------------------------------------------------
  * Start addresses for the final memory configuration
@@ -253,7 +251,7 @@
 
 #define CONFIG_SYS_RESET_ADDRESS       0x3fffff00
 #define CONFIG_SYS_MONITOR_LEN         (256 << 10)     /* Reserve 256 kB for Monitor */
-#define CONFIG_SYS_MONITOR_BASE        TEXT_BASE       /* u-boot code base */
+#define CONFIG_SYS_MONITOR_BASE        CONFIG_SYS_TEXT_BASE    /* u-boot code base */
 #define CONFIG_SYS_MALLOC_LEN          (256 << 10)     /* Reserve 256 kB for malloc */
 
 /* Peripheral Device section */
@@ -302,8 +300,6 @@
 
 #define CONFIG_SYS_PCI_IO_SIZE         0x01000000      /* 16MB */
 
-#define _IO_BASE               0x00000000      /* points to PCI I/O space      */
-
 /* PCI Config Space mapping */
 #define CONFIG_SYS_PCI_CFG_BASE        0xfb000000      /* Changed from FE000000 */
 #define CONFIG_SYS_PCI_CFG_SIZE        0x01000000      /* 16MB */
@@ -403,13 +399,5 @@
 
 #define L2_INIT                0
 #define L2_ENABLE      (L2_INIT | L2CR_L2E)
-
-/*
- * Internal Definitions
- *
- * Boot Flags
- */
-#define BOOTFLAG_COLD  0x01    /* Normal Power-On: Boot from FLASH */
-#define BOOTFLAG_WARM  0x02    /* Software reboot */
 #define CONFIG_SYS_SERIAL_HANG_IN_EXCEPTION
 #endif /* __CONFIG_H */