summaryrefslogtreecommitdiff
path: root/include/configs/x600.h
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2017-10-23 00:55:07 +0300
committerTom Rini <trini@konsulko.com>2017-11-05 19:21:35 +0300
commit43ede0bca7fc1590b623832b743213b818257a27 (patch)
treec7612aadc5ff9c2768b26d383858d83b7339b13b /include/configs/x600.h
parent804dcf771aacc75f595d3656be0ca6a7887b6672 (diff)
downloadu-boot-43ede0bca7fc1590b623832b743213b818257a27.tar.xz
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>
Diffstat (limited to 'include/configs/x600.h')
-rw-r--r--include/configs/x600.h7
1 files changed, 2 insertions, 5 deletions
diff --git a/include/configs/x600.h b/include/configs/x600.h
index dc8ec3663b..1d34ba32a0 100644
--- a/include/configs/x600.h
+++ b/include/configs/x600.h
@@ -136,9 +136,6 @@
#define CONFIG_UBI_PART ubi0
#define CONFIG_UBIFS_VOLUME rootfs
-#define MTDIDS_DEFAULT "nand0=nand"
-#define MTDPARTS_DEFAULT "mtdparts=nand:64M(ubi0),64M(ubi1)"
-
#define CONFIG_EXTRA_ENV_SETTINGS \
"u-boot_addr=1000000\0" \
"u-boot=" __stringify(CONFIG_HOSTNAME) "/u-boot.spr\0" \
@@ -194,8 +191,8 @@
"net_nfs=run load_dtb load_kernel; " \
"run nfsargs addip addcon addmtd addmisc;" \
"bootm ${kernel_addr} - ${dtb_addr}\0" \
- "mtdids=" MTDIDS_DEFAULT "\0" \
- "mtdparts=" MTDPARTS_DEFAULT "\0" \
+ "mtdids=" CONFIG_MTDIDS_DEFAULT "\0" \
+ "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0" \
"nand_ubifs=run ubifs_mount ubifs_load ubifsargs addip" \
" addcon addmisc addmtd;" \
"bootm ${kernel_addr} - ${dtb_addr}\0" \