video: Moving mx3fb.c to CONFIG_VIDEO

[platform/kernel/u-boot.git] / include / configs / apollon.h

diff --git a/include/configs/apollon.h b/include/configs/apollon.h
index f83dd9c..46595d9 100644 (file)
--- a/include/configs/apollon.h
+++ b/include/configs/apollon.h
@@ -76,9 +76,8 @@
  * Size of malloc() pool
  */
 #define        CONFIG_ENV_SIZE SZ_128K /* Total Size of Environment Sector */
+#define CONFIG_ENV_SIZE_FLEX SZ_256K
 #define        CONFIG_SYS_MALLOC_LEN   (CONFIG_ENV_SIZE + SZ_1M)
-/* bytes reserved for initial data */
-#define        CONFIG_SYS_GBL_DATA_SIZE        128
 
 /*
  * Hardware drivers
@@ -87,7 +86,7 @@
 /*
  * SMC91c96 Etherent
  */
-#define        CONFIG_DRIVER_LAN91C96
+#define        CONFIG_LAN91C96
 #define        CONFIG_LAN91C96_BASE    (APOLLON_CS1_BASE+0x300)
 #define        CONFIG_LAN91C96_EXT_PHY
 
@@ -124,10 +123,11 @@
 #define        CONFIG_CMD_JFFS2
 #define        CONFIG_CMD_UBI
 #define        CONFIG_RBTREE
+#define CONFIG_MTD_DEVICE              /* needed for mtdparts commands */
 #define CONFIG_MTD_PARTITIONS
 #endif
 
-#undef CONFIG_CMD_AUTOSCRIPT
+#undef CONFIG_CMD_SOURCE
 
 #ifndef        CONFIG_SYS_USE_NOR
 # undef        CONFIG_CMD_FLASH
@@ -182,10 +182,8 @@
 /*
  * Miscellaneous configurable options
  */
-#define        V_PROMPT        "Apollon # "
-
 #define        CONFIG_SYS_LONGHELP     /* undef to save memory */
-#define        CONFIG_SYS_PROMPT       V_PROMPT
+#define        CONFIG_SYS_PROMPT       "Apollon # "
 #define        CONFIG_SYS_CBSIZE       256     /* Console I/O Buffer Size */
 /* Print Buffer Size */
 #define        CONFIG_SYS_PBSIZE       (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16)
@@ -196,7 +194,6 @@
 #define        CONFIG_SYS_MEMTEST_START        (OMAP2420_SDRC_CS0)
 #define        CONFIG_SYS_MEMTEST_END          (OMAP2420_SDRC_CS0+SZ_31M)
 
-#undef CONFIG_SYS_CLKS_IN_HZ   /* everything, incl board info, in Hz */
 /* default load address */
 #define        CONFIG_SYS_LOAD_ADDR    (OMAP2420_SDRC_CS0)
 
@@ -204,11 +201,9 @@
  * or by 32KHz clk, or from external sig. This rate is divided by a local
  * divisor.
  */
-#define        V_PVT   7       /* use with 12MHz/128 */
-
 #define        CONFIG_SYS_TIMERBASE    OMAP2420_GPT2
-#define        CONFIG_SYS_PVT  V_PVT   /* 2^(pvt+1) */
-#define        CONFIG_SYS_HZ           ((CONFIG_SYS_CLK_FREQ)/(2 << CONFIG_SYS_PVT))
+#define        CONFIG_SYS_PTV          7       /* 2^(PTV+1) */
+#define        CONFIG_SYS_HZ           ((CONFIG_SYS_CLK_FREQ)/(2 << CONFIG_SYS_PTV))
 
 /*-----------------------------------------------------------------------
  * Stack sizes
@@ -254,8 +249,10 @@
 
 /* OneNAND boot, OneNAND has CS0, NOR boot ONeNAND has CS2 */
 #define        CONFIG_SYS_ONENAND_BASE 0x00000000
+#define CONFIG_SYS_MONITOR_LEN         SZ_256K /* U-Boot image size */
 #define        CONFIG_ENV_IS_IN_ONENAND        1
 #define CONFIG_ENV_ADDR                0x00020000
+#define CONFIG_ENV_ADDR_FLEX   0x00040000
 
 #ifdef CONFIG_SYS_USE_UBI
 #define CONFIG_CMD_MTDPARTS
@@ -268,4 +265,8 @@
                                        "-(ubifs)"
 #endif
 
+#define PHYS_SRAM                      0x4020F800
+#define CONFIG_SYS_SDRAM_BASE          PHYS_SDRAM_1
+#define CONFIG_SYS_INIT_SP_ADDR        PHYS_SRAM
+
 #endif /* __CONFIG_H */