Convert CONFIG_NAND to Kconfig

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

diff --git a/include/configs/omap3_pandora.h b/include/configs/omap3_pandora.h
index 4a9f6b7bb617ad50382628da84ab744e27919587..7f1b5712677efc82a3bfab28a94fa771b11dcd62 100644 (file)
--- a/include/configs/omap3_pandora.h
+++ b/include/configs/omap3_pandora.h
@@ -11,7 +11,6 @@
 #define __CONFIG_H
 
 #define CONFIG_NR_DRAM_BANKS   2       /* CS1 may or may not be populated */
-#define CONFIG_NAND
 
 /* override base for compatibility with MLO the device ships with */
 #define CONFIG_SYS_TEXT_BASE           0x80008000
@@ -23,23 +22,15 @@
 
 #define CONFIG_ENV_SIZE                        (128 << 10)     /* 128 KiB */
 
-#define CONFIG_SYS_CONSOLE_IS_IN_ENV   1
 #define CONFIG_SYS_DEVICE_NULLDEV      1
 
 /*
  * Hardware drivers
  */
 
-/* I2C Support */
-#define CONFIG_SYS_I2C_OMAP34XX
-
 /* TWL4030 LED */
 #define CONFIG_TWL4030_LED
 
-/* Initialize GPIOs by default */
-#define CONFIG_OMAP3_GPIO_4    /* GPIO96..127 is in GPIO Bank 4 */
-#define CONFIG_OMAP3_GPIO_6    /* GPIO160..191 is in GPIO Bank 6 */
-
 /*
  * NS16550 Configuration
  */
@@ -63,11 +54,6 @@
 #define CONFIG_SYS_NAND_OOBSIZE                64
 
 #ifdef CONFIG_NAND
-#define CONFIG_CMD_UBIFS       /* Read-only UBI volume operations */
-
-#define CONFIG_RBTREE          /* required by CONFIG_CMD_UBI */
-#define CONFIG_LZO             /* required by CONFIG_CMD_UBIFS */
-
 #define CONFIG_MTD_PARTITIONS  /* required for UBI partition support */
 
 #define MTDIDS_DEFAULT                 "nand0=omap2-nand.0"
@@ -113,7 +99,6 @@
 /* Monitor at start of flash */
 #define CONFIG_SYS_MONITOR_BASE                CONFIG_SYS_FLASH_BASE
 
-#define CONFIG_ENV_IS_IN_NAND          1
 #define SMNAND_ENV_OFFSET              0x260000 /* environment starts here */
 
 #define CONFIG_SYS_ENV_SECT_SIZE       (128 << 10)     /* 128 KiB */