Convert CONFIG_ENV_IS_IN_ONENAND to Kconfig

[people/ms/u-boot.git] / include / configs / omap3_evm.h

diff --git a/include/configs/omap3_evm.h b/include/configs/omap3_evm.h
index 297fd0ee933f13cb4c09bc023f964eff701cf2ea..15eb08bba8e431b88aba20484927129777ad2798 100644 (file)
--- a/include/configs/omap3_evm.h
+++ b/include/configs/omap3_evm.h
@@ -25,8 +25,6 @@
  * ----------------------------------------------------------------------------
  */
 
-#define CONFIG_CMD_JFFS2
-
 #define CONFIG_CMD_NAND
 
 /* ----------------------------------------------------------------------------
@@ -46,9 +44,6 @@
  * ----------------------------------------------------------------------------
  */
 
-/* MMC */
-#define CONFIG_GENERIC_MMC
-
 /* SPL */
 #define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION     1
 #define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME        "u-boot.img"
@@ -86,18 +81,9 @@
 /*
  * High level configuration options
  */
-#define CONFIG_OMAP                    /* This is TI OMAP core */
-#define CONFIG_OMAP_GPIO
-/* Common ARM Erratas */
-#define CONFIG_ARM_ERRATA_454179
-#define CONFIG_ARM_ERRATA_430973
-#define CONFIG_ARM_ERRATA_621766
 
 #define CONFIG_SDRC                    /* The chip has SDRC controller */
 
-#define CONFIG_OMAP3_EVM               /* This is a OMAP3 EVM */
-#define CONFIG_TWL4030_POWER           /* with TWL4030 PMIC */
-
 /*
  * Clock related definitions
  */
@@ -155,7 +141,6 @@
 #define CONFIG_CONS_INDEX              1
 #define CONFIG_SERIAL1                 1       /* UART1 on OMAP3 EVM */
 #define CONFIG_SYS_NS16550_COM1                OMAP34XX_UART1
-#define CONFIG_BAUDRATE                        115200
 #define CONFIG_SYS_BAUDRATE_TABLE      {4800, 9600, 19200, 38400, 57600,\
                                        115200}
 
@@ -220,8 +205,6 @@
 
 #ifdef CONFIG_USB_MUSB_HCD
 
-#define CONGIG_CMD_STORAGE
-
 #ifdef CONFIG_USB_KEYBOARD
 #define CONFIG_SYS_USB_EVENT_POLL
 #define CONFIG_PREBOOT                 "usb start"
@@ -283,9 +266,7 @@
 
 #if !defined(CONFIG_ENV_IS_NOWHERE)
 #if defined(CONFIG_CMD_NAND)
-#define CONFIG_ENV_IS_IN_NAND
 #elif defined(CONFIG_CMD_ONENAND)
-#define CONFIG_ENV_IS_IN_ONENAND
 #define CONFIG_ENV_OFFSET              ONENAND_ENV_OFFSET
 #endif
 #endif /* CONFIG_ENV_IS_NOWHERE */
@@ -319,7 +300,6 @@
  * Board specific
  * -----------------------------------------------------------------------------
  */
-#define CONFIG_SYS_NO_FLASH
 
 /* Uncomment to define the board revision statically */
 /* #define CONFIG_STATIC_BOARD_REV     OMAP3EVM_BOARD_GEN_2 */
@@ -333,7 +313,6 @@
 #define CONFIG_SPL_BSS_START_ADDR      0x80000000
 #define CONFIG_SPL_BSS_MAX_SIZE                0x80000         /* 512 KB */
 
-#define CONFIG_SPL_BOARD_INIT
 #define CONFIG_SPL_OMAP3_ID_NAND
 #define CONFIG_SPL_LDSCRIPT            "arch/arm/mach-omap2/u-boot-spl.lds"