Merge branch 'master' of /home/wd/git/u-boot/lwmon5

[u-boot] / include / configs / ml401.h

diff --git a/include/configs/ml401.h b/include/configs/ml401.h
index 1a2cb0aeed0bca705608e70db54ef5d6e98963a6..360e2e11d2afe31b9c9b2a6c73a3320fdf63d6aa 100644 (file)
--- a/include/configs/ml401.h
+++ b/include/configs/ml401.h
@@ -1,5 +1,5 @@
 /*
- * (C) Copyright 2007 Michal Simek
+ * (C) Copyright 2007-2008 Michal Simek
  *
  * Michal SIMEK <monstr@monstr.eu>
  *
@@ -64,8 +64,10 @@
 #undef ET_DEBUG
 
 /* gpio */
+#ifdef XILINX_GPIO_BASEADDR
 #define        CFG_GPIO_0              1
 #define        CFG_GPIO_0_ADDR         XILINX_GPIO_BASEADDR
+#endif
 
 /* interrupt controller */
 #define        CFG_INTC_0              1
@@ -81,8 +83,8 @@
 #define        CONFIG_XILINX_CLOCK_FREQ        XILINX_CLOCK_FREQ
 
 /* FSL */
-#define        CFG_FSL_2
-#define        FSL_INTR_2      1
+/* #define     CFG_FSL_2 */
+/* #define     FSL_INTR_2      1 */
 
 /*
  * memory layout - Example
@@ -153,9 +155,9 @@
 
        #else   /* !RAMENV */
                #define CFG_ENV_IS_IN_FLASH     1
-               #define CFG_ENV_ADDR            0x40000
                #define CFG_ENV_SECT_SIZE       0x40000 /* 256K(one sector) for env */
-               #define CFG_ENV_SIZE            0x2000
+               #define CFG_ENV_ADDR            (CFG_FLASH_BASE + (2 * CFG_ENV_SECT_SIZE))
+               #define CFG_ENV_SIZE            0x40000
        #endif /* !RAMBOOT */
 #else /* !FLASH */
        /* ENV in RAM */
@@ -254,4 +256,7 @@
                                        "256k(u-boot),256k(env),3m(kernel),"\
                                        "1m(romfs),1m(cramfs),-(jffs2)\0"
 
+#define CONFIG_CMDLINE_EDITING
+#define CONFIG_OF_LIBFDT       1
+
 #endif /* __CONFIG_H */