Kconfig: Migrate MTDIDS_DEFAULT / MTDPARTS_DEFAULT

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

diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h
index 0e082648581c9fd5b35326b41c14b7513adf05c0..4823a7e4f3cf38fdba7bc0ad63525cdc331d7bf9 100644 (file)
--- a/include/configs/am335x_evm.h
+++ b/include/configs/am335x_evm.h
@@ -38,8 +38,8 @@
 
 #ifdef CONFIG_NAND
 #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} " \
@@ -215,18 +215,6 @@
 #define CONFIG_SYS_NAND_ECCBYTES       14
 #define CONFIG_SYS_NAND_ONFI_DETECTION
 #define CONFIG_NAND_OMAP_ECCSCHEME     OMAP_ECC_BCH8_CODE_HW
-#define MTDIDS_DEFAULT                 "nand0=nand.0"
-#define MTDPARTS_DEFAULT               "mtdparts=nand.0:" \
-                                       "128k(NAND.SPL)," \
-                                       "128k(NAND.SPL.backup1)," \
-                                       "128k(NAND.SPL.backup2)," \
-                                       "128k(NAND.SPL.backup3)," \
-                                       "256k(NAND.u-boot-spl-os)," \
-                                       "1m(NAND.u-boot)," \
-                                       "128k(NAND.u-boot-env)," \
-                                       "128k(NAND.u-boot-env.backup1)," \
-                                       "8m(NAND.kernel)," \
-                                       "-(NAND.file-system)"
 #define CONFIG_SYS_NAND_U_BOOT_OFFS    0x000c0000
 /* NAND: SPL related configs */
 #ifdef CONFIG_SPL_OS_BOOT
@@ -301,11 +289,6 @@
 #define CONFIG_ENV_SECT_SIZE           (4 << 10) /* 4 KB sectors */
 #define CONFIG_ENV_OFFSET              (768 << 10) /* 768 KiB in */
 #define CONFIG_ENV_OFFSET_REDUND       (896 << 10) /* 896 KiB in */
-#define MTDIDS_DEFAULT                 "nor0=m25p80-flash.0"
-#define MTDPARTS_DEFAULT               "mtdparts=m25p80-flash.0:128k(SPL)," \
-                                       "512k(u-boot),128k(u-boot-env1)," \
-                                       "128k(u-boot-env2),3464k(kernel)," \
-                                       "-(rootfs)"
 #elif defined(CONFIG_EMMC_BOOT)
 #define CONFIG_SYS_MMC_ENV_DEV         1
 #define CONFIG_SYS_MMC_ENV_PART                2
@@ -317,12 +300,6 @@
 #define CONFIG_ENV_SECT_SIZE           (128 << 10)     /* 128 KiB */
 #define CONFIG_ENV_OFFSET              (512 << 10)     /* 512 KiB */
 #define CONFIG_ENV_OFFSET_REDUND       (768 << 10)     /* 768 KiB */
-#define MTDIDS_DEFAULT                 "nor0=physmap-flash.0"
-#define MTDPARTS_DEFAULT               "mtdparts=physmap-flash.0:" \
-                                       "512k(u-boot)," \
-                                       "128k(u-boot-env1)," \
-                                       "128k(u-boot-env2)," \
-                                       "4m(kernel),-(rootfs)"
 #elif defined(CONFIG_ENV_IS_IN_NAND)
 #define CONFIG_ENV_OFFSET              0x001c0000
 #define CONFIG_ENV_OFFSET_REDUND       0x001e0000