February 2020 - U-Boot

[PATCH] video: add opt out option for VIDEO_BBP selection
by Anatolij Gustschin 04 Feb '20

04 Feb '20

Enable all BPP options by default to avoid empty video console output (this was the case before commit 2cc393f32fd9 ("video: make BPP and ANSI configs optional")). But also support optional selection of only required VIDEO_BBP settings. Signed-off-by: Anatolij Gustschin <agust(a)denx.de> --- drivers/video/Kconfig | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig index 50ab3650ee..62217fda08 100644 --- a/drivers/video/Kconfig +++ b/drivers/video/Kconfig @@ -35,9 +35,21 @@ config BACKLIGHT_GPIO it understands the standard device tree (leds/backlight/gpio-backlight.txt) +config VIDEO_BPP_OPT_OUT + bool "Support manual selection of video console BPP" + depends on DM_VIDEO + help + Enabling this option allows manual selection of the required + VIDEO_BPPxx configuration. By default all BPP options are + enabled to avoid empty console output. Some boards do not use + all BPP options and want to avoid dead code to reduce binary + image size. Let them opt out and select the needed BPP in the + board defconfig file. + config VIDEO_BPP8 bool "Support 8-bit-per-pixel displays" depends on DM_VIDEO + default y if DM_VIDEO && !VIDEO_BPP_OPT_OUT help Support drawing text and bitmaps onto a 8-bit-per-pixel display. Enabling this will include code to support this display. Without @@ -47,6 +59,7 @@ config VIDEO_BPP8 config VIDEO_BPP16 bool "Support 16-bit-per-pixel displays" depends on DM_VIDEO + default y if DM_VIDEO && !VIDEO_BPP_OPT_OUT help Support drawing text and bitmaps onto a 16-bit-per-pixel display. Enabling this will include code to support this display. Without @@ -56,7 +69,7 @@ config VIDEO_BPP16 config VIDEO_BPP32 bool "Support 32-bit-per-pixel displays" depends on DM_VIDEO - default y if X86 + default y if DM_VIDEO && !VIDEO_BPP_OPT_OUT help Support drawing text and bitmaps onto a 32-bit-per-pixel display. Enabling this will include code to support this display. Without -- 2.17.1

2 3

[PATCH 1/2] rk3399: Add boot flash script offet, size
by Jagan Teki 04 Feb '20

04 Feb '20

Most of the SPI flash devices in rockchip (rk3399) are 16MiB size. So, let's use the script offset at the end of 8K. This way it cannot overlap any offsets being used by software components in flash layout. Signed-off-by: Jagan Teki <jagan(a)amarulasolutions.com> Reviewed-by: Kever Yang <kever.yang(a)rock-chips.com> --- include/configs/rk3399_common.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/configs/rk3399_common.h b/include/configs/rk3399_common.h index 89a8a44bbe..01a9174bd2 100644 --- a/include/configs/rk3399_common.h +++ b/include/configs/rk3399_common.h @@ -48,6 +48,8 @@ #define ENV_MEM_LAYOUT_SETTINGS \ "scriptaddr=0x00500000\0" \ + "script_offset_f=0xffe000\0" \ + "script_size_f=0x2000\0" \ "pxefile_addr_r=0x00600000\0" \ "fdt_addr_r=0x01f00000\0" \ "kernel_addr_r=0x02080000\0" \ -- 2.17.1

2 2

[GIT PULL] TI changes for v2020.04-rc2
by Lokesh Vutla 04 Feb '20

04 Feb '20

Hi Tom, Please find the pull request for v2020.04-rc2 containing TI specific changes. This PR is a re spin of previous PR[0] without mmc changes and fetched few dt changes and watchdog fixes. [0] https://patchwork.ozlabs.org/patch/1230709/ Travis-CI build: https://travis-ci.org/lokeshvutla/u-boot/builds/645566110 Thanks and regards, Lokesh The following changes since commit 31a790bee939e227dfc7e6a6a323b2b13180707f: Merge branch 'master' of git://git.denx.de/u-boot-usb (2020-02-02 15:26:53 -0500) are available in the Git repository at: https://gitlab.denx.de/u-boot/custodians/u-boot-ti.git tags/ti-v2020.04-rc2 for you to fetch changes up to 4dd05933989f01bb38813f4a5f043b7dfa24e218: watchdog: omap_wdt: Fix WDT coding style (2020-02-04 09:07:25 +0530) ---------------------------------------------------------------- Below are the major changes in this PR: - DFU boot support for J721e - I2C support for J721e - GPIO support for J721e - Android boot image updates on AM57XX - OMAP watchdog fixes ---------------------------------------------------------------- Faiz Abbas (3): configs: j721e_evm_a72: Fix redundant environment offset arm: dts: k3-j721e-main: Add Support for gpio0 configs: j721e_evm_a72: Add GPIO support Marek Vasut (3): watchdog: omap_wdt: Fix WDT timeout configuration watchdog: omap_wdt: Fix WDT reloading watchdog: omap_wdt: Fix WDT coding style Sam Protsenko (10): image: android: Add functions for handling dtb field image: android: Add routine to get dtbo params cmd: abootimg: Add abootimg command doc: android: Add documentation for Android Boot Image doc: android: Convert to Sphinx format test/py: android: Add test for abootimg configs: am57xx_evm: Enable Android commands env: ti: boot: Respect slot_suffix in AVB commands env: ti: boot: Boot Android with dynamic partitions arm: ti: boot: Use correct dtb and dtbo on Android boot Vignesh Raghavendra (14): 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 gpio: pca953x_gpio: Add support for 24 bit IO expander 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 gpio: da8xx_gpio: Fix compiler warning gpio: da8xx_gpio: Add "ti,keystone-gpio" compatible MAINTAINERS | 4 +- .../arm/dts/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 | 99 ++++++++ arch/arm/dts/k3-j721e-mcu-wakeup.dtsi | 22 ++ arch/arm/dts/k3-j721e-r5-common-proc-board.dts | 45 ++++ arch/arm/dts/k3-j721e.dtsi | 10 + arch/arm/mach-k3/include/mach/j721e_spl.h | 2 +- arch/arm/mach-k3/sysfw-loader.c | 30 +++ cmd/Kconfig | 12 +- cmd/Makefile | 1 + cmd/abootimg.c | 258 +++++++++++++++++++ common/Makefile | 2 +- common/image-android.c | 282 +++++++++++++++++++++ configs/am57xx_evm_defconfig | 6 + configs/am57xx_hs_evm_defconfig | 6 + configs/am57xx_hs_evm_usb_defconfig | 6 + configs/j721e_evm_a72_defconfig | 13 +- configs/j721e_evm_r5_defconfig | 18 +- configs/sandbox_defconfig | 1 + doc/android/{ab.txt => ab.rst} | 39 +-- doc/android/avb2.rst | 133 ++++++++++ doc/android/avb2.txt | 115 --------- doc/android/bcb.rst | 100 ++++++++ doc/android/bcb.txt | 89 ------- doc/android/boot-image.rst | 154 +++++++++++ ...fastboot-protocol.txt => fastboot-protocol.rst} | 45 ++-- doc/android/{fastboot.txt => fastboot.rst} | 92 +++---- doc/android/index.rst | 14 + doc/index.rst | 12 + drivers/gpio/da8xx_gpio.c | 3 +- drivers/gpio/pca953x_gpio.c | 11 +- drivers/watchdog/omap_wdt.c | 56 ++-- include/configs/j721e_evm.h | 4 + include/configs/ti_armv7_common.h | 7 + include/environment/ti/boot.h | 154 ++++++----- include/image.h | 6 + test/py/tests/test_android/test_abootimg.py | 159 ++++++++++++ test/py/tests/test_android/test_avb.py | 2 +- 39 files changed, 1658 insertions(+), 393 deletions(-) create mode 100644 cmd/abootimg.c rename doc/android/{ab.txt => ab.rst} (52%) create mode 100644 doc/android/avb2.rst delete mode 100644 doc/android/avb2.txt create mode 100644 doc/android/bcb.rst delete mode 100644 doc/android/bcb.txt create mode 100644 doc/android/boot-image.rst rename doc/android/{fastboot-protocol.txt => fastboot-protocol.rst} (82%) rename doc/android/{fastboot.txt => fastboot.rst} (79%) create mode 100644 doc/android/index.rst create mode 100644 test/py/tests/test_android/test_abootimg.py -- 2.23.0

2 1

[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 1/2] riscv: Try to get cpu frequency from device tree
by Sean Anderson 04 Feb '20

04 Feb '20

Instead of always using the "clock-frequency" property to determine cpu frequency, try using a clock in "clocks" if it exists. This patch also fixes a bug where there could be spurious higher frequencies if sizeof(u32) != sizeof(ulong). Signed-off-by: Sean Anderson <seanga2(a)gmail.com> --- This patch is the combination of the patches https://patchwork.ozlabs.org/patch/1223933/ https://patchwork.ozlabs.org/patch/1224957/ "riscv: Fix incorrect cpu frequency on RV64" "riscv: Try to get cpu frequency from device tree" Changes for v2: - Renamed err to ret drivers/cpu/riscv_cpu.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/drivers/cpu/riscv_cpu.c b/drivers/cpu/riscv_cpu.c index 28ad0aa30f..5309a49e60 100644 --- a/drivers/cpu/riscv_cpu.c +++ b/drivers/cpu/riscv_cpu.c @@ -3,6 +3,7 @@ * Copyright (C) 2018, Bin Meng <bmeng.cn(a)gmail.com> */ +#include <clk.h> #include <common.h> #include <cpu.h> #include <dm.h> @@ -27,9 +28,24 @@ static int riscv_cpu_get_desc(struct udevice *dev, char *buf, int size) static int riscv_cpu_get_info(struct udevice *dev, struct cpu_info *info) { + int ret; + struct clk clk; const char *mmu; - dev_read_u32(dev, "clock-frequency", (u32 *)&info->cpu_freq); + /* Zero out the frequency, in case sizeof(ulong) != sizeof(u32) */ + info->cpu_freq = 0; + + /* First try getting the frequency from the assigned clock */ + ret = clk_get_by_index(dev, 0, &clk); + if (!ret) { + ret = clk_get_rate(&clk); + if (!IS_ERR_VALUE(ret)) + info->cpu_freq = ret; + clk_free(&clk); + } + + if (!info->cpu_freq) + dev_read_u32(dev, "clock-frequency", (u32 *)&info->cpu_freq); mmu = dev_read_string(dev, "mmu-type"); if (!mmu) -- 2.25.0

2 3

[PATCH v4 0/4] arm64: sun50i: Add support for Orange Pi 3
by Andre Heider 04 Feb '20

04 Feb '20

Changes since v3: * use dts files from linux-next 98d25b0b266d * added commit description to "sunxi: board: extract creating a unique sid into a helper function" * added Maxime's Acked-by Changes since v2: * drop "sunxi: board: Use eth_env_set_enetaddr_by_index()" as it breaks compilation without CONFIG_NET * add "sunxi: board: extract creating a unique sid into a helper function" and use it for the the bdaddr so that it work without ethernet devices * use `if (CONFIG_FIXUP_BDADDR[0])` as suggested by Ondřej to give the compiler a better chance of discarding the function if the knob isn't set Changes since v1: * add CONFIG_FIXUP_BDADDR so fixing up a bdaddr is reusable * try to use "bdaddr" first, then fall back to generating an address Notes: * the kernel patch for btbcm to accept the "local-bd-address" property is on master and will be in v5.5-rc1 Andre Heider (4): sunxi: board: extract creating a unique sid into a helper function arm: sunxi: add a config option to fixup a Bluetooth address arm64: dts: sync Allwinner H6 files arm64: dts: sun50i: Add support for Orange Pi 3 arch/arm/dts/Makefile | 1 + arch/arm/dts/sun50i-h6-beelink-gs1.dts | 27 +++ arch/arm/dts/sun50i-h6-orangepi-3.dts | 287 +++++++++++++++++++++++++ arch/arm/dts/sun50i-h6-orangepi.dtsi | 4 + arch/arm/dts/sun50i-h6-pine-h64.dts | 4 + arch/arm/dts/sun50i-h6.dtsi | 137 ++++++++++-- arch/arm/mach-sunxi/Kconfig | 11 + board/sunxi/MAINTAINERS | 5 + board/sunxi/board.c | 139 ++++++++---- configs/orangepi_3_defconfig | 18 ++ 10 files changed, 569 insertions(+), 64 deletions(-) create mode 100644 arch/arm/dts/sun50i-h6-orangepi-3.dts create mode 100644 configs/orangepi_3_defconfig -- 2.24.0

1 4

[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