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

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

diff --git a/include/configs/omap3_pandora.h b/include/configs/omap3_pandora.h
index b664319..ba7d3cd 100644 (file)
--- a/include/configs/omap3_pandora.h
+++ b/include/configs/omap3_pandora.h
@@ -18,18 +18,11 @@
 
 #include <configs/ti_omap3_common.h>
 
-/*
- * Display CPU and Board information
- */
-#define CONFIG_DISPLAY_CPUINFO         1
-#define CONFIG_DISPLAY_BOARDINFO       1
-
 #define CONFIG_MISC_INIT_R
 #define CONFIG_REVISION_TAG            1
 
 #define CONFIG_ENV_SIZE                        (128 << 10)     /* 128 KiB */
 
-#define CONFIG_SYS_CONSOLE_IS_IN_ENV   1
 #define CONFIG_SYS_DEVICE_NULLDEV      1
 
 /*
@@ -69,7 +62,6 @@
 #define CONFIG_SYS_NAND_OOBSIZE                64
 
 #ifdef CONFIG_NAND
-#define CONFIG_CMD_UBI         /* UBI-formated MTD partition support */
 #define CONFIG_CMD_UBIFS       /* Read-only UBI volume operations */
 
 #define CONFIG_RBTREE          /* required by CONFIG_CMD_UBI */