June 2020 - U-Boot

Re: [PATCH 1/1] riscv: use log functions in fdt_fixup
by Rick Chen 30 Jun '20

30 Jun '20

Hi Heinrich > From: Heinrich Schuchardt [mailto:xypron.glpk@gmx.de] > Sent: Friday, June 26, 2020 12:35 PM > To: Rick Jian-Zhi Chen(陳建志) > Cc: Bin Meng; Atish Patra; Simon Glass; u-boot(a)lists.denx.de; Heinrich Schuchardt > Subject: [PATCH 1/1] riscv: use log functions in fdt_fixup > > Replace printf() and debug() by log_err() and log_debug(). > > "No reserved memory region found in source FDT\n" is not an error but a debug information. > > %s/can not/cannot/ - use the more common spelling. > > Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> > --- > arch/riscv/lib/fdt_fixup.c | 12 ++++++------ > 1 file changed, 6 insertions(+), 6 deletions(-) > Reviewed-by: Rick Chen <rick(a)andestech.com> This patch conflicts with Atish's [PATCH v3 0/2] Assorted fixes related to reserved memory Can you rebase it and send again ? Thanks, Rick > diff --git a/arch/riscv/lib/fdt_fixup.c b/arch/riscv/lib/fdt_fixup.c index 6db48ad04a..c1dc247cf7 100644 > --- a/arch/riscv/lib/fdt_fixup.c > +++ b/arch/riscv/lib/fdt_fixup.c > @@ -37,7 +37,7 @@ int riscv_fdt_copy_resv_mem_node(const void *src, void *dst) > > offset = fdt_path_offset(src, "/reserved-memory"); > if (offset < 0) { > - printf("No reserved memory region found in source FDT\n"); > + log_debug("No reserved memory region found in source FDT\n"); > return 0; > } > > @@ -48,7 +48,7 @@ int riscv_fdt_copy_resv_mem_node(const void *src, void *dst) > "reg", 0, &size, > false); > if (addr == FDT_ADDR_T_NONE) { > - debug("failed to read address/size for %s\n", name); > + log_debug("failed to read address/size for %s\n", name); > continue; > } > strncpy(basename, name, max_len); > @@ -63,7 +63,7 @@ int riscv_fdt_copy_resv_mem_node(const void *src, void *dst) > err = fdtdec_add_reserved_memory(dst, basename, &pmp_mem, > &phandle); > if (err < 0) { > - printf("failed to add reserved memory: %d\n", err); > + log_err("failed to add reserved memory: %d\n", err); > return err; > } > if (!fdt_getprop(src, node, "no-map", NULL)) @@ -109,7 +109,7 @@ int board_fix_fdt(void *fdt) > > err = riscv_board_reserved_mem_fixup(fdt); > if (err < 0) { > - printf("failed to fixup DT for reserved memory: %d\n", err); > + log_err("failed to fixup DT for reserved memory: %d\n", err); > return err; > } > > @@ -127,14 +127,14 @@ int arch_fixup_fdt(void *blob) > size = fdt_totalsize(blob); > err = fdt_open_into(blob, blob, size + 32); > if (err < 0) { > - printf("Device Tree can't be expanded to accommodate new node"); > + log_err("Device Tree can't be expanded to accommodate new node"); > return err; > } > chosen_offset = fdt_path_offset(blob, "/chosen"); > if (chosen_offset < 0) { > err = fdt_add_subnode(blob, 0, "chosen"); > if (err < 0) { > - printf("chosen node can not be added\n"); > + log_err("chosen node cannot be added\n"); > return err; > } > } > -- > 2.27.0

1 0

[PATCH] README: davinci: Clarify when SPL is used and the target devices.
by Adam Ford 30 Jun '20

30 Jun '20

The documentation states that SPL is enabled in all config options for the da850. This incorrect, because devices booting from NOR do not need the SPL to do the low level initializion because when booting from NOR, the board is able to execute in place (XIP) This also clarifies that SPL isn't only used for booting from SPI, because it is also used for booting from MMC and NAND for those devices supporting those boot options. Signed-off-by: Adam Ford <aford173(a)gmail.com> diff --git a/doc/README.davinci b/doc/README.davinci index 6522c24eea..607531af2a 100644 --- a/doc/README.davinci +++ b/doc/README.davinci @@ -37,11 +37,15 @@ Bootloaders =============== For DA850 an SPL (secondary program loader, see doc/README.SPL) is provided -to load U-Boot directly from SPI flash. The SPL takes care of the low level +to load U-Boot from SPI flash, MMC or NAND. The SPL takes care of the low level initialization. -The SPL is built as u-boot.ais for all DA850 defconfigs. The resulting -image file can be programmed to the SPI flash of the DA850 EVM/LCDK. +The SPL is built as u-boot.ais for all DA850 defconfigs except those booting +from NOR flash. The resulting image file can be programmed to the SPI flash +of the DA850 EVM/LCDK. + +Devices that support booting from NOR utilize execute in place (XIP) and do +not require SPL to perform low level initialization. Environment Variables ===================== -- 2.25.1

1 0

Please pull u-boot-video
by Anatolij Gustschin 29 Jun '20

29 Jun '20

Hi Tom, please pull one more bugfix for v2020.07. Thanks! The following changes since commit 19a7e5814b77b288472aa96b6d94fb2591cc9184: Merge tag 'fixes-for-v2020.07' of https://gitlab.denx.de/u-boot/custodians/u-boot-video (2020-06-28 10:12:25 -0400) are available in the Git repository at: https://gitlab.denx.de/u-boot/custodians/u-boot-video.git tags/rockchip-fix for you to fetch changes up to 35ee34b2c2adc961e1ae4e68c5b7e380d7c448a0: video: rockchip: fix HDMI 4K resolution (2020-06-29 17:53:16 +0200) ---------------------------------------------------------------- - fix "Synchronous Abort" when using rk3399 4K HDMI ---------------------------------------------------------------- Anatolij Gustschin (1): video: rockchip: fix HDMI 4K resolution drivers/video/rockchip/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

2 1

[PATCH] cmd: add a panic command
by Heiko Stuebner 29 Jun '20

29 Jun '20

From: Heiko Stuebner <heiko.stuebner(a)theobroma-systems.com> Even in boot scripts it may be needed to "panic" when all options are exhausted and the device specification specifies hanging instead of resetting the board. So add a new panic command that just wraps around the core panic call in uboot and can take an optional message. Signed-off-by: Heiko Stuebner <heiko.stuebner(a)theobroma-systems.com> --- cmd/Makefile | 1 + cmd/panic.c | 22 ++++++++++++++++++++++ 2 files changed, 23 insertions(+) create mode 100644 cmd/panic.c diff --git a/cmd/Makefile b/cmd/Makefile index ac843b4b16..027fa9083a 100644 --- a/cmd/Makefile +++ b/cmd/Makefile @@ -8,6 +8,7 @@ ifndef CONFIG_SPL_BUILD obj-y += boot.o obj-$(CONFIG_CMD_BOOTM) += bootm.o obj-y += help.o +obj-y += panic.o obj-y += version.o # command diff --git a/cmd/panic.c b/cmd/panic.c new file mode 100644 index 0000000000..696b4c73a3 --- /dev/null +++ b/cmd/panic.c @@ -0,0 +1,22 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (c) 2020 Theobroma Systems Design und Consulting GmbH + */ + +#include <common.h> +#include <command.h> + +static int do_panic(cmd_tbl_t *cmdtp, int flag, int argc, + char * const argv[]) +{ + char *text = (argc < 2) ? "" : argv[1]; + + panic(text); + return CMD_RET_SUCCESS; +} + +U_BOOT_CMD( + panic, 2, 1, do_panic, + "Panic with optional message", + "[message]" +); -- 2.26.2

2 1

[PATCH 1/1] gitlab: show skipped Python tests
by Heinrich Schuchardt 29 Jun '20

29 Jun '20

Call pytest3 with argument -ra to display reason why Python tests are skipped. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f2e491c117..f53098ea5f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -46,7 +46,7 @@ stages: # "${var:+"-k $var"}" expands to "" if $var is empty, "-k $var" if not - export PATH=/opt/qemu/bin:/tmp/uboot-test-hooks/bin:${PATH}; export PYTHONPATH=/tmp/uboot-test-hooks/py/travis-ci; - ./test/py/test.py --bd ${TEST_PY_BD} ${TEST_PY_ID} + ./test/py/test.py -ra --bd ${TEST_PY_BD} ${TEST_PY_ID} ${TEST_PY_TEST_SPEC:+"-k ${TEST_PY_TEST_SPEC}"} --build-dir "$UBOOT_TRAVIS_BUILD_DIR" -- 2.27.0

4 15

[PATCH 1/1] crypto/fsl: unused value in caam_hash_update()
by Heinrich Schuchardt 29 Jun '20

29 Jun '20

The value 0 assigned to final is overwritten before ever being used. Remove the assignment. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- drivers/crypto/fsl/fsl_hash.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/crypto/fsl/fsl_hash.c b/drivers/crypto/fsl/fsl_hash.c index 953deec9ff..61f953e8a6 100644 --- a/drivers/crypto/fsl/fsl_hash.c +++ b/drivers/crypto/fsl/fsl_hash.c @@ -86,7 +86,7 @@ static int caam_hash_update(void *hash_ctx, const void *buf, unsigned int size, int is_last, enum caam_hash_algos caam_algo) { - uint32_t final = 0; + uint32_t final; phys_addr_t addr = virt_to_phys((void *)buf); struct sha_ctx *ctx = hash_ctx; -- 2.20.1

2 1

[PATCH 1/1] fs: error handling in do_load()
by Heinrich Schuchardt 29 Jun '20

29 Jun '20

If a file cannot be loaded, show an error message. Set the EFI boot device only after successfully loading a file. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- fs/fs.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/fs/fs.c b/fs/fs.c index ad4caaeb1e..12fa5a6489 100644 --- a/fs/fs.c +++ b/fs/fs.c @@ -715,15 +715,18 @@ int do_load(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[], else pos = 0; -#ifdef CONFIG_CMD_BOOTEFI - efi_set_bootdev(argv[1], (argc > 2) ? argv[2] : "", - (argc > 4) ? argv[4] : ""); -#endif time = get_timer(0); ret = _fs_read(filename, addr, pos, bytes, 1, &len_read); time = get_timer(time); - if (ret < 0) + if (ret < 0) { + printf("Failed to load '%s'\n", filename); return 1; + } + +#ifdef CONFIG_CMD_BOOTEFI + efi_set_bootdev(argv[1], (argc > 2) ? argv[2] : "", + (argc > 4) ? argv[4] : ""); +#endif printf("%llu bytes read in %lu ms", len_read, time); if (time > 0) { -- 2.27.0

2 1

[PATCH] x86: Don't build some unused objects in TPL
by Tom Rini 29 Jun '20

29 Jun '20

In the future if we have separate symbols for DM_SPI_FLASH and SPL_DM_SPI_FLASH we will not always have function declarations available for some DM calls. This in turn leads to build warnings but not failures as the code isn't used and is discarded at link time. Restructure things to not build code we won't use for TPL anyways. Cc: Bin Meng <bmeng.cn(a)gmail.com> Signed-off-by: Tom Rini <trini(a)konsulko.com> --- I ran in to this as part of testing http://patchwork.ozlabs.org/project/uboot/patch/20200604151153.3980-4-Zhiqi… which we do need to bring in. I think we might be building a lot of codde that's then discarded for TPL builds, but didn't think this is the right place to tackle that in. --- arch/x86/cpu/apollolake/Makefile | 2 +- arch/x86/lib/Makefile | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/arch/x86/cpu/apollolake/Makefile b/arch/x86/cpu/apollolake/Makefile index 3aa2a556765a..11621256aebc 100644 --- a/arch/x86/cpu/apollolake/Makefile +++ b/arch/x86/cpu/apollolake/Makefile @@ -3,7 +3,6 @@ # Copyright 2019 Google LLC obj-$(CONFIG_SPL_BUILD) += cpu_spl.o -obj-$(CONFIG_SPL_BUILD) += spl.o obj-$(CONFIG_SPL_BUILD) += systemagent.o obj-y += cpu_common.o @@ -12,6 +11,7 @@ obj-y += cpu.o obj-y += punit.o obj-y += fsp_bindings.o ifdef CONFIG_SPL_BUILD +obj-y += spl.o obj-y += fsp_m.o endif endif diff --git a/arch/x86/lib/Makefile b/arch/x86/lib/Makefile index 5cd458748038..1079bf20226a 100644 --- a/arch/x86/lib/Makefile +++ b/arch/x86/lib/Makefile @@ -22,7 +22,6 @@ obj-y += init_helpers.o obj-y += interrupts.o obj-y += lpc-uclass.o obj-y += mpspec.o -obj-$(CONFIG_ENABLE_MRC_CACHE) += mrccache.o obj-y += northbridge-uclass.o obj-$(CONFIG_I8259_PIC) += i8259.o obj-$(CONFIG_I8254_TIMER) += i8254.o @@ -45,9 +44,12 @@ ifndef CONFIG_SPL_BUILD obj-$(CONFIG_CMD_ZBOOT) += zimage.o endif obj-$(CONFIG_USE_HOB) += hob.o +ifndef CONFIG_TPL_BUILD +obj-$(CONFIG_ENABLE_MRC_CACHE) += mrccache.o obj-$(CONFIG_HAVE_FSP) += fsp/ obj-$(CONFIG_FSP_VERSION1) += fsp1/ obj-$(CONFIG_FSP_VERSION2) += fsp2/ +endif ifdef CONFIG_SPL_BUILD ifdef CONFIG_TPL_BUILD -- 2.17.1

3 2

[PATCH] video: rockchip: fix HDMI 4K resolution
by Anatolij Gustschin 29 Jun '20

29 Jun '20

3480 is not valid XRES, use 3840 as default. Fixes: 05c65a82c3c1 ("video: rockchip: Support 4K resolution for rk3399, HDMI") Signed-off-by: Anatolij Gustschin <agust(a)denx.de> Cc: Jagan Teki <jagan(a)amarulasolutions.com> --- drivers/video/rockchip/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/video/rockchip/Kconfig b/drivers/video/rockchip/Kconfig index cfd774ead6..5215a71f99 100644 --- a/drivers/video/rockchip/Kconfig +++ b/drivers/video/rockchip/Kconfig @@ -22,7 +22,7 @@ menuconfig VIDEO_ROCKCHIP config VIDEO_ROCKCHIP_MAX_XRES int "Maximum horizontal resolution (for memory allocation purposes)" depends on VIDEO_ROCKCHIP - default 3480 if ROCKCHIP_RK3399 && DISPLAY_ROCKCHIP_HDMI + default 3840 if ROCKCHIP_RK3399 && DISPLAY_ROCKCHIP_HDMI default 1920 help The maximum horizontal resolution to support for the framebuffer. -- 2.17.1

2 2

[PATCH 1/1] power: pmic_pca9450: fix PCA9450A I2C address
by Sébastien Szymanski 29 Jun '20

29 Jun '20

PCA9450A I2C address is 0x25. Fix it. Signed-off-by: Sébastien Szymanski <sebastien.szymanski(a)armadeus.com> --- drivers/power/pmic/pmic_pca9450.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/power/pmic/pmic_pca9450.c b/drivers/power/pmic/pmic_pca9450.c index 67a9090200..c0fb78c4cd 100644 --- a/drivers/power/pmic/pmic_pca9450.c +++ b/drivers/power/pmic/pmic_pca9450.c @@ -23,7 +23,7 @@ int power_pca9450a_init(unsigned char bus) p->name = pca9450_name; p->interface = PMIC_I2C; p->number_of_regs = PCA9450_REG_NUM; - p->hw.i2c.addr = 0x35; + p->hw.i2c.addr = 0x25; p->hw.i2c.tx_num = 1; p->bus = bus; -- 2.26.2

2 3