cosmetic: s/BOARD_LATE_INIT/CONFIG_BOARD_LATE_INIT

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

diff --git a/include/configs/imx31_phycore.h b/include/configs/imx31_phycore.h
index cb42a7cc96bbadbeea7055e8b8c19be3dbb30d7f..f4bfee490be6ab2de3208afcd237df34f10a7670 100644 (file)
--- a/include/configs/imx31_phycore.h
+++ b/include/configs/imx31_phycore.h
@@ -28,6 +28,8 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
+#include <asm/arch/imx-regs.h>
+
  /* High Level Configuration Options */
 #define CONFIG_ARM1136         1    /* This is an arm1136 CPU core */
 #define CONFIG_MX31            1    /* in a mx31 */
@@ -51,8 +53,7 @@
 /*
  * Size of malloc() pool
  */
-#define CONFIG_SYS_MALLOC_LEN          (CONFIG_ENV_SIZE + 128 * 1024)
-#define CONFIG_SYS_GBL_DATA_SIZE       128  /* size in bytes reserved for initial data */
+#define CONFIG_SYS_MALLOC_LEN          (CONFIG_ENV_SIZE + 512 * 1024)
 
 /*
  * Hardware drivers
@@ -103,12 +104,13 @@
        "mtdparts=" MTDPARTS_DEFAULT "\0"                                                                               \
        "prg_uboot=tftpboot 0x80000000 $(uboot); protect off 0xa0000000 +0x20000; erase 0xa0000000 +0x20000; cp.b 0x80000000 0xa0000000 $(filesize)\0" \
        "prg_kernel=tftpboot 0x80000000 $(uimage); erase 0xa0040000 +0x180000; cp.b 0x80000000 0xa0040000 $(filesize)\0"        \
-       "prg_jffs2=tftpboot 0x80000000 $(jffs2); erase 0xa01c0000 0xa1ffffff; cp.b 0x80000000 0xa01c0000 $(filesize)\0"
+       "prg_jffs2=tftpboot 0x80000000 $(jffs2); erase 0xa01c0000 0xa1ffffff; cp.b 0x80000000 0xa01c0000 $(filesize)\0" \
+       "videomode=video=ctfb:x:240,y:320,depth:16,mode:0,pclk:185925,le:9,ri:17,up:7,lo:10,hs:1,vs:1,sync:1241513985,vmode:0\0"
 
 
-#define CONFIG_DRIVER_SMC911X          1
-#define CONFIG_DRIVER_SMC911X_BASE     0xa8000000
-#define CONFIG_DRIVER_SMC911X_32_BIT   1
+#define CONFIG_SMC911X         1
+#define CONFIG_SMC911X_BASE    0xa8000000
+#define CONFIG_SMC911X_32_BIT  1
 
 /*
  * Miscellaneous configurable options
@@ -143,6 +145,16 @@
 #define CONFIG_NR_DRAM_BANKS   1
 #define PHYS_SDRAM_1           0x80000000
 #define PHYS_SDRAM_1_SIZE      (128 * 1024 * 1024)
+#define CONFIG_BOARD_EARLY_INIT_F
+#define CONFIG_SYS_TEXT_BASE           0xA0000000
+
+#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)
+#define CONFIG_SYS_INIT_SP_ADDR        (CONFIG_SYS_INIT_RAM_ADDR + \
+                                               CONFIG_SYS_GBL_DATA_OFFSET)
 
 /*-----------------------------------------------------------------------
  * FLASH and environment organization
@@ -180,9 +192,9 @@
 
 /* EET platform additions */
 #ifdef CONFIG_IMX31_PHYCORE_EET
-#define BOARD_LATE_INIT
+#define CONFIG_BOARD_LATE_INIT
 
-#define CONFIG_MX31_GPIO                       1
+#define CONFIG_MXC_GPIO
 
 #define CONFIG_HARD_SPI                                1
 #define CONFIG_MXC_SPI                         1
@@ -190,15 +202,16 @@
 
 #define CONFIG_S6E63D6                         1
 
-#define CONFIG_LCD                             1
-#define CONFIG_VIDEO_MX3                       1
-#define CONFIG_SYS_WHITE_ON_BLACK              1
-#define LCD_BPP                                        LCD_COLOR8
-#define        CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE    1
-#define CONFIG_SYS_CONSOLE_IS_IN_ENV           1
-
-#define        CONFIG_SPLASH_SCREEN                    1
-#define CONFIG_CMD_BMP                         1
+#define CONFIG_VIDEO
+#define CONFIG_CFB_CONSOLE
+#define CONFIG_VIDEO_MX3
+#define CONFIG_VIDEO_LOGO
+#define CONFIG_VIDEO_SW_CURSOR
+#define CONFIG_VGA_AS_SINGLE_DEVICE
+#define CONFIG_SYS_CONSOLE_IS_IN_ENV
+#define CONFIG_SPLASH_SCREEN
+#define CONFIG_CMD_BMP
+#define CONFIG_BMP_16BPP
 #endif
 
 #endif /* __CONFIG_H */