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

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

diff --git a/include/configs/imx31_litekit.h b/include/configs/imx31_litekit.h
index 9405f562c4b34a78dc234fca76147972e9cd88b9..31f05134f8319676414d386a4c5db322bfdccc67 100644 (file)
--- a/include/configs/imx31_litekit.h
+++ b/include/configs/imx31_litekit.h
@@ -39,6 +39,10 @@
 #define CONFIG_DISPLAY_CPUINFO
 #define CONFIG_DISPLAY_BOARDINFO
 
+#define CONFIG_SYS_TEXT_BASE   0xa0000000
+
+#define CONFIG_MACH_TYPE       MACH_TYPE_MX31LITE
+
 /* Temporarily disabled */
 #if 0
 #define CONFIG_OF_LIBFDT               1
@@ -61,6 +65,7 @@
 
 #define CONFIG_MXC_UART        1
 #define CONFIG_SYS_MX31_UART1          1
+#define CONFIG_MXC_GPIO
 
 #define CONFIG_HARD_SPI                1
 #define CONFIG_MXC_SPI         1
@@ -107,7 +112,6 @@
        "prg_uboot=tftpboot 0x80000000 u-boot-imx31_litekit.bin; protect off all; erase 0xa00d0000 0xa01effff; cp.b 0x80000000 0xa00d0000 $(filesize)\0"
 
 
-#define CONFIG_NET_MULTI
 #define CONFIG_SMC911X         1
 #define CONFIG_SMC911X_BASE    (CS4_BASE + 0x00020000)
 #define CONFIG_SMC911X_32_BIT  1
@@ -145,8 +149,9 @@
 #define CONFIG_NR_DRAM_BANKS   1
 #define PHYS_SDRAM_1           CSD0_BASE
 #define PHYS_SDRAM_1_SIZE      (128 * 1024 * 1024)
+#define CONFIG_BOARD_EARLY_INIT_F
 
-#define CONFIG_SYS_SDRAM_BASE          CSD0_BASE
+#define CONFIG_SYS_SDRAM_BASE          PHYS_SDRAM_1
 #define CONFIG_SYS_INIT_RAM_ADDR       IRAM_BASE_ADDR
 #define CONFIG_SYS_INIT_RAM_SIZE               IRAM_SIZE
 #define CONFIG_SYS_GBL_DATA_OFFSET     (CONFIG_SYS_INIT_RAM_SIZE - GENERATED_GBL_DATA_SIZE)