summaryrefslogtreecommitdiff
path: root/include/configs/mccmon6.h
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2017-10-22 17:55:07 -0400
committerTom Rini <trini@konsulko.com>2017-11-05 11:21:35 -0500
commit43ede0bca7fc1590b623832b743213b818257a27 (patch)
treec7612aadc5ff9c2768b26d383858d83b7339b13b /include/configs/mccmon6.h
parent804dcf771aacc75f595d3656be0ca6a7887b6672 (diff)
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/mccmon6.h')
-rw-r--r--include/configs/mccmon6.h18
1 files changed, 3 insertions, 15 deletions
diff --git a/include/configs/mccmon6.h b/include/configs/mccmon6.h
index 755c949b76..0cb8b17fa3 100644
--- a/include/configs/mccmon6.h
+++ b/include/configs/mccmon6.h
@@ -83,18 +83,6 @@
#define CONFIG_MTD_DEVICE
#define CONFIG_MTD_PARTITIONS
-#define MTDIDS_DEFAULT "nor0=8000000.nor"
-#define MTDPARTS_DEFAULT \
- "mtdparts=8000000.nor:" \
- "32m@0x0(mccmon6-image.nor)," \
- "256k@0x40000(u-boot-env.nor)," \
- "1m@0x80000(u-boot.nor)," \
- "8m@0x180000(kernel.nor)," \
- "8m@0x980000(swupdate-kernel.nor)," \
- "8m@0x1180000(swupdate-rootfs.nor)," \
- "128k@0x1980000(kernel-dtb.nor)," \
- "128k@0x19C0000(swupdate-kernel-dtb.nor)"
-
/* USB Configs */
#define CONFIG_USB_MAX_CONTROLLER_COUNT 2
#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
@@ -141,7 +129,7 @@
"setenv kernelnor 0x08180000;" \
"setenv dtbnor 0x09980000;" \
"setenv bootargs console=${console} " \
- ""MTDPARTS_DEFAULT" " \
+ CONFIG_MTDPARTS_DEFAULT " " \
"root=/dev/mmcblk1 rootfstype=ext4 rw rootwait noinitrd;" \
"cp.l ${dtbnor} ${dtbloadaddr} 0x8000;" \
"bootm ${kernelnor} - ${dtbloadaddr};\0" \
@@ -154,7 +142,7 @@
"setenv swurootfsnor 0x09180000;" \
"setenv swudtbnor 0x099A0000;" \
"setenv bootargs console=${console} " \
- ""MTDPARTS_DEFAULT" " \
+ CONFIG_MTDPARTS_DEFAULT " " \
"ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}" \
":${hostname}::off root=/dev/ram rw;" \
"cp.l ${swurootfsnor} ${rootfsloadaddr} 0x200000;" \
@@ -186,7 +174,7 @@
"fi;" \
"fi;" \
"fi\0" \
- "mtdparts=" MTDPARTS_DEFAULT "\0" \
+ "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0" \
"fdt_addr=0x18000000\0" \
"bootdev=1\0" \
"bootpart=1\0" \