summaryrefslogtreecommitdiff
path: root/include/configs/ls1043a_common.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/ls1043a_common.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/ls1043a_common.h')
-rw-r--r--include/configs/ls1043a_common.h19
1 files changed, 1 insertions, 18 deletions
diff --git a/include/configs/ls1043a_common.h b/include/configs/ls1043a_common.h
index a24d0062d2..98fa711b00 100644
--- a/include/configs/ls1043a_common.h
+++ b/include/configs/ls1043a_common.h
@@ -238,23 +238,6 @@
#define HWCONFIG_BUFFER_SIZE 128
#ifndef SPL_NO_MISC
-#if defined(CONFIG_QSPI_BOOT) || defined(CONFIG_SD_BOOT_QSPI)
-#define MTDPARTS_DEFAULT "mtdparts=spi0.0:1m(uboot)," \
- "5m(kernel),1m(dtb),9m(file_system)"
-#else
-#define MTDPARTS_DEFAULT "mtdparts=60000000.nor:" \
- "2m@0x100000(nor_bank0_uboot),"\
- "40m@0x1100000(nor_bank0_fit)," \
- "7m(nor_bank0_user)," \
- "2m@0x4100000(nor_bank4_uboot)," \
- "40m@0x5100000(nor_bank4_fit),"\
- "-(nor_bank4_user);" \
- "7e800000.flash:" \
- "1m(nand_uboot),1m(nand_uboot_env)," \
- "20m(nand_fit);spi0.0:1m(uboot)," \
- "5m(kernel),1m(dtb),9m(file_system)"
-#endif
-
#include <config_distro_defaults.h>
#ifndef CONFIG_SPL_BUILD
#define BOOT_TARGET_DEVICES(func) \
@@ -280,7 +263,7 @@
"kernel_size=0x2800000\0" \
"console=ttyS0,115200\0" \
"boot_os=y\0" \
- "mtdparts=" MTDPARTS_DEFAULT "\0" \
+ "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0" \
BOOTENV \
"boot_scripts=ls1043ardb_boot.scr\0" \
"boot_script_hdr=hdr_ls1043ardb_bs.out\0" \