August 2017 - U-Boot

[U-Boot] [PATCH] net: macb: Add support for Xilinx Zynq SoC
by Wilson Lee 22 Jan '18

22 Jan '18

Although Xilinx Zynq SoC was using MACB similar hardware. However, U-boot MACB driver was not supporting Xilinx Zynq SoC. This patch is to add support for the Xilinx Zynq SoC to the existing MACB network driver. This patch is to add Zynq GEM DMA Config, provide callback function for different linkspeed for case of using Xilinx Zynq Programmable Logic as GMII to RGMII convertor. This patch convert the return value to use error codes. Signed-off-by: Wilson Lee <wilson.lee(a)ni.com> Cc: Chen Yee Chew <chen.yee.chew(a)ni.com> Cc: Keng Soon Cheah <keng.soon.cheah(a)ni.com> Cc: Joe Hershberger <joe.hershberger(a)ni.com> Cc: Wenyou Yang <wenyou.yang(a)atmel.com> --- drivers/net/Kconfig | 7 +++++ drivers/net/macb.c | 91 ++++++++++++++++++++++++++++++++++++++++++++++------- drivers/net/macb.h | 1 + 3 files changed, 87 insertions(+), 12 deletions(-) diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index 5ceea44..6c54f93 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig @@ -177,6 +177,13 @@ config MACB GEM (Gigabit Ethernet MAC) found in some ARM SoC devices. Say Y to include support for the MACB/GEM chip. +config MACB_ZYNQ + bool "Cadence MACB/GEM Ethernet Interface for Xilinx Zynq" + depends on MACB + help + The Cadence MACB ethernet interface was used on Zynq platform. + Say Y to enable support for the MACB/GEM in Zynq chip. + config PCH_GBE bool "Intel Platform Controller Hub EG20T GMAC driver" depends on DM_ETH && DM_PCI diff --git a/drivers/net/macb.c b/drivers/net/macb.c index f9373db..e62aefc 100644 --- a/drivers/net/macb.c +++ b/drivers/net/macb.c @@ -52,6 +52,22 @@ DECLARE_GLOBAL_DATA_PTR; #define MACB_TX_TIMEOUT 1000 #define MACB_AUTONEG_TIMEOUT 5000000 +#ifdef CONFIG_MACB_ZYNQ +/* INCR4 AHB bursts */ +#define MACB_ZYNQ_GEM_DMACR_BLENGTH 0x00000004 +/* Use full configured addressable space (8 Kb) */ +#define MACB_ZYNQ_GEM_DMACR_RXSIZE 0x00000300 +/* Use full configured addressable space (4 Kb) */ +#define MACB_ZYNQ_GEM_DMACR_TXSIZE 0x00000400 +/* Set RXBUF with use of 128 byte */ +#define MACB_ZYNQ_GEM_DMACR_RXBUF 0x00020000 +#define MACB_ZYNQ_GEM_DMACR_INIT \ + (MACB_ZYNQ_GEM_DMACR_BLENGTH | \ + MACB_ZYNQ_GEM_DMACR_RXSIZE | \ + MACB_ZYNQ_GEM_DMACR_TXSIZE | \ + MACB_ZYNQ_GEM_DMACR_RXBUF) +#endif + struct macb_dma_desc { u32 addr; u32 ctrl; @@ -461,13 +477,25 @@ static int macb_phy_find(struct macb_device *macb, const char *name) phy_id = macb_mdio_read(macb, MII_PHYSID1); if (phy_id != 0xffff) { printf("%s: PHY present at %d\n", name, i); - return 1; + return 0; } } /* PHY isn't up to snuff */ printf("%s: PHY not found\n", name); + return -ENODEV; +} + +/** + * macb_linkspd_cb - Linkspeed change callback function + * @regs: Base Register of MACB devices + * @speed: Linkspeed + * Returns 0 when operation success and negative errno number + * when operation failed. + */ +int __weak macb_linkspd_cb(void *regs, unsigned int speed) +{ return 0; } @@ -483,18 +511,20 @@ static int macb_phy_init(struct macb_device *macb, const char *name) u32 ncfgr; u16 phy_id, status, adv, lpa; int media, speed, duplex; + int ret; int i; arch_get_mdio_control(name); /* Auto-detect phy_addr */ - if (!macb_phy_find(macb, name)) - return 0; + ret = macb_phy_find(macb, name); + if (ret) + return ret; /* Check if the PHY is up to snuff... */ phy_id = macb_mdio_read(macb, MII_PHYSID1); if (phy_id == 0xffff) { printf("%s: No PHY present\n", name); - return 0; + return -ENODEV; } #ifdef CONFIG_PHYLIB @@ -530,7 +560,7 @@ static int macb_phy_init(struct macb_device *macb, const char *name) if (!(status & BMSR_LSTATUS)) { printf("%s: link down (status: 0x%04x)\n", name, status); - return 0; + return -ENETDOWN; } /* First check for GMAC and that it is GiB capable */ @@ -554,7 +584,11 @@ static int macb_phy_init(struct macb_device *macb, const char *name) macb_writel(macb, NCFGR, ncfgr); - return 1; + ret = macb_linkspd_cb(macb->regs, _1000BASET); + if (ret) + return ret; + + return 0; } } @@ -573,13 +607,21 @@ static int macb_phy_init(struct macb_device *macb, const char *name) ncfgr = macb_readl(macb, NCFGR); ncfgr &= ~(MACB_BIT(SPD) | MACB_BIT(FD) | GEM_BIT(GBE)); - if (speed) + if (speed) { ncfgr |= MACB_BIT(SPD); + ret = macb_linkspd_cb(macb->regs, _100BASET); + } else { + ret = macb_linkspd_cb(macb->regs, _10BASET); + } + + if (ret) + return ret; + if (duplex) ncfgr |= MACB_BIT(FD); macb_writel(macb, NCFGR, ncfgr); - return 1; + return 0; } static int gmac_init_multi_queues(struct macb_device *macb) @@ -616,6 +658,7 @@ static int _macb_init(struct macb_device *macb, const char *name) struct macb_device *macb = dev_get_priv(dev); #endif unsigned long paddr; + int ret; int i; /* @@ -649,6 +692,10 @@ static int _macb_init(struct macb_device *macb, const char *name) macb->tx_tail = 0; macb->next_rx_tail = 0; +#ifdef CONFIG_MACB_ZYNQ + macb_writel(macb, DMACFG, MACB_ZYNQ_GEM_DMACR_INIT); +#endif + macb_writel(macb, RBQP, macb->rx_ring_dma); macb_writel(macb, TBQP, macb->tx_ring_dma); @@ -709,11 +756,12 @@ static int _macb_init(struct macb_device *macb, const char *name) } #ifdef CONFIG_DM_ETH - if (!macb_phy_init(dev, name)) + ret = macb_phy_init(dev, name); #else - if (!macb_phy_init(macb, name)) + ret = macb_phy_init(macb, name); #endif - return -1; + if (ret) + return ret; /* Enable TX and RX */ macb_writel(macb, NCR, MACB_BIT(TE) | MACB_BIT(RE)); @@ -1013,9 +1061,15 @@ static int macb_enable_clk(struct udevice *dev) if (ret) return -EINVAL; + /* + * Zynq clock driver didn't support for enable or disable + * clock. Hence, clk_enable() didn't apply for Zynq + */ +#ifndef CONFIG_MACB_ZYNQ ret = clk_enable(&clk); if (ret) return ret; +#endif clk_rate = clk_get_rate(&clk); if (!clk_rate) @@ -1083,12 +1137,24 @@ static int macb_eth_remove(struct udevice *dev) return 0; } +/** + * macb_late_eth_ofdata_to_platdata + * @dev: udevice struct + * Returns 0 when operation success and negative errno number + * when operation failed. + */ +int __weak macb_late_eth_ofdata_to_platdata(struct udevice *dev) +{ + return 0; +} + static int macb_eth_ofdata_to_platdata(struct udevice *dev) { struct eth_pdata *pdata = dev_get_platdata(dev); pdata->iobase = devfdt_get_addr(dev); - return 0; + + return macb_late_eth_ofdata_to_platdata(dev); } static const struct udevice_id macb_eth_ids[] = { @@ -1097,6 +1163,7 @@ static const struct udevice_id macb_eth_ids[] = { { .compatible = "atmel,sama5d2-gem" }, { .compatible = "atmel,sama5d3-gem" }, { .compatible = "atmel,sama5d4-gem" }, + { .compatible = "cdns,zynq-gem" }, { } }; diff --git a/drivers/net/macb.h b/drivers/net/macb.h index 5bb48f4..c39554d 100644 --- a/drivers/net/macb.h +++ b/drivers/net/macb.h @@ -11,6 +11,7 @@ #define MACB_NCFGR 0x0004 #define MACB_NSR 0x0008 #define GEM_UR 0x000c +#define MACB_DMACFG 0x0010 #define MACB_TSR 0x0014 #define MACB_RBQP 0x0018 #define MACB_TBQP 0x001c -- 2.7.4

2 2

[U-Boot] [PATCH v4 0/6] Support for the Turris Omnia router
by Marek Behún 22 Jan '18

22 Jan '18

This is the fourth version of patches for adding support for the Turris Omnia board, a router developed by the CZ.NIC. Modifications from last version: - Since the new driver model API does not expose the watchdog_reset function, only wdt_reset, the watchdog did not get restarted and the device rebooted every 2 minutes in U-Boot. These patches solve this problem. - The SPI flash could not be accessed. I did not notice this since during my testing I always uploaded the SPL image via serial line. This is now also solved. The first patch modifies Marvell's DDR3 training code to be more general, so that board topology map can force 2t timing. The second patch adds support for the hardware watchdog which can be found on Omnia. I have modified the driver to use the new driver model API. The third patch adds the device tree for Turris Omnia taken from Linux kernel and also armada-385-turris-omnia-u-boot.dtsi file with some additions for U-Boot. The fourth patch adds support for the I2C multiplexer found on Turris Omnia. The fifth patch adds support for the ATSHA204A CryptoAuthentication chip, on which the Turris Omnia stores serial number and device MAC address. The sixth patch adds the proper support for the board. I have modified config to use distro defaults as requested by Andreas Faerber and also removed unnecessary comments. Marek Behun

6 26

[U-Boot] [PATCH 0/4] mips: bmips: add HSSPI support
by Álvaro Fernández Rojas 22 Jan '18

22 Jan '18

BCM63xx HSSPI controller has the same issue as BCM63xx SPI controller: it doesn't allow keeping CS active between transfers. However, this controller allows changing CS polarities, which is used in the linux upstream driver to manage CS as desired. Álvaro Fernández Rojas (4): dm: spi: add BCM63xx HSSPI driver mips: bmips: add bcm63xx-hsspi driver support for BCM6328 mips: bmips: add bcm63xx-hsspi driver support for BCM63268 mips: bmips: enable the SPI flash on the Comtrend AR-5387un arch/mips/dts/brcm,bcm63268.dtsi | 21 ++ arch/mips/dts/brcm,bcm6328.dtsi | 24 ++ arch/mips/dts/comtrend,ar-5387un.dts | 12 + configs/comtrend_ar5387un_ram_defconfig | 8 + drivers/spi/Kconfig | 8 + drivers/spi/Makefile | 1 + drivers/spi/bcm63xx_hsspi.c | 392 ++++++++++++++++++++++++++++++++ 7 files changed, 466 insertions(+) create mode 100644 drivers/spi/bcm63xx_hsspi.c -- 2.1.4

4 44

[U-Boot] [PATCH 0/2] Fix get_device_type() problems
by Siarhei Siamashka 10 Jan '18

10 Jan '18

The comit 00bbe96ebabb ("arm: omap: Unify get_device_type() function") does not play nice with early errata workarounds and needs some fixes. And because it does not bring any practical improvements anyway (other than increasing the SPL size and introducing more lines of code), it's best to revert it for now. The second patch in this series improves testing coverage and should prevent similar regressions in the future. Siarhei Siamashka (2): Revert "arm: omap: Unify get_device_type() function" arm: Exercise v7_arch_cp15_set_acr even without errata fixups arch/arm/cpu/armv7/start.S | 32 ++++++++++++-------------------- arch/arm/include/asm/arch-am33xx/cpu.h | 6 ++++++ arch/arm/include/asm/arch-am33xx/omap.h | 3 --- arch/arm/include/asm/arch-omap3/omap.h | 3 --- arch/arm/include/asm/arch-omap4/omap.h | 1 + arch/arm/include/asm/arch-omap5/omap.h | 1 + arch/arm/include/asm/omap_common.h | 11 +---------- arch/arm/mach-omap2/Makefile | 1 - arch/arm/mach-omap2/am33xx/Makefile | 2 -- arch/arm/mach-omap2/am33xx/board.c | 3 --- arch/arm/mach-omap2/am33xx/hw_data.c | 19 ------------------- arch/arm/mach-omap2/am33xx/prcm-regs.c | 15 --------------- arch/arm/mach-omap2/am33xx/sys_info.c | 10 ++++++++++ arch/arm/mach-omap2/hwinit-common.c | 9 +++++++++ arch/arm/mach-omap2/omap3/Makefile | 2 -- arch/arm/mach-omap2/omap3/board.c | 7 ------- arch/arm/mach-omap2/omap3/hw_data.c | 19 ------------------- arch/arm/mach-omap2/omap3/prcm-regs.c | 15 --------------- arch/arm/mach-omap2/omap3/sys_info.c | 9 ++++++++- arch/arm/mach-omap2/sysinfo-common.c | 21 --------------------- board/ti/am335x/board.c | 1 - board/ti/am43xx/board.c | 1 - 22 files changed, 48 insertions(+), 143 deletions(-) delete mode 100644 arch/arm/mach-omap2/am33xx/hw_data.c delete mode 100644 arch/arm/mach-omap2/am33xx/prcm-regs.c delete mode 100644 arch/arm/mach-omap2/omap3/hw_data.c delete mode 100644 arch/arm/mach-omap2/omap3/prcm-regs.c delete mode 100644 arch/arm/mach-omap2/sysinfo-common.c -- 2.7.3

2 5

[U-Boot] [PATCH v2 00/13] driver model bring-up of dwc3 usb peripheral
by Vignesh R 08 Jan '18

08 Jan '18

This patch series enables ti dwc3 usb peripherial driver to adopt driver model and DT. And also adds support for to USB device boot using RNDIS for AM437x. Tested on AM437x GP EVM in USB RNDIS boot mode. ROM downloads SPL, SPL loads U-Boot via usb ether and then U-Boot loads kernel image using the same interface. Based on previous work submitted by Mugunthan here: https://lists.denx.de/pipermail/u-boot/2016-March/250115.html Change log: * Reorder patches adding dwc3 driver model patches * Split patch 8 into 3 patches. * rebase to latest master and pick up Reviewed-bys Mugunthan V N (7): drivers: usb: dwc3: remove devm_zalloc from linux_compact drivers: usb: dwc3-omap: move usb_gadget_handle_interrupts from board files to drivers am437x: board: do not register usb devices when CONFIG_DM_USB is defined omap5/am57xx/dra7xx: board: do not register usb devices when CONFIG_DM_USB is defined drivers: usb: common: add support to get maximum speed from dt drivers: usb: dwc3: add ti dwc3 peripheral driver with driver model support drivers: usb: dwc3: add ti dwc3 misc driver for wrapper Vignesh R (6): usb: gadget: ether: Provide a way to read MAC address usb: gadget: ether: Populate DM_FLAG_PRE_RELOC flag usb: gadget: add DWC3 USB gadget support am43xx: Add USB device boot support configs: am43xx: Enable configs to support USB device boot ARM: am437x-gp-evm-u-boot.dtsi: Enable nodes for USB device boot arch/arm/dts/am437x-gp-evm-u-boot.dtsi | 20 +++ arch/arm/mach-omap2/boot-common.c | 3 +- board/ti/am43xx/board.c | 41 +++--- board/ti/am57xx/board.c | 13 +- board/ti/dra7xx/evm.c | 13 +- board/ti/omap5_uevm/evm.c | 13 +- configs/am43xx_evm_defconfig | 13 +- configs/am43xx_evm_usbhost_boot_defconfig | 1 + drivers/usb/common/common.c | 29 ++++ drivers/usb/dwc3/core.c | 64 ++++++++- drivers/usb/dwc3/core.h | 6 + drivers/usb/dwc3/dwc3-omap.c | 231 +++++++++++++++++++++++++++++- drivers/usb/dwc3/gadget.c | 2 +- drivers/usb/dwc3/linux-compat.h | 5 - drivers/usb/dwc3/ti_usb_phy.c | 1 + drivers/usb/gadget/ether.c | 8 +- drivers/usb/gadget/gadget_chips.h | 2 + include/configs/am43xx_evm.h | 27 ++-- include/linux/usb/otg.h | 9 ++ scripts/Makefile.spl | 1 + 20 files changed, 416 insertions(+), 86 deletions(-) -- 2.13.0

5 46

[U-Boot] [PATCH 1/3] armv8: fsl-layerscape: SPL size reduction
by Sumit Garg 05 Jan '18

05 Jan '18

Using changes in this patch we were able to reduce approx 4k size of u-boot-spl.bin image. Following is breif description of changes to reduce SPL size: 1. Compile-off mp.c and libfdt.c in case of SPL build. 2. Keep MMU and DCACHE specific variable and functions under CONFIG_SYS_DCACHE_OFF macro. 3. Compile-off IFC specific funtion call "init_early_memctl_regs" in case of SPL build. Signed-off-by: Sumit Garg <sumit.garg(a)nxp.com> --- Dependent on ls1088 base SD boot target. Also dependent on ls1088 QPSI secure boot target. arch/arm/cpu/armv8/fsl-layerscape/Makefile | 2 ++ arch/arm/cpu/armv8/fsl-layerscape/cpu.c | 6 ++++++ arch/arm/cpu/armv8/fsl-layerscape/soc.c | 2 ++ 3 files changed, 10 insertions(+) diff --git a/arch/arm/cpu/armv8/fsl-layerscape/Makefile b/arch/arm/cpu/armv8/fsl-layerscape/Makefile index 115c3fc..0cb6d4e 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/Makefile +++ b/arch/arm/cpu/armv8/fsl-layerscape/Makefile @@ -7,8 +7,10 @@ obj-y += cpu.o obj-y += lowlevel.o obj-y += soc.o +ifndef CONFIG_SPL_BUILD obj-$(CONFIG_MP) += mp.o obj-$(CONFIG_OF_LIBFDT) += fdt.o +endif obj-$(CONFIG_SPL) += spl.o obj-$(CONFIG_$(SPL_)FSL_LS_PPA) += ppa.o diff --git a/arch/arm/cpu/armv8/fsl-layerscape/cpu.c b/arch/arm/cpu/armv8/fsl-layerscape/cpu.c index 3c9a5ed..3ce51af 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/cpu.c +++ b/arch/arm/cpu/armv8/fsl-layerscape/cpu.c @@ -32,7 +32,9 @@ DECLARE_GLOBAL_DATA_PTR; +#ifndef CONFIG_SYS_DCACHE_OFF struct mm_region *mem_map = early_map; +#endif void cpu_name(char *name) { @@ -824,6 +826,7 @@ void efi_add_known_memory(void) } #endif +#ifndef CONFIG_SYS_DCACHE_OFF /* * Before DDR size is known, early MMU table have DDR mapped as device memory * to avoid speculative access. To relocate U-Boot to DDR, "normal memory" @@ -888,14 +891,17 @@ void update_early_mmu_table(void) } } } +#endif __weak int dram_init(void) { fsl_initdram(); +#ifndef CONFIG_SYS_DCACHE_OFF #if !defined(CONFIG_SPL) || defined(CONFIG_SPL_BUILD) /* This will break-before-make MMU for DDR */ update_early_mmu_table(); #endif +#endif return 0; } diff --git a/arch/arm/cpu/armv8/fsl-layerscape/soc.c b/arch/arm/cpu/armv8/fsl-layerscape/soc.c index 2075c96..7c26953 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/soc.c +++ b/arch/arm/cpu/armv8/fsl-layerscape/soc.c @@ -329,7 +329,9 @@ void bypass_smmu(void) void fsl_lsch3_early_init_f(void) { erratum_rcw_src(); +#ifndef CONFIG_SPL_BUILD init_early_memctl_regs(); /* tighten IFC timing */ +#endif #ifdef CONFIG_SYS_FSL_ERRATUM_A009203 erratum_a009203(); #endif -- 2.7.4

2 17

[U-Boot] [PATCH 1/1] Add support Raspberry-Pi Ziro W
by Dmitry Korunov 05 Dec '17

05 Dec '17

Signed-off-by: Dmitry Korunov <dessel.k(a)gmail.com> --- arch/arm/dts/bcm2835-rpi-zero-w.dts | 44 ++++++++++++++++++++++++++++++++++ arch/arm/dts/bcm283x-rpi-usb-host.dtsi | 3 +++ arch/arm/mach-bcm283x/Kconfig | 16 +++++++++++++ board/raspberrypi/rpi/rpi.c | 5 ++++ configs/rpi_0_w_defconfig | 28 ++++++++++++++++++++++ include/configs/rpi.h | 2 +- 6 files changed, 97 insertions(+), 1 deletion(-) create mode 100644 arch/arm/dts/bcm2835-rpi-zero-w.dts create mode 100644 arch/arm/dts/bcm283x-rpi-usb-host.dtsi create mode 100644 configs/rpi_0_w_defconfig diff --git a/arch/arm/dts/bcm2835-rpi-zero-w.dts b/arch/arm/dts/bcm2835-rpi-zero-w.dts new file mode 100644 index 0000000..c63937d --- /dev/null +++ b/arch/arm/dts/bcm2835-rpi-zero-w.dts @@ -0,0 +1,44 @@ +/* + * Copyright (C) 2016 Stefan Wahren <stefan.wahren(a)i2se.com> + * + * The code contained herein is licensed under the GNU General Public + * License. You may obtain a copy of the GNU General Public License + * Version 2 or later at the following locations: + * + * http://www.opensource.org/licenses/gpl-license.html + * http://www.gnu.org/copyleft/gpl.html + */ + +/dts-v1/; +#include "bcm2835.dtsi" +#include "bcm2835-rpi.dtsi" +#include "bcm283x-rpi-usb-host.dtsi" + +/ { + compatible = "raspberrypi,model-zero-w", "brcm,bcm2835"; + model = "Raspberry Pi Zero W"; + + leds { + act { + gpios = <&gpio 47 0>; + }; + }; +}; + +&gpio { + pinctrl-0 = <&gpioout &alt0 &i2s_alt0 &alt3>; + + /* I2S interface */ + i2s_alt0: i2s_alt0 { + brcm,pins = <18 19 20 21>; + brcm,function = <BCM2835_FSEL_ALT0>; + }; +}; + +&uart1 { + status = "okay"; +}; + +&hdmi { + hpd-gpios = <&gpio 46 GPIO_ACTIVE_LOW>; +}; diff --git a/arch/arm/dts/bcm283x-rpi-usb-host.dtsi b/arch/arm/dts/bcm283x-rpi-usb-host.dtsi new file mode 100644 index 0000000..73f4ece --- /dev/null +++ b/arch/arm/dts/bcm283x-rpi-usb-host.dtsi @@ -0,0 +1,3 @@ +&usb { + dr_mode = "host"; +}; diff --git a/arch/arm/mach-bcm283x/Kconfig b/arch/arm/mach-bcm283x/Kconfig index 69f7a46..86453c1 100644 --- a/arch/arm/mach-bcm283x/Kconfig +++ b/arch/arm/mach-bcm283x/Kconfig @@ -44,6 +44,22 @@ config TARGET_RPI This option creates a build targetting the ARM1176 ISA. select BCM2835 +config TARGET_RPI_0_W + bool "Raspberry Pi Ziro W" + help + Support for all ARM1176-/BCM2835-based Raspberry Pi variants, such as + the RPi Zero model W. + + This option assumes the VideoCore firmware is configured to use the + mini UART (rather than PL011) for the serial console. This is the + default on the RPi Zero W. To enable the UART console, the following + non-default option must be present in config.txt: enable_uart=1. + This is required for U-Boot to operate correctly, even if you only + care about the HDMI/usbkbd console. + + This option creates a build targetting the ARMv7/AArch32 ISA. + select BCM2835 + config TARGET_RPI_2 bool "Raspberry Pi 2" help diff --git a/board/raspberrypi/rpi/rpi.c b/board/raspberrypi/rpi/rpi.c index d3c6ba5..e59d358 100644 --- a/board/raspberrypi/rpi/rpi.c +++ b/board/raspberrypi/rpi/rpi.c @@ -105,6 +105,11 @@ static const struct rpi_model rpi_models_new_scheme[] = { DTB_DIR "bcm2835-rpi-zero.dtb", false, }, + [0xC] = { + "Zero W", + DTB_DIR "bcm2835-rpi-zero-w.dtb", + false, + }, }; static const struct rpi_model rpi_models_old_scheme[] = { diff --git a/configs/rpi_0_w_defconfig b/configs/rpi_0_w_defconfig new file mode 100644 index 0000000..092f378 --- /dev/null +++ b/configs/rpi_0_w_defconfig @@ -0,0 +1,28 @@ +CONFIG_ARM=y +CONFIG_ARCH_BCM283X=y +CONFIG_TARGET_RPI_0_W=y +CONFIG_DEFAULT_DEVICE_TREE="bcm2835-rpi-zero-w" +CONFIG_DISTRO_DEFAULTS=y +CONFIG_OF_BOARD_SETUP=y +# CONFIG_DISPLAY_CPUINFO is not set +# CONFIG_DISPLAY_BOARDINFO is not set +CONFIG_SYS_PROMPT="U-Boot> " +# CONFIG_CMD_IMLS is not set +# CONFIG_CMD_FLASH is not set +CONFIG_CMD_MMC=y +CONFIG_CMD_USB=y +# CONFIG_CMD_FPGA is not set +CONFIG_CMD_GPIO=y +CONFIG_DM_MMC=y +CONFIG_MMC_SDHCI=y +CONFIG_MMC_SDHCI_BCM2835=y +CONFIG_DM_ETH=y +CONFIG_USB=y +CONFIG_DM_USB=y +CONFIG_USB_STORAGE=y +CONFIG_USB_KEYBOARD=y +CONFIG_DM_VIDEO=y +CONFIG_SYS_WHITE_ON_BLACK=y +CONFIG_CONSOLE_SCROLL_LINES=10 +CONFIG_PHYS_TO_BUS=y +CONFIG_OF_LIBFDT_OVERLAY=y diff --git a/include/configs/rpi.h b/include/configs/rpi.h index d715eaa..0ead8d7 100644 --- a/include/configs/rpi.h +++ b/include/configs/rpi.h @@ -80,7 +80,7 @@ #endif /* Console UART */ -#ifdef CONFIG_BCM2837 +#if defined (CONFIG_BCM2837) || defined(CONFIG_TARGET_RPI_0_W) #define CONFIG_BCM283X_MU_SERIAL #else #define CONFIG_PL01X_SERIAL -- 2.7.4

4 7

[U-Boot] [PATCHv6 00/28] Retrieve MAC address from EEPROM
by Olliver Schinagl 05 Dec '17

05 Dec '17

This patch-series introduces methods to retrieve the MAC address from an onboard EEPROM. The series does a few small cleanups at the start, as either I ran into them while doing this series and fixed them along the way or actually depended on them. A manufacturer wants to produce boards and may even have MAC addresses for boards. Maintaining unique environments on a per-board basis however is horrible. Also this data should be very persistent, and not easily deletable by simply wiping the environment or device tree. Finally there are chips available on the market with a pre-programmed MAC address chips (proms) that a board manufacturer wants to use. Because of this, the MAC needs to be stored be able to read from such an 'external' source. The current idea of the eeprom layout, is to skip the first 8 bytes, so that other information can be stored there if needed, for example a header with some magic to identify the EEPROM. Or equivalent purposes. After those 8 bytes the MAC address follows the first macaddress. The macaddress is appended by a CRC8 byte and then padded to make for nice 8 bytes. Following the first macaddress one can store a second, or a third etc etc macaddress. The CRC8 is optional (via a define) but is strongly recommended to have. It helps preventing user error and more importantly, checks if the bytes read are actually a user inserted address. E.g. only writing 1 macaddress into the eeprom but trying to consume 2. These patches where tested on Olimex OLinuXino Lime1 (A10/A20), Lime2 (NAND and eMMC) and A20-OLinuXino-MICRO-4G variants and have been in use internally on our production systems since v2 of this patch set. TODO in a follow up series: * Replace the I2C specific read function to a generic function using Maxime Ripard's EEPROM uclass once merged. * Upgrade to use the EERPOM layout functionality as suggested by Igor Grinberg * Add EEPROM/Mac commands suggested by York Sun The series was initially based ontop of Joe's u-boot_net/next branches, but I rebased it ontop of u-boot/master to get the latest sunxi changes, including: sun7i: Add support for Olimex A20-OLinuXino-LIME2-eMMC ARM: dts: sunxi: Change node name for pwrseq pin on Olinuxino-lime2-emmc Which are on their way to being merged in master. So once those land into master this all should apply cleanly. Sorry Joe! ======= Changes since v5: * Removed changes to eth_legacy as per Simon's request * Adapted, improved and fixed the emac/gmac Kconfig conversion * Renamed sunxi_[eg]mac to sun[47]_mac to be more clear and allowing preparing to merge common parts into sunxi_common * Added a few more MAC helpers * Added PHY_GIGE as Kconfig symbol Changes since v4: * Some patches have been merged, so those are no longer included in the set. * Reworked review comments * Added the source of a MAC address * Made sunxi-gmac a subclassed driver * Switch sunxi-[eg]mac to Kconfig * Drop the FDT injection code for now, this needs more thought/discussion Changes since v3: * Split off board specific stuff and only modify the generic functions * Make reading of an eeprom available to every board. By default this is unconfigure and thus should just fall through * Clean some minor bits up (ARP_HLEN) and use it more generically * Update the gen_ethaddr_crc as suggested by simon * Let the fixup_ethernet from fdt_common insert mac addresses to the environment for unconfigured devices. There is a small caveat here however as described in the TODO above. * Print the mac address that u-boot assigned to each device. Changes since v2: * Drop the id byte altogether and just mark it as reserved. The 'index' can be used to indicate the interface instead * Addopt the read_rom_hwaddr hooks * Renamed crc8 tool to gen_ethaddr_crc * Improved the layout EEPROM example * Made a function out of the hwaddress writing function in sunxi_emac so it can be re-used as the write_hwaddr net_ops hook. * No longer handle fdt parameters in board.c Changes since v1: * Do not CRC the id byte, move it just after the crc byte. One of the reasons I decided to move it after the crc8 was mostly due to mass generation of MAC + CRC combo's where the ID is still unknown. Also not crc-ing the ID means that it is much easier for a user to change it (via the u-boot i2c cmd line or from within linux) without having to worry about the crc. * Add a generator to convert a MAC address from the input to a MAC + CRC8 on the output. Emmanuel Vadot (1): ARM: dts: sunxi: Change node name for pwrseq pin on Olinuxino-lime2-emmc Olliver Schinagl (27): sun7i: Add support for Olimex A20-OLinuXino-LIME2-eMMC net: core: Add PHY_GIGE as a Kconfig symbol net: sunxi simplify defconfig net: sunxi: Re-add RTL8211X_PHY_FORCE_MASTER net: sunxi: Restore sunxi_[eg]mac behavior net: sunxi: Move GMAC_TX_DELAY to the driver net: cosmetic: Do not use magic values for ARP_HLEN net: core: Sanitize get/set operations for enetaddr net: core: Inform the user of the device MAC address net: core: Add MAC address helper functions net: Add ability to set MAC address via EEPROM net: core: print the source of the MAC address net: cosmetic: A MAC address is not limited to SROM net: core: Check return value of read_rom_hwaddr fdt: fixup_eth: Remove code duplication with a function fdt: fixup_eth: improve error catching/reduce identation arm: sunxi: Expose function to generate sunxi-specific a MAC address net: sunxi_emac: Write HW address via net_ops hook net: sunxi: Rename sunxi_emac to a more specific sun4i_mac net: sunxi: Have sunxi common functions together net: sun4i_mac: Add read_rom_hwaddr hook net: sun7i_mac: Make the sun7i a dw driver subclass net: dw: Expose designware_eth_start net: sun7i_mac: Add read_rom_hwaddr hook net: sun8i_gmac: Add read_rom_hwaddr hook net: sun8i: fix whitespace net: sunxi: Enable eeprom on OLinuXino Lime boards (again) arch/arm/dts/sun7i-a20-olinuxino-lime2-emmc.dts | 2 +- arch/arm/include/asm/arch-sunxi/sys_proto.h | 4 +- arch/arm/mach-sunxi/Kconfig | 14 +- arch/arm/mach-sunxi/board.c | 1 - board/sunxi/MAINTAINERS | 5 + board/sunxi/Makefile | 1 - board/sunxi/board.c | 146 ++++++++----- common/fdt_support.c | 33 ++- configs/A10-OLinuXino-Lime_defconfig | 4 +- configs/A20-OLinuXino-Lime2-eMMC_defconfig | 36 ++++ configs/A20-OLinuXino-Lime2_defconfig | 8 +- configs/A20-OLinuXino-Lime_defconfig | 8 +- configs/A20-OLinuXino_MICRO_defconfig | 8 +- configs/A20-Olimex-SOM-EVB_defconfig | 4 +- configs/Bananapi_defconfig | 3 +- configs/Bananapro_defconfig | 3 +- configs/CSQ_CS908_defconfig | 4 +- configs/Colombus_defconfig | 3 +- configs/Cubieboard2_defconfig | 4 +- configs/Cubietruck_defconfig | 3 +- configs/Hummingbird_A31_defconfig | 3 +- configs/Itead_Ibox_A20_defconfig | 4 +- configs/Lamobo_R1_defconfig | 3 +- configs/Linksprite_pcDuino3_Nano_defconfig | 3 +- configs/Linksprite_pcDuino3_defconfig | 4 +- configs/Mele_A1000G_quad_defconfig | 4 +- configs/Mele_I7_defconfig | 4 +- configs/Mele_M3_defconfig | 4 +- configs/Mele_M5_defconfig | 4 +- configs/Mele_M9_defconfig | 4 +- configs/Orangepi_defconfig | 3 +- configs/Orangepi_mini_defconfig | 3 +- configs/Sinlinx_SinA31s_defconfig | 4 +- configs/Sinovoip_BPI_M2_defconfig | 3 +- configs/Wits_Pro_A20_DKT_defconfig | 3 +- configs/i12-tvbox_defconfig | 4 +- configs/icnova-a20-swac_defconfig | 4 +- configs/mixtile_loftq_defconfig | 3 +- doc/README.enetaddr | 95 +++++++++ drivers/net/Kconfig | 76 +++++-- drivers/net/Makefile | 5 +- drivers/net/designware.c | 3 +- drivers/net/designware.h | 1 + drivers/net/{sunxi_emac.c => sun4i_mac.c} | 267 +++++++++++++----------- board/sunxi/gmac.c => drivers/net/sun7i_mac.c | 54 ++++- drivers/net/sun8i_emac.c | 15 +- drivers/net/sunxi_common.c | 33 +++ drivers/net/sunxi_common.h | 13 ++ include/configs/sunxi-common.h | 13 +- include/net.h | 76 ++++++- net/Kconfig | 59 ++++++ net/eth-uclass.c | 65 +++--- net/eth_common.c | 53 ++++- net/eth_legacy.c | 4 +- scripts/config_whitelist.txt | 2 - 55 files changed, 842 insertions(+), 350 deletions(-) create mode 100644 configs/A20-OLinuXino-Lime2-eMMC_defconfig rename drivers/net/{sunxi_emac.c => sun4i_mac.c} (59%) rename board/sunxi/gmac.c => drivers/net/sun7i_mac.c (67%) create mode 100644 drivers/net/sunxi_common.c create mode 100644 drivers/net/sunxi_common.h -- 2.11.0

8 73

[U-Boot] [PATCH] Convert CONFIG_NAND_OMAP_GPMC et al to Kconfig
by Adam Ford 01 Dec '17

01 Dec '17

This converts the following to Kconfig: CONFIG_NAND_OMAP_GPMC CONFIG_NAND_OMAP_GPMC_PREFETCH CONFIG_NAND_OMAP_ELM CONFIG_SYS_NAND_BUSWIDTH_16BIT CONFIG_SPL_NAND_AM33XX_BCH CONFIG_SPL_NAND_SIMPLE Signed-off-by: Adam Ford <aford173(a)gmail.com> --- README | 4 --- arch/arm/mach-omap2/Kconfig | 18 +++++++++++++ configs/am335x_baltos_defconfig | 2 +- configs/am335x_evm_defconfig | 1 + configs/am335x_evm_nor_defconfig | 1 + configs/am335x_evm_usbspl_defconfig | 1 + configs/am335x_hs_evm_defconfig | 1 + configs/am3517_crane_defconfig | 1 + configs/am3517_evm_defconfig | 2 ++ configs/chiliboard_defconfig | 2 +- configs/devkit8000_defconfig | 1 + configs/eco5pk_defconfig | 2 ++ configs/igep0020_defconfig | 1 + configs/igep0030_defconfig | 1 + configs/igep0032_defconfig | 1 + configs/ipam390_defconfig | 1 + configs/mcx_defconfig | 2 ++ configs/mt_ventoux_defconfig | 2 ++ 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/tao3530_defconfig | 1 + configs/ti816x_evm_defconfig | 2 ++ configs/twister_defconfig | 2 ++ drivers/mtd/nand/Kconfig | 47 +++++++++++++++++++++++++++++++++- include/configs/am335x_evm.h | 6 ----- include/configs/am335x_igep003x.h | 1 - include/configs/am3517_crane.h | 3 --- include/configs/am3517_evm.h | 4 --- include/configs/am43xx_evm.h | 5 ---- include/configs/apf27.h | 1 - include/configs/baltos.h | 3 --- include/configs/bav335x.h | 5 ---- include/configs/brppt1.h | 3 --- include/configs/chiliboard.h | 6 ----- include/configs/cm_t35.h | 2 -- include/configs/cm_t3517.h | 1 - include/configs/cm_t43.h | 1 - include/configs/da850evm.h | 1 - include/configs/devkit3250.h | 1 - include/configs/devkit8000.h | 1 - include/configs/dra7xx_evm.h | 6 ----- include/configs/ipam390.h | 1 - include/configs/mcx.h | 4 --- include/configs/omap3_beagle.h | 2 -- include/configs/omap3_cairo.h | 1 - include/configs/omap3_evm.h | 3 --- include/configs/omap3_igep00x0.h | 2 -- include/configs/omap3_logic.h | 3 --- include/configs/omap3_overo.h | 1 - include/configs/omap3_pandora.h | 1 - include/configs/omap3_zoom1.h | 1 - include/configs/omapl138_lcdk.h | 2 -- include/configs/pengwyn.h | 2 -- include/configs/siemens-am33x-common.h | 3 --- include/configs/tam3517-common.h | 4 --- include/configs/tao3530.h | 3 --- include/configs/tegra-common.h | 1 - include/configs/ti816x_evm.h | 5 ---- include/configs/ti_am335x_common.h | 4 --- include/configs/ti_armv7_omap.h | 1 - include/configs/ti_omap3_common.h | 1 - include/configs/ti_omap4_common.h | 4 --- include/configs/ti_omap5_common.h | 4 --- include/configs/tricorder.h | 2 -- scripts/config_whitelist.txt | 5 ---- 71 files changed, 97 insertions(+), 117 deletions(-) diff --git a/README b/README index 3735916..dbbca43 100644 --- a/README +++ b/README @@ -2985,10 +2985,6 @@ FIT uImage format: CONFIG_SPL_NAND_ECC Include standard software ECC in the SPL - CONFIG_SPL_NAND_SIMPLE - Support for NAND boot using simple NAND drivers that - expose the cmd_ctrl() interface. - CONFIG_SPL_UBI Support for a lightweight UBI (fastmap) scanner and loader diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig index 89c91d1..eb3124f 100644 --- a/arch/arm/mach-omap2/Kconfig +++ b/arch/arm/mach-omap2/Kconfig @@ -11,6 +11,7 @@ config OMAP34XX select ARM_ERRATA_621766 select ARM_ERRATA_725233 select USE_TINY_PRINTF + imply NAND_OMAP_GPMC imply SPL_EXT_SUPPORT imply SPL_FAT_SUPPORT imply SPL_GPIO_SUPPORT @@ -19,6 +20,7 @@ config OMAP34XX imply SPL_LIBDISK_SUPPORT imply SPL_LIBGENERIC_SUPPORT imply SPL_MMC_SUPPORT + imply SPL_NAND_SIMPLE imply SPL_NAND_SUPPORT imply SPL_POWER_SUPPORT imply SPL_SERIAL_SUPPORT @@ -29,6 +31,8 @@ config OMAP34XX config OMAP44XX bool "OMAP44XX SoC" select USE_TINY_PRINTF + imply NAND_OMAP_ELM + imply NAND_OMAP_GPMC imply SPL_DISPLAY_PRINT imply SPL_EXT_SUPPORT imply SPL_FAT_SUPPORT @@ -38,6 +42,7 @@ config OMAP44XX imply SPL_LIBDISK_SUPPORT imply SPL_LIBGENERIC_SUPPORT imply SPL_MMC_SUPPORT + imply SPL_NAND_AM33XX_BCH imply SPL_NAND_SUPPORT imply SPL_POWER_SUPPORT imply SPL_SERIAL_SUPPORT @@ -48,6 +53,8 @@ config OMAP54XX bool "OMAP54XX SoC" select ARM_ERRATA_798870 select SYS_THUMB_BUILD + imply NAND_OMAP_ELM + imply NAND_OMAP_GPMC imply SPL_DISPLAY_PRINT imply SPL_ENV_SUPPORT imply SPL_EXT_SUPPORT @@ -58,6 +65,7 @@ config OMAP54XX imply SPL_LIBDISK_SUPPORT imply SPL_LIBGENERIC_SUPPORT imply SPL_MMC_SUPPORT + imply SPL_NAND_AM33XX_BCH imply SPL_NAND_SUPPORT imply SPL_POWER_SUPPORT imply SPL_SERIAL_SUPPORT @@ -72,6 +80,8 @@ config TI814X config TI816X bool "TI816X SoC" + imply NAND_OMAP_ELM + imply NAND_OMAP_GPMC help Support for AM335x SOC from Texas Instruments. The AM335x high performance SOC features a Cortex-A8 @@ -79,8 +89,12 @@ config TI816X config AM43XX bool "AM43XX SoC" + imply NAND_OMAP_ELM + imply NAND_OMAP_GPMC imply SPL_DM imply SPL_DM_SEQ_ALIAS + imply SPL_NAND_AM33XX_BCH + imply SPL_NAND_SUPPORT imply SPL_OF_CONTROL imply SPL_OF_TRANSLATE imply SPL_SEPARATE_BSS @@ -96,6 +110,10 @@ config AM43XX config AM33XX bool "AM33XX SoC" + imply NAND_OMAP_ELM + imply NAND_OMAP_GPMC + imply SPL_NAND_AM33XX_BCH + imply SPL_NAND_SUPPORT imply SYS_I2C_OMAP24XX imply SYS_THUMB_BUILD imply USE_TINY_PRINTF diff --git a/configs/am335x_baltos_defconfig b/configs/am335x_baltos_defconfig index 180268e..2df7ac7 100644 --- a/configs/am335x_baltos_defconfig +++ b/configs/am335x_baltos_defconfig @@ -8,7 +8,6 @@ CONFIG_TARGET_AM335X_BALTOS=y CONFIG_SPL_MMC_SUPPORT=y CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL_LIBDISK_SUPPORT=y -CONFIG_SPL_NAND_SUPPORT=y CONFIG_SPL_WATCHDOG_SUPPORT=y CONFIG_SPL_STACK_R_ADDR=0x82000000 CONFIG_SPL_FAT_SUPPORT=y @@ -52,6 +51,7 @@ CONFIG_CMD_FS_GENERIC=y CONFIG_CMD_UBI=y CONFIG_ISO_PARTITION=y CONFIG_MMC_OMAP_HS=y +CONFIG_NAND_OMAP_GPMC_PREFETCH=y CONFIG_PHYLIB=y CONFIG_SYS_NS16550=y CONFIG_USB=y diff --git a/configs/am335x_evm_defconfig b/configs/am335x_evm_defconfig index 82d5a97..046ee68 100644 --- a/configs/am335x_evm_defconfig +++ b/configs/am335x_evm_defconfig @@ -34,6 +34,7 @@ CONFIG_DM_I2C=y CONFIG_MISC=y CONFIG_DM_MMC=y CONFIG_MMC_OMAP_HS=y +CONFIG_NAND_OMAP_GPMC_PREFETCH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_WINBOND=y CONFIG_PHYLIB=y diff --git a/configs/am335x_evm_nor_defconfig b/configs/am335x_evm_nor_defconfig index 3fb220a..6b94f73 100644 --- a/configs/am335x_evm_nor_defconfig +++ b/configs/am335x_evm_nor_defconfig @@ -27,6 +27,7 @@ CONFIG_DFU_NAND=y CONFIG_DFU_RAM=y CONFIG_MMC_OMAP_HS=y CONFIG_MTD_NOR_FLASH=y +CONFIG_NAND_OMAP_GPMC_PREFETCH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_WINBOND=y CONFIG_PHYLIB=y diff --git a/configs/am335x_evm_usbspl_defconfig b/configs/am335x_evm_usbspl_defconfig index 55c13da..d899d79 100644 --- a/configs/am335x_evm_usbspl_defconfig +++ b/configs/am335x_evm_usbspl_defconfig @@ -30,6 +30,7 @@ CONFIG_DFU_MMC=y CONFIG_DFU_NAND=y CONFIG_DFU_RAM=y CONFIG_MMC_OMAP_HS=y +CONFIG_NAND_OMAP_GPMC_PREFETCH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_WINBOND=y CONFIG_PHYLIB=y diff --git a/configs/am335x_hs_evm_defconfig b/configs/am335x_hs_evm_defconfig index 59306ba..5d88c87 100644 --- a/configs/am335x_hs_evm_defconfig +++ b/configs/am335x_hs_evm_defconfig @@ -37,6 +37,7 @@ CONFIG_DM_I2C=y CONFIG_MISC=y CONFIG_DM_MMC=y CONFIG_MMC_OMAP_HS=y +CONFIG_NAND_OMAP_GPMC_PREFETCH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_WINBOND=y CONFIG_PHYLIB=y diff --git a/configs/am3517_crane_defconfig b/configs/am3517_crane_defconfig index 396aadd..f9bbe0e 100644 --- a/configs/am3517_crane_defconfig +++ b/configs/am3517_crane_defconfig @@ -26,6 +26,7 @@ CONFIG_CMD_EXT2=y CONFIG_CMD_FAT=y CONFIG_CMD_JFFS2=y CONFIG_MMC_OMAP_HS=y +CONFIG_SYS_NAND_BUSWIDTH_16BIT=y CONFIG_SYS_NS16550=y CONFIG_USB=y CONFIG_USB_STORAGE=y diff --git a/configs/am3517_evm_defconfig b/configs/am3517_evm_defconfig index 1d07f1b..4e4aadb 100644 --- a/configs/am3517_evm_defconfig +++ b/configs/am3517_evm_defconfig @@ -37,6 +37,8 @@ CONFIG_CMD_FS_GENERIC=y CONFIG_CMD_UBI=y CONFIG_SPL_PARTITION_UUIDS=y CONFIG_MMC_OMAP_HS=y +CONFIG_NAND_OMAP_GPMC_PREFETCH=y +CONFIG_SYS_NAND_BUSWIDTH_16BIT=y CONFIG_SYS_NS16550=y CONFIG_USB=y CONFIG_USB_MUSB_HOST=y diff --git a/configs/chiliboard_defconfig b/configs/chiliboard_defconfig index 5257d70..b7e8b0c 100644 --- a/configs/chiliboard_defconfig +++ b/configs/chiliboard_defconfig @@ -7,7 +7,6 @@ CONFIG_TARGET_CHILIBOARD=y CONFIG_SPL_MMC_SUPPORT=y CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL_LIBDISK_SUPPORT=y -CONFIG_SPL_NAND_SUPPORT=y CONFIG_SPL_WATCHDOG_SUPPORT=y CONFIG_SPL_STACK_R_ADDR=0x82000000 CONFIG_SPL_FAT_SUPPORT=y @@ -40,6 +39,7 @@ CONFIG_CMD_FS_GENERIC=y CONFIG_CMD_MTDPARTS=y CONFIG_DM_GPIO=y CONFIG_MMC_OMAP_HS=y +CONFIG_NAND_OMAP_GPMC_PREFETCH=y CONFIG_PHYLIB=y CONFIG_SYS_NS16550=y CONFIG_USB=y diff --git a/configs/devkit8000_defconfig b/configs/devkit8000_defconfig index 9afc2ce..897bc80 100644 --- a/configs/devkit8000_defconfig +++ b/configs/devkit8000_defconfig @@ -28,5 +28,6 @@ CONFIG_CMD_MTDPARTS=y CONFIG_ISO_PARTITION=y CONFIG_EFI_PARTITION=y CONFIG_MMC_OMAP_HS=y +CONFIG_SYS_NAND_BUSWIDTH_16BIT=y CONFIG_SYS_NS16550=y CONFIG_OF_LIBFDT=y diff --git a/configs/eco5pk_defconfig b/configs/eco5pk_defconfig index 00261dd..f3c16fd 100644 --- a/configs/eco5pk_defconfig +++ b/configs/eco5pk_defconfig @@ -25,6 +25,8 @@ CONFIG_CMD_EXT2=y CONFIG_CMD_FAT=y CONFIG_CMD_UBI=y CONFIG_MMC_OMAP_HS=y +CONFIG_NAND_OMAP_GPMC_PREFETCH=y +CONFIG_SYS_NAND_BUSWIDTH_16BIT=y CONFIG_SYS_NS16550=y CONFIG_USB=y CONFIG_USB_EHCI_HCD=y diff --git a/configs/igep0020_defconfig b/configs/igep0020_defconfig index 8ca5a84..745d6f6 100644 --- a/configs/igep0020_defconfig +++ b/configs/igep0020_defconfig @@ -37,6 +37,7 @@ CONFIG_LED_STATUS_STATE=2 CONFIG_LED_STATUS_BOOT_ENABLE=y CONFIG_LED_STATUS_BOOT=0 CONFIG_MMC_OMAP_HS=y +CONFIG_SYS_NAND_BUSWIDTH_16BIT=y CONFIG_MTD_UBI_FASTMAP=y CONFIG_SYS_NS16550=y CONFIG_FAT_WRITE=y diff --git a/configs/igep0030_defconfig b/configs/igep0030_defconfig index 8af6dd5..48b80ae 100644 --- a/configs/igep0030_defconfig +++ b/configs/igep0030_defconfig @@ -37,6 +37,7 @@ CONFIG_LED_STATUS_STATE=2 CONFIG_LED_STATUS_BOOT_ENABLE=y CONFIG_LED_STATUS_BOOT=0 CONFIG_MMC_OMAP_HS=y +CONFIG_SYS_NAND_BUSWIDTH_16BIT=y CONFIG_SYS_NS16550=y CONFIG_FAT_WRITE=y CONFIG_OF_LIBFDT=y diff --git a/configs/igep0032_defconfig b/configs/igep0032_defconfig index dd43330..8ecd6a5 100644 --- a/configs/igep0032_defconfig +++ b/configs/igep0032_defconfig @@ -29,6 +29,7 @@ CONFIG_CMD_UBI=y # CONFIG_CMD_UBIFS is not set CONFIG_NET_RANDOM_ETHADDR=y CONFIG_MMC_OMAP_HS=y +CONFIG_SYS_NAND_BUSWIDTH_16BIT=y CONFIG_SYS_NS16550=y CONFIG_FAT_WRITE=y CONFIG_OF_LIBFDT=y diff --git a/configs/ipam390_defconfig b/configs/ipam390_defconfig index 0337afa..2686e9e 100644 --- a/configs/ipam390_defconfig +++ b/configs/ipam390_defconfig @@ -29,4 +29,5 @@ CONFIG_CMD_PING=y CONFIG_CMD_DIAG=y CONFIG_CMD_UBI=y # CONFIG_MMC is not set +CONFIG_SPL_NAND_SIMPLE=y CONFIG_SYS_NS16550=y diff --git a/configs/mcx_defconfig b/configs/mcx_defconfig index 0b65b73..6ed3a1a 100644 --- a/configs/mcx_defconfig +++ b/configs/mcx_defconfig @@ -34,6 +34,8 @@ CONFIG_CMD_FAT=y CONFIG_CMD_JFFS2=y CONFIG_CMD_UBI=y CONFIG_MMC_OMAP_HS=y +CONFIG_NAND_OMAP_GPMC_PREFETCH=y +CONFIG_SYS_NAND_BUSWIDTH_16BIT=y CONFIG_SYS_NS16550=y CONFIG_USB=y CONFIG_USB_EHCI_HCD=y diff --git a/configs/mt_ventoux_defconfig b/configs/mt_ventoux_defconfig index 2a46c19..a387d8b 100644 --- a/configs/mt_ventoux_defconfig +++ b/configs/mt_ventoux_defconfig @@ -31,6 +31,8 @@ CONFIG_CMD_EXT2=y CONFIG_CMD_FAT=y CONFIG_CMD_UBI=y CONFIG_MMC_OMAP_HS=y +CONFIG_NAND_OMAP_GPMC_PREFETCH=y +CONFIG_SYS_NAND_BUSWIDTH_16BIT=y CONFIG_SYS_NS16550=y CONFIG_USB=y CONFIG_USB_EHCI_HCD=y diff --git a/configs/omap3_beagle_defconfig b/configs/omap3_beagle_defconfig index 1a134df..9f20999 100644 --- a/configs/omap3_beagle_defconfig +++ b/configs/omap3_beagle_defconfig @@ -35,6 +35,7 @@ CONFIG_LED_STATUS_GREEN_ENABLE=y CONFIG_LED_STATUS_GREEN=2 CONFIG_LED_STATUS_CMD=y CONFIG_MMC_OMAP_HS=y +CONFIG_SYS_NAND_BUSWIDTH_16BIT=y CONFIG_SYS_NS16550=y CONFIG_USB=y CONFIG_USB_EHCI_HCD=y diff --git a/configs/omap3_evm_defconfig b/configs/omap3_evm_defconfig index 620148c..b34cb28 100644 --- a/configs/omap3_evm_defconfig +++ b/configs/omap3_evm_defconfig @@ -28,6 +28,7 @@ CONFIG_EFI_PARTITION=y # CONFIG_PARTITION_UUIDS is not set # CONFIG_SPL_PARTITION_UUIDS is not set CONFIG_MMC_OMAP_HS=y +CONFIG_SYS_NAND_BUSWIDTH_16BIT=y CONFIG_SYS_NS16550=y CONFIG_USB=y CONFIG_USB_STORAGE=y diff --git a/configs/omap3_ha_defconfig b/configs/omap3_ha_defconfig index f88c2e1..1672f39 100644 --- a/configs/omap3_ha_defconfig +++ b/configs/omap3_ha_defconfig @@ -25,6 +25,7 @@ CONFIG_CMD_EXT2=y CONFIG_CMD_FAT=y CONFIG_CMD_MTDPARTS=y CONFIG_MMC_OMAP_HS=y +CONFIG_SYS_NAND_BUSWIDTH_16BIT=y CONFIG_SYS_NS16550=y CONFIG_USB=y CONFIG_USB_EHCI_HCD=y diff --git a/configs/omap3_logic_defconfig b/configs/omap3_logic_defconfig index 1eb1ff8..959c71f 100644 --- a/configs/omap3_logic_defconfig +++ b/configs/omap3_logic_defconfig @@ -34,6 +34,7 @@ CONFIG_DM_I2C=y CONFIG_DM_MMC=y CONFIG_MMC_OMAP_HS=y CONFIG_MMC_OMAP36XX_PINS=y +CONFIG_SYS_NAND_BUSWIDTH_16BIT=y CONFIG_SYS_NS16550=y CONFIG_USB=y CONFIG_USB_MUSB_GADGET=y diff --git a/configs/omap3_overo_defconfig b/configs/omap3_overo_defconfig index 1a1dfcf..cc30836 100644 --- a/configs/omap3_overo_defconfig +++ b/configs/omap3_overo_defconfig @@ -41,6 +41,7 @@ CONFIG_CMD_UBI=y CONFIG_ISO_PARTITION=y CONFIG_EFI_PARTITION=y CONFIG_MMC_OMAP_HS=y +CONFIG_SYS_NAND_BUSWIDTH_16BIT=y CONFIG_SYS_NS16550=y CONFIG_USB=y CONFIG_USB_EHCI_HCD=y diff --git a/configs/omap3_pandora_defconfig b/configs/omap3_pandora_defconfig index 8a2e0ae..78a6bb3 100644 --- a/configs/omap3_pandora_defconfig +++ b/configs/omap3_pandora_defconfig @@ -25,6 +25,7 @@ CONFIG_CMD_CACHE=y CONFIG_CMD_EXT4_WRITE=y CONFIG_CMD_UBI=y CONFIG_MMC_OMAP_HS=y +CONFIG_SYS_NAND_BUSWIDTH_16BIT=y CONFIG_SYS_NS16550=y CONFIG_FAT_WRITE=y CONFIG_OF_LIBFDT=y diff --git a/configs/omap3_zoom1_defconfig b/configs/omap3_zoom1_defconfig index c6e2924..43bfde5 100644 --- a/configs/omap3_zoom1_defconfig +++ b/configs/omap3_zoom1_defconfig @@ -32,6 +32,7 @@ CONFIG_CMD_MTDPARTS=y CONFIG_ISO_PARTITION=y CONFIG_EFI_PARTITION=y CONFIG_MMC_OMAP_HS=y +CONFIG_SYS_NAND_BUSWIDTH_16BIT=y CONFIG_SYS_NS16550=y CONFIG_FAT_WRITE=y CONFIG_OF_LIBFDT=y diff --git a/configs/omapl138_lcdk_defconfig b/configs/omapl138_lcdk_defconfig index d10c540..f7181b7 100644 --- a/configs/omapl138_lcdk_defconfig +++ b/configs/omapl138_lcdk_defconfig @@ -29,6 +29,7 @@ CONFIG_CMD_UBI=y CONFIG_NET_RANDOM_ETHADDR=y CONFIG_SYS_NAND_U_BOOT_LOCATIONS=y CONFIG_SYS_NAND_U_BOOT_OFFS=0x28000 +CONFIG_SPL_NAND_SIMPLE=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_SPI_FLASH_WINBOND=y diff --git a/configs/tao3530_defconfig b/configs/tao3530_defconfig index e6c7e60..92b8f34 100644 --- a/configs/tao3530_defconfig +++ b/configs/tao3530_defconfig @@ -25,6 +25,7 @@ CONFIG_CMD_EXT2=y CONFIG_CMD_FAT=y CONFIG_CMD_MTDPARTS=y CONFIG_MMC_OMAP_HS=y +CONFIG_SYS_NAND_BUSWIDTH_16BIT=y CONFIG_SYS_NS16550=y CONFIG_USB=y CONFIG_USB_EHCI_HCD=y diff --git a/configs/ti816x_evm_defconfig b/configs/ti816x_evm_defconfig index 9d4be2a..fe40939 100644 --- a/configs/ti816x_evm_defconfig +++ b/configs/ti816x_evm_defconfig @@ -41,5 +41,7 @@ CONFIG_DM_GPIO=y CONFIG_DM_I2C=y CONFIG_SYS_I2C_OMAP24XX=y CONFIG_MMC_OMAP_HS=y +CONFIG_NAND_OMAP_GPMC_PREFETCH=y +CONFIG_SYS_NAND_BUSWIDTH_16BIT=y CONFIG_SYS_NS16550=y # CONFIG_USE_PRIVATE_LIBGCC is not set diff --git a/configs/twister_defconfig b/configs/twister_defconfig index 61132ee..e80e055 100644 --- a/configs/twister_defconfig +++ b/configs/twister_defconfig @@ -27,6 +27,8 @@ CONFIG_CMD_EXT2=y CONFIG_CMD_FAT=y CONFIG_CMD_UBI=y CONFIG_MMC_OMAP_HS=y +CONFIG_NAND_OMAP_GPMC_PREFETCH=y +CONFIG_SYS_NAND_BUSWIDTH_16BIT=y CONFIG_SYS_NS16550=y CONFIG_USB=y CONFIG_USB_EHCI_HCD=y diff --git a/drivers/mtd/nand/Kconfig b/drivers/mtd/nand/Kconfig index 3508c62..3a76ebd 100644 --- a/drivers/mtd/nand/Kconfig +++ b/drivers/mtd/nand/Kconfig @@ -33,6 +33,34 @@ config NAND_DENALI_SPARE_AREA_SKIP_BYTES of OOB area before last ECC sector data starts. This is potentially used to preserve the bad block marker in the OOB area. +config NAND_OMAP_GPMC + bool "Support OMAP GPMC NAND controller" + depends on ARCH_OMAP2PLUS + help + Enables omap_gpmc.c driver for OMAPx and AMxxxx platforms. + GPMC controller is used for parallel NAND flash devices, and can + do ECC calculation (not ECC error detection) for HAM1, BCH4, BCH8 + and BCH16 ECC algorithms. + +config NAND_OMAP_GPMC_PREFETCH + bool "Enable GPMC Prefetch" + depends on NAND_OMAP_GPMC + help + On OMAP platforms that use the GPMC controller + (CONFIG_NAND_OMAP_GPMC_PREFETCH), this options enables the code that + uses the prefetch mode to speed up read operations. + +config NAND_OMAP_ELM + bool "Enable ELM driver for OMAPxx and AMxx platforms." + depends on NAND_OMAP_GPMC && !OMAP34XX + help + ELM controller is used for ECC error detection (not ECC calculation) + of BCH4, BCH8 and BCH16 ECC algorithms. + Some legacy platforms like OMAP3xx do not have in-built ELM h/w engine, + thus such SoC platforms need to depend on software library for ECC error + detection. However ECC calculation on such plaforms would still be + done by GPMC controller. + config NAND_VF610_NFC bool "Support for Freescale NFC for VF610" select SYS_NAND_SELF_INIT @@ -124,7 +152,7 @@ comment "Generic NAND options" # option (mxc_nand, ndfc, omap_gpmc). config SYS_NAND_BUSWIDTH_16BIT bool "Use 16-bit NAND interface" - depends on NAND_VF610_NFC + depends on NAND_VF610_NFC || NAND_OMAP_GPMC help Indicates that NAND device has 16-bit wide data-bus. In absence of this config, bus-width of NAND device is assumed to be either 8-bit and later @@ -165,12 +193,29 @@ config SYS_NAND_U_BOOT_OFFS_REDUND Set the offset from the start of the nand where the redundant u-boot should be loaded from. +config SPL_NAND_AM33XX_BCH + bool "Enables SPL-NAND driver which supports ELM based" + depends on NAND_OMAP_GPMC && !OMAP34XX + default y + help + Hardware ECC correction. This is useful for platforms which have ELM + hardware engine and use NAND boot mode. + Some legacy platforms like OMAP3xx do not have in-built ELM h/w engine, + so those platforms should use CONFIG_SPL_NAND_SIMPLE for enabling + SPL-NAND driver with software ECC correction support. + config SPL_NAND_DENALI bool "Support Denali NAND controller for SPL" help This is a small implementation of the Denali NAND controller for use on SPL. +config SPL_NAND_SIMPLE + bool "Use simple SPL NAND driver" + depends on !SPL_NAND_AM33XX_BCH + help + Support for NAND boot using simple NAND drivers that + expose the cmd_ctrl() interface. endif endmenu diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h index fbab610..19f66af 100644 --- a/include/configs/am335x_evm.h +++ b/include/configs/am335x_evm.h @@ -204,9 +204,6 @@ #define CONFIG_SYS_NAND_OOBSIZE 64 #define CONFIG_SYS_NAND_BLOCK_SIZE (128*1024) /* NAND: driver related configs */ -#define CONFIG_NAND_OMAP_GPMC -#define CONFIG_NAND_OMAP_GPMC_PREFETCH -#define CONFIG_NAND_OMAP_ELM #define CONFIG_SYS_NAND_BAD_BLOCK_POS NAND_LARGE_BADBLOCK_POS #define CONFIG_SYS_NAND_ECCPOS { 2, 3, 4, 5, 6, 7, 8, 9, \ 10, 11, 12, 13, 14, 15, 16, 17, \ @@ -234,9 +231,6 @@ "-(NAND.file-system)" #define CONFIG_SYS_NAND_U_BOOT_OFFS 0x000c0000 /* NAND: SPL related configs */ -#ifdef CONFIG_SPL_NAND_SUPPORT -#define CONFIG_SPL_NAND_AM33XX_BCH -#endif #ifdef CONFIG_SPL_OS_BOOT #define CONFIG_CMD_SPL_NAND_OFS 0x00080000 /* os parameters */ #define CONFIG_SYS_NAND_SPL_KERNEL_OFFS 0x00200000 /* kernel offset */ diff --git a/include/configs/am335x_igep003x.h b/include/configs/am335x_igep003x.h index 3d3d5e7..6bf24a6 100644 --- a/include/configs/am335x_igep003x.h +++ b/include/configs/am335x_igep003x.h @@ -114,7 +114,6 @@ #define CONFIG_PHY_SMSC /* NAND support */ -#define CONFIG_NAND_OMAP_ELM #define CONFIG_SYS_NAND_ONFI_DETECTION 1 #define CONFIG_MTD_PARTITIONS diff --git a/include/configs/am3517_crane.h b/include/configs/am3517_crane.h index aeba61e..7289fa4 100644 --- a/include/configs/am3517_crane.h +++ b/include/configs/am3517_crane.h @@ -212,7 +212,6 @@ /* Monitor at start of flash */ #define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_FLASH_BASE -#define CONFIG_NAND_OMAP_GPMC #define SMNAND_ENV_OFFSET 0x260000 /* environment starts here */ #define CONFIG_SYS_ENV_SECT_SIZE (128 << 10) /* 128 KiB sector */ @@ -243,7 +242,6 @@ /* Defines for SPL */ #define CONFIG_SPL_FRAMEWORK -#define CONFIG_SPL_NAND_SIMPLE #define CONFIG_SPL_TEXT_BASE 0x40200800 #define CONFIG_SPL_MAX_SIZE (SRAM_SCRATCH_SPACE_ADDR - \ CONFIG_SPL_TEXT_BASE) @@ -260,7 +258,6 @@ #define CONFIG_SPL_LDSCRIPT "arch/arm/mach-omap2/u-boot-spl.lds" /* NAND boot config */ -#define CONFIG_SYS_NAND_BUSWIDTH_16BIT #define CONFIG_SYS_NAND_5_ADDR_CYCLE #define CONFIG_SYS_NAND_PAGE_COUNT 64 #define CONFIG_SYS_NAND_PAGE_SIZE 2048 diff --git a/include/configs/am3517_evm.h b/include/configs/am3517_evm.h index 60460c8..65b6af3 100644 --- a/include/configs/am3517_evm.h +++ b/include/configs/am3517_evm.h @@ -104,8 +104,6 @@ /* Board NAND Info. */ #ifdef CONFIG_NAND -#define CONFIG_NAND_OMAP_GPMC -#define CONFIG_NAND_OMAP_GPMC_PREFETCH #define CONFIG_BCH #define CONFIG_SYS_NAND_ADDR NAND_BASE /* physical address */ /* to access nand */ @@ -114,7 +112,6 @@ /* nand at CS0 */ #define CONFIG_SYS_MAX_NAND_DEVICE 1 /* Max number of */ /* NAND devices */ -#define CONFIG_SYS_NAND_BUSWIDTH_16BIT #define CONFIG_SYS_NAND_5_ADDR_CYCLE #define CONFIG_SYS_NAND_PAGE_COUNT 64 #define CONFIG_SYS_NAND_PAGE_SIZE 2048 @@ -291,7 +288,6 @@ /* Defines for SPL */ #define CONFIG_SPL_FRAMEWORK -#define CONFIG_SPL_NAND_SIMPLE #define CONFIG_SPL_TEXT_BASE 0x40200000 #define CONFIG_SPL_MAX_SIZE (SRAM_SCRATCH_SPACE_ADDR - \ CONFIG_SPL_TEXT_BASE) diff --git a/include/configs/am43xx_evm.h b/include/configs/am43xx_evm.h index 4f3b605..4076cb2 100644 --- a/include/configs/am43xx_evm.h +++ b/include/configs/am43xx_evm.h @@ -259,8 +259,6 @@ CONFIG_SYS_NAND_PAGE_SIZE) #define CONFIG_SYS_NAND_5_ADDR_CYCLE /* NAND: driver related configs */ -#define CONFIG_NAND_OMAP_GPMC -#define CONFIG_NAND_OMAP_ELM #define CONFIG_SYS_NAND_ONFI_DETECTION #define CONFIG_NAND_OMAP_ECCSCHEME OMAP_ECC_BCH16_CODE_HW #define CONFIG_SYS_NAND_BAD_BLOCK_POS NAND_LARGE_BADBLOCK_POS @@ -302,9 +300,6 @@ "-(NAND.file-system)" #define CONFIG_SYS_NAND_U_BOOT_OFFS 0x00180000 /* NAND: SPL related configs */ -#ifdef CONFIG_SPL_NAND_SUPPORT -#define CONFIG_SPL_NAND_AM33XX_BCH -#endif /* NAND: SPL falcon mode configs */ #ifdef CONFIG_SPL_OS_BOOT #define CONFIG_CMD_SPL_NAND_OFS 0x00100000 /* os parameters */ diff --git a/include/configs/apf27.h b/include/configs/apf27.h index 29cbbab..7e9d9c9 100644 --- a/include/configs/apf27.h +++ b/include/configs/apf27.h @@ -208,7 +208,6 @@ #define CONFIG_MXC_NAND_HWECC #define CONFIG_SYS_NAND_LARGEPAGE -#define CONFIG_SYS_NAND_BUSWIDTH_16BIT #define CONFIG_SYS_NAND_PAGE_SIZE 2048 #define CONFIG_SYS_NAND_BLOCK_SIZE (128 * 1024) #define CONFIG_SYS_NAND_PAGE_COUNT CONFIG_SYS_NAND_BLOCK_SIZE / \ diff --git a/include/configs/baltos.h b/include/configs/baltos.h index 598352b..f5c22da 100644 --- a/include/configs/baltos.h +++ b/include/configs/baltos.h @@ -246,9 +246,6 @@ #define CONFIG_SPL_LDSCRIPT "arch/arm/mach-omap2/u-boot-spl.lds" #ifdef CONFIG_NAND -#define CONFIG_NAND_OMAP_GPMC -#define CONFIG_NAND_OMAP_GPMC_PREFETCH -#define CONFIG_NAND_OMAP_ELM #define CONFIG_SYS_NAND_5_ADDR_CYCLE #define CONFIG_SYS_NAND_PAGE_COUNT (CONFIG_SYS_NAND_BLOCK_SIZE / \ CONFIG_SYS_NAND_PAGE_SIZE) diff --git a/include/configs/bav335x.h b/include/configs/bav335x.h index 6beb347..6817fab 100644 --- a/include/configs/bav335x.h +++ b/include/configs/bav335x.h @@ -357,8 +357,6 @@ DEFAULT_LINUX_BOOT_ENV \ #define CONFIG_SYS_NAND_OOBSIZE 64 #define CONFIG_SYS_NAND_BLOCK_SIZE (128*1024) /* NAND: driver related configs */ -#define CONFIG_NAND_OMAP_GPMC -#define CONFIG_NAND_OMAP_ELM #define CONFIG_SYS_NAND_BAD_BLOCK_POS NAND_LARGE_BADBLOCK_POS #define CONFIG_SYS_NAND_ECCPOS { \ 2, 3, 4, 5, 6, 7, 8, 9, \ @@ -391,9 +389,6 @@ DEFAULT_LINUX_BOOT_ENV \ #define CONFIG_ENV_OFFSET_REDUND 0x001e0000 #define CONFIG_SYS_ENV_SECT_SIZE CONFIG_SYS_NAND_BLOCK_SIZE /* NAND: SPL related configs */ -#ifdef CONFIG_SPL_NAND_SUPPORT -#define CONFIG_SPL_NAND_AM33XX_BCH -#endif #ifdef CONFIG_SPL_OS_BOOT #define CONFIG_CMD_SPL_NAND_OFS 0x00080000 /* os parameters */ #define CONFIG_SYS_NAND_SPL_KERNEL_OFFS 0x00200000 /* kernel offset */ diff --git a/include/configs/brppt1.h b/include/configs/brppt1.h index 9688c4a..6620c9d 100644 --- a/include/configs/brppt1.h +++ b/include/configs/brppt1.h @@ -73,7 +73,6 @@ #endif /* CONFIG_SPL_OS_BOOT */ #ifdef CONFIG_NAND -#define CONFIG_SPL_NAND_AM33XX_BCH /* OMAP4 and later ELM support */ #define CONFIG_SPL_NAND_BASE #define CONFIG_SPL_NAND_DRIVERS #define CONFIG_SPL_NAND_ECC @@ -186,9 +185,7 @@ MMCARGS */ #define CONFIG_SYS_MAX_NAND_DEVICE 1 #define CONFIG_SYS_NAND_BASE 0x8000000 -#define CONFIG_NAND_OMAP_GPMC /* don't change OMAP_ELM, ECCSCHEME. ROM code only supports this */ -#define CONFIG_NAND_OMAP_ELM #define CONFIG_NAND_OMAP_ECCSCHEME OMAP_ECC_BCH8_CODE_HW #define CONFIG_SYS_NAND_5_ADDR_CYCLE #define CONFIG_SYS_NAND_BLOCK_SIZE (128*1024) diff --git a/include/configs/chiliboard.h b/include/configs/chiliboard.h index 581ab7c..5d2bb98 100644 --- a/include/configs/chiliboard.h +++ b/include/configs/chiliboard.h @@ -139,9 +139,6 @@ #define CONFIG_SYS_NAND_OOBSIZE 64 #define CONFIG_SYS_NAND_BLOCK_SIZE (128*1024) /* NAND: driver related configs */ -#define CONFIG_NAND_OMAP_GPMC -#define CONFIG_NAND_OMAP_GPMC_PREFETCH -#define CONFIG_NAND_OMAP_ELM #define CONFIG_SYS_NAND_BAD_BLOCK_POS NAND_LARGE_BADBLOCK_POS #define CONFIG_SYS_NAND_ECCPOS { 2, 3, 4, 5, 6, 7, 8, 9, \ 10, 11, 12, 13, 14, 15, 16, 17, \ @@ -169,9 +166,6 @@ "-(NAND.file-system)" #define CONFIG_SYS_NAND_U_BOOT_OFFS 0x000c0000 /* NAND: SPL related configs */ -#ifdef CONFIG_SPL_NAND_SUPPORT -#define CONFIG_SPL_NAND_AM33XX_BCH -#endif /* USB configuration */ #define CONFIG_USB_MUSB_DSPS diff --git a/include/configs/cm_t35.h b/include/configs/cm_t35.h index f8f3c92..b3f5283 100644 --- a/include/configs/cm_t35.h +++ b/include/configs/cm_t35.h @@ -106,7 +106,6 @@ /* * Board NAND Info. */ -#define CONFIG_NAND_OMAP_GPMC #define CONFIG_SYS_NAND_ADDR NAND_BASE /* physical address */ /* to access nand */ #define CONFIG_SYS_NAND_BASE NAND_BASE /* physical address */ @@ -252,7 +251,6 @@ /* Defines for SPL */ #define CONFIG_SPL_FRAMEWORK -#define CONFIG_SPL_NAND_SIMPLE #define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION 1 #define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img" diff --git a/include/configs/cm_t3517.h b/include/configs/cm_t3517.h index 5821183..6eb413d 100644 --- a/include/configs/cm_t3517.h +++ b/include/configs/cm_t3517.h @@ -109,7 +109,6 @@ /* * Board NAND Info. */ -#define CONFIG_NAND_OMAP_GPMC #define CONFIG_SYS_NAND_ADDR NAND_BASE /* physical address */ /* to access nand */ #define CONFIG_SYS_NAND_BASE NAND_BASE /* physical address */ diff --git a/include/configs/cm_t43.h b/include/configs/cm_t43.h index 4c261f8..cc1453a 100644 --- a/include/configs/cm_t43.h +++ b/include/configs/cm_t43.h @@ -26,7 +26,6 @@ /* NAND support */ #define CONFIG_NAND -#define CONFIG_NAND_OMAP_ELM #define CONFIG_SYS_NAND_ONFI_DETECTION #define CONFIG_SYS_NAND_5_ADDR_CYCLE #define CONFIG_SYS_NAND_PAGE_SIZE 2048 diff --git a/include/configs/da850evm.h b/include/configs/da850evm.h index 695f3f6..7c348f0 100644 --- a/include/configs/da850evm.h +++ b/include/configs/da850evm.h @@ -200,7 +200,6 @@ #define CONFIG_SPL_NAND_BASE #define CONFIG_SPL_NAND_DRIVERS #define CONFIG_SPL_NAND_ECC -#define CONFIG_SPL_NAND_SIMPLE #define CONFIG_SPL_NAND_LOAD #endif diff --git a/include/configs/devkit3250.h b/include/configs/devkit3250.h index 6124867..8bb813f 100644 --- a/include/configs/devkit3250.h +++ b/include/configs/devkit3250.h @@ -183,7 +183,6 @@ /* SPL will use serial */ /* SPL loads an image from NAND */ -#define CONFIG_SPL_NAND_SIMPLE #define CONFIG_SPL_NAND_RAW_ONLY #define CONFIG_SPL_NAND_DRIVERS diff --git a/include/configs/devkit8000.h b/include/configs/devkit8000.h index 5b249d1..8af6f17 100644 --- a/include/configs/devkit8000.h +++ b/include/configs/devkit8000.h @@ -191,7 +191,6 @@ #define CONFIG_SPL_TEXT_BASE 0x40200000 /*CONFIG_SYS_SRAM_START*/ /* NAND boot config */ -#define CONFIG_SYS_NAND_BUSWIDTH_16BIT #define CONFIG_SYS_NAND_5_ADDR_CYCLE #define CONFIG_SYS_NAND_PAGE_COUNT 64 #define CONFIG_SYS_NAND_PAGE_SIZE 2048 diff --git a/include/configs/dra7xx_evm.h b/include/configs/dra7xx_evm.h index 1a58c6e..c8b70a7 100644 --- a/include/configs/dra7xx_evm.h +++ b/include/configs/dra7xx_evm.h @@ -171,13 +171,10 @@ #define CONFIG_SYS_NAND_PAGE_SIZE 2048 #define CONFIG_SYS_NAND_OOBSIZE 64 #define CONFIG_SYS_NAND_BLOCK_SIZE (128*1024) -#define CONFIG_SYS_NAND_BUSWIDTH_16BIT #define CONFIG_SYS_NAND_PAGE_COUNT (CONFIG_SYS_NAND_BLOCK_SIZE / \ CONFIG_SYS_NAND_PAGE_SIZE) #define CONFIG_SYS_NAND_5_ADDR_CYCLE /* NAND: driver related configs */ -#define CONFIG_NAND_OMAP_GPMC -#define CONFIG_NAND_OMAP_ELM #define CONFIG_SYS_NAND_ONFI_DETECTION #define CONFIG_NAND_OMAP_ECCSCHEME OMAP_ECC_BCH8_CODE_HW #define CONFIG_SYS_NAND_BAD_BLOCK_POS NAND_LARGE_BADBLOCK_POS @@ -204,9 +201,6 @@ "-(NAND.file-system)" #define CONFIG_SYS_NAND_U_BOOT_OFFS 0x000c0000 /* NAND: SPL related configs */ -#ifdef CONFIG_SPL_NAND_SUPPORT -#define CONFIG_SPL_NAND_AM33XX_BCH -#endif /* NAND: SPL falcon mode configs */ #ifdef CONFIG_SPL_OS_BOOT #define CONFIG_CMD_SPL_NAND_OFS 0x00080000 /* os-boot params*/ diff --git a/include/configs/ipam390.h b/include/configs/ipam390.h index a21261f..2ac8b0f 100644 --- a/include/configs/ipam390.h +++ b/include/configs/ipam390.h @@ -176,7 +176,6 @@ #define CONFIG_SPL_NAND_BASE #define CONFIG_SPL_NAND_DRIVERS #define CONFIG_SPL_NAND_ECC -#define CONFIG_SPL_NAND_SIMPLE #define CONFIG_SPL_NAND_LOAD /* diff --git a/include/configs/mcx.h b/include/configs/mcx.h index f255334..a0d8bb6 100644 --- a/include/configs/mcx.h +++ b/include/configs/mcx.h @@ -250,9 +250,6 @@ /* **** PISMO SUPPORT *** */ #define CONFIG_NAND -#define CONFIG_SYS_NAND_BUSWIDTH_16BIT -#define CONFIG_NAND_OMAP_GPMC -#define CONFIG_NAND_OMAP_GPMC_PREFETCH #define SMNAND_ENV_OFFSET 0x180000 /* environment starts here */ /* Redundant Environment */ @@ -280,7 +277,6 @@ /* Defines for SPL */ #define CONFIG_SPL_FRAMEWORK -#define CONFIG_SPL_NAND_SIMPLE #define CONFIG_SPL_NAND_BASE #define CONFIG_SPL_NAND_DRIVERS diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h index a87a75e..5c53351 100644 --- a/include/configs/omap3_beagle.h +++ b/include/configs/omap3_beagle.h @@ -80,7 +80,6 @@ /* * Board NAND Info. */ -#define CONFIG_NAND_OMAP_GPMC #define CONFIG_SYS_MAX_NAND_DEVICE 1 /* Max number of NAND */ /* devices */ @@ -261,7 +260,6 @@ #define CONFIG_SPL_OMAP3_ID_NAND /* NAND boot config */ -#define CONFIG_SYS_NAND_BUSWIDTH_16BIT #define CONFIG_SYS_NAND_5_ADDR_CYCLE #define CONFIG_SYS_NAND_PAGE_COUNT 64 #define CONFIG_SYS_NAND_PAGE_SIZE 2048 diff --git a/include/configs/omap3_cairo.h b/include/configs/omap3_cairo.h index 4f8ce54..069a9bc 100644 --- a/include/configs/omap3_cairo.h +++ b/include/configs/omap3_cairo.h @@ -61,7 +61,6 @@ /* * Board NAND Info. */ -#define CONFIG_NAND_OMAP_GPMC #define CONFIG_SYS_MAX_NAND_DEVICE 1 /* Max number of NAND */ /* devices */ #define CONFIG_EXTRA_ENV_SETTINGS \ diff --git a/include/configs/omap3_evm.h b/include/configs/omap3_evm.h index bc859c8..a021da8 100644 --- a/include/configs/omap3_evm.h +++ b/include/configs/omap3_evm.h @@ -53,7 +53,6 @@ /* #define CONFIG_USB_MUSB_UDC */ /* NAND SPL */ -#define CONFIG_SPL_NAND_SIMPLE #define CONFIG_SPL_NAND_BASE #define CONFIG_SPL_NAND_DRIVERS #define CONFIG_SPL_NAND_ECC @@ -169,7 +168,6 @@ /* Max number of NAND devices */ #define CONFIG_SYS_MAX_NAND_DEVICE 1 -#define CONFIG_SYS_NAND_BUSWIDTH_16BIT /* Timeout values (in ticks) */ #define CONFIG_SYS_FLASH_ERASE_TOUT (100 * CONFIG_SYS_HZ) #define CONFIG_SYS_FLASH_WRITE_TOUT (100 * CONFIG_SYS_HZ) @@ -249,7 +247,6 @@ #if defined(CONFIG_CMD_NAND) #define CONFIG_SYS_FLASH_BASE NAND_BASE -#define CONFIG_NAND_OMAP_GPMC #define CONFIG_ENV_OFFSET SMNAND_ENV_OFFSET #elif defined(CONFIG_CMD_ONENAND) #define CONFIG_SYS_FLASH_BASE ONENAND_MAP diff --git a/include/configs/omap3_igep00x0.h b/include/configs/omap3_igep00x0.h index 39f1e54..1182cf5 100644 --- a/include/configs/omap3_igep00x0.h +++ b/include/configs/omap3_igep00x0.h @@ -98,7 +98,6 @@ /* NAND config */ #define CONFIG_SPL_OMAP3_ID_NAND -#define CONFIG_SYS_NAND_BUSWIDTH_16BIT #define CONFIG_SYS_NAND_5_ADDR_CYCLE #define CONFIG_SYS_NAND_PAGE_COUNT 64 #define CONFIG_SYS_NAND_PAGE_SIZE 2048 @@ -115,7 +114,6 @@ #define CONFIG_SYS_NAND_ECCSIZE 512 #define CONFIG_SYS_NAND_ECCBYTES 14 #define CONFIG_NAND_OMAP_ECCSCHEME OMAP_ECC_BCH8_CODE_HW_DETECTION_SW -#define CONFIG_NAND_OMAP_GPMC #define CONFIG_BCH /* UBI configuration */ diff --git a/include/configs/omap3_logic.h b/include/configs/omap3_logic.h index e5ffb85..be7e458 100644 --- a/include/configs/omap3_logic.h +++ b/include/configs/omap3_logic.h @@ -71,13 +71,10 @@ /* Board NAND Info. */ #ifdef CONFIG_NAND -#define CONFIG_NAND_OMAP_GPMC - #define CONFIG_SYS_NAND_ADDR NAND_BASE /* physical address */ /* to access nand */ #define CONFIG_SYS_MAX_NAND_DEVICE 1 /* Max number of */ /* NAND devices */ -#define CONFIG_SYS_NAND_BUSWIDTH_16BIT #define CONFIG_SYS_NAND_5_ADDR_CYCLE #define CONFIG_SYS_NAND_PAGE_COUNT 64 #define CONFIG_SYS_NAND_PAGE_SIZE 2048 diff --git a/include/configs/omap3_overo.h b/include/configs/omap3_overo.h index bc4a59e..d7999a9 100644 --- a/include/configs/omap3_overo.h +++ b/include/configs/omap3_overo.h @@ -196,7 +196,6 @@ #define CONFIG_SYS_INIT_RAM_SIZE 0x800 /* NAND boot config */ -#define CONFIG_SYS_NAND_BUSWIDTH_16BIT #define CONFIG_SYS_NAND_MAX_ECCPOS 56 #define CONFIG_SYS_NAND_5_ADDR_CYCLE #define CONFIG_SYS_NAND_PAGE_COUNT 64 diff --git a/include/configs/omap3_pandora.h b/include/configs/omap3_pandora.h index 53c53ef..9c98091 100644 --- a/include/configs/omap3_pandora.h +++ b/include/configs/omap3_pandora.h @@ -49,7 +49,6 @@ */ #define CONFIG_SYS_NAND_ADDR NAND_BASE /* physical address */ /* to access nand */ -#define CONFIG_SYS_NAND_BUSWIDTH_16BIT #define CONFIG_NAND_OMAP_ECCSCHEME OMAP_ECC_HAM1_CODE_SW #define CONFIG_SYS_NAND_PAGE_SIZE 2048 #define CONFIG_SYS_NAND_OOBSIZE 64 diff --git a/include/configs/omap3_zoom1.h b/include/configs/omap3_zoom1.h index 7f4f56f..67df5d7 100644 --- a/include/configs/omap3_zoom1.h +++ b/include/configs/omap3_zoom1.h @@ -76,7 +76,6 @@ #define CONFIG_SYS_NAND_BASE NAND_BASE /* physical address */ /* to access nand at */ /* CS0 */ -#define CONFIG_SYS_NAND_BUSWIDTH_16BIT /* Environment information */ diff --git a/include/configs/omapl138_lcdk.h b/include/configs/omapl138_lcdk.h index 08e7deb..b7934d9 100644 --- a/include/configs/omapl138_lcdk.h +++ b/include/configs/omapl138_lcdk.h @@ -160,7 +160,6 @@ #define CONFIG_SYS_NAND_USE_FLASH_BBT #define CONFIG_SYS_NAND_4BIT_HW_ECC_OOBFIRST #define CONFIG_SYS_NAND_PAGE_2K -#define CONFIG_SYS_NAND_BUSWIDTH_16BIT #define CONFIG_SYS_NAND_CS 3 #define CONFIG_SYS_NAND_BASE DAVINCI_ASYNC_EMIF_DATA_CE3_BASE #define CONFIG_SYS_NAND_MASK_CLE 0x10 @@ -192,7 +191,6 @@ #define CONFIG_SPL_NAND_BASE #define CONFIG_SPL_NAND_DRIVERS #define CONFIG_SPL_NAND_ECC -#define CONFIG_SPL_NAND_SIMPLE #define CONFIG_SPL_NAND_LOAD #endif diff --git a/include/configs/pengwyn.h b/include/configs/pengwyn.h index a76bbce..4e098b8 100644 --- a/include/configs/pengwyn.h +++ b/include/configs/pengwyn.h @@ -114,8 +114,6 @@ /* SPL */ /* NAND support */ -#define CONFIG_NAND_OMAP_GPMC -#define CONFIG_NAND_OMAP_ELM /* NAND Configuration. */ #define CONFIG_SYS_NAND_5_ADDR_CYCLE diff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h index 5101d70..be88d84 100644 --- a/include/configs/siemens-am33x-common.h +++ b/include/configs/siemens-am33x-common.h @@ -122,7 +122,6 @@ #define CONFIG_SPL_LDSCRIPT "arch/arm/mach-omap2/u-boot-spl.lds" -#define CONFIG_SPL_NAND_AM33XX_BCH #define CONFIG_SPL_NAND_BASE #define CONFIG_SPL_NAND_DRIVERS #define CONFIG_SPL_NAND_ECC @@ -516,8 +515,6 @@ "512k(mtdoops)," \ "-(configuration)" -#define CONFIG_NAND_OMAP_GPMC -#define CONFIG_NAND_OMAP_ELM #define CONFIG_SYS_NAND_BASE (0x08000000) /* physical address */ /* to access nand at */ /* CS0 */ diff --git a/include/configs/tam3517-common.h b/include/configs/tam3517-common.h index 37f8767..cb6c16b 100644 --- a/include/configs/tam3517-common.h +++ b/include/configs/tam3517-common.h @@ -131,7 +131,6 @@ /* **** PISMO SUPPORT *** */ #define CONFIG_NAND -#define CONFIG_NAND_OMAP_GPMC #define SMNAND_ENV_OFFSET 0x180000 /* environment starts here */ /* Redundant Environment */ @@ -164,7 +163,6 @@ /* Defines for SPL */ #define CONFIG_SPL_FRAMEWORK #define CONFIG_SPL_CONSOLE -#define CONFIG_SPL_NAND_SIMPLE #define CONFIG_SPL_NAND_SOFTECC #define CONFIG_SPL_NAND_WORKSPACE 0x8f07f000 /* below BSS */ @@ -196,7 +194,6 @@ #define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS 0x80 /* 64KiB */ /* NAND boot config */ -#define CONFIG_SYS_NAND_BUSWIDTH_16BIT #define CONFIG_SYS_NAND_PAGE_COUNT 64 #define CONFIG_SYS_NAND_PAGE_SIZE 2048 #define CONFIG_SYS_NAND_OOBSIZE 64 @@ -209,7 +206,6 @@ #define CONFIG_SYS_NAND_ECCSIZE 256 #define CONFIG_SYS_NAND_ECCBYTES 3 #define CONFIG_NAND_OMAP_ECCSCHEME OMAP_ECC_HAM1_CODE_SW -#define CONFIG_NAND_OMAP_GPMC_PREFETCH #define CONFIG_SYS_NAND_U_BOOT_START CONFIG_SYS_TEXT_BASE diff --git a/include/configs/tao3530.h b/include/configs/tao3530.h index 1f36ac6..80a1932 100644 --- a/include/configs/tao3530.h +++ b/include/configs/tao3530.h @@ -81,7 +81,6 @@ /* * Board NAND Info. */ -#define CONFIG_NAND_OMAP_GPMC #define CONFIG_SYS_NAND_ADDR NAND_BASE /* physical address */ /* to access nand */ #define CONFIG_SYS_NAND_BASE NAND_BASE /* physical address */ @@ -90,7 +89,6 @@ #define CONFIG_SYS_MAX_NAND_DEVICE 1 /* Max number of NAND */ /* devices */ -#define CONFIG_SYS_NAND_BUSWIDTH_16BIT /* Environment information */ #define CONFIG_EXTRA_ENV_SETTINGS \ @@ -233,7 +231,6 @@ /* Defines for SPL */ #define CONFIG_SPL_FRAMEWORK -#define CONFIG_SPL_NAND_SIMPLE #define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION 1 #define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img" diff --git a/include/configs/tegra-common.h b/include/configs/tegra-common.h index 723435e..ca9bef3 100644 --- a/include/configs/tegra-common.h +++ b/include/configs/tegra-common.h @@ -89,7 +89,6 @@ /* Defines for SPL */ #define CONFIG_SPL_FRAMEWORK -#define CONFIG_SPL_NAND_SIMPLE #define CONFIG_SPL_MAX_FOOTPRINT (CONFIG_SYS_TEXT_BASE - \ CONFIG_SPL_TEXT_BASE) #define CONFIG_SYS_SPL_MALLOC_SIZE 0x00010000 diff --git a/include/configs/ti816x_evm.h b/include/configs/ti816x_evm.h index bba10ec..f6218d2 100644 --- a/include/configs/ti816x_evm.h +++ b/include/configs/ti816x_evm.h @@ -68,19 +68,15 @@ #define CONFIG_SYS_MAX_NAND_DEVICE 1 /* NAND: SPL related configs */ -#define CONFIG_SPL_NAND_AM33XX_BCH /* NAND: device related configs */ #define CONFIG_SYS_NAND_5_ADDR_CYCLE -#define CONFIG_SYS_NAND_BUSWIDTH_16BIT #define CONFIG_SYS_NAND_PAGE_COUNT (CONFIG_SYS_NAND_BLOCK_SIZE / \ CONFIG_SYS_NAND_PAGE_SIZE) #define CONFIG_SYS_NAND_PAGE_SIZE 2048 #define CONFIG_SYS_NAND_OOBSIZE 64 #define CONFIG_SYS_NAND_BLOCK_SIZE (128*1024) /* NAND: driver related configs */ -#define CONFIG_NAND_OMAP_GPMC_PREFETCH -#define CONFIG_NAND_OMAP_ELM #define CONFIG_SYS_NAND_BAD_BLOCK_POS NAND_LARGE_BADBLOCK_POS #define CONFIG_SYS_NAND_ECCPOS { 2, 3, 4, 5, 6, 7, 8, 9, \ 10, 11, 12, 13, 14, 15, 16, 17, \ @@ -113,7 +109,6 @@ /* SPL */ /* Defines for SPL */ -#define CONFIG_SPL_NAND_AM33XX_BCH /* ELM support */ #define CONFIG_SPL_TEXT_BASE 0x40400000 #define CONFIG_SPL_MAX_SIZE (SRAM_SCRATCH_SPACE_ADDR - \ CONFIG_SPL_TEXT_BASE) diff --git a/include/configs/ti_am335x_common.h b/include/configs/ti_am335x_common.h index bf44121..66cacdf 100644 --- a/include/configs/ti_am335x_common.h +++ b/include/configs/ti_am335x_common.h @@ -74,10 +74,6 @@ * s_init when we have SPL used. */ -#ifdef CONFIG_NAND -#define CONFIG_SPL_NAND_AM33XX_BCH /* ELM support */ -#endif - /* Now bring in the rest of the common code. */ #include <configs/ti_armv7_omap.h> diff --git a/include/configs/ti_armv7_omap.h b/include/configs/ti_armv7_omap.h index 6834500..cf696ff 100644 --- a/include/configs/ti_armv7_omap.h +++ b/include/configs/ti_armv7_omap.h @@ -24,7 +24,6 @@ * access CS0 at is 0x8000000. */ #ifdef CONFIG_NAND -#define CONFIG_NAND_OMAP_GPMC #ifndef CONFIG_SYS_NAND_BASE #define CONFIG_SYS_NAND_BASE 0x8000000 #endif diff --git a/include/configs/ti_omap3_common.h b/include/configs/ti_omap3_common.h index 393d867..2373727 100644 --- a/include/configs/ti_omap3_common.h +++ b/include/configs/ti_omap3_common.h @@ -65,7 +65,6 @@ (64 << 20)) #ifdef CONFIG_NAND -#define CONFIG_SPL_NAND_SIMPLE #define CONFIG_SYS_NAND_BASE 0x30000000 #endif diff --git a/include/configs/ti_omap4_common.h b/include/configs/ti_omap4_common.h index acfac24..dbf3478 100644 --- a/include/configs/ti_omap4_common.h +++ b/include/configs/ti_omap4_common.h @@ -143,10 +143,6 @@ #define CONFIG_SYS_SPL_ARGS_ADDR (CONFIG_SYS_SDRAM_BASE + \ (128 << 20)) -#ifdef CONFIG_NAND -#define CONFIG_SPL_NAND_AM33XX_BCH /* ELM support */ -#endif - #ifdef CONFIG_SPL_BUILD /* No need for i2c in SPL mode as we will use SRI2C for PMIC access on OMAP4 */ #undef CONFIG_SYS_I2C diff --git a/include/configs/ti_omap5_common.h b/include/configs/ti_omap5_common.h index 4c3a276..e892073 100644 --- a/include/configs/ti_omap5_common.h +++ b/include/configs/ti_omap5_common.h @@ -104,10 +104,6 @@ #define CONFIG_SYS_SPL_ARGS_ADDR (CONFIG_SYS_SDRAM_BASE + \ (128 << 20)) -#ifdef CONFIG_NAND -#define CONFIG_SPL_NAND_AM33XX_BCH /* ELM support */ -#endif - #ifdef CONFIG_SPL_BUILD #undef CONFIG_TIMER #endif diff --git a/include/configs/tricorder.h b/include/configs/tricorder.h index fbdd43a..87c2f90 100644 --- a/include/configs/tricorder.h +++ b/include/configs/tricorder.h @@ -84,7 +84,6 @@ "2m(fdt)," \ "-(ubi)" -#define CONFIG_NAND_OMAP_GPMC #define CONFIG_SYS_NAND_ADDR NAND_BASE /* physical address */ /* to access nand */ #define CONFIG_SYS_NAND_BASE NAND_BASE /* physical address */ @@ -254,7 +253,6 @@ /* Defines for SPL */ #define CONFIG_SPL_FRAMEWORK -#define CONFIG_SPL_NAND_SIMPLE #define CONFIG_SPL_NAND_BASE #define CONFIG_SPL_NAND_DRIVERS diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 4689d63..d42e839 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -1620,9 +1620,6 @@ CONFIG_NAND_MXC CONFIG_NAND_MXC_V1_1 CONFIG_NAND_NDFC CONFIG_NAND_OMAP_ECCSCHEME -CONFIG_NAND_OMAP_ELM -CONFIG_NAND_OMAP_GPMC -CONFIG_NAND_OMAP_GPMC_PREFETCH CONFIG_NAND_OMAP_GPMC_WSCFG CONFIG_NAND_SECBOOT CONFIG_NAND_SPL @@ -2254,7 +2251,6 @@ CONFIG_SPL_MMC_LOAD CONFIG_SPL_MMC_MINIMAL CONFIG_SPL_MPC83XX_WAIT_FOR_NAND CONFIG_SPL_MXS_PSWITCH_WAIT -CONFIG_SPL_NAND_AM33XX_BCH CONFIG_SPL_NAND_BASE CONFIG_SPL_NAND_BOOT CONFIG_SPL_NAND_DRIVERS @@ -2263,7 +2259,6 @@ CONFIG_SPL_NAND_INIT CONFIG_SPL_NAND_LOAD CONFIG_SPL_NAND_MINIMAL CONFIG_SPL_NAND_RAW_ONLY -CONFIG_SPL_NAND_SIMPLE CONFIG_SPL_NAND_SOFTECC CONFIG_SPL_NAND_WORKSPACE CONFIG_SPL_NO_CPU_SUPPORT_CODE -- 2.7.4

3 2

[U-Boot] [PATCH v1 0/9] Enable falcon boot for LS1043ARDB SDCARD boot
by York Sun 29 Nov '17

29 Nov '17

With two previous sets, "Add FIT support for falcon boot" and "Enable PPA in SPL for ARMv8 Layerscape SoCs", this set enables falcon boot for LS1043ARDB SDCARD boot and related secure boot. Ruchika Gupta (2): fsl: secure boot: Remove dependency of command line for fsl_validate.c fsl: secure boot: Add fsl_rsa_modexp_raw function for scenarios without DM model York Sun (7): armv8: ls1043ardb: Use static DDR setting for SPL secure boot armv8: layerscape: Eanble falcon boot armv8: ls1043ardb_sdcard: Enable falcon boot crypto: fsl: Allocate memory for descriptor from main memory armv8: fsl-layerscape: Enable secure boot valiation for SPL boot armv8: layerscape: falcon: Implement FIT image validation armv8: ls1043ardb: Enable loading PPA and falcon boot for SD secure boot .../arm/cpu/armv8/fsl-layerscape/doc/README.falcon | 86 ++++++++++++++++++++++ arch/arm/cpu/armv8/fsl-layerscape/spl.c | 58 +++++++++++++++ arch/arm/include/asm/fsl_secure_boot.h | 5 +- arch/arm/include/asm/system.h | 2 +- arch/arm/lib/spl.c | 11 +++ board/freescale/common/Makefile | 5 +- board/freescale/common/fsl_validate.c | 19 +++-- board/freescale/ls1043ardb/ddr.c | 46 ++++++++++++ board/freescale/ls1043ardb/ddr.h | 67 +++++++++++++++++ configs/ls1043ardb_sdcard_SECURE_BOOT_defconfig | 10 ++- configs/ls1043ardb_sdcard_defconfig | 8 +- drivers/crypto/fsl/fsl_rsa.c | 43 ++++++++++- include/configs/ls1043a_common.h | 9 ++- include/configs/ls1043ardb.h | 14 +++- 14 files changed, 360 insertions(+), 23 deletions(-) create mode 100644 arch/arm/cpu/armv8/fsl-layerscape/doc/README.falcon -- 2.7.4

3 12