July 2021 - U-Boot

[PATCH v3 0/4] Allwinner H6 USB3 support
by Andre Przywara 05 Jul '21

05 Jul '21

This series adds PHY and XHCI driver support for the USB3 controller found in the Allwinner H6 SoC. It has been tested and working on both boards enabled in patch 4, although some users experience issues[1]. [1]: https://lists.denx.de/pipermail/u-boot/2021-February/440767.html Changes from v2: - Fix xhci-pci.c compilation (RPi4 and other boards) Changes from v1: - Dropped patches 1-2 (already in u-boot-sunxi/master) and rebased - Added Andre's Reviewed-by on the PHY driver - Fixed error handling in xhci_pci_probe Samuel Holland (4): phy: sun50i-usb3: Add a driver for the H6 USB3 PHY usb: xhci-pci: Move reset logic out of XHCI core usb: xhci-dwc3: Add support for clocks/resets configs: Enable USB3 on Allwinner H6 boards configs/orangepi_3_defconfig | 5 + configs/pine_h64_defconfig | 5 + drivers/phy/allwinner/Kconfig | 8 ++ drivers/phy/allwinner/Makefile | 1 + drivers/phy/allwinner/phy-sun50i-usb3.c | 171 ++++++++++++++++++++++++ drivers/usb/host/xhci-dwc3.c | 56 ++++++++ drivers/usb/host/xhci-mem.c | 2 - drivers/usb/host/xhci-pci.c | 52 ++++++- drivers/usb/host/xhci.c | 35 ----- include/usb/xhci.h | 2 - 10 files changed, 294 insertions(+), 43 deletions(-) create mode 100644 drivers/phy/allwinner/phy-sun50i-usb3.c -- 2.17.5

1 4

[PATCH v2 0/4] Allwinner H6 USB3 support
by Samuel Holland 05 Jul '21

05 Jul '21

This series adds PHY and XHCI driver support for the USB3 controller found in the Allwinner H6 SoC. It has been tested and working on both boards enabled in patch 4, although some users experience issues[1]. [1]: https://lists.denx.de/pipermail/u-boot/2021-February/440767.html Changes from v1: - Dropped patches 1-2 (already in u-boot-sunxi/master) and rebased - Added Andre's Reviewed-by on the PHY driver - Fixed error handling in xhci_pci_probe Samuel Holland (4): phy: sun50i-usb3: Add a driver for the H6 USB3 PHY usb: xhci-pci: Move reset logic out of XHCI core usb: xhci-dwc3: Add support for clocks/resets configs: Enable USB3 on Allwinner H6 boards configs/orangepi_3_defconfig | 5 + configs/pine_h64_defconfig | 5 + drivers/phy/allwinner/Kconfig | 8 ++ drivers/phy/allwinner/Makefile | 1 + drivers/phy/allwinner/phy-sun50i-usb3.c | 171 ++++++++++++++++++++++++ drivers/usb/host/xhci-dwc3.c | 56 ++++++++ drivers/usb/host/xhci-mem.c | 2 - drivers/usb/host/xhci-pci.c | 51 ++++++- drivers/usb/host/xhci.c | 35 ----- include/usb/xhci.h | 2 - 10 files changed, 293 insertions(+), 43 deletions(-) create mode 100644 drivers/phy/allwinner/phy-sun50i-usb3.c -- 2.26.2

4 21

[PATCH v5 0/4] basic support for rk3066 platform.
by Paweł Jarosz 05 Jul '21

05 Jul '21

This patch serie adds basic support for Rockchip RK3066 processor. For now it's clock, pinctrl and sdram driver. Paweł Jarosz (4): rockchip: rk3066: add grf header file rockchip: rk3066: add clock driver for rk3066 soc rockchip: rk3066: add rk3066 pinctrl driver rockchip: rk3066: add sdram driver .../include/asm/arch-rockchip/cru_rk3066.h | 201 ++++ .../include/asm/arch-rockchip/grf_rk3066.h | 211 ++++ drivers/clk/rockchip/Makefile | 1 + drivers/clk/rockchip/clk_rk3066.c | 664 +++++++++++++ drivers/pinctrl/rockchip/Makefile | 1 + drivers/pinctrl/rockchip/pinctrl-rk3066.c | 113 +++ drivers/ram/rockchip/Makefile | 1 + drivers/ram/rockchip/sdram_rk3066.c | 940 ++++++++++++++++++ 8 files changed, 2132 insertions(+) create mode 100644 arch/arm/include/asm/arch-rockchip/cru_rk3066.h create mode 100644 arch/arm/include/asm/arch-rockchip/grf_rk3066.h create mode 100644 drivers/clk/rockchip/clk_rk3066.c create mode 100644 drivers/pinctrl/rockchip/pinctrl-rk3066.c create mode 100644 drivers/ram/rockchip/sdram_rk3066.c -- 2.32.0

2 6

[PATCH] MAINTAINERS, git-mailrc: socfpga: Change co-maintainer to Tien Fong Chee
by Ley Foon Tan 05 Jul '21

05 Jul '21

I'm no longer work in Intel, change Intel SoCFPGA co-maintainer to Tien Fong Chee. Signed-off-by: Ley Foon Tan <lftan.linux(a)gmail.com> --- MAINTAINERS | 2 +- doc/git-mailrc | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index 86ff5e04a6..4997ac97a8 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -118,7 +118,7 @@ F: cmd/arm/ ARM ALTERA SOCFPGA M: Marek Vasut <marex(a)denx.de> M: Simon Goldschmidt <simon.k.r.goldschmidt(a)gmail.com> -M: Ley Foon Tan <lftan.linux(a)gmail.com> +M: Tien Fong Chee <tien.fong.chee(a)intel.com> S: Maintainted T: git https://source.denx.de/u-boot/custodians/u-boot-socfpga.git F: arch/arm/mach-socfpga/ diff --git a/doc/git-mailrc b/doc/git-mailrc index 34f936f4d8..0a78594eb9 100644 --- a/doc/git-mailrc +++ b/doc/git-mailrc @@ -46,6 +46,7 @@ alias simongoldschmidt Simon Goldschmidt <simon.k.r.goldschmidt(a)gmail.com> alias sjg Simon Glass <sjg(a)chromium.org> alias smcnutt Scott McNutt <smcnutt(a)psyent.com> alias stroese Stefan Roese <sr(a)denx.de> +alias tienfong Tien Fong Chee <tien.fong.chee(a)intel.com> alias trini Tom Rini <trini(a)konsulko.com> alias wd Wolfgang Denk <wd(a)denx.de> alias priyankajain Priyanka Jain <priyanka.jain(a)nxp.com> @@ -69,7 +70,7 @@ alias s3c samsung alias s5pc samsung alias samsung uboot, prom alias snapdragon uboot, mateusz -alias socfpga uboot, marex, dinh, simongoldschmidt, leyfoon +alias socfpga uboot, marex, dinh, simongoldschmidt, tienfong alias sunxi uboot, jagan, apritzel alias tegra uboot, sjg, Tom Warren <twarren(a)nvidia.com>, Stephen Warren <swarren(a)nvidia.com> alias tegra2 tegra -- 2.25.1

2 2

Pull request for efi-2021-07-rc5-2
by Heinrich Schuchardt 05 Jul '21

05 Jul '21

Dear Tom, I have removed the one patch for better EFI/DM integration that caused sandbox test problems on my last pull request. This topic needs more coordination with Simon. Gitlab CI showed no problems: https://source.denx.de/u-boot/custodians/u-boot-efi/-/pipelines/7968 The following changes since commit 4d8c21da4170e7c1d38c0106898e0d8347b4f0ff: Merge tag 'u-boot-imx-20210625' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx (2021-06-25 13:33:47 -0400) are available in the Git repository at: https://source.denx.de/u-boot/custodians/u-boot-efi.git tags/efi-2021-07-rc5-2 for you to fetch changes up to 70e80666f26a516096f3787e884d42818d8b4087: smbios: Fix SMBIOS tables (2021-06-28 19:57:13 +0200) ---------------------------------------------------------------- Pull request for efi-2021-07-rc5-2 Documentation: * man-page for askenv bug fixes * correct display of BootOrder in efidebug command * do not allow TPL_HIGH_LEVEL for CreateEvent(Ex) * correct handling of unknown properties in SMBIOS tables ---------------------------------------------------------------- Adarsh Babu Kalepalli (1): doc/usage: cmd-usage help file for askenv Heinrich Schuchardt (3): efi_loader: TPL_HIGH_LEVEL not allowed for CreateEvent efidebug: correct display of BootOrder smbios: convert function descriptions to Sphinx style Ilias Apalodimas (2): smbios: Fix BIOS Characteristics Extension Byte 2 smbios: Fix SMBIOS tables cmd/efidebug.c | 2 +- doc/usage/askenv.rst | 87 +++++++++++++++++++++++++++++++++++++ doc/usage/index.rst | 1 + include/smbios.h | 2 +- lib/efi_loader/efi_boottime.c | 1 - lib/efi_selftest/efi_selftest_tpl.c | 2 +- lib/smbios.c | 24 +++++++--- 7 files changed, 108 insertions(+), 11 deletions(-) create mode 100644 doc/usage/askenv.rst

4 8

[PATCH] rockchip: rk3399: adjust Nanopi R4S board power layout
by xiaobo 05 Jul '21

05 Jul '21

1. Modify the VCC VDD power layout 2. Modify Ethernet1 interface of PCIE0 Reviewed-by: Kever Yang <kever.yang(a)rock-chips.com> Signed-off-by: xiaobo <peterwillcn(a)gmail.com> --- arch/arm/dts/rk3399-nanopi-r4s.dts | 85 ++++++++++++++++++++++-------- 1 file changed, 63 insertions(+), 22 deletions(-) diff --git a/arch/arm/dts/rk3399-nanopi-r4s.dts b/arch/arm/dts/rk3399-nanopi-r4s.dts index 6f2cf17bf1..ae22363072 100644 --- a/arch/arm/dts/rk3399-nanopi-r4s.dts +++ b/arch/arm/dts/rk3399-nanopi-r4s.dts @@ -17,19 +17,65 @@ model = "FriendlyElec NanoPi R4S"; compatible = "friendlyarm,nanopi-r4s", "rockchip,rk3399"; - aliases { - ethernet1 = &r8169; + chosen { + stdout-path = "serial2:1500000n8"; + }; + + vcc1v8_s3: vcc1v8-s3 { + compatible = "regulator-fixed"; + regulator-always-on; + regulator-boot-on; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + regulator-name = "vcc1v8_s3"; + vin-supply = <&vcc_1v8>; + }; + + vcc3v0_sd: vcc3v0-sd { + compatible = "regulator-fixed"; + enable-active-high; + gpio = <&gpio0 RK_PA1 GPIO_ACTIVE_HIGH>; + pinctrl-names = "default"; + pinctrl-0 = <&sdmmc0_pwr_h>; + regulator-always-on; + regulator-min-microvolt = <3000000>; + regulator-max-microvolt = <3000000>; + regulator-name = "vcc3v0_sd"; + vin-supply = <&vcc3v3_sys>; + }; + + vcc3v3_sys: vcc3v3-sys { + compatible = "regulator-fixed"; + regulator-always-on; + regulator-boot-on; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + regulator-name = "vcc3v3_sys"; + }; + + vcc5v0_sys: vcc5v0-sys { + compatible = "regulator-fixed"; + regulator-always-on; + regulator-boot-on; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + regulator-name = "vcc5v0_sys"; + vin-supply = <&vdd_5v>; }; vdd_5v: vdd-5v { compatible = "regulator-fixed"; - regulator-name = "vdd_5v"; regulator-always-on; regulator-boot-on; + regulator-name = "vdd_5v"; }; fan: pwm-fan { compatible = "pwm-fan"; + /* + * With 20KHz PWM and an EVERCOOL EC4007H12SA fan, these levels + * work out to 0, ~1200, ~3000, and 5000RPM respectively. + */ cooling-levels = <0 12 18 255>; #cooling-cells = <2>; fan-supply = <&vdd_5v>; @@ -73,40 +119,39 @@ status = "disabled"; }; +&i2c4 { + status = "disabled"; +}; + &leds { lan_led: led-1 { gpios = <&gpio1 RK_PA1 GPIO_ACTIVE_HIGH>; - label = "nanopi-r4s:green:lan"; + label = "green:lan"; + }; + + sys_led: led-sys { + default-state = "on"; + gpios = <&gpio0 RK_PB5 GPIO_ACTIVE_HIGH>; + label = "red:sys"; }; wan_led: led-2 { gpios = <&gpio1 RK_PA0 GPIO_ACTIVE_HIGH>; - label = "nanopi-r4s:green:wan"; + label = "green:wan"; }; }; &leds_gpio { rockchip,pins = - <0 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>, <1 RK_PA0 RK_FUNC_GPIO &pcfg_pull_none>, - <1 RK_PA1 RK_FUNC_GPIO &pcfg_pull_none>; + <1 RK_PA1 RK_FUNC_GPIO &pcfg_pull_none>, + <0 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>; }; &pcie0 { max-link-speed = <1>; num-lanes = <1>; vpcie3v3-supply = <&vcc3v3_sys>; - - pcie@0 { - reg = <0x00000000 0 0 0 0>; - #address-cells = <3>; - #size-cells = <2>; - - r8169: pcie@0,0 { - reg = <0x000000 0 0 0 0>; - local-mac-address = [ 00 00 00 00 00 00 ]; - }; - }; }; &sdhci { @@ -132,7 +177,3 @@ &usbdrd_dwc3_0 { dr_mode = "host"; }; - -&vcc3v3_sys { - vin-supply = <&vcc5v0_sys>; -}; -- 2.32.0

1 0

[PATCH] dm: define LOG_CATEGORY for all uclass
by Patrick Delaunay 04 Jul '21

04 Jul '21

Define LOG_CATEGORY for all uclass to allow filtering with log command. Signed-off-by: Patrick Delaunay <patrick.delaunay(a)foss.st.com> --- drivers/adc/adc-uclass.c | 2 ++ drivers/ata/ahci-uclass.c | 2 ++ drivers/axi/axi-emul-uclass.c | 2 ++ drivers/axi/axi-uclass.c | 2 ++ drivers/block/blk-uclass.c | 2 ++ drivers/block/ide.c | 2 ++ drivers/bootcount/bootcount-uclass.c | 2 ++ drivers/button/button-uclass.c | 2 ++ drivers/cache/cache-uclass.c | 2 ++ drivers/clk/clk-uclass.c | 2 ++ drivers/core/root.c | 2 ++ drivers/core/simple-bus.c | 2 ++ drivers/cpu/cpu-uclass.c | 2 ++ drivers/crypto/rsa_mod_exp/mod_exp_uclass.c | 2 ++ drivers/dma/dma-uclass.c | 2 ++ drivers/firmware/firmware-uclass.c | 2 ++ drivers/hwspinlock/hwspinlock-uclass.c | 2 ++ drivers/i2c/i2c-emul-uclass.c | 2 ++ drivers/i2c/i2c-uclass.c | 2 ++ drivers/i2c/muxes/i2c-mux-uclass.c | 2 ++ drivers/input/keyboard-uclass.c | 2 ++ drivers/led/led-uclass.c | 2 ++ drivers/mailbox/mailbox-uclass.c | 2 ++ drivers/misc/fs_loader.c | 3 +++ drivers/misc/i2c_eeprom.c | 2 ++ drivers/misc/misc-uclass.c | 2 ++ drivers/misc/p2sb-uclass.c | 2 ++ drivers/misc/pwrseq-uclass.c | 2 ++ drivers/mmc/mmc-uclass.c | 2 ++ drivers/mtd/mtd-uclass.c | 2 ++ drivers/mtd/spi/sf-uclass.c | 2 ++ drivers/mux/mux-uclass.c | 2 ++ drivers/nvme/nvme-uclass.c | 2 ++ drivers/pch/pch-uclass.c | 2 ++ drivers/pci/pci-uclass.c | 2 ++ drivers/pci_endpoint/pci_ep-uclass.c | 2 ++ drivers/phy/phy-uclass.c | 2 ++ drivers/pinctrl/pinctrl-uclass.c | 2 ++ drivers/power/domain/power-domain-uclass.c | 2 ++ drivers/power/pmic/pmic-uclass.c | 2 ++ drivers/power/regulator/regulator-uclass.c | 2 ++ drivers/pwm/pwm-uclass.c | 2 ++ drivers/ram/ram-uclass.c | 2 ++ drivers/remoteproc/rproc-uclass.c | 3 +++ drivers/reset/reset-uclass.c | 2 ++ drivers/rng/rng-uclass.c | 2 ++ drivers/rtc/rtc-uclass.c | 2 ++ drivers/scsi/scsi-uclass.c | 2 ++ drivers/serial/serial-uclass.c | 2 ++ drivers/smem/smem-uclass.c | 2 ++ drivers/soc/soc-uclass.c | 2 ++ drivers/sound/codec-uclass.c | 2 ++ drivers/sound/i2s-uclass.c | 2 ++ drivers/sound/sound-uclass.c | 2 ++ drivers/spi/spi-emul-uclass.c | 2 ++ drivers/spmi/spmi-uclass.c | 2 ++ drivers/sysinfo/sysinfo-uclass.c | 2 ++ drivers/tee/tee-uclass.c | 2 ++ drivers/thermal/thermal-uclass.c | 2 ++ drivers/timer/timer-uclass.c | 2 ++ drivers/ufs/ufs-uclass.c | 2 ++ drivers/usb/emul/usb-emul-uclass.c | 2 ++ drivers/usb/gadget/udc/udc-uclass.c | 2 ++ drivers/usb/host/usb-uclass.c | 2 ++ drivers/video/backlight-uclass.c | 2 ++ drivers/video/bridge/video-bridge-uclass.c | 2 ++ drivers/video/display-uclass.c | 2 ++ drivers/video/dsi-host-uclass.c | 2 ++ drivers/video/panel-uclass.c | 2 ++ drivers/video/vidconsole-uclass.c | 2 ++ drivers/video/video-uclass.c | 2 ++ drivers/video/video_osd-uclass.c | 2 ++ drivers/virtio/virtio-uclass.c | 2 ++ drivers/w1-eeprom/w1-eeprom-uclass.c | 2 ++ drivers/w1/w1-uclass.c | 2 ++ drivers/watchdog/wdt-uclass.c | 2 ++ drivers/xen/pvblock.c | 3 +++ 77 files changed, 157 insertions(+) diff --git a/drivers/adc/adc-uclass.c b/drivers/adc/adc-uclass.c index 8781f32855..67137ffb34 100644 --- a/drivers/adc/adc-uclass.c +++ b/drivers/adc/adc-uclass.c @@ -4,6 +4,8 @@ * Przemyslaw Marczak <p.marczak(a)samsung.com> */ +#define LOG_CATEGORY UCLASS_ADC + #include <common.h> #include <errno.h> #include <div64.h> diff --git a/drivers/ata/ahci-uclass.c b/drivers/ata/ahci-uclass.c index c4c7a03fe7..d398b50b9a 100644 --- a/drivers/ata/ahci-uclass.c +++ b/drivers/ata/ahci-uclass.c @@ -4,6 +4,8 @@ * Written by Simon Glass <sjg(a)chromium.org> */ +#define LOG_CATEGORY UCLASS_AHCI + #include <common.h> #include <ahci.h> #include <dm.h> diff --git a/drivers/axi/axi-emul-uclass.c b/drivers/axi/axi-emul-uclass.c index b28351f1ad..793336d8c4 100644 --- a/drivers/axi/axi-emul-uclass.c +++ b/drivers/axi/axi-emul-uclass.c @@ -4,6 +4,8 @@ * Mario Six, Guntermann & Drunck GmbH, mario.six(a)gdsys.cc */ +#define LOG_CATEGORY UCLASS_AXI_EMUL + #include <common.h> #include <axi.h> #include <dm.h> diff --git a/drivers/axi/axi-uclass.c b/drivers/axi/axi-uclass.c index af8acd9f88..afb4844ecb 100644 --- a/drivers/axi/axi-uclass.c +++ b/drivers/axi/axi-uclass.c @@ -4,6 +4,8 @@ * Mario Six, Guntermann & Drunck GmbH, mario.six(a)gdsys.cc */ +#define LOG_CATEGORY UCLASS_AXI + #include <common.h> #include <dm.h> #include <axi.h> diff --git a/drivers/block/blk-uclass.c b/drivers/block/blk-uclass.c index d0d91db540..dfc0d46970 100644 --- a/drivers/block/blk-uclass.c +++ b/drivers/block/blk-uclass.c @@ -4,6 +4,8 @@ * Written by Simon Glass <sjg(a)chromium.org> */ +#define LOG_CATEGORY UCLASS_BLK + #include <common.h> #include <blk.h> #include <dm.h> diff --git a/drivers/block/ide.c b/drivers/block/ide.c index 862a85bc87..c99076c6f4 100644 --- a/drivers/block/ide.c +++ b/drivers/block/ide.c @@ -4,6 +4,8 @@ * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. */ +#define LOG_CATEGORY UCLASS_IDE + #include <common.h> #include <ata.h> #include <blk.h> diff --git a/drivers/bootcount/bootcount-uclass.c b/drivers/bootcount/bootcount-uclass.c index 34ac08d59a..c747c9ab27 100644 --- a/drivers/bootcount/bootcount-uclass.c +++ b/drivers/bootcount/bootcount-uclass.c @@ -3,6 +3,8 @@ * (C) Copyright 2018 Theobroma Systems Design und Consulting GmbH */ +#define LOG_CATEGORY UCLASS_BOOTCOUNT + #include <common.h> #include <dm.h> #include <errno.h> diff --git a/drivers/button/button-uclass.c b/drivers/button/button-uclass.c index e06d3eb7da..e33ed7d01d 100644 --- a/drivers/button/button-uclass.c +++ b/drivers/button/button-uclass.c @@ -5,6 +5,8 @@ * Based on led-uclass.c */ +#define LOG_CATEGORY UCLASS_BUTTON + #include <common.h> #include <button.h> #include <dm.h> diff --git a/drivers/cache/cache-uclass.c b/drivers/cache/cache-uclass.c index 3b20a10f08..0c13dbdb75 100644 --- a/drivers/cache/cache-uclass.c +++ b/drivers/cache/cache-uclass.c @@ -3,6 +3,8 @@ * Copyright (C) 2019 Intel Corporation <www.intel.com> */ +#define LOG_CATEGORY UCLASS_CACHE + #include <common.h> #include <cache.h> #include <dm.h> diff --git a/drivers/clk/clk-uclass.c b/drivers/clk/clk-uclass.c index 4ab3c402ed..24fdf9511b 100644 --- a/drivers/clk/clk-uclass.c +++ b/drivers/clk/clk-uclass.c @@ -6,6 +6,8 @@ * Copyright (c) 2018, Theobroma Systems Design und Consulting GmbH */ +#define LOG_CATEGORY UCLASS_CLK + #include <common.h> #include <clk.h> #include <clk-uclass.h> diff --git a/drivers/core/root.c b/drivers/core/root.c index d9a19c5e6b..b007447ff0 100644 --- a/drivers/core/root.c +++ b/drivers/core/root.c @@ -6,6 +6,8 @@ * Pavel Herrmann <morpheus.ibis(a)gmail.com> */ +#define LOG_CATEGORY UCLASS_ROOT + #include <common.h> #include <errno.h> #include <fdtdec.h> diff --git a/drivers/core/simple-bus.c b/drivers/core/simple-bus.c index 18f52d26df..abc55c2171 100644 --- a/drivers/core/simple-bus.c +++ b/drivers/core/simple-bus.c @@ -3,6 +3,8 @@ * Copyright (c) 2014 Google, Inc */ +#define LOG_CATEGORY UCLASS_SIMPLE_BUS + #include <common.h> #include <asm/global_data.h> #include <dm.h> diff --git a/drivers/cpu/cpu-uclass.c b/drivers/cpu/cpu-uclass.c index 1c338bad9a..a5cda6a62c 100644 --- a/drivers/cpu/cpu-uclass.c +++ b/drivers/cpu/cpu-uclass.c @@ -4,6 +4,8 @@ * Written by Simon Glass <sjg(a)chromium.org> */ +#define LOG_CATEGORY UCLASS_CPU + #include <common.h> #include <cpu.h> #include <dm.h> diff --git a/drivers/crypto/rsa_mod_exp/mod_exp_uclass.c b/drivers/crypto/rsa_mod_exp/mod_exp_uclass.c index f5ae35e132..6a4d235d57 100644 --- a/drivers/crypto/rsa_mod_exp/mod_exp_uclass.c +++ b/drivers/crypto/rsa_mod_exp/mod_exp_uclass.c @@ -4,6 +4,8 @@ * Author: Ruchika Gupta <ruchika.gupta(a)freescale.com> */ +#define LOG_CATEGORY UCLASS_MOD_EXP + #include <common.h> #include <dm.h> #include <asm/global_data.h> diff --git a/drivers/dma/dma-uclass.c b/drivers/dma/dma-uclass.c index a93b0b7ba0..652ddbb62b 100644 --- a/drivers/dma/dma-uclass.c +++ b/drivers/dma/dma-uclass.c @@ -9,6 +9,8 @@ * Author: Mugunthan V N <mugunthanvnm(a)ti.com> */ +#define LOG_CATEGORY UCLASS_DMA + #include <common.h> #include <cpu_func.h> #include <dm.h> diff --git a/drivers/firmware/firmware-uclass.c b/drivers/firmware/firmware-uclass.c index 7fcd7fb904..bfaf283eed 100644 --- a/drivers/firmware/firmware-uclass.c +++ b/drivers/firmware/firmware-uclass.c @@ -1,5 +1,7 @@ // SPDX-License-Identifier: GPL-2.0+ +#define LOG_CATEGORY UCLASS_FIRMWARE + #include <common.h> #include <dm.h> diff --git a/drivers/hwspinlock/hwspinlock-uclass.c b/drivers/hwspinlock/hwspinlock-uclass.c index 8997243421..cbe7236011 100644 --- a/drivers/hwspinlock/hwspinlock-uclass.c +++ b/drivers/hwspinlock/hwspinlock-uclass.c @@ -3,6 +3,8 @@ * Copyright (C) 2018, STMicroelectronics - All Rights Reserved */ +#define LOG_CATEGORY UCLASS_HWSPINLOCK + #include <common.h> #include <dm.h> #include <errno.h> diff --git a/drivers/i2c/i2c-emul-uclass.c b/drivers/i2c/i2c-emul-uclass.c index 7917b63c55..aeec6aa9fa 100644 --- a/drivers/i2c/i2c-emul-uclass.c +++ b/drivers/i2c/i2c-emul-uclass.c @@ -3,6 +3,8 @@ * Copyright (c) 2014 Google, Inc */ +#define LOG_CATEGORY UCLASS_I2C_EMUL + #include <common.h> #include <dm.h> #include <i2c.h> diff --git a/drivers/i2c/i2c-uclass.c b/drivers/i2c/i2c-uclass.c index be56785217..04c88503a2 100644 --- a/drivers/i2c/i2c-uclass.c +++ b/drivers/i2c/i2c-uclass.c @@ -3,6 +3,8 @@ * Copyright (c) 2014 Google, Inc */ +#define LOG_CATEGORY UCLASS_I2C + #include <common.h> #include <dm.h> #include <errno.h> diff --git a/drivers/i2c/muxes/i2c-mux-uclass.c b/drivers/i2c/muxes/i2c-mux-uclass.c index dbca409ee3..a5d1bb0576 100644 --- a/drivers/i2c/muxes/i2c-mux-uclass.c +++ b/drivers/i2c/muxes/i2c-mux-uclass.c @@ -4,6 +4,8 @@ * Written by Simon Glass <sjg(a)chromium.org> */ +#define LOG_CATEGORY UCLASS_I2C_MUX + #include <common.h> #include <dm.h> #include <errno.h> diff --git a/drivers/input/keyboard-uclass.c b/drivers/input/keyboard-uclass.c index 2c6680337d..aefc8e825e 100644 --- a/drivers/input/keyboard-uclass.c +++ b/drivers/input/keyboard-uclass.c @@ -3,6 +3,8 @@ * Copyright (c) 2015 Google, Inc */ +#define LOG_CATEGORY UCLASS_KEYBOARD + #include <common.h> #include <dm.h> #include <keyboard.h> diff --git a/drivers/led/led-uclass.c b/drivers/led/led-uclass.c index e15a2967ff..7e298dbb06 100644 --- a/drivers/led/led-uclass.c +++ b/drivers/led/led-uclass.c @@ -4,6 +4,8 @@ * Written by Simon Glass <sjg(a)chromium.org> */ +#define LOG_CATEGORY UCLASS_LED + #include <common.h> #include <dm.h> #include <errno.h> diff --git a/drivers/mailbox/mailbox-uclass.c b/drivers/mailbox/mailbox-uclass.c index c972d84608..01c9e75fa5 100644 --- a/drivers/mailbox/mailbox-uclass.c +++ b/drivers/mailbox/mailbox-uclass.c @@ -3,6 +3,8 @@ * Copyright (c) 2016, NVIDIA CORPORATION. */ +#define LOG_CATEGORY UCLASS_MAILBOX + #include <common.h> #include <dm.h> #include <log.h> diff --git a/drivers/misc/fs_loader.c b/drivers/misc/fs_loader.c index e77b3af770..0139bd66ba 100644 --- a/drivers/misc/fs_loader.c +++ b/drivers/misc/fs_loader.c @@ -3,6 +3,9 @@ * Copyright (C) 2018-2019 Intel Corporation <www.intel.com> * */ + +#define LOG_CATEGORY UCLASS_FS_FIRMWARE_LOADER + #include <common.h> #include <dm.h> #include <env.h> diff --git a/drivers/misc/i2c_eeprom.c b/drivers/misc/i2c_eeprom.c index 5926c91a2e..3b249842f8 100644 --- a/drivers/misc/i2c_eeprom.c +++ b/drivers/misc/i2c_eeprom.c @@ -3,6 +3,8 @@ * Copyright (c) 2014 Google, Inc */ +#define LOG_CATEGORY UCLASS_I2C_EEPROM + #include <common.h> #include <eeprom.h> #include <linux/delay.h> diff --git a/drivers/misc/misc-uclass.c b/drivers/misc/misc-uclass.c index 55381edc98..72720b0e59 100644 --- a/drivers/misc/misc-uclass.c +++ b/drivers/misc/misc-uclass.c @@ -3,6 +3,8 @@ * Copyright (C) 2010 Thomas Chou <thomas(a)wytron.com.tw> */ +#define LOG_CATEGORY UCLASS_MISC + #include <common.h> #include <dm.h> #include <errno.h> diff --git a/drivers/misc/p2sb-uclass.c b/drivers/misc/p2sb-uclass.c index ac2852559f..94d273de9b 100644 --- a/drivers/misc/p2sb-uclass.c +++ b/drivers/misc/p2sb-uclass.c @@ -6,6 +6,8 @@ * Written by Simon Glass <sjg(a)chromium.org> */ +#define LOG_CATEGORY UCLASS_P2SB + #include <common.h> #include <dm.h> #include <log.h> diff --git a/drivers/misc/pwrseq-uclass.c b/drivers/misc/pwrseq-uclass.c index c8f6c46069..a0f24e1bf3 100644 --- a/drivers/misc/pwrseq-uclass.c +++ b/drivers/misc/pwrseq-uclass.c @@ -3,6 +3,8 @@ * Copyright (c) 2015 Google, Inc */ +#define LOG_CATEGORY UCLASS_PWRSEQ + #include <common.h> #include <dm.h> #include <pwrseq.h> diff --git a/drivers/mmc/mmc-uclass.c b/drivers/mmc/mmc-uclass.c index d36aae367e..bfdb21af3e 100644 --- a/drivers/mmc/mmc-uclass.c +++ b/drivers/mmc/mmc-uclass.c @@ -5,6 +5,8 @@ * Written by Simon Glass <sjg(a)chromium.org> */ +#define LOG_CATEGORY UCLASS_MMC + #include <common.h> #include <log.h> #include <mmc.h> diff --git a/drivers/mtd/mtd-uclass.c b/drivers/mtd/mtd-uclass.c index 9f5f672ba3..81dba7750f 100644 --- a/drivers/mtd/mtd-uclass.c +++ b/drivers/mtd/mtd-uclass.c @@ -3,6 +3,8 @@ * Copyright (C) 2015 Thomas Chou <thomas(a)wytron.com.tw> */ +#define LOG_CATEGORY UCLASS_MTD + #include <common.h> #include <dm.h> #include <dm/device-internal.h> diff --git a/drivers/mtd/spi/sf-uclass.c b/drivers/mtd/spi/sf-uclass.c index cfce00ef54..63d16291ff 100644 --- a/drivers/mtd/spi/sf-uclass.c +++ b/drivers/mtd/spi/sf-uclass.c @@ -3,6 +3,8 @@ * Copyright (c) 2014 Google, Inc */ +#define LOG_CATEGORY UCLASS_SPI_FLASH + #include <common.h> #include <dm.h> #include <log.h> diff --git a/drivers/mux/mux-uclass.c b/drivers/mux/mux-uclass.c index 6d28dbe4d1..91842c5539 100644 --- a/drivers/mux/mux-uclass.c +++ b/drivers/mux/mux-uclass.c @@ -11,6 +11,8 @@ * Jean-Jacques Hiblot <jjhiblot(a)ti.com> */ +#define LOG_CATEGORY UCLASS_MUX + #include <common.h> #include <dm.h> #include <mux-internal.h> diff --git a/drivers/nvme/nvme-uclass.c b/drivers/nvme/nvme-uclass.c index 277e31e1f3..65ceabf840 100644 --- a/drivers/nvme/nvme-uclass.c +++ b/drivers/nvme/nvme-uclass.c @@ -4,6 +4,8 @@ * Copyright (C) 2017 Bin Meng <bmeng.cn(a)gmail.com> */ +#define LOG_CATEGORY UCLASS_NVME + #include <common.h> #include <blk.h> #include <errno.h> diff --git a/drivers/pch/pch-uclass.c b/drivers/pch/pch-uclass.c index ad4906aa58..7bc2372e96 100644 --- a/drivers/pch/pch-uclass.c +++ b/drivers/pch/pch-uclass.c @@ -4,6 +4,8 @@ * Written by Simon Glass <sjg(a)chromium.org> */ +#define LOG_CATEGORY UCLASS_PCH + #include <common.h> #include <dm.h> #include <pch.h> diff --git a/drivers/pci/pci-uclass.c b/drivers/pci/pci-uclass.c index dfd54b339f..c46da72c03 100644 --- a/drivers/pci/pci-uclass.c +++ b/drivers/pci/pci-uclass.c @@ -4,6 +4,8 @@ * Written by Simon Glass <sjg(a)chromium.org> */ +#define LOG_CATEGORY UCLASS_PCI + #include <common.h> #include <dm.h> #include <errno.h> diff --git a/drivers/pci_endpoint/pci_ep-uclass.c b/drivers/pci_endpoint/pci_ep-uclass.c index 5555cf5a8c..6ee4cfbdb4 100644 --- a/drivers/pci_endpoint/pci_ep-uclass.c +++ b/drivers/pci_endpoint/pci_ep-uclass.c @@ -9,6 +9,8 @@ * Written by Ramon Fried <ramon.fried(a)gmail.com> */ +#define LOG_CATEGORY UCLASS_PCI_EP + #include <common.h> #include <dm.h> #include <errno.h> diff --git a/drivers/phy/phy-uclass.c b/drivers/phy/phy-uclass.c index 43ffbcee0f..59683a080c 100644 --- a/drivers/phy/phy-uclass.c +++ b/drivers/phy/phy-uclass.c @@ -4,6 +4,8 @@ * Written by Jean-Jacques Hiblot <jjhiblot(a)ti.com> */ +#define LOG_CATEGORY UCLASS_PHY + #include <common.h> #include <dm.h> #include <dm/device_compat.h> diff --git a/drivers/pinctrl/pinctrl-uclass.c b/drivers/pinctrl/pinctrl-uclass.c index 6e68e52c32..ea7275ca00 100644 --- a/drivers/pinctrl/pinctrl-uclass.c +++ b/drivers/pinctrl/pinctrl-uclass.c @@ -3,6 +3,8 @@ * Copyright (C) 2015 Masahiro Yamada <yamada.masahiro(a)socionext.com> */ +#define LOG_CATEGORY UCLASS_PINCTRL + #include <common.h> #include <malloc.h> #include <asm/global_data.h> diff --git a/drivers/power/domain/power-domain-uclass.c b/drivers/power/domain/power-domain-uclass.c index af829db9da..00d1489ea2 100644 --- a/drivers/power/domain/power-domain-uclass.c +++ b/drivers/power/domain/power-domain-uclass.c @@ -3,6 +3,8 @@ * Copyright (c) 2016, NVIDIA CORPORATION. */ +#define LOG_CATEGORY UCLASS_POWER_DOMAIN + #include <common.h> #include <dm.h> #include <log.h> diff --git a/drivers/power/pmic/pmic-uclass.c b/drivers/power/pmic/pmic-uclass.c index 79166b8bbc..5dcf6d8079 100644 --- a/drivers/power/pmic/pmic-uclass.c +++ b/drivers/power/pmic/pmic-uclass.c @@ -4,6 +4,8 @@ * Przemyslaw Marczak <p.marczak(a)samsung.com> */ +#define LOG_CATEGORY UCLASS_PMIC + #include <common.h> #include <fdtdec.h> #include <errno.h> diff --git a/drivers/power/regulator/regulator-uclass.c b/drivers/power/regulator/regulator-uclass.c index 4d2e730271..3aef3b650e 100644 --- a/drivers/power/regulator/regulator-uclass.c +++ b/drivers/power/regulator/regulator-uclass.c @@ -4,6 +4,8 @@ * Przemyslaw Marczak <p.marczak(a)samsung.com> */ +#define LOG_CATEGORY UCLASS_REGULATOR + #include <common.h> #include <errno.h> #include <dm.h> diff --git a/drivers/pwm/pwm-uclass.c b/drivers/pwm/pwm-uclass.c index 027181c646..648d0757ba 100644 --- a/drivers/pwm/pwm-uclass.c +++ b/drivers/pwm/pwm-uclass.c @@ -4,6 +4,8 @@ * Written by Simon Glass <sjg(a)chromium.org> */ +#define LOG_CATEGORY UCLASS_PWM + #include <common.h> #include <dm.h> #include <pwm.h> diff --git a/drivers/ram/ram-uclass.c b/drivers/ram/ram-uclass.c index f4d387fed1..4e21240fd4 100644 --- a/drivers/ram/ram-uclass.c +++ b/drivers/ram/ram-uclass.c @@ -4,6 +4,8 @@ * Written by Simon Glass <sjg(a)chromium.org> */ +#define LOG_CATEGORY UCLASS_RAM + #include <common.h> #include <ram.h> #include <dm.h> diff --git a/drivers/remoteproc/rproc-uclass.c b/drivers/remoteproc/rproc-uclass.c index 5919c8bb97..64c47c1e72 100644 --- a/drivers/remoteproc/rproc-uclass.c +++ b/drivers/remoteproc/rproc-uclass.c @@ -3,6 +3,9 @@ * (C) Copyright 2015 * Texas Instruments Incorporated - http://www.ti.com/ */ + +#define LOG_CATEGORY UCLASS_REMOTEPROC + #define pr_fmt(fmt) "%s: " fmt, __func__ #include <common.h> #include <errno.h> diff --git a/drivers/reset/reset-uclass.c b/drivers/reset/reset-uclass.c index 071c389ca0..78df4623b7 100644 --- a/drivers/reset/reset-uclass.c +++ b/drivers/reset/reset-uclass.c @@ -3,6 +3,8 @@ * Copyright (c) 2016, NVIDIA CORPORATION. */ +#define LOG_CATEGORY UCLASS_RESET + #include <common.h> #include <dm.h> #include <fdtdec.h> diff --git a/drivers/rng/rng-uclass.c b/drivers/rng/rng-uclass.c index b6af3b8606..53108e1b31 100644 --- a/drivers/rng/rng-uclass.c +++ b/drivers/rng/rng-uclass.c @@ -3,6 +3,8 @@ * Copyright (c) 2019, Linaro Limited */ +#define LOG_CATEGORY UCLASS_RNG + #include <common.h> #include <dm.h> #include <rng.h> diff --git a/drivers/rtc/rtc-uclass.c b/drivers/rtc/rtc-uclass.c index b406bab32d..be6a2ddb66 100644 --- a/drivers/rtc/rtc-uclass.c +++ b/drivers/rtc/rtc-uclass.c @@ -4,6 +4,8 @@ * Written by Simon Glass <sjg(a)chromium.org> */ +#define LOG_CATEGORY UCLASS_RTC + #include <common.h> #include <dm.h> #include <errno.h> diff --git a/drivers/scsi/scsi-uclass.c b/drivers/scsi/scsi-uclass.c index 90a0adda47..a7c1eaf0cf 100644 --- a/drivers/scsi/scsi-uclass.c +++ b/drivers/scsi/scsi-uclass.c @@ -8,6 +8,8 @@ * Based on ahci-uclass.c */ +#define LOG_CATEGORY UCLASS_SCSI + #include <common.h> #include <dm.h> #include <scsi.h> diff --git a/drivers/serial/serial-uclass.c b/drivers/serial/serial-uclass.c index 8a87eed683..2b4feace53 100644 --- a/drivers/serial/serial-uclass.c +++ b/drivers/serial/serial-uclass.c @@ -3,6 +3,8 @@ * Copyright (c) 2014 The Chromium OS Authors. */ +#define LOG_CATEGORY UCLASS_SERIAL + #include <common.h> #include <dm.h> #include <env_internal.h> diff --git a/drivers/smem/smem-uclass.c b/drivers/smem/smem-uclass.c index ce7bf40656..8469076915 100644 --- a/drivers/smem/smem-uclass.c +++ b/drivers/smem/smem-uclass.c @@ -3,6 +3,8 @@ * Copyright (c) 2018 Ramon Fried <ramon.fried(a)gmail.com> */ +#define LOG_CATEGORY UCLASS_SMEM + #include <common.h> #include <dm.h> #include <smem.h> diff --git a/drivers/soc/soc-uclass.c b/drivers/soc/soc-uclass.c index c32d647864..dfad32d80d 100644 --- a/drivers/soc/soc-uclass.c +++ b/drivers/soc/soc-uclass.c @@ -4,6 +4,8 @@ * Dave Gerlach <d-gerlach(a)ti.com> */ +#define LOG_CATEGORY UCLASS_SOC + #include <common.h> #include <soc.h> #include <dm.h> diff --git a/drivers/sound/codec-uclass.c b/drivers/sound/codec-uclass.c index 1ec77acfc1..2cb233bd30 100644 --- a/drivers/sound/codec-uclass.c +++ b/drivers/sound/codec-uclass.c @@ -4,6 +4,8 @@ * Written by Simon Glass <sjg(a)chromium.org> */ +#define LOG_CATEGORY UCLASS_AUDIO_CODEC + #include <common.h> #include <dm.h> #include <audio_codec.h> diff --git a/drivers/sound/i2s-uclass.c b/drivers/sound/i2s-uclass.c index 2639c86ea2..fc4f686b51 100644 --- a/drivers/sound/i2s-uclass.c +++ b/drivers/sound/i2s-uclass.c @@ -4,6 +4,8 @@ * Written by Simon Glass <sjg(a)chromium.org> */ +#define LOG_CATEGORY UCLASS_I2S + #include <common.h> #include <dm.h> #include <i2s.h> diff --git a/drivers/sound/sound-uclass.c b/drivers/sound/sound-uclass.c index 0c71e01f33..2ffc4fc7c1 100644 --- a/drivers/sound/sound-uclass.c +++ b/drivers/sound/sound-uclass.c @@ -4,6 +4,8 @@ * Written by Simon Glass <sjg(a)chromium.org> */ +#define LOG_CATEGORY UCLASS_SOUND + #include <common.h> #include <dm.h> #include <i2s.h> diff --git a/drivers/spi/spi-emul-uclass.c b/drivers/spi/spi-emul-uclass.c index 52f3f9a011..64bc19c001 100644 --- a/drivers/spi/spi-emul-uclass.c +++ b/drivers/spi/spi-emul-uclass.c @@ -3,6 +3,8 @@ * Copyright (c) 2014 Google, Inc */ +#define LOG_CATEGORY UCLASS_SPI_EMUL + #include <common.h> #include <dm.h> #include <spi.h> diff --git a/drivers/spmi/spmi-uclass.c b/drivers/spmi/spmi-uclass.c index ff098731bb..9d9f46a37d 100644 --- a/drivers/spmi/spmi-uclass.c +++ b/drivers/spmi/spmi-uclass.c @@ -5,6 +5,8 @@ * (C) Copyright 2015 Mateusz Kulikowski <mateusz.kulikowski(a)gmail.com> */ +#define LOG_CATEGORY UCLASS_SPMI + #include <common.h> #include <dm.h> #include <errno.h> diff --git a/drivers/sysinfo/sysinfo-uclass.c b/drivers/sysinfo/sysinfo-uclass.c index 6df58fe160..0e87bb0e54 100644 --- a/drivers/sysinfo/sysinfo-uclass.c +++ b/drivers/sysinfo/sysinfo-uclass.c @@ -4,6 +4,8 @@ * Mario Six, Guntermann & Drunck GmbH, mario.six(a)gdsys.cc */ +#define LOG_CATEGORY UCLASS_SYSINFO + #include <common.h> #include <dm.h> #include <sysinfo.h> diff --git a/drivers/tee/tee-uclass.c b/drivers/tee/tee-uclass.c index 2cc6b6c407..cb1b28e2f8 100644 --- a/drivers/tee/tee-uclass.c +++ b/drivers/tee/tee-uclass.c @@ -3,6 +3,8 @@ * Copyright (c) 2018 Linaro Limited */ +#define LOG_CATEGORY UCLASS_TEE + #include <common.h> #include <dm.h> #include <log.h> diff --git a/drivers/thermal/thermal-uclass.c b/drivers/thermal/thermal-uclass.c index a4ea1e2914..700df8af25 100644 --- a/drivers/thermal/thermal-uclass.c +++ b/drivers/thermal/thermal-uclass.c @@ -3,6 +3,8 @@ * (C) Copyright 2014 Freescale Semiconductor, Inc */ +#define LOG_CATEGORY UCLASS_THERMAL + #include <common.h> #include <dm.h> #include <thermal.h> diff --git a/drivers/timer/timer-uclass.c b/drivers/timer/timer-uclass.c index 73b4a5cd27..c8e8419b22 100644 --- a/drivers/timer/timer-uclass.c +++ b/drivers/timer/timer-uclass.c @@ -3,6 +3,8 @@ * Copyright (C) 2015 Thomas Chou <thomas(a)wytron.com.tw> */ +#define LOG_CATEGORY UCLASS_TIMER + #include <common.h> #include <clk.h> #include <cpu.h> diff --git a/drivers/ufs/ufs-uclass.c b/drivers/ufs/ufs-uclass.c index 034d14fd8d..ceea30c4a9 100644 --- a/drivers/ufs/ufs-uclass.c +++ b/drivers/ufs/ufs-uclass.c @@ -5,6 +5,8 @@ * Copyright (C) 2019 Texas Instruments Incorporated - http://www.ti.com */ +#define LOG_CATEGORY UCLASS_UFS + #include <common.h> #include "ufs.h" #include <dm.h> diff --git a/drivers/usb/emul/usb-emul-uclass.c b/drivers/usb/emul/usb-emul-uclass.c index f5d98b917d..05f6d3d9e2 100644 --- a/drivers/usb/emul/usb-emul-uclass.c +++ b/drivers/usb/emul/usb-emul-uclass.c @@ -4,6 +4,8 @@ * Written by Simon Glass <sjg(a)chromium.org> */ +#define LOG_CATEGORY UCLASS_USB_EMUL + #include <common.h> #include <dm.h> #include <log.h> diff --git a/drivers/usb/gadget/udc/udc-uclass.c b/drivers/usb/gadget/udc/udc-uclass.c index dbc354e84f..de8861829c 100644 --- a/drivers/usb/gadget/udc/udc-uclass.c +++ b/drivers/usb/gadget/udc/udc-uclass.c @@ -4,6 +4,8 @@ * Written by Jean-Jacques Hiblot <jjhiblot(a)ti.com> */ +#define LOG_CATEGORY UCLASS_USB_GADGET_GENERIC + #include <common.h> #include <dm.h> #include <dm/device-internal.h> diff --git a/drivers/usb/host/usb-uclass.c b/drivers/usb/host/usb-uclass.c index e3b616c326..fd39c3345c 100644 --- a/drivers/usb/host/usb-uclass.c +++ b/drivers/usb/host/usb-uclass.c @@ -6,6 +6,8 @@ * usb_match_device() modified from Linux kernel v4.0. */ +#define LOG_CATEGORY UCLASS_USB + #include <common.h> #include <dm.h> #include <errno.h> diff --git a/drivers/video/backlight-uclass.c b/drivers/video/backlight-uclass.c index 0aadf8a1f9..c14996d003 100644 --- a/drivers/video/backlight-uclass.c +++ b/drivers/video/backlight-uclass.c @@ -4,6 +4,8 @@ * Written by Simon Glass <sjg(a)chromium.org> */ +#define LOG_CATEGORY UCLASS_PANEL_BACKLIGHT + #include <common.h> #include <dm.h> #include <backlight.h> diff --git a/drivers/video/bridge/video-bridge-uclass.c b/drivers/video/bridge/video-bridge-uclass.c index 08d38b244b..f389bc6b14 100644 --- a/drivers/video/bridge/video-bridge-uclass.c +++ b/drivers/video/bridge/video-bridge-uclass.c @@ -4,6 +4,8 @@ * Written by Simon Glass <sjg(a)chromium.org> */ +#define LOG_CATEGORY UCLASS_VIDEO_BRIDGE + #include <common.h> #include <dm.h> #include <errno.h> diff --git a/drivers/video/display-uclass.c b/drivers/video/display-uclass.c index 068108e915..2da3d1d14e 100644 --- a/drivers/video/display-uclass.c +++ b/drivers/video/display-uclass.c @@ -3,6 +3,8 @@ * Copyright 2014 Google Inc. */ +#define LOG_CATEGORY UCLASS_DISPLAY + #include <common.h> #include <dm.h> #include <display.h> diff --git a/drivers/video/dsi-host-uclass.c b/drivers/video/dsi-host-uclass.c index 1db1f88a17..6e5256eb12 100644 --- a/drivers/video/dsi-host-uclass.c +++ b/drivers/video/dsi-host-uclass.c @@ -5,6 +5,8 @@ * */ +#define LOG_CATEGORY UCLASS_DSI_HOST + #include <common.h> #include <dm.h> #include <dsi_host.h> diff --git a/drivers/video/panel-uclass.c b/drivers/video/panel-uclass.c index 246d1b2836..bb2eaae2e9 100644 --- a/drivers/video/panel-uclass.c +++ b/drivers/video/panel-uclass.c @@ -4,6 +4,8 @@ * Written by Simon Glass <sjg(a)chromium.org> */ +#define LOG_CATEGORY UCLASS_PANEL + #include <common.h> #include <dm.h> #include <panel.h> diff --git a/drivers/video/vidconsole-uclass.c b/drivers/video/vidconsole-uclass.c index 81b65f5aae..8f7d987cdd 100644 --- a/drivers/video/vidconsole-uclass.c +++ b/drivers/video/vidconsole-uclass.c @@ -7,6 +7,8 @@ * Bernecker & Rainer Industrieelektronik GmbH - http://www.br-automation.com */ +#define LOG_CATEGORY UCLASS_VIDEO_CONSOLE + #include <common.h> #include <command.h> #include <console.h> diff --git a/drivers/video/video-uclass.c b/drivers/video/video-uclass.c index 96ec6f80af..9f8cf6ef2a 100644 --- a/drivers/video/video-uclass.c +++ b/drivers/video/video-uclass.c @@ -3,6 +3,8 @@ * Copyright (c) 2015 Google, Inc */ +#define LOG_CATEGORY UCLASS_VIDEO + #include <common.h> #include <console.h> #include <cpu_func.h> diff --git a/drivers/video/video_osd-uclass.c b/drivers/video/video_osd-uclass.c index 82136a292b..0d3aae4d82 100644 --- a/drivers/video/video_osd-uclass.c +++ b/drivers/video/video_osd-uclass.c @@ -4,6 +4,8 @@ * Mario Six, Guntermann & Drunck GmbH, mario.six(a)gdsys.cc */ +#define LOG_CATEGORY UCLASS_VIDEO_OSD + #include <common.h> #include <dm.h> #include <video_osd.h> diff --git a/drivers/virtio/virtio-uclass.c b/drivers/virtio/virtio-uclass.c index 0379536c54..9e2d0e06a1 100644 --- a/drivers/virtio/virtio-uclass.c +++ b/drivers/virtio/virtio-uclass.c @@ -15,6 +15,8 @@ * the VirtIO specification v1.0. */ +#define LOG_CATEGORY UCLASS_VIRTIO + #include <common.h> #include <dm.h> #include <log.h> diff --git a/drivers/w1-eeprom/w1-eeprom-uclass.c b/drivers/w1-eeprom/w1-eeprom-uclass.c index 97a9d43b03..68681161a2 100644 --- a/drivers/w1-eeprom/w1-eeprom-uclass.c +++ b/drivers/w1-eeprom/w1-eeprom-uclass.c @@ -10,6 +10,8 @@ * */ +#define LOG_CATEGORY UCLASS_W1_EEPROM + #include <common.h> #include <dm.h> #include <log.h> diff --git a/drivers/w1/w1-uclass.c b/drivers/w1/w1-uclass.c index 8bc6cb13f4..2ee706cc87 100644 --- a/drivers/w1/w1-uclass.c +++ b/drivers/w1/w1-uclass.c @@ -10,6 +10,8 @@ * */ +#define LOG_CATEGORY UCLASS_W1 + #include <common.h> #include <dm.h> #include <log.h> diff --git a/drivers/watchdog/wdt-uclass.c b/drivers/watchdog/wdt-uclass.c index 0603ffbd36..bc448f2479 100644 --- a/drivers/watchdog/wdt-uclass.c +++ b/drivers/watchdog/wdt-uclass.c @@ -3,6 +3,8 @@ * Copyright 2017 Google, Inc */ +#define LOG_CATEGORY UCLASS_WDT + #include <common.h> #include <dm.h> #include <errno.h> diff --git a/drivers/xen/pvblock.c b/drivers/xen/pvblock.c index 1c5d039ef0..c25c3ea4ff 100644 --- a/drivers/xen/pvblock.c +++ b/drivers/xen/pvblock.c @@ -3,6 +3,9 @@ * (C) 2007-2008 Samuel Thibault. * (C) Copyright 2020 EPAM Systems Inc. */ + +#define LOG_CATEGORY UCLASS_PVBLOCK + #include <blk.h> #include <common.h> #include <dm.h> -- 2.17.1

2 2

[PATCH 1/1] sandbox: ensure that state->ram_buf is in low memory
by Heinrich Schuchardt 04 Jul '21

04 Jul '21

Addresses in state->ram_buf must be in the low 4 GiB of the address space. Otherwise we cannot correctly fill SMBIOS tables. This shows up in warnings like: WARNING: SMBIOS table_address overflow 7f752735e020 Ensure that state->ram_buf is initialized by the first invocation of os_malloc(). Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- arch/sandbox/cpu/start.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/arch/sandbox/cpu/start.c b/arch/sandbox/cpu/start.c index e87365e800..1388dba895 100644 --- a/arch/sandbox/cpu/start.c +++ b/arch/sandbox/cpu/start.c @@ -439,6 +439,14 @@ int main(int argc, char *argv[]) int size; int ret; + /* + * This must be the first invocation of os_malloc() to have + * state->ram_buf in the low 4 GiB. + */ + ret = state_init(); + if (ret) + goto err; + /* * Copy argv[] so that we can pass the arguments in the original * sequence when resetting the sandbox. @@ -453,10 +461,6 @@ int main(int argc, char *argv[]) gd = &data; gd->arch.text_base = os_find_text_base(); - ret = state_init(); - if (ret) - goto err; - state = state_get_current(); if (os_parse_args(state, argc, argv)) return 1; -- 2.30.2

2 12

[PATCH 1/1] sandbox: fix sandbox_reset()
by Heinrich Schuchardt 04 Jul '21

04 Jul '21

state_uninit() and dm_uninit() are mutually exclusive: state_uninit() prints via drivers. So it cannot be executed after dm_uninit(). dm_uninit() requires memory. So it cannot be executed after state_uninit() which releases all memory. Just skip dm_uninit() when resetting the sandbox. We will wake up in a new process and allocate new memory. So this cleanup is not required. We don't do it in sandbox_exit() either. This avoids a segmentation error when efi_reset_system_boottime() is invoked by a UEFI application. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- arch/sandbox/cpu/start.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/arch/sandbox/cpu/start.c b/arch/sandbox/cpu/start.c index e87365e800..4ffd97ccbc 100644 --- a/arch/sandbox/cpu/start.c +++ b/arch/sandbox/cpu/start.c @@ -425,9 +425,6 @@ void sandbox_reset(void) if (state_uninit()) os_exit(2); - if (dm_uninit()) - os_exit(2); - /* Restart U-Boot */ os_relaunch(os_argv); } -- 2.30.2

3 3

Re: [PATCH v2 1/1] sandbox: don't refer to symbol _init
by Rick Chen 04 Jul '21

04 Jul '21

> From: U-Boot <u-boot-bounces(a)lists.denx.de> On Behalf Of Heinrich Schuchardt > Sent: Wednesday, May 19, 2021 6:03 PM > To: Simon Glass <sjg(a)chromium.org> > Cc: Ovidiu Panait <ovidiu.panait(a)windriver.com>; Bin Meng <bmeng.cn(a)gmail.com>; Stefan Roese <sr(a)denx.de>; Masahiro Yamada <masahiroy(a)kernel.org>; u-boot(a)lists.denx.de; Heinrich Schuchardt <xypron.glpk(a)gmx.de> > Subject: [PATCH v2 1/1] sandbox: don't refer to symbol _init > > GCC provides a symbol _init in crti.o on x86_64 and aarch64 but not on RISC-V. The following lines leads to a build error for sandbox_defconfig on RISC-V due to the missing symbol: > > common/board_f.c:269: > #elif defined(CONFIG_SANDBOX) || defined(CONFIG_EFI_APP) > gd->mon_len = (ulong)&_end - (ulong)_init; > > The sandbox code is not copied into the memory allocated using mmap(). > Hence we can safely use gd->mon_len = 0 to avoid the reference to _init. > > Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> > Reviewed-by: Bin Meng <bmeng.cn(a)gmail.com> > --- > v2: > fix typo in commit message > --- > common/board_f.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) Reviewed-by: Rick Chen <rick(a)andestech.com>

2 1