January 2020 - U-Boot

[U-Boot] [PATCH] qemu-riscv64_smode, sifive-fu540: fix extlinux (define preboot)
by David Abdurachmanov 04 Feb '20

04 Feb '20

Commit 37304aaf60bf92a5dc3ef222ba520698bd862a44 removed preboot commands in RISC-V targets and broke extlinux support as reported by Fu Wei <wefu(a)redhat.com>. The patch finishes migration of CONFIG_USE_PREBOOT and CONFIG_REBOOT to Kconfig. Signed-off-by: David Abdurachmanov <david.abdurachmanov(a)sifive.com> --- configs/qemu-riscv64_smode_defconfig | 2 ++ configs/sifive_fu540_defconfig | 2 ++ include/configs/sifive-fu540.h | 4 ---- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/qemu-riscv64_smode_defconfig b/configs/qemu-riscv64_smode_defconfig index 74743a5ebe..2e1f7fa91f 100644 --- a/configs/qemu-riscv64_smode_defconfig +++ b/configs/qemu-riscv64_smode_defconfig @@ -9,3 +9,5 @@ CONFIG_DISPLAY_CPUINFO=y CONFIG_DISPLAY_BOARDINFO=y # CONFIG_CMD_MII is not set CONFIG_OF_PRIOR_STAGE=y +CONFIG_USE_PREBOOT=y +CONFIG_PREBOOT="setenv fdt_addr ${fdtcontroladdr}; fdt addr ${fdtcontroladdr};" diff --git a/configs/sifive_fu540_defconfig b/configs/sifive_fu540_defconfig index 48865e5f11..a852579309 100644 --- a/configs/sifive_fu540_defconfig +++ b/configs/sifive_fu540_defconfig @@ -9,3 +9,5 @@ CONFIG_MISC_INIT_R=y CONFIG_DISPLAY_CPUINFO=y CONFIG_DISPLAY_BOARDINFO=y CONFIG_OF_PRIOR_STAGE=y +CONFIG_USE_PREBOOT=y +CONFIG_PREBOOT="setenv fdt_addr ${fdtcontroladdr}; fdt addr ${fdtcontroladdr};" diff --git a/include/configs/sifive-fu540.h b/include/configs/sifive-fu540.h index 858b7a7da1..ba4aa0652c 100644 --- a/include/configs/sifive-fu540.h +++ b/include/configs/sifive-fu540.h @@ -40,8 +40,4 @@ "ramdisk_addr_r=0x88300000\0" \ BOOTENV -#define CONFIG_PREBOOT \ - "setenv fdt_addr ${fdtcontroladdr};" \ - "fdt addr ${fdtcontroladdr};" - #endif /* __CONFIG_H */ -- 2.21.0

4 9

[PATCH] doc: fix opensbi build steps for AX25-AE350
by Jagan Teki 04 Feb '20

04 Feb '20

OpenSBI build steps are marked as normal text in AX25-AE350 documentation. Move them into code-block so-that it can show it as build steps. Cc: Heinrich Schuchardt <xypron.glpk(a)gmx.de> Signed-off-by: Jagan Teki <jagan(a)amarulasolutions.com> --- doc/board/AndesTech/ax25-ae350.rst | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/doc/board/AndesTech/ax25-ae350.rst b/doc/board/AndesTech/ax25-ae350.rst index 89c485f88f..f795476d85 100644 --- a/doc/board/AndesTech/ax25-ae350.rst +++ b/doc/board/AndesTech/ax25-ae350.rst @@ -337,9 +337,11 @@ How to build U-Boot SPL Before building U-Boot SPL, OpenSBI must be build first. OpenSBI can be cloned and build for AE350 as below: -git clone https://github.com/riscv/opensbi.git -cd opensbi -make PLATFORM=andes/ae350 +.. code-block:: none + + git clone https://github.com/riscv/opensbi.git + cd opensbi + make PLATFORM=andes/ae350 Copy OpenSBI FW_DYNAMIC image (build\platform\andes\ae350\firmware\fw_dynamic.bin) into U-Boot root directory -- 2.18.0.321.gffc6fa0e3

2 2

Re: [PATCH] riscv: Try to get cpu frequency from device tree
by Rick Chen 04 Feb '20

04 Feb '20

Hi Sean > From: U-Boot [mailto:u-boot-bounces@lists.denx.de] On Behalf Of Lukas Auer > Sent: Monday, January 27, 2020 6:26 AM > To: u-boot(a)lists.denx.de; seanga2(a)gmail.com > Subject: Re: [PATCH] riscv: Try to get cpu frequency from device tree > > On Sun, 2020-01-26 at 13:20 -0500, Sean Anderson wrote: > > On 1/26/20 11:34 AM, Lukas Auer wrote: > > > Hi Sean, > > > Usually, ret is used as a variable name here. I think it would > > > actually make the code a bit nicer to read here, because the clock > > > rate is not read from variable err. > > > > Hm, I chose err instead of ret since that variable is never the return > > value of the function. I can change that for v2 if you'd like. > > > > Makes sense. I think it's fine to keep it as is. But this patch seem depend on [PATCH v2 06/11] riscv: Fix incorrect cpu frequency on RV64. Can you combine those two patches as one patch-set and also modify err as ret BTW. Thanks Rick > > > > But that's just nit-picking. The patch looks good otherwise! > > > > > > Reviewed-by: Lukas Auer <lukas(a)auer.io>

3 3

[PATCH] cmd: Ensure sf operates on spi flash
by Sean Anderson 04 Feb '20

04 Feb '20

Currently, the sf command will probe anything attached to an spi bus, regardless of whether it is UCLASS_SPI_FLASH. This came up when testing the mmc_spi driver, which is accessed via spi but is UCLASS_MMC. If the uclass is not what sf expects, then the "flash" variable will not actually have type spi_nor. This patch adds a check so we don't clobber any data if the user requests us to probe a device which is not an spi flash. Signed-off-by Sean Anderson <seanga2(a)gmail.com> --- cmd/sf.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/cmd/sf.c b/cmd/sf.c index e993b3e5ad..21a410c40f 100644 --- a/cmd/sf.c +++ b/cmd/sf.c @@ -132,6 +132,10 @@ static int do_spi_flash_probe(int argc, char * const argv[]) printf("Failed to initialize SPI flash at %u:%u (error %d)\n", bus, cs, ret); return 1; + } else if (new->driver->id != UCLASS_SPI_FLASH) { + printf("SPI device is not SPI flash: uclass is %d, expected %d\n", + new->driver->id, UCLASS_SPU_FLASH); + return 1; } flash = dev_get_uclass_priv(new); -- 2.25.0

2 3

[PATCH v2] dm: uclass: don't assign aliased seq numbers
by Michael Walle 04 Feb '20

04 Feb '20

If there are aliases for an uclass, set the base for the "dynamically" allocated numbers next to the highest alias. Please note, that this might lead to holes in the sequences, depending on the device tree. For example if there is only an alias "ethernet1", the next device seq number would be 2. In particular this fixes a problem with boards which are using ethernet aliases but also might have network add-in cards like the E1000. If the board is started with the add-in card and depending on the order of the drivers, the E1000 might occupy the first ethernet device and mess up all the hardware addresses, because the devices are now shifted by one. Cc: Thomas Fitzsimmons <fitzsim(a)fitzsim.org> Cc: Michal Simek <michal.simek(a)xilinx.com> Signed-off-by: Michael Walle <michael(a)walle.cc> Reviewed-by: Alex Marginean <alexandru.marginean(a)nxp.com> Tested-by: Alex Marginean <alexandru.marginean(a)nxp.com> Acked-by: Vladimir Oltean <olteanv(a)gmail.com> --- As a side effect, this should also make the following commits superfluous: - 7f3289bf6d ("dm: device: Request next sequence number") - 61607225d1 ("i2c: Fill req_seq in i2c_post_bind()") Although I don't understand the root cause of the said problem. Thomas, Michal, could you please test this and then I'd add a second patch removing the old code. changes since v1: - move notice about superfluous commits from commit message to this section. - fix the comment style drivers/core/uclass.c | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/drivers/core/uclass.c b/drivers/core/uclass.c index c520ef113a..3c216221e0 100644 --- a/drivers/core/uclass.c +++ b/drivers/core/uclass.c @@ -675,13 +675,14 @@ int uclass_unbind_device(struct udevice *dev) int uclass_resolve_seq(struct udevice *dev) { + struct uclass *uc = dev->uclass; + struct uclass_driver *uc_drv = uc->uc_drv; struct udevice *dup; - int seq; + int seq = 0; int ret; assert(dev->seq == -1); - ret = uclass_find_device_by_seq(dev->uclass->uc_drv->id, dev->req_seq, - false, &dup); + ret = uclass_find_device_by_seq(uc_drv->id, dev->req_seq, false, &dup); if (!ret) { dm_warn("Device '%s': seq %d is in use by '%s'\n", dev->name, dev->req_seq, dup->name); @@ -693,9 +694,17 @@ int uclass_resolve_seq(struct udevice *dev) return ret; } - for (seq = 0; seq < DM_MAX_SEQ; seq++) { - ret = uclass_find_device_by_seq(dev->uclass->uc_drv->id, seq, - false, &dup); + if (CONFIG_IS_ENABLED(DM_SEQ_ALIAS) && + (uc_drv->flags & DM_UC_FLAG_SEQ_ALIAS)) { + /* + * dev_read_alias_highest_id() will return -1 if there no + * alias. Thus we can always add one. + */ + seq = dev_read_alias_highest_id(uc_drv->name) + 1; + } + + for (; seq < DM_MAX_SEQ; seq++) { + ret = uclass_find_device_by_seq(uc_drv->id, seq, false, &dup); if (ret == -ENODEV) break; if (ret) -- 2.20.1

3 4

[PATCH v5 00/10] Add support for loading main_r5fss0_core0
by Keerthy 04 Feb '20

04 Feb '20

This patch series enables mcu_r5fss0_core0 & main_r5fss0_core0. Tested for firmware loading and execution on J721e. Changes in v5: * Moved the fs_loader node under r5-common-proc-board-u-boot.dtsi * Added more information on the envnowhere patch. * Added help LIB_ELF option and removed user configurable description. Changes in v4: * Changed env variable names, config names and enhanced commit logs. Changes in v3: * Removed saving env in MMC and fixed env saving in SPL when nowhere option is set. Changes in v2: * Factored out all the generic elf handling functions under lib/elf.c Keerthy (10): env: nowhere: set default enviroment lib: elf: Move the generic elf loading/validating functions to lib arm: k3: Add support for loading non linux remote cores armv7R: K3: r5_mpu: Enable execute permission for MCU0 BTCM armv7R: K3: Add support for jumping to firmware arm: dts: k3-j721e-r5-u-boot: Add fs_loader node arm: dts: k3-j721e-r5: Enable r5fss0 cluster in SPL include: configs: j721e_evm: Add env variables for mcu_r5fss0_core0 & main_r5fss0_core0 configs: j721e_evm_r5: Enable R5F remoteproc support configs: j721e_evm_r5_defconfig: Remove saving ENV in eMMC .../k3-j721e-r5-common-proc-board-u-boot.dtsi | 27 ++ .../arm/dts/k3-j721e-r5-common-proc-board.dts | 2 + arch/arm/mach-k3/common.c | 106 +++++++- arch/arm/mach-k3/common.h | 2 + arch/arm/mach-k3/j721e_init.c | 34 +++ arch/arm/mach-k3/r5_mpu.c | 4 +- cmd/Kconfig | 1 + cmd/elf.c | 229 ---------------- configs/j721e_evm_r5_defconfig | 6 +- env/nowhere.c | 1 + include/configs/j721e_evm.h | 4 + include/elf.h | 4 + lib/Kconfig | 6 + lib/Makefile | 1 + lib/elf.c | 256 ++++++++++++++++++ 15 files changed, 438 insertions(+), 245 deletions(-) create mode 100644 arch/arm/dts/k3-j721e-r5-common-proc-board-u-boot.dtsi create mode 100644 lib/elf.c -- 2.17.1

3 18

[PATCH 1/3] watchdog: omap_wdt: Fix WDT timeout configuration
by Marek Vasut 04 Feb '20

04 Feb '20

The timeout parameter of omap3_wdt_start() is in miliseconds, while GET_WLDR_VAL() expects parameter in seconds. Fix this so the WDT driver is actually usable. Signed-off-by: Marek Vasut <marex(a)denx.de> Cc: Grygorii Strashko <grygorii.strashko(a)ti.com> Cc: Sam Protsenko <semen.protsenko(a)linaro.org> Cc: Suniel Mahesh <sunil.m(a)techveda.org> --- drivers/watchdog/omap_wdt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/watchdog/omap_wdt.c b/drivers/watchdog/omap_wdt.c index 284cfbb2a8..b9cdf70036 100644 --- a/drivers/watchdog/omap_wdt.c +++ b/drivers/watchdog/omap_wdt.c @@ -188,7 +188,7 @@ static int omap3_wdt_stop(struct udevice *dev) static int omap3_wdt_start(struct udevice *dev, u64 timeout_ms, ulong flags) { struct omap3_wdt_priv *priv = dev_get_priv(dev); - u32 pre_margin = GET_WLDR_VAL(timeout_ms); + u32 pre_margin = GET_WLDR_VAL(timeout_ms / 1000); /* * Make sure the watchdog is disabled. This is unfortunately required * because writing to various registers with the watchdog running has no -- 2.24.1

2 6

[PATCH 0/7] J721e: Add support for DFU boot mode
by Vignesh Raghavendra 04 Feb '20

04 Feb '20

This series adds support to boot via USB DFU mode. Vignesh Raghavendra (7): arm: mach-k3: j721e: Rename BOOT_DEVICE_USB to BOOT_DEVICE_DFU arm: mach-k3: sysfw-loader: Add support to download SYSFW via DFU arm: dts: k3-j721e-common-proc-board: Enable USB0 in peripheral mode configs: j721e_evm: Add DFU related variables configs: j721e_evm_r5_defconfig: Increase early malloc size configs: j721e_evm_r5/a72_defconfig: Enable USB Gadget related configs configs: j721e_evm_r5/a72_defconfig: Enable DFU related configs .../arm/dts/k3-j721e-r5-common-proc-board.dts | 18 +++++++++++ arch/arm/mach-k3/include/mach/j721e_spl.h | 2 +- arch/arm/mach-k3/sysfw-loader.c | 30 +++++++++++++++++++ configs/j721e_evm_a72_defconfig | 6 ++++ configs/j721e_evm_r5_defconfig | 17 ++++++++++- include/configs/j721e_evm.h | 4 +++ 6 files changed, 75 insertions(+), 2 deletions(-) -- 2.25.0

3 9

[PATCH 0/4] J721e: Add I2C nodes
by Vignesh Raghavendra 04 Feb '20

04 Feb '20

Add I2C and I2C IO expander nodes Vignesh Raghavendra (4): arm: dts: k3-j721e: Add I2C nodes arm: dts: k3-j721e-common-proc-board: Add I2C GPIO expander arm: dts: k3-j721e-common-proc-board: Enable I2C expander for SPL configs: j721e_evm_defconfig: Enable PCA953x IO expander .../k3-j721e-common-proc-board-u-boot.dtsi | 12 +++ arch/arm/dts/k3-j721e-common-proc-board.dts | 27 +++++++ arch/arm/dts/k3-j721e-main.dtsi | 77 +++++++++++++++++++ arch/arm/dts/k3-j721e-mcu-wakeup.dtsi | 22 ++++++ .../arm/dts/k3-j721e-r5-common-proc-board.dts | 27 +++++++ arch/arm/dts/k3-j721e.dtsi | 10 +++ configs/j721e_evm_a72_defconfig | 4 + configs/j721e_evm_r5_defconfig | 1 + 8 files changed, 180 insertions(+) -- 2.25.0

3 6

[PATCH] gpio: pca953x_gpio: Add support for 24 bit IO expander
by Vignesh Raghavendra 04 Feb '20

04 Feb '20

J721e EVM has a TCA6424 IO expander that has 24 GPIOs. Add support for the same Signed-off-by: Vignesh Raghavendra <vigneshr(a)ti.com> --- drivers/gpio/pca953x_gpio.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/drivers/gpio/pca953x_gpio.c b/drivers/gpio/pca953x_gpio.c index 07a3356b3c87..5c2944067bc1 100644 --- a/drivers/gpio/pca953x_gpio.c +++ b/drivers/gpio/pca953x_gpio.c @@ -15,8 +15,7 @@ * * TODO: * 1. Support PCA957X_TYPE - * 2. Support 24 gpio pins - * 3. Support Polarity Inversion + * 2. Support Polarity Inversion */ #include <common.h> @@ -118,6 +117,10 @@ static int pca953x_read_regs(struct udevice *dev, int reg, u8 *val) ret = dm_i2c_read(dev, reg, val, 1); } else if (info->gpio_count <= 16) { ret = dm_i2c_read(dev, reg << 1, val, info->bank_count); + } else if (info->gpio_count <= 24) { + /* Auto increment */ + ret = dm_i2c_read(dev, (reg << 2) | 0x80, val, + info->bank_count); } else if (info->gpio_count == 40) { /* Auto increment */ ret = dm_i2c_read(dev, (reg << 3) | 0x80, val, @@ -139,6 +142,10 @@ static int pca953x_write_regs(struct udevice *dev, int reg, u8 *val) ret = dm_i2c_write(dev, reg, val, 1); } else if (info->gpio_count <= 16) { ret = dm_i2c_write(dev, reg << 1, val, info->bank_count); + } else if (info->gpio_count <= 24) { + /* Auto increment */ + ret = dm_i2c_write(dev, (reg << 2) | 0x80, val, + info->bank_count); } else if (info->gpio_count == 40) { /* Auto increment */ ret = dm_i2c_write(dev, (reg << 3) | 0x80, val, info->bank_count); -- 2.25.0

2 1