U-Boot

Download

u-boot@lists2.denx.biz

July 2018

194 participants
694 discussions

[U-Boot] [PATCH] imx8qxp_mek: add README
by Peng Fan 24 Jul '18

24 Jul '18

Add README file for i.MX8QXP MEK board. Signed-off-by: Peng Fan <peng.fan(a)nxp.com> Cc: Stefano Babic <sbabic(a)denx.de> Cc: Fabio Estevam <fabio.estevam(a)nxp.com> Cc: Anatolij Gustschin <agust(a)denx.de> --- This patch is for testing i.MX8QXP patchset [PATCH V2 00/32] i.MX: Add i.MX8QXP support https://lists.denx.de/pipermail/u-boot/2018-July/335079.html The board is using B0 chip, A0 chip is not being supported. Please help test if you are interested. I'll post out V3 after collecting more comments. Sadly, I do not know where to download scfw_tcm.bin in public for B0 QXP. Thanks, Peng. board/freescale/imx8qxp_mek/README | 70 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 70 insertions(+) create mode 100644 board/freescale/imx8qxp_mek/README diff --git a/board/freescale/imx8qxp_mek/README b/board/freescale/imx8qxp_mek/README new file mode 100644 index 0000000000..97c244543a --- /dev/null +++ b/board/freescale/imx8qxp_mek/README @@ -0,0 +1,70 @@ +U-Boot for the NXP i.MX8QXP EVK board + +Quick Start +=========== + +- Build U-Boot +- Build the ARM Trusted firmware binary +- Get scfw_tcm.bin and ahab-container.img +- Get mkimage tool +- Generate flash.bin using imx-mkimage +- Flash the binary into the SD card +- Boot + +Build U-Boot +============ + +$ make imx8qxp_mek_defconfig +$ make + +Get and Build the ARM Trusted firmware +====================================== + +$ git clone https://source.codeaurora.org/external/imx/imx-atf +$ cd imx-atf/ +$ git checkout origin/imx_4.9.88_imx8qxp_beta2 +$ make PLAT=imx8qxp bl31 + +Get scfw_tcm.bin and ahab-container.img +============================== + +$ wget https://www.nxp.com/lgfiles/NMG/MAD/YOCTO/firmware-imx-7.6.bin +$ chmod +x firmware-imx-7.6.bin +$ ./firmware-imx-7.6.bin + +scfw_tcm.bin [TODO] + +Get mkimage tool +============================== +Download the imx-mkimage tool: + +$ git clone https://source.codeaurora.org/external/imx/imx-mkimage/ +$ cd imx-mkimage/ +$ git checkout origin/imx_4.9.88_imx8qxp_beta2 + + +Generate flash.bin using imx-mkimage +==================================== + +Copy the following binaries to imx-mkimage/iMX8M folder: + +$ cp imx-atf/build/imx8qxp/release/bl31.bin imx-mkimage/iMX8QX/ +$ cp u-boot/u-boot.bin imx-mkimage/iMX8QX/ + +Copy the following firmwares to imx-mkimage/iMX8 folder : + +$ cp firmware-imx-7.6/firmware/seco/ahab-container.img imx-mkimage/iMX8QX/ + +$ cd imx-mkimage/ +$ make SOC=iMX8QX flash + +Flash the binary into the SD card +================================= + +Burn the flash.bin binary to SD card offset 32KB: + +$ sudo dd if=iMX8QX/flash.bin of=/dev/sd[x] bs=1024 seek=32 + +Boot +==== +Set Boot switch SW2: 1100. -- 2.14.1

2 2

[U-Boot] [PATCH] fs: ext4: Prevent erasing buffer past file size
by Marek Vasut 23 Jul '18

23 Jul '18

The variable 'n' represents the number of bytes to be read from a certain offset in a file, to a certain offset in buffer 'buf'. The variable 'len' represents the length of the entire file, clamped correctly to avoid any overflows. Therefore, comparing 'n' and 'len' to determine whether clearing 'n' bytes of the buffer 'buf' at a certain offset would clear data past buffer 'buf' cannot lead to a correct result, since the 'n' does not contain the offset from the beginning of the file. This patch keeps track of the amount of data read and checks for the buffer overflow by comparing the 'n' to the remaining amount of data to be read instead. Signed-off-by: Marek Vasut <marex(a)denx.de> Cc: Ian Ray <ian.ray(a)ge.com> Cc: Martyn Welch <martyn.welch(a)collabora.co.uk> Cc: Stefano Babic <sbabic(a)denx.de> Cc: Tom Rini <trini(a)konsulko.com> Fixes: ecdfb4195b20 ("ext4: recover from filesystem corruption when reading") --- fs/ext4/ext4fs.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/fs/ext4/ext4fs.c b/fs/ext4/ext4fs.c index 2a28031d14..537aa05eff 100644 --- a/fs/ext4/ext4fs.c +++ b/fs/ext4/ext4fs.c @@ -60,6 +60,7 @@ int ext4fs_read_file(struct ext2fs_node *node, loff_t pos, lbaint_t delayed_extent = 0; lbaint_t delayed_skipfirst = 0; lbaint_t delayed_next = 0; + lbaint_t read_total = 0; char *delayed_buf = NULL; short status; @@ -140,13 +141,14 @@ int ext4fs_read_file(struct ext2fs_node *node, loff_t pos, return -1; previous_block_number = -1; } - /* Zero no more than `len' bytes. */ + /* Zero no more than 'filesize' bytes. */ n = blocksize - skipfirst; - if (n > len) - n = len; + if (n > (len - read_total)) + n = (len - read_total); memset(buf, 0, n); } buf += blocksize - skipfirst; + read_total += blocksize - skipfirst; } if (previous_block_number != -1) { /* spill */ -- 2.16.2

3 3

[U-Boot] [PATCH v2] gpio: xilinx: Convert driver to DM
by Michal Simek 23 Jul '18

23 Jul '18

This patch is enabling GPIO_DM support to have an option to use this driver together with zynq gpio driver. !DM part is kept there till Microblaze is cleanup which will be done hopefully soon. Just a note: There is no reason to initialize uc-priv->name because it is completely unused. Signed-off-by: Michal Simek <michal.simek(a)xilinx.com> --- Changes in v2: - Show value in set_value when debug is enabled - Implement xlate function - Remove tabs from structures for alignment (to be consistent with the rest of code) drivers/gpio/xilinx_gpio.c | 265 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 264 insertions(+), 1 deletion(-) diff --git a/drivers/gpio/xilinx_gpio.c b/drivers/gpio/xilinx_gpio.c index 74c5be0865d1..48b52c985a55 100644 --- a/drivers/gpio/xilinx_gpio.c +++ b/drivers/gpio/xilinx_gpio.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0+ /* - * Copyright (c) 2013 Xilinx, Michal Simek + * Copyright (c) 2013 - 2018 Xilinx, Michal Simek */ #include <common.h> @@ -9,6 +9,7 @@ #include <linux/list.h> #include <asm/io.h> #include <asm/gpio.h> +#include <dm.h> static LIST_HEAD(gpio_list); @@ -23,6 +24,8 @@ struct gpio_regs { u32 gpiodir; }; +#if !defined(CONFIG_DM_GPIO) + #define GPIO_NAME_SIZE 10 struct gpio_names { @@ -345,3 +348,263 @@ int gpio_alloc_dual(u32 baseaddr, const char *name, u32 gpio_no0, u32 gpio_no1) /* Return the first gpio allocated for this device */ return ret; } +#else +#include <dt-bindings/gpio/gpio.h> + +#define XILINX_GPIO_MAX_BANK 2 + +struct xilinx_gpio_platdata { + struct gpio_regs *regs; + int bank_max[XILINX_GPIO_MAX_BANK]; + int bank_input[XILINX_GPIO_MAX_BANK]; + int bank_output[XILINX_GPIO_MAX_BANK]; +}; + +static int xilinx_gpio_get_bank_pin(unsigned offset, u32 *bank_num, + u32 *bank_pin_num, struct udevice *dev) +{ + struct xilinx_gpio_platdata *platdata = dev_get_platdata(dev); + u32 bank, max_pins; + /* the first gpio is 0 not 1 */ + u32 pin_num = offset; + + for (bank = 0; bank < XILINX_GPIO_MAX_BANK; bank++) { + max_pins = platdata->bank_max[bank]; + if (pin_num < max_pins) { + debug("%s: found at bank 0x%x pin 0x%x\n", __func__, + bank, pin_num); + *bank_num = bank; + *bank_pin_num = pin_num; + return 0; + } + pin_num -= max_pins; + } + + return -EINVAL; +} + +static int xilinx_gpio_set_value(struct udevice *dev, unsigned offset, + int value) +{ + struct xilinx_gpio_platdata *platdata = dev_get_platdata(dev); + int val, ret; + u32 bank, pin; + + ret = xilinx_gpio_get_bank_pin(offset, &bank, &pin, dev); + if (ret) + return ret; + + debug("%s: regs: %lx, value: %x, gpio: %x, bank %x, pin %x\n", + __func__, (ulong)platdata->regs, value, offset, bank, pin); + + if (value) { + val = readl(&platdata->regs->gpiodata + bank * 2); + val = val | (1 << pin); + writel(val, &platdata->regs->gpiodata + bank * 2); + } else { + val = readl(&platdata->regs->gpiodata + bank * 2); + val = val & ~(1 << pin); + writel(val, &platdata->regs->gpiodata + bank * 2); + } + + return val; +}; + +static int xilinx_gpio_get_value(struct udevice *dev, unsigned offset) +{ + struct xilinx_gpio_platdata *platdata = dev_get_platdata(dev); + int val, ret; + u32 bank, pin; + + ret = xilinx_gpio_get_bank_pin(offset, &bank, &pin, dev); + if (ret) + return ret; + + debug("%s: regs: %lx, gpio: %x, bank %x, pin %x\n", __func__, + (ulong)platdata->regs, offset, bank, pin); + + val = readl(&platdata->regs->gpiodata + bank * 2); + val = !!(val & (1 << pin)); + + return val; +}; + +static int xilinx_gpio_get_function(struct udevice *dev, unsigned offset) +{ + struct xilinx_gpio_platdata *platdata = dev_get_platdata(dev); + int val, ret; + u32 bank, pin; + + /* Check if all pins are inputs */ + if (platdata->bank_input[bank]) + return GPIOF_INPUT; + + /* Check if all pins are outputs */ + if (platdata->bank_output[bank]) + return GPIOF_OUTPUT; + + ret = xilinx_gpio_get_bank_pin(offset, &bank, &pin, dev); + if (ret) + return ret; + + /* FIXME test on dual */ + val = readl(&platdata->regs->gpiodir + bank * 2); + val = !(val & (1 << pin)); + + /* input is 1 in reg but GPIOF_INPUT is 0 */ + /* output is 0 in reg but GPIOF_OUTPUT is 1 */ + + return val; +} + +static int xilinx_gpio_direction_output(struct udevice *dev, unsigned offset, + int value) +{ + struct xilinx_gpio_platdata *platdata = dev_get_platdata(dev); + int val, ret; + u32 bank, pin; + + ret = xilinx_gpio_get_bank_pin(offset, &bank, &pin, dev); + if (ret) + return ret; + + /* can't change it if all is input by default */ + if (platdata->bank_input[bank]) + return -EINVAL; + + if (!platdata->bank_output[bank]) { + val = readl(&platdata->regs->gpiodir + bank * 2); + val = val & ~(1 << pin); + writel(val, &platdata->regs->gpiodir + bank * 2); + } + + xilinx_gpio_set_value(dev, offset, value); + + return 0; +} + +static int xilinx_gpio_direction_input(struct udevice *dev, unsigned offset) +{ + struct xilinx_gpio_platdata *platdata = dev_get_platdata(dev); + int val, ret; + u32 bank, pin; + + ret = xilinx_gpio_get_bank_pin(offset, &bank, &pin, dev); + if (ret) + return ret; + + /* Already input */ + if (platdata->bank_input[bank]) + return 0; + + /* can't change it if all is output by default */ + if (platdata->bank_output[bank]) + return -EINVAL; + + val = readl(&platdata->regs->gpiodir + bank * 2); + val = val | (1 << pin); + writel(val, &platdata->regs->gpiodir + bank * 2); + + return 0; +} + +static int xilinx_gpio_xlate(struct udevice *dev, struct gpio_desc *desc, + struct ofnode_phandle_args *args) +{ + struct xilinx_gpio_platdata *platdata = dev_get_platdata(dev); + + desc->offset = args->args[0]; + + debug("%s: argc: %x, [0]: %x, [1]: %x, [2]: %x\n", __func__, + args->args_count, args->args[0], args->args[1], args->args[2]); + + /* + * The second cell is channel offset: + * 0 is first channel, 8 is second channel + * + * U-Boot driver just combine channels together that's why simply + * add amount of pins in second channel if present. + */ + if (args->args[1]) { + if (!platdata->bank_max[1]) { + printf("%s: %s has no second channel\n", + __func__, dev->name); + return -EINVAL; + } + + desc->offset += platdata->bank_max[0]; + } + + /* The third cell is optional */ + if (args->args_count > 2) + desc->flags = (args->args[2] & + GPIO_ACTIVE_LOW ? GPIOD_ACTIVE_LOW : 0); + + debug("%s: offset %x, flags %lx\n", + __func__, desc->offset, desc->flags); + return 0; +} + +static const struct dm_gpio_ops xilinx_gpio_ops = { + .direction_input = xilinx_gpio_direction_input, + .direction_output = xilinx_gpio_direction_output, + .get_value = xilinx_gpio_get_value, + .set_value = xilinx_gpio_set_value, + .get_function = xilinx_gpio_get_function, + .xlate = xilinx_gpio_xlate, +}; + +static int xilinx_gpio_probe(struct udevice *dev) +{ + struct xilinx_gpio_platdata *platdata = dev_get_platdata(dev); + struct gpio_dev_priv *uc_priv = dev_get_uclass_priv(dev); + + uc_priv->bank_name = dev->name; + + uc_priv->gpio_count = platdata->bank_max[0] + platdata->bank_max[1]; + + return 0; +} + +static int xilinx_gpio_ofdata_to_platdata(struct udevice *dev) +{ + struct xilinx_gpio_platdata *platdata = dev_get_platdata(dev); + int is_dual; + + platdata->regs = (struct gpio_regs *)dev_read_addr(dev); + + platdata->bank_max[0] = dev_read_u32_default(dev, + "xlnx,gpio-width", 0); + platdata->bank_input[0] = dev_read_u32_default(dev, + "xlnx,all-inputs", 0); + platdata->bank_output[0] = dev_read_u32_default(dev, + "xlnx,all-outputs", 0); + + is_dual = dev_read_u32_default(dev, "xlnx,is-dual", 0); + if (is_dual) { + platdata->bank_max[1] = dev_read_u32_default(dev, + "xlnx,gpio2-width", 0); + platdata->bank_input[1] = dev_read_u32_default(dev, + "xlnx,all-inputs-2", 0); + platdata->bank_output[1] = dev_read_u32_default(dev, + "xlnx,all-outputs-2", 0); + } + + return 0; +} + +static const struct udevice_id xilinx_gpio_ids[] = { + { .compatible = "xlnx,xps-gpio-1.00.a",}, + { } +}; + +U_BOOT_DRIVER(xilinx_gpio) = { + .name = "xlnx_gpio", + .id = UCLASS_GPIO, + .ops = &xilinx_gpio_ops, + .of_match = xilinx_gpio_ids, + .ofdata_to_platdata = xilinx_gpio_ofdata_to_platdata, + .probe = xilinx_gpio_probe, + .platdata_auto_alloc_size = sizeof(struct xilinx_gpio_platdata), +}; +#endif -- 1.9.1

2 3

[U-Boot] [PULL] Please pull u-boot-imx
by Stefano Babic 23 Jul '18

23 Jul '18

Hi Tom, please pull from u-boot-imx, thanks ! The following changes since commit 474ecd2c84d97314b8145fbe3a57887f41b2edb3: env: Simplify Makefile using $(SPL_TPL_) (2018-07-21 12:24:31 -0400) are available in the git repository at: git://www.denx.de/git/u-boot-imx.git master for you to fetch changes up to f97f167107b33fc6596561dae1309571ade39055: configs: imx6q_logic: Cleanup ramdiskaddr and fdtaddr (2018-07-23 11:05:54 +0200) ---------------------------------------------------------------- Adam Ford (2): imx: i.mx6q: imx6q_logic: Migrate to SPL and enable SDP configs: imx6q_logic: Cleanup ramdiskaddr and fdtaddr Baruch Siach (2): mmc: drop mention of IN_PROGRESS status mx6cuboxi: drop CONFIG_SYS_FSL_USDHC_NUM Fabio Berton (1): pico-imx7d: Add support for update SPL using DFU Fabio Estevam (7): mx7: Remove BMODE support pico-imx7d: Convert to distro config pico-imx7d: Add fastboot support pico-imx7d: Add SPL support pico-imx7d: Add Falcon mode support pico-imx7d: Enable CONFIG_ARMV7_BOOT_SEC_DEFAULT pico-imx7d: Do not override addrmap5 Holger Dengler (1): tools/imximage: get HAB information from header Jon Nettleton (5): mmc: break out get_op_cond code to its own function mx6cuboxi: Add support for eMMC booting mx6cuboxi: Use mmc_get_op_cond() to check for an eMMC mx6cuboxi: Add emmc device tree suffix mx6cuboxi: Move the default environment for all devices Ludwig Zenz (4): Revert "ARM: imx6: Disable DDR DRAM calibration DHCOM i.MX6 PDK" ARM: imx6: configure ddrcode pins in spl DHCOM i.MX6 PDK ARM: imx6: DHCOM i.MX6 PDK: ddr init for 32bit bus and 4GBit chips ARM: dh_imx6: enable GigaDevice, Macronix, and Winbond SPI Flash support in Kconfig Mark Jonas (1): arm, imx6: add alternative PAD_CTL_DSE constants Martin Kaiser (1): mx25: fix the offset between the USB ports' registers Michael Trimarchi (4): eth: dm: fec: Add gpio phy reset binding imx: mx6: Fix implementantion reset_misc imx: imx6: Add comment to gpr_init function i.MX6: engicam: gpr_init can be called only for some architecture Otavio Salvador (9): pico-imx7d: Fix common distro configuration behavior pico-imx7d: Add GPT partitioning support pico-imx7d: Add default DFU targets pico-imx7d: Add bootmenu to choose the baseboard pico-imx7d: Allow default fdtfile to be overridden by defconfig pico-imx7d: Enable auxiliary code support pico-imx7d: README: Use dfu-util to flash U-Boot pico-imx7d: README: Drop old instructions about secure mode pico-imx7d: Add new pico-pi config Stefan Agner (12): mtd: nand: mxs_nand: add device tree support for i.MX 6 imx: add macro to detect whether USB has been initialized ARM: dts: imx6ull: use same compatible string as Linux is using board: toradex: add new and upcoming SKUs board: toradex: add Colibri iMX6ULL support ARM: PSCI: initialize stack pointer on secondary CPUs imx: mx7: psci: use C code exclusively imx: mx7: psci: provide complete PSCI 1.0 implementation imx: mx7: psci: support CPU0 on/off imx: mx7: psci: implement MIGRATE_INFO_TYPE colibri_imx7: add compatible string used in vanilla Linux colibri_imx7: improve DDR3 timing Stefano Babic (1): bootcount: flush after storing the bootcounter Uri Mashiach (1): arm: imx7d: cl-som-imx7: sf: support all SF types arch/arm/cpu/armv7/psci.S | 2 + arch/arm/dts/imx6ull-colibri.dts | 550 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ arch/arm/dts/imx6ull.dtsi | 2 +- arch/arm/include/asm/arch-mx25/imx-regs.h | 7 +- arch/arm/include/asm/arch-mx6/imx-regs.h | 7 ++ arch/arm/include/asm/mach-imx/iomux-v3.h | 8 +++ arch/arm/mach-imx/Kconfig | 2 +- arch/arm/mach-imx/mx6/Kconfig | 11 ++- arch/arm/mach-imx/mx6/soc.c | 7 ++ arch/arm/mach-imx/mx7/Kconfig | 2 +- arch/arm/mach-imx/mx7/Makefile | 5 +- arch/arm/mach-imx/mx7/psci-mx7.c | 148 ++++++++++++++++++++++++++++++++++++---- arch/arm/mach-imx/mx7/psci.S | 60 ---------------- arch/arm/mach-imx/mx7/soc.c | 25 ------- board/dhelectronics/dh_imx6/dh_imx6_spl.c | 227 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++---- board/engicam/common/spl.c | 3 +- board/logicpd/imx6/imx6logic.c | 141 ++++++++++++++++++++++++++++++++++++++ board/logicpd/imx6/mx6q_2x_MT41K512M16HA.cfg | 111 ------------------------------ board/solidrun/mx6cuboxi/mx6cuboxi.c | 115 ++++++++++++++++++++++++++++--- board/technexion/pico-imx7d/Makefile | 2 +- board/technexion/pico-imx7d/README | 30 +++----- board/technexion/pico-imx7d/imximage.cfg | 97 -------------------------- board/technexion/pico-imx7d/pico-imx7d.c | 2 +- board/technexion/pico-imx7d/spl.c | 122 +++++++++++++++++++++++++++++++++ board/toradex/colibri-imx6ull/Kconfig | 29 ++++++++ board/toradex/colibri-imx6ull/MAINTAINERS | 10 +++ board/toradex/colibri-imx6ull/Makefile | 4 ++ board/toradex/colibri-imx6ull/colibri-imx6ull.c | 408 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ board/toradex/colibri-imx6ull/imximage.cfg | 106 ++++++++++++++++++++++++++++ board/toradex/colibri_imx7/colibri_imx7.c | 20 +----- board/toradex/colibri_imx7/imximage.cfg | 10 +-- board/toradex/common/tdx-cfg-block.c | 7 ++ board/toradex/common/tdx-cfg-block.h | 7 ++ configs/cl-som-imx7_defconfig | 7 ++ configs/colibri-imx6ull_defconfig | 76 +++++++++++++++++++++ configs/dh_imx6_defconfig | 3 + configs/imx6q_logic_defconfig | 47 +++++++++++-- configs/pico-imx7d_defconfig | 41 ++++++++--- configs/pico-pi-imx7d_defconfig | 59 ++++++++++++++++ drivers/bootcount/bootcount.c | 3 + drivers/mmc/mmc.c | 61 ++++++++++------- drivers/mtd/nand/mxs_nand_dt.c | 8 +++ drivers/net/fec_mxc.c | 43 ++++++++++-- drivers/net/fec_mxc.h | 5 +- include/configs/colibri-imx6ull.h | 199 +++++++++++++++++++++++++++++++++++++++++++++++++++++ include/configs/imx6_logic.h | 46 +++++++++---- include/configs/mx6cuboxi.h | 27 ++++---- include/configs/pico-imx7d.h | 94 +++++++++++++------------ include/mmc.h | 12 +++- tools/imximage.c | 13 ++-- 50 files changed, 2523 insertions(+), 508 deletions(-) create mode 100644 arch/arm/dts/imx6ull-colibri.dts delete mode 100644 arch/arm/mach-imx/mx7/psci.S delete mode 100644 board/logicpd/imx6/mx6q_2x_MT41K512M16HA.cfg delete mode 100644 board/technexion/pico-imx7d/imximage.cfg create mode 100644 board/technexion/pico-imx7d/spl.c create mode 100644 board/toradex/colibri-imx6ull/Kconfig create mode 100644 board/toradex/colibri-imx6ull/MAINTAINERS create mode 100644 board/toradex/colibri-imx6ull/Makefile create mode 100644 board/toradex/colibri-imx6ull/colibri-imx6ull.c create mode 100644 board/toradex/colibri-imx6ull/imximage.cfg create mode 100644 configs/colibri-imx6ull_defconfig create mode 100644 configs/pico-pi-imx7d_defconfig create mode 100644 include/configs/colibri-imx6ull.h -- ===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic(a)denx.de =====================================================================

2 1

[U-Boot] [PATCH] ti_omap3_common: Add CONFIG_SYS_NS16550_COMx entries
by Adam Ford 23 Jul '18

23 Jul '18

Several boards do not use the default UART3, so they do a check for ifdef CONFIG_SPL_BUILD and enable the pointer for CONFIG_SYS_NS16550_COMx to point to OMAP34XX_UARTx. Let's consoldate this all into one place, and remove them from the individual boards. Signed-off-by: Adam Ford <aford173(a)gmail.com> diff --git a/include/configs/omap3_cairo.h b/include/configs/omap3_cairo.h index 57ac3ec..c387602 100644 --- a/include/configs/omap3_cairo.h +++ b/include/configs/omap3_cairo.h @@ -196,18 +196,6 @@ /* env defaults */ #define CONFIG_BOOTFILE "uImage" -/* Override OMAP3 common serial console configuration from UART3 - * to UART2. - * - * Attention: for UART2, special MUX settings (MUX_DEFAULT(), MCBSP3) - * are needed and peripheral clocks for UART2 must be enabled in - * function per_clocks_enable(). - */ -#ifdef CONFIG_SPL_BUILD -#undef CONFIG_SYS_NS16550_COM3 -#define CONFIG_SYS_NS16550_COM2 OMAP34XX_UART2 -#endif - /* Provide the MACH_TYPE value the vendor kernel requires */ #define CONFIG_MACH_TYPE 3063 diff --git a/include/configs/omap3_logic.h b/include/configs/omap3_logic.h index c9a154c..9e8c6bf 100644 --- a/include/configs/omap3_logic.h +++ b/include/configs/omap3_logic.h @@ -17,12 +17,6 @@ #include <configs/ti_omap3_common.h> -#ifdef CONFIG_SPL_BUILD -/* select serial console configuration for SPL */ -#define CONFIG_SYS_NS16550_COM1 OMAP34XX_UART1 -#endif - - /* * We are only ever GP parts and will utilize all of the "downloaded image" * area in SRAM which starts at 0x40200000 and ends at 0x4020FFFF (64KB) in diff --git a/include/configs/ti_omap3_common.h b/include/configs/ti_omap3_common.h index df6bca6..6b5ef1d 100644 --- a/include/configs/ti_omap3_common.h +++ b/include/configs/ti_omap3_common.h @@ -39,6 +39,8 @@ /* Select serial console configuration */ #ifdef CONFIG_SPL_BUILD +#define CONFIG_SYS_NS16550_COM1 OMAP34XX_UART1 +#define CONFIG_SYS_NS16550_COM2 OMAP34XX_UART2 #define CONFIG_SYS_NS16550_COM3 OMAP34XX_UART3 #endif -- 2.7.4

2 3

[U-Boot] [PATCH] cmd: Make CMD_NAND imply NAND
by Adam Ford 23 Jul '18

23 Jul '18

Many boards check for CMD_NAND and not NAND. This makes CMD_NAND imply NAND which will make some Kconfig migration of some NAND options easier later. Rsync all defconfig files using moveconfig.py Signed-off-by: Adam Ford <aford173(a)gmail.com> --- cmd/Kconfig | 1 + configs/MPC8313ERDB_NAND_33_defconfig | 1 - configs/MPC8313ERDB_NAND_66_defconfig | 1 - configs/P1022DS_36BIT_NAND_defconfig | 1 - configs/P1022DS_NAND_defconfig | 1 - configs/P1025RDB_NAND_defconfig | 1 - configs/P5020DS_NAND_SECURE_BOOT_defconfig | 1 - configs/P5020DS_NAND_defconfig | 1 - configs/P5040DS_NAND_SECURE_BOOT_defconfig | 1 - configs/P5040DS_NAND_defconfig | 1 - configs/am335x_baltos_defconfig | 1 - configs/am335x_evm_defconfig | 1 - configs/am335x_evm_nor_defconfig | 1 - configs/am335x_evm_usbspl_defconfig | 1 - configs/am335x_hs_evm_defconfig | 1 - configs/am335x_hs_evm_uart_defconfig | 1 - configs/am335x_igep003x_defconfig | 1 - configs/am3517_crane_defconfig | 1 - configs/am3517_evm_defconfig | 1 - configs/am43xx_evm_defconfig | 1 - configs/am43xx_evm_ethboot_defconfig | 1 - configs/am43xx_evm_rtconly_defconfig | 1 - configs/am43xx_evm_usbhost_boot_defconfig | 1 - configs/am43xx_hs_evm_defconfig | 1 - configs/apf27_defconfig | 4 +--- configs/aristainetos2_defconfig | 6 ++++-- configs/aristainetos2b_defconfig | 6 ++++-- configs/aristainetos_defconfig | 6 ++++-- configs/at91sam9260ek_dataflash_cs0_defconfig | 1 - configs/at91sam9260ek_dataflash_cs1_defconfig | 1 - configs/at91sam9260ek_nandflash_defconfig | 1 - configs/at91sam9261ek_dataflash_cs0_defconfig | 1 - configs/at91sam9261ek_dataflash_cs3_defconfig | 1 - configs/at91sam9261ek_nandflash_defconfig | 1 - configs/at91sam9263ek_dataflash_cs0_defconfig | 1 - configs/at91sam9263ek_dataflash_defconfig | 1 - configs/at91sam9263ek_nandflash_defconfig | 1 - configs/at91sam9263ek_norflash_boot_defconfig | 1 - configs/at91sam9263ek_norflash_defconfig | 1 - configs/at91sam9g10ek_dataflash_cs0_defconfig | 1 - configs/at91sam9g10ek_dataflash_cs3_defconfig | 1 - configs/at91sam9g10ek_nandflash_defconfig | 1 - configs/at91sam9g20ek_2mmc_defconfig | 1 - configs/at91sam9g20ek_2mmc_nandflash_defconfig | 1 - configs/at91sam9g20ek_dataflash_cs0_defconfig | 1 - configs/at91sam9g20ek_dataflash_cs1_defconfig | 1 - configs/at91sam9g20ek_nandflash_defconfig | 1 - configs/at91sam9m10g45ek_mmc_defconfig | 1 - configs/at91sam9n12ek_mmc_defconfig | 1 - configs/at91sam9n12ek_spiflash_defconfig | 1 - configs/at91sam9rlek_dataflash_defconfig | 1 - configs/at91sam9rlek_mmc_defconfig | 1 - configs/at91sam9rlek_nandflash_defconfig | 1 - configs/at91sam9x5ek_dataflash_defconfig | 1 - configs/at91sam9x5ek_mmc_defconfig | 1 - configs/at91sam9x5ek_spiflash_defconfig | 1 - configs/at91sam9xeek_dataflash_cs0_defconfig | 1 - configs/at91sam9xeek_dataflash_cs1_defconfig | 1 - configs/at91sam9xeek_nandflash_defconfig | 1 - configs/axm_defconfig | 1 - configs/bg0900_defconfig | 4 ++-- configs/bitmain_antminer_s9_defconfig | 4 +--- configs/bk4r1_defconfig | 3 +-- configs/brppt1_nand_defconfig | 1 - configs/cairo_defconfig | 1 - configs/chiliboard_defconfig | 1 - configs/cm_t335_defconfig | 1 - configs/cm_t3517_defconfig | 1 - configs/cm_t35_defconfig | 1 - configs/cm_t43_defconfig | 1 - configs/colibri_imx7_defconfig | 6 ++++-- configs/corvus_defconfig | 1 - configs/devkit3250_defconfig | 1 - configs/devkit8000_defconfig | 1 - configs/draco_defconfig | 1 - configs/ea20_defconfig | 1 - configs/eco5pk_defconfig | 1 - configs/etamin_defconfig | 1 - configs/ethernut5_defconfig | 1 - configs/gurnard_defconfig | 1 - configs/gwventana_nand_defconfig | 6 ++++-- configs/igep0032_defconfig | 1 - configs/igep00x0_defconfig | 1 - configs/imx6q_logic_defconfig | 6 ++++-- configs/ipam390_defconfig | 1 - configs/k2e_evm_defconfig | 1 - configs/k2e_hs_evm_defconfig | 1 - configs/k2hk_evm_defconfig | 1 - configs/k2hk_hs_evm_defconfig | 1 - configs/k2l_evm_defconfig | 1 - configs/k2l_hs_evm_defconfig | 1 - configs/mcx_defconfig | 1 - configs/meesc_defconfig | 1 - configs/mt_ventoux_defconfig | 1 - configs/mx28evk_auart_console_defconfig | 3 +-- configs/mx28evk_defconfig | 3 +-- configs/mx28evk_nand_defconfig | 3 +-- configs/mx28evk_spi_defconfig | 3 +-- configs/mx6sabreauto_defconfig | 6 ++++-- configs/mx6sxsabreauto_defconfig | 6 ++++-- configs/omap3_beagle_defconfig | 1 - configs/omap3_evm_defconfig | 1 - configs/omap3_ha_defconfig | 1 - configs/omap3_logic_defconfig | 1 - configs/omap3_overo_defconfig | 1 - configs/omap3_pandora_defconfig | 1 - configs/omap3_zoom1_defconfig | 1 - configs/omapl138_lcdk_defconfig | 1 - configs/pcm052_defconfig | 3 +-- configs/pcm058_defconfig | 6 ++++-- configs/pengwyn_defconfig | 3 +-- configs/pfla02_defconfig | 5 +++-- configs/platinum_picon_defconfig | 6 ++++-- configs/platinum_titanium_defconfig | 6 ++++-- configs/pm9261_defconfig | 1 - configs/pm9263_defconfig | 1 - configs/pm9g45_defconfig | 1 - configs/pxm2_defconfig | 1 - configs/rastaban_defconfig | 1 - configs/rut_defconfig | 1 - configs/sama5d2_ptc_ek_mmc_defconfig | 1 - configs/sama5d36ek_cmp_mmc_defconfig | 1 - configs/sama5d36ek_cmp_spiflash_defconfig | 1 - configs/sama5d3_xplained_mmc_defconfig | 1 - configs/sama5d3xek_mmc_defconfig | 1 - configs/sama5d3xek_spiflash_defconfig | 1 - configs/sama5d4_xplained_mmc_defconfig | 1 - configs/sama5d4_xplained_spiflash_defconfig | 1 - configs/sama5d4ek_mmc_defconfig | 1 - configs/sama5d4ek_spiflash_defconfig | 1 - configs/sheevaplug_defconfig | 2 +- configs/smartweb_defconfig | 1 - configs/snapper9260_defconfig | 1 - configs/snapper9g20_defconfig | 1 - configs/spear300_nand_defconfig | 1 - configs/spear300_usbtty_nand_defconfig | 1 - configs/spear310_nand_defconfig | 1 - configs/spear310_usbtty_nand_defconfig | 1 - configs/spear320_nand_defconfig | 1 - configs/spear320_usbtty_nand_defconfig | 1 - configs/spear600_nand_defconfig | 1 - configs/spear600_usbtty_nand_defconfig | 1 - configs/tao3530_defconfig | 1 - configs/taurus_defconfig | 1 - configs/thuban_defconfig | 1 - configs/ti816x_evm_defconfig | 1 - configs/titanium_defconfig | 6 ++++-- configs/tricorder_defconfig | 1 - configs/tricorder_flash_defconfig | 1 - configs/twister_defconfig | 1 - configs/usb_a9263_dataflash_defconfig | 1 - configs/vf610twr_defconfig | 3 +-- configs/vf610twr_nand_defconfig | 3 +-- configs/wb45n_defconfig | 1 - configs/wb50n_defconfig | 1 - configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig | 3 +-- configs/zynq_zc770_xm011_defconfig | 3 +-- configs/zynq_zc770_xm011_x16_defconfig | 3 +-- 158 files changed, 69 insertions(+), 187 deletions(-) diff --git a/cmd/Kconfig b/cmd/Kconfig index aec209006d..cc66891ac4 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -851,6 +851,7 @@ config CMD_MMC_SWRITE config CMD_NAND bool "nand" default y if NAND_SUNXI + select NAND help NAND support. diff --git a/configs/MPC8313ERDB_NAND_33_defconfig b/configs/MPC8313ERDB_NAND_33_defconfig index 08587b7538..d4a1f09a81 100644 --- a/configs/MPC8313ERDB_NAND_33_defconfig +++ b/configs/MPC8313ERDB_NAND_33_defconfig @@ -29,7 +29,6 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=e2800000.flash:512k(uboot),128k(env),6m@1m(ker CONFIG_ENV_IS_IN_NAND=y # CONFIG_MMC is not set CONFIG_MTD_NOR_FLASH=y -CONFIG_NAND=y CONFIG_PHY_MARVELL=y CONFIG_NETDEVICES=y CONFIG_TSEC_ENET=y diff --git a/configs/MPC8313ERDB_NAND_66_defconfig b/configs/MPC8313ERDB_NAND_66_defconfig index a6bd729a5a..4b6a455f5d 100644 --- a/configs/MPC8313ERDB_NAND_66_defconfig +++ b/configs/MPC8313ERDB_NAND_66_defconfig @@ -29,7 +29,6 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=e2800000.flash:512k(uboot),128k(env),6m@1m(ker CONFIG_ENV_IS_IN_NAND=y # CONFIG_MMC is not set CONFIG_MTD_NOR_FLASH=y -CONFIG_NAND=y CONFIG_PHY_MARVELL=y CONFIG_NETDEVICES=y CONFIG_TSEC_ENET=y diff --git a/configs/P1022DS_36BIT_NAND_defconfig b/configs/P1022DS_36BIT_NAND_defconfig index 45acdcb979..3e4bdecec7 100644 --- a/configs/P1022DS_36BIT_NAND_defconfig +++ b/configs/P1022DS_36BIT_NAND_defconfig @@ -42,7 +42,6 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=fe8000000.nor:48m(ramdisk),14m(diagnostic),2m( CONFIG_ENV_IS_IN_NAND=y CONFIG_FSL_ESDHC=y CONFIG_MTD_NOR_FLASH=y -CONFIG_NAND=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_SPANSION=y CONFIG_PHY_MARVELL=y diff --git a/configs/P1022DS_NAND_defconfig b/configs/P1022DS_NAND_defconfig index 47a3bbd2ad..7121446515 100644 --- a/configs/P1022DS_NAND_defconfig +++ b/configs/P1022DS_NAND_defconfig @@ -41,7 +41,6 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=e8000000.nor:48m(ramdisk),14m(diagnostic),2m(d CONFIG_ENV_IS_IN_NAND=y CONFIG_FSL_ESDHC=y CONFIG_MTD_NOR_FLASH=y -CONFIG_NAND=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_SPANSION=y CONFIG_PHY_MARVELL=y diff --git a/configs/P1025RDB_NAND_defconfig b/configs/P1025RDB_NAND_defconfig index cc55f3e466..f5c7a26ab3 100644 --- a/configs/P1025RDB_NAND_defconfig +++ b/configs/P1025RDB_NAND_defconfig @@ -40,7 +40,6 @@ CONFIG_CMD_FAT=y CONFIG_ENV_IS_IN_NAND=y CONFIG_FSL_ESDHC=y CONFIG_MTD_NOR_FLASH=y -CONFIG_NAND=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_SPANSION=y CONFIG_PHY_MARVELL=y diff --git a/configs/P5020DS_NAND_SECURE_BOOT_defconfig b/configs/P5020DS_NAND_SECURE_BOOT_defconfig index eb1799e753..c685eef973 100644 --- a/configs/P5020DS_NAND_SECURE_BOOT_defconfig +++ b/configs/P5020DS_NAND_SECURE_BOOT_defconfig @@ -28,7 +28,6 @@ CONFIG_CMD_FAT=y CONFIG_DM=y CONFIG_FSL_ESDHC=y CONFIG_MTD_NOR_FLASH=y -CONFIG_NAND=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_SPANSION=y CONFIG_PHYLIB=y diff --git a/configs/P5020DS_NAND_defconfig b/configs/P5020DS_NAND_defconfig index b60ae5d097..963acce3be 100644 --- a/configs/P5020DS_NAND_defconfig +++ b/configs/P5020DS_NAND_defconfig @@ -27,7 +27,6 @@ CONFIG_ENV_IS_IN_NAND=y CONFIG_FSL_CAAM=y CONFIG_FSL_ESDHC=y CONFIG_MTD_NOR_FLASH=y -CONFIG_NAND=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_SPANSION=y CONFIG_PHYLIB=y diff --git a/configs/P5040DS_NAND_SECURE_BOOT_defconfig b/configs/P5040DS_NAND_SECURE_BOOT_defconfig index f7f56fe0ae..4158f48bda 100644 --- a/configs/P5040DS_NAND_SECURE_BOOT_defconfig +++ b/configs/P5040DS_NAND_SECURE_BOOT_defconfig @@ -28,7 +28,6 @@ CONFIG_CMD_FAT=y CONFIG_DM=y CONFIG_FSL_ESDHC=y CONFIG_MTD_NOR_FLASH=y -CONFIG_NAND=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_SPANSION=y CONFIG_PHYLIB=y diff --git a/configs/P5040DS_NAND_defconfig b/configs/P5040DS_NAND_defconfig index 71ecf0f990..b59244a9e2 100644 --- a/configs/P5040DS_NAND_defconfig +++ b/configs/P5040DS_NAND_defconfig @@ -27,7 +27,6 @@ CONFIG_ENV_IS_IN_NAND=y CONFIG_FSL_CAAM=y CONFIG_FSL_ESDHC=y CONFIG_MTD_NOR_FLASH=y -CONFIG_NAND=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_SPANSION=y CONFIG_PHYLIB=y diff --git a/configs/am335x_baltos_defconfig b/configs/am335x_baltos_defconfig index 5400a4cff1..807b610a71 100644 --- a/configs/am335x_baltos_defconfig +++ b/configs/am335x_baltos_defconfig @@ -42,7 +42,6 @@ CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y CONFIG_BOOTCOUNT_LIMIT=y CONFIG_SYS_OMAP24_I2C_SPEED=1000 CONFIG_MMC_OMAP_HS=y -CONFIG_NAND=y CONFIG_PHY_ADDR_ENABLE=y CONFIG_DRIVER_TI_CPSW=y CONFIG_SYS_NS16550=y diff --git a/configs/am335x_evm_defconfig b/configs/am335x_evm_defconfig index c982bed138..87ffb08db4 100644 --- a/configs/am335x_evm_defconfig +++ b/configs/am335x_evm_defconfig @@ -35,7 +35,6 @@ CONFIG_DM_I2C=y CONFIG_MISC=y CONFIG_DM_MMC=y CONFIG_MMC_OMAP_HS=y -CONFIG_NAND=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_WINBOND=y CONFIG_DM_ETH=y diff --git a/configs/am335x_evm_nor_defconfig b/configs/am335x_evm_nor_defconfig index aed312e451..84a766fcaa 100644 --- a/configs/am335x_evm_nor_defconfig +++ b/configs/am335x_evm_nor_defconfig @@ -27,7 +27,6 @@ CONFIG_DFU_RAM=y CONFIG_USB_FUNCTION_FASTBOOT=y CONFIG_MMC_OMAP_HS=y CONFIG_MTD_NOR_FLASH=y -CONFIG_NAND=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_WINBOND=y CONFIG_DRIVER_TI_CPSW=y diff --git a/configs/am335x_evm_usbspl_defconfig b/configs/am335x_evm_usbspl_defconfig index 88003b5852..8a7e04be9c 100644 --- a/configs/am335x_evm_usbspl_defconfig +++ b/configs/am335x_evm_usbspl_defconfig @@ -35,7 +35,6 @@ CONFIG_DFU_NAND=y CONFIG_DFU_RAM=y CONFIG_USB_FUNCTION_FASTBOOT=y CONFIG_MMC_OMAP_HS=y -CONFIG_NAND=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_WINBOND=y CONFIG_DRIVER_TI_CPSW=y diff --git a/configs/am335x_hs_evm_defconfig b/configs/am335x_hs_evm_defconfig index f02bd37a18..46a8b8148f 100644 --- a/configs/am335x_hs_evm_defconfig +++ b/configs/am335x_hs_evm_defconfig @@ -43,7 +43,6 @@ CONFIG_MISC=y CONFIG_DM_MMC=y # CONFIG_MMC_HW_PARTITIONING is not set CONFIG_MMC_OMAP_HS=y -CONFIG_NAND=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_WINBOND=y CONFIG_DM_ETH=y diff --git a/configs/am335x_hs_evm_uart_defconfig b/configs/am335x_hs_evm_uart_defconfig index 06177faa9a..c728fa4c61 100644 --- a/configs/am335x_hs_evm_uart_defconfig +++ b/configs/am335x_hs_evm_uart_defconfig @@ -40,7 +40,6 @@ CONFIG_DM_I2C=y CONFIG_MISC=y CONFIG_DM_MMC=y CONFIG_MMC_OMAP_HS=y -CONFIG_NAND=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_WINBOND=y CONFIG_DM_ETH=y diff --git a/configs/am335x_igep003x_defconfig b/configs/am335x_igep003x_defconfig index aaa5397641..666d10401d 100644 --- a/configs/am335x_igep003x_defconfig +++ b/configs/am335x_igep003x_defconfig @@ -41,7 +41,6 @@ CONFIG_CMD_UBI=y CONFIG_ENV_IS_IN_UBI=y CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y CONFIG_MMC_OMAP_HS=y -CONFIG_NAND=y CONFIG_MTD_UBI_FASTMAP=y CONFIG_DRIVER_TI_CPSW=y CONFIG_SYS_NS16550=y diff --git a/configs/am3517_crane_defconfig b/configs/am3517_crane_defconfig index 23b3441505..152340d439 100644 --- a/configs/am3517_crane_defconfig +++ b/configs/am3517_crane_defconfig @@ -24,7 +24,6 @@ CONFIG_CMD_FAT=y CONFIG_CMD_JFFS2=y CONFIG_ENV_IS_IN_NAND=y CONFIG_MMC_OMAP_HS=y -CONFIG_NAND=y CONFIG_SYS_NAND_BUSWIDTH_16BIT=y CONFIG_SPL_NAND_SIMPLE=y CONFIG_CONS_INDEX=3 diff --git a/configs/am3517_evm_defconfig b/configs/am3517_evm_defconfig index 3b8e2900eb..d87a1e4670 100644 --- a/configs/am3517_evm_defconfig +++ b/configs/am3517_evm_defconfig @@ -35,7 +35,6 @@ CONFIG_SPL_OF_PLATDATA=y # CONFIG_ENV_IS_IN_FAT is not set CONFIG_ENV_IS_IN_NAND=y CONFIG_MMC_OMAP_HS=y -CONFIG_NAND=y CONFIG_SYS_NAND_BUSWIDTH_16BIT=y CONFIG_SPL_NAND_SIMPLE=y CONFIG_CONS_INDEX=3 diff --git a/configs/am43xx_evm_defconfig b/configs/am43xx_evm_defconfig index 06e6c0d5b0..d0166fb301 100644 --- a/configs/am43xx_evm_defconfig +++ b/configs/am43xx_evm_defconfig @@ -33,7 +33,6 @@ CONFIG_DFU_SF=y CONFIG_DM_GPIO=y CONFIG_DM_MMC=y CONFIG_MMC_OMAP_HS=y -CONFIG_NAND=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_MACRONIX=y CONFIG_DRIVER_TI_CPSW=y diff --git a/configs/am43xx_evm_ethboot_defconfig b/configs/am43xx_evm_ethboot_defconfig index c6f6d4f9ac..07f9ae3a42 100644 --- a/configs/am43xx_evm_ethboot_defconfig +++ b/configs/am43xx_evm_ethboot_defconfig @@ -39,7 +39,6 @@ CONFIG_DFU_MMC=y CONFIG_DFU_RAM=y CONFIG_DFU_SF=y CONFIG_MMC_OMAP_HS=y -CONFIG_NAND=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_MACRONIX=y CONFIG_DRIVER_TI_CPSW=y diff --git a/configs/am43xx_evm_rtconly_defconfig b/configs/am43xx_evm_rtconly_defconfig index a4d0210930..c29d8d65f2 100644 --- a/configs/am43xx_evm_rtconly_defconfig +++ b/configs/am43xx_evm_rtconly_defconfig @@ -34,7 +34,6 @@ CONFIG_DFU_SF=y CONFIG_DM_GPIO=y CONFIG_DM_MMC=y CONFIG_MMC_OMAP_HS=y -CONFIG_NAND=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_MACRONIX=y CONFIG_DRIVER_TI_CPSW=y diff --git a/configs/am43xx_evm_usbhost_boot_defconfig b/configs/am43xx_evm_usbhost_boot_defconfig index f2c20ab40f..03fc0858fb 100644 --- a/configs/am43xx_evm_usbhost_boot_defconfig +++ b/configs/am43xx_evm_usbhost_boot_defconfig @@ -47,7 +47,6 @@ CONFIG_DFU_SF=y CONFIG_DM_GPIO=y CONFIG_DM_MMC=y CONFIG_MMC_OMAP_HS=y -CONFIG_NAND=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_MACRONIX=y CONFIG_DRIVER_TI_CPSW=y diff --git a/configs/am43xx_hs_evm_defconfig b/configs/am43xx_hs_evm_defconfig index a6fa2e54be..e86819c799 100644 --- a/configs/am43xx_hs_evm_defconfig +++ b/configs/am43xx_hs_evm_defconfig @@ -44,7 +44,6 @@ CONFIG_DFU_SF=y CONFIG_DM_GPIO=y CONFIG_DM_MMC=y CONFIG_MMC_OMAP_HS=y -CONFIG_NAND=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_MACRONIX=y CONFIG_DRIVER_TI_CPSW=y diff --git a/configs/apf27_defconfig b/configs/apf27_defconfig index 5f688f0be8..4c27d895db 100644 --- a/configs/apf27_defconfig +++ b/configs/apf27_defconfig @@ -19,6 +19,7 @@ CONFIG_CMD_EEPROM=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y +CONFIG_CMD_NAND=y CONFIG_CMD_NAND_TRIMFFS=y CONFIG_CMD_NAND_LOCK_UNLOCK=y CONFIG_CMD_DHCP=y @@ -38,7 +39,4 @@ CONFIG_FPGA_XILINX=y CONFIG_FPGA_SPARTAN3=y CONFIG_MXC_GPIO=y CONFIG_MMC_MXC=y -CONFIG_NAND=y -CONFIG_NAND_MXC=y -CONFIG_SYS_NAND_BUSWIDTH_16BIT=y CONFIG_OF_LIBFDT=y diff --git a/configs/aristainetos2_defconfig b/configs/aristainetos2_defconfig index 60fd211ce9..c9077dc104 100644 --- a/configs/aristainetos2_defconfig +++ b/configs/aristainetos2_defconfig @@ -16,6 +16,7 @@ CONFIG_CMD_BOOTZ=y CONFIG_CMD_GPIO=y CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y +CONFIG_CMD_NAND=y CONFIG_CMD_NAND_TRIMFFS=y CONFIG_CMD_SF=y CONFIG_CMD_USB=y @@ -32,9 +33,10 @@ CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y CONFIG_CMD_UBI=y CONFIG_ENV_IS_IN_SPI_FLASH=y +CONFIG_APBH_DMA=y +CONFIG_APBH_DMA_BURST=y +CONFIG_APBH_DMA_BURST8=y CONFIG_FSL_ESDHC=y -CONFIG_NAND=y -CONFIG_NAND_MXS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_MTD_UBI_FASTMAP=y diff --git a/configs/aristainetos2b_defconfig b/configs/aristainetos2b_defconfig index a3537c1211..b7608f9833 100644 --- a/configs/aristainetos2b_defconfig +++ b/configs/aristainetos2b_defconfig @@ -16,6 +16,7 @@ CONFIG_CMD_BOOTZ=y CONFIG_CMD_GPIO=y CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y +CONFIG_CMD_NAND=y CONFIG_CMD_NAND_TRIMFFS=y CONFIG_CMD_SF=y CONFIG_CMD_USB=y @@ -32,9 +33,10 @@ CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y CONFIG_CMD_UBI=y CONFIG_ENV_IS_IN_SPI_FLASH=y +CONFIG_APBH_DMA=y +CONFIG_APBH_DMA_BURST=y +CONFIG_APBH_DMA_BURST8=y CONFIG_FSL_ESDHC=y -CONFIG_NAND=y -CONFIG_NAND_MXS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_MTD_UBI_FASTMAP=y diff --git a/configs/aristainetos_defconfig b/configs/aristainetos_defconfig index 990aa499f7..d10a77699c 100644 --- a/configs/aristainetos_defconfig +++ b/configs/aristainetos_defconfig @@ -16,6 +16,7 @@ CONFIG_CMD_BOOTZ=y CONFIG_CMD_GPIO=y CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y +CONFIG_CMD_NAND=y CONFIG_CMD_NAND_TRIMFFS=y CONFIG_CMD_SF=y CONFIG_CMD_USB=y @@ -32,9 +33,10 @@ CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y CONFIG_CMD_UBI=y CONFIG_ENV_IS_IN_SPI_FLASH=y +CONFIG_APBH_DMA=y +CONFIG_APBH_DMA_BURST=y +CONFIG_APBH_DMA_BURST8=y CONFIG_FSL_ESDHC=y -CONFIG_NAND=y -CONFIG_NAND_MXS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_MTD_UBI_FASTMAP=y diff --git a/configs/at91sam9260ek_dataflash_cs0_defconfig b/configs/at91sam9260ek_dataflash_cs0_defconfig index c77b8d8a20..cb6624987a 100644 --- a/configs/at91sam9260ek_dataflash_cs0_defconfig +++ b/configs/at91sam9260ek_dataflash_cs0_defconfig @@ -34,7 +34,6 @@ CONFIG_CLK_AT91=y CONFIG_DM_GPIO=y CONFIG_AT91_GPIO=y # CONFIG_MMC is not set -CONFIG_NAND=y CONFIG_NAND_ATMEL=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y diff --git a/configs/at91sam9260ek_dataflash_cs1_defconfig b/configs/at91sam9260ek_dataflash_cs1_defconfig index 254d159185..5d1c5e2b6a 100644 --- a/configs/at91sam9260ek_dataflash_cs1_defconfig +++ b/configs/at91sam9260ek_dataflash_cs1_defconfig @@ -34,7 +34,6 @@ CONFIG_CLK_AT91=y CONFIG_DM_GPIO=y CONFIG_AT91_GPIO=y # CONFIG_MMC is not set -CONFIG_NAND=y CONFIG_NAND_ATMEL=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y diff --git a/configs/at91sam9260ek_nandflash_defconfig b/configs/at91sam9260ek_nandflash_defconfig index 9079a668bd..bd8b8acaa0 100644 --- a/configs/at91sam9260ek_nandflash_defconfig +++ b/configs/at91sam9260ek_nandflash_defconfig @@ -34,7 +34,6 @@ CONFIG_CLK_AT91=y CONFIG_DM_GPIO=y CONFIG_AT91_GPIO=y # CONFIG_MMC is not set -CONFIG_NAND=y CONFIG_NAND_ATMEL=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y diff --git a/configs/at91sam9261ek_dataflash_cs0_defconfig b/configs/at91sam9261ek_dataflash_cs0_defconfig index c5b37fcbd3..8caac814fb 100644 --- a/configs/at91sam9261ek_dataflash_cs0_defconfig +++ b/configs/at91sam9261ek_dataflash_cs0_defconfig @@ -35,7 +35,6 @@ CONFIG_CLK_AT91=y CONFIG_DM_GPIO=y CONFIG_AT91_GPIO=y # CONFIG_MMC is not set -CONFIG_NAND=y CONFIG_NAND_ATMEL=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y diff --git a/configs/at91sam9261ek_dataflash_cs3_defconfig b/configs/at91sam9261ek_dataflash_cs3_defconfig index 43fb85cc11..cc4d1c95bc 100644 --- a/configs/at91sam9261ek_dataflash_cs3_defconfig +++ b/configs/at91sam9261ek_dataflash_cs3_defconfig @@ -35,7 +35,6 @@ CONFIG_CLK_AT91=y CONFIG_DM_GPIO=y CONFIG_AT91_GPIO=y # CONFIG_MMC is not set -CONFIG_NAND=y CONFIG_NAND_ATMEL=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y diff --git a/configs/at91sam9261ek_nandflash_defconfig b/configs/at91sam9261ek_nandflash_defconfig index a62617afbe..a3c1351aca 100644 --- a/configs/at91sam9261ek_nandflash_defconfig +++ b/configs/at91sam9261ek_nandflash_defconfig @@ -35,7 +35,6 @@ CONFIG_CLK_AT91=y CONFIG_DM_GPIO=y CONFIG_AT91_GPIO=y # CONFIG_MMC is not set -CONFIG_NAND=y CONFIG_NAND_ATMEL=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y diff --git a/configs/at91sam9263ek_dataflash_cs0_defconfig b/configs/at91sam9263ek_dataflash_cs0_defconfig index c49f3871fd..edcad95262 100644 --- a/configs/at91sam9263ek_dataflash_cs0_defconfig +++ b/configs/at91sam9263ek_dataflash_cs0_defconfig @@ -39,7 +39,6 @@ CONFIG_DM_GPIO=y CONFIG_AT91_GPIO=y CONFIG_DM_MMC=y CONFIG_GENERIC_ATMEL_MCI=y -CONFIG_NAND=y CONFIG_NAND_ATMEL=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y diff --git a/configs/at91sam9263ek_dataflash_defconfig b/configs/at91sam9263ek_dataflash_defconfig index c49f3871fd..edcad95262 100644 --- a/configs/at91sam9263ek_dataflash_defconfig +++ b/configs/at91sam9263ek_dataflash_defconfig @@ -39,7 +39,6 @@ CONFIG_DM_GPIO=y CONFIG_AT91_GPIO=y CONFIG_DM_MMC=y CONFIG_GENERIC_ATMEL_MCI=y -CONFIG_NAND=y CONFIG_NAND_ATMEL=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y diff --git a/configs/at91sam9263ek_nandflash_defconfig b/configs/at91sam9263ek_nandflash_defconfig index 1592a7ccd6..8399c8553d 100644 --- a/configs/at91sam9263ek_nandflash_defconfig +++ b/configs/at91sam9263ek_nandflash_defconfig @@ -39,7 +39,6 @@ CONFIG_DM_GPIO=y CONFIG_AT91_GPIO=y CONFIG_DM_MMC=y CONFIG_GENERIC_ATMEL_MCI=y -CONFIG_NAND=y CONFIG_NAND_ATMEL=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y diff --git a/configs/at91sam9263ek_norflash_boot_defconfig b/configs/at91sam9263ek_norflash_boot_defconfig index 0009a9cbea..7ecbbc0ca9 100644 --- a/configs/at91sam9263ek_norflash_boot_defconfig +++ b/configs/at91sam9263ek_norflash_boot_defconfig @@ -38,7 +38,6 @@ CONFIG_AT91_GPIO=y CONFIG_DM_MMC=y CONFIG_GENERIC_ATMEL_MCI=y CONFIG_MTD_NOR_FLASH=y -CONFIG_NAND=y CONFIG_NAND_ATMEL=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y diff --git a/configs/at91sam9263ek_norflash_defconfig b/configs/at91sam9263ek_norflash_defconfig index e035589582..024fc09b60 100644 --- a/configs/at91sam9263ek_norflash_defconfig +++ b/configs/at91sam9263ek_norflash_defconfig @@ -38,7 +38,6 @@ CONFIG_AT91_GPIO=y CONFIG_DM_MMC=y CONFIG_GENERIC_ATMEL_MCI=y CONFIG_MTD_NOR_FLASH=y -CONFIG_NAND=y CONFIG_NAND_ATMEL=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y diff --git a/configs/at91sam9g10ek_dataflash_cs0_defconfig b/configs/at91sam9g10ek_dataflash_cs0_defconfig index 632031a6ab..c5f32f75ea 100644 --- a/configs/at91sam9g10ek_dataflash_cs0_defconfig +++ b/configs/at91sam9g10ek_dataflash_cs0_defconfig @@ -35,7 +35,6 @@ CONFIG_CLK_AT91=y CONFIG_DM_GPIO=y CONFIG_AT91_GPIO=y # CONFIG_MMC is not set -CONFIG_NAND=y CONFIG_NAND_ATMEL=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y diff --git a/configs/at91sam9g10ek_dataflash_cs3_defconfig b/configs/at91sam9g10ek_dataflash_cs3_defconfig index 1fdbbe0419..d6cff69374 100644 --- a/configs/at91sam9g10ek_dataflash_cs3_defconfig +++ b/configs/at91sam9g10ek_dataflash_cs3_defconfig @@ -35,7 +35,6 @@ CONFIG_CLK_AT91=y CONFIG_DM_GPIO=y CONFIG_AT91_GPIO=y # CONFIG_MMC is not set -CONFIG_NAND=y CONFIG_NAND_ATMEL=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y diff --git a/configs/at91sam9g10ek_nandflash_defconfig b/configs/at91sam9g10ek_nandflash_defconfig index c9c0d88bad..e016dbaae8 100644 --- a/configs/at91sam9g10ek_nandflash_defconfig +++ b/configs/at91sam9g10ek_nandflash_defconfig @@ -35,7 +35,6 @@ CONFIG_CLK_AT91=y CONFIG_DM_GPIO=y CONFIG_AT91_GPIO=y # CONFIG_MMC is not set -CONFIG_NAND=y CONFIG_NAND_ATMEL=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y diff --git a/configs/at91sam9g20ek_2mmc_defconfig b/configs/at91sam9g20ek_2mmc_defconfig index 01f9347bd1..de945206d5 100644 --- a/configs/at91sam9g20ek_2mmc_defconfig +++ b/configs/at91sam9g20ek_2mmc_defconfig @@ -36,7 +36,6 @@ CONFIG_DM_GPIO=y CONFIG_AT91_GPIO=y CONFIG_DM_MMC=y CONFIG_GENERIC_ATMEL_MCI=y -CONFIG_NAND=y CONFIG_NAND_ATMEL=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y diff --git a/configs/at91sam9g20ek_2mmc_nandflash_defconfig b/configs/at91sam9g20ek_2mmc_nandflash_defconfig index 522d2086d7..a8fb9b7c7c 100644 --- a/configs/at91sam9g20ek_2mmc_nandflash_defconfig +++ b/configs/at91sam9g20ek_2mmc_nandflash_defconfig @@ -36,7 +36,6 @@ CONFIG_DM_GPIO=y CONFIG_AT91_GPIO=y CONFIG_DM_MMC=y CONFIG_GENERIC_ATMEL_MCI=y -CONFIG_NAND=y CONFIG_NAND_ATMEL=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y diff --git a/configs/at91sam9g20ek_dataflash_cs0_defconfig b/configs/at91sam9g20ek_dataflash_cs0_defconfig index e7aa23201e..b3a668e857 100644 --- a/configs/at91sam9g20ek_dataflash_cs0_defconfig +++ b/configs/at91sam9g20ek_dataflash_cs0_defconfig @@ -34,7 +34,6 @@ CONFIG_CLK_AT91=y CONFIG_DM_GPIO=y CONFIG_AT91_GPIO=y # CONFIG_MMC is not set -CONFIG_NAND=y CONFIG_NAND_ATMEL=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y diff --git a/configs/at91sam9g20ek_dataflash_cs1_defconfig b/configs/at91sam9g20ek_dataflash_cs1_defconfig index 94ed68d51e..ab44a27eb4 100644 --- a/configs/at91sam9g20ek_dataflash_cs1_defconfig +++ b/configs/at91sam9g20ek_dataflash_cs1_defconfig @@ -34,7 +34,6 @@ CONFIG_CLK_AT91=y CONFIG_DM_GPIO=y CONFIG_AT91_GPIO=y # CONFIG_MMC is not set -CONFIG_NAND=y CONFIG_NAND_ATMEL=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y diff --git a/configs/at91sam9g20ek_nandflash_defconfig b/configs/at91sam9g20ek_nandflash_defconfig index d6bcf695fd..99cb69e877 100644 --- a/configs/at91sam9g20ek_nandflash_defconfig +++ b/configs/at91sam9g20ek_nandflash_defconfig @@ -34,7 +34,6 @@ CONFIG_CLK_AT91=y CONFIG_DM_GPIO=y CONFIG_AT91_GPIO=y # CONFIG_MMC is not set -CONFIG_NAND=y CONFIG_NAND_ATMEL=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y diff --git a/configs/at91sam9m10g45ek_mmc_defconfig b/configs/at91sam9m10g45ek_mmc_defconfig index aa01be0104..eb3bbb09a4 100644 --- a/configs/at91sam9m10g45ek_mmc_defconfig +++ b/configs/at91sam9m10g45ek_mmc_defconfig @@ -38,7 +38,6 @@ CONFIG_DM_GPIO=y CONFIG_AT91_GPIO=y CONFIG_DM_MMC=y CONFIG_GENERIC_ATMEL_MCI=y -CONFIG_NAND=y CONFIG_NAND_ATMEL=y CONFIG_DM_ETH=y CONFIG_MACB=y diff --git a/configs/at91sam9n12ek_mmc_defconfig b/configs/at91sam9n12ek_mmc_defconfig index 19cca1096b..48d237e6c4 100644 --- a/configs/at91sam9n12ek_mmc_defconfig +++ b/configs/at91sam9n12ek_mmc_defconfig @@ -38,7 +38,6 @@ CONFIG_DM_GPIO=y CONFIG_AT91_GPIO=y CONFIG_DM_MMC=y CONFIG_GENERIC_ATMEL_MCI=y -CONFIG_NAND=y CONFIG_NAND_ATMEL=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y diff --git a/configs/at91sam9n12ek_spiflash_defconfig b/configs/at91sam9n12ek_spiflash_defconfig index ba50e7a070..070e766ce9 100644 --- a/configs/at91sam9n12ek_spiflash_defconfig +++ b/configs/at91sam9n12ek_spiflash_defconfig @@ -38,7 +38,6 @@ CONFIG_DM_GPIO=y CONFIG_AT91_GPIO=y CONFIG_DM_MMC=y CONFIG_GENERIC_ATMEL_MCI=y -CONFIG_NAND=y CONFIG_NAND_ATMEL=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y diff --git a/configs/at91sam9rlek_dataflash_defconfig b/configs/at91sam9rlek_dataflash_defconfig index c1ff8a179c..b4bf22bcd6 100644 --- a/configs/at91sam9rlek_dataflash_defconfig +++ b/configs/at91sam9rlek_dataflash_defconfig @@ -37,7 +37,6 @@ CONFIG_DM_GPIO=y CONFIG_AT91_GPIO=y CONFIG_DM_MMC=y CONFIG_GENERIC_ATMEL_MCI=y -CONFIG_NAND=y CONFIG_NAND_ATMEL=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y diff --git a/configs/at91sam9rlek_mmc_defconfig b/configs/at91sam9rlek_mmc_defconfig index 80d596145a..be0ac1a814 100644 --- a/configs/at91sam9rlek_mmc_defconfig +++ b/configs/at91sam9rlek_mmc_defconfig @@ -37,7 +37,6 @@ CONFIG_DM_GPIO=y CONFIG_AT91_GPIO=y CONFIG_DM_MMC=y CONFIG_GENERIC_ATMEL_MCI=y -CONFIG_NAND=y CONFIG_NAND_ATMEL=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y diff --git a/configs/at91sam9rlek_nandflash_defconfig b/configs/at91sam9rlek_nandflash_defconfig index 3ed0aa18be..3e6419f5ac 100644 --- a/configs/at91sam9rlek_nandflash_defconfig +++ b/configs/at91sam9rlek_nandflash_defconfig @@ -37,7 +37,6 @@ CONFIG_DM_GPIO=y CONFIG_AT91_GPIO=y CONFIG_DM_MMC=y CONFIG_GENERIC_ATMEL_MCI=y -CONFIG_NAND=y CONFIG_NAND_ATMEL=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y diff --git a/configs/at91sam9x5ek_dataflash_defconfig b/configs/at91sam9x5ek_dataflash_defconfig index 54b4a3316a..01befd2de5 100644 --- a/configs/at91sam9x5ek_dataflash_defconfig +++ b/configs/at91sam9x5ek_dataflash_defconfig @@ -39,7 +39,6 @@ CONFIG_DM_GPIO=y CONFIG_AT91_GPIO=y CONFIG_DM_MMC=y CONFIG_GENERIC_ATMEL_MCI=y -CONFIG_NAND=y CONFIG_NAND_ATMEL=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y diff --git a/configs/at91sam9x5ek_mmc_defconfig b/configs/at91sam9x5ek_mmc_defconfig index 3a2d6f4fcc..2414a2c1d0 100644 --- a/configs/at91sam9x5ek_mmc_defconfig +++ b/configs/at91sam9x5ek_mmc_defconfig @@ -39,7 +39,6 @@ CONFIG_DM_GPIO=y CONFIG_AT91_GPIO=y CONFIG_DM_MMC=y CONFIG_GENERIC_ATMEL_MCI=y -CONFIG_NAND=y CONFIG_NAND_ATMEL=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y diff --git a/configs/at91sam9x5ek_spiflash_defconfig b/configs/at91sam9x5ek_spiflash_defconfig index b2c5783fef..7079fc2375 100644 --- a/configs/at91sam9x5ek_spiflash_defconfig +++ b/configs/at91sam9x5ek_spiflash_defconfig @@ -39,7 +39,6 @@ CONFIG_DM_GPIO=y CONFIG_AT91_GPIO=y CONFIG_DM_MMC=y CONFIG_GENERIC_ATMEL_MCI=y -CONFIG_NAND=y CONFIG_NAND_ATMEL=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y diff --git a/configs/at91sam9xeek_dataflash_cs0_defconfig b/configs/at91sam9xeek_dataflash_cs0_defconfig index 4140eb30bb..45238f9e5e 100644 --- a/configs/at91sam9xeek_dataflash_cs0_defconfig +++ b/configs/at91sam9xeek_dataflash_cs0_defconfig @@ -34,7 +34,6 @@ CONFIG_CLK_AT91=y CONFIG_DM_GPIO=y CONFIG_AT91_GPIO=y # CONFIG_MMC is not set -CONFIG_NAND=y CONFIG_NAND_ATMEL=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y diff --git a/configs/at91sam9xeek_dataflash_cs1_defconfig b/configs/at91sam9xeek_dataflash_cs1_defconfig index 12818c6189..19539ef5b5 100644 --- a/configs/at91sam9xeek_dataflash_cs1_defconfig +++ b/configs/at91sam9xeek_dataflash_cs1_defconfig @@ -34,7 +34,6 @@ CONFIG_CLK_AT91=y CONFIG_DM_GPIO=y CONFIG_AT91_GPIO=y # CONFIG_MMC is not set -CONFIG_NAND=y CONFIG_NAND_ATMEL=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y diff --git a/configs/at91sam9xeek_nandflash_defconfig b/configs/at91sam9xeek_nandflash_defconfig index fb079e8088..c3a744d4fa 100644 --- a/configs/at91sam9xeek_nandflash_defconfig +++ b/configs/at91sam9xeek_nandflash_defconfig @@ -34,7 +34,6 @@ CONFIG_CLK_AT91=y CONFIG_DM_GPIO=y CONFIG_AT91_GPIO=y # CONFIG_MMC is not set -CONFIG_NAND=y CONFIG_NAND_ATMEL=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y diff --git a/configs/axm_defconfig b/configs/axm_defconfig index f1bdd0f04c..54ea636115 100644 --- a/configs/axm_defconfig +++ b/configs/axm_defconfig @@ -37,7 +37,6 @@ CONFIG_OF_CONTROL=y CONFIG_OF_EMBED=y CONFIG_ENV_IS_IN_NAND=y # CONFIG_MMC is not set -CONFIG_NAND=y CONFIG_NAND_ATMEL=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y diff --git a/configs/bg0900_defconfig b/configs/bg0900_defconfig index fa8f6dcba8..bc46fd96f2 100644 --- a/configs/bg0900_defconfig +++ b/configs/bg0900_defconfig @@ -19,6 +19,7 @@ CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_GPIO=y +CONFIG_CMD_NAND=y CONFIG_CMD_NAND_TRIMFFS=y CONFIG_CMD_SF=y CONFIG_CMD_SPI=y @@ -27,9 +28,8 @@ CONFIG_CMD_MII=y CONFIG_CMD_PING=y CONFIG_CMD_CACHE=y CONFIG_DOS_PARTITION=y +CONFIG_APBH_DMA=y # CONFIG_MMC is not set -CONFIG_NAND=y -CONFIG_NAND_MXS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_BAR=y CONFIG_SPI_FLASH_STMICRO=y diff --git a/configs/bitmain_antminer_s9_defconfig b/configs/bitmain_antminer_s9_defconfig index 40bce4e374..398fa60543 100644 --- a/configs/bitmain_antminer_s9_defconfig +++ b/configs/bitmain_antminer_s9_defconfig @@ -28,6 +28,7 @@ CONFIG_CMD_FPGA_LOADMK=y CONFIG_CMD_FPGA_LOADP=y CONFIG_CMD_GPIO=y CONFIG_CMD_MMC=y +CONFIG_CMD_NAND=y CONFIG_CMD_NAND_LOCK_UNLOCK=y CONFIG_CMD_PART=y # CONFIG_CMD_SETEXPR is not set @@ -53,9 +54,6 @@ CONFIG_FPGA_ZYNQPL=y CONFIG_DM_GPIO=y CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_ZYNQ=y -CONFIG_NAND=y -CONFIG_NAND_ZYNQ=y -CONFIG_NAND_ZYNQ_USE_BOOTLOADER1_TIMINGS=y CONFIG_ZYNQ_GEM=y CONFIG_DEBUG_UART_ZYNQ=y CONFIG_DEBUG_UART_ANNOUNCE=y diff --git a/configs/bk4r1_defconfig b/configs/bk4r1_defconfig index c90ed96ef0..a27a50f961 100644 --- a/configs/bk4r1_defconfig +++ b/configs/bk4r1_defconfig @@ -14,6 +14,7 @@ CONFIG_CMD_MEMTEST=y CONFIG_CMD_GPIO=y CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y +CONFIG_CMD_NAND=y CONFIG_CMD_NAND_TRIMFFS=y CONFIG_CMD_SF=y CONFIG_CMD_DHCP=y @@ -30,8 +31,6 @@ CONFIG_DM=y CONFIG_DM_GPIO=y CONFIG_VYBRID_GPIO=y CONFIG_FSL_ESDHC=y -CONFIG_NAND_VF610_NFC=y -CONFIG_SYS_NAND_BUSWIDTH_16BIT=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y diff --git a/configs/brppt1_nand_defconfig b/configs/brppt1_nand_defconfig index ac50abc661..9e289b6d3e 100644 --- a/configs/brppt1_nand_defconfig +++ b/configs/brppt1_nand_defconfig @@ -52,7 +52,6 @@ CONFIG_ENV_IS_IN_NAND=y CONFIG_NETCONSOLE=y CONFIG_BOOTCOUNT_LIMIT=y # CONFIG_MMC is not set -CONFIG_NAND=y CONFIG_DRIVER_TI_CPSW=y CONFIG_SYS_NS16550=y CONFIG_USB=y diff --git a/configs/cairo_defconfig b/configs/cairo_defconfig index 0a772a284c..b15255c37d 100644 --- a/configs/cairo_defconfig +++ b/configs/cairo_defconfig @@ -27,7 +27,6 @@ CONFIG_CMD_EXT4_WRITE=y CONFIG_CMD_MTDPARTS=y CONFIG_ENV_IS_IN_NAND=y CONFIG_MMC_OMAP_HS=y -CONFIG_NAND=y CONFIG_SPL_NAND_SIMPLE=y CONFIG_CONS_INDEX=2 CONFIG_SYS_NS16550=y diff --git a/configs/chiliboard_defconfig b/configs/chiliboard_defconfig index 09d7452ae4..9956f0b332 100644 --- a/configs/chiliboard_defconfig +++ b/configs/chiliboard_defconfig @@ -33,7 +33,6 @@ CONFIG_ENV_IS_IN_MMC=y CONFIG_BOOTCOUNT_LIMIT=y CONFIG_DM_GPIO=y CONFIG_MMC_OMAP_HS=y -CONFIG_NAND=y CONFIG_DRIVER_TI_CPSW=y CONFIG_SYS_NS16550=y CONFIG_SPI=y diff --git a/configs/cm_t335_defconfig b/configs/cm_t335_defconfig index a9848a588e..54862db970 100644 --- a/configs/cm_t335_defconfig +++ b/configs/cm_t335_defconfig @@ -44,7 +44,6 @@ CONFIG_LED_STATUS_BIT=64 CONFIG_LED_STATUS_BOOT_ENABLE=y CONFIG_LED_STATUS_BOOT=0 CONFIG_MMC_OMAP_HS=y -CONFIG_NAND=y CONFIG_DRIVER_TI_CPSW=y CONFIG_SYS_NS16550=y CONFIG_FAT_WRITE=y diff --git a/configs/cm_t3517_defconfig b/configs/cm_t3517_defconfig index f41f267d5f..4c38f11680 100644 --- a/configs/cm_t3517_defconfig +++ b/configs/cm_t3517_defconfig @@ -39,7 +39,6 @@ CONFIG_LED_STATUS_STATE=2 CONFIG_LED_STATUS_BOOT_ENABLE=y CONFIG_LED_STATUS_BOOT=0 CONFIG_MMC_OMAP_HS=y -CONFIG_NAND=y CONFIG_NETDEVICES=y CONFIG_SMC911X=y CONFIG_SMC911X_BASE=0x2D000000 diff --git a/configs/cm_t35_defconfig b/configs/cm_t35_defconfig index 8548ceba71..b17f673489 100644 --- a/configs/cm_t35_defconfig +++ b/configs/cm_t35_defconfig @@ -39,7 +39,6 @@ CONFIG_LED_STATUS_STATE=2 CONFIG_LED_STATUS_BOOT_ENABLE=y CONFIG_LED_STATUS_BOOT=0 CONFIG_MMC_OMAP_HS=y -CONFIG_NAND=y CONFIG_SPL_NAND_SIMPLE=y CONFIG_NETDEVICES=y CONFIG_SMC911X=y diff --git a/configs/cm_t43_defconfig b/configs/cm_t43_defconfig index 0f9b0ca0c8..2a4ab6496e 100644 --- a/configs/cm_t43_defconfig +++ b/configs/cm_t43_defconfig @@ -46,7 +46,6 @@ CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y CONFIG_DM=y CONFIG_DM_GPIO=y CONFIG_MMC_OMAP_HS=y -CONFIG_NAND=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_BAR=y CONFIG_SPI_FLASH_ATMEL=y diff --git a/configs/colibri_imx7_defconfig b/configs/colibri_imx7_defconfig index b6139c0c38..621df51768 100644 --- a/configs/colibri_imx7_defconfig +++ b/configs/colibri_imx7_defconfig @@ -25,6 +25,7 @@ CONFIG_CMD_DFU=y CONFIG_CMD_GPIO=y CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y +CONFIG_CMD_NAND=y CONFIG_CMD_NAND_TRIMFFS=y CONFIG_CMD_NAND_TORTURE=y CONFIG_CMD_USB=y @@ -45,11 +46,12 @@ CONFIG_OF_EMBED=y CONFIG_ENV_IS_IN_NAND=y CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y CONFIG_DFU_MMC=y +CONFIG_APBH_DMA=y +CONFIG_APBH_DMA_BURST=y +CONFIG_APBH_DMA_BURST8=y CONFIG_DM_GPIO=y CONFIG_DM_I2C=y CONFIG_FSL_ESDHC=y -CONFIG_NAND=y -CONFIG_NAND_MXS=y CONFIG_MTD_UBI_FASTMAP=y CONFIG_PHYLIB=y CONFIG_PHY_MICREL=y diff --git a/configs/corvus_defconfig b/configs/corvus_defconfig index 16999b6de1..43e2ab0696 100644 --- a/configs/corvus_defconfig +++ b/configs/corvus_defconfig @@ -40,7 +40,6 @@ CONFIG_CLK=y CONFIG_CLK_AT91=y CONFIG_DFU_NAND=y # CONFIG_MMC is not set -CONFIG_NAND=y CONFIG_NAND_ATMEL=y CONFIG_PHYLIB=y CONFIG_ATMEL_USART=y diff --git a/configs/devkit3250_defconfig b/configs/devkit3250_defconfig index 8a37122104..330c28bf9a 100644 --- a/configs/devkit3250_defconfig +++ b/configs/devkit3250_defconfig @@ -33,7 +33,6 @@ CONFIG_SPL_DM=y CONFIG_DM_GPIO=y # CONFIG_MMC is not set CONFIG_MTD_NOR_FLASH=y -CONFIG_NAND=y CONFIG_NAND_LPC32XX_SLC=y CONFIG_SPL_NAND_SIMPLE=y CONFIG_PHYLIB=y diff --git a/configs/devkit8000_defconfig b/configs/devkit8000_defconfig index 4a096b9265..7621159473 100644 --- a/configs/devkit8000_defconfig +++ b/configs/devkit8000_defconfig @@ -25,7 +25,6 @@ CONFIG_MTDIDS_DEFAULT="nand0=nand" CONFIG_MTDPARTS_DEFAULT="mtdparts=nand:512k(x-loader),1920k(u-boot),128k(u-boot-env),4m(kernel),-(fs)" CONFIG_ENV_IS_IN_NAND=y CONFIG_MMC_OMAP_HS=y -CONFIG_NAND=y CONFIG_SYS_NAND_BUSWIDTH_16BIT=y CONFIG_SPL_NAND_SIMPLE=y CONFIG_CONS_INDEX=3 diff --git a/configs/draco_defconfig b/configs/draco_defconfig index 5c61659fe5..ca5008a3ea 100644 --- a/configs/draco_defconfig +++ b/configs/draco_defconfig @@ -58,7 +58,6 @@ CONFIG_BOOTCOUNT_LIMIT=y CONFIG_BOOTCOUNT_ENV=y CONFIG_DFU_NAND=y CONFIG_MMC_OMAP_HS=y -CONFIG_NAND=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_WINBOND=y CONFIG_MTD_UBI_FASTMAP=y diff --git a/configs/ea20_defconfig b/configs/ea20_defconfig index 43292a126d..c1169655d8 100644 --- a/configs/ea20_defconfig +++ b/configs/ea20_defconfig @@ -30,7 +30,6 @@ CONFIG_CMD_DIAG=y CONFIG_CMD_UBI=y CONFIG_ENV_IS_IN_SPI_FLASH=y # CONFIG_MMC is not set -CONFIG_NAND=y CONFIG_NAND_DAVINCI=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y diff --git a/configs/eco5pk_defconfig b/configs/eco5pk_defconfig index 44e83a2d4b..275abc3294 100644 --- a/configs/eco5pk_defconfig +++ b/configs/eco5pk_defconfig @@ -28,7 +28,6 @@ CONFIG_CMD_UBI=y CONFIG_ENV_IS_IN_NAND=y CONFIG_SYS_OMAP24_I2C_SPEED=400000 CONFIG_MMC_OMAP_HS=y -CONFIG_NAND=y CONFIG_SYS_NAND_BUSWIDTH_16BIT=y CONFIG_SPL_NAND_SIMPLE=y CONFIG_CONS_INDEX=3 diff --git a/configs/etamin_defconfig b/configs/etamin_defconfig index 3bb9b2e34e..09a9785a03 100644 --- a/configs/etamin_defconfig +++ b/configs/etamin_defconfig @@ -58,7 +58,6 @@ CONFIG_BOOTCOUNT_LIMIT=y CONFIG_BOOTCOUNT_ENV=y CONFIG_DFU_NAND=y CONFIG_MMC_OMAP_HS=y -CONFIG_NAND=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_WINBOND=y CONFIG_MTD_UBI_FASTMAP=y diff --git a/configs/ethernut5_defconfig b/configs/ethernut5_defconfig index fd5a6f66e9..ec37c93254 100644 --- a/configs/ethernut5_defconfig +++ b/configs/ethernut5_defconfig @@ -49,7 +49,6 @@ CONFIG_CLK_AT91=y CONFIG_DM_GPIO=y CONFIG_AT91_GPIO=y CONFIG_MTD_NOR_FLASH=y -CONFIG_NAND=y CONFIG_NAND_ATMEL=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y diff --git a/configs/gurnard_defconfig b/configs/gurnard_defconfig index f00a06a29b..5574cd5dac 100644 --- a/configs/gurnard_defconfig +++ b/configs/gurnard_defconfig @@ -24,7 +24,6 @@ CONFIG_CMD_PING=y CONFIG_CMD_FAT=y CONFIG_OF_CONTROL=y CONFIG_ENV_IS_IN_NAND=y -CONFIG_NAND=y CONFIG_NAND_ATMEL=y CONFIG_PHYLIB=y CONFIG_TIMER=y diff --git a/configs/gwventana_nand_defconfig b/configs/gwventana_nand_defconfig index f4d35a62b8..a84f9cc246 100644 --- a/configs/gwventana_nand_defconfig +++ b/configs/gwventana_nand_defconfig @@ -38,6 +38,7 @@ CONFIG_CMD_SPL_WRITE_SIZE=0x20000 CONFIG_CMD_GPIO=y CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y +CONFIG_CMD_NAND=y CONFIG_CMD_NAND_TRIMFFS=y CONFIG_CMD_PCI=y CONFIG_CMD_USB=y @@ -58,10 +59,11 @@ CONFIG_CMD_UBI=y CONFIG_ENV_IS_IN_NAND=y CONFIG_DM=y CONFIG_DWC_AHSATA=y +CONFIG_APBH_DMA=y +CONFIG_APBH_DMA_BURST=y +CONFIG_APBH_DMA_BURST8=y CONFIG_SUPPORT_EMMC_RPMB=y CONFIG_FSL_ESDHC=y -CONFIG_NAND=y -CONFIG_NAND_MXS=y CONFIG_PHYLIB=y CONFIG_NETDEVICES=y CONFIG_E1000=y diff --git a/configs/igep0032_defconfig b/configs/igep0032_defconfig index ace2f64f6f..ac17895aa5 100644 --- a/configs/igep0032_defconfig +++ b/configs/igep0032_defconfig @@ -30,7 +30,6 @@ CONFIG_CMD_UBI=y # CONFIG_CMD_UBIFS is not set CONFIG_NET_RANDOM_ETHADDR=y CONFIG_MMC_OMAP_HS=y -CONFIG_NAND=y CONFIG_SYS_NAND_BUSWIDTH_16BIT=y CONFIG_SPL_NAND_SIMPLE=y CONFIG_NETDEVICES=y diff --git a/configs/igep00x0_defconfig b/configs/igep00x0_defconfig index 5b3d24d066..89954d0c6f 100644 --- a/configs/igep00x0_defconfig +++ b/configs/igep00x0_defconfig @@ -30,7 +30,6 @@ CONFIG_CMD_UBI=y # CONFIG_CMD_UBIFS is not set CONFIG_NET_RANDOM_ETHADDR=y CONFIG_MMC_OMAP_HS=y -CONFIG_NAND=y CONFIG_SYS_NAND_BUSWIDTH_16BIT=y CONFIG_SPL_NAND_SIMPLE=y CONFIG_MTD_UBI_FASTMAP=y diff --git a/configs/imx6q_logic_defconfig b/configs/imx6q_logic_defconfig index f0974bfa15..5a20edf237 100644 --- a/configs/imx6q_logic_defconfig +++ b/configs/imx6q_logic_defconfig @@ -15,6 +15,7 @@ CONFIG_CMD_MEMTEST=y CONFIG_CMD_GPIO=y CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y +CONFIG_CMD_NAND=y CONFIG_CMD_NAND_TRIMFFS=y CONFIG_CMD_CACHE=y CONFIG_CMD_PMIC=y @@ -25,10 +26,11 @@ CONFIG_MTDIDS_DEFAULT="nand0=gpmi-nand" CONFIG_MTDPARTS_DEFAULT="mtdparts=gpmi-nand:4m(uboot),1m(env),16m(kernel),1m(dtb),-(fs)" CONFIG_ENV_IS_IN_NAND=y CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_APBH_DMA=y +CONFIG_APBH_DMA_BURST=y +CONFIG_APBH_DMA_BURST8=y CONFIG_SYS_I2C_MXC=y CONFIG_FSL_ESDHC=y -CONFIG_NAND=y -CONFIG_NAND_MXS=y CONFIG_PHYLIB=y CONFIG_PHY_SMSC=y CONFIG_FEC_MXC=y diff --git a/configs/ipam390_defconfig b/configs/ipam390_defconfig index d1a6e542cb..5ce7c9f296 100644 --- a/configs/ipam390_defconfig +++ b/configs/ipam390_defconfig @@ -34,6 +34,5 @@ CONFIG_CMD_DIAG=y CONFIG_CMD_UBI=y CONFIG_ENV_IS_IN_NAND=y # CONFIG_MMC is not set -CONFIG_NAND=y CONFIG_NAND_DAVINCI=y CONFIG_SYS_NS16550=y diff --git a/configs/k2e_evm_defconfig b/configs/k2e_evm_defconfig index c5bb84a8d6..50462f1d34 100644 --- a/configs/k2e_evm_defconfig +++ b/configs/k2e_evm_defconfig @@ -36,7 +36,6 @@ CONFIG_NET_RANDOM_ETHADDR=y CONFIG_DM=y CONFIG_TI_AEMIF=y # CONFIG_MMC is not set -CONFIG_NAND=y CONFIG_NAND_DAVINCI=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y diff --git a/configs/k2e_hs_evm_defconfig b/configs/k2e_hs_evm_defconfig index a86eeb8b14..106baf6046 100644 --- a/configs/k2e_hs_evm_defconfig +++ b/configs/k2e_hs_evm_defconfig @@ -29,7 +29,6 @@ CONFIG_NET_RANDOM_ETHADDR=y CONFIG_DM=y CONFIG_TI_AEMIF=y # CONFIG_MMC is not set -CONFIG_NAND=y CONFIG_NAND_DAVINCI=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y diff --git a/configs/k2hk_evm_defconfig b/configs/k2hk_evm_defconfig index 942e44e7a9..378ed5367b 100644 --- a/configs/k2hk_evm_defconfig +++ b/configs/k2hk_evm_defconfig @@ -36,7 +36,6 @@ CONFIG_NET_RANDOM_ETHADDR=y CONFIG_DM=y CONFIG_TI_AEMIF=y # CONFIG_MMC is not set -CONFIG_NAND=y CONFIG_NAND_DAVINCI=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y diff --git a/configs/k2hk_hs_evm_defconfig b/configs/k2hk_hs_evm_defconfig index 12be37f0b7..df6bcec110 100644 --- a/configs/k2hk_hs_evm_defconfig +++ b/configs/k2hk_hs_evm_defconfig @@ -29,7 +29,6 @@ CONFIG_NET_RANDOM_ETHADDR=y CONFIG_DM=y CONFIG_TI_AEMIF=y # CONFIG_MMC is not set -CONFIG_NAND=y CONFIG_NAND_DAVINCI=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y diff --git a/configs/k2l_evm_defconfig b/configs/k2l_evm_defconfig index 5381e9f7cc..6eef497192 100644 --- a/configs/k2l_evm_defconfig +++ b/configs/k2l_evm_defconfig @@ -36,7 +36,6 @@ CONFIG_NET_RANDOM_ETHADDR=y CONFIG_DM=y CONFIG_TI_AEMIF=y # CONFIG_MMC is not set -CONFIG_NAND=y CONFIG_NAND_DAVINCI=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y diff --git a/configs/k2l_hs_evm_defconfig b/configs/k2l_hs_evm_defconfig index 0381a7240c..565762e968 100644 --- a/configs/k2l_hs_evm_defconfig +++ b/configs/k2l_hs_evm_defconfig @@ -28,7 +28,6 @@ CONFIG_NET_RANDOM_ETHADDR=y CONFIG_DM=y CONFIG_TI_AEMIF=y # CONFIG_MMC is not set -CONFIG_NAND=y CONFIG_NAND_DAVINCI=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y diff --git a/configs/mcx_defconfig b/configs/mcx_defconfig index e14780927c..6a0bf4ff5b 100644 --- a/configs/mcx_defconfig +++ b/configs/mcx_defconfig @@ -34,7 +34,6 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=omap2-nand.0:512k(MLO),1m(u-boot),256k(env1),2 CONFIG_CMD_UBI=y CONFIG_ENV_IS_IN_NAND=y CONFIG_MMC_OMAP_HS=y -CONFIG_NAND=y CONFIG_SYS_NAND_BUSWIDTH_16BIT=y CONFIG_SPL_NAND_SIMPLE=y CONFIG_CONS_INDEX=3 diff --git a/configs/meesc_defconfig b/configs/meesc_defconfig index a009b25789..7698b4c495 100644 --- a/configs/meesc_defconfig +++ b/configs/meesc_defconfig @@ -25,7 +25,6 @@ CONFIG_CLK_AT91=y CONFIG_DM_GPIO=y CONFIG_AT91_GPIO=y # CONFIG_MMC is not set -CONFIG_NAND=y CONFIG_NAND_ATMEL=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y diff --git a/configs/mt_ventoux_defconfig b/configs/mt_ventoux_defconfig index 81ed01e61d..b9fa17be3f 100644 --- a/configs/mt_ventoux_defconfig +++ b/configs/mt_ventoux_defconfig @@ -34,7 +34,6 @@ CONFIG_FPGA_XILINX=y CONFIG_FPGA_SPARTAN3=y CONFIG_SYS_OMAP24_I2C_SPEED=400000 CONFIG_MMC_OMAP_HS=y -CONFIG_NAND=y CONFIG_SYS_NAND_BUSWIDTH_16BIT=y CONFIG_SPL_NAND_SIMPLE=y CONFIG_SYS_NS16550=y diff --git a/configs/mx28evk_auart_console_defconfig b/configs/mx28evk_auart_console_defconfig index 69089a5d6c..bca9870c5e 100644 --- a/configs/mx28evk_auart_console_defconfig +++ b/configs/mx28evk_auart_console_defconfig @@ -19,6 +19,7 @@ CONFIG_CMD_BOOTZ=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_GPIO=y CONFIG_CMD_MMC=y +CONFIG_CMD_NAND=y CONFIG_CMD_NAND_TRIMFFS=y CONFIG_CMD_SF=y CONFIG_CMD_SPI=y @@ -38,8 +39,6 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=gpmi-nand:3m(bootloader)ro,512k(environment),5 CONFIG_CMD_UBI=y CONFIG_ENV_IS_IN_MMC=y CONFIG_MMC_MXS=y -CONFIG_NAND=y -CONFIG_NAND_MXS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_SST=y CONFIG_CONS_INDEX=0 diff --git a/configs/mx28evk_defconfig b/configs/mx28evk_defconfig index aa51974e7d..cbe639e718 100644 --- a/configs/mx28evk_defconfig +++ b/configs/mx28evk_defconfig @@ -19,6 +19,7 @@ CONFIG_CMD_BOOTZ=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_GPIO=y CONFIG_CMD_MMC=y +CONFIG_CMD_NAND=y CONFIG_CMD_NAND_TRIMFFS=y CONFIG_CMD_SF=y CONFIG_CMD_SPI=y @@ -38,8 +39,6 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=gpmi-nand:3m(bootloader)ro,512k(environment),5 CONFIG_CMD_UBI=y CONFIG_ENV_IS_IN_MMC=y CONFIG_MMC_MXS=y -CONFIG_NAND=y -CONFIG_NAND_MXS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_SST=y CONFIG_CONS_INDEX=0 diff --git a/configs/mx28evk_nand_defconfig b/configs/mx28evk_nand_defconfig index e0e328589b..475d9f2a38 100644 --- a/configs/mx28evk_nand_defconfig +++ b/configs/mx28evk_nand_defconfig @@ -18,6 +18,7 @@ CONFIG_CMD_BOOTZ=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_GPIO=y CONFIG_CMD_MMC=y +CONFIG_CMD_NAND=y CONFIG_CMD_NAND_TRIMFFS=y CONFIG_CMD_SF=y CONFIG_CMD_SPI=y @@ -37,8 +38,6 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=gpmi-nand:3m(bootloader)ro,512k(environment),5 CONFIG_CMD_UBI=y CONFIG_ENV_IS_IN_NAND=y CONFIG_MMC_MXS=y -CONFIG_NAND=y -CONFIG_NAND_MXS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_SST=y CONFIG_CONS_INDEX=0 diff --git a/configs/mx28evk_spi_defconfig b/configs/mx28evk_spi_defconfig index 0b6c27f4cd..1cd09fe297 100644 --- a/configs/mx28evk_spi_defconfig +++ b/configs/mx28evk_spi_defconfig @@ -18,6 +18,7 @@ CONFIG_CMD_BOOTZ=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_GPIO=y CONFIG_CMD_MMC=y +CONFIG_CMD_NAND=y CONFIG_CMD_NAND_TRIMFFS=y CONFIG_CMD_SF=y CONFIG_CMD_SPI=y @@ -37,8 +38,6 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=gpmi-nand:3m(bootloader)ro,512k(environment),5 CONFIG_CMD_UBI=y CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_MMC_MXS=y -CONFIG_NAND=y -CONFIG_NAND_MXS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_SST=y CONFIG_CONS_INDEX=0 diff --git a/configs/mx6sabreauto_defconfig b/configs/mx6sabreauto_defconfig index 66507f31ec..903e62d5a3 100644 --- a/configs/mx6sabreauto_defconfig +++ b/configs/mx6sabreauto_defconfig @@ -25,6 +25,7 @@ CONFIG_CMD_DFU=y CONFIG_CMD_GPIO=y CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y +CONFIG_CMD_NAND=y CONFIG_CMD_NAND_TRIMFFS=y CONFIG_CMD_PART=y CONFIG_CMD_SF=y @@ -42,9 +43,10 @@ CONFIG_ENV_IS_IN_MMC=y CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y CONFIG_DFU_MMC=y CONFIG_DFU_SF=y +CONFIG_APBH_DMA=y +CONFIG_APBH_DMA_BURST=y +CONFIG_APBH_DMA_BURST8=y CONFIG_FSL_ESDHC=y -CONFIG_NAND=y -CONFIG_NAND_MXS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_PHYLIB=y diff --git a/configs/mx6sxsabreauto_defconfig b/configs/mx6sxsabreauto_defconfig index be95cc0916..66295e2ed3 100644 --- a/configs/mx6sxsabreauto_defconfig +++ b/configs/mx6sxsabreauto_defconfig @@ -12,6 +12,7 @@ CONFIG_CMD_BOOTZ=y CONFIG_CMD_GPIO=y CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y +CONFIG_CMD_NAND=y CONFIG_CMD_NAND_TRIMFFS=y CONFIG_CMD_SF=y CONFIG_CMD_USB=y @@ -28,13 +29,14 @@ CONFIG_CMD_EXT4_WRITE=y CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y CONFIG_OF_CONTROL=y +CONFIG_APBH_DMA=y +CONFIG_APBH_DMA_BURST=y +CONFIG_APBH_DMA_BURST8=y CONFIG_DM_GPIO=y CONFIG_DM_PCA953X=y CONFIG_DM_I2C=y CONFIG_DM_MMC=y CONFIG_FSL_ESDHC=y -CONFIG_NAND=y -CONFIG_NAND_MXS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_BAR=y CONFIG_SPI_FLASH_STMICRO=y diff --git a/configs/omap3_beagle_defconfig b/configs/omap3_beagle_defconfig index a37a38f881..2f5a7f60e2 100644 --- a/configs/omap3_beagle_defconfig +++ b/configs/omap3_beagle_defconfig @@ -52,7 +52,6 @@ CONFIG_LED_STATUS_GREEN_ENABLE=y CONFIG_LED_STATUS_GREEN=2 CONFIG_LED_STATUS_CMD=y CONFIG_MMC_OMAP_HS=y -CONFIG_NAND=y CONFIG_SYS_NAND_BUSWIDTH_16BIT=y CONFIG_SYS_NAND_U_BOOT_LOCATIONS=y CONFIG_SYS_NAND_U_BOOT_OFFS=0x80000 diff --git a/configs/omap3_evm_defconfig b/configs/omap3_evm_defconfig index cd517b418d..3432378752 100644 --- a/configs/omap3_evm_defconfig +++ b/configs/omap3_evm_defconfig @@ -39,7 +39,6 @@ CONFIG_SPL_DM=y CONFIG_USB_FUNCTION_FASTBOOT=y CONFIG_FASTBOOT_BUF_ADDR=0x82000000 CONFIG_MMC_OMAP_HS=y -CONFIG_NAND=y CONFIG_SYS_NAND_BUSWIDTH_16BIT=y CONFIG_SYS_NAND_U_BOOT_LOCATIONS=y CONFIG_SYS_NAND_U_BOOT_OFFS=0x80000 diff --git a/configs/omap3_ha_defconfig b/configs/omap3_ha_defconfig index e4b16c6872..8cbbef5fbb 100644 --- a/configs/omap3_ha_defconfig +++ b/configs/omap3_ha_defconfig @@ -25,7 +25,6 @@ CONFIG_MTDIDS_DEFAULT="nand0=nand" CONFIG_MTDPARTS_DEFAULT="mtdparts=nand:512k(x-loader),1920k(u-boot),128k(u-boot-env),4m(kernel),-(fs)" CONFIG_ENV_IS_IN_NAND=y CONFIG_MMC_OMAP_HS=y -CONFIG_NAND=y CONFIG_SYS_NAND_BUSWIDTH_16BIT=y CONFIG_SPL_NAND_SIMPLE=y CONFIG_CONS_INDEX=3 diff --git a/configs/omap3_logic_defconfig b/configs/omap3_logic_defconfig index cd8ffd5adf..0cf42cfffb 100644 --- a/configs/omap3_logic_defconfig +++ b/configs/omap3_logic_defconfig @@ -37,7 +37,6 @@ CONFIG_DM_I2C=y CONFIG_DM_MMC=y CONFIG_MMC_OMAP_HS=y CONFIG_MMC_OMAP36XX_PINS=y -CONFIG_NAND=y CONFIG_SYS_NAND_BUSWIDTH_16BIT=y CONFIG_SYS_NAND_U_BOOT_LOCATIONS=y CONFIG_SYS_NAND_U_BOOT_OFFS=0x80000 diff --git a/configs/omap3_overo_defconfig b/configs/omap3_overo_defconfig index 21aaa03b34..49b0f46834 100644 --- a/configs/omap3_overo_defconfig +++ b/configs/omap3_overo_defconfig @@ -31,7 +31,6 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=omap2-nand.0:512k(xloader),1792k(u-boot),256k( CONFIG_CMD_UBI=y CONFIG_ENV_IS_IN_NAND=y CONFIG_MMC_OMAP_HS=y -CONFIG_NAND=y CONFIG_SYS_NAND_BUSWIDTH_16BIT=y CONFIG_SPL_NAND_SIMPLE=y CONFIG_NETDEVICES=y diff --git a/configs/omap3_pandora_defconfig b/configs/omap3_pandora_defconfig index a2cb46e6b8..5d5334feff 100644 --- a/configs/omap3_pandora_defconfig +++ b/configs/omap3_pandora_defconfig @@ -25,7 +25,6 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=omap2-nand.0:512k(xloader),1920k(uboot),128k(u CONFIG_CMD_UBI=y CONFIG_ENV_IS_IN_NAND=y CONFIG_MMC_OMAP_HS=y -CONFIG_NAND=y CONFIG_SYS_NAND_BUSWIDTH_16BIT=y CONFIG_CONS_INDEX=3 CONFIG_SYS_NS16550=y diff --git a/configs/omap3_zoom1_defconfig b/configs/omap3_zoom1_defconfig index 4ca55cb531..b9e6f34986 100644 --- a/configs/omap3_zoom1_defconfig +++ b/configs/omap3_zoom1_defconfig @@ -22,7 +22,6 @@ CONFIG_MTDIDS_DEFAULT="nand0=nand" CONFIG_MTDPARTS_DEFAULT="mtdparts=nand:512k(x-loader),1920k(u-boot),128k(u-boot-env),4m(kernel),-(fs)" CONFIG_ENV_IS_IN_NAND=y CONFIG_MMC_OMAP_HS=y -CONFIG_NAND=y CONFIG_SYS_NAND_BUSWIDTH_16BIT=y CONFIG_NETDEVICES=y CONFIG_SMC911X=y diff --git a/configs/omapl138_lcdk_defconfig b/configs/omapl138_lcdk_defconfig index 4a97269dd4..9c30d41bea 100644 --- a/configs/omapl138_lcdk_defconfig +++ b/configs/omapl138_lcdk_defconfig @@ -34,7 +34,6 @@ CONFIG_NET_RANDOM_ETHADDR=y CONFIG_DM=y CONFIG_DM_I2C=y CONFIG_DM_I2C_COMPAT=y -CONFIG_NAND=y CONFIG_NAND_DAVINCI=y CONFIG_SYS_NAND_BUSWIDTH_16BIT=y CONFIG_SYS_NAND_U_BOOT_LOCATIONS=y diff --git a/configs/pcm052_defconfig b/configs/pcm052_defconfig index 0b3d93eee9..b6dc2d2847 100644 --- a/configs/pcm052_defconfig +++ b/configs/pcm052_defconfig @@ -14,6 +14,7 @@ CONFIG_CMD_MEMTEST=y CONFIG_CMD_GPIO=y CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y +CONFIG_CMD_NAND=y CONFIG_CMD_NAND_TRIMFFS=y CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y @@ -29,8 +30,6 @@ CONFIG_DM=y CONFIG_DM_GPIO=y CONFIG_VYBRID_GPIO=y CONFIG_FSL_ESDHC=y -CONFIG_NAND_VF610_NFC=y -CONFIG_SYS_NAND_BUSWIDTH_16BIT=y CONFIG_PHYLIB=y CONFIG_PHY_MICREL=y CONFIG_DM_SERIAL=y diff --git a/configs/pcm058_defconfig b/configs/pcm058_defconfig index 6318a6a83c..b129c0a07b 100644 --- a/configs/pcm058_defconfig +++ b/configs/pcm058_defconfig @@ -29,6 +29,7 @@ CONFIG_SPL_YMODEM_SUPPORT=y CONFIG_CMD_GPIO=y CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y +CONFIG_CMD_NAND=y CONFIG_CMD_NAND_TRIMFFS=y CONFIG_CMD_SF=y CONFIG_CMD_CACHE=y @@ -39,10 +40,11 @@ CONFIG_CMD_UBI=y # CONFIG_SPL_PARTITION_UUIDS is not set CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_DM=y +CONFIG_APBH_DMA=y +CONFIG_APBH_DMA_BURST=y +CONFIG_APBH_DMA_BURST8=y CONFIG_FSL_ESDHC=y CONFIG_MTD=y -CONFIG_NAND=y -CONFIG_NAND_MXS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_PHYLIB=y diff --git a/configs/pengwyn_defconfig b/configs/pengwyn_defconfig index 76b5715a99..15f267a46e 100644 --- a/configs/pengwyn_defconfig +++ b/configs/pengwyn_defconfig @@ -37,8 +37,8 @@ CONFIG_CMD_MMC=y CONFIG_CMD_NAND=y CONFIG_CMD_SPI=y CONFIG_CMD_USB=y -CONFIG_CMD_WOL=y # CONFIG_CMD_SETEXPR is not set +CONFIG_CMD_WOL=y CONFIG_CMD_EXT4_WRITE=y CONFIG_CMD_MTDPARTS=y CONFIG_MTDIDS_DEFAULT="nand0=omap2-nand.0" @@ -47,7 +47,6 @@ CONFIG_CMD_DIAG=y CONFIG_ENV_IS_IN_NAND=y CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y CONFIG_MMC_OMAP_HS=y -CONFIG_NAND=y CONFIG_DRIVER_TI_CPSW=y CONFIG_SYS_NS16550=y CONFIG_SPI=y diff --git a/configs/pfla02_defconfig b/configs/pfla02_defconfig index 0a03854e70..94dcb59068 100644 --- a/configs/pfla02_defconfig +++ b/configs/pfla02_defconfig @@ -29,7 +29,6 @@ CONFIG_SPL_YMODEM_SUPPORT=y CONFIG_CMD_GPIO=y CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y -# CONFIG_CMD_NAND is not set CONFIG_CMD_SF=y CONFIG_CMD_CACHE=y CONFIG_CMD_EXT4_WRITE=y @@ -38,10 +37,12 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=gpmi-nand:-(nand);spi2.0:1024k(bootloader),64k CONFIG_CMD_UBI=y # CONFIG_SPL_PARTITION_UUIDS is not set CONFIG_DM=y +CONFIG_APBH_DMA=y +CONFIG_APBH_DMA_BURST=y +CONFIG_APBH_DMA_BURST8=y CONFIG_FSL_ESDHC=y CONFIG_MTD=y CONFIG_NAND=y -CONFIG_NAND_MXS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_PHYLIB=y diff --git a/configs/platinum_picon_defconfig b/configs/platinum_picon_defconfig index 3dc70ec550..b64cb947de 100644 --- a/configs/platinum_picon_defconfig +++ b/configs/platinum_picon_defconfig @@ -25,6 +25,7 @@ CONFIG_CMD_BOOTZ=y CONFIG_CMD_GPIO=y CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y +CONFIG_CMD_NAND=y CONFIG_CMD_NAND_TRIMFFS=y CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set @@ -42,9 +43,10 @@ CONFIG_MTDIDS_DEFAULT="nand0=gpmi-nand" CONFIG_MTDPARTS_DEFAULT="mtdparts=gpmi-nand:14M(spl),2M(uboot),512k(env1),512k(env2),495M(ubi0),14M(res0),2M(res1),512k(res2),512k(res3),-(ubi1)" CONFIG_CMD_UBI=y CONFIG_ENV_IS_IN_NAND=y +CONFIG_APBH_DMA=y +CONFIG_APBH_DMA_BURST=y +CONFIG_APBH_DMA_BURST8=y CONFIG_FSL_ESDHC=y -CONFIG_NAND=y -CONFIG_NAND_MXS=y CONFIG_PHYLIB=y CONFIG_USB=y CONFIG_USB_STORAGE=y diff --git a/configs/platinum_titanium_defconfig b/configs/platinum_titanium_defconfig index 63123c3081..6bf0d4d059 100644 --- a/configs/platinum_titanium_defconfig +++ b/configs/platinum_titanium_defconfig @@ -25,6 +25,7 @@ CONFIG_CMD_BOOTZ=y CONFIG_CMD_GPIO=y CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y +CONFIG_CMD_NAND=y CONFIG_CMD_NAND_TRIMFFS=y CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set @@ -42,9 +43,10 @@ CONFIG_MTDIDS_DEFAULT="nand0=gpmi-nand" CONFIG_MTDPARTS_DEFAULT="mtdparts=gpmi-nand:14M(spl),2M(uboot),512k(env1),512k(env2),-(ubi)" CONFIG_CMD_UBI=y CONFIG_ENV_IS_IN_NAND=y +CONFIG_APBH_DMA=y +CONFIG_APBH_DMA_BURST=y +CONFIG_APBH_DMA_BURST8=y CONFIG_FSL_ESDHC=y -CONFIG_NAND=y -CONFIG_NAND_MXS=y CONFIG_PHYLIB=y CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ90X1=y diff --git a/configs/pm9261_defconfig b/configs/pm9261_defconfig index 1afa7807a1..6b1d81285a 100644 --- a/configs/pm9261_defconfig +++ b/configs/pm9261_defconfig @@ -35,7 +35,6 @@ CONFIG_DM_GPIO=y CONFIG_AT91_GPIO=y # CONFIG_MMC is not set CONFIG_MTD_NOR_FLASH=y -CONFIG_NAND=y CONFIG_NAND_ATMEL=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y diff --git a/configs/pm9263_defconfig b/configs/pm9263_defconfig index 836563864a..f212c1e0fb 100644 --- a/configs/pm9263_defconfig +++ b/configs/pm9263_defconfig @@ -35,7 +35,6 @@ CONFIG_DM_GPIO=y CONFIG_AT91_GPIO=y # CONFIG_MMC is not set CONFIG_MTD_NOR_FLASH=y -CONFIG_NAND=y CONFIG_NAND_ATMEL=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y diff --git a/configs/pm9g45_defconfig b/configs/pm9g45_defconfig index 99acd20917..b8f55ab18b 100644 --- a/configs/pm9g45_defconfig +++ b/configs/pm9g45_defconfig @@ -21,7 +21,6 @@ CONFIG_CMD_CACHE=y CONFIG_CMD_JFFS2=y CONFIG_ENV_IS_IN_NAND=y # CONFIG_MMC is not set -CONFIG_NAND=y CONFIG_NAND_ATMEL=y CONFIG_USB=y CONFIG_USB_STORAGE=y diff --git a/configs/pxm2_defconfig b/configs/pxm2_defconfig index 459f8fe48e..5229acc9b2 100644 --- a/configs/pxm2_defconfig +++ b/configs/pxm2_defconfig @@ -60,7 +60,6 @@ CONFIG_BOOTCOUNT_LIMIT=y CONFIG_BOOTCOUNT_ENV=y CONFIG_DFU_NAND=y CONFIG_MMC_OMAP_HS=y -CONFIG_NAND=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_WINBOND=y CONFIG_MTD_UBI_FASTMAP=y diff --git a/configs/rastaban_defconfig b/configs/rastaban_defconfig index 7fdd6ddc56..ce7eb0947f 100644 --- a/configs/rastaban_defconfig +++ b/configs/rastaban_defconfig @@ -58,7 +58,6 @@ CONFIG_BOOTCOUNT_LIMIT=y CONFIG_BOOTCOUNT_ENV=y CONFIG_DFU_NAND=y CONFIG_MMC_OMAP_HS=y -CONFIG_NAND=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_WINBOND=y CONFIG_MTD_UBI_FASTMAP=y diff --git a/configs/rut_defconfig b/configs/rut_defconfig index 07710d272d..53ab8dc690 100644 --- a/configs/rut_defconfig +++ b/configs/rut_defconfig @@ -61,7 +61,6 @@ CONFIG_BOOTCOUNT_LIMIT=y CONFIG_BOOTCOUNT_ENV=y CONFIG_DFU_NAND=y CONFIG_MMC_OMAP_HS=y -CONFIG_NAND=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_WINBOND=y CONFIG_MTD_UBI_FASTMAP=y diff --git a/configs/sama5d2_ptc_ek_mmc_defconfig b/configs/sama5d2_ptc_ek_mmc_defconfig index 27606be8ba..c4a6fdfae7 100644 --- a/configs/sama5d2_ptc_ek_mmc_defconfig +++ b/configs/sama5d2_ptc_ek_mmc_defconfig @@ -45,7 +45,6 @@ CONFIG_I2C_EEPROM=y CONFIG_DM_MMC=y CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_ATMEL=y -CONFIG_NAND=y CONFIG_NAND_ATMEL=y CONFIG_DM_ETH=y CONFIG_MACB=y diff --git a/configs/sama5d36ek_cmp_mmc_defconfig b/configs/sama5d36ek_cmp_mmc_defconfig index 4ec6f4ee46..fdacfea04c 100644 --- a/configs/sama5d36ek_cmp_mmc_defconfig +++ b/configs/sama5d36ek_cmp_mmc_defconfig @@ -40,7 +40,6 @@ CONFIG_DM_GPIO=y CONFIG_AT91_GPIO=y CONFIG_DM_MMC=y CONFIG_GENERIC_ATMEL_MCI=y -CONFIG_NAND=y CONFIG_NAND_ATMEL=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y diff --git a/configs/sama5d36ek_cmp_spiflash_defconfig b/configs/sama5d36ek_cmp_spiflash_defconfig index 157c3aefc9..c38f00cb9c 100644 --- a/configs/sama5d36ek_cmp_spiflash_defconfig +++ b/configs/sama5d36ek_cmp_spiflash_defconfig @@ -40,7 +40,6 @@ CONFIG_DM_GPIO=y CONFIG_AT91_GPIO=y CONFIG_DM_MMC=y CONFIG_GENERIC_ATMEL_MCI=y -CONFIG_NAND=y CONFIG_NAND_ATMEL=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y diff --git a/configs/sama5d3_xplained_mmc_defconfig b/configs/sama5d3_xplained_mmc_defconfig index 3e8cf67819..e5b32371d7 100644 --- a/configs/sama5d3_xplained_mmc_defconfig +++ b/configs/sama5d3_xplained_mmc_defconfig @@ -57,7 +57,6 @@ CONFIG_DM_GPIO=y CONFIG_AT91_GPIO=y CONFIG_DM_MMC=y CONFIG_GENERIC_ATMEL_MCI=y -CONFIG_NAND=y CONFIG_NAND_ATMEL=y CONFIG_DM_ETH=y CONFIG_MACB=y diff --git a/configs/sama5d3xek_mmc_defconfig b/configs/sama5d3xek_mmc_defconfig index dcc7ed868c..989a9bfc9d 100644 --- a/configs/sama5d3xek_mmc_defconfig +++ b/configs/sama5d3xek_mmc_defconfig @@ -61,7 +61,6 @@ CONFIG_AT91_GPIO=y CONFIG_DM_MMC=y CONFIG_GENERIC_ATMEL_MCI=y CONFIG_MTD_NOR_FLASH=y -CONFIG_NAND=y CONFIG_NAND_ATMEL=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y diff --git a/configs/sama5d3xek_spiflash_defconfig b/configs/sama5d3xek_spiflash_defconfig index be95e25edd..f714d0820e 100644 --- a/configs/sama5d3xek_spiflash_defconfig +++ b/configs/sama5d3xek_spiflash_defconfig @@ -56,7 +56,6 @@ CONFIG_AT91_GPIO=y CONFIG_DM_MMC=y CONFIG_GENERIC_ATMEL_MCI=y CONFIG_MTD_NOR_FLASH=y -CONFIG_NAND=y CONFIG_NAND_ATMEL=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y diff --git a/configs/sama5d4_xplained_mmc_defconfig b/configs/sama5d4_xplained_mmc_defconfig index 3b756b1e21..7830eedf0d 100644 --- a/configs/sama5d4_xplained_mmc_defconfig +++ b/configs/sama5d4_xplained_mmc_defconfig @@ -55,7 +55,6 @@ CONFIG_SYS_I2C_AT91=y CONFIG_I2C_EEPROM=y CONFIG_DM_MMC=y CONFIG_GENERIC_ATMEL_MCI=y -CONFIG_NAND=y CONFIG_NAND_ATMEL=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y diff --git a/configs/sama5d4_xplained_spiflash_defconfig b/configs/sama5d4_xplained_spiflash_defconfig index 18ed099f18..968b274030 100644 --- a/configs/sama5d4_xplained_spiflash_defconfig +++ b/configs/sama5d4_xplained_spiflash_defconfig @@ -55,7 +55,6 @@ CONFIG_SYS_I2C_AT91=y CONFIG_I2C_EEPROM=y CONFIG_DM_MMC=y CONFIG_GENERIC_ATMEL_MCI=y -CONFIG_NAND=y CONFIG_NAND_ATMEL=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y diff --git a/configs/sama5d4ek_mmc_defconfig b/configs/sama5d4ek_mmc_defconfig index 86e5db6e6b..89d8dc8bd9 100644 --- a/configs/sama5d4ek_mmc_defconfig +++ b/configs/sama5d4ek_mmc_defconfig @@ -55,7 +55,6 @@ CONFIG_DM_GPIO=y CONFIG_AT91_GPIO=y CONFIG_DM_MMC=y CONFIG_GENERIC_ATMEL_MCI=y -CONFIG_NAND=y CONFIG_NAND_ATMEL=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y diff --git a/configs/sama5d4ek_spiflash_defconfig b/configs/sama5d4ek_spiflash_defconfig index 9dc639c38d..6c8d025cdc 100644 --- a/configs/sama5d4ek_spiflash_defconfig +++ b/configs/sama5d4ek_spiflash_defconfig @@ -52,7 +52,6 @@ CONFIG_DM_GPIO=y CONFIG_AT91_GPIO=y CONFIG_DM_MMC=y CONFIG_GENERIC_ATMEL_MCI=y -CONFIG_NAND=y CONFIG_NAND_ATMEL=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y diff --git a/configs/sheevaplug_defconfig b/configs/sheevaplug_defconfig index d77d198f18..d27698fcce 100644 --- a/configs/sheevaplug_defconfig +++ b/configs/sheevaplug_defconfig @@ -1,4 +1,5 @@ CONFIG_ARM=y +CONFIG_SYS_THUMB_BUILD=y CONFIG_KIRKWOOD=y CONFIG_SYS_TEXT_BASE=0x600000 CONFIG_TARGET_SHEEVAPLUG=y @@ -36,4 +37,3 @@ CONFIG_USB=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_STORAGE=y CONFIG_LZMA=y -CONFIG_SYS_THUMB_BUILD=y diff --git a/configs/smartweb_defconfig b/configs/smartweb_defconfig index bb9feed094..991f324024 100644 --- a/configs/smartweb_defconfig +++ b/configs/smartweb_defconfig @@ -43,7 +43,6 @@ CONFIG_CLK=y CONFIG_CLK_AT91=y CONFIG_DFU_NAND=y # CONFIG_MMC is not set -CONFIG_NAND=y CONFIG_NAND_ATMEL=y CONFIG_PHYLIB=y CONFIG_USB=y diff --git a/configs/snapper9260_defconfig b/configs/snapper9260_defconfig index e707311069..74b0e46204 100644 --- a/configs/snapper9260_defconfig +++ b/configs/snapper9260_defconfig @@ -27,7 +27,6 @@ CONFIG_CMD_FAT=y CONFIG_ENV_IS_IN_NAND=y CONFIG_CMD_PCA953X=y # CONFIG_MMC is not set -CONFIG_NAND=y CONFIG_NAND_ATMEL=y CONFIG_USB=y CONFIG_USB_STORAGE=y diff --git a/configs/snapper9g20_defconfig b/configs/snapper9g20_defconfig index 073e855f71..1f6fc134c4 100644 --- a/configs/snapper9g20_defconfig +++ b/configs/snapper9g20_defconfig @@ -26,7 +26,6 @@ CONFIG_CMD_FAT=y CONFIG_ENV_IS_IN_NAND=y CONFIG_CMD_PCA953X=y # CONFIG_MMC is not set -CONFIG_NAND=y CONFIG_NAND_ATMEL=y CONFIG_USB=y CONFIG_USB_STORAGE=y diff --git a/configs/spear300_nand_defconfig b/configs/spear300_nand_defconfig index c28633a013..2d21069f6d 100644 --- a/configs/spear300_nand_defconfig +++ b/configs/spear300_nand_defconfig @@ -20,7 +20,6 @@ CONFIG_ENV_IS_IN_NAND=y CONFIG_SYS_I2C_DW=y # CONFIG_MMC is not set CONFIG_MTD_NOR_FLASH=y -CONFIG_NAND=y CONFIG_NETDEVICES=y CONFIG_PHY_GIGE=y CONFIG_ETH_DESIGNWARE=y diff --git a/configs/spear300_usbtty_nand_defconfig b/configs/spear300_usbtty_nand_defconfig index f1a1ec6978..7cbb7efe3c 100644 --- a/configs/spear300_usbtty_nand_defconfig +++ b/configs/spear300_usbtty_nand_defconfig @@ -20,7 +20,6 @@ CONFIG_ENV_IS_IN_NAND=y CONFIG_SYS_I2C_DW=y # CONFIG_MMC is not set CONFIG_MTD_NOR_FLASH=y -CONFIG_NAND=y CONFIG_NETDEVICES=y CONFIG_PHY_GIGE=y CONFIG_ETH_DESIGNWARE=y diff --git a/configs/spear310_nand_defconfig b/configs/spear310_nand_defconfig index 4737bb5b25..717d011640 100644 --- a/configs/spear310_nand_defconfig +++ b/configs/spear310_nand_defconfig @@ -20,7 +20,6 @@ CONFIG_ENV_IS_IN_NAND=y CONFIG_SYS_I2C_DW=y # CONFIG_MMC is not set CONFIG_MTD_NOR_FLASH=y -CONFIG_NAND=y CONFIG_NETDEVICES=y CONFIG_PHY_GIGE=y CONFIG_ETH_DESIGNWARE=y diff --git a/configs/spear310_usbtty_nand_defconfig b/configs/spear310_usbtty_nand_defconfig index 071ac55e8d..39e16d878f 100644 --- a/configs/spear310_usbtty_nand_defconfig +++ b/configs/spear310_usbtty_nand_defconfig @@ -20,7 +20,6 @@ CONFIG_ENV_IS_IN_NAND=y CONFIG_SYS_I2C_DW=y # CONFIG_MMC is not set CONFIG_MTD_NOR_FLASH=y -CONFIG_NAND=y CONFIG_NETDEVICES=y CONFIG_PHY_GIGE=y CONFIG_ETH_DESIGNWARE=y diff --git a/configs/spear320_nand_defconfig b/configs/spear320_nand_defconfig index 3667bf8498..d67d3c4b18 100644 --- a/configs/spear320_nand_defconfig +++ b/configs/spear320_nand_defconfig @@ -20,7 +20,6 @@ CONFIG_ENV_IS_IN_NAND=y CONFIG_SYS_I2C_DW=y # CONFIG_MMC is not set CONFIG_MTD_NOR_FLASH=y -CONFIG_NAND=y CONFIG_NETDEVICES=y CONFIG_PHY_GIGE=y CONFIG_ETH_DESIGNWARE=y diff --git a/configs/spear320_usbtty_nand_defconfig b/configs/spear320_usbtty_nand_defconfig index b39339aec9..426abd172a 100644 --- a/configs/spear320_usbtty_nand_defconfig +++ b/configs/spear320_usbtty_nand_defconfig @@ -20,7 +20,6 @@ CONFIG_ENV_IS_IN_NAND=y CONFIG_SYS_I2C_DW=y # CONFIG_MMC is not set CONFIG_MTD_NOR_FLASH=y -CONFIG_NAND=y CONFIG_NETDEVICES=y CONFIG_PHY_GIGE=y CONFIG_ETH_DESIGNWARE=y diff --git a/configs/spear600_nand_defconfig b/configs/spear600_nand_defconfig index a279ec2af2..70815e86ba 100644 --- a/configs/spear600_nand_defconfig +++ b/configs/spear600_nand_defconfig @@ -20,7 +20,6 @@ CONFIG_ENV_IS_IN_NAND=y CONFIG_SYS_I2C_DW=y # CONFIG_MMC is not set CONFIG_MTD_NOR_FLASH=y -CONFIG_NAND=y CONFIG_NETDEVICES=y CONFIG_PHY_GIGE=y CONFIG_ETH_DESIGNWARE=y diff --git a/configs/spear600_usbtty_nand_defconfig b/configs/spear600_usbtty_nand_defconfig index fef9abe19f..3f44c91ee4 100644 --- a/configs/spear600_usbtty_nand_defconfig +++ b/configs/spear600_usbtty_nand_defconfig @@ -20,7 +20,6 @@ CONFIG_ENV_IS_IN_NAND=y CONFIG_SYS_I2C_DW=y # CONFIG_MMC is not set CONFIG_MTD_NOR_FLASH=y -CONFIG_NAND=y CONFIG_NETDEVICES=y CONFIG_PHY_GIGE=y CONFIG_ETH_DESIGNWARE=y diff --git a/configs/tao3530_defconfig b/configs/tao3530_defconfig index dc26f3667d..c6c84027aa 100644 --- a/configs/tao3530_defconfig +++ b/configs/tao3530_defconfig @@ -25,7 +25,6 @@ CONFIG_MTDIDS_DEFAULT="nand0=nand" CONFIG_MTDPARTS_DEFAULT="mtdparts=nand:512k(x-loader),1920k(u-boot),128k(u-boot-env),4m(kernel),-(fs)" CONFIG_ENV_IS_IN_NAND=y CONFIG_MMC_OMAP_HS=y -CONFIG_NAND=y CONFIG_SYS_NAND_BUSWIDTH_16BIT=y CONFIG_SPL_NAND_SIMPLE=y CONFIG_CONS_INDEX=3 diff --git a/configs/taurus_defconfig b/configs/taurus_defconfig index 8680f85b98..f5f0cb84da 100644 --- a/configs/taurus_defconfig +++ b/configs/taurus_defconfig @@ -47,7 +47,6 @@ CONFIG_CLK=y CONFIG_CLK_AT91=y CONFIG_DFU_NAND=y # CONFIG_MMC is not set -CONFIG_NAND=y CONFIG_NAND_ATMEL=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y diff --git a/configs/thuban_defconfig b/configs/thuban_defconfig index 4eb58015b5..7548f4dfac 100644 --- a/configs/thuban_defconfig +++ b/configs/thuban_defconfig @@ -58,7 +58,6 @@ CONFIG_BOOTCOUNT_LIMIT=y CONFIG_BOOTCOUNT_ENV=y CONFIG_DFU_NAND=y CONFIG_MMC_OMAP_HS=y -CONFIG_NAND=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_WINBOND=y CONFIG_MTD_UBI_FASTMAP=y diff --git a/configs/ti816x_evm_defconfig b/configs/ti816x_evm_defconfig index 17d3308991..7468f40b5f 100644 --- a/configs/ti816x_evm_defconfig +++ b/configs/ti816x_evm_defconfig @@ -41,7 +41,6 @@ CONFIG_DM_GPIO=y CONFIG_DM_I2C=y CONFIG_SYS_I2C_OMAP24XX=y CONFIG_MMC_OMAP_HS=y -CONFIG_NAND=y CONFIG_SYS_NAND_BUSWIDTH_16BIT=y CONFIG_SYS_NS16550=y CONFIG_SPI=y diff --git a/configs/titanium_defconfig b/configs/titanium_defconfig index 0f658ff315..cf680e3e13 100644 --- a/configs/titanium_defconfig +++ b/configs/titanium_defconfig @@ -13,6 +13,7 @@ CONFIG_CMD_BOOTZ=y CONFIG_CMD_GPIO=y CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y +CONFIG_CMD_NAND=y CONFIG_CMD_NAND_TRIMFFS=y CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set @@ -30,9 +31,10 @@ CONFIG_MTDIDS_DEFAULT="nand0=gpmi-nand" CONFIG_MTDPARTS_DEFAULT="mtdparts=gpmi-nand:16M(uboot),512k(env1),512k(env2),-(ubi)" CONFIG_CMD_UBI=y CONFIG_ENV_IS_IN_NAND=y +CONFIG_APBH_DMA=y +CONFIG_APBH_DMA_BURST=y +CONFIG_APBH_DMA_BURST8=y CONFIG_FSL_ESDHC=y -CONFIG_NAND=y -CONFIG_NAND_MXS=y CONFIG_PHYLIB=y CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ90X1=y diff --git a/configs/tricorder_defconfig b/configs/tricorder_defconfig index f8a87a8242..1d2b602f45 100644 --- a/configs/tricorder_defconfig +++ b/configs/tricorder_defconfig @@ -34,7 +34,6 @@ CONFIG_LED_STATUS_BIT2=4 CONFIG_LED_STATUS_STATE2=2 CONFIG_LED_STATUS_CMD=y CONFIG_MMC_OMAP_HS=y -CONFIG_NAND=y CONFIG_SPL_NAND_SIMPLE=y CONFIG_CONS_INDEX=3 CONFIG_SYS_NS16550=y diff --git a/configs/tricorder_flash_defconfig b/configs/tricorder_flash_defconfig index 408814eac7..3f35b31a66 100644 --- a/configs/tricorder_flash_defconfig +++ b/configs/tricorder_flash_defconfig @@ -33,7 +33,6 @@ CONFIG_LED_STATUS_BIT2=4 CONFIG_LED_STATUS_STATE2=2 CONFIG_LED_STATUS_CMD=y CONFIG_MMC_OMAP_HS=y -CONFIG_NAND=y CONFIG_SPL_NAND_SIMPLE=y CONFIG_CONS_INDEX=3 CONFIG_SYS_NS16550=y diff --git a/configs/twister_defconfig b/configs/twister_defconfig index dffd8254fb..64a73807e3 100644 --- a/configs/twister_defconfig +++ b/configs/twister_defconfig @@ -33,7 +33,6 @@ CONFIG_CMD_UBI=y CONFIG_ENV_IS_IN_NAND=y CONFIG_SYS_OMAP24_I2C_SPEED=400000 CONFIG_MMC_OMAP_HS=y -CONFIG_NAND=y CONFIG_SYS_NAND_BUSWIDTH_16BIT=y CONFIG_SPL_NAND_SIMPLE=y CONFIG_NETDEVICES=y diff --git a/configs/usb_a9263_dataflash_defconfig b/configs/usb_a9263_dataflash_defconfig index 31712c1984..9d977aec8e 100644 --- a/configs/usb_a9263_dataflash_defconfig +++ b/configs/usb_a9263_dataflash_defconfig @@ -30,7 +30,6 @@ CONFIG_CLK_AT91=y CONFIG_DM_GPIO=y CONFIG_AT91_GPIO=y # CONFIG_MMC is not set -CONFIG_NAND=y CONFIG_NAND_ATMEL=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y diff --git a/configs/vf610twr_defconfig b/configs/vf610twr_defconfig index 833fcdfb80..c69de9c975 100644 --- a/configs/vf610twr_defconfig +++ b/configs/vf610twr_defconfig @@ -15,6 +15,7 @@ CONFIG_CMD_FUSE=y CONFIG_CMD_GPIO=y CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y +CONFIG_CMD_NAND=y CONFIG_CMD_NAND_TRIMFFS=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_DHCP=y @@ -30,8 +31,6 @@ CONFIG_DM=y CONFIG_DM_GPIO=y CONFIG_VYBRID_GPIO=y CONFIG_FSL_ESDHC=y -CONFIG_NAND_VF610_NFC=y -CONFIG_SYS_NAND_BUSWIDTH_16BIT=y CONFIG_SPI_FLASH=y CONFIG_PHYLIB=y CONFIG_PHY_MICREL=y diff --git a/configs/vf610twr_nand_defconfig b/configs/vf610twr_nand_defconfig index 7544624c9a..202c887beb 100644 --- a/configs/vf610twr_nand_defconfig +++ b/configs/vf610twr_nand_defconfig @@ -15,6 +15,7 @@ CONFIG_CMD_FUSE=y CONFIG_CMD_GPIO=y CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y +CONFIG_CMD_NAND=y CONFIG_CMD_NAND_TRIMFFS=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_DHCP=y @@ -30,8 +31,6 @@ CONFIG_DM=y CONFIG_DM_GPIO=y CONFIG_VYBRID_GPIO=y CONFIG_FSL_ESDHC=y -CONFIG_NAND_VF610_NFC=y -CONFIG_SYS_NAND_BUSWIDTH_16BIT=y CONFIG_SPI_FLASH=y CONFIG_PHYLIB=y CONFIG_PHY_MICREL=y diff --git a/configs/wb45n_defconfig b/configs/wb45n_defconfig index f52d46ebe9..c0ae60c150 100644 --- a/configs/wb45n_defconfig +++ b/configs/wb45n_defconfig @@ -23,7 +23,6 @@ CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y CONFIG_ENV_IS_IN_NAND=y -CONFIG_NAND=y CONFIG_NAND_ATMEL=y CONFIG_LZMA=y CONFIG_OF_LIBFDT=y diff --git a/configs/wb50n_defconfig b/configs/wb50n_defconfig index ea27852df7..ecb42b30f2 100644 --- a/configs/wb50n_defconfig +++ b/configs/wb50n_defconfig @@ -24,7 +24,6 @@ CONFIG_CMD_MII=y CONFIG_CMD_PING=y CONFIG_ENV_IS_IN_NAND=y CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y -CONFIG_NAND=y CONFIG_NAND_ATMEL=y CONFIG_PHYLIB=y CONFIG_PHY_MICREL=y diff --git a/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig b/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig index b614acd79e..c1cb16b4a9 100644 --- a/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig +++ b/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig @@ -32,6 +32,7 @@ CONFIG_CMD_FPGA_LOADP=y CONFIG_CMD_GPIO=y CONFIG_CMD_GPT=y CONFIG_CMD_I2C=y +CONFIG_CMD_NAND=y CONFIG_CMD_NAND_LOCK_UNLOCK=y CONFIG_CMD_USB=y CONFIG_CMD_TFTPPUT=y @@ -54,8 +55,6 @@ CONFIG_SYS_I2C_CADENCE=y CONFIG_MISC=y # CONFIG_MMC is not set CONFIG_DM_MMC=y -CONFIG_NAND=y -CONFIG_NAND_ARASAN=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_BAR=y CONFIG_SPI_FLASH_SST=y diff --git a/configs/zynq_zc770_xm011_defconfig b/configs/zynq_zc770_xm011_defconfig index af79f6ead2..3f944a1b8d 100644 --- a/configs/zynq_zc770_xm011_defconfig +++ b/configs/zynq_zc770_xm011_defconfig @@ -24,6 +24,7 @@ CONFIG_CMD_FPGA_LOADFS=y CONFIG_CMD_FPGA_LOADMK=y CONFIG_CMD_FPGA_LOADP=y CONFIG_CMD_GPIO=y +CONFIG_CMD_NAND=y CONFIG_CMD_NAND_LOCK_UNLOCK=y # CONFIG_CMD_SETEXPR is not set # CONFIG_CMD_NET is not set @@ -36,8 +37,6 @@ CONFIG_FPGA_XILINX=y CONFIG_FPGA_ZYNQPL=y CONFIG_DM_GPIO=y # CONFIG_MMC is not set -CONFIG_NAND=y -CONFIG_NAND_ZYNQ=y CONFIG_DEBUG_UART_ZYNQ=y CONFIG_DEBUG_UART_ANNOUNCE=y CONFIG_ZYNQ_SERIAL=y diff --git a/configs/zynq_zc770_xm011_x16_defconfig b/configs/zynq_zc770_xm011_x16_defconfig index ac7a079ca0..03ed214afa 100644 --- a/configs/zynq_zc770_xm011_x16_defconfig +++ b/configs/zynq_zc770_xm011_x16_defconfig @@ -24,6 +24,7 @@ CONFIG_CMD_FPGA_LOADFS=y CONFIG_CMD_FPGA_LOADMK=y CONFIG_CMD_FPGA_LOADP=y CONFIG_CMD_GPIO=y +CONFIG_CMD_NAND=y CONFIG_CMD_NAND_LOCK_UNLOCK=y # CONFIG_CMD_SETEXPR is not set # CONFIG_CMD_NET is not set @@ -36,8 +37,6 @@ CONFIG_FPGA_XILINX=y CONFIG_FPGA_ZYNQPL=y CONFIG_DM_GPIO=y # CONFIG_MMC is not set -CONFIG_NAND=y -CONFIG_NAND_ZYNQ=y CONFIG_DEBUG_UART_ZYNQ=y CONFIG_DEBUG_UART_ANNOUNCE=y CONFIG_ZYNQ_SERIAL=y -- 2.17.1

2 1

[U-Boot] [PATCH] Convert CONFIG_MTD_PARTITIONS et al to Kconfig
by Adam Ford 23 Jul '18

23 Jul '18

This converts the following to Kconfig: CONFIG_MTD_PARTITIONS CONFIG_MTD_DEVICE Signed-off-by: Adam Ford <aford173(a)gmail.com> diff --git a/README b/README index b1ddf89fc5..aee0f7371c 100644 --- a/README +++ b/README @@ -874,9 +874,6 @@ The following options need to be configured: CONFIG_EFI_PARTITION GPT partition table, common when EFI is the bootloader. Note 2TB partition limit; see disk/part_efi.c - CONFIG_MTD_PARTITIONS Memory Technology Device partition table. - - If IDE or SCSI support is enabled (CONFIG_IDE or CONFIG_SCSI) you must configure support for at least one non-MTD partition type as well. @@ -2433,17 +2430,6 @@ FIT uImage format: for a more detailed description refer to doc/README.update. - MTD Support (mtdparts command, UBI support) - CONFIG_MTD_DEVICE - - Adds the MTD device infrastructure from the Linux kernel. - Needed for mtdparts command support. - - CONFIG_MTD_PARTITIONS - - Adds the MTD partitioning infrastructure from the Linux - kernel. Needed for UBI support. - -- UBI support CONFIG_MTD_UBI_WL_THRESHOLD This parameter defines the maximum difference between the highest erase counter value and the lowest erase counter value of eraseblocks diff --git a/cmd/Kconfig b/cmd/Kconfig index aec209006d..170a1af9b6 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -1657,6 +1657,7 @@ config CMD_JFFS2 config CMD_MTDPARTS bool "MTD partition support" + select MTD_DEVICE if (CMD_NAND || NAND) help MTD partition support diff --git a/configs/10m50_defconfig b/configs/10m50_defconfig index c79c9f636e..acd7fb8d7c 100644 --- a/configs/10m50_defconfig +++ b/configs/10m50_defconfig @@ -24,6 +24,7 @@ CONFIG_MISC=y CONFIG_ALTERA_SYSID=y CONFIG_MTD=y CONFIG_MTD_NOR_FLASH=y +CONFIG_MTD_DEVICE=y CONFIG_ALTERA_QSPI=y CONFIG_PHY_MARVELL=y CONFIG_DM_ETH=y diff --git a/configs/BSC9131RDB_NAND_SYSCLK100_defconfig b/configs/BSC9131RDB_NAND_SYSCLK100_defconfig index fe45fda251..7c190cfd89 100644 --- a/configs/BSC9131RDB_NAND_SYSCLK100_defconfig +++ b/configs/BSC9131RDB_NAND_SYSCLK100_defconfig @@ -29,6 +29,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=ff800000.flash:1m(uboot),8m(kernel),512k(dtb), CONFIG_ENV_IS_IN_NAND=y CONFIG_FSL_CAAM=y # CONFIG_MMC is not set +CONFIG_MTD_PARTITIONS=y CONFIG_NAND=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_SPANSION=y diff --git a/configs/BSC9131RDB_NAND_defconfig b/configs/BSC9131RDB_NAND_defconfig index 7e2e24a0ee..11adf978c4 100644 --- a/configs/BSC9131RDB_NAND_defconfig +++ b/configs/BSC9131RDB_NAND_defconfig @@ -28,6 +28,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=ff800000.flash:1m(uboot),8m(kernel),512k(dtb), CONFIG_ENV_IS_IN_NAND=y CONFIG_FSL_CAAM=y # CONFIG_MMC is not set +CONFIG_MTD_PARTITIONS=y CONFIG_NAND=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_SPANSION=y diff --git a/configs/BSC9131RDB_SPIFLASH_SYSCLK100_defconfig b/configs/BSC9131RDB_SPIFLASH_SYSCLK100_defconfig index 1225b40566..3c7293bcd9 100644 --- a/configs/BSC9131RDB_SPIFLASH_SYSCLK100_defconfig +++ b/configs/BSC9131RDB_SPIFLASH_SYSCLK100_defconfig @@ -25,6 +25,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=ff800000.flash:1m(uboot),8m(kernel),512k(dtb), CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_FSL_CAAM=y # CONFIG_MMC is not set +CONFIG_MTD_PARTITIONS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_SPANSION=y CONFIG_PHY_MARVELL=y diff --git a/configs/BSC9131RDB_SPIFLASH_defconfig b/configs/BSC9131RDB_SPIFLASH_defconfig index 8baa0c2d39..50e7ad3693 100644 --- a/configs/BSC9131RDB_SPIFLASH_defconfig +++ b/configs/BSC9131RDB_SPIFLASH_defconfig @@ -25,6 +25,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=ff800000.flash:1m(uboot),8m(kernel),512k(dtb), CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_FSL_CAAM=y # CONFIG_MMC is not set +CONFIG_MTD_PARTITIONS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_SPANSION=y CONFIG_PHY_MARVELL=y diff --git a/configs/BSC9132QDS_NAND_DDRCLK100_SECURE_defconfig b/configs/BSC9132QDS_NAND_DDRCLK100_SECURE_defconfig index f418c91eb9..e19ce92421 100644 --- a/configs/BSC9132QDS_NAND_DDRCLK100_SECURE_defconfig +++ b/configs/BSC9132QDS_NAND_DDRCLK100_SECURE_defconfig @@ -29,6 +29,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=88000000.nor:256k(dtb),7m(kernel),55m(fs),1m(u CONFIG_DM=y CONFIG_FSL_ESDHC=y CONFIG_MTD_NOR_FLASH=y +CONFIG_MTD_PARTITIONS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_SPANSION=y CONFIG_PHY_MARVELL=y diff --git a/configs/BSC9132QDS_NAND_DDRCLK100_defconfig b/configs/BSC9132QDS_NAND_DDRCLK100_defconfig index 190be1e383..8bc12aebe2 100644 --- a/configs/BSC9132QDS_NAND_DDRCLK100_defconfig +++ b/configs/BSC9132QDS_NAND_DDRCLK100_defconfig @@ -32,6 +32,7 @@ CONFIG_ENV_IS_IN_NAND=y CONFIG_FSL_CAAM=y CONFIG_FSL_ESDHC=y CONFIG_MTD_NOR_FLASH=y +CONFIG_MTD_PARTITIONS=y CONFIG_NAND=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_SPANSION=y diff --git a/configs/BSC9132QDS_NAND_DDRCLK133_SECURE_defconfig b/configs/BSC9132QDS_NAND_DDRCLK133_SECURE_defconfig index 3ee7684353..d62ceb1a1d 100644 --- a/configs/BSC9132QDS_NAND_DDRCLK133_SECURE_defconfig +++ b/configs/BSC9132QDS_NAND_DDRCLK133_SECURE_defconfig @@ -29,6 +29,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=88000000.nor:256k(dtb),7m(kernel),55m(fs),1m(u CONFIG_DM=y CONFIG_FSL_ESDHC=y CONFIG_MTD_NOR_FLASH=y +CONFIG_MTD_PARTITIONS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_SPANSION=y CONFIG_PHY_MARVELL=y diff --git a/configs/BSC9132QDS_NAND_DDRCLK133_defconfig b/configs/BSC9132QDS_NAND_DDRCLK133_defconfig index a28bc57d9b..a3640e5e76 100644 --- a/configs/BSC9132QDS_NAND_DDRCLK133_defconfig +++ b/configs/BSC9132QDS_NAND_DDRCLK133_defconfig @@ -32,6 +32,7 @@ CONFIG_ENV_IS_IN_NAND=y CONFIG_FSL_CAAM=y CONFIG_FSL_ESDHC=y CONFIG_MTD_NOR_FLASH=y +CONFIG_MTD_PARTITIONS=y CONFIG_NAND=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_SPANSION=y diff --git a/configs/BSC9132QDS_NOR_DDRCLK100_SECURE_defconfig b/configs/BSC9132QDS_NOR_DDRCLK100_SECURE_defconfig index 57bfbd0f06..3417a0994b 100644 --- a/configs/BSC9132QDS_NOR_DDRCLK100_SECURE_defconfig +++ b/configs/BSC9132QDS_NOR_DDRCLK100_SECURE_defconfig @@ -29,6 +29,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=88000000.nor:256k(dtb),7m(kernel),55m(fs),1m(u CONFIG_DM=y CONFIG_FSL_ESDHC=y CONFIG_MTD_NOR_FLASH=y +CONFIG_MTD_PARTITIONS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_SPANSION=y CONFIG_PHY_MARVELL=y diff --git a/configs/BSC9132QDS_NOR_DDRCLK100_defconfig b/configs/BSC9132QDS_NOR_DDRCLK100_defconfig index 1063090332..8b207541d7 100644 --- a/configs/BSC9132QDS_NOR_DDRCLK100_defconfig +++ b/configs/BSC9132QDS_NOR_DDRCLK100_defconfig @@ -28,6 +28,7 @@ CONFIG_ENV_IS_IN_FLASH=y CONFIG_FSL_CAAM=y CONFIG_FSL_ESDHC=y CONFIG_MTD_NOR_FLASH=y +CONFIG_MTD_PARTITIONS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_SPANSION=y CONFIG_PHY_MARVELL=y diff --git a/configs/BSC9132QDS_NOR_DDRCLK133_SECURE_defconfig b/configs/BSC9132QDS_NOR_DDRCLK133_SECURE_defconfig index 8fc3390db8..6e1f34712b 100644 --- a/configs/BSC9132QDS_NOR_DDRCLK133_SECURE_defconfig +++ b/configs/BSC9132QDS_NOR_DDRCLK133_SECURE_defconfig @@ -29,6 +29,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=88000000.nor:256k(dtb),7m(kernel),55m(fs),1m(u CONFIG_DM=y CONFIG_FSL_ESDHC=y CONFIG_MTD_NOR_FLASH=y +CONFIG_MTD_PARTITIONS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_SPANSION=y CONFIG_PHY_MARVELL=y diff --git a/configs/BSC9132QDS_NOR_DDRCLK133_defconfig b/configs/BSC9132QDS_NOR_DDRCLK133_defconfig index 7436ce63f5..21588c0502 100644 --- a/configs/BSC9132QDS_NOR_DDRCLK133_defconfig +++ b/configs/BSC9132QDS_NOR_DDRCLK133_defconfig @@ -28,6 +28,7 @@ CONFIG_ENV_IS_IN_FLASH=y CONFIG_FSL_CAAM=y CONFIG_FSL_ESDHC=y CONFIG_MTD_NOR_FLASH=y +CONFIG_MTD_PARTITIONS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_SPANSION=y CONFIG_PHY_MARVELL=y diff --git a/configs/BSC9132QDS_SDCARD_DDRCLK100_SECURE_defconfig b/configs/BSC9132QDS_SDCARD_DDRCLK100_SECURE_defconfig index 350d999649..26cb5dde0f 100644 --- a/configs/BSC9132QDS_SDCARD_DDRCLK100_SECURE_defconfig +++ b/configs/BSC9132QDS_SDCARD_DDRCLK100_SECURE_defconfig @@ -29,6 +29,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=88000000.nor:256k(dtb),7m(kernel),55m(fs),1m(u CONFIG_DM=y CONFIG_FSL_ESDHC=y CONFIG_MTD_NOR_FLASH=y +CONFIG_MTD_PARTITIONS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_SPANSION=y CONFIG_PHY_MARVELL=y diff --git a/configs/BSC9132QDS_SDCARD_DDRCLK100_defconfig b/configs/BSC9132QDS_SDCARD_DDRCLK100_defconfig index 8cc76f4c3d..ef5c21d8b8 100644 --- a/configs/BSC9132QDS_SDCARD_DDRCLK100_defconfig +++ b/configs/BSC9132QDS_SDCARD_DDRCLK100_defconfig @@ -28,6 +28,7 @@ CONFIG_ENV_IS_IN_MMC=y CONFIG_FSL_CAAM=y CONFIG_FSL_ESDHC=y CONFIG_MTD_NOR_FLASH=y +CONFIG_MTD_PARTITIONS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_SPANSION=y CONFIG_PHY_MARVELL=y diff --git a/configs/BSC9132QDS_SDCARD_DDRCLK133_SECURE_defconfig b/configs/BSC9132QDS_SDCARD_DDRCLK133_SECURE_defconfig index e6a7ac8bb9..e7ad51100f 100644 --- a/configs/BSC9132QDS_SDCARD_DDRCLK133_SECURE_defconfig +++ b/configs/BSC9132QDS_SDCARD_DDRCLK133_SECURE_defconfig @@ -29,6 +29,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=88000000.nor:256k(dtb),7m(kernel),55m(fs),1m(u CONFIG_DM=y CONFIG_FSL_ESDHC=y CONFIG_MTD_NOR_FLASH=y +CONFIG_MTD_PARTITIONS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_SPANSION=y CONFIG_PHY_MARVELL=y diff --git a/configs/BSC9132QDS_SDCARD_DDRCLK133_defconfig b/configs/BSC9132QDS_SDCARD_DDRCLK133_defconfig index e97a158e64..57047afb90 100644 --- a/configs/BSC9132QDS_SDCARD_DDRCLK133_defconfig +++ b/configs/BSC9132QDS_SDCARD_DDRCLK133_defconfig @@ -28,6 +28,7 @@ CONFIG_ENV_IS_IN_MMC=y CONFIG_FSL_CAAM=y CONFIG_FSL_ESDHC=y CONFIG_MTD_NOR_FLASH=y +CONFIG_MTD_PARTITIONS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_SPANSION=y CONFIG_PHY_MARVELL=y diff --git a/configs/BSC9132QDS_SPIFLASH_DDRCLK100_SECURE_defconfig b/configs/BSC9132QDS_SPIFLASH_DDRCLK100_SECURE_defconfig index 023521b37d..a2aa2f9959 100644 --- a/configs/BSC9132QDS_SPIFLASH_DDRCLK100_SECURE_defconfig +++ b/configs/BSC9132QDS_SPIFLASH_DDRCLK100_SECURE_defconfig @@ -29,6 +29,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=88000000.nor:256k(dtb),7m(kernel),55m(fs),1m(u CONFIG_DM=y CONFIG_FSL_ESDHC=y CONFIG_MTD_NOR_FLASH=y +CONFIG_MTD_PARTITIONS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_SPANSION=y CONFIG_PHY_MARVELL=y diff --git a/configs/BSC9132QDS_SPIFLASH_DDRCLK100_defconfig b/configs/BSC9132QDS_SPIFLASH_DDRCLK100_defconfig index b97f154386..e6872d5f97 100644 --- a/configs/BSC9132QDS_SPIFLASH_DDRCLK100_defconfig +++ b/configs/BSC9132QDS_SPIFLASH_DDRCLK100_defconfig @@ -28,6 +28,7 @@ CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_FSL_CAAM=y CONFIG_FSL_ESDHC=y CONFIG_MTD_NOR_FLASH=y +CONFIG_MTD_PARTITIONS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_SPANSION=y CONFIG_PHY_MARVELL=y diff --git a/configs/BSC9132QDS_SPIFLASH_DDRCLK133_SECURE_defconfig b/configs/BSC9132QDS_SPIFLASH_DDRCLK133_SECURE_defconfig index 8d4087bb06..e485d1d7ce 100644 --- a/configs/BSC9132QDS_SPIFLASH_DDRCLK133_SECURE_defconfig +++ b/configs/BSC9132QDS_SPIFLASH_DDRCLK133_SECURE_defconfig @@ -29,6 +29,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=88000000.nor:256k(dtb),7m(kernel),55m(fs),1m(u CONFIG_DM=y CONFIG_FSL_ESDHC=y CONFIG_MTD_NOR_FLASH=y +CONFIG_MTD_PARTITIONS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_SPANSION=y CONFIG_PHY_MARVELL=y diff --git a/configs/BSC9132QDS_SPIFLASH_DDRCLK133_defconfig b/configs/BSC9132QDS_SPIFLASH_DDRCLK133_defconfig index 95eef73f63..97a3e0f060 100644 --- a/configs/BSC9132QDS_SPIFLASH_DDRCLK133_defconfig +++ b/configs/BSC9132QDS_SPIFLASH_DDRCLK133_defconfig @@ -28,6 +28,7 @@ CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_FSL_CAAM=y CONFIG_FSL_ESDHC=y CONFIG_MTD_NOR_FLASH=y +CONFIG_MTD_PARTITIONS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_SPANSION=y CONFIG_PHY_MARVELL=y diff --git a/configs/P1020RDB-PD_NAND_defconfig b/configs/P1020RDB-PD_NAND_defconfig index 560d278a93..93ce919fbc 100644 --- a/configs/P1020RDB-PD_NAND_defconfig +++ b/configs/P1020RDB-PD_NAND_defconfig @@ -41,6 +41,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=ec000000.nor:128k(dtb),6016k(kernel),57088k(fs CONFIG_ENV_IS_IN_NAND=y CONFIG_FSL_ESDHC=y CONFIG_MTD_NOR_FLASH=y +CONFIG_MTD_PARTITIONS=y CONFIG_NAND=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_SPANSION=y diff --git a/configs/P1020RDB-PD_SDCARD_defconfig b/configs/P1020RDB-PD_SDCARD_defconfig index 5c6d938834..93b1fe48a0 100644 --- a/configs/P1020RDB-PD_SDCARD_defconfig +++ b/configs/P1020RDB-PD_SDCARD_defconfig @@ -39,6 +39,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=ec000000.nor:128k(dtb),6016k(kernel),57088k(fs CONFIG_ENV_IS_IN_MMC=y CONFIG_FSL_ESDHC=y CONFIG_MTD_NOR_FLASH=y +CONFIG_MTD_PARTITIONS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_SPANSION=y CONFIG_PHY_MARVELL=y diff --git a/configs/P1020RDB-PD_SPIFLASH_defconfig b/configs/P1020RDB-PD_SPIFLASH_defconfig index 830211abb2..12d4c62c7f 100644 --- a/configs/P1020RDB-PD_SPIFLASH_defconfig +++ b/configs/P1020RDB-PD_SPIFLASH_defconfig @@ -40,6 +40,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=ec000000.nor:128k(dtb),6016k(kernel),57088k(fs CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_FSL_ESDHC=y CONFIG_MTD_NOR_FLASH=y +CONFIG_MTD_PARTITIONS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_SPANSION=y CONFIG_PHY_MARVELL=y diff --git a/configs/P1020RDB-PD_defconfig b/configs/P1020RDB-PD_defconfig index ece6e9bae2..f4918875b4 100644 --- a/configs/P1020RDB-PD_defconfig +++ b/configs/P1020RDB-PD_defconfig @@ -29,6 +29,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=ec000000.nor:128k(dtb),6016k(kernel),57088k(fs CONFIG_ENV_IS_IN_FLASH=y CONFIG_FSL_ESDHC=y CONFIG_MTD_NOR_FLASH=y +CONFIG_MTD_PARTITIONS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_SPANSION=y CONFIG_PHY_MARVELL=y diff --git a/configs/P1021RDB-PC_36BIT_NAND_defconfig b/configs/P1021RDB-PC_36BIT_NAND_defconfig index 1d15ad254a..5853d15f82 100644 --- a/configs/P1021RDB-PC_36BIT_NAND_defconfig +++ b/configs/P1021RDB-PC_36BIT_NAND_defconfig @@ -43,6 +43,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=fef000000.nor:256k(vsc7385-firmware),256k(dtb) CONFIG_ENV_IS_IN_NAND=y CONFIG_FSL_ESDHC=y CONFIG_MTD_NOR_FLASH=y +CONFIG_MTD_PARTITIONS=y CONFIG_NAND=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_SPANSION=y diff --git a/configs/P1021RDB-PC_36BIT_SDCARD_defconfig b/configs/P1021RDB-PC_36BIT_SDCARD_defconfig index 5465a20fdd..80c6a92613 100644 --- a/configs/P1021RDB-PC_36BIT_SDCARD_defconfig +++ b/configs/P1021RDB-PC_36BIT_SDCARD_defconfig @@ -41,6 +41,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=fef000000.nor:256k(vsc7385-firmware),256k(dtb) CONFIG_ENV_IS_IN_MMC=y CONFIG_FSL_ESDHC=y CONFIG_MTD_NOR_FLASH=y +CONFIG_MTD_PARTITIONS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_SPANSION=y CONFIG_PHY_MARVELL=y diff --git a/configs/P1021RDB-PC_36BIT_SPIFLASH_defconfig b/configs/P1021RDB-PC_36BIT_SPIFLASH_defconfig index d18e004817..e8dfc7e0eb 100644 --- a/configs/P1021RDB-PC_36BIT_SPIFLASH_defconfig +++ b/configs/P1021RDB-PC_36BIT_SPIFLASH_defconfig @@ -42,6 +42,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=fef000000.nor:256k(vsc7385-firmware),256k(dtb) CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_FSL_ESDHC=y CONFIG_MTD_NOR_FLASH=y +CONFIG_MTD_PARTITIONS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_SPANSION=y CONFIG_PHY_MARVELL=y diff --git a/configs/P1021RDB-PC_36BIT_defconfig b/configs/P1021RDB-PC_36BIT_defconfig index 0b2ef4383f..602775e625 100644 --- a/configs/P1021RDB-PC_36BIT_defconfig +++ b/configs/P1021RDB-PC_36BIT_defconfig @@ -31,6 +31,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=fef000000.nor:256k(vsc7385-firmware),256k(dtb) CONFIG_ENV_IS_IN_FLASH=y CONFIG_FSL_ESDHC=y CONFIG_MTD_NOR_FLASH=y +CONFIG_MTD_PARTITIONS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_SPANSION=y CONFIG_PHY_MARVELL=y diff --git a/configs/P1021RDB-PC_NAND_defconfig b/configs/P1021RDB-PC_NAND_defconfig index 6c91058892..e27158b6d6 100644 --- a/configs/P1021RDB-PC_NAND_defconfig +++ b/configs/P1021RDB-PC_NAND_defconfig @@ -42,6 +42,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=ef000000.nor:256k(vsc7385-firmware),256k(dtb), CONFIG_ENV_IS_IN_NAND=y CONFIG_FSL_ESDHC=y CONFIG_MTD_NOR_FLASH=y +CONFIG_MTD_PARTITIONS=y CONFIG_NAND=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_SPANSION=y diff --git a/configs/P1021RDB-PC_SDCARD_defconfig b/configs/P1021RDB-PC_SDCARD_defconfig index 600b7e0729..ce37843591 100644 --- a/configs/P1021RDB-PC_SDCARD_defconfig +++ b/configs/P1021RDB-PC_SDCARD_defconfig @@ -40,6 +40,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=ef000000.nor:256k(vsc7385-firmware),256k(dtb), CONFIG_ENV_IS_IN_MMC=y CONFIG_FSL_ESDHC=y CONFIG_MTD_NOR_FLASH=y +CONFIG_MTD_PARTITIONS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_SPANSION=y CONFIG_PHY_MARVELL=y diff --git a/configs/P1021RDB-PC_SPIFLASH_defconfig b/configs/P1021RDB-PC_SPIFLASH_defconfig index f934e8cd81..e1d8873ee4 100644 --- a/configs/P1021RDB-PC_SPIFLASH_defconfig +++ b/configs/P1021RDB-PC_SPIFLASH_defconfig @@ -41,6 +41,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=ef000000.nor:256k(vsc7385-firmware),256k(dtb), CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_FSL_ESDHC=y CONFIG_MTD_NOR_FLASH=y +CONFIG_MTD_PARTITIONS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_SPANSION=y CONFIG_PHY_MARVELL=y diff --git a/configs/P1021RDB-PC_defconfig b/configs/P1021RDB-PC_defconfig index 8026eff080..07bf05dc6c 100644 --- a/configs/P1021RDB-PC_defconfig +++ b/configs/P1021RDB-PC_defconfig @@ -30,6 +30,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=ef000000.nor:256k(vsc7385-firmware),256k(dtb), CONFIG_ENV_IS_IN_FLASH=y CONFIG_FSL_ESDHC=y CONFIG_MTD_NOR_FLASH=y +CONFIG_MTD_PARTITIONS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_SPANSION=y CONFIG_PHY_MARVELL=y diff --git a/configs/P1022DS_36BIT_NAND_defconfig b/configs/P1022DS_36BIT_NAND_defconfig index 45acdcb979..f05621f3f3 100644 --- a/configs/P1022DS_36BIT_NAND_defconfig +++ b/configs/P1022DS_36BIT_NAND_defconfig @@ -42,6 +42,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=fe8000000.nor:48m(ramdisk),14m(diagnostic),2m( CONFIG_ENV_IS_IN_NAND=y CONFIG_FSL_ESDHC=y CONFIG_MTD_NOR_FLASH=y +CONFIG_MTD_PARTITIONS=y CONFIG_NAND=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_SPANSION=y diff --git a/configs/P1022DS_36BIT_SDCARD_defconfig b/configs/P1022DS_36BIT_SDCARD_defconfig index 52c16400ea..3447345019 100644 --- a/configs/P1022DS_36BIT_SDCARD_defconfig +++ b/configs/P1022DS_36BIT_SDCARD_defconfig @@ -40,6 +40,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=fe8000000.nor:48m(ramdisk),14m(diagnostic),2m( CONFIG_ENV_IS_IN_MMC=y CONFIG_FSL_ESDHC=y CONFIG_MTD_NOR_FLASH=y +CONFIG_MTD_PARTITIONS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_SPANSION=y CONFIG_PHY_MARVELL=y diff --git a/configs/P1022DS_36BIT_SPIFLASH_defconfig b/configs/P1022DS_36BIT_SPIFLASH_defconfig index 44bed835fa..3eb1b11e30 100644 --- a/configs/P1022DS_36BIT_SPIFLASH_defconfig +++ b/configs/P1022DS_36BIT_SPIFLASH_defconfig @@ -41,6 +41,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=fe8000000.nor:48m(ramdisk),14m(diagnostic),2m( CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_FSL_ESDHC=y CONFIG_MTD_NOR_FLASH=y +CONFIG_MTD_PARTITIONS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_SPANSION=y CONFIG_PHY_MARVELL=y diff --git a/configs/P1022DS_36BIT_defconfig b/configs/P1022DS_36BIT_defconfig index d221d81494..924b6b014f 100644 --- a/configs/P1022DS_36BIT_defconfig +++ b/configs/P1022DS_36BIT_defconfig @@ -30,6 +30,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=fe8000000.nor:48m(ramdisk),14m(diagnostic),2m( CONFIG_ENV_IS_IN_FLASH=y CONFIG_FSL_ESDHC=y CONFIG_MTD_NOR_FLASH=y +CONFIG_MTD_PARTITIONS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_SPANSION=y CONFIG_PHY_MARVELL=y diff --git a/configs/P1022DS_NAND_defconfig b/configs/P1022DS_NAND_defconfig index 47a3bbd2ad..5ee2838765 100644 --- a/configs/P1022DS_NAND_defconfig +++ b/configs/P1022DS_NAND_defconfig @@ -41,6 +41,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=e8000000.nor:48m(ramdisk),14m(diagnostic),2m(d CONFIG_ENV_IS_IN_NAND=y CONFIG_FSL_ESDHC=y CONFIG_MTD_NOR_FLASH=y +CONFIG_MTD_PARTITIONS=y CONFIG_NAND=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_SPANSION=y diff --git a/configs/P1022DS_SDCARD_defconfig b/configs/P1022DS_SDCARD_defconfig index 7f92c07a02..54c1c7e41d 100644 --- a/configs/P1022DS_SDCARD_defconfig +++ b/configs/P1022DS_SDCARD_defconfig @@ -39,6 +39,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=e8000000.nor:48m(ramdisk),14m(diagnostic),2m(d CONFIG_ENV_IS_IN_MMC=y CONFIG_FSL_ESDHC=y CONFIG_MTD_NOR_FLASH=y +CONFIG_MTD_PARTITIONS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_SPANSION=y CONFIG_PHY_MARVELL=y diff --git a/configs/P1022DS_SPIFLASH_defconfig b/configs/P1022DS_SPIFLASH_defconfig index 2d655c7b5a..bba579350d 100644 --- a/configs/P1022DS_SPIFLASH_defconfig +++ b/configs/P1022DS_SPIFLASH_defconfig @@ -40,6 +40,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=e8000000.nor:48m(ramdisk),14m(diagnostic),2m(d CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_FSL_ESDHC=y CONFIG_MTD_NOR_FLASH=y +CONFIG_MTD_PARTITIONS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_SPANSION=y CONFIG_PHY_MARVELL=y diff --git a/configs/P1022DS_defconfig b/configs/P1022DS_defconfig index cfd74f9b3f..11d746b655 100644 --- a/configs/P1022DS_defconfig +++ b/configs/P1022DS_defconfig @@ -29,6 +29,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=e8000000.nor:48m(ramdisk),14m(diagnostic),2m(d CONFIG_ENV_IS_IN_FLASH=y CONFIG_FSL_ESDHC=y CONFIG_MTD_NOR_FLASH=y +CONFIG_MTD_PARTITIONS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_SPANSION=y CONFIG_PHY_MARVELL=y diff --git a/configs/P2020RDB-PC_36BIT_NAND_defconfig b/configs/P2020RDB-PC_36BIT_NAND_defconfig index bd8fe1989e..33b00bf1cb 100644 --- a/configs/P2020RDB-PC_36BIT_NAND_defconfig +++ b/configs/P2020RDB-PC_36BIT_NAND_defconfig @@ -43,6 +43,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=fef000000.nor:256k(vsc7385-firmware),256k(dtb) CONFIG_ENV_IS_IN_NAND=y CONFIG_FSL_ESDHC=y CONFIG_MTD_NOR_FLASH=y +CONFIG_MTD_PARTITIONS=y CONFIG_NAND=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_SPANSION=y diff --git a/configs/P2020RDB-PC_36BIT_SDCARD_defconfig b/configs/P2020RDB-PC_36BIT_SDCARD_defconfig index 8115278744..8a70a6a55b 100644 --- a/configs/P2020RDB-PC_36BIT_SDCARD_defconfig +++ b/configs/P2020RDB-PC_36BIT_SDCARD_defconfig @@ -41,6 +41,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=fef000000.nor:256k(vsc7385-firmware),256k(dtb) CONFIG_ENV_IS_IN_MMC=y CONFIG_FSL_ESDHC=y CONFIG_MTD_NOR_FLASH=y +CONFIG_MTD_PARTITIONS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_SPANSION=y CONFIG_PHY_MARVELL=y diff --git a/configs/P2020RDB-PC_36BIT_SPIFLASH_defconfig b/configs/P2020RDB-PC_36BIT_SPIFLASH_defconfig index d1e70b6c35..bbf283ceb1 100644 --- a/configs/P2020RDB-PC_36BIT_SPIFLASH_defconfig +++ b/configs/P2020RDB-PC_36BIT_SPIFLASH_defconfig @@ -42,6 +42,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=fef000000.nor:256k(vsc7385-firmware),256k(dtb) CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_FSL_ESDHC=y CONFIG_MTD_NOR_FLASH=y +CONFIG_MTD_PARTITIONS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_SPANSION=y CONFIG_PHY_MARVELL=y diff --git a/configs/P2020RDB-PC_36BIT_defconfig b/configs/P2020RDB-PC_36BIT_defconfig index f81d77867f..602df73b4c 100644 --- a/configs/P2020RDB-PC_36BIT_defconfig +++ b/configs/P2020RDB-PC_36BIT_defconfig @@ -31,6 +31,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=fef000000.nor:256k(vsc7385-firmware),256k(dtb) CONFIG_ENV_IS_IN_FLASH=y CONFIG_FSL_ESDHC=y CONFIG_MTD_NOR_FLASH=y +CONFIG_MTD_PARTITIONS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_SPANSION=y CONFIG_PHY_MARVELL=y diff --git a/configs/P2020RDB-PC_NAND_defconfig b/configs/P2020RDB-PC_NAND_defconfig index d369fdb935..220019be91 100644 --- a/configs/P2020RDB-PC_NAND_defconfig +++ b/configs/P2020RDB-PC_NAND_defconfig @@ -42,6 +42,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=ef000000.nor:256k(vsc7385-firmware),256k(dtb), CONFIG_ENV_IS_IN_NAND=y CONFIG_FSL_ESDHC=y CONFIG_MTD_NOR_FLASH=y +CONFIG_MTD_PARTITIONS=y CONFIG_NAND=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_SPANSION=y diff --git a/configs/P2020RDB-PC_SDCARD_defconfig b/configs/P2020RDB-PC_SDCARD_defconfig index 5e058194a9..764785a9ff 100644 --- a/configs/P2020RDB-PC_SDCARD_defconfig +++ b/configs/P2020RDB-PC_SDCARD_defconfig @@ -40,6 +40,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=ef000000.nor:256k(vsc7385-firmware),256k(dtb), CONFIG_ENV_IS_IN_MMC=y CONFIG_FSL_ESDHC=y CONFIG_MTD_NOR_FLASH=y +CONFIG_MTD_PARTITIONS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_SPANSION=y CONFIG_PHY_MARVELL=y diff --git a/configs/P2020RDB-PC_SPIFLASH_defconfig b/configs/P2020RDB-PC_SPIFLASH_defconfig index 025be4bc59..1d11fe54d6 100644 --- a/configs/P2020RDB-PC_SPIFLASH_defconfig +++ b/configs/P2020RDB-PC_SPIFLASH_defconfig @@ -41,6 +41,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=ef000000.nor:256k(vsc7385-firmware),256k(dtb), CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_FSL_ESDHC=y CONFIG_MTD_NOR_FLASH=y +CONFIG_MTD_PARTITIONS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_SPANSION=y CONFIG_PHY_MARVELL=y diff --git a/configs/P2020RDB-PC_defconfig b/configs/P2020RDB-PC_defconfig index 4105a4d514..d2c8c0b7e1 100644 --- a/configs/P2020RDB-PC_defconfig +++ b/configs/P2020RDB-PC_defconfig @@ -30,6 +30,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=ef000000.nor:256k(vsc7385-firmware),256k(dtb), CONFIG_ENV_IS_IN_FLASH=y CONFIG_FSL_ESDHC=y CONFIG_MTD_NOR_FLASH=y +CONFIG_MTD_PARTITIONS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_SPANSION=y CONFIG_PHY_MARVELL=y diff --git a/configs/T1023RDB_NAND_defconfig b/configs/T1023RDB_NAND_defconfig index efafe22df7..f1911b4f96 100644 --- a/configs/T1023RDB_NAND_defconfig +++ b/configs/T1023RDB_NAND_defconfig @@ -42,6 +42,7 @@ CONFIG_ENV_IS_IN_NAND=y CONFIG_FSL_CAAM=y CONFIG_FSL_ESDHC=y CONFIG_MTD_NOR_FLASH=y +CONFIG_MTD_PARTITIONS=y CONFIG_NAND=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_SPANSION=y diff --git a/configs/T1023RDB_SDCARD_defconfig b/configs/T1023RDB_SDCARD_defconfig index 81f6f3ab99..0bbabad07a 100644 --- a/configs/T1023RDB_SDCARD_defconfig +++ b/configs/T1023RDB_SDCARD_defconfig @@ -42,6 +42,7 @@ CONFIG_ENV_IS_IN_MMC=y CONFIG_FSL_CAAM=y CONFIG_FSL_ESDHC=y CONFIG_MTD_NOR_FLASH=y +CONFIG_MTD_PARTITIONS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_SPANSION=y CONFIG_PHYLIB=y diff --git a/configs/T1023RDB_SECURE_BOOT_defconfig b/configs/T1023RDB_SECURE_BOOT_defconfig index 62ae4a20b5..fd71616a4a 100644 --- a/configs/T1023RDB_SECURE_BOOT_defconfig +++ b/configs/T1023RDB_SECURE_BOOT_defconfig @@ -32,6 +32,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=fe8000000.nor:1m(uboot),5m(kernel),128k(dtb),9 CONFIG_DM=y CONFIG_FSL_ESDHC=y CONFIG_MTD_NOR_FLASH=y +CONFIG_MTD_PARTITIONS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_SPANSION=y CONFIG_PHYLIB=y diff --git a/configs/T1023RDB_SPIFLASH_defconfig b/configs/T1023RDB_SPIFLASH_defconfig index 7b423ebb96..86c942118a 100644 --- a/configs/T1023RDB_SPIFLASH_defconfig +++ b/configs/T1023RDB_SPIFLASH_defconfig @@ -43,6 +43,7 @@ CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_FSL_CAAM=y CONFIG_FSL_ESDHC=y CONFIG_MTD_NOR_FLASH=y +CONFIG_MTD_PARTITIONS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_SPANSION=y CONFIG_PHYLIB=y diff --git a/configs/T1023RDB_defconfig b/configs/T1023RDB_defconfig index efde0f0652..f4b7124f61 100644 --- a/configs/T1023RDB_defconfig +++ b/configs/T1023RDB_defconfig @@ -31,6 +31,7 @@ CONFIG_ENV_IS_IN_FLASH=y CONFIG_FSL_CAAM=y CONFIG_FSL_ESDHC=y CONFIG_MTD_NOR_FLASH=y +CONFIG_MTD_PARTITIONS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_SPANSION=y CONFIG_PHYLIB=y diff --git a/configs/T1024QDS_DDR4_SECURE_BOOT_defconfig b/configs/T1024QDS_DDR4_SECURE_BOOT_defconfig index 7a814df986..3cc65e18ae 100644 --- a/configs/T1024QDS_DDR4_SECURE_BOOT_defconfig +++ b/configs/T1024QDS_DDR4_SECURE_BOOT_defconfig @@ -33,6 +33,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=fe8000000.nor:1m(uboot),5m(kernel),128k(dtb),9 CONFIG_DM=y CONFIG_FSL_ESDHC=y CONFIG_MTD_NOR_FLASH=y +CONFIG_MTD_PARTITIONS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_EON=y CONFIG_SPI_FLASH_STMICRO=y diff --git a/configs/T1024QDS_DDR4_defconfig b/configs/T1024QDS_DDR4_defconfig index 5b8f016f5f..4be2518a9c 100644 --- a/configs/T1024QDS_DDR4_defconfig +++ b/configs/T1024QDS_DDR4_defconfig @@ -32,6 +32,7 @@ CONFIG_ENV_IS_IN_FLASH=y CONFIG_FSL_CAAM=y CONFIG_FSL_ESDHC=y CONFIG_MTD_NOR_FLASH=y +CONFIG_MTD_PARTITIONS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_EON=y CONFIG_SPI_FLASH_STMICRO=y diff --git a/configs/T1024QDS_NAND_defconfig b/configs/T1024QDS_NAND_defconfig index 1a97c03704..230ab76919 100644 --- a/configs/T1024QDS_NAND_defconfig +++ b/configs/T1024QDS_NAND_defconfig @@ -44,6 +44,7 @@ CONFIG_FSL_CAAM=y CONFIG_SYS_FSL_DDR3=y CONFIG_FSL_ESDHC=y CONFIG_MTD_NOR_FLASH=y +CONFIG_MTD_PARTITIONS=y CONFIG_NAND=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_EON=y diff --git a/configs/T1024QDS_SDCARD_defconfig b/configs/T1024QDS_SDCARD_defconfig index 90c11ff70e..43d3eb0aca 100644 --- a/configs/T1024QDS_SDCARD_defconfig +++ b/configs/T1024QDS_SDCARD_defconfig @@ -44,6 +44,7 @@ CONFIG_FSL_CAAM=y CONFIG_SYS_FSL_DDR3=y CONFIG_FSL_ESDHC=y CONFIG_MTD_NOR_FLASH=y +CONFIG_MTD_PARTITIONS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_EON=y CONFIG_SPI_FLASH_STMICRO=y diff --git a/configs/T1024QDS_SECURE_BOOT_defconfig b/configs/T1024QDS_SECURE_BOOT_defconfig index e68d0722fa..b148822e68 100644 --- a/configs/T1024QDS_SECURE_BOOT_defconfig +++ b/configs/T1024QDS_SECURE_BOOT_defconfig @@ -34,6 +34,7 @@ CONFIG_DM=y CONFIG_SYS_FSL_DDR3=y CONFIG_FSL_ESDHC=y CONFIG_MTD_NOR_FLASH=y +CONFIG_MTD_PARTITIONS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_EON=y CONFIG_SPI_FLASH_STMICRO=y diff --git a/configs/T1024QDS_SPIFLASH_defconfig b/configs/T1024QDS_SPIFLASH_defconfig index 921892e641..f8e453171c 100644 --- a/configs/T1024QDS_SPIFLASH_defconfig +++ b/configs/T1024QDS_SPIFLASH_defconfig @@ -45,6 +45,7 @@ CONFIG_FSL_CAAM=y CONFIG_SYS_FSL_DDR3=y CONFIG_FSL_ESDHC=y CONFIG_MTD_NOR_FLASH=y +CONFIG_MTD_PARTITIONS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_EON=y CONFIG_SPI_FLASH_STMICRO=y diff --git a/configs/T1024QDS_defconfig b/configs/T1024QDS_defconfig index 0f92e2f290..022fa0dcc6 100644 --- a/configs/T1024QDS_defconfig +++ b/configs/T1024QDS_defconfig @@ -33,6 +33,7 @@ CONFIG_FSL_CAAM=y CONFIG_SYS_FSL_DDR3=y CONFIG_FSL_ESDHC=y CONFIG_MTD_NOR_FLASH=y +CONFIG_MTD_PARTITIONS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_EON=y CONFIG_SPI_FLASH_STMICRO=y diff --git a/configs/T1024RDB_NAND_defconfig b/configs/T1024RDB_NAND_defconfig index 384cae1078..65e7afb075 100644 --- a/configs/T1024RDB_NAND_defconfig +++ b/configs/T1024RDB_NAND_defconfig @@ -44,6 +44,7 @@ CONFIG_FSL_CAAM=y CONFIG_SYS_FSL_DDR3=y CONFIG_FSL_ESDHC=y CONFIG_MTD_NOR_FLASH=y +CONFIG_MTD_PARTITIONS=y CONFIG_NAND=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y diff --git a/configs/T1024RDB_SDCARD_defconfig b/configs/T1024RDB_SDCARD_defconfig index a5073d378d..0499cec971 100644 --- a/configs/T1024RDB_SDCARD_defconfig +++ b/configs/T1024RDB_SDCARD_defconfig @@ -44,6 +44,7 @@ CONFIG_FSL_CAAM=y CONFIG_SYS_FSL_DDR3=y CONFIG_FSL_ESDHC=y CONFIG_MTD_NOR_FLASH=y +CONFIG_MTD_PARTITIONS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_PHYLIB=y diff --git a/configs/T1024RDB_SECURE_BOOT_defconfig b/configs/T1024RDB_SECURE_BOOT_defconfig index fcd2049c89..83a1d41d3f 100644 --- a/configs/T1024RDB_SECURE_BOOT_defconfig +++ b/configs/T1024RDB_SECURE_BOOT_defconfig @@ -34,6 +34,7 @@ CONFIG_DM=y CONFIG_SYS_FSL_DDR3=y CONFIG_FSL_ESDHC=y CONFIG_MTD_NOR_FLASH=y +CONFIG_MTD_PARTITIONS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_PHYLIB=y diff --git a/configs/T1024RDB_SPIFLASH_defconfig b/configs/T1024RDB_SPIFLASH_defconfig index 806b72fdb0..def796cdf6 100644 --- a/configs/T1024RDB_SPIFLASH_defconfig +++ b/configs/T1024RDB_SPIFLASH_defconfig @@ -45,6 +45,7 @@ CONFIG_FSL_CAAM=y CONFIG_SYS_FSL_DDR3=y CONFIG_FSL_ESDHC=y CONFIG_MTD_NOR_FLASH=y +CONFIG_MTD_PARTITIONS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_PHYLIB=y diff --git a/configs/T1024RDB_defconfig b/configs/T1024RDB_defconfig index 73cd63b7d6..c7089e4531 100644 --- a/configs/T1024RDB_defconfig +++ b/configs/T1024RDB_defconfig @@ -33,6 +33,7 @@ CONFIG_FSL_CAAM=y CONFIG_SYS_FSL_DDR3=y CONFIG_FSL_ESDHC=y CONFIG_MTD_NOR_FLASH=y +CONFIG_MTD_PARTITIONS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_PHYLIB=y diff --git a/configs/T1040D4RDB_NAND_defconfig b/configs/T1040D4RDB_NAND_defconfig index f6a4835a37..691873a0bc 100644 --- a/configs/T1040D4RDB_NAND_defconfig +++ b/configs/T1040D4RDB_NAND_defconfig @@ -41,6 +41,7 @@ CONFIG_ENV_IS_IN_NAND=y CONFIG_FSL_CAAM=y CONFIG_FSL_ESDHC=y CONFIG_MTD_NOR_FLASH=y +CONFIG_MTD_PARTITIONS=y CONFIG_NAND=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y diff --git a/configs/T1040D4RDB_SDCARD_defconfig b/configs/T1040D4RDB_SDCARD_defconfig index 5b80494028..4b0e2f613b 100644 --- a/configs/T1040D4RDB_SDCARD_defconfig +++ b/configs/T1040D4RDB_SDCARD_defconfig @@ -41,6 +41,7 @@ CONFIG_ENV_IS_IN_MMC=y CONFIG_FSL_CAAM=y CONFIG_FSL_ESDHC=y CONFIG_MTD_NOR_FLASH=y +CONFIG_MTD_PARTITIONS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_PHYLIB=y diff --git a/configs/T1040D4RDB_SECURE_BOOT_defconfig b/configs/T1040D4RDB_SECURE_BOOT_defconfig index 5bf8fb4769..685e2b4ac3 100644 --- a/configs/T1040D4RDB_SECURE_BOOT_defconfig +++ b/configs/T1040D4RDB_SECURE_BOOT_defconfig @@ -31,6 +31,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=fe8000000.nor:1m(uboot),5m(kernel),128k(dtb),9 CONFIG_DM=y CONFIG_FSL_ESDHC=y CONFIG_MTD_NOR_FLASH=y +CONFIG_MTD_PARTITIONS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_PHYLIB=y diff --git a/configs/T1040D4RDB_SPIFLASH_defconfig b/configs/T1040D4RDB_SPIFLASH_defconfig index a7ec2c78bf..4b6d3104a9 100644 --- a/configs/T1040D4RDB_SPIFLASH_defconfig +++ b/configs/T1040D4RDB_SPIFLASH_defconfig @@ -42,6 +42,7 @@ CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_FSL_CAAM=y CONFIG_FSL_ESDHC=y CONFIG_MTD_NOR_FLASH=y +CONFIG_MTD_PARTITIONS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_PHYLIB=y diff --git a/configs/T1040D4RDB_defconfig b/configs/T1040D4RDB_defconfig index 7ce8a0a477..bc746a187c 100644 --- a/configs/T1040D4RDB_defconfig +++ b/configs/T1040D4RDB_defconfig @@ -30,6 +30,7 @@ CONFIG_ENV_IS_IN_FLASH=y CONFIG_FSL_CAAM=y CONFIG_FSL_ESDHC=y CONFIG_MTD_NOR_FLASH=y +CONFIG_MTD_PARTITIONS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_PHYLIB=y diff --git a/configs/T1040QDS_DDR4_defconfig b/configs/T1040QDS_DDR4_defconfig index 1ae33dbafd..865f87cb85 100644 --- a/configs/T1040QDS_DDR4_defconfig +++ b/configs/T1040QDS_DDR4_defconfig @@ -33,6 +33,7 @@ CONFIG_ENV_IS_IN_FLASH=y CONFIG_FSL_CAAM=y CONFIG_FSL_ESDHC=y CONFIG_MTD_NOR_FLASH=y +CONFIG_MTD_PARTITIONS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_EON=y CONFIG_SPI_FLASH_STMICRO=y diff --git a/configs/T1040QDS_SECURE_BOOT_defconfig b/configs/T1040QDS_SECURE_BOOT_defconfig index 966685bd81..15ec9c8830 100644 --- a/configs/T1040QDS_SECURE_BOOT_defconfig +++ b/configs/T1040QDS_SECURE_BOOT_defconfig @@ -35,6 +35,7 @@ CONFIG_DM=y CONFIG_SYS_FSL_DDR3=y CONFIG_FSL_ESDHC=y CONFIG_MTD_NOR_FLASH=y +CONFIG_MTD_PARTITIONS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_EON=y CONFIG_SPI_FLASH_STMICRO=y diff --git a/configs/T1040QDS_defconfig b/configs/T1040QDS_defconfig index 4040a10b4c..92b7adc018 100644 --- a/configs/T1040QDS_defconfig +++ b/configs/T1040QDS_defconfig @@ -34,6 +34,7 @@ CONFIG_FSL_CAAM=y CONFIG_SYS_FSL_DDR3=y CONFIG_FSL_ESDHC=y CONFIG_MTD_NOR_FLASH=y +CONFIG_MTD_PARTITIONS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_EON=y CONFIG_SPI_FLASH_STMICRO=y diff --git a/configs/T1040RDB_NAND_defconfig b/configs/T1040RDB_NAND_defconfig index e898dbbe5b..d8568e4a80 100644 --- a/configs/T1040RDB_NAND_defconfig +++ b/configs/T1040RDB_NAND_defconfig @@ -42,6 +42,7 @@ CONFIG_FSL_CAAM=y CONFIG_SYS_FSL_DDR3=y CONFIG_FSL_ESDHC=y CONFIG_MTD_NOR_FLASH=y +CONFIG_MTD_PARTITIONS=y CONFIG_NAND=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y diff --git a/configs/T1040RDB_SDCARD_defconfig b/configs/T1040RDB_SDCARD_defconfig index fbc498890a..b53d593c69 100644 --- a/configs/T1040RDB_SDCARD_defconfig +++ b/configs/T1040RDB_SDCARD_defconfig @@ -42,6 +42,7 @@ CONFIG_FSL_CAAM=y CONFIG_SYS_FSL_DDR3=y CONFIG_FSL_ESDHC=y CONFIG_MTD_NOR_FLASH=y +CONFIG_MTD_PARTITIONS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_PHYLIB=y diff --git a/configs/T1040RDB_SECURE_BOOT_defconfig b/configs/T1040RDB_SECURE_BOOT_defconfig index cac97fe89c..e59e9e3062 100644 --- a/configs/T1040RDB_SECURE_BOOT_defconfig +++ b/configs/T1040RDB_SECURE_BOOT_defconfig @@ -32,6 +32,7 @@ CONFIG_DM=y CONFIG_SYS_FSL_DDR3=y CONFIG_FSL_ESDHC=y CONFIG_MTD_NOR_FLASH=y +CONFIG_MTD_PARTITIONS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_PHYLIB=y diff --git a/configs/T1040RDB_SPIFLASH_defconfig b/configs/T1040RDB_SPIFLASH_defconfig index 994e94d76f..0968a26a3b 100644 --- a/configs/T1040RDB_SPIFLASH_defconfig +++ b/configs/T1040RDB_SPIFLASH_defconfig @@ -43,6 +43,7 @@ CONFIG_FSL_CAAM=y CONFIG_SYS_FSL_DDR3=y CONFIG_FSL_ESDHC=y CONFIG_MTD_NOR_FLASH=y +CONFIG_MTD_PARTITIONS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_PHYLIB=y diff --git a/configs/T1040RDB_defconfig b/configs/T1040RDB_defconfig index d85885e24c..59a367e7e9 100644 --- a/configs/T1040RDB_defconfig +++ b/configs/T1040RDB_defconfig @@ -31,6 +31,7 @@ CONFIG_FSL_CAAM=y CONFIG_SYS_FSL_DDR3=y CONFIG_FSL_ESDHC=y CONFIG_MTD_NOR_FLASH=y +CONFIG_MTD_PARTITIONS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_PHYLIB=y diff --git a/configs/T1042D4RDB_NAND_defconfig b/configs/T1042D4RDB_NAND_defconfig index b9058b7f45..f77b773f98 100644 --- a/configs/T1042D4RDB_NAND_defconfig +++ b/configs/T1042D4RDB_NAND_defconfig @@ -42,6 +42,7 @@ CONFIG_ENV_IS_IN_NAND=y CONFIG_FSL_CAAM=y CONFIG_FSL_ESDHC=y CONFIG_MTD_NOR_FLASH=y +CONFIG_MTD_PARTITIONS=y CONFIG_NAND=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y diff --git a/configs/T1042D4RDB_SDCARD_defconfig b/configs/T1042D4RDB_SDCARD_defconfig index 6f12ac6a0a..67d66f5fcd 100644 --- a/configs/T1042D4RDB_SDCARD_defconfig +++ b/configs/T1042D4RDB_SDCARD_defconfig @@ -42,6 +42,7 @@ CONFIG_ENV_IS_IN_MMC=y CONFIG_FSL_CAAM=y CONFIG_FSL_ESDHC=y CONFIG_MTD_NOR_FLASH=y +CONFIG_MTD_PARTITIONS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_PHYLIB=y diff --git a/configs/T1042D4RDB_SECURE_BOOT_defconfig b/configs/T1042D4RDB_SECURE_BOOT_defconfig index 2f6b37d2e4..8b0eece1e1 100644 --- a/configs/T1042D4RDB_SECURE_BOOT_defconfig +++ b/configs/T1042D4RDB_SECURE_BOOT_defconfig @@ -32,6 +32,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=fe8000000.nor:1m(uboot),5m(kernel),128k(dtb),9 CONFIG_DM=y CONFIG_FSL_ESDHC=y CONFIG_MTD_NOR_FLASH=y +CONFIG_MTD_PARTITIONS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_PHYLIB=y diff --git a/configs/T1042D4RDB_SPIFLASH_defconfig b/configs/T1042D4RDB_SPIFLASH_defconfig index 2ed1b39430..af0a5b41e4 100644 --- a/configs/T1042D4RDB_SPIFLASH_defconfig +++ b/configs/T1042D4RDB_SPIFLASH_defconfig @@ -43,6 +43,7 @@ CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_FSL_CAAM=y CONFIG_FSL_ESDHC=y CONFIG_MTD_NOR_FLASH=y +CONFIG_MTD_PARTITIONS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_PHYLIB=y diff --git a/configs/T1042D4RDB_defconfig b/configs/T1042D4RDB_defconfig index b645fe278f..2a68cebbe7 100644 --- a/configs/T1042D4RDB_defconfig +++ b/configs/T1042D4RDB_defconfig @@ -31,6 +31,7 @@ CONFIG_ENV_IS_IN_FLASH=y CONFIG_FSL_CAAM=y CONFIG_FSL_ESDHC=y CONFIG_MTD_NOR_FLASH=y +CONFIG_MTD_PARTITIONS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_PHYLIB=y diff --git a/configs/T1042RDB_PI_NAND_SECURE_BOOT_defconfig b/configs/T1042RDB_PI_NAND_SECURE_BOOT_defconfig index 963fd9bafe..3d94c1cad7 100644 --- a/configs/T1042RDB_PI_NAND_SECURE_BOOT_defconfig +++ b/configs/T1042RDB_PI_NAND_SECURE_BOOT_defconfig @@ -47,6 +47,7 @@ CONFIG_SPL_DM=y CONFIG_SYS_FSL_DDR3=y CONFIG_FSL_ESDHC=y CONFIG_MTD_NOR_FLASH=y +CONFIG_MTD_PARTITIONS=y CONFIG_NAND=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y diff --git a/configs/T1042RDB_PI_NAND_defconfig b/configs/T1042RDB_PI_NAND_defconfig index 885516410e..070683623a 100644 --- a/configs/T1042RDB_PI_NAND_defconfig +++ b/configs/T1042RDB_PI_NAND_defconfig @@ -44,6 +44,7 @@ CONFIG_FSL_CAAM=y CONFIG_SYS_FSL_DDR3=y CONFIG_FSL_ESDHC=y CONFIG_MTD_NOR_FLASH=y +CONFIG_MTD_PARTITIONS=y CONFIG_NAND=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y diff --git a/configs/T1042RDB_PI_SDCARD_defconfig b/configs/T1042RDB_PI_SDCARD_defconfig index f8e4b33e99..5eb2963bd7 100644 --- a/configs/T1042RDB_PI_SDCARD_defconfig +++ b/configs/T1042RDB_PI_SDCARD_defconfig @@ -44,6 +44,7 @@ CONFIG_FSL_CAAM=y CONFIG_SYS_FSL_DDR3=y CONFIG_FSL_ESDHC=y CONFIG_MTD_NOR_FLASH=y +CONFIG_MTD_PARTITIONS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_PHYLIB=y diff --git a/configs/T1042RDB_PI_SPIFLASH_defconfig b/configs/T1042RDB_PI_SPIFLASH_defconfig index 77855fc74d..1ae4dc95c1 100644 --- a/configs/T1042RDB_PI_SPIFLASH_defconfig +++ b/configs/T1042RDB_PI_SPIFLASH_defconfig @@ -45,6 +45,7 @@ CONFIG_FSL_CAAM=y CONFIG_SYS_FSL_DDR3=y CONFIG_FSL_ESDHC=y CONFIG_MTD_NOR_FLASH=y +CONFIG_MTD_PARTITIONS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_PHYLIB=y diff --git a/configs/T1042RDB_PI_defconfig b/configs/T1042RDB_PI_defconfig index ebeaf9380f..dd696bba63 100644 --- a/configs/T1042RDB_PI_defconfig +++ b/configs/T1042RDB_PI_defconfig @@ -33,6 +33,7 @@ CONFIG_FSL_CAAM=y CONFIG_SYS_FSL_DDR3=y CONFIG_FSL_ESDHC=y CONFIG_MTD_NOR_FLASH=y +CONFIG_MTD_PARTITIONS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_PHYLIB=y diff --git a/configs/T1042RDB_SECURE_BOOT_defconfig b/configs/T1042RDB_SECURE_BOOT_defconfig index 654f8a6878..0d92ec3c9e 100644 --- a/configs/T1042RDB_SECURE_BOOT_defconfig +++ b/configs/T1042RDB_SECURE_BOOT_defconfig @@ -31,6 +31,7 @@ CONFIG_DM=y CONFIG_SYS_FSL_DDR3=y CONFIG_FSL_ESDHC=y CONFIG_MTD_NOR_FLASH=y +CONFIG_MTD_PARTITIONS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_PHYLIB=y diff --git a/configs/T1042RDB_defconfig b/configs/T1042RDB_defconfig index 10bb12d1b4..3d6a0b32c0 100644 --- a/configs/T1042RDB_defconfig +++ b/configs/T1042RDB_defconfig @@ -30,6 +30,7 @@ CONFIG_FSL_CAAM=y CONFIG_SYS_FSL_DDR3=y CONFIG_FSL_ESDHC=y CONFIG_MTD_NOR_FLASH=y +CONFIG_MTD_PARTITIONS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_PHYLIB=y diff --git a/configs/T2080QDS_NAND_defconfig b/configs/T2080QDS_NAND_defconfig index 2addaac983..b7f84d4dc6 100644 --- a/configs/T2080QDS_NAND_defconfig +++ b/configs/T2080QDS_NAND_defconfig @@ -38,6 +38,7 @@ CONFIG_ENV_IS_IN_NAND=y CONFIG_FSL_CAAM=y CONFIG_FSL_ESDHC=y CONFIG_MTD_NOR_FLASH=y +CONFIG_MTD_PARTITIONS=y CONFIG_NAND=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_EON=y diff --git a/configs/T2080QDS_SDCARD_defconfig b/configs/T2080QDS_SDCARD_defconfig index 6588f14149..908014343f 100644 --- a/configs/T2080QDS_SDCARD_defconfig +++ b/configs/T2080QDS_SDCARD_defconfig @@ -38,6 +38,7 @@ CONFIG_ENV_IS_IN_MMC=y CONFIG_FSL_CAAM=y CONFIG_FSL_ESDHC=y CONFIG_MTD_NOR_FLASH=y +CONFIG_MTD_PARTITIONS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_EON=y CONFIG_SPI_FLASH_STMICRO=y diff --git a/configs/T2080QDS_SECURE_BOOT_defconfig b/configs/T2080QDS_SECURE_BOOT_defconfig index 34b1a385cf..9c13b050e7 100644 --- a/configs/T2080QDS_SECURE_BOOT_defconfig +++ b/configs/T2080QDS_SECURE_BOOT_defconfig @@ -28,6 +28,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=fe8000000.nor:1m(uboot),5m(kernel),128k(dtb),9 CONFIG_DM=y CONFIG_FSL_ESDHC=y CONFIG_MTD_NOR_FLASH=y +CONFIG_MTD_PARTITIONS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_EON=y CONFIG_SPI_FLASH_STMICRO=y diff --git a/configs/T2080QDS_SPIFLASH_defconfig b/configs/T2080QDS_SPIFLASH_defconfig index e3cd7911ba..16b449b95c 100644 --- a/configs/T2080QDS_SPIFLASH_defconfig +++ b/configs/T2080QDS_SPIFLASH_defconfig @@ -39,6 +39,7 @@ CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_FSL_CAAM=y CONFIG_FSL_ESDHC=y CONFIG_MTD_NOR_FLASH=y +CONFIG_MTD_PARTITIONS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_EON=y CONFIG_SPI_FLASH_STMICRO=y diff --git a/configs/T2080QDS_defconfig b/configs/T2080QDS_defconfig index 626feddff8..c4494b74e0 100644 --- a/configs/T2080QDS_defconfig +++ b/configs/T2080QDS_defconfig @@ -27,6 +27,7 @@ CONFIG_ENV_IS_IN_FLASH=y CONFIG_FSL_CAAM=y CONFIG_FSL_ESDHC=y CONFIG_MTD_NOR_FLASH=y +CONFIG_MTD_PARTITIONS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_EON=y CONFIG_SPI_FLASH_STMICRO=y diff --git a/configs/T2080RDB_NAND_defconfig b/configs/T2080RDB_NAND_defconfig index b7f55208af..8e79d6514f 100644 --- a/configs/T2080RDB_NAND_defconfig +++ b/configs/T2080RDB_NAND_defconfig @@ -40,6 +40,7 @@ CONFIG_ENV_IS_IN_NAND=y CONFIG_FSL_CAAM=y CONFIG_FSL_ESDHC=y CONFIG_MTD_NOR_FLASH=y +CONFIG_MTD_PARTITIONS=y CONFIG_NAND=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y diff --git a/configs/T2080RDB_SDCARD_defconfig b/configs/T2080RDB_SDCARD_defconfig index dc3a2231fb..a60ed6863c 100644 --- a/configs/T2080RDB_SDCARD_defconfig +++ b/configs/T2080RDB_SDCARD_defconfig @@ -40,6 +40,7 @@ CONFIG_ENV_IS_IN_MMC=y CONFIG_FSL_CAAM=y CONFIG_FSL_ESDHC=y CONFIG_MTD_NOR_FLASH=y +CONFIG_MTD_PARTITIONS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_PHYLIB=y diff --git a/configs/T2080RDB_SECURE_BOOT_defconfig b/configs/T2080RDB_SECURE_BOOT_defconfig index 44730c97cd..2ce91ba057 100644 --- a/configs/T2080RDB_SECURE_BOOT_defconfig +++ b/configs/T2080RDB_SECURE_BOOT_defconfig @@ -30,6 +30,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=fe8000000.nor:1m(uboot),5m(kernel),128k(dtb),9 CONFIG_DM=y CONFIG_FSL_ESDHC=y CONFIG_MTD_NOR_FLASH=y +CONFIG_MTD_PARTITIONS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_PHYLIB=y diff --git a/configs/T2080RDB_SPIFLASH_defconfig b/configs/T2080RDB_SPIFLASH_defconfig index 8a1194764b..ee894083ef 100644 --- a/configs/T2080RDB_SPIFLASH_defconfig +++ b/configs/T2080RDB_SPIFLASH_defconfig @@ -41,6 +41,7 @@ CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_FSL_CAAM=y CONFIG_FSL_ESDHC=y CONFIG_MTD_NOR_FLASH=y +CONFIG_MTD_PARTITIONS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_PHYLIB=y diff --git a/configs/T2080RDB_defconfig b/configs/T2080RDB_defconfig index 9dfc6c9e13..a168525cba 100644 --- a/configs/T2080RDB_defconfig +++ b/configs/T2080RDB_defconfig @@ -29,6 +29,7 @@ CONFIG_ENV_IS_IN_FLASH=y CONFIG_FSL_CAAM=y CONFIG_FSL_ESDHC=y CONFIG_MTD_NOR_FLASH=y +CONFIG_MTD_PARTITIONS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_PHYLIB=y diff --git a/configs/T2081QDS_NAND_defconfig b/configs/T2081QDS_NAND_defconfig index 3f8d6117ac..e0e36e5792 100644 --- a/configs/T2081QDS_NAND_defconfig +++ b/configs/T2081QDS_NAND_defconfig @@ -38,6 +38,7 @@ CONFIG_ENV_IS_IN_NAND=y CONFIG_FSL_CAAM=y CONFIG_FSL_ESDHC=y CONFIG_MTD_NOR_FLASH=y +CONFIG_MTD_PARTITIONS=y CONFIG_NAND=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_EON=y diff --git a/configs/T2081QDS_SDCARD_defconfig b/configs/T2081QDS_SDCARD_defconfig index 9a15eabe6e..341fabf075 100644 --- a/configs/T2081QDS_SDCARD_defconfig +++ b/configs/T2081QDS_SDCARD_defconfig @@ -38,6 +38,7 @@ CONFIG_ENV_IS_IN_MMC=y CONFIG_FSL_CAAM=y CONFIG_FSL_ESDHC=y CONFIG_MTD_NOR_FLASH=y +CONFIG_MTD_PARTITIONS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_EON=y CONFIG_SPI_FLASH_STMICRO=y diff --git a/configs/T2081QDS_SPIFLASH_defconfig b/configs/T2081QDS_SPIFLASH_defconfig index fc7115a6e3..3a03a173ae 100644 --- a/configs/T2081QDS_SPIFLASH_defconfig +++ b/configs/T2081QDS_SPIFLASH_defconfig @@ -39,6 +39,7 @@ CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_FSL_CAAM=y CONFIG_FSL_ESDHC=y CONFIG_MTD_NOR_FLASH=y +CONFIG_MTD_PARTITIONS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_EON=y CONFIG_SPI_FLASH_STMICRO=y diff --git a/configs/T2081QDS_defconfig b/configs/T2081QDS_defconfig index 1c15a7ee47..0c3e898546 100644 --- a/configs/T2081QDS_defconfig +++ b/configs/T2081QDS_defconfig @@ -27,6 +27,7 @@ CONFIG_ENV_IS_IN_FLASH=y CONFIG_FSL_CAAM=y CONFIG_FSL_ESDHC=y CONFIG_MTD_NOR_FLASH=y +CONFIG_MTD_PARTITIONS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_EON=y CONFIG_SPI_FLASH_STMICRO=y diff --git a/configs/TQM834x_defconfig b/configs/TQM834x_defconfig index 4d730e24ed..229ad92634 100644 --- a/configs/TQM834x_defconfig +++ b/configs/TQM834x_defconfig @@ -24,6 +24,7 @@ CONFIG_MTDIDS_DEFAULT="nor0=TQM834x-0" CONFIG_MTDPARTS_DEFAULT="mtdparts=TQM834x-0:256k(u-boot),256k(env),1m(kernel),2m(initrd),-(user);" # CONFIG_MMC is not set CONFIG_MTD_NOR_FLASH=y +CONFIG_MTD_DEVICE=y CONFIG_PHY_MARVELL=y CONFIG_NETDEVICES=y CONFIG_TSEC_ENET=y diff --git a/configs/TWR-P1025_defconfig b/configs/TWR-P1025_defconfig index 2770e47ed0..beb16a7ba5 100644 --- a/configs/TWR-P1025_defconfig +++ b/configs/TWR-P1025_defconfig @@ -31,6 +31,8 @@ CONFIG_ENV_IS_IN_FLASH=y CONFIG_SATA_SIL3114=y CONFIG_FSL_ESDHC=y CONFIG_MTD_NOR_FLASH=y +CONFIG_MTD_DEVICE=y +CONFIG_MTD_PARTITIONS=y CONFIG_PHY_MARVELL=y CONFIG_NETDEVICES=y CONFIG_PHY_GIGE=y diff --git a/configs/alt_defconfig b/configs/alt_defconfig index b7b64f6dd4..46dc0a5084 100644 --- a/configs/alt_defconfig +++ b/configs/alt_defconfig @@ -62,6 +62,8 @@ CONFIG_DM_MMC=y CONFIG_SH_MMCIF=y CONFIG_RENESAS_SDHI=y CONFIG_MTD=y +CONFIG_MTD_DEVICE=y +CONFIG_MTD_PARTITIONS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_BAR=y CONFIG_SPI_FLASH_SPANSION=y diff --git a/configs/am335x_evm_norboot_defconfig b/configs/am335x_evm_norboot_defconfig index ea0eebb54b..1d7233ecd9 100644 --- a/configs/am335x_evm_norboot_defconfig +++ b/configs/am335x_evm_norboot_defconfig @@ -23,6 +23,7 @@ CONFIG_DFU_RAM=y CONFIG_USB_FUNCTION_FASTBOOT=y CONFIG_MMC_OMAP_HS=y CONFIG_MTD_NOR_FLASH=y +CONFIG_MTD_DEVICE=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_WINBOND=y CONFIG_DRIVER_TI_CPSW=y diff --git a/configs/am335x_evm_spiboot_defconfig b/configs/am335x_evm_spiboot_defconfig index 9408f04559..c36fabdec4 100644 --- a/configs/am335x_evm_spiboot_defconfig +++ b/configs/am335x_evm_spiboot_defconfig @@ -27,6 +27,7 @@ CONFIG_DFU_MMC=y CONFIG_DFU_RAM=y CONFIG_USB_FUNCTION_FASTBOOT=y CONFIG_MMC_OMAP_HS=y +CONFIG_MTD_DEVICE=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_WINBOND=y CONFIG_DRIVER_TI_CPSW=y diff --git a/configs/at91sam9n12ek_mmc_defconfig b/configs/at91sam9n12ek_mmc_defconfig index 086a07ffb7..acc94feab2 100644 --- a/configs/at91sam9n12ek_mmc_defconfig +++ b/configs/at91sam9n12ek_mmc_defconfig @@ -38,6 +38,7 @@ CONFIG_DM_GPIO=y CONFIG_AT91_GPIO=y CONFIG_DM_MMC=y CONFIG_GENERIC_ATMEL_MCI=y +CONFIG_MTD_PARTITIONS=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_ATMEL=y diff --git a/configs/at91sam9n12ek_nandflash_defconfig b/configs/at91sam9n12ek_nandflash_defconfig index 75205a615d..6a38c56e40 100644 --- a/configs/at91sam9n12ek_nandflash_defconfig +++ b/configs/at91sam9n12ek_nandflash_defconfig @@ -38,6 +38,7 @@ CONFIG_DM_GPIO=y CONFIG_AT91_GPIO=y CONFIG_DM_MMC=y CONFIG_GENERIC_ATMEL_MCI=y +CONFIG_MTD_PARTITIONS=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_ATMEL=y diff --git a/configs/at91sam9n12ek_spiflash_defconfig b/configs/at91sam9n12ek_spiflash_defconfig index 3a8c61c127..0964676746 100644 --- a/configs/at91sam9n12ek_spiflash_defconfig +++ b/configs/at91sam9n12ek_spiflash_defconfig @@ -38,6 +38,7 @@ CONFIG_DM_GPIO=y CONFIG_AT91_GPIO=y CONFIG_DM_MMC=y CONFIG_GENERIC_ATMEL_MCI=y +CONFIG_MTD_PARTITIONS=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_ATMEL=y diff --git a/configs/bitmain_antminer_s9_defconfig b/configs/bitmain_antminer_s9_defconfig index 40bce4e374..f007b60f8e 100644 --- a/configs/bitmain_antminer_s9_defconfig +++ b/configs/bitmain_antminer_s9_defconfig @@ -53,6 +53,7 @@ CONFIG_FPGA_ZYNQPL=y CONFIG_DM_GPIO=y CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_ZYNQ=y +CONFIG_MTD_DEVICE=y CONFIG_NAND=y CONFIG_NAND_ZYNQ=y CONFIG_NAND_ZYNQ_USE_BOOTLOADER1_TIMINGS=y diff --git a/configs/brppt1_spi_defconfig b/configs/brppt1_spi_defconfig index 140a7ddfef..664286f161 100644 --- a/configs/brppt1_spi_defconfig +++ b/configs/brppt1_spi_defconfig @@ -58,6 +58,7 @@ CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_NETCONSOLE=y CONFIG_BOOTCOUNT_LIMIT=y CONFIG_MMC_OMAP_HS=y +CONFIG_MTD_DEVICE=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y # CONFIG_SPI_FLASH_USE_4K_SECTORS is not set diff --git a/configs/cm_fx6_defconfig b/configs/cm_fx6_defconfig index f10903ea45..d5327194c1 100644 --- a/configs/cm_fx6_defconfig +++ b/configs/cm_fx6_defconfig @@ -51,6 +51,7 @@ CONFIG_DWC_AHSATA=y CONFIG_DM_KEYBOARD=y CONFIG_DM_MMC=y CONFIG_FSL_ESDHC=y +CONFIG_MTD_PARTITIONS=y CONFIG_NAND=y CONFIG_NAND_MXS=y CONFIG_SPI_FLASH=y diff --git a/configs/cm_t3517_defconfig b/configs/cm_t3517_defconfig index f41f267d5f..fa7f336739 100644 --- a/configs/cm_t3517_defconfig +++ b/configs/cm_t3517_defconfig @@ -39,6 +39,7 @@ CONFIG_LED_STATUS_STATE=2 CONFIG_LED_STATUS_BOOT_ENABLE=y CONFIG_LED_STATUS_BOOT=0 CONFIG_MMC_OMAP_HS=y +CONFIG_MTD_PARTITIONS=y CONFIG_NAND=y CONFIG_NETDEVICES=y CONFIG_SMC911X=y diff --git a/configs/cm_t35_defconfig b/configs/cm_t35_defconfig index 8548ceba71..30a745210a 100644 --- a/configs/cm_t35_defconfig +++ b/configs/cm_t35_defconfig @@ -39,6 +39,7 @@ CONFIG_LED_STATUS_STATE=2 CONFIG_LED_STATUS_BOOT_ENABLE=y CONFIG_LED_STATUS_BOOT=0 CONFIG_MMC_OMAP_HS=y +CONFIG_MTD_PARTITIONS=y CONFIG_NAND=y CONFIG_SPL_NAND_SIMPLE=y CONFIG_NETDEVICES=y diff --git a/configs/corvus_defconfig b/configs/corvus_defconfig index 0f91f6e8f0..93a014645a 100644 --- a/configs/corvus_defconfig +++ b/configs/corvus_defconfig @@ -40,6 +40,7 @@ CONFIG_CLK=y CONFIG_CLK_AT91=y CONFIG_DFU_NAND=y # CONFIG_MMC is not set +CONFIG_MTD_PARTITIONS=y CONFIG_PHYLIB=y CONFIG_ATMEL_USART=y CONFIG_USB=y diff --git a/configs/da850_am18xxevm_defconfig b/configs/da850_am18xxevm_defconfig index c76321fb47..9283bf9da1 100644 --- a/configs/da850_am18xxevm_defconfig +++ b/configs/da850_am18xxevm_defconfig @@ -37,6 +37,8 @@ CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_DM=y CONFIG_DM_I2C=y CONFIG_DM_I2C_COMPAT=y +CONFIG_MTD_DEVICE=y +CONFIG_MTD_PARTITIONS=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y diff --git a/configs/da850evm_defconfig b/configs/da850evm_defconfig index 6a2b7ae670..3c22932f48 100644 --- a/configs/da850evm_defconfig +++ b/configs/da850evm_defconfig @@ -39,6 +39,8 @@ CONFIG_DM=y CONFIG_DM_GPIO=y CONFIG_DM_I2C=y CONFIG_DM_I2C_COMPAT=y +CONFIG_MTD_DEVICE=y +CONFIG_MTD_PARTITIONS=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y diff --git a/configs/display5_defconfig b/configs/display5_defconfig index f51fbd4aa5..2a85cf1074 100644 --- a/configs/display5_defconfig +++ b/configs/display5_defconfig @@ -11,7 +11,6 @@ CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL=y CONFIG_SPL_SPI_FLASH_SUPPORT=y CONFIG_SPL_SPI_SUPPORT=y -CONFIG_SPL_WATCHDOG_SUPPORT=y CONFIG_DEFAULT_DEVICE_TREE="imx6q-display5" CONFIG_FIT=y CONFIG_SPL_LOAD_FIT=y @@ -26,6 +25,7 @@ CONFIG_SPL_SAVEENV=y CONFIG_SPL_I2C_SUPPORT=y CONFIG_SPL_OS_BOOT=y CONFIG_SPL_SPI_LOAD=y +CONFIG_SPL_WATCHDOG_SUPPORT=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="display5 > " CONFIG_CMD_BOOTZ=y @@ -59,6 +59,8 @@ CONFIG_BOOTCOUNT_LIMIT=y CONFIG_SYS_BOOTCOUNT_SINGLEWORD=y CONFIG_SYS_BOOTCOUNT_ADDR=0x020CC068 CONFIG_FSL_ESDHC=y +CONFIG_MTD_DEVICE=y +CONFIG_MTD_PARTITIONS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_BAR=y CONFIG_SPI_FLASH_SPANSION=y diff --git a/configs/display5_factory_defconfig b/configs/display5_factory_defconfig index 14df849fb7..3cd2d6c888 100644 --- a/configs/display5_factory_defconfig +++ b/configs/display5_factory_defconfig @@ -9,7 +9,6 @@ CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL=y CONFIG_SPL_SPI_FLASH_SUPPORT=y CONFIG_SPL_SPI_SUPPORT=y -CONFIG_SPL_WATCHDOG_SUPPORT=y CONFIG_FIT=y CONFIG_OF_BOARD_SETUP=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg,MX6Q" @@ -26,6 +25,7 @@ CONFIG_SPL_SPI_LOAD=y CONFIG_SPL_USB_HOST_SUPPORT=y CONFIG_SPL_USB_GADGET_SUPPORT=y CONFIG_SPL_USB_SDP_SUPPORT=y +CONFIG_SPL_WATCHDOG_SUPPORT=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="display5 factory > " CONFIG_CMD_BOOTZ=y @@ -61,6 +61,8 @@ CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_DFU_MMC=y CONFIG_DFU_SF=y CONFIG_FSL_ESDHC=y +CONFIG_MTD_DEVICE=y +CONFIG_MTD_PARTITIONS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_BAR=y CONFIG_SPI_FLASH_SPANSION=y diff --git a/configs/ds414_defconfig b/configs/ds414_defconfig index 21602a77fc..e8f50f388c 100644 --- a/configs/ds414_defconfig +++ b/configs/ds414_defconfig @@ -40,6 +40,7 @@ CONFIG_ISO_PARTITION=y CONFIG_NET_RANDOM_ETHADDR=y CONFIG_SPL_OF_TRANSLATE=y # CONFIG_MMC is not set +CONFIG_MTD_DEVICE=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_BAR=y CONFIG_SPI_FLASH_STMICRO=y diff --git a/configs/flea3_defconfig b/configs/flea3_defconfig index 6bb83a0528..f116b45437 100644 --- a/configs/flea3_defconfig +++ b/configs/flea3_defconfig @@ -23,6 +23,7 @@ CONFIG_ENV_IS_IN_FLASH=y CONFIG_MXC_GPIO=y # CONFIG_MMC is not set CONFIG_MTD_NOR_FLASH=y +CONFIG_MTD_PARTITIONS=y CONFIG_NAND=y CONFIG_NAND_MXC=y CONFIG_PHYLIB=y diff --git a/configs/gose_defconfig b/configs/gose_defconfig index 50f15181e9..4b41893497 100644 --- a/configs/gose_defconfig +++ b/configs/gose_defconfig @@ -61,6 +61,8 @@ CONFIG_SYS_I2C_RCAR_IIC=y CONFIG_DM_MMC=y CONFIG_RENESAS_SDHI=y CONFIG_MTD=y +CONFIG_MTD_DEVICE=y +CONFIG_MTD_PARTITIONS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_BAR=y CONFIG_SPI_FLASH_SPANSION=y diff --git a/configs/gwventana_emmc_defconfig b/configs/gwventana_emmc_defconfig index dbb9fba4d9..4394842f20 100644 --- a/configs/gwventana_emmc_defconfig +++ b/configs/gwventana_emmc_defconfig @@ -58,6 +58,7 @@ CONFIG_DM=y CONFIG_DWC_AHSATA=y CONFIG_SUPPORT_EMMC_RPMB=y CONFIG_FSL_ESDHC=y +CONFIG_MTD_DEVICE=y CONFIG_PHYLIB=y CONFIG_NETDEVICES=y CONFIG_E1000=y diff --git a/configs/gwventana_gw5904_defconfig b/configs/gwventana_gw5904_defconfig index 366daefdc1..ef4785055e 100644 --- a/configs/gwventana_gw5904_defconfig +++ b/configs/gwventana_gw5904_defconfig @@ -58,6 +58,7 @@ CONFIG_DM=y CONFIG_DWC_AHSATA=y CONFIG_SUPPORT_EMMC_RPMB=y CONFIG_FSL_ESDHC=y +CONFIG_MTD_DEVICE=y CONFIG_PHYLIB=y CONFIG_MV88E61XX_SWITCH=y CONFIG_MV88E61XX_CPU_PORT=5 diff --git a/configs/hikey_defconfig b/configs/hikey_defconfig index 58eb8234df..15301b2f88 100644 --- a/configs/hikey_defconfig +++ b/configs/hikey_defconfig @@ -18,6 +18,7 @@ CONFIG_ENV_FAT_INTERFACE="mmc" CONFIG_ENV_FAT_DEVICE_AND_PART="1:1" CONFIG_MMC_DW=y CONFIG_MMC_DW_K3=y +CONFIG_MTD_PARTITIONS=y CONFIG_CONS_INDEX=4 CONFIG_USB=y CONFIG_USB_DWC2=y diff --git a/configs/imx6q_logic_defconfig b/configs/imx6q_logic_defconfig index f0974bfa15..022dbde21b 100644 --- a/configs/imx6q_logic_defconfig +++ b/configs/imx6q_logic_defconfig @@ -27,6 +27,7 @@ CONFIG_ENV_IS_IN_NAND=y CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y CONFIG_SYS_I2C_MXC=y CONFIG_FSL_ESDHC=y +CONFIG_MTD_PARTITIONS=y CONFIG_NAND=y CONFIG_NAND_MXS=y CONFIG_PHYLIB=y diff --git a/configs/k2g_evm_defconfig b/configs/k2g_evm_defconfig index ede8f6a701..2f69207f84 100644 --- a/configs/k2g_evm_defconfig +++ b/configs/k2g_evm_defconfig @@ -36,6 +36,7 @@ CONFIG_DM=y # CONFIG_BLK is not set CONFIG_DM_MMC=y CONFIG_MMC_OMAP_HS=y +CONFIG_MTD_DEVICE=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_BAR=y diff --git a/configs/k2g_hs_evm_defconfig b/configs/k2g_hs_evm_defconfig index 04f4b02a09..87b558a548 100644 --- a/configs/k2g_hs_evm_defconfig +++ b/configs/k2g_hs_evm_defconfig @@ -29,6 +29,7 @@ CONFIG_DM=y # CONFIG_BLK is not set CONFIG_DM_MMC=y CONFIG_MMC_OMAP_HS=y +CONFIG_MTD_DEVICE=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_BAR=y diff --git a/configs/kmeter1_defconfig b/configs/kmeter1_defconfig index e64a6936db..9aad99982a 100644 --- a/configs/kmeter1_defconfig +++ b/configs/kmeter1_defconfig @@ -29,6 +29,7 @@ CONFIG_BOOTCOUNT_LIMIT=y CONFIG_SYS_BOOTCOUNT_ADDR=0xE011BFF8 # CONFIG_MMC is not set CONFIG_MTD_NOR_FLASH=y +CONFIG_MTD_DEVICE=y # CONFIG_PCI is not set CONFIG_SYS_NS16550=y CONFIG_OF_LIBFDT=y diff --git a/configs/kmopti2_defconfig b/configs/kmopti2_defconfig index c6ad62255d..d8da1c4b18 100644 --- a/configs/kmopti2_defconfig +++ b/configs/kmopti2_defconfig @@ -29,6 +29,7 @@ CONFIG_BOOTCOUNT_LIMIT=y CONFIG_SYS_BOOTCOUNT_ADDR=0xE0113FF8 # CONFIG_MMC is not set CONFIG_MTD_NOR_FLASH=y +CONFIG_MTD_DEVICE=y # CONFIG_PCI is not set CONFIG_SYS_NS16550=y CONFIG_OF_LIBFDT=y diff --git a/configs/kmsupx5_defconfig b/configs/kmsupx5_defconfig index eb4c4b433b..79d5f923ff 100644 --- a/configs/kmsupx5_defconfig +++ b/configs/kmsupx5_defconfig @@ -29,6 +29,7 @@ CONFIG_BOOTCOUNT_LIMIT=y CONFIG_SYS_BOOTCOUNT_ADDR=0xE0113FF8 # CONFIG_MMC is not set CONFIG_MTD_NOR_FLASH=y +CONFIG_MTD_DEVICE=y # CONFIG_PCI is not set CONFIG_SYS_NS16550=y CONFIG_OF_LIBFDT=y diff --git a/configs/kmtepr2_defconfig b/configs/kmtepr2_defconfig index cf17002d56..c47341e160 100644 --- a/configs/kmtepr2_defconfig +++ b/configs/kmtepr2_defconfig @@ -29,6 +29,7 @@ CONFIG_BOOTCOUNT_LIMIT=y CONFIG_SYS_BOOTCOUNT_ADDR=0xE0113FF8 # CONFIG_MMC is not set CONFIG_MTD_NOR_FLASH=y +CONFIG_MTD_DEVICE=y # CONFIG_PCI is not set CONFIG_SYS_NS16550=y CONFIG_OF_LIBFDT=y diff --git a/configs/kmvect1_defconfig b/configs/kmvect1_defconfig index b148f80346..281a82e0ca 100644 --- a/configs/kmvect1_defconfig +++ b/configs/kmvect1_defconfig @@ -30,6 +30,7 @@ CONFIG_BOOTCOUNT_LIMIT=y CONFIG_SYS_BOOTCOUNT_ADDR=0xE0113FF8 # CONFIG_MMC is not set CONFIG_MTD_NOR_FLASH=y +CONFIG_MTD_DEVICE=y # CONFIG_PCI is not set CONFIG_SYS_NS16550=y CONFIG_OF_LIBFDT=y diff --git a/configs/koelsch_defconfig b/configs/koelsch_defconfig index 90a2c282fd..c3500d2ada 100644 --- a/configs/koelsch_defconfig +++ b/configs/koelsch_defconfig @@ -61,6 +61,8 @@ CONFIG_SYS_I2C_RCAR_IIC=y CONFIG_DM_MMC=y CONFIG_RENESAS_SDHI=y CONFIG_MTD=y +CONFIG_MTD_DEVICE=y +CONFIG_MTD_PARTITIONS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_BAR=y CONFIG_SPI_FLASH_SPANSION=y diff --git a/configs/lager_defconfig b/configs/lager_defconfig index 688e8d5ead..d8cae4fa44 100644 --- a/configs/lager_defconfig +++ b/configs/lager_defconfig @@ -63,6 +63,8 @@ CONFIG_DM_MMC=y CONFIG_SH_MMCIF=y CONFIG_RENESAS_SDHI=y CONFIG_MTD=y +CONFIG_MTD_DEVICE=y +CONFIG_MTD_PARTITIONS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_BAR=y CONFIG_SPI_FLASH_SPANSION=y diff --git a/configs/mccmon6_nor_defconfig b/configs/mccmon6_nor_defconfig index cb5012e4de..93cf3eef27 100644 --- a/configs/mccmon6_nor_defconfig +++ b/configs/mccmon6_nor_defconfig @@ -29,6 +29,8 @@ CONFIG_DM=y CONFIG_FSL_ESDHC=y CONFIG_MTD=y CONFIG_MTD_NOR_FLASH=y +CONFIG_MTD_DEVICE=y +CONFIG_MTD_PARTITIONS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_SPANSION=y CONFIG_PHYLIB=y diff --git a/configs/mccmon6_sd_defconfig b/configs/mccmon6_sd_defconfig index b40e6f47e5..2abaa82a35 100644 --- a/configs/mccmon6_sd_defconfig +++ b/configs/mccmon6_sd_defconfig @@ -30,6 +30,8 @@ CONFIG_DM=y CONFIG_FSL_ESDHC=y CONFIG_MTD=y CONFIG_MTD_NOR_FLASH=y +CONFIG_MTD_DEVICE=y +CONFIG_MTD_PARTITIONS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_SPANSION=y CONFIG_PHYLIB=y diff --git a/configs/microblaze-generic_defconfig b/configs/microblaze-generic_defconfig index 6ba70223e2..4f7d86c485 100644 --- a/configs/microblaze-generic_defconfig +++ b/configs/microblaze-generic_defconfig @@ -41,6 +41,8 @@ CONFIG_NETCONSOLE=y CONFIG_SPL_DM=y CONFIG_XILINX_GPIO=y CONFIG_MTD_NOR_FLASH=y +CONFIG_MTD_DEVICE=y +CONFIG_MTD_PARTITIONS=y CONFIG_PHY_ATHEROS=y CONFIG_PHY_BROADCOM=y CONFIG_PHY_DAVICOM=y diff --git a/configs/mx35pdk_defconfig b/configs/mx35pdk_defconfig index 468b540a14..4178aa7d61 100644 --- a/configs/mx35pdk_defconfig +++ b/configs/mx35pdk_defconfig @@ -27,6 +27,7 @@ CONFIG_ENV_IS_IN_FLASH=y CONFIG_MXC_GPIO=y CONFIG_FSL_ESDHC=y CONFIG_MTD_NOR_FLASH=y +CONFIG_MTD_PARTITIONS=y CONFIG_NAND=y CONFIG_NAND_MXC=y CONFIG_NETDEVICES=y diff --git a/configs/pfla02_defconfig b/configs/pfla02_defconfig index 0a03854e70..67d3ddd4ea 100644 --- a/configs/pfla02_defconfig +++ b/configs/pfla02_defconfig @@ -40,6 +40,7 @@ CONFIG_CMD_UBI=y CONFIG_DM=y CONFIG_FSL_ESDHC=y CONFIG_MTD=y +CONFIG_MTD_DEVICE=y CONFIG_NAND=y CONFIG_NAND_MXS=y CONFIG_SPI_FLASH=y diff --git a/configs/porter_defconfig b/configs/porter_defconfig index 17937aa346..6efa641c23 100644 --- a/configs/porter_defconfig +++ b/configs/porter_defconfig @@ -61,6 +61,8 @@ CONFIG_SYS_I2C_RCAR_IIC=y CONFIG_DM_MMC=y CONFIG_RENESAS_SDHI=y CONFIG_MTD=y +CONFIG_MTD_DEVICE=y +CONFIG_MTD_PARTITIONS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_BAR=y CONFIG_SPI_FLASH_SPANSION=y diff --git a/configs/r8a77995_draak_defconfig b/configs/r8a77995_draak_defconfig index f451950add..2897a3e141 100644 --- a/configs/r8a77995_draak_defconfig +++ b/configs/r8a77995_draak_defconfig @@ -45,6 +45,7 @@ CONFIG_MMC_HS200_SUPPORT=y CONFIG_RENESAS_SDHI=y CONFIG_MTD=y CONFIG_MTD_NOR_FLASH=y +CONFIG_MTD_DEVICE=y CONFIG_CFI_FLASH=y CONFIG_RENESAS_RPC_HF=y CONFIG_PHY_MICREL=y diff --git a/configs/s5pc210_universal_defconfig b/configs/s5pc210_universal_defconfig index e14db986dd..a1c67a3861 100644 --- a/configs/s5pc210_universal_defconfig +++ b/configs/s5pc210_universal_defconfig @@ -32,6 +32,8 @@ CONFIG_MMC_DW=y CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_SDMA=y CONFIG_MMC_SDHCI_S5P=y +CONFIG_MTD_DEVICE=y +CONFIG_MTD_PARTITIONS=y CONFIG_DM_PMIC=y CONFIG_DM_PMIC_MAX8998=y CONFIG_USB=y diff --git a/configs/silk_defconfig b/configs/silk_defconfig index 0d0a13aef6..0437c39e75 100644 --- a/configs/silk_defconfig +++ b/configs/silk_defconfig @@ -63,6 +63,8 @@ CONFIG_DM_MMC=y CONFIG_SH_MMCIF=y CONFIG_RENESAS_SDHI=y CONFIG_MTD=y +CONFIG_MTD_DEVICE=y +CONFIG_MTD_PARTITIONS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_BAR=y CONFIG_SPI_FLASH_SPANSION=y diff --git a/configs/smartweb_defconfig b/configs/smartweb_defconfig index 1f246e32ed..8219c15fac 100644 --- a/configs/smartweb_defconfig +++ b/configs/smartweb_defconfig @@ -43,6 +43,7 @@ CONFIG_CLK=y CONFIG_CLK_AT91=y CONFIG_DFU_NAND=y # CONFIG_MMC is not set +CONFIG_MTD_PARTITIONS=y CONFIG_PHYLIB=y CONFIG_USB=y CONFIG_DM_USB=y diff --git a/configs/smdkc100_defconfig b/configs/smdkc100_defconfig index f4ffd53148..74e7b6b7fb 100644 --- a/configs/smdkc100_defconfig +++ b/configs/smdkc100_defconfig @@ -20,6 +20,8 @@ CONFIG_MTDIDS_DEFAULT="onenand0=s3c-onenand" CONFIG_MTDPARTS_DEFAULT="mtdparts=s3c-onenand:256k(bootloader),128k@0x40000(params),3m@0x60000(kernel),16m@0x360000(test),-(UBI)" CONFIG_ENV_IS_IN_ONENAND=y # CONFIG_MMC is not set +CONFIG_MTD_DEVICE=y +CONFIG_MTD_PARTITIONS=y CONFIG_NETDEVICES=y CONFIG_SMC911X=y CONFIG_SMC911X_BASE=0x98800300 diff --git a/configs/socfpga_arria10_defconfig b/configs/socfpga_arria10_defconfig index f3fea51c4a..4278bd06c8 100644 --- a/configs/socfpga_arria10_defconfig +++ b/configs/socfpga_arria10_defconfig @@ -32,5 +32,7 @@ CONFIG_FPGA_SOCFPGA=y CONFIG_DM_GPIO=y CONFIG_DWAPB_GPIO=y CONFIG_DM_MMC=y +CONFIG_MTD_DEVICE=y +CONFIG_MTD_PARTITIONS=y CONFIG_SPI=y CONFIG_USE_TINY_PRINTF=y diff --git a/configs/socfpga_arria5_defconfig b/configs/socfpga_arria5_defconfig index 41c98801be..9b18d3e4c9 100644 --- a/configs/socfpga_arria5_defconfig +++ b/configs/socfpga_arria5_defconfig @@ -48,6 +48,7 @@ CONFIG_DM_I2C=y CONFIG_SYS_I2C_DW=y CONFIG_DM_MMC=y CONFIG_MMC_DW=y +CONFIG_MTD_DEVICE=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_BAR=y CONFIG_SPI_FLASH_SPANSION=y diff --git a/configs/socfpga_cyclone5_defconfig b/configs/socfpga_cyclone5_defconfig index 76936da1d0..8ab97efcc5 100644 --- a/configs/socfpga_cyclone5_defconfig +++ b/configs/socfpga_cyclone5_defconfig @@ -48,6 +48,7 @@ CONFIG_DM_I2C=y CONFIG_SYS_I2C_DW=y CONFIG_DM_MMC=y CONFIG_MMC_DW=y +CONFIG_MTD_DEVICE=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_BAR=y CONFIG_SPI_FLASH_MACRONIX=y diff --git a/configs/socfpga_dbm_soc1_defconfig b/configs/socfpga_dbm_soc1_defconfig index 3659a6c323..e4468e9aa0 100644 --- a/configs/socfpga_dbm_soc1_defconfig +++ b/configs/socfpga_dbm_soc1_defconfig @@ -49,6 +49,8 @@ CONFIG_DM_I2C=y CONFIG_SYS_I2C_DW=y CONFIG_DM_MMC=y CONFIG_MMC_DW=y +CONFIG_MTD_DEVICE=y +CONFIG_MTD_PARTITIONS=y CONFIG_DM_ETH=y CONFIG_PHY_GIGE=y CONFIG_ETH_DESIGNWARE=y diff --git a/configs/socfpga_de0_nano_soc_defconfig b/configs/socfpga_de0_nano_soc_defconfig index 643542d2c9..d56cb7d5a3 100644 --- a/configs/socfpga_de0_nano_soc_defconfig +++ b/configs/socfpga_de0_nano_soc_defconfig @@ -48,6 +48,7 @@ CONFIG_DM_I2C=y CONFIG_SYS_I2C_DW=y CONFIG_DM_MMC=y CONFIG_MMC_DW=y +CONFIG_MTD_DEVICE=y CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ90X1=y CONFIG_DM_ETH=y diff --git a/configs/socfpga_de10_nano_defconfig b/configs/socfpga_de10_nano_defconfig index bf292fd79b..9f57f64ce6 100644 --- a/configs/socfpga_de10_nano_defconfig +++ b/configs/socfpga_de10_nano_defconfig @@ -44,6 +44,8 @@ CONFIG_DM_I2C=y CONFIG_SYS_I2C_DW=y CONFIG_DM_MMC=y CONFIG_MMC_DW=y +CONFIG_MTD_DEVICE=y +CONFIG_MTD_PARTITIONS=y CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ90X1=y CONFIG_DM_ETH=y diff --git a/configs/socfpga_de1_soc_defconfig b/configs/socfpga_de1_soc_defconfig index f1a7599735..34bb903ebf 100644 --- a/configs/socfpga_de1_soc_defconfig +++ b/configs/socfpga_de1_soc_defconfig @@ -43,6 +43,8 @@ CONFIG_DM_I2C=y CONFIG_SYS_I2C_DW=y CONFIG_DM_MMC=y CONFIG_MMC_DW=y +CONFIG_MTD_DEVICE=y +CONFIG_MTD_PARTITIONS=y CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ90X1=y CONFIG_DM_ETH=y diff --git a/configs/socfpga_is1_defconfig b/configs/socfpga_is1_defconfig index 655a4c314f..68a37f51cd 100644 --- a/configs/socfpga_is1_defconfig +++ b/configs/socfpga_is1_defconfig @@ -45,6 +45,7 @@ CONFIG_DWAPB_GPIO=y CONFIG_DM_I2C=y CONFIG_SYS_I2C_DW=y # CONFIG_MMC is not set +CONFIG_MTD_DEVICE=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_BAR=y CONFIG_SPI_FLASH_STMICRO=y diff --git a/configs/socfpga_sockit_defconfig b/configs/socfpga_sockit_defconfig index 006c4d127f..7c6c76ad19 100644 --- a/configs/socfpga_sockit_defconfig +++ b/configs/socfpga_sockit_defconfig @@ -48,6 +48,7 @@ CONFIG_DM_I2C=y CONFIG_SYS_I2C_DW=y CONFIG_DM_MMC=y CONFIG_MMC_DW=y +CONFIG_MTD_DEVICE=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_BAR=y CONFIG_SPI_FLASH_MACRONIX=y diff --git a/configs/socfpga_socrates_defconfig b/configs/socfpga_socrates_defconfig index dcbab53082..c5d5fa69f5 100644 --- a/configs/socfpga_socrates_defconfig +++ b/configs/socfpga_socrates_defconfig @@ -49,6 +49,7 @@ CONFIG_DM_I2C=y CONFIG_SYS_I2C_DW=y CONFIG_DM_MMC=y CONFIG_MMC_DW=y +CONFIG_MTD_DEVICE=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_BAR=y CONFIG_SPI_FLASH_MACRONIX=y diff --git a/configs/socfpga_sr1500_defconfig b/configs/socfpga_sr1500_defconfig index a65c69d146..71fc2fe8f9 100644 --- a/configs/socfpga_sr1500_defconfig +++ b/configs/socfpga_sr1500_defconfig @@ -50,6 +50,7 @@ CONFIG_DM_I2C=y CONFIG_SYS_I2C_DW=y CONFIG_DM_MMC=y CONFIG_MMC_DW=y +CONFIG_MTD_DEVICE=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_BAR=y CONFIG_SPI_FLASH_STMICRO=y diff --git a/configs/socfpga_vining_fpga_defconfig b/configs/socfpga_vining_fpga_defconfig index 6df9dcf58f..f0b4d46cb0 100644 --- a/configs/socfpga_vining_fpga_defconfig +++ b/configs/socfpga_vining_fpga_defconfig @@ -64,6 +64,7 @@ CONFIG_LED_STATUS_BIT3=65 CONFIG_LED_STATUS_CMD=y CONFIG_DM_MMC=y CONFIG_MMC_DW=y +CONFIG_MTD_DEVICE=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_SPANSION=y CONFIG_SPI_FLASH_STMICRO=y diff --git a/configs/spear300_defconfig b/configs/spear300_defconfig index 94620a88d1..579bd3e350 100644 --- a/configs/spear300_defconfig +++ b/configs/spear300_defconfig @@ -20,6 +20,8 @@ CONFIG_ENV_IS_IN_FLASH=y CONFIG_SYS_I2C_DW=y # CONFIG_MMC is not set CONFIG_MTD_NOR_FLASH=y +CONFIG_MTD_DEVICE=y +CONFIG_MTD_PARTITIONS=y CONFIG_NETDEVICES=y CONFIG_PHY_GIGE=y CONFIG_ETH_DESIGNWARE=y diff --git a/configs/spear300_nand_defconfig b/configs/spear300_nand_defconfig index c28633a013..ea94770cb7 100644 --- a/configs/spear300_nand_defconfig +++ b/configs/spear300_nand_defconfig @@ -20,6 +20,8 @@ CONFIG_ENV_IS_IN_NAND=y CONFIG_SYS_I2C_DW=y # CONFIG_MMC is not set CONFIG_MTD_NOR_FLASH=y +CONFIG_MTD_DEVICE=y +CONFIG_MTD_PARTITIONS=y CONFIG_NAND=y CONFIG_NETDEVICES=y CONFIG_PHY_GIGE=y diff --git a/configs/spear300_usbtty_defconfig b/configs/spear300_usbtty_defconfig index 5dd0ad70d9..2b370f38b4 100644 --- a/configs/spear300_usbtty_defconfig +++ b/configs/spear300_usbtty_defconfig @@ -20,6 +20,8 @@ CONFIG_ENV_IS_IN_FLASH=y CONFIG_SYS_I2C_DW=y # CONFIG_MMC is not set CONFIG_MTD_NOR_FLASH=y +CONFIG_MTD_DEVICE=y +CONFIG_MTD_PARTITIONS=y CONFIG_NETDEVICES=y CONFIG_PHY_GIGE=y CONFIG_ETH_DESIGNWARE=y diff --git a/configs/spear300_usbtty_nand_defconfig b/configs/spear300_usbtty_nand_defconfig index f1a1ec6978..89fbf20bc5 100644 --- a/configs/spear300_usbtty_nand_defconfig +++ b/configs/spear300_usbtty_nand_defconfig @@ -20,6 +20,8 @@ CONFIG_ENV_IS_IN_NAND=y CONFIG_SYS_I2C_DW=y # CONFIG_MMC is not set CONFIG_MTD_NOR_FLASH=y +CONFIG_MTD_DEVICE=y +CONFIG_MTD_PARTITIONS=y CONFIG_NAND=y CONFIG_NETDEVICES=y CONFIG_PHY_GIGE=y diff --git a/configs/spear310_defconfig b/configs/spear310_defconfig index 283d729e39..ffbc25d63f 100644 --- a/configs/spear310_defconfig +++ b/configs/spear310_defconfig @@ -20,6 +20,8 @@ CONFIG_ENV_IS_IN_FLASH=y CONFIG_SYS_I2C_DW=y # CONFIG_MMC is not set CONFIG_MTD_NOR_FLASH=y +CONFIG_MTD_DEVICE=y +CONFIG_MTD_PARTITIONS=y CONFIG_NETDEVICES=y CONFIG_PHY_GIGE=y CONFIG_ETH_DESIGNWARE=y diff --git a/configs/spear310_nand_defconfig b/configs/spear310_nand_defconfig index 4737bb5b25..c9981ee0ef 100644 --- a/configs/spear310_nand_defconfig +++ b/configs/spear310_nand_defconfig @@ -20,6 +20,8 @@ CONFIG_ENV_IS_IN_NAND=y CONFIG_SYS_I2C_DW=y # CONFIG_MMC is not set CONFIG_MTD_NOR_FLASH=y +CONFIG_MTD_DEVICE=y +CONFIG_MTD_PARTITIONS=y CONFIG_NAND=y CONFIG_NETDEVICES=y CONFIG_PHY_GIGE=y diff --git a/configs/spear310_pnor_defconfig b/configs/spear310_pnor_defconfig index 4a79746934..e31266f6a0 100644 --- a/configs/spear310_pnor_defconfig +++ b/configs/spear310_pnor_defconfig @@ -20,6 +20,8 @@ CONFIG_ENV_IS_IN_FLASH=y CONFIG_SYS_I2C_DW=y # CONFIG_MMC is not set CONFIG_MTD_NOR_FLASH=y +CONFIG_MTD_DEVICE=y +CONFIG_MTD_PARTITIONS=y CONFIG_NETDEVICES=y CONFIG_PHY_GIGE=y CONFIG_ETH_DESIGNWARE=y diff --git a/configs/spear310_usbtty_defconfig b/configs/spear310_usbtty_defconfig index aa039dae31..ebbbf9229e 100644 --- a/configs/spear310_usbtty_defconfig +++ b/configs/spear310_usbtty_defconfig @@ -20,6 +20,8 @@ CONFIG_ENV_IS_IN_FLASH=y CONFIG_SYS_I2C_DW=y # CONFIG_MMC is not set CONFIG_MTD_NOR_FLASH=y +CONFIG_MTD_DEVICE=y +CONFIG_MTD_PARTITIONS=y CONFIG_NETDEVICES=y CONFIG_PHY_GIGE=y CONFIG_ETH_DESIGNWARE=y diff --git a/configs/spear310_usbtty_nand_defconfig b/configs/spear310_usbtty_nand_defconfig index 071ac55e8d..6640d5f633 100644 --- a/configs/spear310_usbtty_nand_defconfig +++ b/configs/spear310_usbtty_nand_defconfig @@ -20,6 +20,8 @@ CONFIG_ENV_IS_IN_NAND=y CONFIG_SYS_I2C_DW=y # CONFIG_MMC is not set CONFIG_MTD_NOR_FLASH=y +CONFIG_MTD_DEVICE=y +CONFIG_MTD_PARTITIONS=y CONFIG_NAND=y CONFIG_NETDEVICES=y CONFIG_PHY_GIGE=y diff --git a/configs/spear310_usbtty_pnor_defconfig b/configs/spear310_usbtty_pnor_defconfig index 432ed437b7..d68cc45764 100644 --- a/configs/spear310_usbtty_pnor_defconfig +++ b/configs/spear310_usbtty_pnor_defconfig @@ -20,6 +20,8 @@ CONFIG_ENV_IS_IN_FLASH=y CONFIG_SYS_I2C_DW=y # CONFIG_MMC is not set CONFIG_MTD_NOR_FLASH=y +CONFIG_MTD_DEVICE=y +CONFIG_MTD_PARTITIONS=y CONFIG_NETDEVICES=y CONFIG_PHY_GIGE=y CONFIG_ETH_DESIGNWARE=y diff --git a/configs/spear320_defconfig b/configs/spear320_defconfig index 001828dc90..5d31874d2e 100644 --- a/configs/spear320_defconfig +++ b/configs/spear320_defconfig @@ -20,6 +20,8 @@ CONFIG_ENV_IS_IN_FLASH=y CONFIG_SYS_I2C_DW=y # CONFIG_MMC is not set CONFIG_MTD_NOR_FLASH=y +CONFIG_MTD_DEVICE=y +CONFIG_MTD_PARTITIONS=y CONFIG_NETDEVICES=y CONFIG_PHY_GIGE=y CONFIG_ETH_DESIGNWARE=y diff --git a/configs/spear320_nand_defconfig b/configs/spear320_nand_defconfig index 3667bf8498..65fdb1cd23 100644 --- a/configs/spear320_nand_defconfig +++ b/configs/spear320_nand_defconfig @@ -20,6 +20,8 @@ CONFIG_ENV_IS_IN_NAND=y CONFIG_SYS_I2C_DW=y # CONFIG_MMC is not set CONFIG_MTD_NOR_FLASH=y +CONFIG_MTD_DEVICE=y +CONFIG_MTD_PARTITIONS=y CONFIG_NAND=y CONFIG_NETDEVICES=y CONFIG_PHY_GIGE=y diff --git a/configs/spear320_pnor_defconfig b/configs/spear320_pnor_defconfig index 2dbd092a2a..cf81df2cdd 100644 --- a/configs/spear320_pnor_defconfig +++ b/configs/spear320_pnor_defconfig @@ -20,6 +20,8 @@ CONFIG_ENV_IS_IN_FLASH=y CONFIG_SYS_I2C_DW=y # CONFIG_MMC is not set CONFIG_MTD_NOR_FLASH=y +CONFIG_MTD_DEVICE=y +CONFIG_MTD_PARTITIONS=y CONFIG_NETDEVICES=y CONFIG_PHY_GIGE=y CONFIG_ETH_DESIGNWARE=y diff --git a/configs/spear320_usbtty_defconfig b/configs/spear320_usbtty_defconfig index fb1eade03e..9e9b12ffbd 100644 --- a/configs/spear320_usbtty_defconfig +++ b/configs/spear320_usbtty_defconfig @@ -20,6 +20,8 @@ CONFIG_ENV_IS_IN_FLASH=y CONFIG_SYS_I2C_DW=y # CONFIG_MMC is not set CONFIG_MTD_NOR_FLASH=y +CONFIG_MTD_DEVICE=y +CONFIG_MTD_PARTITIONS=y CONFIG_NETDEVICES=y CONFIG_PHY_GIGE=y CONFIG_ETH_DESIGNWARE=y diff --git a/configs/spear320_usbtty_nand_defconfig b/configs/spear320_usbtty_nand_defconfig index b39339aec9..f6045c83f4 100644 --- a/configs/spear320_usbtty_nand_defconfig +++ b/configs/spear320_usbtty_nand_defconfig @@ -20,6 +20,8 @@ CONFIG_ENV_IS_IN_NAND=y CONFIG_SYS_I2C_DW=y # CONFIG_MMC is not set CONFIG_MTD_NOR_FLASH=y +CONFIG_MTD_DEVICE=y +CONFIG_MTD_PARTITIONS=y CONFIG_NAND=y CONFIG_NETDEVICES=y CONFIG_PHY_GIGE=y diff --git a/configs/spear320_usbtty_pnor_defconfig b/configs/spear320_usbtty_pnor_defconfig index de995772aa..a94bf6393e 100644 --- a/configs/spear320_usbtty_pnor_defconfig +++ b/configs/spear320_usbtty_pnor_defconfig @@ -20,6 +20,8 @@ CONFIG_ENV_IS_IN_FLASH=y CONFIG_SYS_I2C_DW=y # CONFIG_MMC is not set CONFIG_MTD_NOR_FLASH=y +CONFIG_MTD_DEVICE=y +CONFIG_MTD_PARTITIONS=y CONFIG_NETDEVICES=y CONFIG_PHY_GIGE=y CONFIG_ETH_DESIGNWARE=y diff --git a/configs/spear600_defconfig b/configs/spear600_defconfig index 65693d7355..4969ec2b0c 100644 --- a/configs/spear600_defconfig +++ b/configs/spear600_defconfig @@ -23,6 +23,8 @@ CONFIG_ENV_IS_IN_FLASH=y CONFIG_SYS_I2C_DW=y # CONFIG_MMC is not set CONFIG_MTD_NOR_FLASH=y +CONFIG_MTD_DEVICE=y +CONFIG_MTD_PARTITIONS=y CONFIG_NETDEVICES=y CONFIG_PHY_GIGE=y CONFIG_ETH_DESIGNWARE=y diff --git a/configs/spear600_nand_defconfig b/configs/spear600_nand_defconfig index a279ec2af2..010bd43e13 100644 --- a/configs/spear600_nand_defconfig +++ b/configs/spear600_nand_defconfig @@ -20,6 +20,8 @@ CONFIG_ENV_IS_IN_NAND=y CONFIG_SYS_I2C_DW=y # CONFIG_MMC is not set CONFIG_MTD_NOR_FLASH=y +CONFIG_MTD_DEVICE=y +CONFIG_MTD_PARTITIONS=y CONFIG_NAND=y CONFIG_NETDEVICES=y CONFIG_PHY_GIGE=y diff --git a/configs/spear600_usbtty_defconfig b/configs/spear600_usbtty_defconfig index 7505ac0fd9..e66e818200 100644 --- a/configs/spear600_usbtty_defconfig +++ b/configs/spear600_usbtty_defconfig @@ -20,6 +20,8 @@ CONFIG_ENV_IS_IN_FLASH=y CONFIG_SYS_I2C_DW=y # CONFIG_MMC is not set CONFIG_MTD_NOR_FLASH=y +CONFIG_MTD_DEVICE=y +CONFIG_MTD_PARTITIONS=y CONFIG_NETDEVICES=y CONFIG_PHY_GIGE=y CONFIG_ETH_DESIGNWARE=y diff --git a/configs/spear600_usbtty_nand_defconfig b/configs/spear600_usbtty_nand_defconfig index fef9abe19f..5b9c8339da 100644 --- a/configs/spear600_usbtty_nand_defconfig +++ b/configs/spear600_usbtty_nand_defconfig @@ -20,6 +20,8 @@ CONFIG_ENV_IS_IN_NAND=y CONFIG_SYS_I2C_DW=y # CONFIG_MMC is not set CONFIG_MTD_NOR_FLASH=y +CONFIG_MTD_DEVICE=y +CONFIG_MTD_PARTITIONS=y CONFIG_NAND=y CONFIG_NETDEVICES=y CONFIG_PHY_GIGE=y diff --git a/configs/stmark2_defconfig b/configs/stmark2_defconfig index 671c0aa4d9..1b14aff00a 100644 --- a/configs/stmark2_defconfig +++ b/configs/stmark2_defconfig @@ -21,6 +21,7 @@ CONFIG_MTDIDS_DEFAULT="nor0=spi-flash.0" CONFIG_MTDPARTS_DEFAULT="mtdparts=spi-flash.0:1m(u-boot),7m(kernel),-(rootfs)" CONFIG_ENV_IS_IN_SPI_FLASH=y # CONFIG_NET is not set +CONFIG_MTD_DEVICE=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_MTD=y CONFIG_SPI=y diff --git a/configs/stout_defconfig b/configs/stout_defconfig index c6c91e98b0..2a6cea3322 100644 --- a/configs/stout_defconfig +++ b/configs/stout_defconfig @@ -61,6 +61,8 @@ CONFIG_SYS_I2C_RCAR_IIC=y CONFIG_DM_MMC=y CONFIG_RENESAS_SDHI=y CONFIG_MTD=y +CONFIG_MTD_DEVICE=y +CONFIG_MTD_PARTITIONS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_BAR=y CONFIG_SPI_FLASH_SPANSION=y diff --git a/configs/suvd3_defconfig b/configs/suvd3_defconfig index 48fc91f46b..ede7e7316c 100644 --- a/configs/suvd3_defconfig +++ b/configs/suvd3_defconfig @@ -29,6 +29,7 @@ CONFIG_BOOTCOUNT_LIMIT=y CONFIG_SYS_BOOTCOUNT_ADDR=0xE0113FF8 # CONFIG_MMC is not set CONFIG_MTD_NOR_FLASH=y +CONFIG_MTD_DEVICE=y # CONFIG_PCI is not set CONFIG_SYS_NS16550=y CONFIG_OF_LIBFDT=y diff --git a/configs/taurus_defconfig b/configs/taurus_defconfig index 20057be7e5..a441f10ae0 100644 --- a/configs/taurus_defconfig +++ b/configs/taurus_defconfig @@ -47,6 +47,7 @@ CONFIG_CLK=y CONFIG_CLK_AT91=y CONFIG_DFU_NAND=y # CONFIG_MMC is not set +CONFIG_MTD_PARTITIONS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_PHYLIB=y diff --git a/configs/tuge1_defconfig b/configs/tuge1_defconfig index 14f256abd4..4ace459571 100644 --- a/configs/tuge1_defconfig +++ b/configs/tuge1_defconfig @@ -29,6 +29,7 @@ CONFIG_BOOTCOUNT_LIMIT=y CONFIG_SYS_BOOTCOUNT_ADDR=0xE0113FF8 # CONFIG_MMC is not set CONFIG_MTD_NOR_FLASH=y +CONFIG_MTD_DEVICE=y # CONFIG_PCI is not set CONFIG_SYS_NS16550=y CONFIG_OF_LIBFDT=y diff --git a/configs/tuxx1_defconfig b/configs/tuxx1_defconfig index d3b9ca25b6..3e45802438 100644 --- a/configs/tuxx1_defconfig +++ b/configs/tuxx1_defconfig @@ -29,6 +29,7 @@ CONFIG_BOOTCOUNT_LIMIT=y CONFIG_SYS_BOOTCOUNT_ADDR=0xE0113FF8 # CONFIG_MMC is not set CONFIG_MTD_NOR_FLASH=y +CONFIG_MTD_DEVICE=y # CONFIG_PCI is not set CONFIG_SYS_NS16550=y CONFIG_OF_LIBFDT=y diff --git a/configs/uniphier_ld4_sld8_defconfig b/configs/uniphier_ld4_sld8_defconfig index e5c1deb184..610035a8af 100644 --- a/configs/uniphier_ld4_sld8_defconfig +++ b/configs/uniphier_ld4_sld8_defconfig @@ -39,6 +39,7 @@ CONFIG_MISC=y CONFIG_I2C_EEPROM=y CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS=10 CONFIG_MMC_UNIPHIER=y +CONFIG_MTD_DEVICE=y CONFIG_NAND=y CONFIG_NAND_DENALI_DT=y CONFIG_NAND_DENALI_SPARE_AREA_SKIP_BYTES=8 diff --git a/configs/uniphier_v7_defconfig b/configs/uniphier_v7_defconfig index 89b7b4a0a2..8dae587e01 100644 --- a/configs/uniphier_v7_defconfig +++ b/configs/uniphier_v7_defconfig @@ -38,6 +38,7 @@ CONFIG_MISC=y CONFIG_I2C_EEPROM=y CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS=10 CONFIG_MMC_UNIPHIER=y +CONFIG_MTD_DEVICE=y CONFIG_NAND=y CONFIG_NAND_DENALI_DT=y CONFIG_NAND_DENALI_SPARE_AREA_SKIP_BYTES=8 diff --git a/configs/uniphier_v8_defconfig b/configs/uniphier_v8_defconfig index 93df2f6bbc..235d1f5222 100644 --- a/configs/uniphier_v8_defconfig +++ b/configs/uniphier_v8_defconfig @@ -36,6 +36,7 @@ CONFIG_MMC_UNIPHIER=y CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_SDMA=y CONFIG_MMC_SDHCI_CADENCE=y +CONFIG_MTD_DEVICE=y CONFIG_NAND=y CONFIG_NAND_DENALI_DT=y CONFIG_NAND_DENALI_SPARE_AREA_SKIP_BYTES=8 diff --git a/configs/vct_platinum_onenand_defconfig b/configs/vct_platinum_onenand_defconfig index b1ac814058..d488fa1f68 100644 --- a/configs/vct_platinum_onenand_defconfig +++ b/configs/vct_platinum_onenand_defconfig @@ -22,6 +22,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=onenand:128k(u-boot),128k(env),20m(kernel),-(r CONFIG_CMD_UBI=y # CONFIG_CMD_UBIFS is not set CONFIG_ENV_IS_IN_ONENAND=y +CONFIG_MTD_DEVICE=y CONFIG_NETDEVICES=y CONFIG_SMC911X=y CONFIG_SMC911X_BASE=0x00000000 diff --git a/configs/vct_platinum_onenand_small_defconfig b/configs/vct_platinum_onenand_small_defconfig index f941f2d29c..6cbec32250 100644 --- a/configs/vct_platinum_onenand_small_defconfig +++ b/configs/vct_platinum_onenand_small_defconfig @@ -28,4 +28,5 @@ CONFIG_CMD_UBI=y # CONFIG_ISO_PARTITION is not set CONFIG_ENV_IS_IN_ONENAND=y # CONFIG_NET is not set +CONFIG_MTD_DEVICE=y CONFIG_SYS_NS16550=y diff --git a/configs/vct_platinumavc_onenand_defconfig b/configs/vct_platinumavc_onenand_defconfig index 8e219ecdc4..baa8397896 100644 --- a/configs/vct_platinumavc_onenand_defconfig +++ b/configs/vct_platinumavc_onenand_defconfig @@ -19,5 +19,6 @@ CONFIG_CMD_UBI=y # CONFIG_CMD_UBIFS is not set # CONFIG_ISO_PARTITION is not set CONFIG_ENV_IS_IN_ONENAND=y +CONFIG_MTD_DEVICE=y CONFIG_SYS_NS16550=y # CONFIG_REGEX is not set diff --git a/configs/vct_platinumavc_onenand_small_defconfig b/configs/vct_platinumavc_onenand_small_defconfig index 21d4c2db08..e5a848d930 100644 --- a/configs/vct_platinumavc_onenand_small_defconfig +++ b/configs/vct_platinumavc_onenand_small_defconfig @@ -28,4 +28,5 @@ CONFIG_CMD_UBI=y # CONFIG_ISO_PARTITION is not set CONFIG_ENV_IS_IN_ONENAND=y # CONFIG_NET is not set +CONFIG_MTD_DEVICE=y CONFIG_SYS_NS16550=y diff --git a/configs/vct_premium_onenand_defconfig b/configs/vct_premium_onenand_defconfig index 523ea486dc..c7c61426b1 100644 --- a/configs/vct_premium_onenand_defconfig +++ b/configs/vct_premium_onenand_defconfig @@ -22,6 +22,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=onenand:128k(u-boot),128k(env),20m(kernel),-(r CONFIG_CMD_UBI=y # CONFIG_CMD_UBIFS is not set CONFIG_ENV_IS_IN_ONENAND=y +CONFIG_MTD_DEVICE=y CONFIG_NETDEVICES=y CONFIG_SMC911X=y CONFIG_SMC911X_BASE=0x00000000 diff --git a/configs/vct_premium_onenand_small_defconfig b/configs/vct_premium_onenand_small_defconfig index 7b2d7152ee..e7d6f91c82 100644 --- a/configs/vct_premium_onenand_small_defconfig +++ b/configs/vct_premium_onenand_small_defconfig @@ -28,4 +28,5 @@ CONFIG_CMD_UBI=y # CONFIG_ISO_PARTITION is not set CONFIG_ENV_IS_IN_ONENAND=y # CONFIG_NET is not set +CONFIG_MTD_DEVICE=y CONFIG_SYS_NS16550=y diff --git a/configs/wb45n_defconfig b/configs/wb45n_defconfig index 6dc7c2efc4..63b0218acb 100644 --- a/configs/wb45n_defconfig +++ b/configs/wb45n_defconfig @@ -23,5 +23,7 @@ CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y CONFIG_ENV_IS_IN_NAND=y +CONFIG_MTD_DEVICE=y +CONFIG_MTD_PARTITIONS=y CONFIG_LZMA=y CONFIG_OF_LIBFDT=y diff --git a/configs/woodburn_defconfig b/configs/woodburn_defconfig index a42869f867..00bc7743b7 100644 --- a/configs/woodburn_defconfig +++ b/configs/woodburn_defconfig @@ -28,6 +28,7 @@ CONFIG_ENV_IS_IN_FLASH=y CONFIG_MXC_GPIO=y CONFIG_FSL_ESDHC=y CONFIG_MTD_NOR_FLASH=y +CONFIG_MTD_PARTITIONS=y CONFIG_NAND=y CONFIG_NAND_MXC=y CONFIG_PHYLIB=y diff --git a/configs/woodburn_sd_defconfig b/configs/woodburn_sd_defconfig index 4b1a54c2a5..9dc32bbfe0 100644 --- a/configs/woodburn_sd_defconfig +++ b/configs/woodburn_sd_defconfig @@ -39,6 +39,7 @@ CONFIG_ENV_IS_IN_FLASH=y CONFIG_MXC_GPIO=y CONFIG_FSL_ESDHC=y CONFIG_MTD_NOR_FLASH=y +CONFIG_MTD_PARTITIONS=y CONFIG_NAND=y CONFIG_NAND_MXC=y CONFIG_PHYLIB=y diff --git a/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig b/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig index b614acd79e..7dff5ae104 100644 --- a/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig +++ b/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig @@ -54,6 +54,7 @@ CONFIG_SYS_I2C_CADENCE=y CONFIG_MISC=y # CONFIG_MMC is not set CONFIG_DM_MMC=y +CONFIG_MTD_DEVICE=y CONFIG_NAND=y CONFIG_NAND_ARASAN=y CONFIG_SPI_FLASH=y diff --git a/configs/xilinx_zynqmp_zc1751_xm017_dc3_defconfig b/configs/xilinx_zynqmp_zc1751_xm017_dc3_defconfig index aa7cf978ce..934743f62c 100644 --- a/configs/xilinx_zynqmp_zc1751_xm017_dc3_defconfig +++ b/configs/xilinx_zynqmp_zc1751_xm017_dc3_defconfig @@ -53,6 +53,7 @@ CONFIG_MISC=y CONFIG_DM_MMC=y CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_ZYNQ=y +CONFIG_MTD_DEVICE=y CONFIG_NAND=y CONFIG_NAND_ARASAN=y CONFIG_PHY_MARVELL=y diff --git a/configs/zynq_zc770_xm011_defconfig b/configs/zynq_zc770_xm011_defconfig index af79f6ead2..1ec6ee4a0b 100644 --- a/configs/zynq_zc770_xm011_defconfig +++ b/configs/zynq_zc770_xm011_defconfig @@ -36,6 +36,7 @@ CONFIG_FPGA_XILINX=y CONFIG_FPGA_ZYNQPL=y CONFIG_DM_GPIO=y # CONFIG_MMC is not set +CONFIG_MTD_DEVICE=y CONFIG_NAND=y CONFIG_NAND_ZYNQ=y CONFIG_DEBUG_UART_ZYNQ=y diff --git a/configs/zynq_zc770_xm011_x16_defconfig b/configs/zynq_zc770_xm011_x16_defconfig index ac7a079ca0..f4ed082636 100644 --- a/configs/zynq_zc770_xm011_x16_defconfig +++ b/configs/zynq_zc770_xm011_x16_defconfig @@ -36,6 +36,7 @@ CONFIG_FPGA_XILINX=y CONFIG_FPGA_ZYNQPL=y CONFIG_DM_GPIO=y # CONFIG_MMC is not set +CONFIG_MTD_DEVICE=y CONFIG_NAND=y CONFIG_NAND_ZYNQ=y CONFIG_DEBUG_UART_ZYNQ=y diff --git a/drivers/mtd/Kconfig b/drivers/mtd/Kconfig index 707359dca1..41f8883ec2 100644 --- a/drivers/mtd/Kconfig +++ b/drivers/mtd/Kconfig @@ -13,6 +13,18 @@ config MTD_NOR_FLASH help Enable support for parallel NOR flash. +config MTD_DEVICE + bool "Enable MTD Device for NAND and ONENAND devices" + help + Adds the MTD device infrastructure from the Linux kernel. + Needed for mtdparts command support. + +config MTD_PARTITIONS + bool "Add MTD Partioning infrastructure" + help + Adds the MTD partitioning infrastructure from the Linux + kernel. Needed for UBI support. + config CFI_FLASH bool "Enable Driver Model for CFI Flash driver" depends on MTD diff --git a/include/configs/10m50_devboard.h b/include/configs/10m50_devboard.h index 1162663e4d..719a22d797 100644 --- a/include/configs/10m50_devboard.h +++ b/include/configs/10m50_devboard.h @@ -22,7 +22,6 @@ */ #define CONFIG_SYS_MAX_FLASH_BANKS 1 #define CONFIG_SYS_MAX_FLASH_SECT 1024 -#define CONFIG_MTD_DEVICE /* * NET options diff --git a/include/configs/BSC9131RDB.h b/include/configs/BSC9131RDB.h index 026e9df6d7..93366d1048 100644 --- a/include/configs/BSC9131RDB.h +++ b/include/configs/BSC9131RDB.h @@ -312,8 +312,6 @@ extern unsigned long get_sdram_size(void); /* * Dynamic MTD Partition support with mtdparts */ -#define CONFIG_MTD_DEVICE -#define CONFIG_MTD_PARTITIONS /* * Environment Configuration diff --git a/include/configs/BSC9132QDS.h b/include/configs/BSC9132QDS.h index 0756488d8e..0c1c2cd3e1 100644 --- a/include/configs/BSC9132QDS.h +++ b/include/configs/BSC9132QDS.h @@ -514,8 +514,6 @@ combinations. this should be removed later * Dynamic MTD Partition support with mtdparts */ #ifdef CONFIG_MTD_NOR_FLASH -#define CONFIG_MTD_DEVICE -#define CONFIG_MTD_PARTITIONS #define CONFIG_FLASH_CFI_MTD #endif /* diff --git a/include/configs/M54418TWR.h b/include/configs/M54418TWR.h index c252fb6312..a9d456c50b 100644 --- a/include/configs/M54418TWR.h +++ b/include/configs/M54418TWR.h @@ -284,14 +284,9 @@ #ifdef CONFIG_CMD_JFFS2 #define CONFIG_JFFS2_DEV "nand0" #define CONFIG_JFFS2_PART_OFFSET (0x800000) -#define CONFIG_MTD_DEVICE #endif -#ifdef CONFIG_CMD_UBI -#define CONFIG_MTD_DEVICE /* needed for mtdparts command */ -#define CONFIG_MTD_PARTITIONS /* mtdparts and UBI support */ -#endif /* Cache Configuration */ #define CONFIG_SYS_CACHELINE_SIZE 16 #define ICACHE_STATUS (CONFIG_SYS_INIT_RAM_ADDR + \ diff --git a/include/configs/MPC8313ERDB.h b/include/configs/MPC8313ERDB.h index 794d045d37..1f56deb151 100644 --- a/include/configs/MPC8313ERDB.h +++ b/include/configs/MPC8313ERDB.h @@ -249,7 +249,6 @@ #define CONFIG_SYS_NAND_BASE 0xE2800000 #endif -#define CONFIG_MTD_DEVICE #define CONFIG_MTD_PARTITION #define CONFIG_SYS_MAX_NAND_DEVICE 1 diff --git a/include/configs/MPC8315ERDB.h b/include/configs/MPC8315ERDB.h index 1daf9102f4..e61cf64f65 100644 --- a/include/configs/MPC8315ERDB.h +++ b/include/configs/MPC8315ERDB.h @@ -228,7 +228,6 @@ #define CONFIG_SYS_NAND_BASE 0xE0600000 #endif -#define CONFIG_MTD_DEVICE #define CONFIG_MTD_PARTITION #define CONFIG_SYS_MAX_NAND_DEVICE 1 diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h index b29a5113aa..61ab0cca98 100644 --- a/include/configs/P1010RDB.h +++ b/include/configs/P1010RDB.h @@ -335,7 +335,6 @@ extern unsigned long get_sdram_size(void); #define CONFIG_SYS_NAND_BASE_PHYS CONFIG_SYS_NAND_BASE #endif -#define CONFIG_MTD_DEVICE #define CONFIG_MTD_PARTITION #define CONFIG_SYS_NAND_CSPR (CSPR_PHYS_ADDR(CONFIG_SYS_NAND_BASE_PHYS) \ diff --git a/include/configs/P1022DS.h b/include/configs/P1022DS.h index 1b347541c0..abfef11b77 100644 --- a/include/configs/P1022DS.h +++ b/include/configs/P1022DS.h @@ -514,8 +514,6 @@ /* * Dynamic MTD Partition support with mtdparts */ -#define CONFIG_MTD_DEVICE -#define CONFIG_MTD_PARTITIONS #define CONFIG_FLASH_CFI_MTD /* diff --git a/include/configs/T102xQDS.h b/include/configs/T102xQDS.h index e457135e56..53c731c7f2 100644 --- a/include/configs/T102xQDS.h +++ b/include/configs/T102xQDS.h @@ -734,8 +734,6 @@ unsigned long get_board_ddr_clk(void); * Dynamic MTD Partition support with mtdparts */ #ifdef CONFIG_MTD_NOR_FLASH -#define CONFIG_MTD_DEVICE -#define CONFIG_MTD_PARTITIONS #define CONFIG_FLASH_CFI_MTD #endif diff --git a/include/configs/T102xRDB.h b/include/configs/T102xRDB.h index 07ba1cfaeb..bd67c72b44 100644 --- a/include/configs/T102xRDB.h +++ b/include/configs/T102xRDB.h @@ -748,8 +748,6 @@ unsigned long get_board_ddr_clk(void); * Dynamic MTD Partition support with mtdparts */ #ifdef CONFIG_MTD_NOR_FLASH -#define CONFIG_MTD_DEVICE -#define CONFIG_MTD_PARTITIONS #define CONFIG_FLASH_CFI_MTD #endif diff --git a/include/configs/T1040QDS.h b/include/configs/T1040QDS.h index df5b0f57e8..1d13df2d05 100644 --- a/include/configs/T1040QDS.h +++ b/include/configs/T1040QDS.h @@ -615,8 +615,6 @@ unsigned long get_board_ddr_clk(void); * Dynamic MTD Partition support with mtdparts */ #ifdef CONFIG_MTD_NOR_FLASH -#define CONFIG_MTD_DEVICE -#define CONFIG_MTD_PARTITIONS #define CONFIG_FLASH_CFI_MTD #endif diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h index f34f5187ee..e209debbab 100644 --- a/include/configs/T104xRDB.h +++ b/include/configs/T104xRDB.h @@ -767,8 +767,6 @@ $(SRCTREE)/board/freescale/t104xrdb/t1042d4_sd_rcw.cfg * Dynamic MTD Partition support with mtdparts */ #ifdef CONFIG_MTD_NOR_FLASH -#define CONFIG_MTD_DEVICE -#define CONFIG_MTD_PARTITIONS #define CONFIG_FLASH_CFI_MTD #endif diff --git a/include/configs/T208xQDS.h b/include/configs/T208xQDS.h index f5d454b002..93fae8a9c5 100644 --- a/include/configs/T208xQDS.h +++ b/include/configs/T208xQDS.h @@ -701,8 +701,6 @@ unsigned long get_board_ddr_clk(void); * Dynamic MTD Partition support with mtdparts */ #ifdef CONFIG_MTD_NOR_FLASH -#define CONFIG_MTD_DEVICE -#define CONFIG_MTD_PARTITIONS #define CONFIG_FLASH_CFI_MTD #endif diff --git a/include/configs/T208xRDB.h b/include/configs/T208xRDB.h index 934e6e4741..412a0e7997 100644 --- a/include/configs/T208xRDB.h +++ b/include/configs/T208xRDB.h @@ -649,8 +649,6 @@ unsigned long get_board_ddr_clk(void); * Dynamic MTD Partition support with mtdparts */ #ifdef CONFIG_MTD_NOR_FLASH -#define CONFIG_MTD_DEVICE -#define CONFIG_MTD_PARTITIONS #define CONFIG_FLASH_CFI_MTD #endif diff --git a/include/configs/TQM834x.h b/include/configs/TQM834x.h index bde8c3b882..1cf37ef11b 100644 --- a/include/configs/TQM834x.h +++ b/include/configs/TQM834x.h @@ -475,7 +475,6 @@ * JFFS2 partitions */ /* mtdparts command line support */ -#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */ #define CONFIG_FLASH_CFI_MTD /* default mtd partition table */ diff --git a/include/configs/am335x_igep003x.h b/include/configs/am335x_igep003x.h index a429dd9910..5fe7565131 100644 --- a/include/configs/am335x_igep003x.h +++ b/include/configs/am335x_igep003x.h @@ -108,9 +108,6 @@ /* NAND support */ #define CONFIG_SYS_NAND_ONFI_DETECTION 1 -#define CONFIG_MTD_PARTITIONS -#define CONFIG_MTD_DEVICE - /* SPL */ /* UBI configuration */ diff --git a/include/configs/am3517_evm.h b/include/configs/am3517_evm.h index 066110370e..9a20796214 100644 --- a/include/configs/am3517_evm.h +++ b/include/configs/am3517_evm.h @@ -88,8 +88,6 @@ #define CONFIG_SYS_NAND_MAX_ECCPOS 56 #define CONFIG_SYS_NAND_U_BOOT_START CONFIG_SYS_TEXT_BASE #define CONFIG_SYS_NAND_U_BOOT_OFFS 0x80000 -#define CONFIG_MTD_PARTITIONS /* required for UBI partition support */ -#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */ /* NAND block size is 128 KiB. Synchronize these values with * corresponding Device Tree entries in Linux: * MLO(SPL) 4 * NAND_BLOCK_SIZE = 512 KiB @ 0x000000 diff --git a/include/configs/apf27.h b/include/configs/apf27.h index a930307a14..f4e0c1a762 100644 --- a/include/configs/apf27.h +++ b/include/configs/apf27.h @@ -184,8 +184,6 @@ /* * Partitions & Filsystems */ -#define CONFIG_MTD_DEVICE -#define CONFIG_MTD_PARTITIONS /* * Ethernet (on SOC imx FEC) diff --git a/include/configs/apx4devkit.h b/include/configs/apx4devkit.h index ebebec07fc..00ba2eab6a 100644 --- a/include/configs/apx4devkit.h +++ b/include/configs/apx4devkit.h @@ -44,10 +44,6 @@ #endif /* UBI and NAND partitioning */ -#ifdef CONFIG_CMD_NAND -#define CONFIG_MTD_DEVICE -#define CONFIG_MTD_PARTITIONS -#endif /* FEC Ethernet on SoC */ #ifdef CONFIG_CMD_NET diff --git a/include/configs/aristainetos-common.h b/include/configs/aristainetos-common.h index 209b378191..bfa89b5d0a 100644 --- a/include/configs/aristainetos-common.h +++ b/include/configs/aristainetos-common.h @@ -193,8 +193,6 @@ #define CONFIG_MXC_USB_FLAGS 0 /* UBI support */ -#define CONFIG_MTD_PARTITIONS -#define CONFIG_MTD_DEVICE #define CONFIG_HW_WATCHDOG #define CONFIG_IMX_WATCHDOG diff --git a/include/configs/at91sam9n12ek.h b/include/configs/at91sam9n12ek.h index a6865b2d6f..a80d61db80 100644 --- a/include/configs/at91sam9n12ek.h +++ b/include/configs/at91sam9n12ek.h @@ -67,9 +67,6 @@ #define CONFIG_PMECC_CAP 2 #define CONFIG_PMECC_SECTOR_SIZE 512 -#define CONFIG_MTD_PARTITIONS -#define CONFIG_MTD_DEVICE - #define CONFIG_EXTRA_ENV_SETTINGS \ "console=console=ttyS0,115200\0" \ "mtdparts="CONFIG_MTDPARTS_DEFAULT"\0" \ diff --git a/include/configs/at91sam9x5ek.h b/include/configs/at91sam9x5ek.h index 8fc9750945..a5c98dc8e0 100644 --- a/include/configs/at91sam9x5ek.h +++ b/include/configs/at91sam9x5ek.h @@ -55,9 +55,6 @@ #define CONFIG_SYS_NAND_MASK_CLE (1 << 22) #define CONFIG_SYS_NAND_ENABLE_PIN AT91_PIN_PD4 #define CONFIG_SYS_NAND_READY_PIN AT91_PIN_PD5 - -#define CONFIG_MTD_DEVICE -#define CONFIG_MTD_PARTITIONS #endif /* PMECC & PMERRLOC */ diff --git a/include/configs/baltos.h b/include/configs/baltos.h index 03559bd4f5..a5737708b7 100644 --- a/include/configs/baltos.h +++ b/include/configs/baltos.h @@ -35,8 +35,6 @@ #define CONFIG_SYS_BOOTM_LEN SZ_64M /* UBI Support */ -#define CONFIG_MTD_PARTITIONS -#define CONFIG_MTD_DEVICE /* I2C configuration */ diff --git a/include/configs/brppt1.h b/include/configs/brppt1.h index eb45331033..93729e24dd 100644 --- a/include/configs/brppt1.h +++ b/include/configs/brppt1.h @@ -46,9 +46,6 @@ * both for ease of use in U-Boot and for passing information on to * the Linux kernel. */ -#if defined(CONFIG_SPI_BOOT) || defined(CONFIG_NAND) -#define CONFIG_MTD_DEVICE /* Required for mtdparts */ -#endif /* CONFIG_SPI_BOOT, ... */ #ifdef CONFIG_SPL_OS_BOOT #define CONFIG_SYS_SPL_ARGS_ADDR 0x80F80000 diff --git a/include/configs/cm_fx6.h b/include/configs/cm_fx6.h index 5bdc76dceb..5f3b97f6e6 100644 --- a/include/configs/cm_fx6.h +++ b/include/configs/cm_fx6.h @@ -47,8 +47,6 @@ /* MTD support */ #ifndef CONFIG_SPL_BUILD -#define CONFIG_MTD_DEVICE -#define CONFIG_MTD_PARTITIONS #define CONFIG_SPI_FLASH_MTD #endif diff --git a/include/configs/cm_t35.h b/include/configs/cm_t35.h index e1bb24c00c..415924549b 100644 --- a/include/configs/cm_t35.h +++ b/include/configs/cm_t35.h @@ -74,8 +74,6 @@ #define CONFIG_USB_TTY /* commands to include */ -#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */ -#define CONFIG_MTD_PARTITIONS #define CONFIG_SYS_I2C #define CONFIG_SYS_I2C_EEPROM_ADDR 0x50 diff --git a/include/configs/cm_t3517.h b/include/configs/cm_t3517.h index 5c45c00a3d..2c889d4a85 100644 --- a/include/configs/cm_t3517.h +++ b/include/configs/cm_t3517.h @@ -81,8 +81,6 @@ #endif /* CONFIG_USB_MUSB_AM35X */ /* commands to include */ -#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */ -#define CONFIG_MTD_PARTITIONS #define CONFIG_SYS_I2C #define CONFIG_SYS_I2C_EEPROM_ADDR 0x50 diff --git a/include/configs/colibri_imx7.h b/include/configs/colibri_imx7.h index b0389794bd..ec5aade852 100644 --- a/include/configs/colibri_imx7.h +++ b/include/configs/colibri_imx7.h @@ -159,8 +159,6 @@ #define CONFIG_SYS_NAND_MX7_GPMI_62_ECC_BYTES /* Dynamic MTD partition support */ -#define CONFIG_MTD_PARTITIONS -#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */ /* DMA stuff, needed for GPMI/MXS NAND support */ diff --git a/include/configs/colibri_t20.h b/include/configs/colibri_t20.h index 49d6263672..4a18c72a53 100644 --- a/include/configs/colibri_t20.h +++ b/include/configs/colibri_t20.h @@ -41,8 +41,6 @@ #define CONFIG_SYS_MAX_NAND_DEVICE 1 /* Dynamic MTD partition support */ -#define CONFIG_MTD_PARTITIONS -#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */ /* Environment in NAND, 64K is a bit excessive but erase block is 512K anyway */ #define CONFIG_ENV_OFFSET (SZ_2M) diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h index a7b647c6a2..1d15651c23 100644 --- a/include/configs/colibri_vf.h +++ b/include/configs/colibri_vf.h @@ -43,8 +43,6 @@ #define CONFIG_SYS_NAND_BASE NFC_BASE_ADDR /* Dynamic MTD partition support */ -#define CONFIG_MTD_PARTITIONS -#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */ #define CONFIG_SYS_FSL_ESDHC_ADDR 0 #define CONFIG_SYS_FSL_ESDHC_NUM 1 diff --git a/include/configs/corvus.h b/include/configs/corvus.h index 61b014638e..b372f59476 100644 --- a/include/configs/corvus.h +++ b/include/configs/corvus.h @@ -82,9 +82,6 @@ #define CONFIG_NET_RETRY_COUNT 20 #define CONFIG_AT91_WANTS_COMMON_PHY -#define CONFIG_MTD_DEVICE -#define CONFIG_MTD_PARTITIONS - /* DFU class support */ #define CONFIG_SYS_DFU_DATA_BUF_SIZE (SZ_1M) #define DFU_MANIFEST_POLL_TIMEOUT 25000 diff --git a/include/configs/da850evm.h b/include/configs/da850evm.h index ebfdd1c7a3..3796f81d3f 100644 --- a/include/configs/da850evm.h +++ b/include/configs/da850evm.h @@ -222,8 +222,6 @@ #ifdef CONFIG_SPL_BUILD #undef CONFIG_SPI_FLASH_MTD #endif -#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */ -#define CONFIG_MTD_PARTITIONS /* required for UBI partition support */ #endif #define CONFIG_DA8XX_GPIO @@ -273,11 +271,6 @@ #define CONFIG_CLOCKS #endif -#ifdef CONFIG_USE_NAND -#define CONFIG_MTD_DEVICE -#define CONFIG_MTD_PARTITIONS -#endif - #if !defined(CONFIG_USE_NAND) && \ !defined(CONFIG_USE_NOR) && \ !defined(CONFIG_USE_SPIFLASH) diff --git a/include/configs/display5.h b/include/configs/display5.h index f3c8757385..692a95938b 100644 --- a/include/configs/display5.h +++ b/include/configs/display5.h @@ -36,9 +36,7 @@ */ #ifndef CONFIG_SPL_BUILD -#define CONFIG_MTD_DEVICE #define CONFIG_SPI_FLASH_MTD -#define CONFIG_MTD_PARTITIONS #endif /* Below values are "dummy" - only to avoid build break */ @@ -393,8 +391,6 @@ (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET) /* Commands */ -#define CONFIG_MTD_PARTITIONS -#define CONFIG_MTD_DEVICE /* Watchdog */ #define CONFIG_HW_WATCHDOG diff --git a/include/configs/dns325.h b/include/configs/dns325.h index dec71038bf..0d52ffb4d7 100644 --- a/include/configs/dns325.h +++ b/include/configs/dns325.h @@ -27,8 +27,6 @@ /* * Commands configuration */ -#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */ -#define CONFIG_MTD_PARTITIONS #define CONFIG_NR_DRAM_BANKS 1 diff --git a/include/configs/dockstar.h b/include/configs/dockstar.h index 896bca2f98..f33978829d 100644 --- a/include/configs/dockstar.h +++ b/include/configs/dockstar.h @@ -68,7 +68,5 @@ /* * File system */ -#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */ -#define CONFIG_MTD_PARTITIONS #endif /* _CONFIG_DOCKSTAR_H */ diff --git a/include/configs/draak.h b/include/configs/draak.h index e1b9bf1885..5d1da21e99 100644 --- a/include/configs/draak.h +++ b/include/configs/draak.h @@ -27,7 +27,6 @@ #define CONFIG_FLASH_CFI_DRIVER #define CONFIG_FLASH_CFI_MTD #define CONFIG_FLASH_SHOW_PROGRESS 45 -#define CONFIG_MTD_DEVICE #define CONFIG_SYS_FLASH_BANKS_LIST { 0x08000000 } #define CONFIG_SYS_FLASH_CFI #define CONFIG_SYS_FLASH_CFI_WIDTH FLASH_CFI_16BIT diff --git a/include/configs/ds414.h b/include/configs/ds414.h index 27308c92ff..b9b708ad41 100644 --- a/include/configs/ds414.h +++ b/include/configs/ds414.h @@ -61,8 +61,6 @@ #endif /* why is this only defined in mv-common.h if CONFIG_DM is undefined? */ -#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */ -#define CONFIG_MTD_PARTITIONS /* * mv-common.h should be defined after CMD configs since it used them diff --git a/include/configs/ea20.h b/include/configs/ea20.h index c84cd962d7..c2e7f1c2d8 100644 --- a/include/configs/ea20.h +++ b/include/configs/ea20.h @@ -116,9 +116,6 @@ /* NAND Setup */ #ifdef CONFIG_SYS_USE_NAND -#define CONFIG_MTD_DEVICE -#define CONFIG_MTD_PARTITIONS - #define CONFIG_NAND_DAVINCI #define CONFIG_SYS_NAND_PAGE_2K #define CONFIG_SYS_NAND_NO_SUBPAGE diff --git a/include/configs/ethernut5.h b/include/configs/ethernut5.h index ca5c65fe5a..6cf21fe313 100644 --- a/include/configs/ethernut5.h +++ b/include/configs/ethernut5.h @@ -145,8 +145,6 @@ #endif /* File systems */ -#define CONFIG_MTD_DEVICE -#define CONFIG_MTD_PARTITIONS /* Boot command */ #define CONFIG_CMDLINE_TAG diff --git a/include/configs/flea3.h b/include/configs/flea3.h index cda5f4d6eb..9d16428606 100644 --- a/include/configs/flea3.h +++ b/include/configs/flea3.h @@ -106,9 +106,7 @@ /* * MTD Command for mtdparts */ -#define CONFIG_MTD_DEVICE #define CONFIG_FLASH_CFI_MTD -#define CONFIG_MTD_PARTITIONS /* * FLASH and environment organization diff --git a/include/configs/goflexhome.h b/include/configs/goflexhome.h index 8b05e0a53d..29e104f3c6 100644 --- a/include/configs/goflexhome.h +++ b/include/configs/goflexhome.h @@ -41,9 +41,6 @@ * Commands configuration */ -#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */ -#define CONFIG_MTD_PARTITIONS - /* * mv-common.h should be defined after CMD configs since it used them * to enable certain macros diff --git a/include/configs/guruplug.h b/include/configs/guruplug.h index 04b7e944a4..739ab320f6 100644 --- a/include/configs/guruplug.h +++ b/include/configs/guruplug.h @@ -18,8 +18,6 @@ * Standard filesystems */ #define CONFIG_BZIP2 -#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */ -#define CONFIG_MTD_PARTITIONS /* * mv-plug-common.h should be defined after CMD configs since it used them diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h index 1b7e29ca5e..b078cc5466 100644 --- a/include/configs/gw_ventana.h +++ b/include/configs/gw_ventana.h @@ -171,8 +171,6 @@ /* * MTD Command for mtdparts */ -#define CONFIG_MTD_DEVICE -#define CONFIG_MTD_PARTITIONS /* Persistent Environment Config */ #if defined(CONFIG_ENV_IS_IN_MMC) diff --git a/include/configs/harmony.h b/include/configs/harmony.h index 51e284e2e9..fc5ed5b2fd 100644 --- a/include/configs/harmony.h +++ b/include/configs/harmony.h @@ -30,8 +30,6 @@ #define CONFIG_SYS_MAX_NAND_DEVICE 1 /* Dynamic MTD partition support */ -#define CONFIG_MTD_PARTITIONS -#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */ /* Environment in NAND (which is 512M), aligned to start of last sector */ #define CONFIG_ENV_OFFSET (SZ_512M - SZ_128K) /* 128K sector size */ diff --git a/include/configs/hikey.h b/include/configs/hikey.h index c451f63cfb..29d4db9707 100644 --- a/include/configs/hikey.h +++ b/include/configs/hikey.h @@ -61,8 +61,6 @@ /* Command line configuration */ -#define CONFIG_MTD_PARTITIONS - /* BOOTP options */ #define CONFIG_BOOTP_BOOTFILESIZE diff --git a/include/configs/ib62x0.h b/include/configs/ib62x0.h index a7643166f4..f8d3c3b63f 100644 --- a/include/configs/ib62x0.h +++ b/include/configs/ib62x0.h @@ -26,8 +26,6 @@ /* * Commands configuration */ -#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */ -#define CONFIG_MTD_PARTITIONS /* * mv-common.h should be defined after CMD configs since it used them diff --git a/include/configs/iconnect.h b/include/configs/iconnect.h index 1fe4618da5..87113d7805 100644 --- a/include/configs/iconnect.h +++ b/include/configs/iconnect.h @@ -28,8 +28,6 @@ /* * Commands configuration */ -#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */ -#define CONFIG_MTD_PARTITIONS /* * mv-common.h should be defined after CMD configs since it used them @@ -75,7 +73,5 @@ /* * File system */ -#define CONFIG_MTD_DEVICE -#define CONFIG_MTD_PARTITIONS #endif /* _CONFIG_ICONNECT_H */ diff --git a/include/configs/ids8313.h b/include/configs/ids8313.h index 020d29072f..b633de60e9 100644 --- a/include/configs/ids8313.h +++ b/include/configs/ids8313.h @@ -460,7 +460,6 @@ /* mtdparts command line support */ #define CONFIG_FLASH_CFI_MTD -#define CONFIG_MTD_DEVICE #define CONFIG_EXTRA_ENV_SETTINGS \ "netdev=" __stringify(CONFIG_NETDEV) "\0" \ @@ -503,6 +502,5 @@ "bootm ${loadaddr} - ${fdtaddr}" /* UBI Support */ -#define CONFIG_MTD_PARTITIONS #endif /* __CONFIG_H */ diff --git a/include/configs/imx27lite-common.h b/include/configs/imx27lite-common.h index 7cf5e0bd70..dddb2c9b0e 100644 --- a/include/configs/imx27lite-common.h +++ b/include/configs/imx27lite-common.h @@ -116,7 +116,6 @@ * MTD */ #define CONFIG_FLASH_CFI_MTD -#define CONFIG_MTD_DEVICE /* * NAND diff --git a/include/configs/imx6-engicam.h b/include/configs/imx6-engicam.h index 28c982a528..7260f8013f 100644 --- a/include/configs/imx6-engicam.h +++ b/include/configs/imx6-engicam.h @@ -153,8 +153,6 @@ # define CONFIG_SYS_NAND_U_BOOT_OFFS 0x200000 /* MTD device */ -# define CONFIG_MTD_DEVICE -# define CONFIG_MTD_PARTITIONS #endif /* Ethernet */ diff --git a/include/configs/imx6_logic.h b/include/configs/imx6_logic.h index 0226510b2e..8de4c1bb98 100644 --- a/include/configs/imx6_logic.h +++ b/include/configs/imx6_logic.h @@ -145,8 +145,6 @@ #define CONFIG_SYS_NAND_U_BOOT_OFFS 0x200000 /* MTD device */ -# define CONFIG_MTD_DEVICE -# define CONFIG_MTD_PARTITIONS /* DMA stuff, needed for GPMI/MXS NAND support */ diff --git a/include/configs/ipam390.h b/include/configs/ipam390.h index faf21ddb08..e7cde28733 100644 --- a/include/configs/ipam390.h +++ b/include/configs/ipam390.h @@ -215,9 +215,6 @@ #ifndef CONFIG_DRIVER_TI_EMAC #endif -#define CONFIG_MTD_DEVICE -#define CONFIG_MTD_PARTITIONS - /* defines for SPL */ #define CONFIG_SYS_SPL_MALLOC_START (CONFIG_SYS_TEXT_BASE - \ CONFIG_SYS_MALLOC_LEN) diff --git a/include/configs/km/keymile-common.h b/include/configs/km/keymile-common.h index 92511193f6..aad7657e94 100644 --- a/include/configs/km/keymile-common.h +++ b/include/configs/km/keymile-common.h @@ -41,8 +41,6 @@ #define CONFIG_BOOTP_BOOTFILESIZE /* UBI Support for all Keymile boards */ -#define CONFIG_MTD_PARTITIONS -#define CONFIG_MTD_DEVICE #define CONFIG_MTD_CONCAT #ifndef CONFIG_KM_DEF_ENV_BOOTPARAMS diff --git a/include/configs/mccmon6.h b/include/configs/mccmon6.h index bd61471799..0816fae365 100644 --- a/include/configs/mccmon6.h +++ b/include/configs/mccmon6.h @@ -77,8 +77,6 @@ #define CONFIG_SYS_FLASH_BANKS_SIZES { (32 * SZ_1M) } /* MTD support */ -#define CONFIG_MTD_DEVICE -#define CONFIG_MTD_PARTITIONS /* USB Configs */ #define CONFIG_USB_MAX_CONTROLLER_COUNT 2 diff --git a/include/configs/mcx.h b/include/configs/mcx.h index a6fdb1c11d..0cad187a3c 100644 --- a/include/configs/mcx.h +++ b/include/configs/mcx.h @@ -72,9 +72,6 @@ /* commands to include */ -#define CONFIG_MTD_PARTITIONS -#define CONFIG_MTD_DEVICE - #define CONFIG_SYS_I2C /* RTC */ diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h index 966feeeafd..1ce9d433dd 100644 --- a/include/configs/microblaze-generic.h +++ b/include/configs/microblaze-generic.h @@ -154,17 +154,8 @@ */ #define CONFIG_BOOTP_BOOTFILESIZE -#if defined(CONFIG_CMD_JFFS2) -# define CONFIG_MTD_PARTITIONS -#endif - -#if defined(CONFIG_CMD_UBI) -# define CONFIG_MTD_PARTITIONS -#endif - #if defined(CONFIG_MTD_PARTITIONS) /* MTD partitions */ -#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */ #define CONFIG_FLASH_CFI_MTD /* default mtd partition table */ diff --git a/include/configs/mx28evk.h b/include/configs/mx28evk.h index dc4db2bec8..c060d56328 100644 --- a/include/configs/mx28evk.h +++ b/include/configs/mx28evk.h @@ -56,10 +56,6 @@ #endif /* UBI and NAND partitioning */ -#ifdef CONFIG_CMD_NAND -#define CONFIG_MTD_DEVICE -#define CONFIG_MTD_PARTITIONS -#endif /* FEC Ethernet on SoC */ #ifdef CONFIG_CMD_NET diff --git a/include/configs/mx35pdk.h b/include/configs/mx35pdk.h index ad5fe82dfc..49d923b8eb 100644 --- a/include/configs/mx35pdk.h +++ b/include/configs/mx35pdk.h @@ -120,9 +120,7 @@ /* * MTD Command for mtdparts */ -#define CONFIG_MTD_DEVICE #define CONFIG_FLASH_CFI_MTD -#define CONFIG_MTD_PARTITIONS /* * FLASH and environment organization diff --git a/include/configs/nas220.h b/include/configs/nas220.h index b9449a4a40..b37705e26e 100644 --- a/include/configs/nas220.h +++ b/include/configs/nas220.h @@ -94,8 +94,6 @@ */ #define CONFIG_JFFS2_NAND #define CONFIG_JFFS2_LZO -#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */ -#define CONFIG_MTD_PARTITIONS /* * SATA diff --git a/include/configs/nokia_rx51.h b/include/configs/nokia_rx51.h index 70bb5b6c2d..40e735101b 100644 --- a/include/configs/nokia_rx51.h +++ b/include/configs/nokia_rx51.h @@ -147,8 +147,6 @@ #ifdef ONENAND_SUPPORT #define CONFIG_SYS_ONENAND_BASE ONENAND_MAP -#define CONFIG_MTD_DEVICE -#define CONFIG_MTD_PARTITIONS #endif diff --git a/include/configs/nsa310s.h b/include/configs/nsa310s.h index 2f90439383..1ca9a01754 100644 --- a/include/configs/nsa310s.h +++ b/include/configs/nsa310s.h @@ -22,8 +22,6 @@ #define CONFIG_BZIP2 /* commands configuration */ -#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */ -#define CONFIG_MTD_PARTITIONS /* * mv-common.h should be defined after CMD configs since it used them diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h index bbc860dfc0..1599b6f0ba 100644 --- a/include/configs/omap3_beagle.h +++ b/include/configs/omap3_beagle.h @@ -48,7 +48,6 @@ #define CONFIG_ENV_OFFSET 0x260000 #define CONFIG_ENV_ADDR 0x260000 #define CONFIG_ENV_OVERWRITE -#define CONFIG_MTD_PARTITIONS /* required for UBI partition support */ /* NAND: SPL falcon mode configs */ #if defined(CONFIG_SPL_OS_BOOT) #define CONFIG_SYS_NAND_SPL_KERNEL_OFFS 0x2a0000 diff --git a/include/configs/omap3_evm.h b/include/configs/omap3_evm.h index 41c0579567..34418309cb 100644 --- a/include/configs/omap3_evm.h +++ b/include/configs/omap3_evm.h @@ -55,7 +55,6 @@ #define CONFIG_ENV_OFFSET 0x260000 #define CONFIG_ENV_ADDR 0x260000 #define CONFIG_ENV_OVERWRITE -#define CONFIG_MTD_PARTITIONS /* required for UBI partition support */ /* NAND: SPL falcon mode configs */ #if defined(CONFIG_SPL_OS_BOOT) #define CONFIG_SYS_NAND_SPL_KERNEL_OFFS 0x2a0000 diff --git a/include/configs/omap3_igep00x0.h b/include/configs/omap3_igep00x0.h index 0ea1490819..4254330ee2 100644 --- a/include/configs/omap3_igep00x0.h +++ b/include/configs/omap3_igep00x0.h @@ -91,7 +91,6 @@ #endif -#define CONFIG_MTD_PARTITIONS #define CONFIG_SYS_MTDPARTS_RUNTIME /* OneNAND config */ diff --git a/include/configs/omap3_logic.h b/include/configs/omap3_logic.h index cde61f2fd7..fd1512e009 100644 --- a/include/configs/omap3_logic.h +++ b/include/configs/omap3_logic.h @@ -65,8 +65,6 @@ #define CONFIG_NAND_OMAP_ECCSCHEME OMAP_ECC_BCH8_CODE_HW_DETECTION_SW #define CONFIG_SYS_NAND_MAX_OOBFREE 2 #define CONFIG_SYS_NAND_MAX_ECCPOS 56 -#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */ -#define CONFIG_MTD_PARTITIONS /* required for UBI partition support */ #endif /* Environment information */ diff --git a/include/configs/omap3_overo.h b/include/configs/omap3_overo.h index 666ec47284..a3d0e5fcaa 100644 --- a/include/configs/omap3_overo.h +++ b/include/configs/omap3_overo.h @@ -40,8 +40,6 @@ /* commands to include */ #ifdef CONFIG_NAND -#define CONFIG_MTD_PARTITIONS /* required for UBI partition support */ - /* NAND block size is 128 KiB. Synchronize these values with * overo_nand_partitions in mach-omap2/board-overo.c in Linux: * xloader 4 * NAND_BLOCK_SIZE = 512 KiB diff --git a/include/configs/omap3_pandora.h b/include/configs/omap3_pandora.h index c4e99e08b1..9259282729 100644 --- a/include/configs/omap3_pandora.h +++ b/include/configs/omap3_pandora.h @@ -50,10 +50,6 @@ #define CONFIG_SYS_NAND_PAGE_SIZE 2048 #define CONFIG_SYS_NAND_OOBSIZE 64 -#ifdef CONFIG_NAND -#define CONFIG_MTD_PARTITIONS /* required for UBI partition support */ -#endif - #define CONFIG_BOOTCOMMAND \ "run distro_bootcmd; " \ diff --git a/include/configs/omapl138_lcdk.h b/include/configs/omapl138_lcdk.h index 58624ec581..418bbcf773 100644 --- a/include/configs/omapl138_lcdk.h +++ b/include/configs/omapl138_lcdk.h @@ -262,11 +262,6 @@ #ifndef CONFIG_DRIVER_TI_EMAC #endif -#ifdef CONFIG_USE_NAND -#define CONFIG_MTD_DEVICE -#define CONFIG_MTD_PARTITIONS -#endif - #if !defined(CONFIG_USE_NAND) && \ !defined(CONFIG_SYS_USE_NOR) && \ !defined(CONFIG_USE_SPIFLASH) diff --git a/include/configs/openrd.h b/include/configs/openrd.h index aa5425af02..2b21003b8b 100644 --- a/include/configs/openrd.h +++ b/include/configs/openrd.h @@ -23,8 +23,6 @@ /* * Commands configuration */ -#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */ -#define CONFIG_MTD_PARTITIONS /* * mv-common.h should be defined after CMD configs since it used them diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h index 115ad7ff7a..6ce4656b21 100644 --- a/include/configs/p1_p2_rdb_pc.h +++ b/include/configs/p1_p2_rdb_pc.h @@ -69,8 +69,6 @@ /* * Dynamic MTD Partition support with mtdparts */ -#define CONFIG_MTD_DEVICE -#define CONFIG_MTD_PARTITIONS #define CONFIG_FLASH_CFI_MTD #endif @@ -91,8 +89,6 @@ /* * Dynamic MTD Partition support with mtdparts */ -#define CONFIG_MTD_DEVICE -#define CONFIG_MTD_PARTITIONS #define CONFIG_FLASH_CFI_MTD #endif @@ -138,8 +134,6 @@ /* * Dynamic MTD Partition support with mtdparts */ -#define CONFIG_MTD_DEVICE -#define CONFIG_MTD_PARTITIONS #define CONFIG_FLASH_CFI_MTD #endif diff --git a/include/configs/p1_twr.h b/include/configs/p1_twr.h index 32b5c62985..ca327b4b0e 100644 --- a/include/configs/p1_twr.h +++ b/include/configs/p1_twr.h @@ -331,8 +331,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); /* * Dynamic MTD Partition support with mtdparts */ -#define CONFIG_MTD_DEVICE -#define CONFIG_MTD_PARTITIONS #define CONFIG_FLASH_CFI_MTD /* diff --git a/include/configs/pcm052.h b/include/configs/pcm052.h index b8012b1af3..1885577ce5 100644 --- a/include/configs/pcm052.h +++ b/include/configs/pcm052.h @@ -31,8 +31,6 @@ #define CONFIG_JFFS2_NAND /* Dynamic MTD partition support */ -#define CONFIG_MTD_PARTITIONS -#define CONFIG_MTD_DEVICE #endif diff --git a/include/configs/pcm058.h b/include/configs/pcm058.h index 87bb47383b..6da624af6e 100644 --- a/include/configs/pcm058.h +++ b/include/configs/pcm058.h @@ -61,8 +61,6 @@ /* DMA stuff, needed for GPMI/MXS NAND support */ /* Filesystem support */ -#define CONFIG_MTD_PARTITIONS -#define CONFIG_MTD_DEVICE /* Physical Memory Map */ #define CONFIG_NR_DRAM_BANKS 1 diff --git a/include/configs/pfla02.h b/include/configs/pfla02.h index dbcda61168..690efd74af 100644 --- a/include/configs/pfla02.h +++ b/include/configs/pfla02.h @@ -60,8 +60,6 @@ /* DMA stuff, needed for GPMI/MXS NAND support */ /* Filesystem support */ -#define CONFIG_MTD_PARTITIONS -#define CONFIG_MTD_DEVICE /* Various command support */ diff --git a/include/configs/platinum.h b/include/configs/platinum.h index 734918a2bb..a780cca592 100644 --- a/include/configs/platinum.h +++ b/include/configs/platinum.h @@ -108,8 +108,6 @@ #define CONFIG_PREBOOT /* MTD/UBI/UBIFS config */ -#define CONFIG_MTD_DEVICE -#define CONFIG_MTD_PARTITIONS /* * Environment configuration diff --git a/include/configs/pogo_e02.h b/include/configs/pogo_e02.h index a654df6d6f..68d726835c 100644 --- a/include/configs/pogo_e02.h +++ b/include/configs/pogo_e02.h @@ -27,8 +27,6 @@ /* * Commands configuration */ -#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */ -#define CONFIG_MTD_PARTITIONS /* * mv-common.h should be defined after CMD configs since it used them @@ -73,7 +71,5 @@ /* * File system */ -#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */ -#define CONFIG_MTD_PARTITIONS #endif /* _CONFIG_POGO_E02_H */ diff --git a/include/configs/rcar-gen2-common.h b/include/configs/rcar-gen2-common.h index e1b2fa28e1..4f24a0e7ef 100644 --- a/include/configs/rcar-gen2-common.h +++ b/include/configs/rcar-gen2-common.h @@ -54,8 +54,6 @@ /* SF MTD */ #if defined(CONFIG_SPI_FLASH_MTD) && !defined(CONFIG_SPL_BUILD) -#define CONFIG_MTD_DEVICE -#define CONFIG_MTD_PARTITIONS #else #undef CONFIG_SPI_FLASH_MTD #endif diff --git a/include/configs/s5pc210_universal.h b/include/configs/s5pc210_universal.h index 4f0b58570c..baa19b0dc3 100644 --- a/include/configs/s5pc210_universal.h +++ b/include/configs/s5pc210_universal.h @@ -43,9 +43,6 @@ #define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_SDRAM_BASE + 0x5000000) #define CONFIG_SYS_LOAD_ADDR (CONFIG_SYS_SDRAM_BASE + 0x4800000) -#define CONFIG_MTD_DEVICE -#define CONFIG_MTD_PARTITIONS - /* Actual modem binary size is 16MiB. Add 2MiB for bad block handling */ #define NORMAL_MTDPARTS_DEFAULT CONFIG_MTDPARTS_DEFAULT diff --git a/include/configs/sama5d3_xplained.h b/include/configs/sama5d3_xplained.h index 5cbddf30d7..8b8fc4704c 100644 --- a/include/configs/sama5d3_xplained.h +++ b/include/configs/sama5d3_xplained.h @@ -44,9 +44,6 @@ /* our CLE is AD22 */ #define CONFIG_SYS_NAND_MASK_CLE (1 << 22) #define CONFIG_SYS_NAND_ONFI_DETECTION - -#define CONFIG_MTD_DEVICE -#define CONFIG_MTD_PARTITIONS #endif /* PMECC & PMERRLOC */ #define CONFIG_ATMEL_NAND_HWECC diff --git a/include/configs/sheevaplug.h b/include/configs/sheevaplug.h index dc6375841e..deec71734d 100644 --- a/include/configs/sheevaplug.h +++ b/include/configs/sheevaplug.h @@ -22,8 +22,6 @@ * Standard filesystems */ #define CONFIG_BZIP2 -#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */ -#define CONFIG_MTD_PARTITIONS /* * mv-plug-common.h should be defined after CMD configs since it used them diff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h index 470387df8c..97903a08e1 100644 --- a/include/configs/siemens-am33x-common.h +++ b/include/configs/siemens-am33x-common.h @@ -61,7 +61,6 @@ #define CONFIG_SYS_LOAD_ADDR 0x81000000 /* Default load address */ -#define CONFIG_MTD_DEVICE #define CONFIG_SF_DEFAULT_SPEED (75000000) /* Physical Memory Map */ @@ -198,10 +197,6 @@ /* NAND support */ #ifdef CONFIG_NAND /* UBI Support */ -#ifndef CONFIG_SPL_BUILD -#define CONFIG_MTD_PARTITIONS -#define CONFIG_MTD_DEVICE -#endif /* Commen environment */ #define CONFIG_PREBOOT diff --git a/include/configs/smartweb.h b/include/configs/smartweb.h index c6a2f8a8d1..ec9095ee99 100644 --- a/include/configs/smartweb.h +++ b/include/configs/smartweb.h @@ -87,8 +87,6 @@ #define CONFIG_SYS_NAND_ENABLE_PIN AT91_PIN_PC14 #define CONFIG_SYS_NAND_READY_PIN AT91_PIN_PC13 -#define CONFIG_MTD_DEVICE - /* general purpose I/O */ #define CONFIG_ATMEL_LEGACY /* required until (g)pio is fixed */ #define CONFIG_AT91_GPIO /* enable the GPIO features */ @@ -134,8 +132,6 @@ #define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS 2 /* USB DFU support */ -#define CONFIG_MTD_DEVICE -#define CONFIG_MTD_PARTITIONS #define CONFIG_USB_GADGET_AT91 diff --git a/include/configs/smdkc100.h b/include/configs/smdkc100.h index 671e4479f5..aa43798c42 100644 --- a/include/configs/smdkc100.h +++ b/include/configs/smdkc100.h @@ -52,9 +52,6 @@ /* allow to overwrite serial and ethaddr */ #define CONFIG_ENV_OVERWRITE -#define CONFIG_MTD_DEVICE -#define CONFIG_MTD_PARTITIONS - #define CONFIG_BOOTCOMMAND "run ubifsboot" #define CONFIG_RAMDISK_BOOT "root=/dev/ram0 rw rootfstype=ext2" \ diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h index acac4a7108..8ebf6b85fe 100644 --- a/include/configs/socfpga_common.h +++ b/include/configs/socfpga_common.h @@ -156,8 +156,6 @@ unsigned int cm_get_l4_sp_clk_hz(void); /* Enable multiple SPI NOR flash manufacturers */ #ifndef CONFIG_SPL_BUILD #define CONFIG_SPI_FLASH_MTD -#define CONFIG_MTD_DEVICE -#define CONFIG_MTD_PARTITIONS #endif /* QSPI reference clock */ #ifndef __ASSEMBLY__ diff --git a/include/configs/spear-common.h b/include/configs/spear-common.h index 7edd3b6489..b91b999129 100644 --- a/include/configs/spear-common.h +++ b/include/configs/spear-common.h @@ -82,8 +82,6 @@ /* NAND FLASH Configuration */ #define CONFIG_SYS_NAND_SELF_INIT -#define CONFIG_MTD_DEVICE -#define CONFIG_MTD_PARTITIONS #define CONFIG_NAND_FSMC #define CONFIG_SYS_MAX_NAND_DEVICE 1 #define CONFIG_SYS_NAND_ONFI_DETECTION diff --git a/include/configs/stmark2.h b/include/configs/stmark2.h index 36b7f288e0..8f0437f824 100644 --- a/include/configs/stmark2.h +++ b/include/configs/stmark2.h @@ -55,7 +55,6 @@ #define CONFIG_SYS_MCFRRTC_BASE 0xFC0A8000 /* spi not partitions */ -#define CONFIG_MTD_DEVICE #define CONFIG_JFFS2_CMDLINE #define CONFIG_JFFS2_DEV "nor0" diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h index b515e9bb1f..9a64073066 100644 --- a/include/configs/sunxi-common.h +++ b/include/configs/sunxi-common.h @@ -125,9 +125,6 @@ #define CONFIG_SYS_NAND_MAX_ECCPOS 1664 #define CONFIG_SYS_NAND_ONFI_DETECTION #define CONFIG_SYS_MAX_NAND_DEVICE 8 - -#define CONFIG_MTD_DEVICE -#define CONFIG_MTD_PARTITIONS #endif #ifdef CONFIG_SPL_SPI_SUNXI diff --git a/include/configs/tam3517-common.h b/include/configs/tam3517-common.h index 5ebd5cdef9..a7d3d0822b 100644 --- a/include/configs/tam3517-common.h +++ b/include/configs/tam3517-common.h @@ -189,9 +189,6 @@ #define CONFIG_SYS_NAND_U_BOOT_OFFS 0x80000 #define CONFIG_SYS_NAND_U_BOOT_SIZE 0x80000 -#define CONFIG_MTD_PARTITIONS -#define CONFIG_MTD_DEVICE - /* Setup MTD for NAND on the SOM */ #define CONFIG_TAM3517_SETTINGS \ diff --git a/include/configs/tao3530.h b/include/configs/tao3530.h index 061610d4c1..4b596c680a 100644 --- a/include/configs/tao3530.h +++ b/include/configs/tao3530.h @@ -58,7 +58,6 @@ #define CONFIG_ENV_OVERWRITE /* commands to include */ -#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */ #define CONFIG_SYS_I2C #define CONFIG_I2C_MULTI_BUS diff --git a/include/configs/taurus.h b/include/configs/taurus.h index d21d575cb0..9846b9f356 100644 --- a/include/configs/taurus.h +++ b/include/configs/taurus.h @@ -105,8 +105,6 @@ #define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS 2 /* USB DFU support */ -#define CONFIG_MTD_DEVICE -#define CONFIG_MTD_PARTITIONS #define CONFIG_USB_GADGET_AT91 diff --git a/include/configs/ti_armv7_common.h b/include/configs/ti_armv7_common.h index 9257e2b0a4..57f27cb90e 100644 --- a/include/configs/ti_armv7_common.h +++ b/include/configs/ti_armv7_common.h @@ -124,9 +124,6 @@ * mtdparts, both for ease of use in U-Boot and for passing information * on to the Linux kernel. */ -#if defined(CONFIG_SPI_BOOT) || defined(CONFIG_NOR) || defined(CONFIG_NAND) || defined(CONFIG_NAND_DAVINCI) -#define CONFIG_MTD_DEVICE /* Required for mtdparts */ -#endif /* * Our platforms make use of SPL to initalize the hardware (primarily diff --git a/include/configs/ti_armv7_keystone2.h b/include/configs/ti_armv7_keystone2.h index ccd466583a..3bdd8ed59b 100644 --- a/include/configs/ti_armv7_keystone2.h +++ b/include/configs/ti_armv7_keystone2.h @@ -173,7 +173,6 @@ #define CONFIG_SYS_MAX_NAND_DEVICE 1 #define CONFIG_SYS_NAND_MAX_CHIPS 1 #define CONFIG_SYS_NAND_NO_SUBPAGE_WRITE -#define CONFIG_MTD_PARTITIONS /* USB Configuration */ #define CONFIG_USB_XHCI_KEYSTONE diff --git a/include/configs/titanium.h b/include/configs/titanium.h index 2470855463..63098387c3 100644 --- a/include/configs/titanium.h +++ b/include/configs/titanium.h @@ -165,7 +165,5 @@ #endif /* CONFIG_CMD_NAND */ /* UBI/UBIFS config options */ -#define CONFIG_MTD_DEVICE -#define CONFIG_MTD_PARTITIONS #endif /* __CONFIG_H */ diff --git a/include/configs/tricorder.h b/include/configs/tricorder.h index 3a2a420127..95c3ea9ce4 100644 --- a/include/configs/tricorder.h +++ b/include/configs/tricorder.h @@ -65,7 +65,6 @@ #define CONFIG_TWL4030_LED /* Board NAND Info */ -#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */ #define CONFIG_SYS_NAND_ADDR NAND_BASE /* physical address */ /* to access nand */ @@ -78,8 +77,6 @@ #define CONFIG_SYS_NAND_MAX_ECCPOS 56 /* needed for ubi */ -#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */ -#define CONFIG_MTD_PARTITIONS /* Environment information (this is the common part) */ diff --git a/include/configs/uniphier.h b/include/configs/uniphier.h index b631f79df8..31dfd23494 100644 --- a/include/configs/uniphier.h +++ b/include/configs/uniphier.h @@ -25,7 +25,6 @@ #define CONFIG_TIMESTAMP /* FLASH related */ -#define CONFIG_MTD_DEVICE #define CONFIG_FLASH_CFI_DRIVER #define CONFIG_SYS_FLASH_CFI diff --git a/include/configs/vct.h b/include/configs/vct.h index db96d81a2f..0e347a4c18 100644 --- a/include/configs/vct.h +++ b/include/configs/vct.h @@ -189,10 +189,6 @@ int vct_gpio_get(int pin); /* * UBI configuration */ -#if defined(CONFIG_VCT_ONENAND) -#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */ -#define CONFIG_MTD_PARTITIONS -#endif /* * We need a small, stripped down image to fit into the first 128k OneNAND diff --git a/include/configs/vf610twr.h b/include/configs/vf610twr.h index d08d42371c..effae2b0ba 100644 --- a/include/configs/vf610twr.h +++ b/include/configs/vf610twr.h @@ -37,8 +37,6 @@ #define CONFIG_SYS_NAND_BASE NFC_BASE_ADDR /* Dynamic MTD partition support */ -#define CONFIG_MTD_PARTITIONS -#define CONFIG_MTD_DEVICE #endif #define CONFIG_SYS_FSL_ESDHC_ADDR 0 diff --git a/include/configs/wb45n.h b/include/configs/wb45n.h index 58c36e0d56..5c90fe53e3 100644 --- a/include/configs/wb45n.h +++ b/include/configs/wb45n.h @@ -56,9 +56,7 @@ #define CONFIG_PMECC_CAP 4 #define CONFIG_PMECC_SECTOR_SIZE 512 -#define CONFIG_MTD_DEVICE #define CONFIG_CMD_MTDPARTS -#define CONFIG_MTD_PARTITIONS #define CONFIG_RBTREE #define CONFIG_LZO diff --git a/include/configs/woodburn_common.h b/include/configs/woodburn_common.h index 7135e1972e..88ee59259c 100644 --- a/include/configs/woodburn_common.h +++ b/include/configs/woodburn_common.h @@ -112,9 +112,7 @@ /* * MTD Command for mtdparts */ -#define CONFIG_MTD_DEVICE #define CONFIG_FLASH_CFI_MTD -#define CONFIG_MTD_PARTITIONS /* * FLASH and environment organization diff --git a/include/configs/x600.h b/include/configs/x600.h index 204e019d4f..74f4dfc55d 100644 --- a/include/configs/x600.h +++ b/include/configs/x600.h @@ -62,8 +62,6 @@ #define CONFIG_NAND_ECC_BCH /* UBI/UBI config options */ -#define CONFIG_MTD_DEVICE -#define CONFIG_MTD_PARTITIONS /* Ethernet config options */ #define CONFIG_MII diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h index e9086f9906..b9f6a70648 100644 --- a/include/configs/xilinx_zynqmp.h +++ b/include/configs/xilinx_zynqmp.h @@ -60,7 +60,6 @@ #ifdef CONFIG_NAND_ARASAN # define CONFIG_SYS_MAX_NAND_DEVICE 1 # define CONFIG_SYS_NAND_ONFI_DETECTION -# define CONFIG_MTD_DEVICE #endif #if defined(CONFIG_SPL_BUILD) diff --git a/include/configs/xilinx_zynqmp_mini.h b/include/configs/xilinx_zynqmp_mini.h index 96ff6c9f02..9a1ea54526 100644 --- a/include/configs/xilinx_zynqmp_mini.h +++ b/include/configs/xilinx_zynqmp_mini.h @@ -23,7 +23,6 @@ #undef CONFIG_CMD_ENV #undef CONFIG_MP #undef CONFIG_SYS_INIT_SP_ADDR -#undef CONFIG_MTD_DEVICE #undef CONFIG_BOOTM_NETBSD #undef CONFIG_BOOTM_VXWORKS #undef CONFIG_BOOTM_LINUX diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h index 55b983fc16..ba6925fb0e 100644 --- a/include/configs/zynq-common.h +++ b/include/configs/zynq-common.h @@ -69,7 +69,6 @@ #ifdef CONFIG_NAND_ZYNQ #define CONFIG_SYS_MAX_NAND_DEVICE 1 #define CONFIG_SYS_NAND_ONFI_DETECTION -#define CONFIG_MTD_DEVICE #endif #ifdef CONFIG_USB_EHCI_ZYNQ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 1219dcc3be..aa27fbc006 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -1307,13 +1307,11 @@ CONFIG_MPC8xxx_DISABLE_BPTR CONFIG_MPLL_FREQ CONFIG_MSHC_FREQ CONFIG_MTD_CONCAT -CONFIG_MTD_DEVICE CONFIG_MTD_ECC_SOFT CONFIG_MTD_NAND_MUSEUM_IDS CONFIG_MTD_NAND_VERIFY_WRITE CONFIG_MTD_ONENAND_VERIFY_WRITE CONFIG_MTD_PARTITION -CONFIG_MTD_PARTITIONS CONFIG_MTD_UBI_BEB_RESERVE CONFIG_MTD_UBI_BLOCK CONFIG_MTD_UBI_DEBUG -- 2.17.1

2 1

[U-Boot] [PATCH] configs: Convert CONFIG_USE_NAND to CONFIG_NAND
by Adam Ford 23 Jul '18

23 Jul '18

The DA850-EVM and OMAPL138_LCDK both use checks for CONFIG_USE_NAND. This patch changes these checks to CONFIG_NAND which is already defined in Kconfig. Since the OMAPL138_LCDK already had CONFIG_NAND defined in its defconfig, it can be deleted from configs/omapl138_lcdk.h. Signed-off-by: Adam Ford <aford173(a)gmail.com> diff --git a/include/configs/da850evm.h b/include/configs/da850evm.h index ebfdd1c7a3..6690be60b6 100644 --- a/include/configs/da850evm.h +++ b/include/configs/da850evm.h @@ -148,7 +148,7 @@ /* * Flash & Environment */ -#ifdef CONFIG_USE_NAND +#ifdef CONFIG_NAND #define CONFIG_NAND_DAVINCI #define CONFIG_ENV_OFFSET 0x0 /* Block 0--not used by bootcode */ #define CONFIG_ENV_SIZE (128 << 10) @@ -273,12 +273,12 @@ #define CONFIG_CLOCKS #endif -#ifdef CONFIG_USE_NAND +#ifdef CONFIG_NAND #define CONFIG_MTD_DEVICE #define CONFIG_MTD_PARTITIONS #endif -#if !defined(CONFIG_USE_NAND) && \ +#if !defined(CONFIG_NAND) && \ !defined(CONFIG_USE_NOR) && \ !defined(CONFIG_USE_SPIFLASH) #define CONFIG_ENV_SIZE (16 << 10) diff --git a/include/configs/omapl138_lcdk.h b/include/configs/omapl138_lcdk.h index 58624ec581..ee6f866581 100644 --- a/include/configs/omapl138_lcdk.h +++ b/include/configs/omapl138_lcdk.h @@ -16,7 +16,6 @@ #define CONFIG_DRIVER_TI_EMAC #undef CONFIG_USE_SPIFLASH #undef CONFIG_SYS_USE_NOR -#define CONFIG_USE_NAND /* * Disable DM_* for SPL build and can be re-enabled after adding @@ -142,7 +141,7 @@ /* * Flash & Environment */ -#ifdef CONFIG_USE_NAND +#ifdef CONFIG_NAND #define CONFIG_NAND_DAVINCI #define CONFIG_ENV_OFFSET 0x0 /* Block 0--not used by bootcode */ #define CONFIG_ENV_SIZE (128 << 9) @@ -262,12 +261,12 @@ #ifndef CONFIG_DRIVER_TI_EMAC #endif -#ifdef CONFIG_USE_NAND +#ifdef CONFIG_NAND #define CONFIG_MTD_DEVICE #define CONFIG_MTD_PARTITIONS #endif -#if !defined(CONFIG_USE_NAND) && \ +#if !defined(CONFIG_NAND) && \ !defined(CONFIG_SYS_USE_NOR) && \ !defined(CONFIG_USE_SPIFLASH) #define CONFIG_ENV_SIZE (16 << 10) diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 97e27ae7fe..8ded15c89a 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -4418,7 +4418,6 @@ CONFIG_SYS_USE_FLASH CONFIG_SYS_USE_MAIN_OSCILLATOR CONFIG_SYS_USE_MMC CONFIG_SYS_USE_MPC834XSYS_USB_PHY -CONFIG_SYS_USE_NAND CONFIG_SYS_USE_NANDFLASH CONFIG_SYS_USE_NOR CONFIG_SYS_USE_NORFLASH -- 2.17.1

2 1

[U-Boot] [PATCH] Convert CONFIG_NAND_ATMEL to Kconfig
by Adam Ford 23 Jul '18

23 Jul '18

This converts the following to Kconfig: CONFIG_NAND_ATMEL Signed-off-by: Adam Ford <aford173(a)gmail.com> diff --git a/configs/at91sam9260ek_dataflash_cs0_defconfig b/configs/at91sam9260ek_dataflash_cs0_defconfig index 3d2b8803ea..c77b8d8a20 100644 --- a/configs/at91sam9260ek_dataflash_cs0_defconfig +++ b/configs/at91sam9260ek_dataflash_cs0_defconfig @@ -34,6 +34,8 @@ CONFIG_CLK_AT91=y CONFIG_DM_GPIO=y CONFIG_AT91_GPIO=y # CONFIG_MMC is not set +CONFIG_NAND=y +CONFIG_NAND_ATMEL=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_ATMEL=y diff --git a/configs/at91sam9260ek_dataflash_cs1_defconfig b/configs/at91sam9260ek_dataflash_cs1_defconfig index 6b821a9375..254d159185 100644 --- a/configs/at91sam9260ek_dataflash_cs1_defconfig +++ b/configs/at91sam9260ek_dataflash_cs1_defconfig @@ -34,6 +34,8 @@ CONFIG_CLK_AT91=y CONFIG_DM_GPIO=y CONFIG_AT91_GPIO=y # CONFIG_MMC is not set +CONFIG_NAND=y +CONFIG_NAND_ATMEL=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_ATMEL=y diff --git a/configs/at91sam9260ek_nandflash_defconfig b/configs/at91sam9260ek_nandflash_defconfig index ea5292c934..9079a668bd 100644 --- a/configs/at91sam9260ek_nandflash_defconfig +++ b/configs/at91sam9260ek_nandflash_defconfig @@ -34,6 +34,8 @@ CONFIG_CLK_AT91=y CONFIG_DM_GPIO=y CONFIG_AT91_GPIO=y # CONFIG_MMC is not set +CONFIG_NAND=y +CONFIG_NAND_ATMEL=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_ATMEL=y diff --git a/configs/at91sam9261ek_dataflash_cs0_defconfig b/configs/at91sam9261ek_dataflash_cs0_defconfig index b6c9244a59..c5b37fcbd3 100644 --- a/configs/at91sam9261ek_dataflash_cs0_defconfig +++ b/configs/at91sam9261ek_dataflash_cs0_defconfig @@ -35,6 +35,8 @@ CONFIG_CLK_AT91=y CONFIG_DM_GPIO=y CONFIG_AT91_GPIO=y # CONFIG_MMC is not set +CONFIG_NAND=y +CONFIG_NAND_ATMEL=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_ATMEL=y diff --git a/configs/at91sam9261ek_dataflash_cs3_defconfig b/configs/at91sam9261ek_dataflash_cs3_defconfig index d7fb15b3e7..43fb85cc11 100644 --- a/configs/at91sam9261ek_dataflash_cs3_defconfig +++ b/configs/at91sam9261ek_dataflash_cs3_defconfig @@ -35,6 +35,8 @@ CONFIG_CLK_AT91=y CONFIG_DM_GPIO=y CONFIG_AT91_GPIO=y # CONFIG_MMC is not set +CONFIG_NAND=y +CONFIG_NAND_ATMEL=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_ATMEL=y diff --git a/configs/at91sam9261ek_nandflash_defconfig b/configs/at91sam9261ek_nandflash_defconfig index 95b7558183..a62617afbe 100644 --- a/configs/at91sam9261ek_nandflash_defconfig +++ b/configs/at91sam9261ek_nandflash_defconfig @@ -35,6 +35,8 @@ CONFIG_CLK_AT91=y CONFIG_DM_GPIO=y CONFIG_AT91_GPIO=y # CONFIG_MMC is not set +CONFIG_NAND=y +CONFIG_NAND_ATMEL=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_ATMEL=y diff --git a/configs/at91sam9263ek_dataflash_cs0_defconfig b/configs/at91sam9263ek_dataflash_cs0_defconfig index 9f357aef90..c49f3871fd 100644 --- a/configs/at91sam9263ek_dataflash_cs0_defconfig +++ b/configs/at91sam9263ek_dataflash_cs0_defconfig @@ -39,6 +39,8 @@ CONFIG_DM_GPIO=y CONFIG_AT91_GPIO=y CONFIG_DM_MMC=y CONFIG_GENERIC_ATMEL_MCI=y +CONFIG_NAND=y +CONFIG_NAND_ATMEL=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_ATMEL=y diff --git a/configs/at91sam9263ek_dataflash_defconfig b/configs/at91sam9263ek_dataflash_defconfig index 9f357aef90..c49f3871fd 100644 --- a/configs/at91sam9263ek_dataflash_defconfig +++ b/configs/at91sam9263ek_dataflash_defconfig @@ -39,6 +39,8 @@ CONFIG_DM_GPIO=y CONFIG_AT91_GPIO=y CONFIG_DM_MMC=y CONFIG_GENERIC_ATMEL_MCI=y +CONFIG_NAND=y +CONFIG_NAND_ATMEL=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_ATMEL=y diff --git a/configs/at91sam9263ek_nandflash_defconfig b/configs/at91sam9263ek_nandflash_defconfig index 1a43f4f110..1592a7ccd6 100644 --- a/configs/at91sam9263ek_nandflash_defconfig +++ b/configs/at91sam9263ek_nandflash_defconfig @@ -39,6 +39,8 @@ CONFIG_DM_GPIO=y CONFIG_AT91_GPIO=y CONFIG_DM_MMC=y CONFIG_GENERIC_ATMEL_MCI=y +CONFIG_NAND=y +CONFIG_NAND_ATMEL=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_ATMEL=y diff --git a/configs/at91sam9263ek_norflash_boot_defconfig b/configs/at91sam9263ek_norflash_boot_defconfig index 96836267cd..0009a9cbea 100644 --- a/configs/at91sam9263ek_norflash_boot_defconfig +++ b/configs/at91sam9263ek_norflash_boot_defconfig @@ -38,6 +38,8 @@ CONFIG_AT91_GPIO=y CONFIG_DM_MMC=y CONFIG_GENERIC_ATMEL_MCI=y CONFIG_MTD_NOR_FLASH=y +CONFIG_NAND=y +CONFIG_NAND_ATMEL=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_ATMEL=y diff --git a/configs/at91sam9263ek_norflash_defconfig b/configs/at91sam9263ek_norflash_defconfig index a2b52df354..e035589582 100644 --- a/configs/at91sam9263ek_norflash_defconfig +++ b/configs/at91sam9263ek_norflash_defconfig @@ -38,6 +38,8 @@ CONFIG_AT91_GPIO=y CONFIG_DM_MMC=y CONFIG_GENERIC_ATMEL_MCI=y CONFIG_MTD_NOR_FLASH=y +CONFIG_NAND=y +CONFIG_NAND_ATMEL=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_ATMEL=y diff --git a/configs/at91sam9g10ek_dataflash_cs0_defconfig b/configs/at91sam9g10ek_dataflash_cs0_defconfig index 0caede5ded..632031a6ab 100644 --- a/configs/at91sam9g10ek_dataflash_cs0_defconfig +++ b/configs/at91sam9g10ek_dataflash_cs0_defconfig @@ -35,6 +35,8 @@ CONFIG_CLK_AT91=y CONFIG_DM_GPIO=y CONFIG_AT91_GPIO=y # CONFIG_MMC is not set +CONFIG_NAND=y +CONFIG_NAND_ATMEL=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_ATMEL=y diff --git a/configs/at91sam9g10ek_dataflash_cs3_defconfig b/configs/at91sam9g10ek_dataflash_cs3_defconfig index 16707ac4a6..1fdbbe0419 100644 --- a/configs/at91sam9g10ek_dataflash_cs3_defconfig +++ b/configs/at91sam9g10ek_dataflash_cs3_defconfig @@ -35,6 +35,8 @@ CONFIG_CLK_AT91=y CONFIG_DM_GPIO=y CONFIG_AT91_GPIO=y # CONFIG_MMC is not set +CONFIG_NAND=y +CONFIG_NAND_ATMEL=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_ATMEL=y diff --git a/configs/at91sam9g10ek_nandflash_defconfig b/configs/at91sam9g10ek_nandflash_defconfig index 0a4538e2a9..c9c0d88bad 100644 --- a/configs/at91sam9g10ek_nandflash_defconfig +++ b/configs/at91sam9g10ek_nandflash_defconfig @@ -35,6 +35,8 @@ CONFIG_CLK_AT91=y CONFIG_DM_GPIO=y CONFIG_AT91_GPIO=y # CONFIG_MMC is not set +CONFIG_NAND=y +CONFIG_NAND_ATMEL=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_ATMEL=y diff --git a/configs/at91sam9g20ek_2mmc_defconfig b/configs/at91sam9g20ek_2mmc_defconfig index 3ef05dbac4..01f9347bd1 100644 --- a/configs/at91sam9g20ek_2mmc_defconfig +++ b/configs/at91sam9g20ek_2mmc_defconfig @@ -36,6 +36,8 @@ CONFIG_DM_GPIO=y CONFIG_AT91_GPIO=y CONFIG_DM_MMC=y CONFIG_GENERIC_ATMEL_MCI=y +CONFIG_NAND=y +CONFIG_NAND_ATMEL=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_ATMEL=y diff --git a/configs/at91sam9g20ek_2mmc_nandflash_defconfig b/configs/at91sam9g20ek_2mmc_nandflash_defconfig index 6476465623..522d2086d7 100644 --- a/configs/at91sam9g20ek_2mmc_nandflash_defconfig +++ b/configs/at91sam9g20ek_2mmc_nandflash_defconfig @@ -36,6 +36,8 @@ CONFIG_DM_GPIO=y CONFIG_AT91_GPIO=y CONFIG_DM_MMC=y CONFIG_GENERIC_ATMEL_MCI=y +CONFIG_NAND=y +CONFIG_NAND_ATMEL=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_ATMEL=y diff --git a/configs/at91sam9g20ek_dataflash_cs0_defconfig b/configs/at91sam9g20ek_dataflash_cs0_defconfig index a161302fb0..e7aa23201e 100644 --- a/configs/at91sam9g20ek_dataflash_cs0_defconfig +++ b/configs/at91sam9g20ek_dataflash_cs0_defconfig @@ -34,6 +34,8 @@ CONFIG_CLK_AT91=y CONFIG_DM_GPIO=y CONFIG_AT91_GPIO=y # CONFIG_MMC is not set +CONFIG_NAND=y +CONFIG_NAND_ATMEL=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_ATMEL=y diff --git a/configs/at91sam9g20ek_dataflash_cs1_defconfig b/configs/at91sam9g20ek_dataflash_cs1_defconfig index d7a97e3ddb..94ed68d51e 100644 --- a/configs/at91sam9g20ek_dataflash_cs1_defconfig +++ b/configs/at91sam9g20ek_dataflash_cs1_defconfig @@ -34,6 +34,8 @@ CONFIG_CLK_AT91=y CONFIG_DM_GPIO=y CONFIG_AT91_GPIO=y # CONFIG_MMC is not set +CONFIG_NAND=y +CONFIG_NAND_ATMEL=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_ATMEL=y diff --git a/configs/at91sam9g20ek_nandflash_defconfig b/configs/at91sam9g20ek_nandflash_defconfig index b6affb8ffe..d6bcf695fd 100644 --- a/configs/at91sam9g20ek_nandflash_defconfig +++ b/configs/at91sam9g20ek_nandflash_defconfig @@ -34,6 +34,8 @@ CONFIG_CLK_AT91=y CONFIG_DM_GPIO=y CONFIG_AT91_GPIO=y # CONFIG_MMC is not set +CONFIG_NAND=y +CONFIG_NAND_ATMEL=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_ATMEL=y diff --git a/configs/at91sam9m10g45ek_mmc_defconfig b/configs/at91sam9m10g45ek_mmc_defconfig index 0862a323ac..aa01be0104 100644 --- a/configs/at91sam9m10g45ek_mmc_defconfig +++ b/configs/at91sam9m10g45ek_mmc_defconfig @@ -38,6 +38,8 @@ CONFIG_DM_GPIO=y CONFIG_AT91_GPIO=y CONFIG_DM_MMC=y CONFIG_GENERIC_ATMEL_MCI=y +CONFIG_NAND=y +CONFIG_NAND_ATMEL=y CONFIG_DM_ETH=y CONFIG_MACB=y CONFIG_PINCTRL=y diff --git a/configs/at91sam9m10g45ek_nandflash_defconfig b/configs/at91sam9m10g45ek_nandflash_defconfig index df806b29a1..d85a92a026 100644 --- a/configs/at91sam9m10g45ek_nandflash_defconfig +++ b/configs/at91sam9m10g45ek_nandflash_defconfig @@ -38,6 +38,8 @@ CONFIG_DM_GPIO=y CONFIG_AT91_GPIO=y CONFIG_DM_MMC=y CONFIG_GENERIC_ATMEL_MCI=y +CONFIG_NAND=y +CONFIG_NAND_ATMEL=y CONFIG_DM_ETH=y CONFIG_MACB=y CONFIG_PINCTRL=y diff --git a/configs/at91sam9n12ek_mmc_defconfig b/configs/at91sam9n12ek_mmc_defconfig index 086a07ffb7..19cca1096b 100644 --- a/configs/at91sam9n12ek_mmc_defconfig +++ b/configs/at91sam9n12ek_mmc_defconfig @@ -38,6 +38,8 @@ CONFIG_DM_GPIO=y CONFIG_AT91_GPIO=y CONFIG_DM_MMC=y CONFIG_GENERIC_ATMEL_MCI=y +CONFIG_NAND=y +CONFIG_NAND_ATMEL=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_ATMEL=y diff --git a/configs/at91sam9n12ek_nandflash_defconfig b/configs/at91sam9n12ek_nandflash_defconfig index 75205a615d..33da570b4d 100644 --- a/configs/at91sam9n12ek_nandflash_defconfig +++ b/configs/at91sam9n12ek_nandflash_defconfig @@ -38,6 +38,8 @@ CONFIG_DM_GPIO=y CONFIG_AT91_GPIO=y CONFIG_DM_MMC=y CONFIG_GENERIC_ATMEL_MCI=y +CONFIG_NAND=y +CONFIG_NAND_ATMEL=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_ATMEL=y diff --git a/configs/at91sam9n12ek_spiflash_defconfig b/configs/at91sam9n12ek_spiflash_defconfig index 3a8c61c127..ba50e7a070 100644 --- a/configs/at91sam9n12ek_spiflash_defconfig +++ b/configs/at91sam9n12ek_spiflash_defconfig @@ -38,6 +38,8 @@ CONFIG_DM_GPIO=y CONFIG_AT91_GPIO=y CONFIG_DM_MMC=y CONFIG_GENERIC_ATMEL_MCI=y +CONFIG_NAND=y +CONFIG_NAND_ATMEL=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_ATMEL=y diff --git a/configs/at91sam9rlek_dataflash_defconfig b/configs/at91sam9rlek_dataflash_defconfig index b9307743f5..c1ff8a179c 100644 --- a/configs/at91sam9rlek_dataflash_defconfig +++ b/configs/at91sam9rlek_dataflash_defconfig @@ -37,6 +37,8 @@ CONFIG_DM_GPIO=y CONFIG_AT91_GPIO=y CONFIG_DM_MMC=y CONFIG_GENERIC_ATMEL_MCI=y +CONFIG_NAND=y +CONFIG_NAND_ATMEL=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_ATMEL=y diff --git a/configs/at91sam9rlek_mmc_defconfig b/configs/at91sam9rlek_mmc_defconfig index 15c98a2800..80d596145a 100644 --- a/configs/at91sam9rlek_mmc_defconfig +++ b/configs/at91sam9rlek_mmc_defconfig @@ -37,6 +37,8 @@ CONFIG_DM_GPIO=y CONFIG_AT91_GPIO=y CONFIG_DM_MMC=y CONFIG_GENERIC_ATMEL_MCI=y +CONFIG_NAND=y +CONFIG_NAND_ATMEL=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_ATMEL=y diff --git a/configs/at91sam9rlek_nandflash_defconfig b/configs/at91sam9rlek_nandflash_defconfig index a5dcc7795b..3ed0aa18be 100644 --- a/configs/at91sam9rlek_nandflash_defconfig +++ b/configs/at91sam9rlek_nandflash_defconfig @@ -37,6 +37,8 @@ CONFIG_DM_GPIO=y CONFIG_AT91_GPIO=y CONFIG_DM_MMC=y CONFIG_GENERIC_ATMEL_MCI=y +CONFIG_NAND=y +CONFIG_NAND_ATMEL=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_ATMEL=y diff --git a/configs/at91sam9x5ek_dataflash_defconfig b/configs/at91sam9x5ek_dataflash_defconfig index bfd80b207e..54b4a3316a 100644 --- a/configs/at91sam9x5ek_dataflash_defconfig +++ b/configs/at91sam9x5ek_dataflash_defconfig @@ -39,6 +39,8 @@ CONFIG_DM_GPIO=y CONFIG_AT91_GPIO=y CONFIG_DM_MMC=y CONFIG_GENERIC_ATMEL_MCI=y +CONFIG_NAND=y +CONFIG_NAND_ATMEL=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_ATMEL=y diff --git a/configs/at91sam9x5ek_mmc_defconfig b/configs/at91sam9x5ek_mmc_defconfig index 01c5818adf..3a2d6f4fcc 100644 --- a/configs/at91sam9x5ek_mmc_defconfig +++ b/configs/at91sam9x5ek_mmc_defconfig @@ -39,6 +39,8 @@ CONFIG_DM_GPIO=y CONFIG_AT91_GPIO=y CONFIG_DM_MMC=y CONFIG_GENERIC_ATMEL_MCI=y +CONFIG_NAND=y +CONFIG_NAND_ATMEL=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_ATMEL=y diff --git a/configs/at91sam9x5ek_nandflash_defconfig b/configs/at91sam9x5ek_nandflash_defconfig index 693e4de843..5dab4bae88 100644 --- a/configs/at91sam9x5ek_nandflash_defconfig +++ b/configs/at91sam9x5ek_nandflash_defconfig @@ -39,6 +39,8 @@ CONFIG_DM_GPIO=y CONFIG_AT91_GPIO=y CONFIG_DM_MMC=y CONFIG_GENERIC_ATMEL_MCI=y +CONFIG_NAND=y +CONFIG_NAND_ATMEL=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_ATMEL=y diff --git a/configs/at91sam9x5ek_spiflash_defconfig b/configs/at91sam9x5ek_spiflash_defconfig index 7df7fc5047..b2c5783fef 100644 --- a/configs/at91sam9x5ek_spiflash_defconfig +++ b/configs/at91sam9x5ek_spiflash_defconfig @@ -39,6 +39,8 @@ CONFIG_DM_GPIO=y CONFIG_AT91_GPIO=y CONFIG_DM_MMC=y CONFIG_GENERIC_ATMEL_MCI=y +CONFIG_NAND=y +CONFIG_NAND_ATMEL=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_ATMEL=y diff --git a/configs/at91sam9xeek_dataflash_cs0_defconfig b/configs/at91sam9xeek_dataflash_cs0_defconfig index a42e29e5f1..4140eb30bb 100644 --- a/configs/at91sam9xeek_dataflash_cs0_defconfig +++ b/configs/at91sam9xeek_dataflash_cs0_defconfig @@ -34,6 +34,8 @@ CONFIG_CLK_AT91=y CONFIG_DM_GPIO=y CONFIG_AT91_GPIO=y # CONFIG_MMC is not set +CONFIG_NAND=y +CONFIG_NAND_ATMEL=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_ATMEL=y diff --git a/configs/at91sam9xeek_dataflash_cs1_defconfig b/configs/at91sam9xeek_dataflash_cs1_defconfig index 33d2bd0d6e..12818c6189 100644 --- a/configs/at91sam9xeek_dataflash_cs1_defconfig +++ b/configs/at91sam9xeek_dataflash_cs1_defconfig @@ -34,6 +34,8 @@ CONFIG_CLK_AT91=y CONFIG_DM_GPIO=y CONFIG_AT91_GPIO=y # CONFIG_MMC is not set +CONFIG_NAND=y +CONFIG_NAND_ATMEL=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_ATMEL=y diff --git a/configs/at91sam9xeek_nandflash_defconfig b/configs/at91sam9xeek_nandflash_defconfig index 3424b1dc31..fb079e8088 100644 --- a/configs/at91sam9xeek_nandflash_defconfig +++ b/configs/at91sam9xeek_nandflash_defconfig @@ -34,6 +34,8 @@ CONFIG_CLK_AT91=y CONFIG_DM_GPIO=y CONFIG_AT91_GPIO=y # CONFIG_MMC is not set +CONFIG_NAND=y +CONFIG_NAND_ATMEL=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_ATMEL=y diff --git a/configs/axm_defconfig b/configs/axm_defconfig index 2e325d9357..f1bdd0f04c 100644 --- a/configs/axm_defconfig +++ b/configs/axm_defconfig @@ -37,6 +37,8 @@ CONFIG_OF_CONTROL=y CONFIG_OF_EMBED=y CONFIG_ENV_IS_IN_NAND=y # CONFIG_MMC is not set +CONFIG_NAND=y +CONFIG_NAND_ATMEL=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_PHYLIB=y diff --git a/configs/corvus_defconfig b/configs/corvus_defconfig index 0f91f6e8f0..16999b6de1 100644 --- a/configs/corvus_defconfig +++ b/configs/corvus_defconfig @@ -40,6 +40,8 @@ CONFIG_CLK=y CONFIG_CLK_AT91=y CONFIG_DFU_NAND=y # CONFIG_MMC is not set +CONFIG_NAND=y +CONFIG_NAND_ATMEL=y CONFIG_PHYLIB=y CONFIG_ATMEL_USART=y CONFIG_USB=y diff --git a/configs/ethernut5_defconfig b/configs/ethernut5_defconfig index 904ad4fec9..fd5a6f66e9 100644 --- a/configs/ethernut5_defconfig +++ b/configs/ethernut5_defconfig @@ -49,6 +49,8 @@ CONFIG_CLK_AT91=y CONFIG_DM_GPIO=y CONFIG_AT91_GPIO=y CONFIG_MTD_NOR_FLASH=y +CONFIG_NAND=y +CONFIG_NAND_ATMEL=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_ATMEL=y diff --git a/configs/gurnard_defconfig b/configs/gurnard_defconfig index 6c222d6fba..f00a06a29b 100644 --- a/configs/gurnard_defconfig +++ b/configs/gurnard_defconfig @@ -24,6 +24,8 @@ CONFIG_CMD_PING=y CONFIG_CMD_FAT=y CONFIG_OF_CONTROL=y CONFIG_ENV_IS_IN_NAND=y +CONFIG_NAND=y +CONFIG_NAND_ATMEL=y CONFIG_PHYLIB=y CONFIG_TIMER=y CONFIG_ATMEL_PIT_TIMER=y diff --git a/configs/meesc_defconfig b/configs/meesc_defconfig index d4987f8619..a009b25789 100644 --- a/configs/meesc_defconfig +++ b/configs/meesc_defconfig @@ -25,6 +25,8 @@ CONFIG_CLK_AT91=y CONFIG_DM_GPIO=y CONFIG_AT91_GPIO=y # CONFIG_MMC is not set +CONFIG_NAND=y +CONFIG_NAND_ATMEL=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_ATMEL=y diff --git a/configs/pm9261_defconfig b/configs/pm9261_defconfig index ba413cecaf..1afa7807a1 100644 --- a/configs/pm9261_defconfig +++ b/configs/pm9261_defconfig @@ -35,6 +35,8 @@ CONFIG_DM_GPIO=y CONFIG_AT91_GPIO=y # CONFIG_MMC is not set CONFIG_MTD_NOR_FLASH=y +CONFIG_NAND=y +CONFIG_NAND_ATMEL=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_ATMEL=y diff --git a/configs/pm9263_defconfig b/configs/pm9263_defconfig index 98b4385fc4..836563864a 100644 --- a/configs/pm9263_defconfig +++ b/configs/pm9263_defconfig @@ -35,6 +35,8 @@ CONFIG_DM_GPIO=y CONFIG_AT91_GPIO=y # CONFIG_MMC is not set CONFIG_MTD_NOR_FLASH=y +CONFIG_NAND=y +CONFIG_NAND_ATMEL=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_ATMEL=y diff --git a/configs/pm9g45_defconfig b/configs/pm9g45_defconfig index 2a59ff38a8..99acd20917 100644 --- a/configs/pm9g45_defconfig +++ b/configs/pm9g45_defconfig @@ -21,5 +21,7 @@ CONFIG_CMD_CACHE=y CONFIG_CMD_JFFS2=y CONFIG_ENV_IS_IN_NAND=y # CONFIG_MMC is not set +CONFIG_NAND=y +CONFIG_NAND_ATMEL=y CONFIG_USB=y CONFIG_USB_STORAGE=y diff --git a/configs/sama5d2_ptc_ek_mmc_defconfig b/configs/sama5d2_ptc_ek_mmc_defconfig index 3fc18a132d..27606be8ba 100644 --- a/configs/sama5d2_ptc_ek_mmc_defconfig +++ b/configs/sama5d2_ptc_ek_mmc_defconfig @@ -45,6 +45,8 @@ CONFIG_I2C_EEPROM=y CONFIG_DM_MMC=y CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_ATMEL=y +CONFIG_NAND=y +CONFIG_NAND_ATMEL=y CONFIG_DM_ETH=y CONFIG_MACB=y CONFIG_PINCTRL=y diff --git a/configs/sama5d2_ptc_ek_nandflash_defconfig b/configs/sama5d2_ptc_ek_nandflash_defconfig index 886f34202c..b4a7376197 100644 --- a/configs/sama5d2_ptc_ek_nandflash_defconfig +++ b/configs/sama5d2_ptc_ek_nandflash_defconfig @@ -45,6 +45,8 @@ CONFIG_I2C_EEPROM=y CONFIG_DM_MMC=y CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_ATMEL=y +CONFIG_NAND=y +CONFIG_NAND_ATMEL=y CONFIG_DM_ETH=y CONFIG_MACB=y CONFIG_PINCTRL=y diff --git a/configs/sama5d36ek_cmp_mmc_defconfig b/configs/sama5d36ek_cmp_mmc_defconfig index 90a4577508..4ec6f4ee46 100644 --- a/configs/sama5d36ek_cmp_mmc_defconfig +++ b/configs/sama5d36ek_cmp_mmc_defconfig @@ -40,6 +40,8 @@ CONFIG_DM_GPIO=y CONFIG_AT91_GPIO=y CONFIG_DM_MMC=y CONFIG_GENERIC_ATMEL_MCI=y +CONFIG_NAND=y +CONFIG_NAND_ATMEL=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_ATMEL=y diff --git a/configs/sama5d36ek_cmp_nandflash_defconfig b/configs/sama5d36ek_cmp_nandflash_defconfig index 9a0e260b30..46ec7c728f 100644 --- a/configs/sama5d36ek_cmp_nandflash_defconfig +++ b/configs/sama5d36ek_cmp_nandflash_defconfig @@ -40,6 +40,8 @@ CONFIG_DM_GPIO=y CONFIG_AT91_GPIO=y CONFIG_DM_MMC=y CONFIG_GENERIC_ATMEL_MCI=y +CONFIG_NAND=y +CONFIG_NAND_ATMEL=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_ATMEL=y diff --git a/configs/sama5d36ek_cmp_spiflash_defconfig b/configs/sama5d36ek_cmp_spiflash_defconfig index 9f7af62ca6..157c3aefc9 100644 --- a/configs/sama5d36ek_cmp_spiflash_defconfig +++ b/configs/sama5d36ek_cmp_spiflash_defconfig @@ -40,6 +40,8 @@ CONFIG_DM_GPIO=y CONFIG_AT91_GPIO=y CONFIG_DM_MMC=y CONFIG_GENERIC_ATMEL_MCI=y +CONFIG_NAND=y +CONFIG_NAND_ATMEL=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_ATMEL=y diff --git a/configs/sama5d3_xplained_mmc_defconfig b/configs/sama5d3_xplained_mmc_defconfig index 861a851828..3e8cf67819 100644 --- a/configs/sama5d3_xplained_mmc_defconfig +++ b/configs/sama5d3_xplained_mmc_defconfig @@ -57,6 +57,8 @@ CONFIG_DM_GPIO=y CONFIG_AT91_GPIO=y CONFIG_DM_MMC=y CONFIG_GENERIC_ATMEL_MCI=y +CONFIG_NAND=y +CONFIG_NAND_ATMEL=y CONFIG_DM_ETH=y CONFIG_MACB=y CONFIG_PINCTRL=y diff --git a/configs/sama5d3_xplained_nandflash_defconfig b/configs/sama5d3_xplained_nandflash_defconfig index b72462d282..4efcba6062 100644 --- a/configs/sama5d3_xplained_nandflash_defconfig +++ b/configs/sama5d3_xplained_nandflash_defconfig @@ -54,6 +54,8 @@ CONFIG_DM_GPIO=y CONFIG_AT91_GPIO=y CONFIG_DM_MMC=y CONFIG_GENERIC_ATMEL_MCI=y +CONFIG_NAND=y +CONFIG_NAND_ATMEL=y CONFIG_DM_ETH=y CONFIG_MACB=y CONFIG_PINCTRL=y diff --git a/configs/sama5d3xek_mmc_defconfig b/configs/sama5d3xek_mmc_defconfig index 37f0eb9c8d..dcc7ed868c 100644 --- a/configs/sama5d3xek_mmc_defconfig +++ b/configs/sama5d3xek_mmc_defconfig @@ -61,6 +61,8 @@ CONFIG_AT91_GPIO=y CONFIG_DM_MMC=y CONFIG_GENERIC_ATMEL_MCI=y CONFIG_MTD_NOR_FLASH=y +CONFIG_NAND=y +CONFIG_NAND_ATMEL=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_ATMEL=y diff --git a/configs/sama5d3xek_nandflash_defconfig b/configs/sama5d3xek_nandflash_defconfig index 972926dd04..b2e46e5bdb 100644 --- a/configs/sama5d3xek_nandflash_defconfig +++ b/configs/sama5d3xek_nandflash_defconfig @@ -56,6 +56,8 @@ CONFIG_AT91_GPIO=y CONFIG_DM_MMC=y CONFIG_GENERIC_ATMEL_MCI=y CONFIG_MTD_NOR_FLASH=y +CONFIG_NAND=y +CONFIG_NAND_ATMEL=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_ATMEL=y diff --git a/configs/sama5d3xek_spiflash_defconfig b/configs/sama5d3xek_spiflash_defconfig index 5fb38f6e6f..be95e25edd 100644 --- a/configs/sama5d3xek_spiflash_defconfig +++ b/configs/sama5d3xek_spiflash_defconfig @@ -56,6 +56,8 @@ CONFIG_AT91_GPIO=y CONFIG_DM_MMC=y CONFIG_GENERIC_ATMEL_MCI=y CONFIG_MTD_NOR_FLASH=y +CONFIG_NAND=y +CONFIG_NAND_ATMEL=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_ATMEL=y diff --git a/configs/sama5d4_xplained_mmc_defconfig b/configs/sama5d4_xplained_mmc_defconfig index 5e1234b779..3b756b1e21 100644 --- a/configs/sama5d4_xplained_mmc_defconfig +++ b/configs/sama5d4_xplained_mmc_defconfig @@ -55,6 +55,8 @@ CONFIG_SYS_I2C_AT91=y CONFIG_I2C_EEPROM=y CONFIG_DM_MMC=y CONFIG_GENERIC_ATMEL_MCI=y +CONFIG_NAND=y +CONFIG_NAND_ATMEL=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_ATMEL=y diff --git a/configs/sama5d4_xplained_nandflash_defconfig b/configs/sama5d4_xplained_nandflash_defconfig index e017e0314e..eae8a04c25 100644 --- a/configs/sama5d4_xplained_nandflash_defconfig +++ b/configs/sama5d4_xplained_nandflash_defconfig @@ -52,6 +52,8 @@ CONFIG_SYS_I2C_AT91=y CONFIG_I2C_EEPROM=y CONFIG_DM_MMC=y CONFIG_GENERIC_ATMEL_MCI=y +CONFIG_NAND=y +CONFIG_NAND_ATMEL=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_ATMEL=y diff --git a/configs/sama5d4_xplained_spiflash_defconfig b/configs/sama5d4_xplained_spiflash_defconfig index dc17f9b603..18ed099f18 100644 --- a/configs/sama5d4_xplained_spiflash_defconfig +++ b/configs/sama5d4_xplained_spiflash_defconfig @@ -55,6 +55,8 @@ CONFIG_SYS_I2C_AT91=y CONFIG_I2C_EEPROM=y CONFIG_DM_MMC=y CONFIG_GENERIC_ATMEL_MCI=y +CONFIG_NAND=y +CONFIG_NAND_ATMEL=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_ATMEL=y diff --git a/configs/sama5d4ek_mmc_defconfig b/configs/sama5d4ek_mmc_defconfig index cf57caeb04..86e5db6e6b 100644 --- a/configs/sama5d4ek_mmc_defconfig +++ b/configs/sama5d4ek_mmc_defconfig @@ -55,6 +55,8 @@ CONFIG_DM_GPIO=y CONFIG_AT91_GPIO=y CONFIG_DM_MMC=y CONFIG_GENERIC_ATMEL_MCI=y +CONFIG_NAND=y +CONFIG_NAND_ATMEL=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_ATMEL=y diff --git a/configs/sama5d4ek_nandflash_defconfig b/configs/sama5d4ek_nandflash_defconfig index 27c79cbe85..60fc8add29 100644 --- a/configs/sama5d4ek_nandflash_defconfig +++ b/configs/sama5d4ek_nandflash_defconfig @@ -52,6 +52,8 @@ CONFIG_DM_GPIO=y CONFIG_AT91_GPIO=y CONFIG_DM_MMC=y CONFIG_GENERIC_ATMEL_MCI=y +CONFIG_NAND=y +CONFIG_NAND_ATMEL=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_ATMEL=y diff --git a/configs/sama5d4ek_spiflash_defconfig b/configs/sama5d4ek_spiflash_defconfig index 5269bc64e6..9dc639c38d 100644 --- a/configs/sama5d4ek_spiflash_defconfig +++ b/configs/sama5d4ek_spiflash_defconfig @@ -52,6 +52,8 @@ CONFIG_DM_GPIO=y CONFIG_AT91_GPIO=y CONFIG_DM_MMC=y CONFIG_GENERIC_ATMEL_MCI=y +CONFIG_NAND=y +CONFIG_NAND_ATMEL=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_ATMEL=y diff --git a/configs/smartweb_defconfig b/configs/smartweb_defconfig index 1f246e32ed..bb9feed094 100644 --- a/configs/smartweb_defconfig +++ b/configs/smartweb_defconfig @@ -43,6 +43,8 @@ CONFIG_CLK=y CONFIG_CLK_AT91=y CONFIG_DFU_NAND=y # CONFIG_MMC is not set +CONFIG_NAND=y +CONFIG_NAND_ATMEL=y CONFIG_PHYLIB=y CONFIG_USB=y CONFIG_DM_USB=y diff --git a/configs/snapper9260_defconfig b/configs/snapper9260_defconfig index d70054bfe4..e707311069 100644 --- a/configs/snapper9260_defconfig +++ b/configs/snapper9260_defconfig @@ -27,5 +27,7 @@ CONFIG_CMD_FAT=y CONFIG_ENV_IS_IN_NAND=y CONFIG_CMD_PCA953X=y # CONFIG_MMC is not set +CONFIG_NAND=y +CONFIG_NAND_ATMEL=y CONFIG_USB=y CONFIG_USB_STORAGE=y diff --git a/configs/snapper9g20_defconfig b/configs/snapper9g20_defconfig index 9954be567f..073e855f71 100644 --- a/configs/snapper9g20_defconfig +++ b/configs/snapper9g20_defconfig @@ -26,5 +26,7 @@ CONFIG_CMD_FAT=y CONFIG_ENV_IS_IN_NAND=y CONFIG_CMD_PCA953X=y # CONFIG_MMC is not set +CONFIG_NAND=y +CONFIG_NAND_ATMEL=y CONFIG_USB=y CONFIG_USB_STORAGE=y diff --git a/configs/taurus_defconfig b/configs/taurus_defconfig index 20057be7e5..8680f85b98 100644 --- a/configs/taurus_defconfig +++ b/configs/taurus_defconfig @@ -47,6 +47,8 @@ CONFIG_CLK=y CONFIG_CLK_AT91=y CONFIG_DFU_NAND=y # CONFIG_MMC is not set +CONFIG_NAND=y +CONFIG_NAND_ATMEL=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_PHYLIB=y diff --git a/configs/usb_a9263_dataflash_defconfig b/configs/usb_a9263_dataflash_defconfig index 9977a0719a..31712c1984 100644 --- a/configs/usb_a9263_dataflash_defconfig +++ b/configs/usb_a9263_dataflash_defconfig @@ -30,6 +30,8 @@ CONFIG_CLK_AT91=y CONFIG_DM_GPIO=y CONFIG_AT91_GPIO=y # CONFIG_MMC is not set +CONFIG_NAND=y +CONFIG_NAND_ATMEL=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_ATMEL=y diff --git a/configs/wb45n_defconfig b/configs/wb45n_defconfig index 6dc7c2efc4..f52d46ebe9 100644 --- a/configs/wb45n_defconfig +++ b/configs/wb45n_defconfig @@ -23,5 +23,7 @@ CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y CONFIG_ENV_IS_IN_NAND=y +CONFIG_NAND=y +CONFIG_NAND_ATMEL=y CONFIG_LZMA=y CONFIG_OF_LIBFDT=y diff --git a/configs/wb50n_defconfig b/configs/wb50n_defconfig index e6b6baa5e8..ea27852df7 100644 --- a/configs/wb50n_defconfig +++ b/configs/wb50n_defconfig @@ -24,6 +24,8 @@ CONFIG_CMD_MII=y CONFIG_CMD_PING=y CONFIG_ENV_IS_IN_NAND=y CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_NAND=y +CONFIG_NAND_ATMEL=y CONFIG_PHYLIB=y CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ90X1=y diff --git a/drivers/mtd/nand/Kconfig b/drivers/mtd/nand/Kconfig index bdc272142e..f4f3955d08 100644 --- a/drivers/mtd/nand/Kconfig +++ b/drivers/mtd/nand/Kconfig @@ -9,6 +9,13 @@ config SYS_NAND_SELF_INIT This option, if enabled, provides more flexible and linux-like NAND initialization process. +config NAND_ATMEL + bool "Support Atmel NAND controller" + imply SYS_NAND_USE_FLASH_BBT + help + Enable this driver for NAND flash platforms using an Atmel NAND + controller. + config NAND_DENALI bool select SYS_NAND_SELF_INIT diff --git a/include/configs/at91sam9260ek.h b/include/configs/at91sam9260ek.h index 137d7f0bbf..fdc74a3d78 100644 --- a/include/configs/at91sam9260ek.h +++ b/include/configs/at91sam9260ek.h @@ -90,7 +90,6 @@ /* NAND flash */ #ifdef CONFIG_CMD_NAND -#define CONFIG_NAND_ATMEL #define CONFIG_SYS_MAX_NAND_DEVICE 1 #define CONFIG_SYS_NAND_BASE ATMEL_BASE_CS3 #define CONFIG_SYS_NAND_DBW_8 diff --git a/include/configs/at91sam9261ek.h b/include/configs/at91sam9261ek.h index 9e85259909..0cf34153b0 100644 --- a/include/configs/at91sam9261ek.h +++ b/include/configs/at91sam9261ek.h @@ -59,7 +59,6 @@ /* NAND flash */ #ifdef CONFIG_CMD_NAND -#define CONFIG_NAND_ATMEL #define CONFIG_SYS_MAX_NAND_DEVICE 1 #define CONFIG_SYS_NAND_BASE 0x40000000 #define CONFIG_SYS_NAND_DBW_8 diff --git a/include/configs/at91sam9263ek.h b/include/configs/at91sam9263ek.h index 4c476fc6a2..3bd0926590 100644 --- a/include/configs/at91sam9263ek.h +++ b/include/configs/at91sam9263ek.h @@ -190,7 +190,6 @@ /* NAND flash */ #ifdef CONFIG_CMD_NAND -#define CONFIG_NAND_ATMEL #define CONFIG_SYS_MAX_NAND_DEVICE 1 #define CONFIG_SYS_NAND_BASE ATMEL_BASE_CS3 #define CONFIG_SYS_NAND_DBW_8 1 diff --git a/include/configs/at91sam9m10g45ek.h b/include/configs/at91sam9m10g45ek.h index bec1558d6b..2c1ceeda07 100644 --- a/include/configs/at91sam9m10g45ek.h +++ b/include/configs/at91sam9m10g45ek.h @@ -52,7 +52,6 @@ /* NAND flash */ #ifdef CONFIG_CMD_NAND -#define CONFIG_NAND_ATMEL #define CONFIG_SYS_MAX_NAND_DEVICE 1 #define CONFIG_SYS_NAND_BASE ATMEL_BASE_CS3 #define CONFIG_SYS_NAND_DBW_8 diff --git a/include/configs/at91sam9n12ek.h b/include/configs/at91sam9n12ek.h index a6865b2d6f..05046ac7f1 100644 --- a/include/configs/at91sam9n12ek.h +++ b/include/configs/at91sam9n12ek.h @@ -52,7 +52,6 @@ /* NAND flash */ #ifdef CONFIG_CMD_NAND -#define CONFIG_NAND_ATMEL #define CONFIG_SYS_MAX_NAND_DEVICE 1 #define CONFIG_SYS_NAND_BASE 0x40000000 #define CONFIG_SYS_NAND_MASK_ALE (1 << 21) diff --git a/include/configs/at91sam9rlek.h b/include/configs/at91sam9rlek.h index 5ddb7673e5..1001526b7d 100644 --- a/include/configs/at91sam9rlek.h +++ b/include/configs/at91sam9rlek.h @@ -50,7 +50,6 @@ /* NAND flash */ #ifdef CONFIG_CMD_NAND -#define CONFIG_NAND_ATMEL #define CONFIG_SYS_MAX_NAND_DEVICE 1 #define CONFIG_SYS_NAND_BASE ATMEL_BASE_CS3 #define CONFIG_SYS_NAND_DBW_8 1 diff --git a/include/configs/at91sam9x5ek.h b/include/configs/at91sam9x5ek.h index 8fc9750945..04ee0a94a8 100644 --- a/include/configs/at91sam9x5ek.h +++ b/include/configs/at91sam9x5ek.h @@ -45,7 +45,6 @@ /* NAND flash */ #ifdef CONFIG_CMD_NAND -#define CONFIG_NAND_ATMEL #define CONFIG_SYS_MAX_NAND_DEVICE 1 #define CONFIG_SYS_NAND_BASE 0x40000000 #define CONFIG_SYS_NAND_DBW_8 1 diff --git a/include/configs/corvus.h b/include/configs/corvus.h index 61b014638e..f1cd955afa 100644 --- a/include/configs/corvus.h +++ b/include/configs/corvus.h @@ -64,7 +64,6 @@ /* NAND flash */ #ifdef CONFIG_CMD_NAND -#define CONFIG_NAND_ATMEL #define CONFIG_SYS_MAX_NAND_DEVICE 1 #define CONFIG_SYS_NAND_BASE ATMEL_BASE_CS3 #define CONFIG_SYS_NAND_DBW_8 diff --git a/include/configs/ethernut5.h b/include/configs/ethernut5.h index ca5c65fe5a..6ec8860a9d 100644 --- a/include/configs/ethernut5.h +++ b/include/configs/ethernut5.h @@ -66,7 +66,6 @@ #define CONFIG_SYS_MAX_NAND_DEVICE 1 #define CONFIG_SYS_NAND_BASE 0x40000000 #define CONFIG_SYS_NAND_DBW_8 -#define CONFIG_NAND_ATMEL /* our ALE is AD21 */ #define CONFIG_SYS_NAND_MASK_ALE (1 << 21) /* our CLE is AD22 */ diff --git a/include/configs/meesc.h b/include/configs/meesc.h index 004b2b3330..dcf504b1cb 100644 --- a/include/configs/meesc.h +++ b/include/configs/meesc.h @@ -77,7 +77,6 @@ /* NAND flash */ #ifdef CONFIG_CMD_NAND -# define CONFIG_NAND_ATMEL # define CONFIG_SYS_MAX_NAND_DEVICE 1 # define CONFIG_SYS_NAND_BASE ATMEL_BASE_CS3 /* 0x40000000 */ # define CONFIG_SYS_NAND_DBW_8 diff --git a/include/configs/pm9261.h b/include/configs/pm9261.h index 1d9d2c575e..015eeab21c 100644 --- a/include/configs/pm9261.h +++ b/include/configs/pm9261.h @@ -159,7 +159,6 @@ #define PHYS_SDRAM_SIZE 0x04000000 /* 64 megs */ /* NAND flash */ -#define CONFIG_NAND_ATMEL #define CONFIG_SYS_MAX_NAND_DEVICE 1 #define CONFIG_SYS_NAND_BASE 0x40000000 #define CONFIG_SYS_NAND_DBW_8 1 diff --git a/include/configs/pm9263.h b/include/configs/pm9263.h index 8fd1dc48c6..20ecccca57 100644 --- a/include/configs/pm9263.h +++ b/include/configs/pm9263.h @@ -182,7 +182,6 @@ /* NAND flash */ #ifdef CONFIG_CMD_NAND -#define CONFIG_NAND_ATMEL #define CONFIG_SYS_MAX_NAND_DEVICE 1 #define CONFIG_SYS_NAND_BASE 0x40000000 #define CONFIG_SYS_NAND_DBW_8 1 diff --git a/include/configs/pm9g45.h b/include/configs/pm9g45.h index 1feb8d9a7d..275eac8319 100644 --- a/include/configs/pm9g45.h +++ b/include/configs/pm9g45.h @@ -71,7 +71,6 @@ /* NAND flash */ #ifdef CONFIG_CMD_NAND -#define CONFIG_NAND_ATMEL #define CONFIG_SYS_MAX_NAND_DEVICE 1 #define CONFIG_SYS_NAND_BASE 0x40000000 #define CONFIG_SYS_NAND_DBW_8 1 diff --git a/include/configs/sama5d2_ptc_ek.h b/include/configs/sama5d2_ptc_ek.h index 6bc4846f57..d2d4adbb7f 100644 --- a/include/configs/sama5d2_ptc_ek.h +++ b/include/configs/sama5d2_ptc_ek.h @@ -29,7 +29,6 @@ /* NAND Flash */ #ifdef CONFIG_CMD_NAND -#define CONFIG_NAND_ATMEL #define CONFIG_SYS_MAX_NAND_DEVICE 1 #define CONFIG_SYS_NAND_BASE ATMEL_BASE_CS3 /* our ALE is AD21 */ diff --git a/include/configs/sama5d3_xplained.h b/include/configs/sama5d3_xplained.h index 5cbddf30d7..3a2810522b 100644 --- a/include/configs/sama5d3_xplained.h +++ b/include/configs/sama5d3_xplained.h @@ -36,7 +36,6 @@ /* NAND flash */ #ifdef CONFIG_CMD_NAND -#define CONFIG_NAND_ATMEL #define CONFIG_SYS_MAX_NAND_DEVICE 1 #define CONFIG_SYS_NAND_BASE 0x60000000 /* our ALE is AD21 */ diff --git a/include/configs/sama5d3xek.h b/include/configs/sama5d3xek.h index d5e6b7f4e2..82e1a16a40 100644 --- a/include/configs/sama5d3xek.h +++ b/include/configs/sama5d3xek.h @@ -58,7 +58,6 @@ /* NAND flash */ #ifdef CONFIG_CMD_NAND -#define CONFIG_NAND_ATMEL #define CONFIG_SYS_MAX_NAND_DEVICE 1 #define CONFIG_SYS_NAND_BASE 0x60000000 /* our ALE is AD21 */ diff --git a/include/configs/sama5d4_xplained.h b/include/configs/sama5d4_xplained.h index ec6602cf45..42e5a86941 100644 --- a/include/configs/sama5d4_xplained.h +++ b/include/configs/sama5d4_xplained.h @@ -33,7 +33,6 @@ /* NAND flash */ #ifdef CONFIG_CMD_NAND -#define CONFIG_NAND_ATMEL #define CONFIG_SYS_MAX_NAND_DEVICE 1 #define CONFIG_SYS_NAND_BASE 0x80000000 /* our ALE is AD21 */ diff --git a/include/configs/sama5d4ek.h b/include/configs/sama5d4ek.h index 19ce833861..c36b5084e5 100644 --- a/include/configs/sama5d4ek.h +++ b/include/configs/sama5d4ek.h @@ -31,7 +31,6 @@ /* NAND flash */ #ifdef CONFIG_CMD_NAND -#define CONFIG_NAND_ATMEL #define CONFIG_SYS_MAX_NAND_DEVICE 1 #define CONFIG_SYS_NAND_BASE 0x80000000 /* our ALE is AD21 */ diff --git a/include/configs/smartweb.h b/include/configs/smartweb.h index c6a2f8a8d1..23137bd5f8 100644 --- a/include/configs/smartweb.h +++ b/include/configs/smartweb.h @@ -78,7 +78,6 @@ ROUND(3 * CONFIG_ENV_SIZE + (4 * SZ_1M), 0x1000) /* NAND flash settings */ -#define CONFIG_NAND_ATMEL #define CONFIG_SYS_MAX_NAND_DEVICE 1 #define CONFIG_SYS_NAND_BASE ATMEL_BASE_CS3 #define CONFIG_SYS_NAND_DBW_8 diff --git a/include/configs/snapper9260.h b/include/configs/snapper9260.h index bcdc1f0db0..b0d1f44976 100644 --- a/include/configs/snapper9260.h +++ b/include/configs/snapper9260.h @@ -38,7 +38,6 @@ #define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_SDRAM_BASE + (1024 * 1024)) /* NAND Flash */ -#define CONFIG_NAND_ATMEL #define CONFIG_SYS_MAX_NAND_DEVICE 1 #define CONFIG_SYS_NAND_BASE ATMEL_BASE_CS3 #define CONFIG_SYS_NAND_DBW_8 diff --git a/include/configs/snapper9g45.h b/include/configs/snapper9g45.h index 8a2858c47d..32b42a8759 100644 --- a/include/configs/snapper9g45.h +++ b/include/configs/snapper9g45.h @@ -36,7 +36,6 @@ #define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_SDRAM_BASE + (1024 * 1024)) /* NAND Flash */ -#define CONFIG_NAND_ATMEL #define CONFIG_ATMEL_NAND_HWECC #define CONFIG_SYS_NAND_ECC_BASE ATMEL_BASE_ECC #define CONFIG_SYS_MAX_NAND_DEVICE 1 diff --git a/include/configs/taurus.h b/include/configs/taurus.h index d21d575cb0..d8cfc3f055 100644 --- a/include/configs/taurus.h +++ b/include/configs/taurus.h @@ -72,7 +72,6 @@ /* NAND flash */ #ifdef CONFIG_CMD_NAND -#define CONFIG_NAND_ATMEL #define CONFIG_SYS_MAX_NAND_DEVICE 1 #define CONFIG_SYS_NAND_BASE ATMEL_BASE_CS3 #define CONFIG_SYS_NAND_DBW_8 diff --git a/include/configs/usb_a9263.h b/include/configs/usb_a9263.h index bc102eecf2..a13fee6938 100644 --- a/include/configs/usb_a9263.h +++ b/include/configs/usb_a9263.h @@ -48,7 +48,6 @@ /* NAND flash */ #ifdef CONFIG_CMD_NAND -#define CONFIG_NAND_ATMEL #define CONFIG_SYS_MAX_NAND_DEVICE 1 #define CONFIG_SYS_NAND_BASE ATMEL_BASE_CS3 /* our ALE is AD21 */ diff --git a/include/configs/wb45n.h b/include/configs/wb45n.h index 58c36e0d56..9e4dee50fd 100644 --- a/include/configs/wb45n.h +++ b/include/configs/wb45n.h @@ -40,7 +40,6 @@ (CONFIG_SYS_SDRAM_BASE + 4 * 1024 - GENERATED_GBL_DATA_SIZE) /* NAND flash */ -#define CONFIG_NAND_ATMEL #define CONFIG_SYS_MAX_NAND_DEVICE 1 #define CONFIG_SYS_NAND_BASE 0x40000000 /* our ALE is AD21 */ diff --git a/include/configs/wb50n.h b/include/configs/wb50n.h index 3ca1820342..70ea48a9a3 100644 --- a/include/configs/wb50n.h +++ b/include/configs/wb50n.h @@ -51,7 +51,6 @@ #define CONFIG_SYS_MEMTEST_END 0x22000000 /* NAND flash */ -#define CONFIG_NAND_ATMEL #define CONFIG_SYS_MAX_NAND_DEVICE 1 #define CONFIG_SYS_NAND_BASE ATMEL_BASE_CS3 /* our ALE is AD21 */ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 1219dcc3be..42dc722251 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -1369,7 +1369,6 @@ CONFIG_MY_OPTION CONFIG_NANDFLASH_SIZE CONFIG_NAND_6BYTES_OOB_FREE_10BYTES_ECC CONFIG_NAND_ACTL -CONFIG_NAND_ATMEL CONFIG_NAND_CS_INIT CONFIG_NAND_DATA_REG CONFIG_NAND_DAVINCI -- 2.17.1

2 1

[U-Boot] [PATCH] configs: Make NAND_BOOT and ONENAND_BOOT imply NAND
by Adam Ford 23 Jul '18

23 Jul '18

Some boards indicate support from booting NAND or ONENAND booting, but don't enable the CONFIG_NAND. This makes those boards imply NAND which will make enabling other flags that are dependent on CONFIG_NAND possible and easier to migrate. Signed-off-by: Adam Ford <aford173(a)gmail.com> diff --git a/common/Kconfig b/common/Kconfig index 4c7a1a9af8..a22268cbf9 100644 --- a/common/Kconfig +++ b/common/Kconfig @@ -125,6 +125,7 @@ config NOR_BOOT config NAND_BOOT bool "Support for booting from NAND flash" default n + imply NAND help Enabling this will make a U-Boot binary that is capable of being booted via NAND flash. This is not a must, some SoCs need this, @@ -133,6 +134,7 @@ config NAND_BOOT config ONENAND_BOOT bool "Support for booting from ONENAND" default n + imply NAND help Enabling this will make a U-Boot binary that is capable of being booted via ONENAND. This is not a must, some SoCs need this, diff --git a/configs/at91sam9m10g45ek_nandflash_defconfig b/configs/at91sam9m10g45ek_nandflash_defconfig index d85a92a026..5b5a942f23 100644 --- a/configs/at91sam9m10g45ek_nandflash_defconfig +++ b/configs/at91sam9m10g45ek_nandflash_defconfig @@ -38,7 +38,6 @@ CONFIG_DM_GPIO=y CONFIG_AT91_GPIO=y CONFIG_DM_MMC=y CONFIG_GENERIC_ATMEL_MCI=y -CONFIG_NAND=y CONFIG_NAND_ATMEL=y CONFIG_DM_ETH=y CONFIG_MACB=y diff --git a/configs/at91sam9n12ek_nandflash_defconfig b/configs/at91sam9n12ek_nandflash_defconfig index 33da570b4d..1627206c9e 100644 --- a/configs/at91sam9n12ek_nandflash_defconfig +++ b/configs/at91sam9n12ek_nandflash_defconfig @@ -38,7 +38,6 @@ CONFIG_DM_GPIO=y CONFIG_AT91_GPIO=y CONFIG_DM_MMC=y CONFIG_GENERIC_ATMEL_MCI=y -CONFIG_NAND=y CONFIG_NAND_ATMEL=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y diff --git a/configs/at91sam9x5ek_nandflash_defconfig b/configs/at91sam9x5ek_nandflash_defconfig index 5dab4bae88..87944fce47 100644 --- a/configs/at91sam9x5ek_nandflash_defconfig +++ b/configs/at91sam9x5ek_nandflash_defconfig @@ -39,7 +39,6 @@ CONFIG_DM_GPIO=y CONFIG_AT91_GPIO=y CONFIG_DM_MMC=y CONFIG_GENERIC_ATMEL_MCI=y -CONFIG_NAND=y CONFIG_NAND_ATMEL=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y diff --git a/configs/ls2080aqds_nand_defconfig b/configs/ls2080aqds_nand_defconfig index cbb6133266..c6f91453a8 100644 --- a/configs/ls2080aqds_nand_defconfig +++ b/configs/ls2080aqds_nand_defconfig @@ -41,7 +41,6 @@ CONFIG_NET_RANDOM_ETHADDR=y CONFIG_DM=y CONFIG_FSL_CAAM=y CONFIG_FSL_ESDHC=y -CONFIG_NAND=y CONFIG_DM_SPI_FLASH=y CONFIG_PHYLIB=y CONFIG_NETDEVICES=y diff --git a/configs/ls2080ardb_nand_defconfig b/configs/ls2080ardb_nand_defconfig index 590d0ba9dd..8a33f4c4d3 100644 --- a/configs/ls2080ardb_nand_defconfig +++ b/configs/ls2080ardb_nand_defconfig @@ -39,7 +39,6 @@ CONFIG_DM=y CONFIG_FSL_CAAM=y CONFIG_FSL_ESDHC=y CONFIG_MTD_NOR_FLASH=y -CONFIG_NAND=y CONFIG_PHYLIB=y CONFIG_NETDEVICES=y CONFIG_PHY_GIGE=y diff --git a/configs/sama5d2_ptc_ek_nandflash_defconfig b/configs/sama5d2_ptc_ek_nandflash_defconfig index b4a7376197..ebba7599f0 100644 --- a/configs/sama5d2_ptc_ek_nandflash_defconfig +++ b/configs/sama5d2_ptc_ek_nandflash_defconfig @@ -45,7 +45,6 @@ CONFIG_I2C_EEPROM=y CONFIG_DM_MMC=y CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_ATMEL=y -CONFIG_NAND=y CONFIG_NAND_ATMEL=y CONFIG_DM_ETH=y CONFIG_MACB=y diff --git a/configs/sama5d36ek_cmp_nandflash_defconfig b/configs/sama5d36ek_cmp_nandflash_defconfig index 46ec7c728f..9def836578 100644 --- a/configs/sama5d36ek_cmp_nandflash_defconfig +++ b/configs/sama5d36ek_cmp_nandflash_defconfig @@ -40,7 +40,6 @@ CONFIG_DM_GPIO=y CONFIG_AT91_GPIO=y CONFIG_DM_MMC=y CONFIG_GENERIC_ATMEL_MCI=y -CONFIG_NAND=y CONFIG_NAND_ATMEL=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y diff --git a/configs/sama5d3_xplained_nandflash_defconfig b/configs/sama5d3_xplained_nandflash_defconfig index 4efcba6062..8d0e475cca 100644 --- a/configs/sama5d3_xplained_nandflash_defconfig +++ b/configs/sama5d3_xplained_nandflash_defconfig @@ -54,7 +54,6 @@ CONFIG_DM_GPIO=y CONFIG_AT91_GPIO=y CONFIG_DM_MMC=y CONFIG_GENERIC_ATMEL_MCI=y -CONFIG_NAND=y CONFIG_NAND_ATMEL=y CONFIG_DM_ETH=y CONFIG_MACB=y diff --git a/configs/sama5d3xek_nandflash_defconfig b/configs/sama5d3xek_nandflash_defconfig index b2e46e5bdb..940decc322 100644 --- a/configs/sama5d3xek_nandflash_defconfig +++ b/configs/sama5d3xek_nandflash_defconfig @@ -56,7 +56,6 @@ CONFIG_AT91_GPIO=y CONFIG_DM_MMC=y CONFIG_GENERIC_ATMEL_MCI=y CONFIG_MTD_NOR_FLASH=y -CONFIG_NAND=y CONFIG_NAND_ATMEL=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y diff --git a/configs/sama5d4_xplained_nandflash_defconfig b/configs/sama5d4_xplained_nandflash_defconfig index eae8a04c25..e2f8bbbe49 100644 --- a/configs/sama5d4_xplained_nandflash_defconfig +++ b/configs/sama5d4_xplained_nandflash_defconfig @@ -52,7 +52,6 @@ CONFIG_SYS_I2C_AT91=y CONFIG_I2C_EEPROM=y CONFIG_DM_MMC=y CONFIG_GENERIC_ATMEL_MCI=y -CONFIG_NAND=y CONFIG_NAND_ATMEL=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y diff --git a/configs/sama5d4ek_nandflash_defconfig b/configs/sama5d4ek_nandflash_defconfig index 60fc8add29..1b0be82122 100644 --- a/configs/sama5d4ek_nandflash_defconfig +++ b/configs/sama5d4ek_nandflash_defconfig @@ -52,7 +52,6 @@ CONFIG_DM_GPIO=y CONFIG_AT91_GPIO=y CONFIG_DM_MMC=y CONFIG_GENERIC_ATMEL_MCI=y -CONFIG_NAND=y CONFIG_NAND_ATMEL=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 1fb8968ef5..b5f63c834b 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -3626,7 +3626,6 @@ CONFIG_SYS_NAND_MAX_OOBFREE CONFIG_SYS_NAND_MX7_GPMI_62_ECC_BYTES CONFIG_SYS_NAND_NO_SUBPAGE CONFIG_SYS_NAND_NO_SUBPAGE_WRITE -CONFIG_SYS_NAND_ONFI_DETECTION CONFIG_SYS_NAND_OR_PRELIM CONFIG_SYS_NAND_PAGE_2K CONFIG_SYS_NAND_PAGE_4K @@ -3638,7 +3637,6 @@ CONFIG_SYS_NAND_SELECT_DEVICE CONFIG_SYS_NAND_SIZE CONFIG_SYS_NAND_SPL_KERNEL_OFFS CONFIG_SYS_NAND_SPL_SIZE -CONFIG_SYS_NAND_USE_FLASH_BBT CONFIG_SYS_NAND_U_BOOT_DST CONFIG_SYS_NAND_U_BOOT_RELOC CONFIG_SYS_NAND_U_BOOT_RELOC_SP -- 2.17.1

2 1

← Newer
1
...
33
34
35
36
37
38
39
...
70
Older →

Jump to page: