summaryrefslogtreecommitdiff
path: root/include/configs/openrd.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/openrd.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/openrd.h')
-rw-r--r--include/configs/openrd.h13
1 files changed, 4 insertions, 9 deletions
diff --git a/include/configs/openrd.h b/include/configs/openrd.h
index d685411bbb..1bea7f58cb 100644
--- a/include/configs/openrd.h
+++ b/include/configs/openrd.h
@@ -59,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