Merge git://git.denx.de/u-boot-sunxi

[J-u-boot.git] / include / configs / 10m50_devboard.h

diff --git a/include/configs/10m50_devboard.h b/include/configs/10m50_devboard.h
index ab7dd08914143be7330251485a3d4f1a4e266299..892ceff5e6402099f63b3d29cfd4b8c803250c04 100644 (file)
--- a/include/configs/10m50_devboard.h
+++ b/include/configs/10m50_devboard.h
@@ -12,14 +12,12 @@
 /*
  * BOARD/CPU
  */
-#define CONFIG_DISPLAY_CPUINFO
 #define CONFIG_DISPLAY_BOARDINFO_LATE
 
 /*
  * SERIAL
  */
-#define CONFIG_BAUDRATE                        115200
-#define CONFIG_SYS_CONSOLE_INFO_QUIET  /* Suppress console info */
+#define CONFIG_SYS_NS16550_MEM32
 
 /*
  * Flash
@@ -32,8 +30,6 @@
  * NET options
  */
 #define CONFIG_SYS_RX_ETH_BUFFER       0
-#define CONFIG_CMD_MII
-#define CONFIG_PHY_GIGE
 #define CONFIG_SYS_FAULT_ECHO_LINK_DOWN
 #define CONFIG_PHY_MARVELL
 
@@ -48,23 +44,8 @@
 /*
  * FDT options
  */
-#define CONFIG_OF_LIBFDT
-#define CONFIG_OF_BOARD_SETUP
 #define CONFIG_LMB
 
-/*
- * ENVIRONMENT -- Put environment in sector CONFIG_SYS_MONITOR_LEN above
- * CONFIG_SYS_RESET_ADDR, since we assume the monitor is stored at the
- * reset address, no? This will keep the environment in user region
- * of flash. NOTE: the monitor length must be multiple of sector size
- * (which is common practice).
- */
-#define CONFIG_ENV_IS_IN_FLASH
-
-#define CONFIG_ENV_SIZE                        0x10000 /* 64k, 1 sector */
-#define CONFIG_ENV_OVERWRITE           /* Serial change Ok     */
-#define CONFIG_ENV_ADDR                        0xf4040000
-
 /*
  * MEMORY ORGANIZATION
  * -Monitor at top of sdram.
@@ -75,12 +56,24 @@
 #define CONFIG_SYS_SDRAM_SIZE          0x08000000
 #define CONFIG_NR_DRAM_BANKS           1
 #define CONFIG_MONITOR_IS_IN_RAM
-#define CONFIG_SYS_MONITOR_LEN         0x40000 /* Reserve 256k */
+#define CONFIG_SYS_MONITOR_LEN         0x80000 /* Reserve 512k */
 #define CONFIG_SYS_MONITOR_BASE        (CONFIG_SYS_SDRAM_BASE + \
                                         CONFIG_SYS_SDRAM_SIZE - \
                                         CONFIG_SYS_MONITOR_LEN)
 #define CONFIG_SYS_MALLOC_LEN          0x20000
 
+/*
+ * ENVIRONMENT -- Put environment in sector CONFIG_SYS_MONITOR_LEN above
+ * CONFIG_SYS_RESET_ADDR, since we assume the monitor is stored at the
+ * reset address, no? This will keep the environment in user region
+ * of flash. NOTE: the monitor length must be multiple of sector size
+ * (which is common practice).
+ */
+
+#define CONFIG_ENV_SIZE                        0x10000 /* 64k, 1 sector */
+#define CONFIG_ENV_OVERWRITE           /* Serial change Ok     */
+#define CONFIG_ENV_ADDR                        (0xf4000000 + CONFIG_SYS_MONITOR_LEN)
+
 /*
  * MISC
  */
@@ -91,13 +84,14 @@
 #define CONFIG_SYS_PBSIZE              (CONFIG_SYS_CBSIZE + \
                                        sizeof(CONFIG_SYS_PROMPT) + \
                                         16)    /* Print buf size */
-#define CONFIG_SYS_LOAD_ADDR           CONFIG_SYS_SDRAM_BASE
+#define CONFIG_SYS_LOAD_ADDR           0xcc000000      /* Half of RAM */
+#define CONFIG_LOADADDR                        CONFIG_SYS_LOAD_ADDR
 #define CONFIG_SYS_MEMTEST_START       CONFIG_SYS_SDRAM_BASE
 #define CONFIG_SYS_MEMTEST_END         (CONFIG_SYS_MONITOR_BASE - \
                                         CONFIG_ENV_SIZE - \
                                         CONFIG_SYS_MALLOC_LEN -        \
                                         0x10000)
+#define CONFIG_AUTO_COMPLETE
 #define CONFIG_CMDLINE_EDITING
-#define CONFIG_CMD_GPIO
 
 #endif /* __CONFIG_H */