September 2021 - U-Boot

[PATCH v2] board: freescale: lx216x : increase fdt blob size
by Wasim Khan 20 Sep '21

20 Sep '21

From: Wasim Khan <wasim.khan(a)nxp.com> Increase fdt blob size for lx2160 and lx2162 series to fix below errors/warnings during device tree fixup. Unable to update property /soc/spi@2100000:status, err=FDT_ERR_NOSPACE Unable to update property /soc/spi@2110000:status, err=FDT_ERR_NOSPACE Unable to update property /soc/spi@2120000:status, err=FDT_ERR_NOSPACE WARNING: could not set reg FDT_ERR_NOSPACE. WARNING unable to set iommus: FDT_ERR_NOSPACE Signed-off-by: Wasim Khan <wasim.khan(a)nxp.com> --- Change in v2: - Return error code if fdt_increase_size() fails board/freescale/lx2160a/lx2160a.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/board/freescale/lx2160a/lx2160a.c b/board/freescale/lx2160a/lx2160a.c index f505e82fb9..ba3d62a002 100644 --- a/board/freescale/lx2160a/lx2160a.c +++ b/board/freescale/lx2160a/lx2160a.c @@ -828,10 +828,18 @@ int ft_board_setup(void *blob, struct bd_info *bd) u64 mc_memory_base = 0; u64 mc_memory_size = 0; u16 total_memory_banks; + int err; #if CONFIG_IS_ENABLED(TARGET_LX2160ARDB) u8 board_rev; #endif + err = fdt_increase_size(blob, 512); + if (err) { + printf("%s fdt_increase_size: err=%s\n", __func__, + fdt_strerror(err)); + return err; + } + ft_cpu_setup(blob, bd); fdt_fixup_mc_ddr(&mc_memory_base, &mc_memory_size); -- 2.25.1

2 1

[PATCH 1/4] usb: add support for ULPI/SERIAL/HSIC PHY modes
by Matthias Schiffer 20 Sep '21

20 Sep '21

Import usb_phy_interface enum values and DT match strings from the Linux kernel. Signed-off-by: Markus Niebel <Markus.Niebel(a)ew.tq-group.com> Signed-off-by: Matthias Schiffer <matthias.schiffer(a)ew.tq-group.com> --- drivers/usb/common/common.c | 3 +++ include/linux/usb/phy.h | 3 +++ 2 files changed, 6 insertions(+) diff --git a/drivers/usb/common/common.c b/drivers/usb/common/common.c index 2a47f40bbab..43564c9fbaf 100644 --- a/drivers/usb/common/common.c +++ b/drivers/usb/common/common.c @@ -80,6 +80,9 @@ static const char *const usbphy_modes[] = { [USBPHY_INTERFACE_MODE_UNKNOWN] = "", [USBPHY_INTERFACE_MODE_UTMI] = "utmi", [USBPHY_INTERFACE_MODE_UTMIW] = "utmi_wide", + [USBPHY_INTERFACE_MODE_ULPI] = "ulpi", + [USBPHY_INTERFACE_MODE_SERIAL] = "serial", + [USBPHY_INTERFACE_MODE_HSIC] = "hsic", }; enum usb_phy_interface usb_get_phy_mode(ofnode node) diff --git a/include/linux/usb/phy.h b/include/linux/usb/phy.h index 1e1217a9583..14b2c7eb2e6 100644 --- a/include/linux/usb/phy.h +++ b/include/linux/usb/phy.h @@ -16,6 +16,9 @@ enum usb_phy_interface { USBPHY_INTERFACE_MODE_UNKNOWN, USBPHY_INTERFACE_MODE_UTMI, USBPHY_INTERFACE_MODE_UTMIW, + USBPHY_INTERFACE_MODE_ULPI, + USBPHY_INTERFACE_MODE_SERIAL, + USBPHY_INTERFACE_MODE_HSIC, }; #if CONFIG_IS_ENABLED(DM_USB) -- 2.17.1

1 3

Please pull u-boot-marvell/next (watchdog related)
by Stefan Roese 20 Sep '21

20 Sep '21

Hi Tom, please pull the following watchdog related fix: ---------------------------------------------------------------- - wdt: dw: Fix passing NULL pointer to reset functions (Sean) ---------------------------------------------------------------- Here the Azure build, without any issues: https://dev.azure.com/sr0718/u-boot/_build/results?buildId=114&view=results Thanks, Stefan The following changes since commit 3f571228a5340e84123ea7330e2c9cdaea99e733: Merge tag 'dm-pull-18sep21' of https://source.denx.de/u-boot/custodians/u-boot-dm (2021-09-19 10:38:20 -0400) are available in the Git repository at: git@source.denx.de:u-boot/custodians/u-boot-marvell.git for you to fetch changes up to b31077feca2276f0860706d1843f548baae68aee: wdt: dw: Fix passing NULL pointer to reset functions (2021-09-20 07:39:29 +0200) ---------------------------------------------------------------- Sean Anderson (1): wdt: dw: Fix passing NULL pointer to reset functions drivers/watchdog/designware_wdt.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)

2 2

[PATCH 1/5] ARM: rmobile: Enable board detection when FIT is enabled
by Adam Ford 20 Sep '21

20 Sep '21

There are three boards from Beacon, RZ/G2 M/N/H which all use the same board file, but different device trees. Add code to automatically select the proper device tree based on the CPU type. Signed-off-by: Adam Ford <aford173(a)gmail.com> diff --git a/board/beacon/beacon-rzg2m/beacon-rzg2m.c b/board/beacon/beacon-rzg2m/beacon-rzg2m.c index c12ff77fb2..b3521fcbc1 100644 --- a/board/beacon/beacon-rzg2m/beacon-rzg2m.c +++ b/board/beacon/beacon-rzg2m/beacon-rzg2m.c @@ -36,3 +36,19 @@ void reset_cpu(void) { writel(RST_CODE, RST_CA57RESCNT); } + +#if IS_ENABLED(CONFIG_MULTI_DTB_FIT) +int board_fit_config_name_match(const char *name) +{ + if (!strcmp(rzg_get_cpu_name(), "R8A774A1") && !strcmp(name, "r8a774a1-beacon-rzg2m-kit")) + return 0; + + if (!strcmp(rzg_get_cpu_name(), "R8A774B1") && !strcmp(name, "r8a774b1-beacon-rzg2n-kit")) + return 0; + + if (!strcmp(rzg_get_cpu_name(), "R8A774E1") && !strcmp(name, "r8a774e1-beacon-rzg2h-kit")) + return 0; + + return -1; +} +#endif -- 2.25.1

2 6

[PATCH v4 0/5] env: Allow environment in text files
by Simon Glass 20 Sep '21

20 Sep '21

One barrier to completing the 7-year-long Kconfig migration is that the default environment is implemented using ad-hoc CONFIG options. At present U-Boot environment variables, and thus scripts, are defined by CONFIG_EXTRA_ENV_SETTINGS. It is not really feasible to move the environment to Kconfig as it is hundreds of lines of text in some cases. Even considering the current situation, it is painful to add large amounts of text to the config-header file and dealing with quoting and newlines is harder than it should be. It would be better if we could just type the script into a text file and have it included by U-Boot. Add a feature that brings in a .env file associated with the board config, if present. To use it, create a file in a board/<vendor>/env directory called <board>.env (or common.env if you want the same environment for all boards). The environment variables should be of the form "var=value". Values can extend to multiple lines. This series converts the existing environment documentation to rST and updates it to explain how to use this. Note: this series was originally sent eight years ago: https://patchwork.ozlabs.org/project/uboot/patch/1382763695-2849-4-git-send… It has been updated to work with Kconfig, etc. Some review comments in that patch were infeasible so I have not addressed them. I would like this series to be considered independently, on its merits. Rather than deal with the complexity of rewriting the distro-boot script, this is disabled for sandbox. The forthcoming bootmethod approach should provide the same functionality without needing the complex scripting in the environment. Migration needs more thought, although it can be done later. It may be possible to do migrate automatically, using buildman to extract the built-in environmnent from the ELF file. This would produce a pretty ugly conversion though, since it would drop all the intermediate variables used to create the environment. Better would be to parse the config.h file, figure out the components of CONFIG_EXTRA_ENV_SETTINGS then output these as separate pieces in the file. It is not clear how easy that would be, nor whether the result would be very pretty. Also the __stringify() macro needs to be handled somehow. This series is available at u-boot-dm/env-working Comments welcome. Changes in v4: - Add new patch to move environment documentation to rST - Move this from being part of configuring U-Boot to part of building it - Don't put the environment in autoconf.mk as it is not needed - Add documentation in rST format instead of README - Drop mention of import/export - Update awk script to ignore blank lines, as generated by clang - Add documentation in rST format instead of README Changes in v3: - Adjust Makefile to generate the .inc and .h files in separate fules - Add more detail in the README about the format of .env files - Improve the comment about " in the awk script - Correctly terminate environment files with \n - Define __UBOOT_CONFIG__ when collecting environment files - Add new patch to use a text-based environment for sandbox Changes in v2: - Move .env file from include/configs to board/ - Use awk script to process environment since it is much easier on the brain - Add information and updated example script to README - Add dependency rule so that the environment is rebuilt when it changes - Add separate patch to enable C preprocessor for environment files - Enable var+=value form to simplify composing variables in multiple steps Simon Glass (5): sandbox: Drop distro_boot doc: Move environment documentation to rST env: Allow U-Boot scripts to be placed in a .env file env: Allow environment files to use the C preprocessor sandbox: Use a text-based environment Makefile | 39 ++- README | 328 -------------------------- board/sandbox/env/sandbox.env | 25 ++ config.mk | 2 + doc/usage/environment.rst | 431 ++++++++++++++++++++++++++++++++++ doc/usage/index.rst | 1 + env/embedded.c | 1 + include/configs/sandbox.h | 40 ---- include/env_default.h | 8 + scripts/env2string.awk | 55 +++++ 10 files changed, 561 insertions(+), 369 deletions(-) create mode 100644 board/sandbox/env/sandbox.env create mode 100644 doc/usage/environment.rst create mode 100644 scripts/env2string.awk -- 2.33.0.464.g1972c5931b-goog

2 8

[PATCH] board: freescale: lx216x : increase fdt blob size
by Wasim Khan 20 Sep '21

20 Sep '21

From: Wasim Khan <wasim.khan(a)nxp.com> Increase fdt blob size for lx2160 and lx2162 series to fix below errors/warnings during device tree fixup. Unable to update property /soc/spi@2100000:status, err=FDT_ERR_NOSPACE Unable to update property /soc/spi@2110000:status, err=FDT_ERR_NOSPACE Unable to update property /soc/spi@2120000:status, err=FDT_ERR_NOSPACE WARNING: could not set reg FDT_ERR_NOSPACE. WARNING unable to set iommus: FDT_ERR_NOSPACE Signed-off-by: Wasim Khan <wasim.khan(a)nxp.com> --- board/freescale/lx2160a/lx2160a.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/board/freescale/lx2160a/lx2160a.c b/board/freescale/lx2160a/lx2160a.c index f505e82fb9..d03168d6a2 100644 --- a/board/freescale/lx2160a/lx2160a.c +++ b/board/freescale/lx2160a/lx2160a.c @@ -828,10 +828,18 @@ int ft_board_setup(void *blob, struct bd_info *bd) u64 mc_memory_base = 0; u64 mc_memory_size = 0; u16 total_memory_banks; + int err; #if CONFIG_IS_ENABLED(TARGET_LX2160ARDB) u8 board_rev; #endif + err = fdt_increase_size(blob, 512); + if (err) { + printf("%s fdt_increase_size: err=%s\n", __func__, + fdt_strerror(err)); + return 1; + } + ft_cpu_setup(blob, bd); fdt_fixup_mc_ddr(&mc_memory_base, &mc_memory_size); -- 2.25.1

2 1

[PATCH] wdt: dw: Fix passing NULL pointer to reset functions
by Sean Anderson 20 Sep '21

20 Sep '21

reset_*_bulk expects a real pointer. Fixes: 4f7abafe1c ("driver: watchdog: reset watchdog in designware_wdt_stop() function") Signed-off-by: Sean Anderson <seanga2(a)gmail.com> --- drivers/watchdog/designware_wdt.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/watchdog/designware_wdt.c b/drivers/watchdog/designware_wdt.c index afed81e6c6..cfec29bd15 100644 --- a/drivers/watchdog/designware_wdt.c +++ b/drivers/watchdog/designware_wdt.c @@ -22,7 +22,7 @@ struct designware_wdt_priv { void __iomem *base; unsigned int clk_khz; - struct reset_ctl_bulk *resets; + struct reset_ctl_bulk resets; }; /* @@ -99,11 +99,11 @@ static int designware_wdt_stop(struct udevice *dev) if (CONFIG_IS_ENABLED(DM_RESET)) { int ret; - ret = reset_assert_bulk(priv->resets); + ret = reset_assert_bulk(&priv->resets); if (ret) return ret; - ret = reset_deassert_bulk(priv->resets); + ret = reset_deassert_bulk(&priv->resets); if (ret) return ret; } @@ -156,11 +156,11 @@ static int designware_wdt_probe(struct udevice *dev) #endif if (CONFIG_IS_ENABLED(DM_RESET)) { - ret = reset_get_bulk(dev, priv->resets); + ret = reset_get_bulk(dev, &priv->resets); if (ret) goto err; - ret = reset_deassert_bulk(priv->resets); + ret = reset_deassert_bulk(&priv->resets); if (ret) goto err; } -- 2.33.0

2 4

Rename of the u-boot-atmel custodian tree
by Eugen.Hristev＠microchip.com 20 Sep '21

20 Sep '21

Hello everyone, I plan to rename the u-boot-atmel tree to u-boot-at91 . It's been more than 5 years since Atmel is part of Microchip, and the name is slowly being changed to reflect the new reality. It makes more sense to have the custodian tree named u-boot-at91 , as this tree is used only for patches related to the at91 boards and drivers (not any other former Atmel product, nor any other Microchip product ). I won't be naming it u-boot-microchip since Microchip does much more than just the former Atmel MPUs (AT91 architecture) . This means, however, that all remotes to this tree have to be updated. I do not see any other side effect at this moment. I will wait some more time , few weeks or one month, before making this change, to allow anyone to comment on this. Thanks, Eugen

3 3

[PATCH v2 0/3] ARM: meson: add support for JetHub D1/H1
by Vyacheslav Bocharov 20 Sep '21

20 Sep '21

Add support for new home automation devices manufactured by JetHome. Patches prepared for use with the "ARM: meson: Sync Amlogic DT from Linux 5.14" patch series by Neil Armstrong JetHome Jethub D1 (http://jethome.ru/jethub-d1) is a home automation controller with the following features: - DIN Rail Mounting case - Amlogic A113X (ARM Cortex-A53) quad-core up to 1.5GHz - no video out - 512Mb/1GB DDR3 - 8/16GB eMMC flash - 1 x USB 2.0 - 1 x 10/100Mbps ethernet - WiFi / Bluetooth AMPAK AP6255 (Broadcom BCM43455) IEEE 802.11a/b/g/n/ac, Bluetooth 4.2. - TI CC2538 + CC2592 Zigbee Wireless Module with up to 20dBm output power and Zigbee 3.0 support. - 2 x gpio LEDS - GPIO user Button - 1 x 1-Wire - 2 x RS-485 - 4 x dry contact digital GPIO inputs - 3 x relay GPIO outputs - DC source with a voltage of 9 to 56 V / Passive POE JetHome Jethub H1 (http://jethome.ru/jethub-h1) is a home automation controller with the following features: - Square plastic case - Amlogic S905W (ARM Cortex-A53) quad-core up to 1.5GHz - no video out - 1GB DDR3 - 8/16GB eMMC flash - 2 x USB 2.0 - 1 x 10/100Mbps ethernet - WiFi / Bluetooth RTL8822CS IEEE 802.11a/b/g/n/ac, Bluetooth 5.0. - TI CC2538 + CC2592 Zigbee Wireless Module with up to 20dBm output power and Zigbee 3.0 support. - MicroSD 2.x/3.x/4.x DS/HS cards. - 1 x gpio LED - ADC user Button - DC source 5V microUSB with serial console Changes from v1: - fix BOOT_TARGET_DEVICES in jethub.h (patch 1/3) - add lore URLs to description (patch 2/3) Signed-off-by: Vyacheslav Bocharov <adeep(a)lexina.in> Vyacheslav Bocharov (3): ARM: amlogic: add JetHub common config header ARM: amlogic: add JetHub D1/H1 device support ARM: amlogic: add JetHub D1/H1 docs arch/arm/dts/Makefile | 2 + .../arm/dts/meson-axg-jethome-jethub-j100.dts | 361 ++++++++++++++++++ .../meson-gxl-s905w-jethome-jethub-j80.dts | 241 ++++++++++++ board/amlogic/jethub-j80/MAINTAINERS | 6 + board/amlogic/jethub-j80/Makefile | 6 + board/amlogic/jethub-j80/jethub-j80.c | 68 ++++ configs/jethub_j100_defconfig | 55 +++ configs/jethub_j80_defconfig | 63 +++ doc/board/amlogic/index.rst | 128 ++++--- doc/board/amlogic/jethub-j100.rst | 108 ++++++ doc/board/amlogic/jethub-j80.rst | 97 +++++ include/configs/jethub.h | 40 ++ 12 files changed, 1112 insertions(+), 63 deletions(-) create mode 100644 arch/arm/dts/meson-axg-jethome-jethub-j100.dts create mode 100644 arch/arm/dts/meson-gxl-s905w-jethome-jethub-j80.dts create mode 100644 board/amlogic/jethub-j80/MAINTAINERS create mode 100644 board/amlogic/jethub-j80/Makefile create mode 100644 board/amlogic/jethub-j80/jethub-j80.c create mode 100644 configs/jethub_j100_defconfig create mode 100644 configs/jethub_j80_defconfig create mode 100644 doc/board/amlogic/jethub-j100.rst create mode 100644 doc/board/amlogic/jethub-j80.rst create mode 100644 include/configs/jethub.h -- 2.30.2

3 6

[PATCH] usb: xhci-dwc3: Add support for USB 3.1 controllers
by Mark Kettenis 20 Sep '21

20 Sep '21

This adds support for the DWC_sub31 controllers such as those found on Apple's M1 SoC. This version of the controller seems to work fine with the existing driver. Signed-off-by: Mark Kettenis <kettenis(a)openbsd.org> --- drivers/usb/host/xhci-dwc3.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/usb/host/xhci-dwc3.c b/drivers/usb/host/xhci-dwc3.c index 3e0ae80cec..a2ea40bae0 100644 --- a/drivers/usb/host/xhci-dwc3.c +++ b/drivers/usb/host/xhci-dwc3.c @@ -70,7 +70,8 @@ int dwc3_core_init(struct dwc3 *dwc3_reg) revision = readl(&dwc3_reg->g_snpsid); /* This should read as U3 followed by revision number */ - if ((revision & DWC3_GSNPSID_MASK) != 0x55330000) { + if ((revision & DWC3_GSNPSID_MASK) != 0x55330000 && + (revision & DWC3_GSNPSID_MASK) != 0x33310000) { puts("this is not a DesignWare USB3 DRD Core\n"); return -1; } -- 2.33.0

3 4