Kconfig: Migrate MTDIDS_DEFAULT / MTDPARTS_DEFAULT

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

diff --git a/include/configs/openrd.h b/include/configs/openrd.h
index 51e4d90a2e98f214383fbb27e34ac1e6607ee8e8..1bea7f58cb9d822312f7b9be0b5d8b98b9423fdf 100644 (file)
--- a/include/configs/openrd.h
+++ b/include/configs/openrd.h
@@ -21,16 +21,11 @@
 #define CONFIG_KW88F6281       1       /* SOC Name */
 #define CONFIG_MACH_OPENRD_BASE        /* Machine type */
 #define CONFIG_SKIP_LOWLEVEL_INIT      /* disable board lowlevel_init */
-#define CONFIG_SYS_THUMB_BUILD
 
 /*
  * Commands configuration
  */
-#define CONFIG_SYS_NO_FLASH            /* Declare no flash (NOR/SPI) */
 #define CONFIG_SYS_MVFS
-#define CONFIG_CMD_ENV
-#define CONFIG_CMD_NAND
-#define CONFIG_CMD_IDE
 
 /*
  * mv-common.h should be defined after CMD configs since it used them
@@ -42,10 +37,7 @@
  *  Environment variables configurations
  */
 #ifdef CONFIG_CMD_NAND
-#define CONFIG_ENV_IS_IN_NAND          1
 #define CONFIG_ENV_SECT_SIZE           0x20000 /* 128K */
-#else
-#define CONFIG_ENV_IS_NOWHERE          1       /* if env in SDRAM */
 #endif
 /*
  * max 4k env size is enough, but in case of nand
@@ -67,18 +59,13 @@
        "setenv bootargs ${x_bootargs} ${x_bootargs_root}; "    \
        "${x_bootcmd_usb}; bootm 0x6400000;"
 
-#define MTDIDS_DEFAULT         "nand0=nand_mtd"
-#define MTDPARTS_DEFAULT       "mtdparts=nand_mtd:0x100000@0x000000(uboot),"\
-       "0x400000@0x100000(uImage),"\
-       "0x1fb00000@0x500000(rootfs)"
-
-#define CONFIG_EXTRA_ENV_SETTINGS      "x_bootargs=console"            \
-       "=ttyS0,115200 "MTDPARTS_DEFAULT " rw ubi.mtd=2,2048\0"         \
+#define CONFIG_EXTRA_ENV_SETTINGS      "x_bootargs=console=ttyS0,115200 " \
+       CONFIG_MTDPARTS_DEFAULT " rw ubi.mtd=2,2048\0" \
        "x_bootcmd_kernel=nand read 0x6400000 0x100000 0x300000\0"      \
        "x_bootcmd_usb=usb start\0"                                     \
        "x_bootargs_root=root=ubi0:rootfs rootfstype=ubifs\0"           \
-       "mtdids="MTDIDS_DEFAULT"\0"                                     \
-       "mtdparts="MTDPARTS_DEFAULT"\0"
+       "mtdids="CONFIG_MTDIDS_DEFAULT"\0"                                      \
+       "mtdparts="CONFIG_MTDPARTS_DEFAULT"\0"
 
 /*
  * Ethernet Driver configuration