July 2020 - U-Boot

[PATCH 1/1] cmd: bdinfo: cleanup phys_addr_t output
by Heinrich Schuchardt 05 Aug '20

05 Aug '20

We currently print the memory size with at least 8 hexadecimal digits. This creates a ragged output on 64 bit boards, e.g. on a Kendryte K210: DRAM bank = 0x0000000000000002 -> start = 0x0000000080600000 -> size = 0x0000000000200000 memstart = 0x0000000000000000 memsize = 0x00000000 flashstart = 0x0000000000000000 flashsize = 0x0000000000000000 flashoffset = 0x0000000000000000 All other numbers are printed with the number of digits needed for the type ulong. So use this value as minimum number of digits (precision) for printing physical addresses. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- cmd/bdinfo.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/cmd/bdinfo.c b/cmd/bdinfo.c index 8b2c105e77..519f5de146 100644 --- a/cmd/bdinfo.c +++ b/cmd/bdinfo.c @@ -33,9 +33,10 @@ static void print_eth(int idx) printf("%-12s= %s\n", name, val); } -static void print_lnum(const char *name, unsigned long long value) +static void print_phys_addr(const char *name, phys_addr_t value) { - printf("%-12s= 0x%.8llX\n", name, value); + printf("%-12s= 0x%.*llx\n", name, 2 * (int)sizeof(ulong), + (unsigned long long)value); } void bdinfo_print_mhz(const char *name, unsigned long hz) @@ -74,7 +75,7 @@ int do_bdinfo(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) bdinfo_print_num("boot_params", (ulong)bd->bi_boot_params); print_bi_dram(bd); bdinfo_print_num("memstart", (ulong)bd->bi_memstart); - print_lnum("memsize", (u64)bd->bi_memsize); + print_phys_addr("memsize", bd->bi_memsize); bdinfo_print_num("flashstart", (ulong)bd->bi_flashstart); bdinfo_print_num("flashsize", (ulong)bd->bi_flashsize); bdinfo_print_num("flashoffset", (ulong)bd->bi_flashoffset); -- 2.27.0

5 4

[PATCH] cmd: bootz: fix device-tree overlap test
by Baruch Siach 05 Aug '20

05 Aug '20

The address of the kernel image is stored in images->ep. zi_start is the offset of execution entry in the image, which is usually 0 for ARM zImage. Fixes boot error when ftd is stored near RAM address 0x0: ERROR: FDT image overlaps OS image (OS=0x0..0x5fd608) Fixes: fbde7589ce30 ("common: bootm: add checks to verify if ramdisk / fdtimage overlaps OS image") Cc: Tero Kristo <t-kristo(a)ti.com> Signed-off-by: Baruch Siach <baruch(a)tkos.co.il> --- cmd/bootz.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/bootz.c b/cmd/bootz.c index 1c8b0cf89f92..7556cd2752a8 100644 --- a/cmd/bootz.c +++ b/cmd/bootz.c @@ -54,7 +54,7 @@ static int bootz_start(struct cmd_tbl *cmdtp, int flag, int argc, * Handle the BOOTM_STATE_FINDOTHER state ourselves as we do not * have a header that provide this informaiton. */ - if (bootm_find_images(flag, argc, argv, zi_start, zi_end - zi_start)) + if (bootm_find_images(flag, argc, argv, images->ep, zi_end - zi_start)) return 1; return 0; -- 2.27.0

2 1

[PATCH v2] fit_image: Use calloc() to fix reproducibility issue
by Fabio Estevam 05 Aug '20

05 Aug '20

Vagrant Cascadian reported that mx6cuboxi target no longer builds reproducibility on Debian. One example of builds mismatches: 00096680: 696e 6700 736f 756e 642d 6461 6900 6465 ing.sound-dai.de -00096690: 7465 6374 2d67 7069 6f73 0000 tect-gpios.. +00096690: 7465 6374 2d67 7069 6f73 0061 tect-gpios.a This problem happens because all the buffers in fit_image.c are allocated via malloc(), which does not zero out the allocated buffer. Using calloc() fixes this unpredictable behaviour as it guarantees that the allocated buffer are zero initialized. Reported-by: Vagrant Cascadian <vagrant(a)reproducible-builds.org> Suggested-by: Tom Rini <trini(a)konsulko.com> Signed-off-by: Fabio Estevam <festevam(a)gmail.com> --- Changes since v1: - Improve the commit log description by stating why calloc() helps. tools/fit_image.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/fit_image.c b/tools/fit_image.c index a082d9386d..0c6185d892 100644 --- a/tools/fit_image.c +++ b/tools/fit_image.c @@ -388,7 +388,7 @@ static int fit_build(struct image_tool_params *params, const char *fname) size = fit_calc_size(params); if (size < 0) return -1; - buf = malloc(size); + buf = calloc(1, size); if (!buf) { fprintf(stderr, "%s: Out of memory (%d bytes)\n", params->cmdname, size); @@ -467,7 +467,7 @@ static int fit_extract_data(struct image_tool_params *params, const char *fname) * Allocate space to hold the image data we will extract, * extral space allocate for image alignment to prevent overflow. */ - buf = malloc(fit_size + (align_size * image_number)); + buf = calloc(1, fit_size + (align_size * image_number)); if (!buf) { ret = -ENOMEM; goto err_munmap; @@ -572,7 +572,7 @@ static int fit_import_data(struct image_tool_params *params, const char *fname) /* Allocate space to hold the new FIT */ size = sbuf.st_size + 16384; - fdt = malloc(size); + fdt = calloc(1, size); if (!fdt) { fprintf(stderr, "%s: Failed to allocate memory (%d bytes)\n", __func__, size); @@ -673,7 +673,7 @@ static int copyfile(const char *src, const char *dst) goto out; } - buf = malloc(512); + buf = calloc(1, 512); if (!buf) { printf("Can't allocate buffer to copy file\n"); goto out; -- 2.17.1

3 2

[PATCH v2 0/1] Fix SPL_EARLY_BSS applying to normal build
by Brian Moyer 05 Aug '20

05 Aug '20

SPL_CLEAR_BSS is called regardless of build type if CONFIG_SPL_EARLY_BSS is defined. This seems to break u-boot proper and doesn't seem like the correct behavior. Early bss clearing in u-boot proper happens before relocation and causes lots of problems because .rel.dyn and .bss overlap. Changes in v2: - Adding a check to the first SPL_CLEAR_BSS resulted in BSS never getting cleared for u-boot proper. Added an or condition to the second call. - SPL_CLEAR_BSS is the only bss clearing operation. Renamed to just CLEAR_BSS for clarity. Brian Moyer (1): arm: Add SPL build check to SPL early bss clear arch/arm/lib/crt0.S | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) -- 2.17.1

2 2

[PATCH 1/1] doc: move Clang documentation to HTML
by Heinrich Schuchardt 05 Aug '20

05 Aug '20

* Move README.clang to doc/build/clang.rst and reformat as reStructeredText. * Indicate that -ffixed-r9 and -ffixed-x18 are used to reserve registers for gd. * Minor editing. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- doc/README.clang | 55 -------------------------------- doc/build/clang.rst | 76 +++++++++++++++++++++++++++++++++++++++++++++ doc/build/index.rst | 1 + 3 files changed, 77 insertions(+), 55 deletions(-) delete mode 100644 doc/README.clang create mode 100644 doc/build/clang.rst diff --git a/doc/README.clang b/doc/README.clang deleted file mode 100644 index 475bb1e2ed..0000000000 --- a/doc/README.clang +++ /dev/null @@ -1,55 +0,0 @@ -The biggest problem when trying to compile U-Boot with clang is that -almost all archs rely on storing gd in a global register and clang user -manual states: "clang does not support global register variables; this -is unlikely to be implemented soon because it requires additional LLVM -backend support." - -Since version 3.4 the ARM backend can be instructed to leave r9 alone. -Global registers themselves are not supported so some inline assembly is -used to get its value. This does lead to larger code then strictly -necessary, but at least works. - -NOTE: target compilation only work for _some_ ARM boards at the moment. -Also AArch64 is not supported currently due to a lack of private libgcc -support. Boards which reassign gd in c will also fail to compile, but there is -in no strict reason to do so in the ARM world, since crt0.S takes care of this. -These assignments can be avoided by changing the init calls but this is not in -mainline yet. - -Debian (based) --------------- -Binary packages can be installed as usual, e.g.: -sudo apt-get install clang - -Note that we still use binutils for some tools so we must continue to set -CROSS_COMPILE. To compile U-Boot with clang on linux without IAS use e.g.: -make HOSTCC=clang rpi_2_defconfig -make HOSTCC=clang CROSS_COMPILE=arm-linux-gnueabi- \ - CC="clang -target arm-linux-gnueabi" -j8 - -It can also be used to compile sandbox: -make HOSTCC=clang sandbox_defconfig -make HOSTCC=clang CC=clang -j8 - -FreeBSD 11 (Current): --------------------- -Since llvm 3.4 is currently in the base system, the integrated as is -incapable of building U-Boot. Therefore gas from devel/arm-gnueabi-binutils -is used instead. It needs a symlinks to be picked up correctly though: - -ln -s /usr/local/bin/arm-gnueabi-freebsd-as /usr/bin/arm-freebsd-eabi-as - -# The following commands compile U-Boot using the clang xdev toolchain. -# NOTE: CROSS_COMPILE and target differ on purpose! -export CROSS_COMPILE=arm-gnueabi-freebsd- -gmake rpi_2_defconfig -gmake CC="clang -target arm-freebsd-eabi --sysroot /usr/arm-freebsd" -j8 - -Given that U-Boot will default to gcc, above commands can be -simplified with a simple wrapper script, listed below. - -/usr/local/bin/arm-gnueabi-freebsd-gcc ---- -#!/bin/sh - -exec clang -target arm-freebsd-eabi --sysroot /usr/arm-freebsd "$@" diff --git a/doc/build/clang.rst b/doc/build/clang.rst new file mode 100644 index 0000000000..1d35616eb5 --- /dev/null +++ b/doc/build/clang.rst @@ -0,0 +1,76 @@ +Building with Clang +=================== + +The biggest problem when trying to compile U-Boot with Clang is that almost all +archs rely on storing gd in a global register and the Clang 3.5 user manual +states: "Clang does not support global register variables; this is unlikely to +be implemented soon because it requires additional LLVM backend support." + +The ARM backend can be instructed not to use the r9 and x18 registers using +-ffixed-r9 or -ffixed-x18 respectively. As global registers themselves are not +supported inline assembly is needed to get and set the r9 or x18 value. This +leads to larger code then strictly necessary, but at least works. + +**NOTE:** target compilation only work for _some_ ARM boards at the moment. +Also AArch64 is not supported currently due to a lack of private libgcc +support. Boards which reassign gd in c will also fail to compile, but there is +in no strict reason to do so in the ARM world, since crt0.S takes care of this. +These assignments can be avoided by changing the init calls but this is not in +mainline yet. + + +Debian based +------------ + +Required packages can be installed via apt, e.g. + +.. code-block:: bash + + sudo apt-get install clang + +Note that we still use binutils for some tools so we must continue to set +CROSS_COMPILE. To compile U-Boot with Clang on Linux without IAS use e.g. + +.. code-block:: bash + + make HOSTCC=clang rpi_2_defconfig + make HOSTCC=clang CROSS_COMPILE=arm-linux-gnueabi- \ + CC="clang -target arm-linux-gnueabi" -j8 + +It can also be used to compile sandbox: + +.. code-block:: bash + + make HOSTCC=clang sandbox_defconfig + make HOSTCC=clang CC=clang -j8 + + +FreeBSD 11 +---------- + +Since llvm 3.4 is currently in the base system, the integrated assembler as +is incapable of building U-Boot. Therefore gas from devel/arm-gnueabi-binutils +is used instead. It needs a symlink to be picked up correctly though: + +.. code-block:: bash + + ln -s /usr/local/bin/arm-gnueabi-freebsd-as /usr/bin/arm-freebsd-eabi-as + +The following commands compile U-Boot using the Clang xdev toolchain. + +**NOTE:** CROSS_COMPILE and target differ on purpose! + +.. code-block:: bash + + export CROSS_COMPILE=arm-gnueabi-freebsd- + gmake rpi_2_defconfig + gmake CC="clang -target arm-freebsd-eabi --sysroot /usr/arm-freebsd" -j8 + +Given that U-Boot will default to gcc, above commands can be +simplified with a simple wrapper script - saved as +/usr/local/bin/arm-gnueabi-freebsd-gcc - listed below: + +.. code-block:: bash + + #!/bin/sh + exec clang -target arm-freebsd-eabi --sysroot /usr/arm-freebsd "$@" diff --git a/doc/build/index.rst b/doc/build/index.rst index e4e34114af..e0072afb5e 100644 --- a/doc/build/index.rst +++ b/doc/build/index.rst @@ -6,4 +6,5 @@ Build U-Boot .. toctree:: :maxdepth: 2 + clang tools -- 2.26.2

2 1

[PATCH] pinctrl: aspeed: Fix Kconfig entry indentation
by Michal Simek 05 Aug '20

05 Aug '20

Fix Kconfig entry indentation for Aspeed ast2500 pin control driver. Fixes: 4f0e44e46615 ("aspeed: AST2500 Pinctrl Driver") Signed-off-by: Michal Simek <michal.simek(a)xilinx.com> --- drivers/pinctrl/Kconfig | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/pinctrl/Kconfig b/drivers/pinctrl/Kconfig index 83e39b9de383..a11e3116ec80 100644 --- a/drivers/pinctrl/Kconfig +++ b/drivers/pinctrl/Kconfig @@ -276,13 +276,13 @@ config SPL_PINCTRL_STMFX See the help of PINCTRL_STMFX for details. config ASPEED_AST2500_PINCTRL - bool "Aspeed AST2500 pin control driver" - depends on DM && PINCTRL_GENERIC && ASPEED_AST2500 - default y - help - Support pin multiplexing control on Aspeed ast2500 SoC. The driver uses - Generic Pinctrl framework and is compatible with the Linux driver, - i.e. it uses the same device tree configuration. + bool "Aspeed AST2500 pin control driver" + depends on DM && PINCTRL_GENERIC && ASPEED_AST2500 + default y + help + Support pin multiplexing control on Aspeed ast2500 SoC. The driver + uses Generic Pinctrl framework and is compatible with the Linux + driver, i.e. it uses the same device tree configuration. endif -- 2.27.0

3 2

[PATCH] Makefile.lib: Build all DTS with -@ if OF_LIBFDT_OVERLAY is enabled
by Michal Simek 05 Aug '20

05 Aug '20

The commit 47818e23a228 ("Makefile.lib: include /__symbols__ in dtb if SPL_LOAD_FIT_APPLY_OVERLAY is enabled") enables DT building as overlays based on symbols which depends on SPL. But there is already an option to apply overlays in full U-Boot too. And there are platforms which are not using SPL and there is no option to build DTs with -@ parameter. That's why change dependency on OF_LIBFDT_OVERLAY which is already symbol which is selected when SPL_LOAD_FIT_APPLY_OVERLAY is enabled but also adding support for platforms which don't enable SPL and want to work with overlays on U-Boot prompt. Signed-off-by: Michal Simek <michal.simek(a)xilinx.com> --- scripts/Makefile.lib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib index 734001c952a1..56e9d5424296 100644 --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib @@ -311,7 +311,7 @@ cmd_dt_S_dtb= \ $(obj)/%.dtb.S: $(obj)/%.dtb $(call cmd,dt_S_dtb) -ifeq ($(CONFIG_SPL_LOAD_FIT_APPLY_OVERLAY),y) +ifeq ($(CONFIG_OF_LIBFDT_OVERLAY),y) DTC_FLAGS += -@ endif -- 2.27.0

4 3

[PATCH] dt-bindings: Sync include/dt-bindings/phy/phy.h from Linux
by Michal Simek 05 Aug '20

05 Aug '20

Add 4 new phy types which are present in Linux kernel. DP and SGMII types are used on Xilinx ZynqMP devices. Signed-off-by: Michal Simek <michal.simek(a)xilinx.com> --- SGMII is in queue in Linux next. --- include/dt-bindings/phy/phy.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/include/dt-bindings/phy/phy.h b/include/dt-bindings/phy/phy.h index 6c901930eb3e..7e657da45420 100644 --- a/include/dt-bindings/phy/phy.h +++ b/include/dt-bindings/phy/phy.h @@ -15,5 +15,9 @@ #define PHY_TYPE_PCIE 2 #define PHY_TYPE_USB2 3 #define PHY_TYPE_USB3 4 +#define PHY_TYPE_UFS 5 +#define PHY_TYPE_DP 6 +#define PHY_TYPE_XPCS 7 +#define PHY_TYPE_SGMII 8 #endif /* _DT_BINDINGS_PHY */ -- 2.27.0

2 1

[PATCH] fixdep: fix coding style in previous fix
by Stephen Warren 05 Aug '20

05 Aug '20

From: Stephen Warren <swarren(a)nvidia.com> Remove a double space introduced by my previous fixdep fix. Fixes: 76ae74d348a0 ("fixdep: fix CONFIG_IS_ENABLED etc. handling") Signed-off-by: Stephen Warren <swarren(a)nvidia.com> --- scripts/basic/fixdep.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/basic/fixdep.c b/scripts/basic/fixdep.c index 958668df5546..6d59cf8c07ee 100644 --- a/scripts/basic/fixdep.c +++ b/scripts/basic/fixdep.c @@ -266,7 +266,7 @@ static void parse_config_file(const char *p) (q - p == 9 && !memcmp(p, "IS_MODULE(", 10)) || (q - p == 3 && !memcmp(p, "VAL(", 4))) { p = q + 1; - q = p; + q = p; while (isalnum(*q) || *q == '_') q++; r = q; -- 2.27.0

2 1

[PATCH v1] test/py: Add test support for three stage boot
by yan-liu＠ti.com 05 Aug '20

05 Aug '20

From: Yan Liu <yan-liu(a)ti.com> Current pytest only support upto 2 stage boot; Some boards like TI K3 am6/J7 boards use 3 stage boot. This patch adds u_boot_spl2 to be able to handle the 3-stage boot case. User needs to set "env__spl2_skipped" in u_boot_boardenv config file to use this support. By default it is set to TRUE. Signed-off-by: Yan Liu <yan-liu(a)ti.com> --- test/py/u_boot_console_base.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/test/py/u_boot_console_base.py b/test/py/u_boot_console_base.py index 326b2ac..1db5da4 100644 --- a/test/py/u_boot_console_base.py +++ b/test/py/u_boot_console_base.py @@ -17,6 +17,7 @@ import u_boot_spawn # Regexes for text we expect U-Boot to send to the console. pattern_u_boot_spl_signon = re.compile('(U-Boot SPL \\d{4}\\.\\d{2}[^\r\n]*\\))') +pattern_u_boot_spl2_signon = re.compile('(U-Boot SPL \\d{4}\\.\\d{2}[^\r\n]*\\))') pattern_u_boot_main_signon = re.compile('(U-Boot \\d{4}\\.\\d{2}[^\r\n]*\\))') pattern_stop_autoboot_prompt = re.compile('Hit any key to stop autoboot: ') pattern_unknown_command = re.compile('Unknown command \'.*\' - try \'help\'') @@ -28,6 +29,7 @@ PAT_RE = 1 bad_pattern_defs = ( ('spl_signon', pattern_u_boot_spl_signon), + ('spl2_signon', pattern_u_boot_spl2_signon), ('main_signon', pattern_u_boot_main_signon), ('stop_autoboot_prompt', pattern_stop_autoboot_prompt), ('unknown_command', pattern_unknown_command), @@ -353,12 +355,20 @@ class ConsoleBase(object): 'n') == 'y' env_spl_skipped = self.config.env.get('env__spl_skipped', False) + env_spl2_skipped = self.config.env.get('env__spl2_skipped', + True) if config_spl and config_spl_serial_support and not env_spl_skipped: m = self.p.expect([pattern_u_boot_spl_signon] + self.bad_patterns) if m != 0: raise Exception('Bad pattern found on SPL console: ' + self.bad_pattern_ids[m - 1]) + if not env_spl2_skipped: + m = self.p.expect([pattern_u_boot_spl2_signon] + + self.bad_patterns) + if m != 0: + raise Exception('Bad pattern found on SPL2 console: ' + + self.bad_pattern_ids[m - 1]) m = self.p.expect([pattern_u_boot_main_signon] + self.bad_patterns) if m != 0: raise Exception('Bad pattern found on console: ' + -- 2.7.4

3 2