Convert CONFIG_BOOTP_BOOTPATH et al to Kconfig

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

diff --git a/include/configs/mcx.h b/include/configs/mcx.h
index fd8cf1d506034d8c904f0e4af2d5c700b69b9576..a6246713320ad09420470e1472be8039e0ad4158 100644 (file)
--- a/include/configs/mcx.h
+++ b/include/configs/mcx.h
@@ -12,19 +12,8 @@
 /*
  * High Level Configuration Options
  */
-#define CONFIG_OMAP                    /* in a TI OMAP core */
-#define CONFIG_OMAP3_MCX               /* working with mcx */
-#define CONFIG_OMAP_GPIO
-/* 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 CONFIG_EMIF4   /* The chip has EMIF4 controller */
+#define CONFIG_MACH_TYPE       MACH_TYPE_MCX
 
 #include <asm/arch/cpu.h>              /* get chip and board defs */
 #include <asm/arch/omap.h>
@@ -33,7 +22,6 @@
  * Leave it at 0x80008000 to allow booting new u-boot.bin with X-loader
  * and older u-boot.bin with the new U-Boot SPL.
  */
-#define CONFIG_SYS_TEXT_BASE           0x80008000
 
 /* Clock Defines */
 #define V_OSCK                 26000000        /* Clock output from T2 */
@@ -78,40 +66,18 @@
 
 /* allow to overwrite serial and ethaddr */
 #define CONFIG_ENV_OVERWRITE
-#define CONFIG_BAUDRATE                        115200
 #define CONFIG_SYS_BAUDRATE_TABLE      {4800, 9600, 19200, 38400, 57600,\
                                        115200}
-#define CONFIG_GENERIC_MMC
-#define CONFIG_DOS_PARTITION
 
 /* EHCI */
-#define CONFIG_OMAP3_GPIO_2
-#define CONFIG_OMAP3_GPIO_5
-#define CONFIG_USB_EHCI
-#define CONFIG_USB_EHCI_OMAP
 #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 */
-#define CONFIG_CMD_JFFS2       /* JFFS2 Support                */
 
-#define CONFIG_CMD_DATE
-#define CONFIG_CMD_NAND                /* NAND support                 */
-#define CONFIG_CMD_UBIFS
-#define CONFIG_RBTREE
-#define CONFIG_LZO
 #define CONFIG_MTD_PARTITIONS
 #define CONFIG_MTD_DEVICE
-#define CONFIG_CMD_MTDPARTS
 
-#define CONFIG_SYS_NO_FLASH
 #define CONFIG_SYS_I2C
-#define CONFIG_SYS_OMAP24_I2C_SPEED    100000
-#define CONFIG_SYS_OMAP24_I2C_SLAVE    1
-#define CONFIG_SYS_I2C_OMAP34XX
 
 /* RTC */
 #define CONFIG_RTC_DS1337
@@ -140,11 +106,6 @@
 #define CONFIG_BOOTFILE                "uImage"
 
 /* Setup MTD for NAND on the SOM */
-#define MTDIDS_DEFAULT         "nand0=omap2-nand.0"
-#define MTDPARTS_DEFAULT       "mtdparts=omap2-nand.0:512k(MLO),"      \
-                               "1m(u-boot),256k(env1),"                \
-                               "256k(env2),6m(kernel),6m(k_recovery)," \
-                               "8m(fs_recovery),-(common_data)"
 
 #define CONFIG_HOSTNAME mcx
 #define CONFIG_EXTRA_ENV_SETTINGS \
@@ -231,19 +192,10 @@
        "bootcmd=mmc rescan;if fatload mmc 0 82000000 loadbootscr.scr;" \
                "then source 82000000;else run nandboot;fi\0"
 
-#define CONFIG_AUTO_COMPLETE
-#define CONFIG_CMDLINE_EDITING
-
 /*
  * Miscellaneous configurable options
  */
-#define CONFIG_SYS_LONGHELP            /* undef to save memory */
 #define CONFIG_SYS_CBSIZE              1024/* Console I/O Buffer Size */
-/* Print Buffer Size */
-#define CONFIG_SYS_PBSIZE              (CONFIG_SYS_CBSIZE + \
-                                       sizeof(CONFIG_SYS_PROMPT) + 16)
-#define CONFIG_SYS_MAXARGS             16      /* max number of command */
-                                               /* args */
 /* Boot Argument Buffer Size */
 #define CONFIG_SYS_BARGSIZE            (CONFIG_SYS_CBSIZE)
 /* memtest works on */
@@ -275,17 +227,11 @@
  */
 
 /* **** PISMO SUPPORT *** */
-#define CONFIG_NAND
-#define CONFIG_SYS_NAND_BUSWIDTH_16BIT
-#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 */
 
 /* Redundant Environment */
 #define CONFIG_SYS_ENV_SECT_SIZE       (128 << 10)     /* 128 KiB */
-#define CONFIG_ENV_OFFSET              SMNAND_ENV_OFFSET
-#define CONFIG_ENV_ADDR                        SMNAND_ENV_OFFSET
+#define CONFIG_ENV_OFFSET              0x180000
+#define CONFIG_ENV_ADDR                        0x180000
 #define CONFIG_ENV_OFFSET_REDUND       (CONFIG_ENV_OFFSET + \
                                                2 * CONFIG_SYS_ENV_SECT_SIZE)
 #define CONFIG_ENV_SIZE_REDUND         CONFIG_ENV_SIZE
@@ -306,14 +252,10 @@
                                         GENERATED_GBL_DATA_SIZE)
 
 /* Defines for SPL */
-#define CONFIG_SPL_FRAMEWORK
-#define CONFIG_SPL_BOARD_INIT
-#define CONFIG_SPL_NAND_SIMPLE
 
 #define CONFIG_SPL_NAND_BASE
 #define CONFIG_SPL_NAND_DRIVERS
 #define CONFIG_SPL_NAND_ECC
-#define CONFIG_SPL_LDSCRIPT            "arch/arm/mach-omap2/u-boot-spl.lds"
 
 #define CONFIG_SPL_TEXT_BASE           0x40200000 /*CONFIG_SYS_SRAM_START*/
 #define CONFIG_SPL_MAX_SIZE            (54 * 1024)     /* 8 KB for stack */
@@ -355,7 +297,6 @@
 #define CONFIG_DRIVER_TI_EMAC
 #define CONFIG_DRIVER_TI_EMAC_USE_RMII
 #define CONFIG_MII
-#define CONFIG_BOOTP_DNS
 #define CONFIG_BOOTP_DNS2
 #define CONFIG_BOOTP_SEND_HOSTNAME
 #define CONFIG_NET_RETRY_COUNT 10
@@ -363,7 +304,6 @@
 
 #define CONFIG_SPLASH_SCREEN
 #define CONFIG_VIDEO_BMP_RLE8
-#define CONFIG_CMD_BMP
 #define CONFIG_VIDEO_OMAP3
 
 #endif /* __CONFIG_H */