Fix merge problems

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

diff --git a/include/configs/Adder.h b/include/configs/Adder.h
index 4304ecca7dee043915af476dfa5a59286a7ba041..cefdd29602d6b92d25865db1f49a977b2228081e 100644 (file)
--- a/include/configs/Adder.h
+++ b/include/configs/Adder.h
@@ -37,9 +37,12 @@
 
 #define CONFIG_ETHER_ON_FEC1
 #define CONFIG_ETHER_ON_FEC2
+#define CONFIG_HAS_ETH0
+#define CONFIG_HAS_ETH1
 
 #if defined(CONFIG_ETHER_ON_FEC1) || defined(CONFIG_ETHER_ON_FEC2)
 #define CFG_DISCOVER_PHY
+#define CONFIG_MII_INIT                1
 #define FEC_ENET
 #endif /* CONFIG_ETHER_ON_FEC || CONFIG_ETHER_ON_FEC2 */
 
@@ -128,7 +131,7 @@
 #define CFG_BOOTMAPSZ          (8 << 20)       /* Initial Memory map for Linux */
 
 #define CFG_MONITOR_BASE       TEXT_BASE
-#define CFG_MONITOR_LEN                (192 << 10)     /* Reserve 192 KB for Monitor   */
+#define CFG_MONITOR_LEN                (256 << 10)     /* Reserve 256 KB for Monitor   */
 #ifdef CONFIG_BZIP2
 #define CFG_MALLOC_LEN         (2500 << 10)    /* Reserve ~2.5 MB for malloc() */
 #else
@@ -146,7 +149,7 @@
 
 /* Environment is in flash */
 #define CFG_ENV_IS_IN_FLASH
-#define CFG_ENV_SECT_SIZE      0x10000         /* We use one complete sector   */
+#define CFG_ENV_SECT_SIZE      0x10000         /* We use one complete sector   */
 #define CFG_ENV_ADDR           (CFG_MONITOR_BASE + CFG_MONITOR_LEN)
 
 #define CONFIG_ENV_OVERWRITE
@@ -188,16 +191,16 @@
 #define CFG_TBSCR              (TBSCR_TBF | TBSCR_TBE)
 
 /* PISCR - Periodic Interrupt Status and Control */
-#define CFG_PISCR              (PISCR_PS | PISCR_PITF)
+#define CFG_PISCR              (PISCR_PS | PISCR_PITF)
 
 /* PLPRCR - PLL, Low-Power, and Reset Control Register */
-/* #define CFG_PLPRCR          PLPRCR_TEXPS */
+/* #define CFG_PLPRCR          PLPRCR_TEXPS */
 
 /* SCCR - System Clock and reset Control Register */
-#define SCCR_MASK              SCCR_EBDF11
+#define SCCR_MASK              SCCR_EBDF11
 #define CFG_SCCR               SCCR_RTSEL
 
-#define CFG_DER                0
+#define CFG_DER                        0
 
 /*-----------------------------------------------------------------------
  * Cache Configuration
@@ -212,4 +215,8 @@
 #define BOOTFLAG_COLD          0x01    /* Normal Power-On: Boot from flash     */
 #define BOOTFLAG_WARM          0x02    /* Software reboot                      */
 
+/* pass open firmware flat tree */
+#define CONFIG_OF_LIBFDT       1
+#define CONFIG_OF_BOARD_SETUP  1
+
 #endif /* __CONFIG_H */