Convert CONFIG_BOOTP_BOOTPATH et al to Kconfig

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

diff --git a/include/configs/am43xx_evm.h b/include/configs/am43xx_evm.h
index 743f953602236f9d4d4277375844ac7997aa3830..a0d2b36d9982b82e5a12944e87597f941d14bd91 100644 (file)
--- a/include/configs/am43xx_evm.h
+++ b/include/configs/am43xx_evm.h
@@ -77,7 +77,6 @@
 #define CONFIG_SYS_USB_FAT_BOOT_PARTITION              1
 #define CONFIG_USB_XHCI_OMAP
 
-#define CONFIG_OMAP_USB_PHY
 #define CONFIG_AM437X_USB2PHY2_HOST
 #endif
 
@@ -116,27 +115,11 @@
 #endif
 
 #ifdef CONFIG_QSPI_BOOT
-#ifndef CONFIG_SYS_TEXT_BASE
-#define CONFIG_SYS_TEXT_BASE           CONFIG_ISW_ENTRY_ADDR
-#endif
 #define CONFIG_SYS_REDUNDAND_ENVIRONMENT
 #define CONFIG_ENV_SPI_MAX_HZ           CONFIG_SF_DEFAULT_SPEED
 #define CONFIG_ENV_SECT_SIZE           (64 << 10) /* 64 KB sectors */
 #define CONFIG_ENV_OFFSET              0x110000
 #define CONFIG_ENV_OFFSET_REDUND       0x120000
-#ifdef MTDIDS_DEFAULT
-#undef MTDIDS_DEFAULT
-#endif
-#ifdef MTDPARTS_DEFAULT
-#undef MTDPARTS_DEFAULT
-#endif
-#define MTDPARTS_DEFAULT               "mtdparts=qspi.0:512k(QSPI.u-boot)," \
-                                       "512k(QSPI.u-boot.backup)," \
-                                       "512k(QSPI.u-boot-spl-os)," \
-                                       "64k(QSPI.u-boot-env)," \
-                                       "64k(QSPI.u-boot-env.backup)," \
-                                       "8m(QSPI.kernel)," \
-                                       "-(QSPI.file-system)"
 #endif
 
 /* SPI */
@@ -233,11 +216,8 @@
 /* CPSW Ethernet */
 #define CONFIG_MII
 #define CONFIG_BOOTP_DEFAULT
-#define CONFIG_BOOTP_DNS
 #define CONFIG_BOOTP_DNS2
 #define CONFIG_BOOTP_SEND_HOSTNAME
-#define CONFIG_BOOTP_GATEWAY
-#define CONFIG_BOOTP_SUBNETMASK
 #define CONFIG_NET_RETRY_COUNT         10
 #endif
 
@@ -256,8 +236,6 @@
                                         CONFIG_SYS_NAND_PAGE_SIZE)
 #define CONFIG_SYS_NAND_5_ADDR_CYCLE
 /* NAND: driver related configs */
-#define CONFIG_NAND_OMAP_GPMC
-#define CONFIG_NAND_OMAP_ELM
 #define CONFIG_SYS_NAND_ONFI_DETECTION
 #define CONFIG_NAND_OMAP_ECCSCHEME     OMAP_ECC_BCH16_CODE_HW
 #define CONFIG_SYS_NAND_BAD_BLOCK_POS  NAND_LARGE_BADBLOCK_POS
@@ -285,30 +263,15 @@
                        }
 #define CONFIG_SYS_NAND_ECCSIZE                512
 #define CONFIG_SYS_NAND_ECCBYTES       26
-#define MTDIDS_DEFAULT                 "nand0=nand.0"
-#define MTDPARTS_DEFAULT               "mtdparts=nand.0:" \
-                                       "256k(NAND.SPL)," \
-                                       "256k(NAND.SPL.backup1)," \
-                                       "256k(NAND.SPL.backup2)," \
-                                       "256k(NAND.SPL.backup3)," \
-                                       "512k(NAND.u-boot-spl-os)," \
-                                       "1m(NAND.u-boot)," \
-                                       "256k(NAND.u-boot-env)," \
-                                       "256k(NAND.u-boot-env.backup1)," \
-                                       "7m(NAND.kernel)," \
-                                       "-(NAND.file-system)"
 #define CONFIG_SYS_NAND_U_BOOT_OFFS    0x00180000
 /* NAND: SPL related configs */
-#ifdef CONFIG_SPL_NAND_SUPPORT
-#define CONFIG_SPL_NAND_AM33XX_BCH
-#endif
 /* NAND: SPL falcon mode configs */
 #ifdef CONFIG_SPL_OS_BOOT
 #define CONFIG_SYS_NAND_SPL_KERNEL_OFFS        0x00300000 /* kernel offset */
 #endif
 #define NANDARGS \
-       "mtdids=" MTDIDS_DEFAULT "\0" \
-       "mtdparts=" MTDPARTS_DEFAULT "\0" \
+       "mtdids=" CONFIG_MTDIDS_DEFAULT "\0" \
+       "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0" \
        "nandargs=setenv bootargs console=${console} " \
                "${optargs} " \
                "root=${nandroot} " \