Convert CONFIG_VIDEO to Kconfig

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

diff --git a/include/configs/mcx.h b/include/configs/mcx.h
index 26eb2203540f350b608e392817dc115f8844af28..2b9be7e1d8c47d09331fccacb6e96cdd518ce3c9 100644 (file)
--- a/include/configs/mcx.h
+++ b/include/configs/mcx.h
@@ -16,20 +16,19 @@
 #define CONFIG_OMAP3_MCX               /* working with mcx */
 #define CONFIG_OMAP_GPIO
 #define CONFIG_OMAP_COMMON
 #define CONFIG_OMAP3_MCX               /* working with mcx */
 #define CONFIG_OMAP_GPIO
 #define CONFIG_OMAP_COMMON

+/* Common ARM Erratas */
+#define CONFIG_ARM_ERRATA_454179
+#define CONFIG_ARM_ERRATA_430973
+#define CONFIG_ARM_ERRATA_621766

 
 #define MACH_TYPE_MCX                  3656
 #define CONFIG_MACH_TYPE       MACH_TYPE_MCX
 #define CONFIG_BOARD_LATE_INIT
 
 
 #define MACH_TYPE_MCX                  3656
 #define CONFIG_MACH_TYPE       MACH_TYPE_MCX
 #define CONFIG_BOARD_LATE_INIT
 

-#define CONFIG_SYS_CACHELINE_SIZE      64
-

 #define CONFIG_EMIF4   /* The chip has EMIF4 controller */
 
 #include <asm/arch/cpu.h>              /* get chip and board defs */
 #define CONFIG_EMIF4   /* The chip has EMIF4 controller */
 
 #include <asm/arch/cpu.h>              /* get chip and board defs */

-#include <asm/arch/omap3.h>
-
-#define CONFIG_OF_LIBFDT
-#define CONFIG_FIT
+#include <asm/arch/omap.h>

 
 /*
  * Leave it at 0x80008000 to allow booting new u-boot.bin with X-loader
 
 /*
  * Leave it at 0x80008000 to allow booting new u-boot.bin with X-loader


@@ -37,12 +36,6 @@
  */
 #define CONFIG_SYS_TEXT_BASE           0x80008000
 
  */
 #define CONFIG_SYS_TEXT_BASE           0x80008000
 

-/*
- * Display CPU and Board information
- */
-#define CONFIG_DISPLAY_CPUINFO
-#define CONFIG_DISPLAY_BOARDINFO
-

 /* Clock Defines */
 #define V_OSCK                 26000000        /* Clock output from T2 */
 #define V_SCLK                 (V_OSCK >> 1)
 /* Clock Defines */
 #define V_OSCK                 26000000        /* Clock output from T2 */
 #define V_SCLK                 (V_OSCK >> 1)


@@ -73,7 +66,6 @@
  */
 #define V_NS16550_CLK                  48000000        /* 48MHz (APLL96/2) */
 
  */
 #define V_NS16550_CLK                  48000000        /* 48MHz (APLL96/2) */
 

-#define CONFIG_SYS_NS16550

 #define CONFIG_SYS_NS16550_SERIAL
 #define CONFIG_SYS_NS16550_REG_SIZE    (-4)
 #define CONFIG_SYS_NS16550_CLK         V_NS16550_CLK
 #define CONFIG_SYS_NS16550_SERIAL
 #define CONFIG_SYS_NS16550_REG_SIZE    (-4)
 #define CONFIG_SYS_NS16550_CLK         V_NS16550_CLK


@@ -96,45 +88,27 @@
 #define CONFIG_DOS_PARTITION
 
 /* EHCI */
 #define CONFIG_DOS_PARTITION
 
 /* EHCI */

-#define CONFIG_USB_STORAGE

 #define CONFIG_OMAP3_GPIO_2
 #define CONFIG_OMAP3_GPIO_5
 #define CONFIG_USB_EHCI
 #define CONFIG_USB_EHCI_OMAP
 #define CONFIG_OMAP3_GPIO_2
 #define CONFIG_OMAP3_GPIO_5
 #define CONFIG_USB_EHCI
 #define CONFIG_USB_EHCI_OMAP

-#define CONFIG_USB_ULPI
-#define CONFIG_USB_ULPI_VIEWPORT_OMAP

 #define CONFIG_OMAP_EHCI_PHY1_RESET_GPIO       57
 #define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 3
 #define CONFIG_OMAP_EHCI_PHY1_RESET_GPIO       57
 #define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 3

+#define        CONFIG_USB_HOST_ETHER
+#define        CONFIG_USB_ETHER_ASIX
+#define CONFIG_USB_ETHER_MCS7830

 
 /* commands to include */
 
 /* commands to include */

-#include <config_cmd_default.h>
-
-#define CONFIG_CMD_EXT2                /* EXT2 Support                 */
-#define CONFIG_CMD_FAT         /* FAT support                  */

 #define CONFIG_CMD_JFFS2       /* JFFS2 Support                */
 
 #define CONFIG_CMD_DATE
 #define CONFIG_CMD_JFFS2       /* JFFS2 Support                */
 
 #define CONFIG_CMD_DATE

-#define CONFIG_CMD_I2C         /* I2C serial bus support       */
-#define CONFIG_CMD_MMC         /* MMC support                  */
-#define CONFIG_CMD_FAT         /* FAT support                  */
-#define CONFIG_CMD_USB

 #define CONFIG_CMD_NAND                /* NAND support                 */
 #define CONFIG_CMD_NAND                /* NAND support                 */

-#define CONFIG_CMD_DHCP
-#define CONFIG_CMD_PING
-#define CONFIG_CMD_CACHE
-#define CONFIG_CMD_UBI

 #define CONFIG_CMD_UBIFS
 #define CONFIG_RBTREE
 #define CONFIG_LZO
 #define CONFIG_MTD_PARTITIONS
 #define CONFIG_MTD_DEVICE
 #define CONFIG_CMD_MTDPARTS
 #define CONFIG_CMD_UBIFS
 #define CONFIG_RBTREE
 #define CONFIG_LZO
 #define CONFIG_MTD_PARTITIONS
 #define CONFIG_MTD_DEVICE
 #define CONFIG_CMD_MTDPARTS

-#define CONFIG_CMD_GPIO
-
-#undef CONFIG_CMD_FLASH                /* flinfo, erase, protect       */
-#undef CONFIG_CMD_FPGA         /* FPGA configuration Support   */
-#undef CONFIG_CMD_IMI          /* iminfo                       */
-#undef CONFIG_CMD_IMLS         /* List all found images        */

 
 #define CONFIG_SYS_NO_FLASH
 #define CONFIG_SYS_I2C
 
 #define CONFIG_SYS_NO_FLASH
 #define CONFIG_SYS_I2C


@@ -146,9 +120,6 @@
 #define CONFIG_RTC_DS1337
 #define CONFIG_SYS_I2C_RTC_ADDR                0x68
 
 #define CONFIG_RTC_DS1337
 #define CONFIG_SYS_I2C_RTC_ADDR                0x68
 

-#define CONFIG_CMD_NET
-#define CONFIG_CMD_MII
-#define CONFIG_CMD_NFS

 /*
  * Board NAND Info.
  */
 /*
  * Board NAND Info.
  */


@@ -168,7 +139,6 @@
 #define CONFIG_JFFS2_PART_SIZE         0xf980000       /* sz of jffs2 part */
 
 /* Environment information */
 #define CONFIG_JFFS2_PART_SIZE         0xf980000       /* sz of jffs2 part */
 
 /* Environment information */

-#define CONFIG_BOOTDELAY       3

 
 #define CONFIG_BOOTFILE                "uImage"
 
 
 #define CONFIG_BOOTFILE                "uImage"
 


@@ -270,11 +240,7 @@
 /*
  * Miscellaneous configurable options
  */
 /*
  * Miscellaneous configurable options
  */

-#define V_PROMPT                       "mcx # "
-

 #define CONFIG_SYS_LONGHELP            /* undef to save memory */
 #define CONFIG_SYS_LONGHELP            /* undef to save memory */

-#define CONFIG_SYS_HUSH_PARSER         /* use "hush" command parser */
-#define CONFIG_SYS_PROMPT              V_PROMPT

 #define CONFIG_SYS_CBSIZE              1024/* Console I/O Buffer Size */
 /* Print Buffer Size */
 #define CONFIG_SYS_PBSIZE              (CONFIG_SYS_CBSIZE + \
 #define CONFIG_SYS_CBSIZE              1024/* Console I/O Buffer Size */
 /* Print Buffer Size */
 #define CONFIG_SYS_PBSIZE              (CONFIG_SYS_CBSIZE + \


@@ -312,7 +278,10 @@
  */
 
 /* **** PISMO SUPPORT *** */
  */
 
 /* **** PISMO SUPPORT *** */

+#define CONFIG_NAND
+#define CONFIG_SYS_NAND_BUSWIDTH_16BIT

 #define CONFIG_NAND_OMAP_GPMC
 #define CONFIG_NAND_OMAP_GPMC

+#define CONFIG_NAND_OMAP_GPMC_PREFETCH

 #define CONFIG_ENV_IS_IN_NAND
 #define SMNAND_ENV_OFFSET              0x180000 /* environment starts here */
 
 #define CONFIG_ENV_IS_IN_NAND
 #define SMNAND_ENV_OFFSET              0x180000 /* environment starts here */
 


@@ -344,15 +313,6 @@
 #define CONFIG_SPL_BOARD_INIT
 #define CONFIG_SPL_NAND_SIMPLE
 
 #define CONFIG_SPL_BOARD_INIT
 #define CONFIG_SPL_NAND_SIMPLE
 

-#define CONFIG_SPL_LIBCOMMON_SUPPORT
-#define CONFIG_SPL_LIBDISK_SUPPORT
-#define CONFIG_SPL_I2C_SUPPORT
-#define CONFIG_SPL_MMC_SUPPORT
-#define CONFIG_SPL_FAT_SUPPORT
-#define CONFIG_SPL_LIBGENERIC_SUPPORT
-#define CONFIG_SPL_SERIAL_SUPPORT
-#define CONFIG_SPL_POWER_SUPPORT
-#define CONFIG_SPL_NAND_SUPPORT

 #define CONFIG_SPL_NAND_BASE
 #define CONFIG_SPL_NAND_DRIVERS
 #define CONFIG_SPL_NAND_ECC
 #define CONFIG_SPL_NAND_BASE
 #define CONFIG_SPL_NAND_DRIVERS
 #define CONFIG_SPL_NAND_ECC


@@ -405,7 +365,6 @@
 #define CONFIG_NET_RETRY_COUNT 10
 #endif
 
 #define CONFIG_NET_RETRY_COUNT 10
 #endif
 

-#define CONFIG_VIDEO

 #define CONFIG_CFB_CONSOLE
 #define CONFIG_VGA_AS_SINGLE_DEVICE
 #define CONFIG_SPLASH_SCREEN
 #define CONFIG_CFB_CONSOLE
 #define CONFIG_VGA_AS_SINGLE_DEVICE
 #define CONFIG_SPLASH_SCREEN