From 61be023775ab1ccef072bd8116f0ccf740bf8708 Mon Sep 17 00:00:00 2001 From: Uwe Kleine-König Date: Sun, 14 Mar 2021 16:47:46 +0100 Subject: v7a: barebox update 2020.09.0 -> 2021.02.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit One new patch is required to fix a regression for USB on rpi3. Also USB on rpi3 requires CONFIG_USB_NOP_XCEIV=y now which is enabled in the rpi2 config now. For the beaglebone two patches are added fixing a regression related to a dts sync from upstream. All three patches were already sent to the barebox mailing list. Acked-by: Ahmad Fatoum Signed-off-by: Uwe Kleine-König --- configs/platform-v7a/barebox-am335x-mlo.config | 17 ++++----- configs/platform-v7a/barebox-am335x.config | 24 ++++++------- configs/platform-v7a/barebox-am335x.config.diff | 16 +++------ configs/platform-v7a/barebox-at91.config | 13 ++++++- configs/platform-v7a/barebox-at91.config.diff | 4 +-- configs/platform-v7a/barebox-mx6.config | 29 +++++++++------- configs/platform-v7a/barebox-mx6.config.diff | 20 ++++------- configs/platform-v7a/barebox-rpi2.config | 16 +++++++-- configs/platform-v7a/barebox-rpi2.config.diff | 5 ++- configs/platform-v7a/barebox-stm32mp.config | 15 ++++++-- configs/platform-v7a/barebox-stm32mp.config.diff | 6 ++-- configs/platform-v7a/barebox-vexpress.config | 12 ++++++- configs/platform-v7a/barebox-vexpress.config.diff | 4 +-- configs/platform-v7a/barebox.config | 12 ++++++- .../bcm283X-Select-OF-clock-providers.patch | 30 ++++++++++++++++ .../net-phy-fix-waiting-for-link.patch | 35 +++++++++++++++++++ ...base-probe-simple-pm-bus-children-as-well.patch | 40 ++++++++++++++++++++++ .../platform-v7a/patches/barebox-2021.02.0/series | 6 ++++ configs/platform-v7a/platformconfig | 4 +-- configs/platform-v7a/rules/barebox-stm32mp.make | 2 +- .../platform-v7a/rules/image-stm32mp157c-dk2.make | 2 +- 21 files changed, 234 insertions(+), 78 deletions(-) create mode 100644 configs/platform-v7a/patches/barebox-2021.02.0/bcm283X-Select-OF-clock-providers.patch create mode 100644 configs/platform-v7a/patches/barebox-2021.02.0/net-phy-fix-waiting-for-link.patch create mode 100644 configs/platform-v7a/patches/barebox-2021.02.0/of-base-probe-simple-pm-bus-children-as-well.patch create mode 100644 configs/platform-v7a/patches/barebox-2021.02.0/series (limited to 'configs/platform-v7a') diff --git a/configs/platform-v7a/barebox-am335x-mlo.config b/configs/platform-v7a/barebox-am335x-mlo.config index f22edc9..c24227a 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 2020.09.0 Configuration +# Barebox/arm 2021.02.0 Configuration # CONFIG_ARM=y CONFIG_ARM_USE_COMPRESSED_DTB=y @@ -187,6 +187,9 @@ CONFIG_DEBUG_OMAP_UART_PORT=1 # CONFIG_DEBUG_INITCALLS is not set # CONFIG_PBL_BREAK is not set # CONFIG_UBSAN is not set +CONFIG_HAVE_ARCH_KASAN=y +CONFIG_CC_HAS_KASAN_GENERIC=y +# CONFIG_KASAN is not set # CONFIG_COMPILE_TEST is not set # end of Debugging @@ -248,18 +251,11 @@ CONFIG_MTD_M25P80=y # CONFIG_DRIVER_CFI is not set CONFIG_NAND=y -# CONFIG_NAND_ECC_SOFT is not set -# CONFIG_NAND_ECC_BCH is not set -CONFIG_NAND_ECC_HW=y -# CONFIG_NAND_ECC_HW_OOB_FIRST is not set +# CONFIG_MTD_NAND_ECC_SOFT is not set # CONFIG_NAND_ECC_HW_SYNDROME is not set -# CONFIG_NAND_ECC_HW_NONE is not set -# CONFIG_NAND_INFO is not set -# CONFIG_NAND_BBT is not set CONFIG_NAND_OMAP_GPMC=y # CONFIG_MTD_NAND_OMAP_ELM is not set -# CONFIG_MTD_NAND_ECC_SMC is not set -CONFIG_MTD_NAND_IDS=y +# CONFIG_MTD_NAND_ECC_SW_HAMMING_SMC is not set # CONFIG_MTD_NAND_DENALI is not set CONFIG_MTD_SPI_NOR=y # CONFIG_MTD_SPI_NOR_USE_4K_SECTORS is not set @@ -290,6 +286,7 @@ CONFIG_MCI=y # CONFIG_MCI_STARTUP is not set # CONFIG_MCI_WRITE is not set # CONFIG_MCI_MMC_BOOT_PARTITIONS is not set +# CONFIG_MCI_MMC_GPP_PARTITIONS is not set # # --- MCI host drivers --- diff --git a/configs/platform-v7a/barebox-am335x.config b/configs/platform-v7a/barebox-am335x.config index a430710..d959c49 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 2020.09.0 Configuration +# Barebox/arm 2021.02.0 Configuration # CONFIG_ARM=y CONFIG_ARM_LINUX=y @@ -213,6 +213,7 @@ CONFIG_STATE=y # CONFIG_BOOTCHOOSER is not set CONFIG_RESET_SOURCE=y # CONFIG_MACHINE_ID is not set +# CONFIG_SYSTEMD_OF_WATCHDOG is not set # # OP-TEE loading @@ -238,6 +239,9 @@ CONFIG_DEBUG_OMAP_UART_PORT=1 # CONFIG_DEBUG_INITCALLS is not set # CONFIG_PBL_BREAK is not set # CONFIG_UBSAN is not set +CONFIG_HAVE_ARCH_KASAN=y +CONFIG_CC_HAS_KASAN_GENERIC=y +# CONFIG_KASAN is not set # CONFIG_COMPILE_TEST is not set # end of Debugging @@ -267,6 +271,7 @@ CONFIG_CMD_VERSION=y CONFIG_CMD_MMC=y # CONFIG_CMD_MMC_EXTCSD is not set # CONFIG_CMD_POLLER is not set +# CONFIG_CMD_SLICE is not set # end of Information # @@ -305,6 +310,7 @@ CONFIG_CMD_PRINTENV=y CONFIG_CMD_MAGICVAR=y CONFIG_CMD_MAGICVAR_HELP=y CONFIG_CMD_SAVEENV=y +CONFIG_CMD_SETENV=y # end of Environment # @@ -384,6 +390,7 @@ CONFIG_CMD_MEMCMP=y CONFIG_CMD_MEMCPY=y CONFIG_CMD_MEMSET=y CONFIG_CMD_MEMTEST=y +# CONFIG_CMD_MEMTESTER is not set CONFIG_CMD_MM=y CONFIG_CMD_MW=y # end of Memory @@ -397,7 +404,6 @@ CONFIG_CMD_GPIO=y CONFIG_CMD_I2C=y CONFIG_CMD_LED=y CONFIG_CMD_NAND=y -# CONFIG_CMD_NANDTEST is not set # CONFIG_CMD_NAND_BITFLIP is not set # CONFIG_CMD_POWEROFF is not set CONFIG_CMD_SPI=y @@ -439,6 +445,7 @@ CONFIG_NET_RESOLV=y CONFIG_NET_IFUP=y CONFIG_NET_DHCP=y # CONFIG_NET_SNTP is not set +# CONFIG_NET_FASTBOOT is not set # # Drivers @@ -558,20 +565,12 @@ CONFIG_MTD_M25P80=y # CONFIG_DRIVER_CFI is not set CONFIG_NAND=y -CONFIG_NAND_ECC_SOFT=y -# CONFIG_NAND_ECC_BCH is not set -CONFIG_NAND_ECC_HW=y -# CONFIG_NAND_ECC_HW_OOB_FIRST is not set +# CONFIG_MTD_NAND_ECC_SOFT is not set CONFIG_NAND_ECC_HW_SYNDROME=y -CONFIG_NAND_ECC_HW_NONE=y -CONFIG_NAND_INFO=y -CONFIG_NAND_READ_OOB=y -CONFIG_NAND_BBT=y # CONFIG_NAND_ALLOW_ERASE_BAD is not set CONFIG_NAND_OMAP_GPMC=y # CONFIG_MTD_NAND_OMAP_ELM is not set -# CONFIG_MTD_NAND_ECC_SMC is not set -CONFIG_MTD_NAND_IDS=y +# CONFIG_MTD_NAND_ECC_SW_HAMMING_SMC is not set # CONFIG_MTD_NAND_DENALI is not set CONFIG_MTD_SPI_NOR=y # CONFIG_MTD_SPI_NOR_USE_4K_SECTORS is not set @@ -629,6 +628,7 @@ CONFIG_MCI_STARTUP=y CONFIG_MCI_INFO=y CONFIG_MCI_WRITE=y # CONFIG_MCI_MMC_BOOT_PARTITIONS is not set +# CONFIG_MCI_MMC_GPP_PARTITIONS is not set # # --- MCI host drivers --- diff --git a/configs/platform-v7a/barebox-am335x.config.diff b/configs/platform-v7a/barebox-am335x.config.diff index e944803..75d4897 100644 --- a/configs/platform-v7a/barebox-am335x.config.diff +++ b/configs/platform-v7a/barebox-am335x.config.diff @@ -1,4 +1,4 @@ -e6072dae533833bfa758a60d8e3b92b6 +550b611f7e000b2105486cbceddb2144 # CONFIG_AM33XX_NET_BOOT is not set CONFIG_ARCH_AM33XX=y # CONFIG_ARCH_BCM283X is not set @@ -22,10 +22,10 @@ CONFIG_CLOCKSOURCE_TI_DM=y # CONFIG_CMD_KEYSTORE is not set CONFIG_CMD_MIITOOL=y CONFIG_CMD_NAND=y -# CONFIG_CMD_NANDTEST is not set # CONFIG_CMD_NAND_BITFLIP is not set # CONFIG_CMD_SMC is undefined # CONFIG_COMMON_CLK is undefined +# CONFIG_COMMON_CLK_OF_PROVIDER is undefined # CONFIG_CONSOLE_ACTIVATE_FIRST is not set CONFIG_CONSOLE_ACTIVATE_NONE=y CONFIG_CRYPTO_KEYSTORE=y @@ -69,24 +69,16 @@ CONFIG_MACH_BEAGLEBONE=y CONFIG_MCI_OMAP_HSMMC=y CONFIG_MTD_M25P80=y # CONFIG_MTD_NAND_DENALI is not set -# CONFIG_MTD_NAND_ECC_SMC is not set -CONFIG_MTD_NAND_IDS=y +# CONFIG_MTD_NAND_ECC_SOFT is not set +# CONFIG_MTD_NAND_ECC_SW_HAMMING_SMC is not set # CONFIG_MTD_NAND_OMAP_ELM is not set CONFIG_MTD_SPI_NOR=y # CONFIG_MTD_SPI_NOR_USE_4K_SECTORS is not set # CONFIG_MTD_SST25L is not set CONFIG_NAND=y # CONFIG_NAND_ALLOW_ERASE_BAD is not set -CONFIG_NAND_BBT=y -# CONFIG_NAND_ECC_BCH is not set -CONFIG_NAND_ECC_HW=y -CONFIG_NAND_ECC_HW_NONE=y -# CONFIG_NAND_ECC_HW_OOB_FIRST is not set CONFIG_NAND_ECC_HW_SYNDROME=y -CONFIG_NAND_ECC_SOFT=y -CONFIG_NAND_INFO=y CONFIG_NAND_OMAP_GPMC=y -CONFIG_NAND_READ_OOB=y CONFIG_NVMEM=y # CONFIG_NVMEM_SNVS_LPGPR is not set # CONFIG_OMAP_BUILD_IFT is not set diff --git a/configs/platform-v7a/barebox-at91.config b/configs/platform-v7a/barebox-at91.config index 48d48fe..127b79f 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 2020.09.0 Configuration +# Barebox/arm 2021.02.0 Configuration # CONFIG_ARM=y CONFIG_ARM_LINUX=y @@ -214,6 +214,7 @@ CONFIG_STATE=y # CONFIG_BOOTCHOOSER is not set CONFIG_RESET_SOURCE=y # CONFIG_MACHINE_ID is not set +# CONFIG_SYSTEMD_OF_WATCHDOG is not set # # OP-TEE loading @@ -233,6 +234,9 @@ CONFIG_DEBUG_AT91_UART_BASE=0xf8020000 # CONFIG_DEBUG_INITCALLS is not set # CONFIG_PBL_BREAK is not set # CONFIG_UBSAN is not set +CONFIG_HAVE_ARCH_KASAN=y +CONFIG_CC_HAS_KASAN_GENERIC=y +# CONFIG_KASAN is not set # CONFIG_COMPILE_TEST is not set # end of Debugging @@ -263,6 +267,7 @@ CONFIG_CMD_VERSION=y # CONFIG_CMD_MMC is not set # CONFIG_CMD_MMC_EXTCSD is not set # CONFIG_CMD_POLLER is not set +# CONFIG_CMD_SLICE is not set # end of Information # @@ -302,6 +307,7 @@ CONFIG_CMD_PRINTENV=y CONFIG_CMD_MAGICVAR=y CONFIG_CMD_MAGICVAR_HELP=y CONFIG_CMD_SAVEENV=y +CONFIG_CMD_SETENV=y # end of Environment # @@ -381,6 +387,7 @@ CONFIG_CMD_MEMCMP=y CONFIG_CMD_MEMCPY=y CONFIG_CMD_MEMSET=y CONFIG_CMD_MEMTEST=y +# CONFIG_CMD_MEMTESTER is not set CONFIG_CMD_MM=y CONFIG_CMD_MW=y # end of Memory @@ -431,6 +438,7 @@ CONFIG_NET_RESOLV=y CONFIG_NET_IFUP=y CONFIG_NET_DHCP=y # CONFIG_NET_SNTP is not set +# CONFIG_NET_FASTBOOT is not set # # Drivers @@ -577,6 +585,7 @@ CONFIG_MCI=y CONFIG_MCI_INFO=y CONFIG_MCI_WRITE=y CONFIG_MCI_MMC_BOOT_PARTITIONS=y +# CONFIG_MCI_MMC_GPP_PARTITIONS is not set # # --- MCI host drivers --- @@ -730,6 +739,8 @@ CONFIG_REGULATOR_FIXED=y # NVME Support # # end of NVME Support + +# CONFIG_SYSCON_REBOOT_MODE is not set # end of Drivers # diff --git a/configs/platform-v7a/barebox-at91.config.diff b/configs/platform-v7a/barebox-at91.config.diff index 3f636d8..3fa0142 100644 --- a/configs/platform-v7a/barebox-at91.config.diff +++ b/configs/platform-v7a/barebox-at91.config.diff @@ -1,4 +1,4 @@ -e6072dae533833bfa758a60d8e3b92b6 +550b611f7e000b2105486cbceddb2144 CONFIG_ARCH_AT91=y # CONFIG_ARCH_BCM283X is not set CONFIG_ARCH_TEXT_BASE=0x23f00000 @@ -21,7 +21,6 @@ CONFIG_CMD_MENU_MANAGEMENT=y # CONFIG_CMD_USB is undefined # CONFIG_CMD_USBGADGET is undefined CONFIG_COMMON_CLK_AT91=y -CONFIG_COMMON_CLK_OF_PROVIDER=y CONFIG_COMPILE_LOGLEVEL=6 CONFIG_DEBUG_AT91_UART_BASE=0xf8020000 CONFIG_DEFAULT_COMPRESSION_BZIP2=y @@ -99,6 +98,7 @@ CONFIG_SOC_SAMA5D2=y CONFIG_SPI_ATMEL_QUADSPI=y # CONFIG_SPI_CADENCE_QUADSPI is not set CONFIG_SPI_MEM=y +# CONFIG_SYSCON_REBOOT_MODE is not set # CONFIG_THUMB2_BAREBOX is undefined # CONFIG_USB is undefined # CONFIG_USBGADGET_START is undefined diff --git a/configs/platform-v7a/barebox-mx6.config b/configs/platform-v7a/barebox-mx6.config index 1340090..8af1a2a 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 2020.09.0 Configuration +# Barebox/arm 2021.02.0 Configuration # CONFIG_ARM=y CONFIG_ARM_LINUX=y @@ -118,6 +118,8 @@ CONFIG_MACH_UDOO_NEO=y # CONFIG_MACH_PHYTEC_SOM_IMX8MQ is not set # CONFIG_MACH_GRINN_LITEBOARD is not set # CONFIG_MACH_DIGI_CCIMX6ULSBCPRO is not set +# CONFIG_MACH_WEBASTO_CCBV2 is not set +# CONFIG_MACH_MNT_REFORM is not set # # Board specific settings @@ -279,6 +281,7 @@ CONFIG_STATE=y # CONFIG_BOOTCHOOSER is not set CONFIG_RESET_SOURCE=y # CONFIG_MACHINE_ID is not set +# CONFIG_SYSTEMD_OF_WATCHDOG is not set # # OP-TEE loading @@ -304,6 +307,9 @@ CONFIG_DEBUG_IMX_UART_PORT=1 # CONFIG_DEBUG_INITCALLS is not set # CONFIG_PBL_BREAK is not set # CONFIG_UBSAN is not set +CONFIG_HAVE_ARCH_KASAN=y +CONFIG_CC_HAS_KASAN_GENERIC=y +# CONFIG_KASAN is not set # CONFIG_COMPILE_TEST is not set # end of Debugging @@ -333,6 +339,7 @@ CONFIG_CMD_VERSION=y CONFIG_CMD_MMC=y CONFIG_CMD_MMC_EXTCSD=y # CONFIG_CMD_POLLER is not set +# CONFIG_CMD_SLICE is not set # end of Information # @@ -373,6 +380,7 @@ CONFIG_CMD_PRINTENV=y CONFIG_CMD_MAGICVAR=y CONFIG_CMD_MAGICVAR_HELP=y CONFIG_CMD_SAVEENV=y +CONFIG_CMD_SETENV=y # end of Environment # @@ -454,6 +462,7 @@ CONFIG_CMD_MEMCMP=y CONFIG_CMD_MEMCPY=y CONFIG_CMD_MEMSET=y CONFIG_CMD_MEMTEST=y +# CONFIG_CMD_MEMTESTER is not set CONFIG_CMD_MM=y CONFIG_CMD_MW=y # end of Memory @@ -468,7 +477,6 @@ CONFIG_CMD_GPIO=y CONFIG_CMD_I2C=y CONFIG_CMD_LED=y CONFIG_CMD_NAND=y -CONFIG_CMD_NANDTEST=y # CONFIG_CMD_NAND_BITFLIP is not set # CONFIG_CMD_POWEROFF is not set CONFIG_CMD_SPI=y @@ -510,6 +518,7 @@ CONFIG_NET_RESOLV=y CONFIG_NET_IFUP=y CONFIG_NET_DHCP=y # CONFIG_NET_SNTP is not set +# CONFIG_NET_FASTBOOT is not set # # Drivers @@ -634,20 +643,12 @@ CONFIG_MTD_SST25L=y # CONFIG_DRIVER_CFI is not set CONFIG_NAND=y -CONFIG_NAND_ECC_SOFT=y -# CONFIG_NAND_ECC_BCH is not set -CONFIG_NAND_ECC_HW=y -# CONFIG_NAND_ECC_HW_OOB_FIRST is not set +# CONFIG_MTD_NAND_ECC_SOFT is not set CONFIG_NAND_ECC_HW_SYNDROME=y -CONFIG_NAND_ECC_HW_NONE=y -CONFIG_NAND_INFO=y -CONFIG_NAND_READ_OOB=y -CONFIG_NAND_BBT=y CONFIG_NAND_ALLOW_ERASE_BAD=y CONFIG_NAND_IMX=y CONFIG_NAND_MXS=y -# CONFIG_MTD_NAND_ECC_SMC is not set -CONFIG_MTD_NAND_IDS=y +# CONFIG_MTD_NAND_ECC_SW_HAMMING_SMC is not set # CONFIG_MTD_NAND_DENALI is not set CONFIG_MTD_SPI_NOR=y # CONFIG_MTD_SPI_NOR_USE_4K_SECTORS is not set @@ -714,6 +715,7 @@ CONFIG_VIDEO_VPL=y CONFIG_DRIVER_VIDEO_IMX_IPUV3=y CONFIG_DRIVER_VIDEO_IMX_IPUV3_LVDS=y # CONFIG_DRIVER_VIDEO_IMX_IPUV3_PARALLEL is not set +# CONFIG_DRIVER_VIDEO_BOCHS_ISA is not set CONFIG_DRIVER_VIDEO_SIMPLEFB=y # CONFIG_DRIVER_VIDEO_EDID is not set # CONFIG_DRIVER_VIDEO_BACKLIGHT is not set @@ -733,6 +735,7 @@ CONFIG_MCI=y CONFIG_MCI_INFO=y CONFIG_MCI_WRITE=y CONFIG_MCI_MMC_BOOT_PARTITIONS=y +# CONFIG_MCI_MMC_GPP_PARTITIONS is not set # # --- MCI host drivers --- @@ -913,6 +916,8 @@ CONFIG_USB_NOP_XCEIV=y # NVME Support # # end of NVME Support + +# CONFIG_SYSCON_REBOOT_MODE is not set # end of Drivers # diff --git a/configs/platform-v7a/barebox-mx6.config.diff b/configs/platform-v7a/barebox-mx6.config.diff index 3c04319..58450f9 100644 --- a/configs/platform-v7a/barebox-mx6.config.diff +++ b/configs/platform-v7a/barebox-mx6.config.diff @@ -1,4 +1,4 @@ -e6072dae533833bfa758a60d8e3b92b6 +550b611f7e000b2105486cbceddb2144 # CONFIG_ARCH_BCM283X is not set CONFIG_ARCH_HAS_FEC_IMX=y CONFIG_ARCH_HAS_IMX_GPT=y @@ -26,13 +26,11 @@ CONFIG_CLOCKSOURCE_IMX_GPT=y CONFIG_CMD_MIITOOL=y CONFIG_CMD_MMC_EXTCSD=y CONFIG_CMD_NAND=y -CONFIG_CMD_NANDTEST=y # CONFIG_CMD_NAND_BITFLIP is not set # CONFIG_CMD_SMC is undefined CONFIG_CMD_SPLASH=y CONFIG_CMD_UBI=y CONFIG_CMD_UBIFORMAT=y -CONFIG_COMMON_CLK_OF_PROVIDER=y # CONFIG_CONSOLE_ACTIVATE_FIRST is not set CONFIG_CONSOLE_ACTIVATE_NONE=y CONFIG_CRYPTO_KEYSTORE=y @@ -52,6 +50,7 @@ CONFIG_DRIVER_SERIAL_IMX=y CONFIG_DRIVER_SPI_IMX=y CONFIG_DRIVER_SPI_IMX_2_3=y # CONFIG_DRIVER_VIDEO_BACKLIGHT is not set +# CONFIG_DRIVER_VIDEO_BOCHS_ISA is not set # CONFIG_DRIVER_VIDEO_EDID is not set # CONFIG_DRIVER_VIDEO_FB_SSD1307 is not set CONFIG_DRIVER_VIDEO_IMX_IPUV3=y @@ -115,6 +114,7 @@ CONFIG_MACH_EMBEST_RIOTBOARD=y # CONFIG_MACH_GW_VENTANA is not set # CONFIG_MACH_KINDLE_MX50 is not set # CONFIG_MACH_KONTRON_SAMX6I is not set +# CONFIG_MACH_MNT_REFORM is not set CONFIG_MACH_NITROGEN6=y # CONFIG_MACH_NXP_IMX6ULL_EVK is not set # CONFIG_MACH_NXP_IMX8MM_EVK is not set @@ -148,6 +148,7 @@ CONFIG_MACH_UDOO_NEO=y # CONFIG_MACH_VARISCITE_MX6 is not set # CONFIG_MACH_VF610_TWR is not set # CONFIG_MACH_WARP7 is not set +# CONFIG_MACH_WEBASTO_CCBV2 is not set # CONFIG_MACH_ZII_IMX7D_DEV is not set # CONFIG_MACH_ZII_IMX8MQ_DEV is not set # CONFIG_MACH_ZII_RDU1 is not set @@ -167,8 +168,8 @@ CONFIG_MTD_DATAFLASH=y # CONFIG_MTD_DATAFLASH_WRITE_VERIFY is not set CONFIG_MTD_M25P80=y # CONFIG_MTD_NAND_DENALI is not set -# CONFIG_MTD_NAND_ECC_SMC is not set -CONFIG_MTD_NAND_IDS=y +# CONFIG_MTD_NAND_ECC_SOFT is not set +# CONFIG_MTD_NAND_ECC_SW_HAMMING_SMC is not set CONFIG_MTD_RAW_DEVICE=y CONFIG_MTD_SPI_NOR=y # CONFIG_MTD_SPI_NOR_USE_4K_SECTORS is not set @@ -181,17 +182,9 @@ CONFIG_MTD_UBI_FASTMAP=y CONFIG_MXS_APBH_DMA=y CONFIG_NAND=y CONFIG_NAND_ALLOW_ERASE_BAD=y -CONFIG_NAND_BBT=y -# CONFIG_NAND_ECC_BCH is not set -CONFIG_NAND_ECC_HW=y -CONFIG_NAND_ECC_HW_NONE=y -# CONFIG_NAND_ECC_HW_OOB_FIRST is not set CONFIG_NAND_ECC_HW_SYNDROME=y -CONFIG_NAND_ECC_SOFT=y CONFIG_NAND_IMX=y -CONFIG_NAND_INFO=y CONFIG_NAND_MXS=y -CONFIG_NAND_READ_OOB=y CONFIG_NVMEM=y # CONFIG_NVMEM_SNVS_LPGPR is not set CONFIG_PARTITION_DISK_EFI=y @@ -217,6 +210,7 @@ CONFIG_RESET_IMX_SRC=y # CONFIG_SPI_CADENCE_QUADSPI is not set CONFIG_SPI_MEM=y CONFIG_STMP_DEVICE=y +# CONFIG_SYSCON_REBOOT_MODE is not set CONFIG_THUMB2_BAREBOX=y CONFIG_UBIFORMAT=y CONFIG_USB_GADGET_DFU=y diff --git a/configs/platform-v7a/barebox-rpi2.config b/configs/platform-v7a/barebox-rpi2.config index 9e73e9e..4535c29 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 2020.09.0 Configuration +# Barebox/arm 2021.02.0 Configuration # CONFIG_ARM=y CONFIG_ARM_LINUX=y @@ -202,6 +202,7 @@ CONFIG_STATE=y # CONFIG_BOOTCHOOSER is not set CONFIG_RESET_SOURCE=y # CONFIG_MACHINE_ID is not set +# CONFIG_SYSTEMD_OF_WATCHDOG is not set # # OP-TEE loading @@ -219,6 +220,9 @@ CONFIG_DEFAULT_LOGLEVEL=6 # CONFIG_DEBUG_INITCALLS is not set # CONFIG_PBL_BREAK is not set # CONFIG_UBSAN is not set +CONFIG_HAVE_ARCH_KASAN=y +CONFIG_CC_HAS_KASAN_GENERIC=y +# CONFIG_KASAN is not set # CONFIG_COMPILE_TEST is not set # end of Debugging @@ -248,6 +252,7 @@ CONFIG_CMD_VERSION=y CONFIG_CMD_MMC=y # CONFIG_CMD_MMC_EXTCSD is not set # CONFIG_CMD_POLLER is not set +# CONFIG_CMD_SLICE is not set # end of Information # @@ -286,6 +291,7 @@ CONFIG_CMD_PRINTENV=y CONFIG_CMD_MAGICVAR=y CONFIG_CMD_MAGICVAR_HELP=y CONFIG_CMD_SAVEENV=y +CONFIG_CMD_SETENV=y # end of Environment # @@ -365,6 +371,7 @@ CONFIG_CMD_MEMCMP=y CONFIG_CMD_MEMCPY=y CONFIG_CMD_MEMSET=y CONFIG_CMD_MEMTEST=y +# CONFIG_CMD_MEMTESTER is not set CONFIG_CMD_MM=y CONFIG_CMD_MW=y # end of Memory @@ -416,6 +423,7 @@ CONFIG_NET_RESOLV=y CONFIG_NET_IFUP=y CONFIG_NET_DHCP=y # CONFIG_NET_SNTP is not set +# CONFIG_NET_FASTBOOT is not set # # Drivers @@ -562,6 +570,7 @@ CONFIG_MCI=y CONFIG_MCI_INFO=y CONFIG_MCI_WRITE=y CONFIG_MCI_MMC_BOOT_PARTITIONS=y +# CONFIG_MCI_MMC_GPP_PARTITIONS is not set # # --- MCI host drivers --- @@ -575,6 +584,7 @@ CONFIG_MCI_BCM283X_SDHOST=y CONFIG_HAVE_CLK=y CONFIG_CLKDEV_LOOKUP=y CONFIG_COMMON_CLK=y +CONFIG_COMMON_CLK_OF_PROVIDER=y # # Clocksource @@ -686,7 +696,9 @@ CONFIG_REGULATOR_BCM283X=y # CONFIG_FIRMWARE_ALTERA_SERIAL is not set # end of Firmware Drivers -# CONFIG_GENERIC_PHY is not set +CONFIG_GENERIC_PHY=y +CONFIG_USB_NOP_XCEIV=y +# CONFIG_PHY_FSL_IMX8MQ_USB is not set # CONFIG_CRYPTO_HW is not set # diff --git a/configs/platform-v7a/barebox-rpi2.config.diff b/configs/platform-v7a/barebox-rpi2.config.diff index 4ca4bd2..98f0915 100644 --- a/configs/platform-v7a/barebox-rpi2.config.diff +++ b/configs/platform-v7a/barebox-rpi2.config.diff @@ -1,4 +1,4 @@ -e6072dae533833bfa758a60d8e3b92b6 +550b611f7e000b2105486cbceddb2144 CONFIG_ARM_ASM_UNIFIED=y CONFIG_BOOTM_INITRD=y # CONFIG_CMD_I2C is undefined @@ -8,6 +8,7 @@ CONFIG_DRIVER_SERIAL_NS16550=y # CONFIG_EEPROM_93XX46 is not set # CONFIG_EEPROM_AT24 is undefined # CONFIG_FILE_LIST is undefined +CONFIG_GENERIC_PHY=y # CONFIG_GPIO_PCA953X is undefined # CONFIG_GPIO_PCF857X is undefined CONFIG_GPIO_RASPBERRYPI_EXP=y @@ -43,6 +44,7 @@ CONFIG_NET_NETCONSOLE=y CONFIG_NVMEM=y # CONFIG_NVMEM_SNVS_LPGPR is not set # CONFIG_PBL_OPTEE is undefined +# CONFIG_PHY_FSL_IMX8MQ_USB is not set CONFIG_PINCTRL_BCM283X=y CONFIG_PROMPT="R-Pi> " CONFIG_SERIAL_AMBA_PL011=y @@ -58,5 +60,6 @@ CONFIG_USB_DWC2_HOST=y # CONFIG_USB_GADGET_FASTBOOT is undefined # CONFIG_USB_GADGET_SERIAL is undefined # CONFIG_USB_HUB_USB251XB is undefined +CONFIG_USB_NOP_XCEIV=y CONFIG_USB_OTGDEV=y CONFIG_WATCHDOG_BCM2835=y diff --git a/configs/platform-v7a/barebox-stm32mp.config b/configs/platform-v7a/barebox-stm32mp.config index 10df8b0..b64fedb 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 2020.09.0 Configuration +# Barebox/arm 2021.02.0 Configuration # CONFIG_ARM=y CONFIG_ARM_LINUX=y @@ -52,7 +52,7 @@ CONFIG_CPU_32v7=y CONFIG_BAREBOX_MAX_IMAGE_SIZE=0xffffffff CONFIG_ARCH_NR_GPIO=416 CONFIG_ARCH_STM32MP157=y -CONFIG_MACH_STM32MP157C_DK2=y +CONFIG_MACH_STM32MP15XX_DKX=y CONFIG_MACH_LXA_MC1=y # CONFIG_MACH_SEEED_ODYSSEY is not set # CONFIG_BOARD_ARM_GENERIC_DT is not set @@ -198,6 +198,7 @@ CONFIG_STATE=y # CONFIG_BOOTCHOOSER is not set CONFIG_RESET_SOURCE=y # CONFIG_MACHINE_ID is not set +# CONFIG_SYSTEMD_OF_WATCHDOG is not set # # OP-TEE loading @@ -215,6 +216,9 @@ CONFIG_DEFAULT_LOGLEVEL=7 # CONFIG_DEBUG_INITCALLS is not set # CONFIG_PBL_BREAK is not set # CONFIG_UBSAN is not set +CONFIG_HAVE_ARCH_KASAN=y +CONFIG_CC_HAS_KASAN_GENERIC=y +# CONFIG_KASAN is not set # CONFIG_COMPILE_TEST is not set # end of Debugging @@ -244,6 +248,7 @@ CONFIG_CMD_VERSION=y CONFIG_CMD_MMC=y CONFIG_CMD_MMC_EXTCSD=y # CONFIG_CMD_POLLER is not set +# CONFIG_CMD_SLICE is not set # end of Information # @@ -282,6 +287,7 @@ CONFIG_CMD_PRINTENV=y CONFIG_CMD_MAGICVAR=y CONFIG_CMD_MAGICVAR_HELP=y CONFIG_CMD_SAVEENV=y +CONFIG_CMD_SETENV=y # end of Environment # @@ -361,6 +367,7 @@ CONFIG_CMD_MEMCMP=y CONFIG_CMD_MEMCPY=y CONFIG_CMD_MEMSET=y CONFIG_CMD_MEMTEST=y +# CONFIG_CMD_MEMTESTER is not set CONFIG_CMD_MM=y CONFIG_CMD_MW=y # end of Memory @@ -410,6 +417,7 @@ CONFIG_NET_RESOLV=y CONFIG_NET_IFUP=y CONFIG_NET_DHCP=y # CONFIG_NET_SNTP is not set +# CONFIG_NET_FASTBOOT is not set # # Drivers @@ -524,6 +532,7 @@ CONFIG_MCI_STARTUP=y CONFIG_MCI_INFO=y CONFIG_MCI_WRITE=y CONFIG_MCI_MMC_BOOT_PARTITIONS=y +# CONFIG_MCI_MMC_GPP_PARTITIONS is not set # # --- MCI host drivers --- @@ -684,6 +693,8 @@ CONFIG_RESET_STM32=y # NVME Support # # end of NVME Support + +# CONFIG_SYSCON_REBOOT_MODE is not set # end of Drivers # diff --git a/configs/platform-v7a/barebox-stm32mp.config.diff b/configs/platform-v7a/barebox-stm32mp.config.diff index 4b1564f..3212fc1 100644 --- a/configs/platform-v7a/barebox-stm32mp.config.diff +++ b/configs/platform-v7a/barebox-stm32mp.config.diff @@ -1,4 +1,4 @@ -e6072dae533833bfa758a60d8e3b92b6 +550b611f7e000b2105486cbceddb2144 # CONFIG_ARCH_BCM283X is not set CONFIG_ARCH_HAS_RESET_CONTROLLER=y CONFIG_ARCH_NR_GPIO=416 @@ -30,7 +30,6 @@ CONFIG_CMD_POWEROFF=y # CONFIG_CMD_SPI is undefined # CONFIG_CMD_USB is undefined # CONFIG_CMD_USBGADGET is undefined -CONFIG_COMMON_CLK_OF_PROVIDER=y CONFIG_COMPILE_LOGLEVEL=6 # CONFIG_CONSOLE_ACTIVATE_FIRST is not set CONFIG_CONSOLE_ACTIVATE_NONE=y @@ -69,7 +68,7 @@ CONFIG_MACH_LXA_MC1=y # CONFIG_MACH_RPI_CM3 is undefined # CONFIG_MACH_RPI_COMMON is undefined # CONFIG_MACH_SEEED_ODYSSEY is not set -CONFIG_MACH_STM32MP157C_DK2=y +CONFIG_MACH_STM32MP15XX_DKX=y # CONFIG_MCI_BCM283X is undefined # CONFIG_MCI_BCM283X_SDHOST is undefined # CONFIG_MCI_MMCI is not set @@ -126,6 +125,7 @@ CONFIG_STM32_BSEC=y CONFIG_STM32_IWDG_WATCHDOG=y CONFIG_STM32_REMOTEPROC=y # CONFIG_STPMIC1_WATCHDOG is not set +# CONFIG_SYSCON_REBOOT_MODE is not set CONFIG_THUMB2_BAREBOX=y # CONFIG_USB is undefined # CONFIG_USBGADGET_START is undefined diff --git a/configs/platform-v7a/barebox-vexpress.config b/configs/platform-v7a/barebox-vexpress.config index d507898..1765134 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 2020.09.0 Configuration +# Barebox/arm 2021.02.0 Configuration # CONFIG_ARM=y CONFIG_ARM_LINUX=y @@ -51,6 +51,7 @@ CONFIG_CPU_32v7=y CONFIG_ARCH_TEXT_BASE=0x0 CONFIG_BAREBOX_MAX_IMAGE_SIZE=0xffffffff CONFIG_MACH_VEXPRESS=y +# CONFIG_MACH_VIRT is not set CONFIG_BOARD_ARM_GENERIC_DT=y CONFIG_AEABI=y # CONFIG_THUMB2_BAREBOX is not set @@ -190,6 +191,7 @@ CONFIG_STATE=y # CONFIG_BOOTCHOOSER is not set CONFIG_RESET_SOURCE=y # CONFIG_MACHINE_ID is not set +# CONFIG_SYSTEMD_OF_WATCHDOG is not set # # OP-TEE loading @@ -208,6 +210,9 @@ CONFIG_DEFAULT_LOGLEVEL=6 # CONFIG_DEBUG_INITCALLS is not set # CONFIG_PBL_BREAK is not set # CONFIG_UBSAN is not set +CONFIG_HAVE_ARCH_KASAN=y +CONFIG_CC_HAS_KASAN_GENERIC=y +# CONFIG_KASAN is not set # CONFIG_COMPILE_TEST is not set # end of Debugging @@ -237,6 +242,7 @@ CONFIG_CMD_VERSION=y CONFIG_CMD_MMC=y # CONFIG_CMD_MMC_EXTCSD is not set # CONFIG_CMD_POLLER is not set +# CONFIG_CMD_SLICE is not set # end of Information # @@ -275,6 +281,7 @@ CONFIG_CMD_PRINTENV=y CONFIG_CMD_MAGICVAR=y CONFIG_CMD_MAGICVAR_HELP=y CONFIG_CMD_SAVEENV=y +CONFIG_CMD_SETENV=y # end of Environment # @@ -354,6 +361,7 @@ CONFIG_CMD_MEMCMP=y CONFIG_CMD_MEMCPY=y CONFIG_CMD_MEMSET=y CONFIG_CMD_MEMTEST=y +# CONFIG_CMD_MEMTESTER is not set CONFIG_CMD_MM=y CONFIG_CMD_MW=y # end of Memory @@ -405,6 +413,7 @@ CONFIG_NET_RESOLV=y CONFIG_NET_IFUP=y CONFIG_NET_DHCP=y # CONFIG_NET_SNTP is not set +# CONFIG_NET_FASTBOOT is not set # # Drivers @@ -571,6 +580,7 @@ CONFIG_MCI_STARTUP=y CONFIG_MCI_INFO=y CONFIG_MCI_WRITE=y # CONFIG_MCI_MMC_BOOT_PARTITIONS is not set +# CONFIG_MCI_MMC_GPP_PARTITIONS is not set # # --- MCI host drivers --- diff --git a/configs/platform-v7a/barebox-vexpress.config.diff b/configs/platform-v7a/barebox-vexpress.config.diff index ac5b99a..211256b 100644 --- a/configs/platform-v7a/barebox-vexpress.config.diff +++ b/configs/platform-v7a/barebox-vexpress.config.diff @@ -1,4 +1,4 @@ -e6072dae533833bfa758a60d8e3b92b6 +550b611f7e000b2105486cbceddb2144 CONFIG_AMBA_SP804=y # CONFIG_ARCH_BCM283X is not set CONFIG_ARCH_VEXPRESS=y @@ -9,7 +9,6 @@ CONFIG_BOOTM_INITRD=y # CONFIG_CLOCKSOURCE_BCM283X is undefined # CONFIG_CMD_GPIO is undefined # CONFIG_CMD_SMC is undefined -CONFIG_COMMON_CLK_OF_PROVIDER=y CONFIG_CONSOLE_ACTIVATE_ALL=y # CONFIG_CONSOLE_ACTIVATE_FIRST is not set CONFIG_DRIVER_CFI=y @@ -47,6 +46,7 @@ CONFIG_DRIVER_NET_SMC911X=y # CONFIG_MACH_RPI_CM3 is undefined # CONFIG_MACH_RPI_COMMON is undefined CONFIG_MACH_VEXPRESS=y +# CONFIG_MACH_VIRT is not set # CONFIG_MCI_BCM283X is undefined # CONFIG_MCI_BCM283X_SDHOST is undefined # CONFIG_MDIO_BUS_MUX_GPIO is undefined diff --git a/configs/platform-v7a/barebox.config b/configs/platform-v7a/barebox.config index bbe7f3e..fd9da05 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 2020.09.0 Configuration +# Barebox/arm 2021.02.0 Configuration # CONFIG_ARM=y CONFIG_ARM_LINUX=y @@ -203,6 +203,7 @@ CONFIG_STATE=y # CONFIG_BOOTCHOOSER is not set CONFIG_RESET_SOURCE=y # CONFIG_MACHINE_ID is not set +# CONFIG_SYSTEMD_OF_WATCHDOG is not set # # OP-TEE loading @@ -221,6 +222,9 @@ CONFIG_DEFAULT_LOGLEVEL=6 # CONFIG_DEBUG_INITCALLS is not set # CONFIG_PBL_BREAK is not set # CONFIG_UBSAN is not set +CONFIG_HAVE_ARCH_KASAN=y +CONFIG_CC_HAS_KASAN_GENERIC=y +# CONFIG_KASAN is not set # CONFIG_COMPILE_TEST is not set # end of Debugging @@ -250,6 +254,7 @@ CONFIG_CMD_VERSION=y CONFIG_CMD_MMC=y # CONFIG_CMD_MMC_EXTCSD is not set # CONFIG_CMD_POLLER is not set +# CONFIG_CMD_SLICE is not set # end of Information # @@ -288,6 +293,7 @@ CONFIG_CMD_PRINTENV=y CONFIG_CMD_MAGICVAR=y CONFIG_CMD_MAGICVAR_HELP=y CONFIG_CMD_SAVEENV=y +CONFIG_CMD_SETENV=y # end of Environment # @@ -367,6 +373,7 @@ CONFIG_CMD_MEMCMP=y CONFIG_CMD_MEMCPY=y CONFIG_CMD_MEMSET=y CONFIG_CMD_MEMTEST=y +# CONFIG_CMD_MEMTESTER is not set CONFIG_CMD_MM=y CONFIG_CMD_MW=y # end of Memory @@ -420,6 +427,7 @@ CONFIG_NET_RESOLV=y CONFIG_NET_IFUP=y CONFIG_NET_DHCP=y # CONFIG_NET_SNTP is not set +# CONFIG_NET_FASTBOOT is not set # # Drivers @@ -584,6 +592,7 @@ CONFIG_MCI_STARTUP=y CONFIG_MCI_INFO=y CONFIG_MCI_WRITE=y # CONFIG_MCI_MMC_BOOT_PARTITIONS is not set +# CONFIG_MCI_MMC_GPP_PARTITIONS is not set # # --- MCI host drivers --- @@ -597,6 +606,7 @@ CONFIG_MCI_MMCI=y CONFIG_HAVE_CLK=y CONFIG_CLKDEV_LOOKUP=y CONFIG_COMMON_CLK=y +CONFIG_COMMON_CLK_OF_PROVIDER=y # # Clocksource diff --git a/configs/platform-v7a/patches/barebox-2021.02.0/bcm283X-Select-OF-clock-providers.patch b/configs/platform-v7a/patches/barebox-2021.02.0/bcm283X-Select-OF-clock-providers.patch new file mode 100644 index 0000000..8b08428 --- /dev/null +++ b/configs/platform-v7a/patches/barebox-2021.02.0/bcm283X-Select-OF-clock-providers.patch @@ -0,0 +1,30 @@ +From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= +Date: Thu, 11 Mar 2021 13:10:47 +0100 +Subject: [PATCH] bcm283X: Select OF clock providers +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This makes available the fixed clock needed on rpi3 for USB. + +USB stopped working when the dwc driver started to require an otg clock. + +Fixes: f73ca701bb85 ("usb: dwc2: add clk dependency for probe via oftree") +Signed-off-by: Uwe Kleine-König +Link: https://lore.pengutronix.de/20210312133030.521569-1-u.kleine-koenig@pengutronix.de +--- + arch/arm/Kconfig | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig +index ab0bf030131c..f9be9d42ecff 100644 +--- a/arch/arm/Kconfig ++++ b/arch/arm/Kconfig +@@ -44,6 +44,7 @@ config ARCH_BCM283X + select GPIOLIB + select CLKDEV_LOOKUP + select COMMON_CLK ++ select COMMON_CLK_OF_PROVIDER + select CLOCKSOURCE_BCM283X + select ARM_AMBA + select HAS_DEBUG_LL diff --git a/configs/platform-v7a/patches/barebox-2021.02.0/net-phy-fix-waiting-for-link.patch b/configs/platform-v7a/patches/barebox-2021.02.0/net-phy-fix-waiting-for-link.patch new file mode 100644 index 0000000..cf42798 --- /dev/null +++ b/configs/platform-v7a/patches/barebox-2021.02.0/net-phy-fix-waiting-for-link.patch @@ -0,0 +1,35 @@ +From: Sascha Hauer +Date: Fri, 12 Mar 2021 11:13:09 +0100 +Subject: [PATCH] net: phy: fix waiting for link + +phydev->adjust_link() is called only from phy_update_status() when the +link status changes during that function. phydev->link is also updated +in genphy_update_link() called from phy_wait_aneg_done(), so it can +happen that phydev->link changes outside of phy_update_status(), thus +phydev->adjust_link is never called and no link change notice is +printed. + +Instead of calling genphy_update_link() from phy_wait_aneg_done(), call +phy_update_status(). This makes sure that a link change is properly +noticed. + +Fixes: 8f75aa496dcb ("net: reply to ping requests") +Signed-off-by: Sascha Hauer +Link: https://lore.pengutronix.de/20210312101309.29650-1-s.hauer@pengutronix.de +--- + drivers/net/phy/phy.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c +index 622acbe40dd9..e8e8dad5bd25 100644 +--- a/drivers/net/phy/phy.c ++++ b/drivers/net/phy/phy.c +@@ -571,7 +571,7 @@ int phy_wait_aneg_done(struct phy_device *phydev) + } + + do { +- genphy_update_link(phydev); ++ phy_update_status(phydev); + if (phydev->link == 1) + return 0; + } while (!is_timeout(start, PHY_AN_TIMEOUT * SECOND)); diff --git a/configs/platform-v7a/patches/barebox-2021.02.0/of-base-probe-simple-pm-bus-children-as-well.patch b/configs/platform-v7a/patches/barebox-2021.02.0/of-base-probe-simple-pm-bus-children-as-well.patch new file mode 100644 index 0000000..7873666 --- /dev/null +++ b/configs/platform-v7a/patches/barebox-2021.02.0/of-base-probe-simple-pm-bus-children-as-well.patch @@ -0,0 +1,40 @@ +From: Ahmad Fatoum +Date: Fri, 12 Mar 2021 08:27:46 +0100 +Subject: [PATCH] of: base: probe simple-pm-bus children as well + +Upstream is migrating device trees like those of the am33xx to use +simple-pm-bus, where applicable. These are buses that reference a clock +or a power domain that needs to be enabled in order to use devices on it. + +As we didn't yet support this binding, this broke the Beaglebone +and all other am33xx board since v2021.02.0. + +Fix this by adding simple-pm-bus to the of_default_bus_match_table. +Note that this is only an adequate solution for when the power domain +and clocks referenced are already enabled prior to barebox startup. + +For all other cases, driver support must be available for the clock +and power domains in questions and this driver must be extended to +make use of them. For the am33xx, the relevant buses are powered +and clocked on boot up, so we leave general support to another day.. + +Fixes: 6ea3de1b8ce7 ("dts: update to v5.11-rc1") +Signed-off-by: Ahmad Fatoum +Link: https://lore.pengutronix.de/20210312082218.17058-1-a.fatoum@pengutronix.de +--- + drivers/of/base.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/drivers/of/base.c b/drivers/of/base.c +index 8759099d7480..6fe02649ee53 100644 +--- a/drivers/of/base.c ++++ b/drivers/of/base.c +@@ -2272,6 +2272,8 @@ const char *of_get_model(void) + const struct of_device_id of_default_bus_match_table[] = { + { + .compatible = "simple-bus", ++ }, { ++ .compatible = "simple-pm-bus", + }, { + .compatible = "simple-mfd", + }, { diff --git a/configs/platform-v7a/patches/barebox-2021.02.0/series b/configs/platform-v7a/patches/barebox-2021.02.0/series new file mode 100644 index 0000000..0654fa5 --- /dev/null +++ b/configs/platform-v7a/patches/barebox-2021.02.0/series @@ -0,0 +1,6 @@ +# generated by git-ptx-patches +#tag:base --start-number 1 +of-base-probe-simple-pm-bus-children-as-well.patch +net-phy-fix-waiting-for-link.patch +bcm283X-Select-OF-clock-providers.patch +# ad5056773d1eb319e6b321f55c67cc0c - git-ptx-patches magic diff --git a/configs/platform-v7a/platformconfig b/configs/platform-v7a/platformconfig index 9145bb8..2ef8b8e 100644 --- a/configs/platform-v7a/platformconfig +++ b/configs/platform-v7a/platformconfig @@ -176,8 +176,8 @@ PTXCONF_CONSOLE_SPEED="115200" # PTXCONF_AT91BOOTSTRAP2 is not set PTXCONF_BAREBOX_COMMON_ARCH_STRING="arm" PTXCONF_BAREBOX_COMMON=y -PTXCONF_BAREBOX_COMMON_VERSION="2020.09.0" -PTXCONF_BAREBOX_COMMON_MD5="907dc813298fcded06fa9c788d3fb6c8" +PTXCONF_BAREBOX_COMMON_VERSION="2021.02.0" +PTXCONF_BAREBOX_COMMON_MD5="07045e34faa1135d9cd18503186b2d7f" PTXCONF_BAREBOX_COMMON_NEEDS_HOST_LZOP=y PTXCONF_BAREBOX_AM335X_MLO=y PTXCONF_BAREBOX_AM335X=y diff --git a/configs/platform-v7a/rules/barebox-stm32mp.make b/configs/platform-v7a/rules/barebox-stm32mp.make index 82a3c31..2ad1fa4 100644 --- a/configs/platform-v7a/rules/barebox-stm32mp.make +++ b/configs/platform-v7a/rules/barebox-stm32mp.make @@ -43,7 +43,7 @@ BAREBOX_STM32MP_MAKE_ENV := $(BAREBOX_STM32MP_CONF_ENV) BAREBOX_STM32MP_MAKE_OPT := $(BAREBOX_STM32MP_CONF_OPT) BAREBOX_STM32MP_IMAGES := \ - images/barebox-stm32mp157c-dk2.img \ + images/barebox-stm32mp15xx-dkx.img \ images/barebox-stm32mp157c-lxa-mc1.img BAREBOX_STM32MP_IMAGES := $(addprefix $(BAREBOX_STM32MP_DIR)/,$(BAREBOX_STM32MP_IMAGES)) diff --git a/configs/platform-v7a/rules/image-stm32mp157c-dk2.make b/configs/platform-v7a/rules/image-stm32mp157c-dk2.make index 2c739d3..7c0f442 100644 --- a/configs/platform-v7a/rules/image-stm32mp157c-dk2.make +++ b/configs/platform-v7a/rules/image-stm32mp157c-dk2.make @@ -13,7 +13,7 @@ IMAGE_PACKAGES-$(PTXCONF_IMAGE_STM32MP157C_DK2) += image-stm32mp157c-dk2 IMAGE_STM32MP157C_DK2_ENV := \ STM32MP_BOARD_FSBL=stm32mp157c-dk2 \ - STM32MP_BOARD_SSBL=stm32mp157c-dk2 + STM32MP_BOARD_SSBL=stm32mp15xx-dkx # # Paths and names -- cgit v1.2.3