Merge branch 'agust@denx.de-next' of git://git.denx.de/u-boot-staging

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

diff --git a/include/configs/SBC8540.h b/include/configs/SBC8540.h
index 9cc87dd..d448bf6 100644 (file)
--- a/include/configs/SBC8540.h
+++ b/include/configs/SBC8540.h
@@ -94,20 +94,6 @@
 #error "You can only use ONE of PCI Ethernet Card or TSEC Ethernet or CPM FCC."
 #endif
 
-/*
- * Base addresses -- Note these are effective addresses where the
- * actual resources get mapped (not physical addresses)
- */
-#define CONFIG_SYS_CCSRBAR_DEFAULT     0xff700000      /* CCSRBAR Default      */
-
-#if XXX
-  #define CONFIG_SYS_CCSRBAR           0xfdf00000      /* relocated CCSRBAR    */
-#else
-  #define CONFIG_SYS_CCSRBAR           0xff700000      /* default CCSRBAR      */
-#endif
-#define CONFIG_SYS_CCSRBAR_PHYS        CONFIG_SYS_CCSRBAR      /* physical addr of CCSRBAR */
-#define CONFIG_SYS_IMMR                CONFIG_SYS_CCSRBAR      /* PQII uses CONFIG_SYS_IMMR    */
-
 #define CONFIG_SYS_SDRAM_SIZE          512             /* DDR is 512MB */
 
 /* DDR Setup */
@@ -118,7 +104,7 @@
 #undef  CONFIG_DDR_SPD
 
 #if defined(CONFIG_MPC85xx_REV1)
-  #define CONFIG_DDR_DLL                       /* possible DLL fix needed      */
+#define CONFIG_SYS_FSL_ERRATUM_DDR_MSYNC_IN    /* possible DLL fix needed */
 #endif
 
 #undef  CONFIG_DDR_ECC                     /* only for ECC DDR module */
@@ -193,10 +179,9 @@
 
 #define CONFIG_SYS_INIT_RAM_LOCK       1
 #define CONFIG_SYS_INIT_RAM_ADDR       0x70000000      /* Initial RAM address  */
-#define CONFIG_SYS_INIT_RAM_END        0x4000          /* End of used area in RAM */
+#define CONFIG_SYS_INIT_RAM_SIZE       0x4000          /* Size of used area in RAM */
 
-#define CONFIG_SYS_GBL_DATA_SIZE       128             /* num bytes initial 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)
 #define CONFIG_SYS_INIT_SP_OFFSET      CONFIG_SYS_GBL_DATA_OFFSET
 
 #define CONFIG_SYS_MONITOR_LEN         (256 * 1024)    /* Reserve 256 kB for Mon */
@@ -232,9 +217,6 @@
 
 /* Use the HUSH parser */
 #define CONFIG_SYS_HUSH_PARSER
-#ifdef CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
-#endif
 
 /*
  * I2C
@@ -253,7 +235,6 @@
 
 #if defined(CONFIG_TSEC_ENET)          /* TSEC Ethernet port */
 
-#  define CONFIG_NET_MULTI     1
 #  define CONFIG_MPC85xx_TSEC1
 #  define CONFIG_MPC85xx_TSEC1_NAME    "TSEC0"
 #  define CONFIG_MII           1       /* MII PHY management           */
@@ -276,8 +257,8 @@
      * - Select bus for bd/buffers
      * - Full duplex
      */
-    #define CONFIG_SYS_CMXFCR_MASK     (CMXFCR_FC2 | CMXFCR_RF2CS_MSK | CMXFCR_TF2CS_MSK)
-    #define CONFIG_SYS_CMXFCR_VALUE    (CMXFCR_RF2CS_CLK13 | CMXFCR_TF2CS_CLK14)
+    #define CONFIG_SYS_CMXFCR_MASK2    (CMXFCR_FC2 | CMXFCR_RF2CS_MSK | CMXFCR_TF2CS_MSK)
+    #define CONFIG_SYS_CMXFCR_VALUE2   (CMXFCR_RF2CS_CLK13 | CMXFCR_TF2CS_CLK14)
     #define CONFIG_SYS_CPMFCR_RAMTYPE  0
     #define CONFIG_SYS_FCC_PSMR        (FCC_PSMR_FDE)
 
@@ -422,14 +403,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 */
@@ -449,7 +422,7 @@
 #define CONFIG_GATEWAYIP       YourGatewayIP
 #define CONFIG_NETMASK         255.255.255.0
 #define CONFIG_HOSTNAME                SBC8560
-#define CONFIG_ROOTPATH                YourRootPath
-#define CONFIG_BOOTFILE                YourImageName
+#define CONFIG_ROOTPATH                "YourRootPath"
+#define CONFIG_BOOTFILE                "YourImageName"
 
 #endif /* __CONFIG_H */