October 2018 - U-Boot

[U-Boot] [PATCH] w1: fix build without CONFIG_W1_EEPROM
by Martin Fuzzey 24 Oct '18

24 Oct '18

Building with CONFIG_W1 and CONFIG_CMD_W1 but without CONFIG_W1_EEPROM fails with drivers/w1/w1-uclass.c:104: undefined reference to `w1_eeprom_register_new_device' cmd/w1.c:93: undefined reference to `w1_eeprom_read_buf' Fix this. Signed-off-by: Martin Fuzzey <martin.fuzzey(a)flowbird.group> --- cmd/w1.c | 9 ++++++++- drivers/w1/w1-uclass.c | 2 ++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/cmd/w1.c b/cmd/w1.c index 9c95fcf..9765bd6 100644 --- a/cmd/w1.c +++ b/cmd/w1.c @@ -41,6 +41,7 @@ static int w1_bus(void) return CMD_RET_SUCCESS; } +#ifdef CONFIG_W1_EEPROM static int w1_read(int argc, char *const argv[]) { int bus_n = 0, dev_n = 0, offset = 0, len = 512; @@ -102,6 +103,7 @@ static int w1_read(int argc, char *const argv[]) return CMD_RET_SUCCESS; } +#endif int do_w1(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[]) { @@ -111,8 +113,10 @@ int do_w1(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[]) if (!strcmp(argv[1], "bus")) return w1_bus(); +#ifdef CONFIG_W1_EEPROM if (!strcmp(argv[1], "read")) return w1_read(argc, argv); +#endif return CMD_RET_SUCCESS; } @@ -120,7 +124,10 @@ int do_w1(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[]) U_BOOT_CMD(w1, 6, 0, do_w1, "onewire interface utility commands", "bus - show onewire bus info (all)\n" +#ifdef CONFIG_W1_EEPROM "w1 read [<bus> [<dev> [offset [length]]]]" " - read from onewire device 'dev' on onewire bus 'bus'" " starting from offset 'offset' and length 'length'\n" - " defaults: bus 0, dev 0, offset 0, length 512 bytes."); + " defaults: bus 0, dev 0, offset 0, length 512 bytes." +#endif + ); diff --git a/drivers/w1/w1-uclass.c b/drivers/w1/w1-uclass.c index cb41b68..5544b19 100644 --- a/drivers/w1/w1-uclass.c +++ b/drivers/w1/w1-uclass.c @@ -100,8 +100,10 @@ static int w1_enumerate(struct udevice *bus) debug("%s: Detected new device 0x%llx (family 0x%x)\n", bus->name, rn, (u8)(rn & 0xff)); +#ifdef CONFIG_W1_EEPROM /* attempt to register as w1-eeprom device */ w1_eeprom_register_new_device(rn); +#endif } } -- 1.9.1

3 6

[U-Boot] [PATCH] power: regulator: Makefile: Remove SPL tag for REGULATOR_GPIO
by Lokesh Vutla 24 Oct '18

24 Oct '18

From: Keerthy <j-keerthy(a)ti.com> There is no SPL specific Kconfig symbol defined for DM_REGULATOR_GPIO but Makefile uses a SPL tag for building gpio-regulator. This makes gpio-regulator can never be built for SPL. Fix it by dropping the SPL tag in Makefile. CONFIG_SPL_POWER_SUPPORT is used for including regulator support in SPL. Signed-off-by: Keerthy <j-keerthy(a)ti.com> Signed-off-by: Lokesh Vutla <lokeshvutla(a)ti.com> --- drivers/power/regulator/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/power/regulator/Makefile b/drivers/power/regulator/Makefile index 16208af069..ba71504f8c 100644 --- a/drivers/power/regulator/Makefile +++ b/drivers/power/regulator/Makefile @@ -12,7 +12,7 @@ obj-$(CONFIG_DM_REGULATOR_MAX77686) += max77686.o obj-$(CONFIG_$(SPL_)DM_PMIC_PFUZE100) += pfuze100.o obj-$(CONFIG_REGULATOR_PWM) += pwm_regulator.o obj-$(CONFIG_$(SPL_)DM_REGULATOR_FIXED) += fixed.o -obj-$(CONFIG_$(SPL_)DM_REGULATOR_GPIO) += gpio-regulator.o +obj-$(CONFIG_DM_REGULATOR_GPIO) += gpio-regulator.o obj-$(CONFIG_REGULATOR_RK8XX) += rk8xx.o obj-$(CONFIG_DM_REGULATOR_S2MPS11) += s2mps11_regulator.o obj-$(CONFIG_REGULATOR_S5M8767) += s5m8767.o -- 2.19.1

1 1

[U-Boot] efi: utf8_utf16_strncpy?
by AKASHI Takahiro 24 Oct '18

24 Oct '18

Hi Heinrich, Why is the type of the first argument of utf8_utf16_str(n)cpy() "u16 **", not "u16 *"? (same issue against utf16_utf8_strncpy()) It's quit confusing, even causing an easy mistake since it differs from normal strcpy(). What is worse is that we may need additional variable, which is never used, to avoid unnecessary update of pointer. In all occurrences in current efi implementation, there is no user of an updated pointer. Thanks, -Takahiro Akashi

1 0

Re: [U-Boot] [PATCH 25/30] riscv: qemu: use device tree passed by prior boot stage
by Rick Chen 24 Oct '18

24 Oct '18

> > > > > > QEMU provides a device tree, which is passed to u-boot using register > > > > nits: U-Boot > > > > > a1. We are now able to directly select the device tree with the > > > configuration CONFIG_OF_PRIOR_STAGE. Replace the hard-coded address in > > > qemu-riscv with it. > > > > > > Signed-off-by: Lukas Auer <lukas.auer(a)aisec.fraunhofer.de> > > > --- > > > > > > board/emulation/qemu-riscv/qemu-riscv.c | 11 ----------- > > > configs/qemu-riscv32_defconfig | 2 +- > > > configs/qemu-riscv64_defconfig | 2 +- > > > 3 files changed, 2 insertions(+), 13 deletions(-) > > > > > > > Reviewed-by: Bin Meng <bmeng.cn(a)gmail.com> Reviewed-by: Rick Chen <rick(a)andestech.com>

1 0

[U-Boot] spl: fix the new position of gd and stack
by Peng Donglin 24 Oct '18

24 Oct '18

If we enable CONFIG_SPL_SYS_MALLOC_SIMPLE and set CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN, the new gd and stack will inside malloc area,so there is a overwrite risk. We can place the new position of gd and stack under the malloc area to fix this issue. Signed-off-by: Peng Donglin <dolinux.peng(a)gmail.com> --- common/spl/spl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/spl/spl.c b/common/spl/spl.c index 292e659c9a..e85a153869 100644 --- a/common/spl/spl.c +++ b/common/spl/spl.c @@ -628,7 +628,7 @@ ulong spl_relocate_stack_gd(void) } #endif /* Get stack position: use 8-byte alignment for ABI compliance */ - ptr = CONFIG_SPL_STACK_R_ADDR - roundup(sizeof(gd_t),16); + ptr -= roundup(sizeof(gd_t), 16); new_gd = (gd_t *)ptr; memcpy(new_gd, (void *)gd, sizeof(gd_t)); #if CONFIG_IS_ENABLED(DM) -- 2.17.1

1 0

Re: [U-Boot] [PATCH 24/30] riscv: save hart ID and device tree passed by prior boot stage
by Rick Chen 24 Oct '18

24 Oct '18

> > > > > > Store the hart ID and device tree passed by the prior boot stage (in > > > a0 and a1) in registers s0 and s1. Replace one use of s1 in start.S to > > > avoid overwriting it. > > > > > > The device tree is also stored in memory to make it available to > > > u-boot > > > > nits: U-Boot > > > > > with the configuration CONFIG_OF_PRIOR_STAGE. > > > > > > Signed-off-by: Lukas Auer <lukas.auer(a)aisec.fraunhofer.de> > > > --- > > > > > > arch/riscv/cpu/cpu.c | 6 ++++++ > > > arch/riscv/cpu/start.S | 12 ++++++++++-- > > > 2 files changed, 16 insertions(+), 2 deletions(-) > > > > > > > Reviewed-by: Bin Meng <bmeng.cn(a)gmail.com> Reviewed-by: Rick Chen <rick(a)andestech.com>

1 0

Re: [U-Boot] [PATCH 23/30] riscv: do not blindly modify the mstatus CSR
by Rick Chen 24 Oct '18

24 Oct '18

> > > > > > The mstatus CSR includes WPRI (writes preserve values, reads ignore > > > values) fields and must therefore not be set to zero without > > > preserving these fields. It is not apparent why mstatus is set to zero > > > here since it is not required for u-boot to run. Remove it. > > > > nits: U-Boot > > > > > > > > This instruction and others encode zero as an immediate. RISC-V has > > > the zero register for this purpose. Replace the immediates with the > > > zero register. > > > > > > Signed-off-by: Lukas Auer <lukas.auer(a)aisec.fraunhofer.de> > > > --- > > > > > > arch/riscv/cpu/start.S | 7 +++---- > > > 1 file changed, 3 insertions(+), 4 deletions(-) > > > > > > > Reviewed-by: Bin Meng <bmeng.cn(a)gmail.com> Reviewed-by: Rick Chen <rick(a)andestech.com>

1 0

[U-Boot] spl: fix the new position of gd and stack
by Donglin Peng 24 Oct '18

24 Oct '18

If we enable CONFIG_SPL_SYS_MALLOC_SIMPLE and set CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN, the new gd and stack will inside malloc area,so there is a overwrite risk. We can place the new position of gd and stack under the malloc area to fix this issue. Signed-off-by: Peng Donglin <dolinux.peng(a)gmail.com> --- common/spl/spl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/spl/spl.c b/common/spl/spl.c index 292e659c9a..e85a153869 100644 --- a/common/spl/spl.c +++ b/common/spl/spl.c @@ -628,7 +628,7 @@ ulong spl_relocate_stack_gd(void) } #endif /* Get stack position: use 8-byte alignment for ABI compliance */ - ptr = CONFIG_SPL_STACK_R_ADDR - roundup(sizeof(gd_t),16); + ptr -= roundup(sizeof(gd_t), 16); new_gd = (gd_t *)ptr; memcpy(new_gd, (void *)gd, sizeof(gd_t)); #if CONFIG_IS_ENABLED(DM) -- 2.17.1

1 0

[U-Boot] Regression: vf610twr build error
by Stefano Babic 24 Oct '18

24 Oct '18

Hi Alison, I get a build error when I try to build the vf610 boards. This is not due to recent patches for the board, but it is implicitly done on the current tree after other branches were merged, because the resulting binary becomes bigger. In fact, it exceeds the maximum size: arm: + vf610twr_nand +u-boot-nodtb.bin exceeds file size limit: + limit: 520192 bytes + actual: 521316 bytes + excess: 1124 bytes +make[1]: *** [u-boot-nodtb.bin] Error 1 +make: *** [sub-make] Error 2 arm: + vf610twr +u-boot-nodtb.bin exceeds file size limit: + limit: 520192 bytes + actual: 521492 bytes + excess: 1300 bytes +make[1]: *** [u-boot-nodtb.bin] Error 1 +make: *** [sub-make] Error 2 Anyway, colibry_vf has already set CONFIG_SYS_THUMB_BUILD to optimize the footprint. I can confirm that setting this to vf610twr fixes the build - anyway, I have no way to test. Can you take a look ? If it is ok, CONFIG_SYS_THUMB_BUILD should be added to both vf610twr_defconfig and vf610twr_nand_defconfig. Best regards, Stefano -- ===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic(a)denx.de =====================================================================

2 1

[U-Boot] MT76XX-driver
by Frank Wunderlich 23 Oct '18

23 Oct '18

Hi, can you please rename the driver (and the commit-message) to mt7622 because this is a MIPS-driver and not compatible with e.g. mt7623 (arm). https://patchwork.ozlabs.org/patch/988140/ regards Frank

3 3