February 2019 - U-Boot

[U-Boot] [PATCH] doc: binding: rename directory ram to memory-controller
by Patrick Delaunay 01 Mar '19

01 Mar '19

Alignment with kernel directory name as it have already bindings for DDR controllers in the directory: Documentation/devicetree/bindings/memory-controller PS: the drivers using RAM u-class should be associated with this binding directory Signed-off-by: Patrick Delaunay <patrick.delaunay(a)st.com> --- doc/device-tree-bindings/{ram => memory-controllers}/k3-am654-ddrss.txt | 0 doc/device-tree-bindings/{ram => memory-controllers}/st,stm32-fmc.txt | 0 doc/device-tree-bindings/{ram => memory-controllers}/st,stm32mp1-ddr.txt | 0 3 files changed, 0 insertions(+), 0 deletions(-) rename doc/device-tree-bindings/{ram => memory-controllers}/k3-am654-ddrss.txt (100%) rename doc/device-tree-bindings/{ram => memory-controllers}/st,stm32-fmc.txt (100%) rename doc/device-tree-bindings/{ram => memory-controllers}/st,stm32mp1-ddr.txt (100%) diff --git a/doc/device-tree-bindings/ram/k3-am654-ddrss.txt b/doc/device-tree-bindings/memory-controllers/k3-am654-ddrss.txt similarity index 100% rename from doc/device-tree-bindings/ram/k3-am654-ddrss.txt rename to doc/device-tree-bindings/memory-controllers/k3-am654-ddrss.txt diff --git a/doc/device-tree-bindings/ram/st,stm32-fmc.txt b/doc/device-tree-bindings/memory-controllers/st,stm32-fmc.txt similarity index 100% rename from doc/device-tree-bindings/ram/st,stm32-fmc.txt rename to doc/device-tree-bindings/memory-controllers/st,stm32-fmc.txt diff --git a/doc/device-tree-bindings/ram/st,stm32mp1-ddr.txt b/doc/device-tree-bindings/memory-controllers/st,stm32mp1-ddr.txt similarity index 100% rename from doc/device-tree-bindings/ram/st,stm32mp1-ddr.txt rename to doc/device-tree-bindings/memory-controllers/st,stm32mp1-ddr.txt -- 2.7.4

2 1

[U-Boot] [PATCH 1/1] fs: fat: fix link error when building with DEBUG=1
by Heinrich Schuchardt 01 Mar '19

01 Mar '19

When compiling with DEBUG=1 an error fs/fat/fat_write.c:831: undefined reference to `__aeabi_ldivmod' occurred. We should use do_div() instead of the modulus operator. filesize and cur_pos cannot be negative. So let's use u64 to avoid warnings. Fixes: cb8af8af5ba0 ("fs: fat: support write with non-zero offset") Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- fs/fat/fat_write.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fs/fat/fat_write.c b/fs/fat/fat_write.c index 3272412ca9..852f874e58 100644 --- a/fs/fat/fat_write.c +++ b/fs/fat/fat_write.c @@ -696,11 +696,11 @@ static int set_contents(fsdata *mydata, dir_entry *dentptr, loff_t pos, __u8 *buffer, loff_t maxsize, loff_t *gotsize) { - loff_t filesize; unsigned int bytesperclust = mydata->clust_size * mydata->sect_size; __u32 curclust = START(dentptr); __u32 endclust = 0, newclust = 0; - loff_t cur_pos, offset, actsize, wsize; + u64 cur_pos, filesize; + loff_t offset, actsize, wsize; *gotsize = 0; filesize = pos + maxsize; @@ -828,7 +828,7 @@ set_contents(fsdata *mydata, dir_entry *dentptr, loff_t pos, __u8 *buffer, curclust = endclust; filesize -= cur_pos; - assert(!(cur_pos % bytesperclust)); + assert(!do_div(cur_pos, bytesperclust)); set_clusters: /* allocate and write */ -- 2.20.1

2 1

[U-Boot] [PATCH] arm: pdu001: Fix order of include files
by Felix Brack 01 Mar '19

01 Mar '19

Fix the order of include files according to U-Boot coding style. Signed-off-by: Felix Brack <fb(a)ltec.ch> --- board/eets/pdu001/mux.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/board/eets/pdu001/mux.c b/board/eets/pdu001/mux.c index f1d38e9b74..f0f9e262eb 100644 --- a/board/eets/pdu001/mux.c +++ b/board/eets/pdu001/mux.c @@ -8,11 +8,11 @@ */ #include <common.h> +#include <i2c.h> #include <asm/arch/sys_proto.h> #include <asm/arch/hardware.h> #include <asm/arch/mux.h> #include <asm/io.h> -#include <i2c.h> #include "board.h" static struct module_pin_mux uart0_pin_mux[] = { -- 2.17.1

2 1

[U-Boot] [PATCH] .gitignore: Ignore regenerated *.dtbo files
by Michal Simek 01 Mar '19

01 Mar '19

*.dtbo are dt overlays files which should be also ignored as *.dtb. Signed-off-by: Michal Simek <michal.simek(a)xilinx.com> --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 8d18d6f49bcb..3df3139d236e 100644 --- a/.gitignore +++ b/.gitignore @@ -10,6 +10,7 @@ *.bin *.cfgout *.dtb +*.dtbo *.dtb.S *.elf *.exe -- 1.9.1

2 1

[U-Boot] [PATCH] ARM: cache: Fix incorrect bitwise operation
by Marek Vasut 01 Mar '19

01 Mar '19

The loop implemented in the code is supposed to check whether the PL310 operation register has any bit from the mask set. Currently, the code checks whether the PL310 operation register has any bit set AND whether the mask is non-zero, which is incorrect. Fix the conditional. Signed-off-by: Marek Vasut <marex(a)denx.de> Cc: Dalon Westergreen <dwesterg(a)gmail.com> Cc: Dinh Nguyen <dinguyen(a)kernel.org> Cc: Tom Rini <trini(a)konsulko.com> Fixes: 93bc21930a1b ("armv7: add PL310 support to u-boot") --- arch/arm/lib/cache-pl310.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/lib/cache-pl310.c b/arch/arm/lib/cache-pl310.c index 1296ba6efd..bbaaaa4157 100644 --- a/arch/arm/lib/cache-pl310.c +++ b/arch/arm/lib/cache-pl310.c @@ -33,7 +33,7 @@ static void pl310_background_op_all_ways(u32 *op_reg) /* Invalidate all ways */ writel(way_mask, op_reg); /* Wait for all ways to be invalidated */ - while (readl(op_reg) && way_mask) + while (readl(op_reg) & way_mask) ; pl310_cache_sync(); } -- 2.19.2

4 3

[U-Boot] [PATCH] spi: omap3: fix set_wordlen() reading from incorrect address for CHCONF
by David Rivshin 01 Mar '19

01 Mar '19

From: David Rivshin <DRivshin(a)allworx.com> _omap3_spi_set_wordlen() indexed the regs->channel[] array with the old wordlen (instead of the chipselect number) when reading the current CHCONF register value. This meant it read from the wrong memory location, modified that value, and then wrote it back to the correct CHCONF register. The end result is that most slave configuration settings would be lost, such as clock divisor, clock/chipselect polarities, etc. Fixes: 77b8d04854f4 ("spi: omap3: Convert to driver model") Signed-off-by: David Rivshin <drivshin(a)allworx.com> --- drivers/spi/omap3_spi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/spi/omap3_spi.c b/drivers/spi/omap3_spi.c index c7fcf050a5..ff4c700645 100644 --- a/drivers/spi/omap3_spi.c +++ b/drivers/spi/omap3_spi.c @@ -415,7 +415,7 @@ static void _omap3_spi_set_wordlen(struct omap3_spi_priv *priv) unsigned int confr; /* McSPI individual channel configuration */ - confr = readl(&priv->regs->channel[priv->wordlen].chconf); + confr = readl(&priv->regs->channel[priv->cs].chconf); /* wordlength */ confr &= ~OMAP3_MCSPI_CHCONF_WL_MASK; base-commit: d3689267f92c5956e09cc7d1baa4700141662bff -- 2.20.1

2 1

[U-Boot] Pull request: u-boot-sunxi/master
by Jagan Teki 01 Mar '19

01 Mar '19

Hi Tom, Please pull this PR. Jagan. The following changes since commit b89074f65047c4058741ed2bf3e6ff0c5af4c5bc: Merge tag 'u-boot-imx-2019-02-16' of git://git.denx.de/u-boot-imx (2019-02-16 08:31:05 -0500) are available in the Git repository at: git://git.denx.de/u-boot-sunxi.git master for you to fetch changes up to da95ed58c4765ff23ed35753878274ef585f28b5: sunxi: Add Bananapi M2+ H5 board (2019-02-18 14:46:53 +0530) ---------------------------------------------------------------- Chen-Yu Tsai (3): sunxi: Sync Bananapi M2+ device tree from Linux v5.0-rc1 sunxi: Rename Sinovoip BPI M2 Plus to Bananapi M2 Plus H3 sunxi: Add Bananapi M2+ H5 board arch/arm/dts/sun50i-h5-bananapi-m2-plus.dts | 11 + arch/arm/dts/sun8i-h3-bananapi-m2-plus.dts | 190 +--------------- arch/arm/dts/sunxi-bananapi-m2-plus.dtsi | 245 +++++++++++++++++++++ board/sunxi/MAINTAINERS | 12 +- ...lus_defconfig => bananapi_m2_plus_h3_defconfig} | 0 configs/bananapi_m2_plus_h5_defconfig | 20 ++ 6 files changed, 285 insertions(+), 193 deletions(-) create mode 100644 arch/arm/dts/sun50i-h5-bananapi-m2-plus.dts create mode 100644 arch/arm/dts/sunxi-bananapi-m2-plus.dtsi rename configs/{Sinovoip_BPI_M2_Plus_defconfig => bananapi_m2_plus_h3_defconfig} (100%) create mode 100644 configs/bananapi_m2_plus_h5_defconfig

2 1

[U-Boot] Commit "ARM: CPU: arm926ejs: Consolidate cache routines to common file" breaks u-boot on Dreamplug
by Leigh Brown 01 Mar '19

01 Mar '19

Hello, Vagrant Cascadian asked for people to test the version of u-boot packaged for Debian Buster. I tested u-boot on my Dreamplug and found it was not working correctly. I raised a bug for Debian[1] but I have also tested with the mainline version of u-boot and found the same issues. The first issue is that the following commit caused u-boot to no longer be able to access usb storage on the Dreamplug: commit 93b283d49f933f95f3a6f40762936f454ac655a8 Author: Adam Ford <aford173(a)gmail.com> Date: Thu Aug 16 13:23:11 2018 -0500 ARM: CPU: arm926ejs: Consolidate cache routines to common file Four different boards had different options for enabling cache that were virtually all the same. This consolidates these common functions into arch/arm/cpu/arm926ejs/cache.c This also has the positive side-effect of enabling cache on the Davinci (da850) boards. Signed-off-by: Adam Ford <aford173(a)gmail.com> [trini: Add mach-at91 to the list of consolidations] Signed-off-by: Tom Rini <trini(a)konsulko.com> I don't have much knowledge of ARM caching, but the following patch makes it work again on my Dreamplug. diff --git a/arch/arm/mach-kirkwood/cpu.c b/arch/arm/mach-kirkwood/cpu.c index d54de53f31..8a065d73ae 100644 --- a/arch/arm/mach-kirkwood/cpu.c +++ b/arch/arm/mach-kirkwood/cpu.c @@ -291,7 +291,6 @@ int arch_misc_init(void) temp |= (1 << 22); writefr_extra_feature_reg(temp); - icache_enable(); /* Change reset vector to address 0x0 */ temp = get_cr(); set_cr(temp & ~CR_V); diff --git a/include/configs/dreamplug.h b/include/configs/dreamplug.h index f4d717213c..6348935c68 100644 --- a/include/configs/dreamplug.h +++ b/include/configs/dreamplug.h @@ -79,4 +79,6 @@ #define CONFIG_SYS_ATA_IDE0_OFFSET MV_SATA_PORT0_OFFSET #endif /*CONFIG_MVSATA_IDE*/ +#define CONFIG_SYS_DCACHE_OFF + #endif /* _CONFIG_DREAMPLUG_H */ I'd be grateful if someone could take a look. If you need me to do any testing or provide any more information, please let me know. I found another issue (documented in the same bug). I'll send a separate email about that. Regards, Leigh. -- [1] https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=923379

4 5

[U-Boot] IMX6 DM_USB / DM_MMC requires OF_CONTROL?
by Tim Harvey 28 Feb '19

28 Feb '19

Greetings, I'm seeing that I need to switch my IMX6 board support (board/gateworks/gw_ventana) over to DM_USB and DM_MMC right away (v2019.04) and I notice enabling those fails building as it looks like these DM drivers expect OF_CONTROL (U-Boot running from a device-tree). Is that currently true or am I perhaps missing something? I haven't pinned down what exactly is missing yet so I thought I would ask. It looks like only a couple of IMX6 boards have been converted over thus far. What is the IMX6 status of DM_SCSI/DM_PCI/DM_VIDEO which are required by v2019.07? Best Regards, Tim

6 8

[U-Boot] [PATCH v4 00/20] mx6sabre: Add DM and SPL FIT support
by Abel Vesa 28 Feb '19

28 Feb '19

The third version is here: https://lists.denx.de/pipermail/u-boot/2019-January/356903.html So, this time I hope I got it right. Before, I was stupidly trying to put a fit in another fit without a really good reason. To my excuse, that was working even with the spl_image->os set to 0, bug which I (hope) I fixed in the first patch (a new one) of this series. Changes since v3: * Reduced the SPL size by disabling EXT_SUPPORT, otherwise the 6qp-sabresd wouldn't boot due to having its dtb last in the fit. I forgot to mention in the last version that EFI and DOS SPL support also had to be disabled to get the size right. * Dropped the fit_spl.its file * Dropped the (now) unnecessary updates to the README files. We're sticking to the u-boot.img since it's exactly what is needed. * Fixed a bug related to FIT_IMAGE_TINY when CONFIG_SPL_OS_BOOT is enabled. The short story here is that spl_image->os was remaining set to 0. (see first patch in the series for details) Abel Vesa (20): common: spl_fit: Fix the spl_fit_image_get_os for FIT_IMAGE_TINY usb: Rename SPL_USB_SUPPORT to SPL_USB_STORAGE usb: ehci-mx6: Make regulator DM_REGULATOR dependent configs: imx6sabreauto: Add DM_MMC support configs: imx6sabreauto: Add DM_USB support mmc: fsl_esdhc: Fix DM_REGULATOR ifdefs for SPL builds board: mx6sabresd: Add board_fit_config_name_match to support FIT in SPL board: mx6sabreauto: Add board_fit_config_name_match to support FIT in SPL arm: dts: Add all the imx6[q|qp|dl] sabre[auto|sd] u-boot dts[i] files arm: dts: Update all the dts[i] files for imx6[q|qp|dl] sabre[auto|sd] configs: mx6sabreauto: Add SPL FIT and DM support configs: mx6sabresd: Add SPL FIT and DM support mx6sabreauto: Add DM_GPIO support mx6sabresd: Add DM_GPIO support configs: mx6sabreauto: Add DM_SPI_FLASH necessary configs configs: mx6sabresd: Add DM_SPI_FLASH necessary configs board: mx6sabreauto: Remove the non-DM code board: mx6sabresd: Remove non-DM code board: mx6sabresd: Remove the enet reset gpio handling configs: mx6sabresd: Reduce SPL size by disabling DOS, EXT and EFI support arch/arm/dts/Makefile | 8 +- arch/arm/dts/imx6dl-sabreauto-u-boot.dtsi | 6 + arch/arm/dts/imx6dl-sabreauto.dts | 13 + arch/arm/dts/imx6dl-sabresd-u-boot.dtsi | 6 + arch/arm/dts/imx6dl-sabresd.dts | 18 + arch/arm/dts/imx6dl.dtsi | 306 ++++++++++- arch/arm/dts/imx6q-sabreauto-u-boot.dtsi | 6 + arch/arm/dts/imx6q-sabreauto.dts | 18 + arch/arm/dts/imx6q-sabresd-u-boot.dtsi | 6 + arch/arm/dts/imx6q-sabresd.dts | 23 + arch/arm/dts/imx6q.dtsi | 310 +++++++++-- arch/arm/dts/imx6qdl-sabreauto-u-boot.dtsi | 21 + arch/arm/dts/imx6qdl-sabreauto.dtsi | 810 ++++++++++++++++++++++++++++ arch/arm/dts/imx6qdl-sabresd-u-boot.dtsi | 14 + arch/arm/dts/imx6qdl-sabresd.dtsi | 741 +++++++++++++++++++++++++ arch/arm/dts/imx6qdl-u-boot.dtsi | 4 +- arch/arm/dts/imx6qdl.dtsi | 455 +++++++++------- arch/arm/dts/imx6qp-sabreauto-u-boot.dtsi | 6 + arch/arm/dts/imx6qp-sabreauto.dts | 55 ++ arch/arm/dts/imx6qp-sabresd-u-boot.dtsi | 6 + arch/arm/dts/imx6qp-sabresd.dts | 55 ++ arch/arm/dts/imx6qp.dtsi | 115 ++++ arch/arm/include/asm/arch-am33xx/spl.h | 2 +- arch/arm/mach-omap2/boot-common.c | 2 +- board/freescale/mx6sabreauto/mx6sabreauto.c | 91 +--- board/freescale/mx6sabresd/mx6sabresd.c | 78 +-- common/Makefile | 5 +- common/spl/Kconfig | 4 +- common/spl/Makefile | 2 +- common/spl/spl_fit.c | 4 - common/spl/spl_usb.c | 4 - configs/am43xx_evm_usbhost_boot_defconfig | 2 +- configs/am43xx_hs_evm_defconfig | 2 +- configs/mx6sabreauto_defconfig | 20 +- configs/mx6sabresd_defconfig | 26 +- drivers/mmc/fsl_esdhc.c | 8 +- drivers/usb/host/ehci-mx6.c | 7 +- 37 files changed, 2847 insertions(+), 412 deletions(-) create mode 100644 arch/arm/dts/imx6dl-sabreauto-u-boot.dtsi create mode 100644 arch/arm/dts/imx6dl-sabreauto.dts create mode 100644 arch/arm/dts/imx6dl-sabresd-u-boot.dtsi create mode 100644 arch/arm/dts/imx6dl-sabresd.dts create mode 100644 arch/arm/dts/imx6q-sabreauto-u-boot.dtsi create mode 100644 arch/arm/dts/imx6q-sabreauto.dts create mode 100644 arch/arm/dts/imx6q-sabresd-u-boot.dtsi create mode 100644 arch/arm/dts/imx6q-sabresd.dts create mode 100644 arch/arm/dts/imx6qdl-sabreauto-u-boot.dtsi create mode 100644 arch/arm/dts/imx6qdl-sabreauto.dtsi create mode 100644 arch/arm/dts/imx6qdl-sabresd-u-boot.dtsi create mode 100644 arch/arm/dts/imx6qdl-sabresd.dtsi create mode 100644 arch/arm/dts/imx6qp-sabreauto-u-boot.dtsi create mode 100644 arch/arm/dts/imx6qp-sabreauto.dts create mode 100644 arch/arm/dts/imx6qp-sabresd-u-boot.dtsi create mode 100644 arch/arm/dts/imx6qp-sabresd.dts create mode 100644 arch/arm/dts/imx6qp.dtsi -- 2.7.4

8 86