September 2017 - U-Boot

[U-Boot] [PATCH 1/1] rockchip: provide installation instruction for Firefly-RK3399.
by Heinrich Schuchardt 09 Oct '17

09 Oct '17

Unfortunately installing U-Boot on an SD card for the Firefly-RK3399 is not trivial. I could not get U-Boot running with SPL. So I ended up using the Rockchip miniloader. Adding a README hopefully will give other users an easier start. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- board/rockchip/firefly_rk3399/README | 55 ++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) create mode 100644 board/rockchip/firefly_rk3399/README diff --git a/board/rockchip/firefly_rk3399/README b/board/rockchip/firefly_rk3399/README new file mode 100644 index 0000000000..e9fb41f02d --- /dev/null +++ b/board/rockchip/firefly_rk3399/README @@ -0,0 +1,55 @@ +Installation of U-Boot on the Firefly-RK3399 +============================================ + +Here is a step-by-step instruction for installing U-Boot for the +Firefly-RK3399 on an SD card using the precompiled miniloader provided +by Rockchip. An alternative is to use the second stage loader SPL built by +U-Boot. + +Get precompiled binaries +======================== + + git clone https://github.com/rockchip-linux/rkbin.git + +Flash precompiled binaries to the SD card +========================================= + + mkimage -n rk3399 -T rksd -d rkbin/rk33/rk3399_ddr_800MHz_v1.08.bin \ + idbloader.img + cat rkbin/rk33/rk3399_miniloader_v1.06.bin >> idbloader.img + sudo dd if=idbloader.img of=/dev/sdX seek=64 conv=notrunc + cat > trust.ini << EOF + [VERSION] + MAJOR=1 + MINOR=0 + [BL30_OPTION] + SEC=0 + [BL31_OPTION] + SEC=1 + PATH=rkbin/rk33/rk3399_bl31_v1.00.elf + ADDR=0x10000 + [BL32_OPTION] + SEC=0 + [BL33_OPTION] + SEC=0 + [OUTPUT] + PATH=trust.img + EOF + rkbin/tools/trust_merger trust.ini + sudo dd if=trust.img of=/dev/sdX seek=24576 conv=notrunc + +Running trust_merger requires an x86_64 system. + +Compile U-Boot +============== + + make mrproper + make firefly-rk3399_defconfig + make + mkimage -n rk3399 -O u-boot -a 0x20000 -T rkimage -d u-boot-dtb.bin \ + uboot.img + +Flash U-Boot to the SD-card +=========================== + + sudo dd if=u-boot/uboot.img of=/dev/sdX seek=16384 conv=notrunc -- 2.14.1

4 4

[U-Boot] [PATCH] sunxi: clk: fix N formula for CPUX clocks
by Quentin Schulz 09 Oct '17

09 Oct '17

As explained in arch/arm/mach-sunxi/clock_sun8i_a83t.c, clk for CPU clusters is computed as clk = 24*n. However, the current formula is clk = 24*(n-1). This results in a clock set to a frequency that isn't specified as possible for CPUs. Let's use the correct formula. Fixes: f542948b1e8c ("sunxi: clk: add basic clocks for A83T") Signed-off-by: Quentin Schulz <quentin.schulz(a)free-electrons.com> --- arch/arm/include/asm/arch-sunxi/clock_sun8i_a83t.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/include/asm/arch-sunxi/clock_sun8i_a83t.h b/arch/arm/include/asm/arch-sunxi/clock_sun8i_a83t.h index 5e1346e524..c4f5f5f958 100644 --- a/arch/arm/include/asm/arch-sunxi/clock_sun8i_a83t.h +++ b/arch/arm/include/asm/arch-sunxi/clock_sun8i_a83t.h @@ -158,7 +158,7 @@ struct sunxi_ccm_reg { #define CPU_CLK_SRC_OSC24M 0 #define CPU_CLK_SRC_PLL1 1 -#define CCM_PLL1_CTRL_N(n) ((((n) - 1) & 0xff) << 8) +#define CCM_PLL1_CTRL_N(n) (((n) & 0xff) << 8) #define CCM_PLL1_CTRL_P(n) (((n) & 0x1) << 16) #define CCM_PLL1_CTRL_EN (0x1 << 31) #define CMM_PLL1_CLOCK_TIME_2 (0x2 << 24) -- 2.11.0

3 2

[U-Boot] BUG: Environment is in SPI flash does not even compile (at least for Orange PI PC2
by kope＠madnet.sk 09 Oct '17

09 Oct '17

Hi, I'm trying to compile u-boot with Environment in SPI flash (CONFIG_ENV_IS_IN_SPI_FLASH?) for Orange PI PC2. Compilation ends with an error: CC env/sf.o env/sf.c: In function ‘env_sf_save’: env/sf.c:266:6: error: ‘CONFIG_ENV_SECT_SIZE’ undeclared (first use in this function); did you mean ‘CONFIG_ENV_SIZE’? After defining CONFIG_ENV_SECT_SIZE in include/configs/sunxi-common.h linking fails with error: LD u-boot env/built-in.o: In function `setup_flash_device': /root/uboot/u-boot/env/sf.c:71: undefined reference to `spi_flash_probe' env/built-in.o: In function `env_sf_load': /root/uboot/u-boot/env/sf.c:342: undefined reference to `spi_flash_free' Is there a way to have the environment in the SPI? Thanks. Regards, Peter Kosa

2 1

[U-Boot] [PATCH] dm: video: make ANSI escape sequence support optional
by Anatolij Gustschin 09 Oct '17

09 Oct '17

As mentioned in review comments for ANSI escape sequence support patches, this should be optional to reduce code size. Disable escape sequence support when CONFIG_VIDEO_ANSI is not enabled. Signed-off-by: Anatolij Gustschin <agust(a)denx.de> --- This patch is based on basic ANSI escape seq. support series: https://www.mail-archive.com/u-boot@lists.denx.de/msg263777.html drivers/video/vidconsole-uclass.c | 6 ++++++ include/video_console.h | 4 ++++ 2 files changed, 10 insertions(+) diff --git a/drivers/video/vidconsole-uclass.c b/drivers/video/vidconsole-uclass.c index 5f63c12d6c..f62e9f9308 100644 --- a/drivers/video/vidconsole-uclass.c +++ b/drivers/video/vidconsole-uclass.c @@ -108,6 +108,7 @@ static void vidconsole_newline(struct udevice *dev) video_sync(dev->parent); } +#if CONFIG_IS_ENABLED(VIDEO_ANSI) static const struct { unsigned r; unsigned g; @@ -299,22 +300,27 @@ error: /* something went wrong, just revert to normal mode: */ priv->escape = 0; } +#endif int vidconsole_put_char(struct udevice *dev, char ch) { struct vidconsole_priv *priv = dev_get_uclass_priv(dev); int ret; +#if CONFIG_IS_ENABLED(VIDEO_ANSI) if (priv->escape) { vidconsole_escape_char(dev, ch); return 0; } +#endif switch (ch) { +#if CONFIG_IS_ENABLED(VIDEO_ANSI) case '\x1b': priv->escape_len = 0; priv->escape = 1; break; +#endif case '\a': /* beep */ break; diff --git a/include/video_console.h b/include/video_console.h index 9dce234bd9..f07f43c1e2 100644 --- a/include/video_console.h +++ b/include/video_console.h @@ -7,6 +7,8 @@ #ifndef __video_console_h #define __video_console_h +#include <linux/kconfig.h> + #define VID_FRAC_DIV 256 #define VID_TO_PIXEL(x) ((x) / VID_FRAC_DIV) @@ -45,6 +47,7 @@ struct vidconsole_priv { int xsize_frac; int xstart_frac; int last_ch; +#if CONFIG_IS_ENABLED(VIDEO_ANSI) /* * ANSI escape sequences are accumulated character by character, * starting after the ESC char (0x1b) until the entire sequence @@ -53,6 +56,7 @@ struct vidconsole_priv { int escape; int escape_len; char escape_buf[32]; +#endif }; /** -- 2.11.0

3 5

[U-Boot] [PATCH] linux/bitfield.h: import <linux/bitfields.h> from Linux 4.13
by Masahiro Yamada 09 Oct '17

09 Oct '17

Copied from Linux 4.13. Commit log of 3e9b3112ec74 of Linux explains well why this header is useful. Signed-off-by: Masahiro Yamada <yamada.masahiro(a)socionext.com> --- In order to use this header, http://patchwork.ozlabs.org/patch/814471/ must be applied. <linux/bitfield.h> is highly dependent on <linux/build_bug.h> include/linux/bitfield.h | 106 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 106 insertions(+) create mode 100644 include/linux/bitfield.h diff --git a/include/linux/bitfield.h b/include/linux/bitfield.h new file mode 100644 index 0000000..8b9d6ff --- /dev/null +++ b/include/linux/bitfield.h @@ -0,0 +1,106 @@ +/* + * Copyright (C) 2014 Felix Fietkau <nbd(a)nbd.name> + * Copyright (C) 2004 - 2009 Ivo van Doorn <IvDoorn(a)gmail.com> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 + * as published by the Free Software Foundation + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#ifndef _LINUX_BITFIELD_H +#define _LINUX_BITFIELD_H + +#include <linux/bug.h> + +/* + * Bitfield access macros + * + * FIELD_{GET,PREP} macros take as first parameter shifted mask + * from which they extract the base mask and shift amount. + * Mask must be a compilation time constant. + * + * Example: + * + * #define REG_FIELD_A GENMASK(6, 0) + * #define REG_FIELD_B BIT(7) + * #define REG_FIELD_C GENMASK(15, 8) + * #define REG_FIELD_D GENMASK(31, 16) + * + * Get: + * a = FIELD_GET(REG_FIELD_A, reg); + * b = FIELD_GET(REG_FIELD_B, reg); + * + * Set: + * reg = FIELD_PREP(REG_FIELD_A, 1) | + * FIELD_PREP(REG_FIELD_B, 0) | + * FIELD_PREP(REG_FIELD_C, c) | + * FIELD_PREP(REG_FIELD_D, 0x40); + * + * Modify: + * reg &= ~REG_FIELD_C; + * reg |= FIELD_PREP(REG_FIELD_C, c); + */ + +#define __bf_shf(x) (__builtin_ffsll(x) - 1) + +#define __BF_FIELD_CHECK(_mask, _reg, _val, _pfx) \ + ({ \ + BUILD_BUG_ON_MSG(!__builtin_constant_p(_mask), \ + _pfx "mask is not constant"); \ + BUILD_BUG_ON_MSG(!(_mask), _pfx "mask is zero"); \ + BUILD_BUG_ON_MSG(__builtin_constant_p(_val) ? \ + ~((_mask) >> __bf_shf(_mask)) & (_val) : 0, \ + _pfx "value too large for the field"); \ + BUILD_BUG_ON_MSG((_mask) > (typeof(_reg))~0ull, \ + _pfx "type of reg too small for mask"); \ + __BUILD_BUG_ON_NOT_POWER_OF_2((_mask) + \ + (1ULL << __bf_shf(_mask))); \ + }) + +/** + * FIELD_FIT() - check if value fits in the field + * @_mask: shifted mask defining the field's length and position + * @_val: value to test against the field + * + * Return: true if @_val can fit inside @_mask, false if @_val is too big. + */ +#define FIELD_FIT(_mask, _val) \ + ({ \ + __BF_FIELD_CHECK(_mask, 0ULL, _val, "FIELD_FIT: "); \ + !((((typeof(_mask))_val) << __bf_shf(_mask)) & ~(_mask)); \ + }) + +/** + * FIELD_PREP() - prepare a bitfield element + * @_mask: shifted mask defining the field's length and position + * @_val: value to put in the field + * + * FIELD_PREP() masks and shifts up the value. The result should + * be combined with other fields of the bitfield using logical OR. + */ +#define FIELD_PREP(_mask, _val) \ + ({ \ + __BF_FIELD_CHECK(_mask, 0ULL, _val, "FIELD_PREP: "); \ + ((typeof(_mask))(_val) << __bf_shf(_mask)) & (_mask); \ + }) + +/** + * FIELD_GET() - extract a bitfield element + * @_mask: shifted mask defining the field's length and position + * @_reg: 32bit value of entire bitfield + * + * FIELD_GET() extracts the field specified by @_mask from the + * bitfield passed in as @_reg by masking and shifting it down. + */ +#define FIELD_GET(_mask, _reg) \ + ({ \ + __BF_FIELD_CHECK(_mask, _reg, 0U, "FIELD_GET: "); \ + (typeof(_mask))(((_reg) & (_mask)) >> __bf_shf(_mask)); \ + }) + +#endif -- 2.7.4

2 1

[U-Boot] [PATCH] xyz-modem: Fix timeout loop waiting with WATCHDOG
by Lokesh Vutla 09 Oct '17

09 Oct '17

Commit 2c77c0d6524eb ("xyz-modem: Change getc timeout loop waiting") fixes the loop delay when using a hw watchdog. But assuming that Watchdog kicking is taken care of by getc(). This is not true in case of DM_SERIAL. So, kick the watchdog before loop waiting, instead of relying on other functions. Signed-off-by: Lokesh Vutla <lokeshvutla(a)ti.com> --- - This fixes UART boot on AM335x-evm. common/xyzModem.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/common/xyzModem.c b/common/xyzModem.c index a0c5dfeece..8c4679473f 100644 --- a/common/xyzModem.c +++ b/common/xyzModem.c @@ -26,6 +26,7 @@ #include <xyzModem.h> #include <stdarg.h> #include <crc.h> +#include <watchdog.h> /* Assumption - run xyzModem protocol over the console port */ @@ -64,6 +65,7 @@ CYGACC_COMM_IF_GETC_TIMEOUT (char chan, char *c) { ulong now = get_timer(0); + WATCHDOG_RESET(); while (!tstc ()) { if (get_timer(now) > xyzModem_CHAR_TIMEOUT) -- 2.14.1

3 6

[U-Boot] [PATCH] usb: kbd: Don't fail with iomux
by Rob Clark 09 Oct '17

09 Oct '17

stdin might not be set, which would cause iomux_doenv() to fail therefore causing probe_usb_keyboard() to fail. Furthermore if we do have iomux enabled, the sensible thing (in terms of user experience) would be to simply add ourselves to the list of stdin devices. This fixes an issue with usbkbd on dragonboard410c with distro- bootcmd, where stdin is not set (so stdinname is null). Signed-off-by: Rob Clark <robdclark(a)gmail.com> --- Somehow this patch was dropped on the floor. I don't remember which version # this is up to, search the list if you care. But this is the latest. I only noticed it was missing because u-boot crashes when you boot with usb-keyboard plugged in (at least on db410c) without it. So someone please apply this patch before it gets lost again. common/usb_kbd.c | 46 +++++++++++++++++++++++++++++++--------------- include/console.h | 2 -- 2 files changed, 31 insertions(+), 17 deletions(-) diff --git a/common/usb_kbd.c b/common/usb_kbd.c index a323d72a36..4c3ad95fca 100644 --- a/common/usb_kbd.c +++ b/common/usb_kbd.c @@ -516,23 +516,39 @@ static int probe_usb_keyboard(struct usb_device *dev) return error; stdinname = env_get("stdin"); -#if CONFIG_IS_ENABLED(CONSOLE_MUX) - error = iomux_doenv(stdin, stdinname); - if (error) - return error; -#else - /* Check if this is the standard input device. */ - if (strcmp(stdinname, DEVNAME)) - return 1; + if (CONFIG_IS_ENABLED(CONSOLE_MUX)) { + char *devname = DEVNAME; + char *newstdin = NULL; + /* + * stdin might not be set yet.. either way, with console- + * mux the sensible thing to do is add ourselves to the + * list of stdio devices: + */ + if (stdinname && !strstr(stdinname, DEVNAME)) { + newstdin = malloc(strlen(stdinname) + + strlen(","DEVNAME) + 1); + sprintf(newstdin, "%s,"DEVNAME, stdinname); + stdinname = newstdin; + } else if (!stdinname) { + stdinname = devname; + } + error = iomux_doenv(stdin, stdinname); + free(newstdin); + if (error) + return error; + } else { + /* Check if this is the standard input device. */ + if (strcmp(stdinname, DEVNAME)) + return 1; - /* Reassign the console */ - if (overwrite_console()) - return 1; + /* Reassign the console */ + if (overwrite_console()) + return 1; - error = console_assign(stdin, DEVNAME); - if (error) - return error; -#endif + error = console_assign(stdin, DEVNAME); + if (error) + return error; + } return 0; } diff --git a/include/console.h b/include/console.h index cea29ed6dc..7dfd36d7d1 100644 --- a/include/console.h +++ b/include/console.h @@ -57,8 +57,6 @@ int console_announce_r(void); /* * CONSOLE multiplexing. */ -#ifdef CONFIG_CONSOLE_MUX #include <iomux.h> -#endif #endif -- 2.13.5

4 3

[U-Boot] [PATCH 00/10] efi_loader: event services & API test
by Heinrich Schuchardt 09 Oct '17

09 Oct '17

This patch series provides: * corrections for the EFI event services * a test framework to check the EFI API implementation * unit tests covering the event services The EFI selftest is written such that it could be easily turned into a standalone EFI application. But this would require modifying the build procedures for EFI. Objcopy cannot generate the necessary relocations. The unit tests are identified by entries in a linker generated array to make them as self sufficient as possible. A Python test case is supplied to call run the EFI tests. Tested with Travis CI https://travis-ci.org/xypron2/u-boot/jobs/275733784 Of all my efi_loader patches these are the first I would like to see merged. Simon has commented on some other patches that he misses comments for all EFI API functions. I will add these with a separate patch. Heinrich Schuchardt (10): efi_loader: allow return value in EFI_CALL efi_selftest: provide an EFI selftest application test/py: add a test calling the EFI selftest efi_loader: implement queueing of the notification function efi_loader: efi_set_timer: reset signaled state efi_selftest: provide unit test for event services efi_loader: implement task priority level (TPL) efi_selftest: test task priority levels efi_loader: notify when ExitBootServices is invoked efi_selftest: check notification of ExitBootServices MAINTAINERS | 5 +- cmd/Kconfig | 2 + cmd/bootefi.c | 25 ++- include/efi_loader.h | 30 +++- include/efi_selftest.h | 91 ++++++++++ lib/Makefile | 1 + lib/efi_loader/efi_boottime.c | 83 +++++++-- lib/efi_loader/efi_console.c | 4 +- lib/efi_selftest/Kconfig | 7 + lib/efi_selftest/Makefile | 26 +++ lib/efi_selftest/efi_selftest.c | 219 +++++++++++++++++++++++ lib/efi_selftest/efi_selftest_console.c | 187 +++++++++++++++++++ lib/efi_selftest/efi_selftest_events.c | 195 ++++++++++++++++++++ lib/efi_selftest/efi_selftest_exitbootservices.c | 106 +++++++++++ lib/efi_selftest/efi_selftest_tpl.c | 214 ++++++++++++++++++++++ test/py/tests/test_efi_selftest.py | 24 +++ 16 files changed, 1197 insertions(+), 22 deletions(-) create mode 100644 include/efi_selftest.h create mode 100644 lib/efi_selftest/Kconfig create mode 100644 lib/efi_selftest/Makefile create mode 100644 lib/efi_selftest/efi_selftest.c create mode 100644 lib/efi_selftest/efi_selftest_console.c create mode 100644 lib/efi_selftest/efi_selftest_events.c create mode 100644 lib/efi_selftest/efi_selftest_exitbootservices.c create mode 100644 lib/efi_selftest/efi_selftest_tpl.c create mode 100644 test/py/tests/test_efi_selftest.py -- 2.11.0

3 28

[U-Boot] [PATCH v2 0/6] Board for QEMU's '-machine virt' on ARM
by Tuomas Tynkkynen 07 Oct '17

07 Oct '17

These patches add a board for running U-Boot under QEMU's '-machine virt' emulation, thus making it possible to boot Linux distros that use the extlinux.conf booting method under '-machine virt'. To some extent, this is currently possible by emulating and running U-Boot on some of the Versatile boards, but (IIRC) they have some limitations like limiting to 1GB of RAM or lacking support for PCI. Changes in v2: - Introduce helper functions for implementing memory-mapped PCI config space accesses + refactor two existing drivers to use them. - Addresses Bin Meng's review comments (in patches 4 & 5) - Hook up test.py to run on Travis CI (patch 6). This requires https://github.com/swarren/uboot-test-hooks/pull/14 to go in first. Travis run with the uboot-test-hooks hacked to point to my local repository: https://travis-ci.org/dezgeg/u-boot/builds/276392558 Tuomas Tynkkynen (6): pci: Add helper for implementing memory-mapped config space accesses pci: xilinx: Use pci_generic_mmap_{read,write}_config() pci: layerscape: Use pci_generic_mmap_{read,write}_config PCI: Add driver for a 'pci-host-ecam-generic' host controller ARM: Add a new arch + board for QEMU's 'virt' machine travis.yml: Add job for running test.py in qemu_arm .travis.yml | 5 ++ arch/arm/Kconfig | 10 +++ arch/arm/mach-qemu/Kconfig | 12 +++ board/emulation/qemu-arm/MAINTAINERS | 6 ++ board/emulation/qemu-arm/Makefile | 5 ++ board/emulation/qemu-arm/qemu-arm.c | 33 ++++++++ configs/qemu_arm_defconfig | 28 +++++++ drivers/pci/Kconfig | 8 ++ drivers/pci/Makefile | 1 + drivers/pci/pci-uclass.c | 58 ++++++++++++++ drivers/pci/pcie_ecam_generic.c | 143 +++++++++++++++++++++++++++++++++++ drivers/pci/pcie_layerscape.c | 68 +++++------------ drivers/pci/pcie_xilinx.c | 53 ++----------- include/configs/qemu-arm.h | 58 ++++++++++++++ include/pci.h | 51 +++++++++++++ 15 files changed, 442 insertions(+), 97 deletions(-) create mode 100644 arch/arm/mach-qemu/Kconfig create mode 100644 board/emulation/qemu-arm/MAINTAINERS create mode 100644 board/emulation/qemu-arm/Makefile create mode 100644 board/emulation/qemu-arm/qemu-arm.c create mode 100644 configs/qemu_arm_defconfig create mode 100644 drivers/pci/pcie_ecam_generic.c create mode 100644 include/configs/qemu-arm.h -- 2.13.0

4 22

[U-Boot] [PATCH] fs/ext4/ext4fs.c: Free dirnode in error path of ext4fs_ls
by Tom Rini 07 Oct '17

07 Oct '17

As reported by Coverity, we did not free dirnode in the case of failure. Do so now. Reported-by: Coverity (CID: 131221) Cc: Stefan Brüns <stefan.bruens(a)rwth-aachen.de> Signed-off-by: Tom Rini <trini(a)konsulko.com> --- fs/ext4/ext4fs.c | 1 + 1 file changed, 1 insertion(+) diff --git a/fs/ext4/ext4fs.c b/fs/ext4/ext4fs.c index 081509dbb4db..b0c7303aa410 100644 --- a/fs/ext4/ext4fs.c +++ b/fs/ext4/ext4fs.c @@ -167,6 +167,7 @@ int ext4fs_ls(const char *dirname) FILETYPE_DIRECTORY); if (status != 1) { printf("** Can not find directory. **\n"); + ext4fs_free_node(dirnode, &ext4fs_root->diropen); return 1; } -- 1.9.1

1 1