December 2018 - U-Boot

[U-Boot] i.MX8MQ-EVK with ext4 read support
by Chris Spencer 20 Dec '18

20 Dec '18

Hi, I'm trying to get started with the new i.MX8MQ-EVK support and I've got a bit of an issue enabling ext4 read support without also enabling write support. CONFIG_FS_EXT4=y I get a build error here: fs/fs.c:198:12: error: ‘ext4_write_file’ undeclared here (not in a function); did you mean ‘ext4_read_file’? .write = ext4_write_file, ^~~~~~~~~~~~~~~ This line is wrapped with an ifdef check for CONFIG_CMD_EXT4_WRITE. The write function is declared in include/ext4fs.h, where it is wrapped with a check for CONFIG_EXT4_WRITE. The problem is that include/configs/imx8mq_evk.h has this define: #define CONFIG_CMD_EXT4_WRITE This results in the 'write' code being enabled in fs.c but disabled in ext4fs.h. The two ifdefs probably ought to be made consistent, but I don't really understand why imx8mq_evk.h needs to define it in the first place. Can anybody shed some light on this? Thanks, Chris

2 2

[U-Boot] [imx/next V2] tools: imx8m_image: use bash
by Peng Fan 20 Dec '18

20 Dec '18

travis-ci reports "tools/imx8m_image.sh: 15: [: signed_hdmi_imx8m.bin: unexpected operator" After use bash, no error, so use bash instead of sh. Signed-off-by: Peng Fan <peng.fan(a)nxp.com> --- tools/imx8m_image.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/imx8m_image.sh b/tools/imx8m_image.sh index 6346fb64d8..0e9df4763c 100755 --- a/tools/imx8m_image.sh +++ b/tools/imx8m_image.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # SPDX-License-Identifier: GPL-2.0+ # # script to check whether the file exists in imximage.cfg for i.MX8M -- 2.14.1

3 3

[U-Boot] [PATCH 1/1] arm: sunxi: Add NULL pointer check
by Stefan Mavrodiev 20 Dec '18

20 Dec '18

Current driver doesn't check if the destination pointer is NULL. This cause the data from the FIFO to be stored inside the internal SDRAM ( address 0 ). The patch add simple check if the destination pointer is NULL. Signed-off-by: Stefan Mavrodiev <stefan(a)olimex.com> --- drivers/spi/sun4i_spi.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/spi/sun4i_spi.c b/drivers/spi/sun4i_spi.c index b86b5a00ad..38cc743c61 100644 --- a/drivers/spi/sun4i_spi.c +++ b/drivers/spi/sun4i_spi.c @@ -129,7 +129,8 @@ static inline void sun4i_spi_drain_fifo(struct sun4i_spi_priv *priv, int len) while (len--) { byte = readb(&priv->regs->rxdata); - *priv->rx_buf++ = byte; + if (priv->rx_buf) + *priv->rx_buf++ = byte; } } -- 2.17.1

5 24

[U-Boot] [PATCH] imx6: apalis: Make the boot process more generic
by Petr Štetiar 20 Dec '18

20 Dec '18

I'm preparing support for Apalis imx6 boards in OpenWrt and I've ended up with quite huge patchset against upstream U-Boot 2018.03, so I'm trying to propose more generic way of boot process handling. In OpenWrt we usually have kernel, dtbs and U-Boot boot script in boot partition with ext4fs, so for some use cases it would be handy to be able to replace some of the files I've added TDX_APALIS_IMX6_BOOT_PART and TDX_APALIS_IMX6_ROOT_PART config variables so this could be distro specific and overridden. I've added `set_blkcnt` environment variable which is needed for every `mmc write` command as we need to always specify size in block count. This is copy&pasted from official Toradex's flashing scripts, so all the credits for this work belongs to them. Currently the rootfs location is passed via mmcblk number and the problem with this approach is that the mmcblk number for the boot device changes depending on the kernel version and imx6 SoC type. In order to avoid such issues, use the UUID method to specify the rootfs location. I've added new boot sequence, where we first try to load and run boot script defined in the new `script` variable, so the boot process could be more generic and overridden by the distro. When the boot script isn't loaded, it will use the previous boot sequence so it should be backward compatible. For the recovery purposes and better end user experience I've added boot from SDP as the last boot command if every other boot option fails. I plan to use SDP as official flashing/recovery procedure in OpenWrt for Apalis imx6 boards. I've copy&pasted almost everything from the `f086812a mx6sxsabresd: Use PARTUUID to specify the rootfs location` commit, so credits for the rest of this patch belongs to Fabio. Cc: Stefan Agner <stefan.agner(a)toradex.com> Cc: Max Krummenacher <max.krummenacher(a)toradex.com> Signed-off-by: Petr Štetiar <ynezz(a)true.cz> --- board/toradex/apalis_imx6/Kconfig | 15 +++++++++++++++ configs/apalis_imx6_defconfig | 2 ++ include/configs/apalis_imx6.h | 29 ++++++++++++++++++++++++----- 3 files changed, 41 insertions(+), 5 deletions(-) diff --git a/board/toradex/apalis_imx6/Kconfig b/board/toradex/apalis_imx6/Kconfig index 14f8c10..584bc9f 100644 --- a/board/toradex/apalis_imx6/Kconfig +++ b/board/toradex/apalis_imx6/Kconfig @@ -50,6 +50,21 @@ config TDX_APALIS_IMX6_V1_0 otherwise the UARTs are configuered in DTE mode. default n +config TDX_APALIS_IMX6_BOOT_PART + int "Partition number to use for boot filesystem" + default 1 + help + The partition number to use for boot filesystem this is the + partition that typically contains boot.scr, DTBs, uImage etc. + +config TDX_APALIS_IMX6_ROOT_PART + int "Partition number to use for root filesystem" + default 2 + help + The partition number to use for root filesystem this is the + partition that is typically specified with root=/dev/sdaX or + which gets converted into a root=PARTUUID=some_uuid. + source "board/toradex/common/Kconfig" endif diff --git a/configs/apalis_imx6_defconfig b/configs/apalis_imx6_defconfig index 133fc1a..279d39f 100644 --- a/configs/apalis_imx6_defconfig +++ b/configs/apalis_imx6_defconfig @@ -39,6 +39,7 @@ CONFIG_CMD_DFU=y CONFIG_CMD_GPIO=y CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y +CONFIG_CMD_PART=y CONFIG_CMD_USB=y CONFIG_CMD_USB_SDP=y CONFIG_CMD_USB_MASS_STORAGE=y @@ -48,6 +49,7 @@ CONFIG_CMD_PING=y CONFIG_CMD_BMP=y CONFIG_CMD_CACHE=y CONFIG_CMD_EXT4=y +CONFIG_CMD_EXT4_WRITE=y CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y CONFIG_ENV_IS_IN_MMC=y diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h index 135b3c9..9af5b29 100644 --- a/include/configs/apalis_imx6.h +++ b/include/configs/apalis_imx6.h @@ -142,9 +142,9 @@ "imx6q-colibri-cam-eval-v3.dtb fat 0 1" #define EMMC_BOOTCMD \ - "emmcargs=ip=off root=/dev/mmcblk0p2 rw,noatime rootfstype=ext3 " \ + "emmcargs=ip=off root=PARTUUID=${uuid} rw,noatime rootfstype=ext3 " \ "rootwait\0" \ - "emmcboot=run setup; " \ + "emmcboot=run setup; run finduuid;" \ "setenv bootargs ${defargs} ${emmcargs} ${setupargs} " \ "${vidargs}; echo Booting from internal eMMC chip...; " \ "run emmcdtbload; load mmc 0:1 ${kernel_addr_r} " \ @@ -201,10 +201,20 @@ #define FDT_FILE "imx6q-apalis_v1_0-eval.dtb" #endif #define CONFIG_EXTRA_ENV_SETTINGS \ - "bootcmd=run emmcboot ; echo ; echo emmcboot failed ; " \ + "script=boot.scr\0" \ + "mmcbootdev=" __stringify(CONFIG_SYS_MMC_ENV_DEV) "\0" \ + "bootpart=" __stringify(CONFIG_TDX_APALIS_IMX6_BOOT_PART) "\0" \ + "rootpart=" __stringify(CONFIG_TDX_APALIS_IMX6_ROOT_PART) "\0" \ + "finduuid=part uuid mmc ${mmcbootdev}:${rootpart} uuid\0" \ + "loadbootscript=" \ + "load mmc ${mmcbootdev}:${bootpart} ${loadaddr} ${script};\0" \ + "bootscript=echo Running bootscript from mmc ...; " \ + "source\0" \ + "bootcmd_default=run emmcboot ; echo ; echo emmcboot failed ; " \ "run nfsboot ; echo ; echo nfsboot failed ; " \ "usb start ;" \ - "setenv stdout serial,vga ; setenv stdin serial,usbkbd\0" \ + "setenv stdout serial,vga ; setenv stdin serial,usbkbd;" \ + "sdp 0\0" \ "boot_file=uImage\0" \ "console=ttymxc0\0" \ "defargs=enable_wait_mode=off vmalloc=400M\0" \ @@ -232,7 +242,16 @@ "vidargs=mxc_hdmi.only_cea=1 " \ "video=mxcfb0:dev=hdmi,1920x1080M@60,if=RGB24 " \ "video=mxcfb1:off video=mxcfb2:off video=mxcfb3:off " \ - "fbmem=32M\0 " + "fbmem=32M\0 " \ + "set_blkcnt=setexpr blkcnt ${filesize} + 0x1ff && setexpr blkcnt ${blkcnt} / 0x200\0" + +#define CONFIG_BOOTCOMMAND \ + "mmc dev ${mmcbootdev};" \ + "if run loadbootscript; then " \ + "run bootscript; " \ + "else " \ + "run bootcmd_default; " \ + "fi; " /* Miscellaneous configurable options */ #undef CONFIG_SYS_CBSIZE -- 1.9.1

4 4

[U-Boot] [PATCH] imx: Add Makefile dependency for mkimage_fit_atf.sh
by Christopher Spencer 20 Dec '18

20 Dec '18

From: Chris Spencer <christopher.spencer(a)sea.co.uk> The mkimage_fit_atf.sh SPL FIT generator script requires u-boot-nodtb.bin, but this was not enforced by the Makefile. This could cause the generator script to be executed before u-boot-nodtb.bin has been created. Signed-off-by: Chris Spencer <christopher.spencer(a)sea.co.uk> Cc: NXP i.MX U-Boot Team <uboot-imx(a)nxp.com> --- Makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Makefile b/Makefile index fe41a5fe92..929f206f23 100644 --- a/Makefile +++ b/Makefile @@ -1113,6 +1113,9 @@ U_BOOT_ITS = $(subst ",,$(CONFIG_SPL_FIT_SOURCE)) else ifneq ($(CONFIG_SPL_FIT_GENERATOR),"") U_BOOT_ITS := u-boot.its +ifeq ($(CONFIG_SPL_FIT_GENERATOR),"arch/arm/mach-imx/mkimage_fit_atf.sh") +U_BOOT_ITS_DEPS += u-boot-nodtb.bin +endif ifeq ($(CONFIG_SPL_FIT_GENERATOR),"arch/arm/mach-rockchip/make_fit_atf.py") U_BOOT_ITS_DEPS += u-boot endif -- 2.17.1 Disclaimer: This email has been scanned for all known viruses by the MessageLabs Email Security System. The contents of this email (including any attachments) are intended for the use of the mail addressee(s) shown, hence is private and in addition may include commercially sensitive information. If you are not the intended recipient of this email any disclosure, copying, distribution or use of its contents is strictly prohibited. You should notify the sender immediately and then delete it (including any attachments) from your system. The information contained in or attached to this message may also be subject to the export control laws and regulations of the United Kingdom and the United States. This specifically includes, but is not limited to, the Arms Export Control Act (22 U.S.C. 2751-2794) and the International Traffic in Arms Regulation (22 C.F.R 120-130) as well as the Export Administration Act (50 U.S.C. App. 2401-2420), the Export Administration Regulation (15 C.F.R. 730-774) and the UK Export Control Act 2002. Please help out the environment by only printing this e-mail if absolutely necessary - Thank you. SEA is the brand name of Systems Engineering & Assessment Ltd (registered office: Beckington Castle, 17 Castle Corner, Beckington, Frome, Somerset, BA11 6TA, UK - company number 02302168).

2 4

[U-Boot] [PATCH] zynq-gem: Flush cache before handing RX packet to receive handler
by Stefan Theil 20 Dec '18

20 Dec '18

The cache was only flushed before *transmitting* packets, but not when receiving them, leading to an issue where new packets were handed to the receive handler with old contents in cache. This only happens when a lot of packets are received without sending packages every now and then. Signed-off-by: Stefan Theil <stefan.theil(a)mixed-mode.de> --- drivers/net/zynq_gem.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/net/zynq_gem.c b/drivers/net/zynq_gem.c index 9bd79b198a..5825b6dd99 100644 --- a/drivers/net/zynq_gem.c +++ b/drivers/net/zynq_gem.c @@ -621,6 +621,9 @@ static int zynq_gem_recv(struct udevice *dev, int flags, uchar **packetp) *packetp = (uchar *)(uintptr_t)addr; + flush_dcache_range(addr, addr + roundup(PKTSIZE_ALIGN, ARCH_DMA_MINALIGN)); + barrier(); + return frame_len; } -- 2.17.1

4 9

[U-Boot] [PATCH 1/2] arm64: zynqmp: Do not protect zynqmp_pmufw_version()
by Michal Simek 20 Dec '18

20 Dec '18

There is hard dependency for CLK_ZYNQMP to have zynqmp_pmufw_version() but also FPGA code is calling this function which is possible to use without actual CLK_ZYNQMP firmware driver to be enabled. This patch enables the case where only fixed-clock CLK setup is used. Signed-off-by: Michal Simek <michal.simek(a)xilinx.com> --- arch/arm/cpu/armv8/zynqmp/cpu.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/arch/arm/cpu/armv8/zynqmp/cpu.c b/arch/arm/cpu/armv8/zynqmp/cpu.c index 4ee8e3f627e9..5ef1a52862c0 100644 --- a/arch/arm/cpu/armv8/zynqmp/cpu.c +++ b/arch/arm/cpu/armv8/zynqmp/cpu.c @@ -179,8 +179,7 @@ int __maybe_unused invoke_smc(u32 pm_api_id, u32 arg0, u32 arg1, u32 arg2, return regs.regs[0]; } -#if defined(CONFIG_CLK_ZYNQMP) -unsigned int zynqmp_pmufw_version(void) +unsigned int __maybe_unused zynqmp_pmufw_version(void) { int ret; u32 ret_payload[PAYLOAD_ARG_CNT]; @@ -202,7 +201,6 @@ unsigned int zynqmp_pmufw_version(void) return pm_api_version; } -#endif static int zynqmp_mmio_rawwrite(const u32 address, const u32 mask, -- 1.9.1

1 1

[U-Boot] [PATCH 0/6] mips: mscc: Add multi-dtb support to luton+ocelot
by Lars Povlsen 20 Dec '18

20 Dec '18

This patch series add support for using multi-dtb on the MSCC luton and ocelot SOC reference boards. The appropriate board will be determined during startup, and the right DT will be selected. The patch is based off u-boot-mips repo. Lars Povlsen (6): mips: luton+ocelot: Remove board-specific config options mips: mscc: Add generic PHY MIIM utility functions mips: mscc: Add generic GPIO control utility function mips: luton: DT: Add pcb090 mips: luton: Add multi-dtb support mips: ocelot: Add multi-dtb support arch/mips/dts/Makefile | 2 + arch/mips/dts/luton_pcb090.dts | 36 +++++++++ arch/mips/mach-mscc/Kconfig | 38 +++------- arch/mips/mach-mscc/Makefile | 2 +- arch/mips/mach-mscc/gpio.c | 33 +++++++++ arch/mips/mach-mscc/include/mach/common.h | 22 ++++++ .../include/mach/luton/luton_devcpu_gcb.h | 4 + .../mach/luton/luton_devcpu_gcb_miim_regs.h | 26 +++++++ .../include/mach/ocelot/ocelot_devcpu_gcb.h | 2 + .../mach/ocelot/ocelot_devcpu_gcb_miim_regs.h | 25 +++++++ arch/mips/mach-mscc/phy.c | 73 +++++++++++++++++++ board/mscc/luton/luton.c | 46 +++++++++++- board/mscc/ocelot/ocelot.c | 52 +++++++++++-- configs/mscc_luton_defconfig | 7 +- configs/mscc_ocelot_defconfig | 7 +- configs/mscc_ocelot_pcb120_defconfig | 60 --------------- include/configs/vcoreiii.h | 2 + 17 files changed, 333 insertions(+), 104 deletions(-) create mode 100644 arch/mips/dts/luton_pcb090.dts create mode 100644 arch/mips/mach-mscc/gpio.c create mode 100644 arch/mips/mach-mscc/include/mach/luton/luton_devcpu_gcb_miim_regs.h create mode 100644 arch/mips/mach-mscc/include/mach/ocelot/ocelot_devcpu_gcb_miim_regs.h create mode 100644 arch/mips/mach-mscc/phy.c delete mode 100644 configs/mscc_ocelot_pcb120_defconfig -- 2.19.2

3 8

[U-Boot] [PATCH v2 0/3] Ethernet support for QEMU sifive_u machine
by Anup Patel 20 Dec '18

20 Dec '18

This patchset enables Cadance MACB ethernet driver for QEMU sifive_u machine. The Cadance MACB ethernet driver works fine for QEMU sifive_u machince in both M-mode and S-mode with some minor fixes. The patches are based upon latest RISC-V U-Boot tree (git://git.denx.de/u-boot-riscv.git) at commit id 9deb8d2fcd13d4a40a4e63c396fe4376af46efac To try on QEMU, please ensure following patches are applied to QEMU sources: https://patchwork.kernel.org/patch/10729579/ https://patchwork.kernel.org/patch/10729581/ Changes since v1: - Minor nit changes in PATCH1 Anup Patel (3): riscv: Add asm/dma-mapping.h for DMA mappings net: macb: Fix clk API usage for RISC-V systems riscv: qemu: Imply MACB ethernet for emulation arch/riscv/include/asm/dma-mapping.h | 38 ++++++++++++++++++++++++++++ board/emulation/qemu-riscv/Kconfig | 4 +++ drivers/net/macb.c | 4 ++- 3 files changed, 45 insertions(+), 1 deletion(-) create mode 100644 arch/riscv/include/asm/dma-mapping.h -- 2.17.1

1 6

[U-Boot] Unable to saveenv to MMC
by Robin Polak 20 Dec '18

20 Dec '18

Hello. I'm having trouble persisting my environment variables to the SD Card onto which I have FAT formatted and then written U-Boot to using the following command: sudo dd if=u-boot-sunxi-with-spl.bin of=/dev/disk2 bs=1024 seek=8 I get the following error when booting a Linksprite_pcDuino3_Nano with the SD Card I've built: U-Boot SPL 2018.11 (Dec 06 2018 - 17:57:48 +0000) DRAM: 1024 MiB CPU: 912000000Hz, AXI/AHB/APB: 3/2/2 Trying to boot from MMC1 U-Boot 2018.11 (Dec 06 2018 - 17:57:48 +0000) Allwinner Technology CPU: Allwinner A20 (SUN7I) Model: LinkSprite pcDuino3 Nano I2C: ready DRAM: 1 GiB MMC: SUNXI SD/MMC: 0 Loading Environment from FAT... Unable to use mmc 0:0... In: serial Out: serial Err: serial SCSI: SATA link 0 timeout. AHCI 0001.0100 32 slots 1 ports 3 Gbps 0x1 impl SATA mode flags: ncq stag pm led clo only pmp pio slum part ccc apst Net: eth0: ethernet@1c50000 starting USB... USB0: USB EHCI 1.00 USB1: USB OHCI 1.0 USB2: USB EHCI 1.00 USB3: USB OHCI 1.0 scanning bus 0 for devices... 1 USB Device(s) found scanning bus 2 for devices... 1 USB Device(s) found scanning usb for storage devices... 0 Storage Device(s) found Hit any key to stop autoboot: 0 => saveenv Saving Environment to FAT... Unable to use mmc 0:0... Failed (1) Thank you for any light that may be shed upon this error. -- -- Robin Polak robin(a)robinpolak.com 917-494-2080

5 7