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

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

diff --git a/include/configs/apollon.h b/include/configs/apollon.h
index 04da083e697d4234165d601c832fab57893ea8e4..575f60e1661d1dddd6a4760435bbd73406beb939 100644 (file)
--- a/include/configs/apollon.h
+++ b/include/configs/apollon.h
@@ -124,10 +124,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
@@ -251,9 +252,12 @@
 
 /* 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_SYS_64BIT_VSPRINTF              /* needed for nand_util.c */
+
 #ifdef CONFIG_SYS_USE_UBI
 #define CONFIG_CMD_MTDPARTS
 #define MTDIDS_DEFAULT         "onenand0=onenand"