Kconfig: Migrate MTDIDS_DEFAULT / MTDPARTS_DEFAULT
We move all instances of CONFIG_MTDIDS_DEFAULT and
CONFIG_MTDPARTS_DEFAULT from the header files to the defconfig files.
There's a few cases here where we need to expand upon what was in the
header file.
Tested-by: Adam Ford <aford173@gmail.com> #omap3_logic
Signed-off-by: Tom Rini <trini@konsulko.com>
diff --git a/include/configs/nsa310s.h b/include/configs/nsa310s.h
index 9c84acc..35cb5b0 100644
--- a/include/configs/nsa310s.h
+++ b/include/configs/nsa310s.h
@@ -49,17 +49,10 @@
"fdt addr 0x700000; fdt resize; fdt chosen; " \
"bootz 0x800000 - 0x700000"
-#define CONFIG_MTDPARTS \
- "mtdparts=orion_nand:" \
- "0xe0000@0x0(uboot)," \
- "0x20000@0xe0000(uboot_env)," \
- "0x100000@0x100000(second_stage_uboot)," \
- "-@0x200000(root)\0"
-
#define CONFIG_EXTRA_ENV_SETTINGS \
"console=console=ttyS0,115200\0" \
"mtdids=nand0=orion_nand\0" \
- "mtdparts="CONFIG_MTDPARTS \
+ "mtdparts="CONFIG_MTDPARTS_DEFAULT \
"kernel=/boot/zImage\0" \
"fdt=/boot/nsa310s.dtb\0" \
"bootargs_root=ubi.mtd=3 root=ubi0:rootfs rootfstype=ubifs rw\0"