diff options
18 files changed, 82 insertions, 281 deletions
diff --git a/configs/platform-v7a/barebox-am335x-mlo.config b/configs/platform-v7a/barebox-am335x-mlo.config index 882c13e..dd22fd8 100644 --- a/configs/platform-v7a/barebox-am335x-mlo.config +++ b/configs/platform-v7a/barebox-am335x-mlo.config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Barebox/arm 2021.11.0 Configuration +# Barebox/arm 2022.01.0 Configuration # CONFIG_ARM=y CONFIG_ARM_USE_COMPRESSED_DTB=y @@ -67,7 +67,6 @@ CONFIG_MACH_PHYTEC_SOM_AM335X=y # CONFIG_PHYTEC_SOM_AM335X_OF_AUTOENABLE is not set # end of OMAP Features -# CONFIG_ARCH_RK3568_OPTEE is not set # CONFIG_BOARD_ARM_GENERIC_DT is not set CONFIG_ARM_ASM_UNIFIED=y CONFIG_AEABI=y @@ -189,6 +188,7 @@ CONFIG_DEBUG_OMAP_UART_PORT=1 # CONFIG_DEBUG_INITCALLS is not set # CONFIG_DEBUG_PROBES is not set # CONFIG_PBL_BREAK is not set +# CONFIG_PRINTF_FULL is not set # CONFIG_UBSAN is not set CONFIG_HAVE_ARCH_KASAN=y CONFIG_CC_HAS_KASAN_GENERIC=y @@ -196,6 +196,11 @@ CONFIG_CC_HAS_KASAN_GENERIC=y # CONFIG_COMPILE_TEST is not set # end of Debugging +# +# EFI (Extensible Firmware Interface) Support +# +# end of EFI (Extensible Firmware Interface) Support + CONFIG_HAS_DEBUG_LL=y # CONFIG_NET is not set @@ -525,6 +530,7 @@ CONFIG_EXTRA_FIRMWARE_DIR="firmware" # Host Tools # # CONFIG_COMPILE_HOST_TOOLS is not set +CONFIG_OMAP_IMAGE=y # end of Host Tools # diff --git a/configs/platform-v7a/barebox-am335x.config b/configs/platform-v7a/barebox-am335x.config index 40edd97..6ff4e96 100644 --- a/configs/platform-v7a/barebox-am335x.config +++ b/configs/platform-v7a/barebox-am335x.config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Barebox/arm 2021.11.0 Configuration +# Barebox/arm 2022.01.0 Configuration # CONFIG_ARM=y CONFIG_ARM_LINUX=y @@ -70,7 +70,6 @@ CONFIG_MACH_BEAGLEBONE=y # CONFIG_MACH_WAGO_PFC_AM35XX is not set # end of OMAP Features -# CONFIG_ARCH_RK3568_OPTEE is not set CONFIG_BOARD_ARM_GENERIC_DT=y CONFIG_ARM_ASM_UNIFIED=y CONFIG_AEABI=y @@ -245,6 +244,7 @@ CONFIG_DEBUG_OMAP_UART_PORT=1 # CONFIG_DEBUG_INITCALLS is not set # CONFIG_DEBUG_PROBES is not set # CONFIG_PBL_BREAK is not set +# CONFIG_PRINTF_FULL is not set # CONFIG_UBSAN is not set CONFIG_HAVE_ARCH_KASAN=y CONFIG_CC_HAS_KASAN_GENERIC=y @@ -252,6 +252,11 @@ CONFIG_CC_HAS_KASAN_GENERIC=y # CONFIG_COMPILE_TEST is not set # end of Debugging +# +# EFI (Extensible Firmware Interface) Support +# +# end of EFI (Extensible Firmware Interface) Support + CONFIG_HAS_DEBUG_LL=y CONFIG_COMMAND_SUPPORT=y CONFIG_COMPILE_HASH=y @@ -529,6 +534,7 @@ CONFIG_NET_USB=y CONFIG_NET_USB_ASIX=y # CONFIG_USB_NET_AX88179_178A is not set CONFIG_NET_USB_SMSC95XX=y +# CONFIG_NET_USB_RTL8152 is not set # end of Network drivers # @@ -938,6 +944,7 @@ CONFIG_EXTRA_FIRMWARE_DIR="firmware" # Host Tools # # CONFIG_COMPILE_HOST_TOOLS is not set +CONFIG_OMAP_IMAGE=y # end of Host Tools # diff --git a/configs/platform-v7a/barebox-am335x.config.diff b/configs/platform-v7a/barebox-am335x.config.diff index 943c37d..dff2c91 100644 --- a/configs/platform-v7a/barebox-am335x.config.diff +++ b/configs/platform-v7a/barebox-am335x.config.diff @@ -1,4 +1,4 @@ -82771f6d38b1270ff8c3853c94a3eba9 +232929d64c236508ee3b5a0283b35315 # CONFIG_AM33XX_NET_BOOT is not set CONFIG_ARCH_AM33XX=y # CONFIG_ARCH_BCM283X is not set @@ -88,6 +88,7 @@ CONFIG_NVMEM=y # CONFIG_OMAP_BUILD_IFT is not set # CONFIG_OMAP_BUILD_SPI is not set CONFIG_OMAP_GPMC=y +CONFIG_OMAP_IMAGE=y CONFIG_OMAP_MULTI_BOARDS=y # CONFIG_PBL_OPTEE is undefined # CONFIG_PINCTRL_BCM283X is undefined diff --git a/configs/platform-v7a/barebox-at91.config b/configs/platform-v7a/barebox-at91.config index 87c6951..cdfb79b 100644 --- a/configs/platform-v7a/barebox-at91.config +++ b/configs/platform-v7a/barebox-at91.config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Barebox/arm 2021.11.0 Configuration +# Barebox/arm 2022.01.0 Configuration # CONFIG_ARM=y CONFIG_ARM_LINUX=y @@ -80,7 +80,6 @@ CONFIG_MACH_SAMA5D27_GIANTBOARD=y # AT91 Board Options # CONFIG_BAREBOX_MAX_IMAGE_SIZE=0xffffffff -# CONFIG_ARCH_RK3568_OPTEE is not set # CONFIG_BOARD_ARM_GENERIC_DT is not set CONFIG_AEABI=y # CONFIG_ARM_BOARD_APPEND_ATAG is not set @@ -242,6 +241,7 @@ CONFIG_DEBUG_AT91_UART_BASE=0xf8020000 # CONFIG_DEBUG_INITCALLS is not set # CONFIG_DEBUG_PROBES is not set # CONFIG_PBL_BREAK is not set +# CONFIG_PRINTF_FULL is not set # CONFIG_UBSAN is not set CONFIG_HAVE_ARCH_KASAN=y CONFIG_CC_HAS_KASAN_GENERIC=y @@ -249,6 +249,11 @@ CONFIG_CC_HAS_KASAN_GENERIC=y # CONFIG_COMPILE_TEST is not set # end of Debugging +# +# EFI (Extensible Firmware Interface) Support +# +# end of EFI (Extensible Firmware Interface) Support + CONFIG_HAS_DEBUG_LL=y CONFIG_COMMAND_SUPPORT=y CONFIG_COMPILE_HASH=y diff --git a/configs/platform-v7a/barebox-at91.config.diff b/configs/platform-v7a/barebox-at91.config.diff index 923d39a..6b8c31c 100644 --- a/configs/platform-v7a/barebox-at91.config.diff +++ b/configs/platform-v7a/barebox-at91.config.diff @@ -1,4 +1,4 @@ -82771f6d38b1270ff8c3853c94a3eba9 +232929d64c236508ee3b5a0283b35315 CONFIG_ARCH_AT91=y # CONFIG_ARCH_BCM283X is not set CONFIG_ARCH_TEXT_BASE=0x23f00000 @@ -85,6 +85,7 @@ CONFIG_MTD_SPI_NOR=y # CONFIG_MTD_SST25L is not set # CONFIG_NET_USB is undefined # CONFIG_NET_USB_ASIX is undefined +# CONFIG_NET_USB_RTL8152 is undefined # CONFIG_NET_USB_SMSC95XX is undefined CONFIG_OF_BAREBOX_ENV_IN_FS=y CONFIG_PBL_CONSOLE=y diff --git a/configs/platform-v7a/barebox-mx6.config b/configs/platform-v7a/barebox-mx6.config index 52c1325..04f841d 100644 --- a/configs/platform-v7a/barebox-mx6.config +++ b/configs/platform-v7a/barebox-mx6.config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Barebox/arm 2021.11.0 Configuration +# Barebox/arm 2022.01.0 Configuration # CONFIG_ARM=y CONFIG_ARM_LINUX=y @@ -137,7 +137,6 @@ CONFIG_IMX_IIM_FUSE_BLOW=y # CONFIG_HABV4 is not set # end of i.MX specific settings -# CONFIG_ARCH_RK3568_OPTEE is not set CONFIG_BOARD_ARM_GENERIC_DT=y CONFIG_ARM_ASM_UNIFIED=y CONFIG_AEABI=y @@ -316,6 +315,7 @@ CONFIG_DEBUG_IMX_UART_PORT=1 # CONFIG_DEBUG_INITCALLS is not set # CONFIG_DEBUG_PROBES is not set # CONFIG_PBL_BREAK is not set +# CONFIG_PRINTF_FULL is not set # CONFIG_UBSAN is not set CONFIG_HAVE_ARCH_KASAN=y CONFIG_CC_HAS_KASAN_GENERIC=y @@ -323,6 +323,11 @@ CONFIG_CC_HAS_KASAN_GENERIC=y # CONFIG_COMPILE_TEST is not set # end of Debugging +# +# EFI (Extensible Firmware Interface) Support +# +# end of EFI (Extensible Firmware Interface) Support + CONFIG_HAS_DEBUG_LL=y CONFIG_COMMAND_SUPPORT=y CONFIG_COMPILE_HASH=y @@ -607,6 +612,7 @@ CONFIG_NET_USB=y CONFIG_NET_USB_ASIX=y # CONFIG_USB_NET_AX88179_178A is not set CONFIG_NET_USB_SMSC95XX=y +# CONFIG_NET_USB_RTL8152 is not set # end of Network drivers # @@ -910,6 +916,7 @@ CONFIG_HW_HAS_PCI=y # # CONFIG_PCI is not set # CONFIG_PCI_IMX6 is not set +# CONFIG_PCI_ECAM_GENERIC is not set # end of PCI bus options # CONFIG_RTC_CLASS is not set diff --git a/configs/platform-v7a/barebox-mx6.config.diff b/configs/platform-v7a/barebox-mx6.config.diff index 4d2d585..15cb5c6 100644 --- a/configs/platform-v7a/barebox-mx6.config.diff +++ b/configs/platform-v7a/barebox-mx6.config.diff @@ -1,4 +1,4 @@ -82771f6d38b1270ff8c3853c94a3eba9 +232929d64c236508ee3b5a0283b35315 # CONFIG_ARCH_BCM283X is not set CONFIG_ARCH_HAS_FEC_IMX=y CONFIG_ARCH_HAS_IMX_GPT=y @@ -201,6 +201,7 @@ CONFIG_PARTITION_DISK_EFI_GPT_COMPARE=y CONFIG_PARTITION_DISK_EFI_GPT_NO_FORCE=y # CONFIG_PBL_OPTEE is undefined # CONFIG_PCI is not set +# CONFIG_PCI_ECAM_GENERIC is not set # CONFIG_PCI_IMX6 is not set # CONFIG_PHY_FSL_IMX8MQ_USB is not set # CONFIG_PICOPNG is not set diff --git a/configs/platform-v7a/barebox-rpi2.config b/configs/platform-v7a/barebox-rpi2.config index 58e9f59..4f24159 100644 --- a/configs/platform-v7a/barebox-rpi2.config +++ b/configs/platform-v7a/barebox-rpi2.config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Barebox/arm 2021.11.0 Configuration +# Barebox/arm 2022.01.0 Configuration # CONFIG_ARM=y CONFIG_ARM_LINUX=y @@ -60,7 +60,6 @@ CONFIG_MACH_RPI_CM3=y # end of select Broadcom BCM283X boards to be built CONFIG_BAREBOX_MAX_IMAGE_SIZE=0xffffffff -# CONFIG_ARCH_RK3568_OPTEE is not set CONFIG_BOARD_ARM_GENERIC_DT=y CONFIG_ARM_ASM_UNIFIED=y CONFIG_AEABI=y @@ -226,6 +225,7 @@ CONFIG_DEFAULT_LOGLEVEL=6 # CONFIG_DEBUG_INITCALLS is not set # CONFIG_DEBUG_PROBES is not set # CONFIG_PBL_BREAK is not set +# CONFIG_PRINTF_FULL is not set # CONFIG_UBSAN is not set CONFIG_HAVE_ARCH_KASAN=y CONFIG_CC_HAS_KASAN_GENERIC=y @@ -233,6 +233,11 @@ CONFIG_CC_HAS_KASAN_GENERIC=y # CONFIG_COMPILE_TEST is not set # end of Debugging +# +# EFI (Extensible Firmware Interface) Support +# +# end of EFI (Extensible Firmware Interface) Support + CONFIG_HAS_DEBUG_LL=y CONFIG_COMMAND_SUPPORT=y CONFIG_COMPILE_HASH=y @@ -505,6 +510,7 @@ CONFIG_NET_USB=y CONFIG_NET_USB_ASIX=y # CONFIG_USB_NET_AX88179_178A is not set CONFIG_NET_USB_SMSC95XX=y +# CONFIG_NET_USB_RTL8152 is not set # end of Network drivers # diff --git a/configs/platform-v7a/barebox-rpi2.config.diff b/configs/platform-v7a/barebox-rpi2.config.diff index d296a95..23f1c14 100644 --- a/configs/platform-v7a/barebox-rpi2.config.diff +++ b/configs/platform-v7a/barebox-rpi2.config.diff @@ -1,4 +1,4 @@ -82771f6d38b1270ff8c3853c94a3eba9 +232929d64c236508ee3b5a0283b35315 CONFIG_ARM_ASM_UNIFIED=y CONFIG_BOOTM_INITRD=y # CONFIG_CMD_I2C is undefined diff --git a/configs/platform-v7a/barebox-stm32mp.config b/configs/platform-v7a/barebox-stm32mp.config index 6a4f3e8..4d1c78d 100644 --- a/configs/platform-v7a/barebox-stm32mp.config +++ b/configs/platform-v7a/barebox-stm32mp.config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Barebox/arm 2021.11.0 Configuration +# Barebox/arm 2022.01.0 Configuration # CONFIG_ARM=y CONFIG_ARM_LINUX=y @@ -49,13 +49,13 @@ CONFIG_CPU_32v7=y # # CONFIG_BOOT_ENDIANNESS_SWITCH is not set CONFIG_BAREBOX_MAX_IMAGE_SIZE=0xffffffff -# CONFIG_ARCH_RK3568_OPTEE is not set CONFIG_ARCH_NR_GPIO=416 CONFIG_ARCH_STM32MP157=y CONFIG_MACH_STM32MP15XX_DKX=y CONFIG_MACH_LXA_MC1=y # CONFIG_MACH_SEEED_ODYSSEY is not set CONFIG_MACH_STM32MP15X_EV1=y +# CONFIG_MACH_PROTONIC_STM32MP1 is not set # CONFIG_BOARD_ARM_GENERIC_DT is not set CONFIG_ARM_ASM_UNIFIED=y CONFIG_AEABI=y @@ -222,6 +222,7 @@ CONFIG_DEFAULT_LOGLEVEL=7 # CONFIG_DEBUG_INITCALLS is not set # CONFIG_DEBUG_PROBES is not set # CONFIG_PBL_BREAK is not set +# CONFIG_PRINTF_FULL is not set # CONFIG_UBSAN is not set CONFIG_HAVE_ARCH_KASAN=y CONFIG_CC_HAS_KASAN_GENERIC=y @@ -229,6 +230,11 @@ CONFIG_CC_HAS_KASAN_GENERIC=y # CONFIG_COMPILE_TEST is not set # end of Debugging +# +# EFI (Extensible Firmware Interface) Support +# +# end of EFI (Extensible Firmware Interface) Support + CONFIG_HAS_DEBUG_LL=y CONFIG_COMMAND_SUPPORT=y CONFIG_COMPILE_HASH=y @@ -663,6 +669,7 @@ CONFIG_NVMEM=y # CONFIG_NVMEM_RMEM is not set # CONFIG_NVMEM_SNVS_LPGPR is not set CONFIG_STM32_BSEC=y +CONFIG_STM32_BSEC_WRITE=y # # Bus devices @@ -839,6 +846,7 @@ CONFIG_EXTRA_FIRMWARE_DIR="firmware" # Host Tools # # CONFIG_COMPILE_HOST_TOOLS is not set +CONFIG_STM32_IMAGE=y # end of Host Tools # diff --git a/configs/platform-v7a/barebox-stm32mp.config.diff b/configs/platform-v7a/barebox-stm32mp.config.diff index f4f3cc8..bd73049 100644 --- a/configs/platform-v7a/barebox-stm32mp.config.diff +++ b/configs/platform-v7a/barebox-stm32mp.config.diff @@ -1,4 +1,4 @@ -82771f6d38b1270ff8c3853c94a3eba9 +232929d64c236508ee3b5a0283b35315 # CONFIG_ARCH_BCM283X is not set CONFIG_ARCH_HAS_RESET_CONTROLLER=y CONFIG_ARCH_NR_GPIO=416 @@ -64,6 +64,7 @@ CONFIG_LED_PWM=y # CONFIG_LED_TRIGGERS is not set # CONFIG_LIBFDT is undefined CONFIG_MACH_LXA_MC1=y +# CONFIG_MACH_PROTONIC_STM32MP1 is not set # CONFIG_MACH_RPI2 is undefined # CONFIG_MACH_RPI3 is undefined # CONFIG_MACH_RPI is undefined @@ -99,6 +100,7 @@ CONFIG_NET_NETCONSOLE=y # CONFIG_NET_NFS is not set # CONFIG_NET_USB is undefined # CONFIG_NET_USB_ASIX is undefined +# CONFIG_NET_USB_RTL8152 is undefined # CONFIG_NET_USB_SMSC95XX is undefined CONFIG_NVMEM=y # CONFIG_NVMEM_REBOOT_MODE is not set @@ -128,6 +130,8 @@ CONFIG_RESET_STM32=y # CONFIG_SPI is not set # CONFIG_SPI_MEM is undefined CONFIG_STM32_BSEC=y +CONFIG_STM32_BSEC_WRITE=y +CONFIG_STM32_IMAGE=y CONFIG_STM32_IWDG_WATCHDOG=y CONFIG_STM32_REMOTEPROC=y # CONFIG_STPMIC1_WATCHDOG is not set diff --git a/configs/platform-v7a/barebox-vexpress.config b/configs/platform-v7a/barebox-vexpress.config index cc006d6..3b017b6 100644 --- a/configs/platform-v7a/barebox-vexpress.config +++ b/configs/platform-v7a/barebox-vexpress.config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Barebox/arm 2021.11.0 Configuration +# Barebox/arm 2022.01.0 Configuration # CONFIG_ARM=y CONFIG_ARM_LINUX=y @@ -49,7 +49,6 @@ CONFIG_CPU_32v7=y # CONFIG_BOOT_ENDIANNESS_SWITCH is not set CONFIG_ARCH_TEXT_BASE=0x0 CONFIG_BAREBOX_MAX_IMAGE_SIZE=0xffffffff -# CONFIG_ARCH_RK3568_OPTEE is not set CONFIG_MACH_VEXPRESS=y # CONFIG_MACH_VIRT is not set CONFIG_BOARD_ARM_GENERIC_DT=y @@ -215,6 +214,7 @@ CONFIG_DEFAULT_LOGLEVEL=6 # CONFIG_DEBUG_INITCALLS is not set # CONFIG_DEBUG_PROBES is not set # CONFIG_PBL_BREAK is not set +# CONFIG_PRINTF_FULL is not set # CONFIG_UBSAN is not set CONFIG_HAVE_ARCH_KASAN=y CONFIG_CC_HAS_KASAN_GENERIC=y @@ -222,6 +222,11 @@ CONFIG_CC_HAS_KASAN_GENERIC=y # CONFIG_COMPILE_TEST is not set # end of Debugging +# +# EFI (Extensible Firmware Interface) Support +# +# end of EFI (Extensible Firmware Interface) Support + CONFIG_HAS_DEBUG_LL=y CONFIG_COMMAND_SUPPORT=y CONFIG_COMPILE_HASH=y @@ -491,6 +496,7 @@ CONFIG_NET_USB=y CONFIG_NET_USB_ASIX=y # CONFIG_USB_NET_AX88179_178A is not set CONFIG_NET_USB_SMSC95XX=y +# CONFIG_NET_USB_RTL8152 is not set # end of Network drivers # diff --git a/configs/platform-v7a/barebox-vexpress.config.diff b/configs/platform-v7a/barebox-vexpress.config.diff index 74b86f9..e9dcf7c 100644 --- a/configs/platform-v7a/barebox-vexpress.config.diff +++ b/configs/platform-v7a/barebox-vexpress.config.diff @@ -1,4 +1,4 @@ -82771f6d38b1270ff8c3853c94a3eba9 +232929d64c236508ee3b5a0283b35315 CONFIG_AMBA_SP804=y # CONFIG_ARCH_BCM283X is not set CONFIG_ARCH_VEXPRESS=y diff --git a/configs/platform-v7a/barebox.config b/configs/platform-v7a/barebox.config index 9ae4dba..1992c65 100644 --- a/configs/platform-v7a/barebox.config +++ b/configs/platform-v7a/barebox.config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Barebox/arm 2021.11.0 Configuration +# Barebox/arm 2022.01.0 Configuration # CONFIG_ARM=y CONFIG_ARM_LINUX=y @@ -60,7 +60,6 @@ CONFIG_MACH_RPI3=y # end of select Broadcom BCM283X boards to be built CONFIG_BAREBOX_MAX_IMAGE_SIZE=0xffffffff -# CONFIG_ARCH_RK3568_OPTEE is not set CONFIG_BOARD_ARM_GENERIC_DT=y CONFIG_AEABI=y # CONFIG_THUMB2_BAREBOX is not set @@ -227,6 +226,7 @@ CONFIG_DEFAULT_LOGLEVEL=6 # CONFIG_DEBUG_INITCALLS is not set # CONFIG_DEBUG_PROBES is not set # CONFIG_PBL_BREAK is not set +# CONFIG_PRINTF_FULL is not set # CONFIG_UBSAN is not set CONFIG_HAVE_ARCH_KASAN=y CONFIG_CC_HAS_KASAN_GENERIC=y @@ -234,6 +234,11 @@ CONFIG_CC_HAS_KASAN_GENERIC=y # CONFIG_COMPILE_TEST is not set # end of Debugging +# +# EFI (Extensible Firmware Interface) Support +# +# end of EFI (Extensible Firmware Interface) Support + CONFIG_HAS_DEBUG_LL=y CONFIG_COMMAND_SUPPORT=y CONFIG_COMPILE_HASH=y @@ -507,6 +512,7 @@ CONFIG_NET_USB=y CONFIG_NET_USB_ASIX=y # CONFIG_USB_NET_AX88179_178A is not set CONFIG_NET_USB_SMSC95XX=y +# CONFIG_NET_USB_RTL8152 is not set # end of Network drivers # diff --git a/configs/platform-v7a/patches/barebox-2021.11.0/0001-net-cpsw-add-support-for-new-binding-in-Linux-v5.15-.patch b/configs/platform-v7a/patches/barebox-2021.11.0/0001-net-cpsw-add-support-for-new-binding-in-Linux-v5.15-.patch deleted file mode 100644 index 287f052..0000000 --- a/configs/platform-v7a/patches/barebox-2021.11.0/0001-net-cpsw-add-support-for-new-binding-in-Linux-v5.15-.patch +++ /dev/null @@ -1,210 +0,0 @@ -From ed7f3fd5b5e2088f04d2f5d615d71cf6e6507509 Mon Sep 17 00:00:00 2001 -From: Ahmad Fatoum <a.fatoum@pengutronix.de> -Date: Fri, 3 Dec 2021 21:50:35 +0100 -Subject: [PATCH 1/2] net: cpsw: add support for new binding in Linux v5.15-rc1 - DTs - -As is customary, upstream OMAP DTs have yet again added a new binding -breaking compatibility with a barebox driver. This time, the old Ethernet -node was disabled in favor of a new node that is matched by the new Linux -cpsw driver introduced with Linux commit ed3525eda4c4 ("net: ethernet: -ti: introduce cpsw switchdev based driver part 1 - dual-emac"). - -Add support for the new binding to restore working Beaglebone Black -networking. These changes have been tested against both the old and new -bindings. - -Fixes: 618948e4e5b3 ("dts: update to v5.15-rc1") -Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de> -Link: https://lore.barebox.org/20211203205035.555285-1-a.fatoum@pengutronix.de -Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> ---- - drivers/net/cpsw.c | 120 +++++++++++++++++++++++++++++++++------------ - 1 file changed, 89 insertions(+), 31 deletions(-) - -diff --git a/drivers/net/cpsw.c b/drivers/net/cpsw.c -index 4a8f9e67d6f0..6725c7b9bdb4 100644 ---- a/drivers/net/cpsw.c -+++ b/drivers/net/cpsw.c -@@ -592,7 +592,12 @@ static int cpsw_mdio_probe(struct device_d *dev) - - priv = xzalloc(sizeof(*priv)); - -+ /* If we can't request I/O memory region, we'll assume parent did -+ * it for us -+ */ - iores = dev_request_mem_resource(dev, 0); -+ if (IS_ERR(iores) && PTR_ERR(iores) == -EBUSY) -+ iores = dev_get_resource(dev, IORESOURCE_MEM, 0); - if (IS_ERR(iores)) - return PTR_ERR(iores); - priv->mdio_regs = IOMEM(iores->start); -@@ -1214,11 +1219,27 @@ static void cpsw_gmii_sel_am335x(struct cpsw_slave *slave) - writel(reg, phy_sel_addr); - } - --static int cpsw_probe_dt(struct cpsw_priv *priv) -+static void cpsw_add_slave(struct cpsw_slave *slave, struct device_node *child, int i) -+{ -+ uint32_t phy_id[2] = {-1, -1}; -+ int ret; -+ -+ if (!of_find_node_by_name(child, "fixed-link")) { -+ ret = of_property_read_u32_array(child, "phy_id", phy_id, 2); -+ if (!ret) -+ dev_warn(slave->cpsw->dev, "phy_id is deprecated, use phy-handle\n"); -+ } -+ -+ slave->dev.device_node = child; -+ slave->phy_id = phy_id[1]; -+ slave->phy_if = of_get_phy_mode(child); -+ slave->slave_num = i; -+} -+ -+static int cpsw_legacy_probe_dt(struct cpsw_priv *priv) - { - struct device_d *dev = priv->dev; - struct device_node *np = dev->device_node, *child; -- struct device_node *physel; - int ret, i = 0; - - ret = of_property_read_u32(np, "slaves", &priv->num_slaves); -@@ -1227,15 +1248,6 @@ static int cpsw_probe_dt(struct cpsw_priv *priv) - - priv->slaves = xzalloc(sizeof(struct cpsw_slave) * priv->num_slaves); - -- physel = of_find_compatible_node(NULL, NULL, "ti,am3352-phy-gmii-sel"); -- if (!physel) { -- dev_err(dev, "Cannot find ti,am3352-phy-gmii-sel node\n"); -- return -EINVAL; -- } -- ret = cpsw_phy_sel_init(priv, physel); -- if (ret) -- return ret; -- - for_each_child_of_node(np, child) { - if (of_device_is_compatible(child, "ti,davinci_mdio")) { - ret = of_pinctrl_select_state_default(child); -@@ -1244,29 +1256,73 @@ static int cpsw_probe_dt(struct cpsw_priv *priv) - } - - if (i < priv->num_slaves && !strncmp(child->name, "slave", 5)) { -- struct cpsw_slave *slave = &priv->slaves[i]; -- uint32_t phy_id[2] = {-1, -1}; -+ cpsw_add_slave(&priv->slaves[i], child, i); -+ i++; -+ } -+ } - -- if (!of_find_node_by_name(child, "fixed-link")) { -- ret = of_property_read_u32_array(child, "phy_id", phy_id, 2); -- if (!ret) -- dev_warn(dev, "phy_id is deprecated, use phy-handle\n"); -- } -+ return 0; -+} -+ -+static int cpsw_switch_probe_dt(struct cpsw_priv *priv) -+{ -+ struct device_d *dev = priv->dev; -+ struct device_node *np = dev->device_node, *child; -+ struct device_node *ports = NULL; -+ int ret, i = 0; - -- slave->dev.device_node = child; -- slave->phy_id = phy_id[1]; -- slave->phy_if = of_get_phy_mode(child); -- slave->slave_num = i; -+ for_each_child_of_node(np, child) { -+ if (of_device_is_compatible(child, "ti,davinci_mdio")) { -+ ret = of_pinctrl_select_state_default(child); -+ if (ret) -+ return ret; -+ } - -- i++; -+ if (!strcmp(child->name, "ethernet-ports")) { -+ ports = child; -+ priv->num_slaves = of_get_available_child_count(ports); - } - } - -- for (i = 0; i < priv->num_slaves; i++) { -- struct cpsw_slave *slave = &priv->slaves[i]; -+ if (!ports) -+ return -EINVAL; -+ -+ priv->slaves = xzalloc(sizeof(struct cpsw_slave) * priv->num_slaves); -+ -+ for_each_available_child_of_node(ports, child) { -+ cpsw_add_slave(&priv->slaves[i], child, i); -+ i++; -+ } -+ -+ return 0; -+} - -- cpsw_gmii_sel_am335x(slave); -+static int cpsw_probe_dt(struct cpsw_priv *priv) -+{ -+ struct device_d *dev = priv->dev; -+ struct device_node *physel; -+ int (*probe_slaves_dt)(struct cpsw_priv *priv); -+ int ret, i = 0; -+ -+ physel = of_find_compatible_node(NULL, NULL, "ti,am3352-phy-gmii-sel"); -+ if (!physel) { -+ dev_err(dev, "Cannot find ti,am3352-phy-gmii-sel node\n"); -+ return -EINVAL; - } -+ ret = cpsw_phy_sel_init(priv, physel); -+ if (ret) -+ return ret; -+ -+ probe_slaves_dt = device_get_match_data(dev); -+ if (!probe_slaves_dt) -+ return -EINVAL; -+ -+ ret = probe_slaves_dt(priv); -+ if (ret < 0) -+ return ret; -+ -+ for (i = 0; i < priv->num_slaves; i++) -+ cpsw_gmii_sel_am335x(&priv->slaves[i]); - - return 0; - } -@@ -1282,15 +1338,15 @@ static int cpsw_probe(struct device_d *dev) - - dev_dbg(dev, "* %s\n", __func__); - -- ret = of_platform_populate(dev->device_node, NULL, dev); -- if (ret) -- return ret; -- - iores = dev_request_mem_resource(dev, 0); - if (IS_ERR(iores)) - return PTR_ERR(iores); - regs = IOMEM(iores->start); - -+ ret = of_platform_populate(dev->device_node, NULL, dev); -+ if (ret) -+ return ret; -+ - priv = xzalloc(sizeof(*priv)); - priv->dev = dev; - -@@ -1371,7 +1427,9 @@ static void cpsw_remove(struct device_d *dev) - - static __maybe_unused struct of_device_id cpsw_dt_ids[] = { - { -- .compatible = "ti,cpsw", -+ .compatible = "ti,cpsw", .data = cpsw_legacy_probe_dt -+ }, { -+ .compatible = "ti,cpsw-switch", .data = cpsw_switch_probe_dt - }, { - /* sentinel */ - } --- -2.30.2 - diff --git a/configs/platform-v7a/patches/barebox-2021.11.0/0002-Revert-ARM-beaglebone-init-MPU-speed-to-800Mhz.patch b/configs/platform-v7a/patches/barebox-2021.11.0/0002-Revert-ARM-beaglebone-init-MPU-speed-to-800Mhz.patch deleted file mode 100644 index 10bfb83..0000000 --- a/configs/platform-v7a/patches/barebox-2021.11.0/0002-Revert-ARM-beaglebone-init-MPU-speed-to-800Mhz.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 9c1a78f959dd751c9b8ceb31e44926afc89d7769 Mon Sep 17 00:00:00 2001 -From: Ahmad Fatoum <a.fatoum@pengutronix.de> -Date: Fri, 3 Dec 2021 19:51:54 +0100 -Subject: [PATCH 2/2] Revert "ARM: beaglebone: init MPU speed to 800Mhz" -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Commit 130c7d6715e9 ("ARM: beaglebone: init MPU speed to 800Mhz") causes -warm reboot from within Linux v5.14.0 to no longer succeed. -barebox MLO is entered, but hangs. Reset from within barebox is -unaffected. -This can be reproduced using DistroKit 949c5ef2b9a6 ("v7a: barebox: -version bump v2021.08.0 → v2021.11.0") on a Beaglebone Black. -Until that's figured out, revert the commit; functional reboot is more -important than the quicker boot up. - -This reverts commit 130c7d6715e932a1e0b3e026fea97f700ab33ea9. - -Fixes: 130c7d6715e9 ("ARM: beaglebone: init MPU speed to 800Mhz") -Reported-by: arwie # IRC -Cc: Marc Reilly <marc@cpdesign.com.au> -Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de> -Link: https://lore.barebox.org/20211203185154.388145-1-a.fatoum@pengutronix.de -Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> ---- - arch/arm/boards/beaglebone/lowlevel.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/arch/arm/boards/beaglebone/lowlevel.c b/arch/arm/boards/beaglebone/lowlevel.c -index 31211448f5e8..91d143e4150b 100644 ---- a/arch/arm/boards/beaglebone/lowlevel.c -+++ b/arch/arm/boards/beaglebone/lowlevel.c -@@ -126,7 +126,7 @@ static noinline int beaglebone_sram_init(void) - - /* Setup the PLLs and the clocks for the peripherals */ - if (is_beaglebone_black()) { -- am33xx_pll_init(MPUPLL_M_800, DDRPLL_M_400); -+ am33xx_pll_init(MPUPLL_M_500, DDRPLL_M_400); - am335x_sdram_init(0x18B, &ddr3_cmd_ctrl, &ddr3_regs, - &ddr3_data); - } else { --- -2.30.2 - diff --git a/configs/platform-v7a/patches/barebox-2021.11.0/series b/configs/platform-v7a/patches/barebox-2021.11.0/series deleted file mode 100644 index ba7c27d..0000000 --- a/configs/platform-v7a/patches/barebox-2021.11.0/series +++ /dev/null @@ -1,2 +0,0 @@ -0001-net-cpsw-add-support-for-new-binding-in-Linux-v5.15-.patch -0002-Revert-ARM-beaglebone-init-MPU-speed-to-800Mhz.patch diff --git a/configs/platform-v7a/platformconfig b/configs/platform-v7a/platformconfig index faae4d5..25d9040 100644 --- a/configs/platform-v7a/platformconfig +++ b/configs/platform-v7a/platformconfig @@ -178,8 +178,8 @@ PTXCONF_CONSOLE_SPEED="115200" # PTXCONF_AT91BOOTSTRAP2 is not set PTXCONF_BAREBOX_COMMON_ARCH_STRING="arm" PTXCONF_BAREBOX_COMMON=y -PTXCONF_BAREBOX_COMMON_VERSION="2021.11.0" -PTXCONF_BAREBOX_COMMON_MD5="e7f7629701e9e8b9566b6799b422de5e" +PTXCONF_BAREBOX_COMMON_VERSION="2022.01.0" +PTXCONF_BAREBOX_COMMON_MD5="753ba533ced54f4113f9e97846c13fc1" PTXCONF_BAREBOX_COMMON_NEEDS_HOST_LZOP=y PTXCONF_BAREBOX_AM335X_MLO=y PTXCONF_BAREBOX_AM335X=y |