Convert CONFIG_CMD_PCA953X to Kconfig

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

diff --git a/include/configs/omap3_cairo.h b/include/configs/omap3_cairo.h
index 379c2a0..4f8ce54 100644 (file)
--- a/include/configs/omap3_cairo.h
+++ b/include/configs/omap3_cairo.h
@@ -40,11 +40,6 @@
 
 #include <configs/ti_omap3_common.h>
 
-/*
- * Display CPU and Board information
- */
-#define CONFIG_DISPLAY_BOARDINFO       1
-
 #define CONFIG_MISC_INIT_R
 
 #define CONFIG_REVISION_TAG            1
@@ -58,9 +53,6 @@
 
 #define CONFIG_NAND
 
-/* commands to include */
-#define CONFIG_CMD_NAND_LOCK_UNLOCK
-
 /*
  * TWL4030
  */
@@ -180,7 +172,6 @@
 #define CONFIG_SYS_MONITOR_BASE                CONFIG_SYS_FLASH_BASE
 #define CONFIG_SYS_ONENAND_BASE                ONENAND_MAP
 
-#define CONFIG_ENV_IS_IN_NAND          1
 #define CONFIG_ENV_SIZE                        (128 << 10)     /* 128 KiB */
 #define ONENAND_ENV_OFFSET             0x260000 /* environment starts here */
 #define SMNAND_ENV_OFFSET              0x260000 /* environment starts here */
@@ -233,9 +224,8 @@
 #define CONFIG_SERIAL2
 #endif
 
-/* Provide MACH_TYPE for compatibility with non-DT kernels */
-#define MACH_TYPE_OMAP3_CAIRO  3063
-#define CONFIG_MACH_TYPE       MACH_TYPE_OMAP3_CAIRO
+/* Provide the MACH_TYPE value the vendor kernel requires */
+#define CONFIG_MACH_TYPE       3063
 
 /*-----------------------------------------------------------------------
  * FLASH and environment organization