April 2022 - U-Boot

[PATCH v1] net: eth-uclass: Fix eth_halt
by qianfanguijin＠163.com 02 Apr '22

02 Apr '22

From: qianfan Zhao <qianfanguijin(a)163.com> eth_device_priv maybe unaccessable after @stop handler due to eth device is removed in @stop. Setting private data before @stop handler. This also fix data abort bug when run dhcp or tftp command via usbnet. Signed-off-by: qianfan Zhao <qianfanguijin(a)163.com> --- net/eth-uclass.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/net/eth-uclass.c b/net/eth-uclass.c index 58c308f332..c6eb1bc8f8 100644 --- a/net/eth-uclass.c +++ b/net/eth-uclass.c @@ -338,9 +338,14 @@ void eth_halt(void) if (!priv || !priv->running) return; - eth_get_ops(current)->stop(current); - priv->state = ETH_STATE_PASSIVE; + /* Make sure setting private data before @stop handler, it may remove + * ethernet device and will cause @priv unaccessable. + * eg: + * usb_eth_stop -> usb_gadget_release -> device_remove + */ priv->running = false; + + eth_get_ops(current)->stop(current); } int eth_is_active(struct udevice *dev) -- 2.17.1

3 2

[PATCH v2 1/2] net: eth-uclass: Fix eth_halt
by qianfanguijin＠163.com 01 Apr '22

01 Apr '22

From: qianfan Zhao <qianfanguijin(a)163.com> eth_device_priv maybe unaccessable after @stop handler due to eth device is removed in @stop. Setting private data before @stop handler. This also fix data abort bug when run dhcp or tftp command via usbnet. Signed-off-by: qianfan Zhao <qianfanguijin(a)163.com> --- net/eth-uclass.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/net/eth-uclass.c b/net/eth-uclass.c index 58c308f332..c6eb1bc8f8 100644 --- a/net/eth-uclass.c +++ b/net/eth-uclass.c @@ -338,9 +338,14 @@ void eth_halt(void) if (!priv || !priv->running) return; - eth_get_ops(current)->stop(current); - priv->state = ETH_STATE_PASSIVE; + /* Make sure setting private data before @stop handler, it may remove + * ethernet device and will cause @priv unaccessable. + * eg: + * usb_eth_stop -> usb_gadget_release -> device_remove + */ priv->running = false; + + eth_get_ops(current)->stop(current); } int eth_is_active(struct udevice *dev) -- 2.17.1

2 2

[PATCH] net: phy: dp83867: Fix a never true comparison
by li.haolin＠qq.com 01 Apr '22

01 Apr '22

From: Haolin Li <li.haolin(a)qq.com> The type of the return value of phy_read() and phy_read_mmd() is int. Change the variable to not be unsigned so that we not get into an unsigned compared against 0. Signed-off-by: Haolin Li <li.haolin(a)qq.com> --- drivers/net/phy/dp83867.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/net/phy/dp83867.c b/drivers/net/phy/dp83867.c index eada4541c9..c5d44f4629 100644 --- a/drivers/net/phy/dp83867.c +++ b/drivers/net/phy/dp83867.c @@ -266,7 +266,7 @@ static int dp83867_of_init(struct phy_device *phydev) static int dp83867_config(struct phy_device *phydev) { struct dp83867_private *dp83867; - unsigned int val, delay, cfg2; + int val, delay, cfg2; int ret, bs; dp83867 = (struct dp83867_private *)phydev->priv; @@ -291,8 +291,11 @@ static int dp83867_config(struct phy_device *phydev) if (phy_interface_is_rgmii(phydev)) { val = phy_read(phydev, MDIO_DEVAD_NONE, MII_DP83867_PHYCTRL); - if (val < 0) + if (val < 0) { + ret = val; goto err_out; + } + val &= ~DP83867_PHYCR_FIFO_DEPTH_MASK; val |= (dp83867->fifo_depth << DP83867_PHYCR_FIFO_DEPTH_SHIFT); -- 2.25.1

2 2

[PATCH 01/11] db-mv784mp-gp: Rename CONFIG_DB_784MP_GP to CONFIG_TARGET_DB_MV784MP_GP
by Tom Rini 01 Apr '22

01 Apr '22

The value CONFIG_DB_784MP_GP is only used in the DDR code to refer to CONFIG_TARGET_DB_MV784MP_GP so just use that second value directly. Cc: Stefan Roese <sr(a)denx.de> Signed-off-by: Tom Rini <trini(a)konsulko.com> --- arch/arm/mach-mvebu/serdes/axp/high_speed_env_lib.c | 2 +- drivers/ddr/marvell/axp/ddr3_axp.h | 2 +- drivers/ddr/marvell/axp/ddr3_axp_config.h | 2 +- include/configs/db-mv784mp-gp.h | 5 ----- 4 files changed, 3 insertions(+), 8 deletions(-) diff --git a/arch/arm/mach-mvebu/serdes/axp/high_speed_env_lib.c b/arch/arm/mach-mvebu/serdes/axp/high_speed_env_lib.c index 0b63664dd8be..68f8eade2722 100644 --- a/arch/arm/mach-mvebu/serdes/axp/high_speed_env_lib.c +++ b/arch/arm/mach-mvebu/serdes/axp/high_speed_env_lib.c @@ -62,7 +62,7 @@ static u32 board_id_get(void) return DB_78X60_AMC_ID; #elif defined(CONFIG_DB_78X60_PCAC_REV2) return DB_78X60_PCAC_REV2_ID; -#elif defined(CONFIG_DB_784MP_GP) +#elif defined(CONFIG_TARGET_DB_MV784MP_GP) return DB_784MP_GP_ID; #elif defined(CONFIG_RD_78460_CUSTOMER) return RD_78460_CUSTOMER_ID; diff --git a/drivers/ddr/marvell/axp/ddr3_axp.h b/drivers/ddr/marvell/axp/ddr3_axp.h index 970651f87029..a14c766dda71 100644 --- a/drivers/ddr/marvell/axp/ddr3_axp.h +++ b/drivers/ddr/marvell/axp/ddr3_axp.h @@ -37,7 +37,7 @@ #define ECC_SUPPORT #endif #define NEW_FABRIC_TWSI_ADDR 0x4E -#ifdef CONFIG_DB_784MP_GP +#ifdef CONFIG_TARGET_DB_MV784MP_GP #define BUS_WIDTH_ECC_TWSI_ADDR 0x4E #else #define BUS_WIDTH_ECC_TWSI_ADDR 0x4F diff --git a/drivers/ddr/marvell/axp/ddr3_axp_config.h b/drivers/ddr/marvell/axp/ddr3_axp_config.h index 437a02efbac9..ab09e72623a0 100644 --- a/drivers/ddr/marvell/axp/ddr3_axp_config.h +++ b/drivers/ddr/marvell/axp/ddr3_axp_config.h @@ -138,7 +138,7 @@ * Enables I2C auto detection different options */ #if defined(CONFIG_DB_88F78X60) || defined(CONFIG_DB_88F78X60_REV2) || \ - defined(CONFIG_DB_784MP_GP) + defined(CONFIG_TARGET_DB_MV784MP_GP) #define AUTO_DETECTION_SUPPORT #endif #endif diff --git a/include/configs/db-mv784mp-gp.h b/include/configs/db-mv784mp-gp.h index 41d469d79526..d6850bd32e72 100644 --- a/include/configs/db-mv784mp-gp.h +++ b/include/configs/db-mv784mp-gp.h @@ -6,11 +6,6 @@ #ifndef _CONFIG_DB_MV7846MP_GP_H #define _CONFIG_DB_MV7846MP_GP_H -/* - * High Level Configuration Options (easy to change) - */ -#define CONFIG_DB_784MP_GP /* Board target name for DDR training */ - /* * TEXT_BASE needs to be below 16MiB, since this area is scrubbed * for DDR ECC byte filling in the SPL before loading the main -- 2.25.1

4 14

[PATCH 01/22] Convert CONFIG_CF_DSPI to Kconfig
by Tom Rini 01 Apr '22

01 Apr '22

This converts the following to Kconfig: CONFIG_CF_DSPI Signed-off-by: Tom Rini <trini(a)konsulko.com> --- arch/m68k/Kconfig | 5 +++++ include/configs/stmark2.h | 1 - 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/arch/m68k/Kconfig b/arch/m68k/Kconfig index 97c0b7b834e7..ae8d26d671dd 100644 --- a/arch/m68k/Kconfig +++ b/arch/m68k/Kconfig @@ -113,6 +113,10 @@ config M54418 bool select MCF5441x +# peripherals +config CF_DSPI + bool + choice prompt "Target select" optional @@ -176,6 +180,7 @@ config TARGET_AMCORE config TARGET_STMARK2 bool "Support stmark2" + select CF_DSPI select M54418 endchoice diff --git a/include/configs/stmark2.h b/include/configs/stmark2.h index 781dba542bde..78b8f1d4420d 100644 --- a/include/configs/stmark2.h +++ b/include/configs/stmark2.h @@ -43,7 +43,6 @@ #define CONFIG_MCFTMR /* DSPI and Serial Flash */ -#define CONFIG_CF_DSPI #define CONFIG_SERIAL_FLASH #define CONFIG_SYS_SBFHDR_SIZE 0x7 -- 2.25.1

6 29

[PATCH 1/7] am33xx: musb: Remove unused configuration logic
by Tom Rini 01 Apr '22

01 Apr '22

At this point DM and OF_CONTROL are used to configure how the USB ports are enabled, with the exception of in SPL and no SPL_OF_CONTROL. Remove a bunch of now unused logic to simplify the code. Signed-off-by: Tom Rini <trini(a)konsulko.com> --- arch/arm/mach-omap2/am33xx/board.c | 82 +++--------------------------- 1 file changed, 6 insertions(+), 76 deletions(-) diff --git a/arch/arm/mach-omap2/am33xx/board.c b/arch/arm/mach-omap2/am33xx/board.c index 5175eb01cbe9..7f1b84e466da 100644 --- a/arch/arm/mach-omap2/am33xx/board.c +++ b/arch/arm/mach-omap2/am33xx/board.c @@ -207,10 +207,8 @@ int cpu_mmc_init(struct bd_info *bis) #define RTC_BOARD_TYPE_SHIFT 16 /* AM33XX has two MUSB controllers which can be host or gadget */ -#if (defined(CONFIG_USB_MUSB_GADGET) || defined(CONFIG_USB_MUSB_HOST)) && \ - (defined(CONFIG_AM335X_USB0) || defined(CONFIG_AM335X_USB1)) && \ - (!CONFIG_IS_ENABLED(DM_USB) || !CONFIG_IS_ENABLED(OF_CONTROL)) && \ - (!defined(CONFIG_SPL_BUILD) || defined(CONFIG_SPL_MUSB_NEW)) +#if (defined(CONFIG_AM335X_USB0) || defined(CONFIG_AM335X_USB1)) && \ + defined(CONFIG_SPL_BUILD) static struct musb_hdrc_config musb_config = { .multipoint = 1, @@ -219,7 +217,7 @@ static struct musb_hdrc_config musb_config = { .ram_bits = 12, }; -#if CONFIG_IS_ENABLED(DM_USB) && !CONFIG_IS_ENABLED(OF_CONTROL) +#ifdef CONFIG_AM335X_USB0 static struct ti_musb_plat usb0 = { .base = (void *)USB0_OTG_BASE, .ctrl_mod_base = &((struct ctrl_dev *)CTRL_DEVICE_BASE)->usb_ctrl0, @@ -229,7 +227,9 @@ static struct ti_musb_plat usb0 = { .platform_ops = &musb_dsps_ops, }, }; +#endif +#ifdef CONFIG_AM335X_USB1 static struct ti_musb_plat usb1 = { .base = (void *)USB1_OTG_BASE, .ctrl_mod_base = &((struct ctrl_dev *)CTRL_DEVICE_BASE)->usb_ctrl1, @@ -239,6 +239,7 @@ static struct ti_musb_plat usb1 = { .platform_ops = &musb_dsps_ops, }, }; +#endif U_BOOT_DRVINFOS(am33xx_usbs) = { #ifdef CONFIG_AM335X_USB0_PERIPHERAL @@ -257,77 +258,6 @@ int arch_misc_init(void) { return 0; } -#else -static struct ctrl_dev *cdev = (struct ctrl_dev *)CTRL_DEVICE_BASE; - -/* USB 2.0 PHY Control */ -#define CM_PHY_PWRDN (1 << 0) -#define CM_PHY_OTG_PWRDN (1 << 1) -#define OTGVDET_EN (1 << 19) -#define OTGSESSENDEN (1 << 20) - -static void am33xx_usb_set_phy_power(u8 on, u32 *reg_addr) -{ - if (on) { - clrsetbits_le32(reg_addr, CM_PHY_PWRDN | CM_PHY_OTG_PWRDN, - OTGVDET_EN | OTGSESSENDEN); - } else { - clrsetbits_le32(reg_addr, 0, CM_PHY_PWRDN | CM_PHY_OTG_PWRDN); - } -} - -#ifdef CONFIG_AM335X_USB0 -static void am33xx_otg0_set_phy_power(struct udevice *dev, u8 on) -{ - am33xx_usb_set_phy_power(on, &cdev->usb_ctrl0); -} - -struct omap_musb_board_data otg0_board_data = { - .set_phy_power = am33xx_otg0_set_phy_power, -}; - -static struct musb_hdrc_platform_data otg0_plat = { - .mode = CONFIG_AM335X_USB0_MODE, - .config = &musb_config, - .power = 50, - .platform_ops = &musb_dsps_ops, - .board_data = &otg0_board_data, -}; -#endif - -#ifdef CONFIG_AM335X_USB1 -static void am33xx_otg1_set_phy_power(struct udevice *dev, u8 on) -{ - am33xx_usb_set_phy_power(on, &cdev->usb_ctrl1); -} - -struct omap_musb_board_data otg1_board_data = { - .set_phy_power = am33xx_otg1_set_phy_power, -}; - -static struct musb_hdrc_platform_data otg1_plat = { - .mode = CONFIG_AM335X_USB1_MODE, - .config = &musb_config, - .power = 50, - .platform_ops = &musb_dsps_ops, - .board_data = &otg1_board_data, -}; -#endif - -int arch_misc_init(void) -{ -#ifdef CONFIG_AM335X_USB0 - musb_register(&otg0_plat, &otg0_board_data, - (void *)USB0_OTG_BASE); -#endif -#ifdef CONFIG_AM335X_USB1 - musb_register(&otg1_plat, &otg1_board_data, - (void *)USB1_OTG_BASE); -#endif - return 0; -} -#endif - #else /* CONFIG_USB_MUSB_* && CONFIG_AM335X_USB* && !CONFIG_DM_USB */ int arch_misc_init(void) -- 2.25.1

1 7

[PATCH] dm: Use explicit numbers for all enum values
by Michal Simek 01 Apr '22

01 Apr '22

Based on discussion at https://lore.kernel.org/r/20200318125003.GA2727094@kroah.com we got recommendation to use explicit values for all enum values. The patch is following this recommendation. The same change was also done by commit 31431dd466e7 ("firmware: xilinx: Use explicit values for all enum values"). Signed-off-by: Michal Simek <michal.simek(a)xilinx.com> --- I was doing some debug and got uclass ID but without values it is hard to find out which uclass it is. --- include/dm/uclass-id.h | 240 ++++++++++++++++++++--------------------- 1 file changed, 120 insertions(+), 120 deletions(-) diff --git a/include/dm/uclass-id.h b/include/dm/uclass-id.h index 0e26e1d13824..30d120879a4e 100644 --- a/include/dm/uclass-id.h +++ b/include/dm/uclass-id.h @@ -13,129 +13,129 @@ enum uclass_id { /* These are used internally by driver model */ UCLASS_ROOT = 0, - UCLASS_DEMO, - UCLASS_TEST, - UCLASS_TEST_FDT, - UCLASS_TEST_FDT_MANUAL, - UCLASS_TEST_BUS, - UCLASS_TEST_PROBE, - UCLASS_TEST_DUMMY, - UCLASS_TEST_DEVRES, - UCLASS_TEST_ACPI, - UCLASS_SPI_EMUL, /* sandbox SPI device emulator */ - UCLASS_I2C_EMUL, /* sandbox I2C device emulator */ - UCLASS_I2C_EMUL_PARENT, /* parent for I2C device emulators */ - UCLASS_PCI_EMUL, /* sandbox PCI device emulator */ - UCLASS_PCI_EMUL_PARENT, /* parent for PCI device emulators */ - UCLASS_USB_EMUL, /* sandbox USB bus device emulator */ - UCLASS_AXI_EMUL, /* sandbox AXI bus device emulator */ + UCLASS_DEMO = 1, + UCLASS_TEST = 2, + UCLASS_TEST_FDT = 3, + UCLASS_TEST_FDT_MANUAL = 4, + UCLASS_TEST_BUS = 5, + UCLASS_TEST_PROBE = 6, + UCLASS_TEST_DUMMY = 7, + UCLASS_TEST_DEVRES = 8, + UCLASS_TEST_ACPI = 10, + UCLASS_SPI_EMUL = 11, /* sandbox SPI device emulator */ + UCLASS_I2C_EMUL = 12, /* sandbox I2C device emulator */ + UCLASS_I2C_EMUL_PARENT = 12, /* parent for I2C device emulators */ + UCLASS_PCI_EMUL = 13, /* sandbox PCI device emulator */ + UCLASS_PCI_EMUL_PARENT = 14, /* parent for PCI device emulators */ + UCLASS_USB_EMUL = 15, /* sandbox USB bus device emulator */ + UCLASS_AXI_EMUL = 16, /* sandbox AXI bus device emulator */ /* U-Boot uclasses start here - in alphabetical order */ - UCLASS_ACPI_PMC, /* (x86) Power-management controller (PMC) */ - UCLASS_ADC, /* Analog-to-digital converter */ - UCLASS_AHCI, /* SATA disk controller */ - UCLASS_AUDIO_CODEC, /* Audio codec with control and data path */ - UCLASS_AXI, /* AXI bus */ - UCLASS_BLK, /* Block device */ - UCLASS_BOOTCOUNT, /* Bootcount backing store */ - UCLASS_BUTTON, /* Button */ - UCLASS_CACHE, /* Cache controller */ - UCLASS_CLK, /* Clock source, e.g. used by peripherals */ - UCLASS_CPU, /* CPU, typically part of an SoC */ - UCLASS_CROS_EC, /* Chrome OS EC */ - UCLASS_DISPLAY, /* Display (e.g. DisplayPort, HDMI) */ - UCLASS_DSI_HOST, /* Display Serial Interface host */ - UCLASS_DMA, /* Direct Memory Access */ - UCLASS_DSA, /* Distributed (Ethernet) Switch Architecture */ - UCLASS_ECDSA, /* Elliptic curve cryptographic device */ - UCLASS_EFI_LOADER, /* Devices created by UEFI applications */ - UCLASS_EFI_MEDIA, /* Devices provided by UEFI firmware */ - UCLASS_ETH, /* Ethernet device */ - UCLASS_ETH_PHY, /* Ethernet PHY device */ - UCLASS_FIRMWARE, /* Firmware */ - UCLASS_FS_FIRMWARE_LOADER, /* Generic loader */ - UCLASS_GPIO, /* Bank of general-purpose I/O pins */ - UCLASS_HASH, /* Hash device */ - UCLASS_HWSPINLOCK, /* Hardware semaphores */ - UCLASS_I2C, /* I2C bus */ - UCLASS_I2C_EEPROM, /* I2C EEPROM device */ - UCLASS_I2C_GENERIC, /* Generic I2C device */ - UCLASS_I2C_MUX, /* I2C multiplexer */ - UCLASS_I2S, /* I2S bus */ - UCLASS_IDE, /* IDE device */ - UCLASS_IOMMU, /* IOMMU */ - UCLASS_IRQ, /* Interrupt controller */ - UCLASS_KEYBOARD, /* Keyboard input device */ - UCLASS_LED, /* Light-emitting diode (LED) */ - UCLASS_LPC, /* x86 'low pin count' interface */ - UCLASS_MAILBOX, /* Mailbox controller */ - UCLASS_MASS_STORAGE, /* Mass storage device */ - UCLASS_MDIO, /* MDIO bus */ - UCLASS_MDIO_MUX, /* MDIO MUX/switch */ - UCLASS_MISC, /* Miscellaneous device */ - UCLASS_MMC, /* SD / MMC card or chip */ - UCLASS_MOD_EXP, /* RSA Mod Exp device */ - UCLASS_MTD, /* Memory Technology Device (MTD) device */ - UCLASS_MUX, /* Multiplexer device */ - UCLASS_NOP, /* No-op devices */ - UCLASS_NORTHBRIDGE, /* Intel Northbridge / SDRAM controller */ - UCLASS_NVME, /* NVM Express device */ - UCLASS_P2SB, /* (x86) Primary-to-Sideband Bus */ - UCLASS_PANEL, /* Display panel, such as an LCD */ - UCLASS_PANEL_BACKLIGHT, /* Backlight controller for panel */ - UCLASS_PCH, /* x86 platform controller hub */ - UCLASS_PCI, /* PCI bus */ - UCLASS_PCI_EP, /* PCI endpoint device */ - UCLASS_PCI_GENERIC, /* Generic PCI bus device */ - UCLASS_PHY, /* Physical Layer (PHY) device */ - UCLASS_PINCONFIG, /* Pin configuration node device */ - UCLASS_PINCTRL, /* Pinctrl (pin muxing/configuration) device */ - UCLASS_PMIC, /* PMIC I/O device */ - UCLASS_POWER_DOMAIN, /* (SoC) Power domains */ - UCLASS_PWM, /* Pulse-width modulator */ - UCLASS_PWRSEQ, /* Power sequence device */ - UCLASS_QFW, /* QEMU firmware config device */ - UCLASS_RAM, /* RAM controller */ - UCLASS_REBOOT_MODE, /* Reboot mode */ - UCLASS_REGULATOR, /* Regulator device */ - UCLASS_REMOTEPROC, /* Remote Processor device */ - UCLASS_RESET, /* Reset controller device */ - UCLASS_RNG, /* Random Number Generator */ - UCLASS_RTC, /* Real time clock device */ - UCLASS_SCMI_AGENT, /* Interface with an SCMI server */ - UCLASS_SCSI, /* SCSI device */ - UCLASS_SERIAL, /* Serial UART */ - UCLASS_SIMPLE_BUS, /* Bus with child devices */ - UCLASS_SMEM, /* Shared memory interface */ - UCLASS_SOC, /* SOC Device */ - UCLASS_SOUND, /* Playing simple sounds */ - UCLASS_SPI, /* SPI bus */ - UCLASS_SPI_FLASH, /* SPI flash */ - UCLASS_SPI_GENERIC, /* Generic SPI flash target */ - UCLASS_SPMI, /* System Power Management Interface bus */ - UCLASS_SYSCON, /* System configuration device */ - UCLASS_SYSINFO, /* Device information from hardware */ - UCLASS_SYSRESET, /* System reset device */ - UCLASS_TEE, /* Trusted Execution Environment device */ - UCLASS_THERMAL, /* Thermal sensor */ - UCLASS_TIMER, /* Timer device */ - UCLASS_TPM, /* Trusted Platform Module TIS interface */ - UCLASS_UFS, /* Universal Flash Storage */ - UCLASS_USB, /* USB bus */ - UCLASS_USB_DEV_GENERIC, /* USB generic device */ - UCLASS_USB_HUB, /* USB hub */ - UCLASS_USB_GADGET_GENERIC, /* USB generic device */ - UCLASS_VIDEO, /* Video or LCD device */ - UCLASS_VIDEO_BRIDGE, /* Video bridge, e.g. DisplayPort to LVDS */ - UCLASS_VIDEO_CONSOLE, /* Text console driver for video device */ - UCLASS_VIDEO_OSD, /* On-screen display */ - UCLASS_VIRTIO, /* VirtIO transport device */ - UCLASS_W1, /* Dallas 1-Wire bus */ - UCLASS_W1_EEPROM, /* one-wire EEPROMs */ - UCLASS_WDT, /* Watchdog Timer driver */ - UCLASS_PVBLOCK, /* Xen virtual block device */ + UCLASS_ACPI_PMC = 17, /* (x86) Power-management controller (PMC) */ + UCLASS_ADC = 18, /* Analog-to-digital converter */ + UCLASS_AHCI = 19, /* SATA disk controller */ + UCLASS_AUDIO_CODEC = 20,/* Audio codec with control and data path */ + UCLASS_AXI = 21, /* AXI bus */ + UCLASS_BLK = 22, /* Block device */ + UCLASS_BOOTCOUNT = 23, /* Bootcount backing store */ + UCLASS_BUTTON = 24, /* Button */ + UCLASS_CACHE = 25, /* Cache controller */ + UCLASS_CLK = 26, /* Clock source, e.g. used by peripherals */ + UCLASS_CPU = 27, /* CPU, typically part of an SoC */ + UCLASS_CROS_EC = 28, /* Chrome OS EC */ + UCLASS_DISPLAY = 29, /* Display (e.g. DisplayPort, HDMI) */ + UCLASS_DSI_HOST = 30, /* Display Serial Interface host */ + UCLASS_DMA = 31, /* Direct Memory Access */ + UCLASS_DSA = 32, /* Distributed (Ethernet) Switch Architecture */ + UCLASS_ECDSA = 33, /* Elliptic curve cryptographic device */ + UCLASS_EFI_LOADER = 34, /* Devices created by UEFI applications */ + UCLASS_EFI_MEDIA = 35, /* Devices provided by UEFI firmware */ + UCLASS_ETH = 36, /* Ethernet device */ + UCLASS_ETH_PHY = 37, /* Ethernet PHY device */ + UCLASS_FIRMWARE = 38, /* Firmware */ + UCLASS_FS_FIRMWARE_LOADER = 39, /* Generic loader */ + UCLASS_GPIO = 40, /* Bank of general-purpose I/O pins */ + UCLASS_HASH = 41, /* Hash device */ + UCLASS_HWSPINLOCK = 42, /* Hardware semaphores */ + UCLASS_I2C = 43, /* I2C bus */ + UCLASS_I2C_EEPROM = 44, /* I2C EEPROM device */ + UCLASS_I2C_GENERIC = 45, /* Generic I2C device */ + UCLASS_I2C_MUX = 46, /* I2C multiplexer */ + UCLASS_I2S = 47, /* I2S bus */ + UCLASS_IDE = 48, /* IDE device */ + UCLASS_IOMMU = 49, /* IOMMU */ + UCLASS_IRQ = 49, /* Interrupt controller */ + UCLASS_KEYBOARD = 50, /* Keyboard input device */ + UCLASS_LED = 51, /* Light-emitting diode (LED) */ + UCLASS_LPC = 52, /* x86 'low pin count' interface */ + UCLASS_MAILBOX = 53, /* Mailbox controller */ + UCLASS_MASS_STORAGE = 54, /* Mass storage device */ + UCLASS_MDIO = 55, /* MDIO bus */ + UCLASS_MDIO_MUX = 56, /* MDIO MUX/switch */ + UCLASS_MISC = 57, /* Miscellaneous device */ + UCLASS_MMC = 58, /* SD / MMC card or chip */ + UCLASS_MOD_EXP = 59, /* RSA Mod Exp device */ + UCLASS_MTD = 60, /* Memory Technology Device (MTD) device */ + UCLASS_MUX = 61, /* Multiplexer device */ + UCLASS_NOP = 62, /* No-op devices */ + UCLASS_NORTHBRIDGE = 63, /* Intel Northbridge / SDRAM controller */ + UCLASS_NVME = 64, /* NVM Express device */ + UCLASS_P2SB = 65, /* (x86) Primary-to-Sideband Bus */ + UCLASS_PANEL = 66, /* Display panel, such as an LCD */ + UCLASS_PANEL_BACKLIGHT = 67, /* Backlight controller for panel */ + UCLASS_PCH = 68, /* x86 platform controller hub */ + UCLASS_PCI = 69, /* PCI bus */ + UCLASS_PCI_EP = 70, /* PCI endpoint device */ + UCLASS_PCI_GENERIC = 71,/* Generic PCI bus device */ + UCLASS_PHY = 72, /* Physical Layer (PHY) device */ + UCLASS_PINCONFIG = 73, /* Pin configuration node device */ + UCLASS_PINCTRL = 74, /* Pinctrl (pin muxing/configuration) device */ + UCLASS_PMIC = 75, /* PMIC I/O device */ + UCLASS_POWER_DOMAIN = 76, /* (SoC) Power domains */ + UCLASS_PWM = 77, /* Pulse-width modulator */ + UCLASS_PWRSEQ = 78, /* Power sequence device */ + UCLASS_QFW = 79, /* QEMU firmware config device */ + UCLASS_RAM = 80, /* RAM controller */ + UCLASS_REBOOT_MODE = 81,/* Reboot mode */ + UCLASS_REGULATOR = 82, /* Regulator device */ + UCLASS_REMOTEPROC = 83, /* Remote Processor device */ + UCLASS_RESET = 84, /* Reset controller device */ + UCLASS_RNG = 85, /* Random Number Generator */ + UCLASS_RTC = 86, /* Real time clock device */ + UCLASS_SCMI_AGENT = 87, /* Interface with an SCMI server */ + UCLASS_SCSI = 88, /* SCSI device */ + UCLASS_SERIAL = 89, /* Serial UART */ + UCLASS_SIMPLE_BUS = 90, /* Bus with child devices */ + UCLASS_SMEM = 91, /* Shared memory interface */ + UCLASS_SOC = 92, /* SOC Device */ + UCLASS_SOUND = 93, /* Playing simple sounds */ + UCLASS_SPI = 94, /* SPI bus */ + UCLASS_SPI_FLASH = 95, /* SPI flash */ + UCLASS_SPI_GENERIC = 96, /* Generic SPI flash target */ + UCLASS_SPMI = 97, /* System Power Management Interface bus */ + UCLASS_SYSCON = 98, /* System configuration device */ + UCLASS_SYSINFO = 99, /* Device information from hardware */ + UCLASS_SYSRESET = 100, /* System reset device */ + UCLASS_TEE = 101, /* Trusted Execution Environment device */ + UCLASS_THERMAL = 102, /* Thermal sensor */ + UCLASS_TIMER = 103, /* Timer device */ + UCLASS_TPM = 104, /* Trusted Platform Module TIS interface */ + UCLASS_UFS = 105, /* Universal Flash Storage */ + UCLASS_USB = 106, /* USB bus */ + UCLASS_USB_DEV_GENERIC = 107, /* USB generic device */ + UCLASS_USB_HUB = 108, /* USB hub */ + UCLASS_USB_GADGET_GENERIC = 109, /* USB generic device */ + UCLASS_VIDEO = 110, /* Video or LCD device */ + UCLASS_VIDEO_BRIDGE = 111, /* Video bridge, e.g. DisplayPort to LVDS */ + UCLASS_VIDEO_CONSOLE = 112, /* Text console driver for video device */ + UCLASS_VIDEO_OSD = 113, /* On-screen display */ + UCLASS_VIRTIO = 114, /* VirtIO transport device */ + UCLASS_W1 = 115, /* Dallas 1-Wire bus */ + UCLASS_W1_EEPROM = 116, /* one-wire EEPROMs */ + UCLASS_WDT = 117, /* Watchdog Timer driver */ + UCLASS_PVBLOCK = 118, /* Xen virtual block device */ - UCLASS_COUNT, + UCLASS_COUNT = 119, UCLASS_INVALID = -1, }; -- 2.35.1

2 1

[PATCH] ARM: dts: colibri-imx6ull: fix mac address passing
by Francesco Dolcini 01 Apr '22

01 Apr '22

colibri-imx6ull ethernet device is fec2, while the optional secondary ethernet is fec1, update the ethernet aliases in the .dts file so that ethaddr is set to fec2 and eth1addr to fec1. Without this change the ethernet interfaces have a different mac address between Linux and U-Boot. Signed-off-by: Francesco Dolcini <francesco.dolcini(a)toradex.com> --- arch/arm/dts/imx6ull-colibri.dtsi | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/arch/arm/dts/imx6ull-colibri.dtsi b/arch/arm/dts/imx6ull-colibri.dtsi index b7bf79f28c..104207be97 100644 --- a/arch/arm/dts/imx6ull-colibri.dtsi +++ b/arch/arm/dts/imx6ull-colibri.dtsi @@ -8,6 +8,12 @@ #include "imx6ull.dtsi" / { + /* Ethernet aliases to ensure correct MAC addresses */ + aliases { + ethernet0 = &fec2; + ethernet1 = &fec1; + }; + chosen { stdout-path = &uart1; }; -- 2.25.1

4 12

[uU PATCH 0/8] Integration of sysfw and tispl with U-Boot build
by Neha Malcom Francis 01 Apr '22

01 Apr '22

Devices that belong to the K3 architecture require SYSFW which is a FIT image consisting of a signed system firmware image and board config binaries. Board config binaries are needed to bring up SYSFW during U-Boot SPL startup. The board config data is given in YAML as input. These board configs contain board-specific information such as resource management, power management and security. The following series intends to plumb the system firmware generation into U-Boot using binman for packaging. Thus it will eliminate the need for additional custom repositories for SYSFW generation and also moves t owards the community standard build flow. The series also plumbs the generation of tispl.bin into the build flow. This image is required for loading u-boot in K3 devices. The image is packaged using ATF, OPTEE and DM (Device Manager). Please note that the following series has implemented the above for J721E general purpose board. The board configs and device trees added are specific to J721E GP devices. Also note the introduction of two new etypes for sysfw and ti-dm. The binman tests for sysfw has coverage of 90%, this is believed to be because of the requirement of sysfw to access a signing script located outside the binman directory. Logs of the binman test is located here: https://pastebin.ubuntu.com/p/n5CdT7TFJg/ On running CI tests on Github, errors were produced during world builds of keystone2_keystone3 and siemens (I0T2050 which is based on AM65x). This patch series is intended for only J721E and future work is to expand to the remaining K3 devices as well. The errors that come are mainly due to the boards other than J721E trying to generate tispl.bin. Error logs of the CI test is located here: https://pastebin.ubuntu.com/p/rpMrWzH7tv/ Neha Malcom Francis (8): tools: config: yaml: Add board config class to generate config binaries binman: etype: sysfw: Add entry type for sysfw schema: yaml: Add board config schema config: yaml: j721e_evm: Add board config for J721E EVM binman: sysfw: Add support for packaging tiboot3.bin and sysfw.itb binman: dtsi: sysfw: j721e: Use binman to package sysfw.itb binman: etype: dm: Add entry type for TI DM binman: dtsi: tispl: j721e: Use binman to package tispl.bin Makefile | 1 + arch/arm/dts/j721e-a72-binman.dtsi | 92 + arch/arm/dts/j721e-r5-binman.dtsi | 75 + .../k3-j721e-common-proc-board-u-boot.dtsi | 1 + .../k3-j721e-r5-common-proc-board-u-boot.dtsi | 1 + arch/arm/mach-k3/config.mk | 54 +- board/ti/common/schema.yaml | 355 ++ board/ti/j721e/Kconfig | 2 + board/ti/j721e/config.yaml | 3162 +++++++++++++++++ scripts/Makefile.spl | 4 - test/py/requirements.txt | 1 + tools/binman/entries.rst | 21 + tools/binman/etype/sysfw.py | 60 + tools/binman/etype/ti_dm.py | 22 + tools/binman/ftest.py | 14 + tools/binman/test/225_ti_dm.dts | 13 + tools/binman/test/226_sysfw.dts | 13 + tools/tibcfg_gen.py | 116 + 18 files changed, 3969 insertions(+), 38 deletions(-) create mode 100644 arch/arm/dts/j721e-a72-binman.dtsi create mode 100644 arch/arm/dts/j721e-r5-binman.dtsi create mode 100644 board/ti/common/schema.yaml create mode 100644 board/ti/j721e/config.yaml create mode 100644 tools/binman/etype/sysfw.py create mode 100644 tools/binman/etype/ti_dm.py create mode 100644 tools/binman/test/225_ti_dm.dts create mode 100644 tools/binman/test/226_sysfw.dts create mode 100644 tools/tibcfg_gen.py -- 2.17.1 Thanking You Neha Malcom Francis

1 8

Pull request for efi-2022-04-rc6
by Heinrich Schuchardt 01 Apr '22

01 Apr '22

Dear Tom, The following changes since commit 64b78f5721e65e96ea5a3d100d46b2e6fda722df: Merge branch '2022-03-31-critical-fixes' (2022-03-31 08:28:43 -0400) are available in the Git repository at: https://source.denx.de/u-boot/custodians/u-boot-efi.git tags/efi-2022-04-rc6 for you to fetch changes up to b6370aca3709ef23a9e8fe556beaa2e4b4e089c3: efi_loader: initrddump: Actually use the custom CFLAGS (2022-03-31 19:06:17 +0200) No problems were reported by Gitlab CI: https://source.denx.de/u-boot/custodians/u-boot-efi/-/pipelines/11531 ---------------------------------------------------------------- Pull request for efi-2022-04-rc6 Documentation: * Move VxWorks and Plan 9 to HTML documentation * Move all command man-pages to a separate directory Test: * Fix pylint errors UEFI * Fix build flags for initrddump.efi QEMU * Remove unused function to get RNG device ---------------------------------------------------------------- Andy Shevchenko (1): efi_loader: initrddump: Actually use the custom CFLAGS Bin Meng (5): doc: usage: Group all shell command docs into cmd/ sub-directory doc: usage: Update the extension command title doc: usage: Convert README.vxworks to reST doc: usage: Update vxworks doc to mention RISC-V support doc: usage: Convert README.plan9 to reST Heinrich Schuchardt (2): test: fix pylint warnings for test_efi_fit.py test: fix pylint warnings in test_efi_bootmgr Patrick Delaunay (1): doc: mmc dev Sughosh Ganu (1): qemu: arm: Remove platform specific function to get RNG device board/emulation/qemu-arm/qemu-arm.c | 42 ------------ doc/usage/{ => cmd}/acpi.rst | 0 doc/usage/{ => cmd}/addrmap.rst | 0 doc/usage/{ => cmd}/askenv.rst | 0 doc/usage/{ => cmd}/base.rst | 0 doc/usage/{ => cmd}/bootefi.rst | 0 doc/usage/{ => cmd}/booti.rst | 0 doc/usage/{ => cmd}/bootmenu.rst | 0 doc/usage/{ => cmd}/button.rst | 0 doc/usage/{x86 => cmd}/cbsysinfo.rst | 0 doc/usage/{ => cmd}/conitrace.rst | 0 doc/usage/{ => cmd}/echo.rst | 0 doc/usage/{ => cmd}/exception.rst | 0 doc/usage/{ => cmd}/exit.rst | 0 doc/usage/{ => cmd}/extension.rst | 4 +- doc/usage/{ => cmd}/false.rst | 0 doc/usage/{ => cmd}/fatinfo.rst | 0 doc/usage/{ => cmd}/fatload.rst | 0 doc/usage/{ => cmd}/for.rst | 0 doc/usage/{ => cmd}/load.rst | 0 doc/usage/{ => cmd}/loady.rst | 0 doc/usage/{ => cmd}/mbr.rst | 0 doc/usage/{ => cmd}/md.rst | 2 - doc/usage/{ => cmd}/mmc.rst | 36 +++++----- doc/usage/{ => cmd}/pinmux.rst | 0 doc/usage/{ => cmd}/pstore.rst | 0 doc/usage/{ => cmd}/qfw.rst | 0 doc/usage/{ => cmd}/reset.rst | 0 doc/usage/{ => cmd}/sbi.rst | 0 doc/usage/{ => cmd}/scp03.rst | 0 doc/usage/{ => cmd}/setexpr.rst | 0 doc/usage/{ => cmd}/sf.rst | 0 doc/usage/{ => cmd}/size.rst | 0 doc/usage/{ => cmd}/true.rst | 0 doc/usage/{ => cmd}/ums.rst | 0 doc/usage/{ => cmd}/wdt.rst | 0 doc/usage/index.rst | 79 ++++++++++++---------- doc/{README.plan9 => usage/os/plan9.rst} | 12 ++-- doc/{README.vxworks => usage/os/vxworks.rst} | 31 ++++++--- lib/efi_loader/Makefile | 2 +- test/py/tests/test_efi_bootmgr/conftest.py | 14 ++-- test/py/tests/test_efi_bootmgr/test_efi_bootmgr.py | 13 +++- test/py/tests/test_efi_fit.py | 31 +++++---- 43 files changed, 129 insertions(+), 137 deletions(-) rename doc/usage/{ => cmd}/acpi.rst (100%) rename doc/usage/{ => cmd}/addrmap.rst (100%) rename doc/usage/{ => cmd}/askenv.rst (100%) rename doc/usage/{ => cmd}/base.rst (100%) rename doc/usage/{ => cmd}/bootefi.rst (100%) rename doc/usage/{ => cmd}/booti.rst (100%) rename doc/usage/{ => cmd}/bootmenu.rst (100%) rename doc/usage/{ => cmd}/button.rst (100%) rename doc/usage/{x86 => cmd}/cbsysinfo.rst (100%) rename doc/usage/{ => cmd}/conitrace.rst (100%) rename doc/usage/{ => cmd}/echo.rst (100%) rename doc/usage/{ => cmd}/exception.rst (100%) rename doc/usage/{ => cmd}/exit.rst (100%) rename doc/usage/{ => cmd}/extension.rst (96%) rename doc/usage/{ => cmd}/false.rst (100%) rename doc/usage/{ => cmd}/fatinfo.rst (100%) rename doc/usage/{ => cmd}/fatload.rst (100%) rename doc/usage/{ => cmd}/for.rst (100%) rename doc/usage/{ => cmd}/load.rst (100%) rename doc/usage/{ => cmd}/loady.rst (100%) rename doc/usage/{ => cmd}/mbr.rst (100%) rename doc/usage/{ => cmd}/md.rst (99%) rename doc/usage/{ => cmd}/mmc.rst (90%) rename doc/usage/{ => cmd}/pinmux.rst (100%) rename doc/usage/{ => cmd}/pstore.rst (100%) rename doc/usage/{ => cmd}/qfw.rst (100%) rename doc/usage/{ => cmd}/reset.rst (100%) rename doc/usage/{ => cmd}/sbi.rst (100%) rename doc/usage/{ => cmd}/scp03.rst (100%) rename doc/usage/{ => cmd}/setexpr.rst (100%) rename doc/usage/{ => cmd}/sf.rst (100%) rename doc/usage/{ => cmd}/size.rst (100%) rename doc/usage/{ => cmd}/true.rst (100%) rename doc/usage/{ => cmd}/ums.rst (100%) rename doc/usage/{ => cmd}/wdt.rst (100%) rename doc/{README.plan9 => usage/os/plan9.rst} (89%) rename doc/{README.vxworks => usage/os/vxworks.rst} (89%)

2 1