From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Wed, 06 Mar 2024 10:25:39 +0100 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1rhnWt-00Akeh-2x for lore@lore.pengutronix.de; Wed, 06 Mar 2024 10:25:39 +0100 Received: from localhost ([127.0.0.1] helo=metis.whiteo.stw.pengutronix.de) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1rhnWt-0003cH-Al; Wed, 06 Mar 2024 10:25:39 +0100 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1rhnWp-0003aH-9V; Wed, 06 Mar 2024 10:25:35 +0100 Received: from [2a0a:edc0:0:1101:1d::54] (helo=dude05.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1rhnWo-004iYS-Sx; Wed, 06 Mar 2024 10:25:34 +0100 Received: from localhost ([::1] helo=dude05.red.stw.pengutronix.de) by dude05.red.stw.pengutronix.de with esmtp (Exim 4.96) (envelope-from ) id 1rhnWo-0065XD-0s; Wed, 06 Mar 2024 10:25:34 +0100 From: Ahmad Fatoum To: distrokit@pengutronix.de Date: Wed, 6 Mar 2024 10:25:28 +0100 Message-Id: <20240306092530.1448784-2-a.fatoum@pengutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240306092530.1448784-1-a.fatoum@pengutronix.de> References: <20240306092530.1448784-1-a.fatoum@pengutronix.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [DistroKit] [PATCH v2 1/3] platform: v7a: barebox: Upgrade from 2023.12.0 to 2024.01.0 X-BeenThere: distrokit@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: DistroKit Mailinglist List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Alexander Dahl , Ahmad Fatoum , Roland Hieber Sender: "DistroKit" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: distrokit-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.whiteo.stw.pengutronix.de); SAEximRunCond expanded to false From: Alexander Dahl The latest and greatest. Has the nice support for 'noload' sub-images in FIT images conforming for spec. Signed-off-by: Alexander Dahl Signed-off-by: Ahmad Fatoum --- v1 -> v2: - import patch from barebox master branch to address v2024.01.0 rpi-without-videocore-dt --- .../platform-v7a/barebox-am335x-mlo.config | 10 +- configs/platform-v7a/barebox-am335x.config | 11 +- .../platform-v7a/barebox-am335x.config.diff | 3 +- configs/platform-v7a/barebox-at91.config | 11 +- configs/platform-v7a/barebox-at91.config.diff | 3 +- configs/platform-v7a/barebox-mx6.config | 12 +- configs/platform-v7a/barebox-mx6.config.diff | 4 +- configs/platform-v7a/barebox-rpi2.config | 12 +- configs/platform-v7a/barebox-rpi2.config.diff | 2 +- configs/platform-v7a/barebox-stm32mp.config | 13 +- .../platform-v7a/barebox-stm32mp.config.diff | 3 +- configs/platform-v7a/barebox-vexpress.config | 11 +- .../platform-v7a/barebox-vexpress.config.diff | 3 +- configs/platform-v7a/barebox.config | 12 +- ...ression-booting-without-VideoCore-DT.patch | 130 ++++++++++++++++++ .../patches/barebox-2024.01.0/series | 1 + configs/platform-v7a/platformconfig | 4 +- 17 files changed, 222 insertions(+), 23 deletions(-) create mode 100644 configs/platform-v7a/patches/barebox-2024.01.0/0001-ARM-rpi-fix-regression-booting-without-VideoCore-DT.patch create mode 100644 configs/platform-v7a/patches/barebox-2024.01.0/series diff --git a/configs/platform-v7a/barebox-am335x-mlo.config b/configs/platform-v7a/barebox-am335x-mlo.config index b652d28850c1..12707b759ab4 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 2023.12.0 Configuration +# Barebox/arm 2024.01.0 Configuration # CONFIG_ARM=y CONFIG_ARM_USE_COMPRESSED_DTB=y @@ -188,6 +188,7 @@ CONFIG_DEFAULT_LOGLEVEL=7 CONFIG_DEBUG_OMAP_UART_PORT=1 # CONFIG_DEBUG_INITCALLS is not set # CONFIG_DEBUG_PROBES is not set +# CONFIG_DMA_API_DEBUG is not set # CONFIG_PBL_BREAK is not set # CONFIG_PRINTF_FULL is not set # CONFIG_UBSAN is not set @@ -412,6 +413,12 @@ CONFIG_TI_SYSC=y # # CONFIG_FIRMWARE_ALTERA_SERIAL is not set # CONFIG_QEMU_FW_CFG is not set + +# +# ARM System Control and Management Interface Protocol +# +# CONFIG_ARM_SCMI_PROTOCOL is not set +# end of ARM System Control and Management Interface Protocol # end of Firmware Drivers # @@ -458,6 +465,7 @@ CONFIG_TI_SYSC=y # CONFIG_POWER_RESET_GPIO_RESTART is not set # CONFIG_VIRTIO_MENU is not set # CONFIG_MAILBOX is not set +# CONFIG_TEE is not set # end of Drivers # diff --git a/configs/platform-v7a/barebox-am335x.config b/configs/platform-v7a/barebox-am335x.config index 54453aedf649..fbcdc25e2f16 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 2023.12.0 Configuration +# Barebox/arm 2024.01.0 Configuration # CONFIG_ARM=y CONFIG_ARM_LINUX=y @@ -244,6 +244,7 @@ CONFIG_DEFAULT_LOGLEVEL=6 CONFIG_DEBUG_OMAP_UART_PORT=1 # CONFIG_DEBUG_INITCALLS is not set # CONFIG_DEBUG_PROBES is not set +# CONFIG_DMA_API_DEBUG is not set # CONFIG_PBL_BREAK is not set # CONFIG_PRINTF_FULL is not set # CONFIG_UBSAN is not set @@ -529,6 +530,7 @@ CONFIG_DRIVER_NET_CPSW=y # CONFIG_DAVICOM_PHY is not set # CONFIG_DP83867_PHY is not set # CONFIG_DP83TD510_PHY is not set +# CONFIG_DP83TG720_PHY is not set # CONFIG_LXT_PHY is not set # CONFIG_MARVELL_PHY is not set # CONFIG_MICREL_PHY is not set @@ -819,6 +821,12 @@ CONFIG_REGULATOR_FIXED=y # # CONFIG_FIRMWARE_ALTERA_SERIAL is not set # CONFIG_QEMU_FW_CFG is not set + +# +# ARM System Control and Management Interface Protocol +# +# CONFIG_ARM_SCMI_PROTOCOL is not set +# end of ARM System Control and Management Interface Protocol # end of Firmware Drivers # @@ -866,6 +874,7 @@ CONFIG_REGULATOR_FIXED=y # CONFIG_POWER_RESET_GPIO_RESTART is not set # CONFIG_VIRTIO_MENU is not set # CONFIG_MAILBOX is not set +# CONFIG_TEE is not set # end of Drivers # diff --git a/configs/platform-v7a/barebox-am335x.config.diff b/configs/platform-v7a/barebox-am335x.config.diff index 7354b58a06c7..c0c929c239a3 100644 --- a/configs/platform-v7a/barebox-am335x.config.diff +++ b/configs/platform-v7a/barebox-am335x.config.diff @@ -1,4 +1,4 @@ -53d21fb44946357f79471694e33102cc +60c98fdd624cc491e6ab694be209074e # CONFIG_AM33XX_NET_BOOT is not set CONFIG_ARCH_AM33XX=y # CONFIG_ARCH_BCM283X is not set @@ -8,7 +8,6 @@ CONFIG_ARCH_OMAP_MULTI=y CONFIG_ARM_ASM_UNIFIED=y CONFIG_ARM_BOARD_APPEND_ATAG=y # CONFIG_ARM_BOARD_PREPEND_ATAG is not set -# CONFIG_ARM_SCMI_PROTOCOL is undefined # CONFIG_ARM_SECURE_MONITOR is undefined # CONFIG_ARM_SMCCC is undefined # CONFIG_BAREBOX_UPDATE_AM33XX_EMMC is not set diff --git a/configs/platform-v7a/barebox-at91.config b/configs/platform-v7a/barebox-at91.config index eac526659940..a8bef5382f57 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 2023.12.0 Configuration +# Barebox/arm 2024.01.0 Configuration # CONFIG_ARM=y CONFIG_ARM_LINUX=y @@ -254,6 +254,7 @@ CONFIG_DEBUG_AT91_UART_BASE=0xfc069000 # CONFIG_DEBUG_INITCALLS is not set # CONFIG_DEBUG_PBL is not set # CONFIG_DEBUG_PROBES is not set +# CONFIG_DMA_API_DEBUG is not set # CONFIG_PBL_BREAK is not set # CONFIG_PRINTF_FULL is not set # CONFIG_UBSAN is not set @@ -542,6 +543,7 @@ CONFIG_DRIVER_NET_MICREL=y # CONFIG_DAVICOM_PHY is not set # CONFIG_DP83867_PHY is not set # CONFIG_DP83TD510_PHY is not set +# CONFIG_DP83TG720_PHY is not set # CONFIG_LXT_PHY is not set # CONFIG_MARVELL_PHY is not set # CONFIG_MICREL_PHY is not set @@ -824,6 +826,12 @@ CONFIG_REGULATOR_FIXED=y # # CONFIG_FIRMWARE_ALTERA_SERIAL is not set # CONFIG_QEMU_FW_CFG is not set + +# +# ARM System Control and Management Interface Protocol +# +# CONFIG_ARM_SCMI_PROTOCOL is not set +# end of ARM System Control and Management Interface Protocol # end of Firmware Drivers # @@ -873,6 +881,7 @@ CONFIG_ATMEL_EBI=y # CONFIG_POWER_RESET_GPIO_RESTART is not set # CONFIG_VIRTIO_MENU is not set # CONFIG_MAILBOX is not set +# CONFIG_TEE 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 b2e86af201b5..34e71cbee6ee 100644 --- a/configs/platform-v7a/barebox-at91.config.diff +++ b/configs/platform-v7a/barebox-at91.config.diff @@ -1,4 +1,4 @@ -53d21fb44946357f79471694e33102cc +60c98fdd624cc491e6ab694be209074e CONFIG_ARCH_AT91=y # CONFIG_ARCH_BCM283X is not set # CONFIG_ARCH_IMX is undefined @@ -7,7 +7,6 @@ CONFIG_ARCH_AT91=y # CONFIG_ARCH_ROCKCHIP is undefined CONFIG_ARCH_TEXT_BASE=0x23f00000 # CONFIG_ARM_AMBA is undefined -# CONFIG_ARM_SCMI_PROTOCOL is undefined # CONFIG_ARM_SECURE_MONITOR is undefined # CONFIG_ARM_SMCCC is undefined CONFIG_AT91SAM9_SMC=y diff --git a/configs/platform-v7a/barebox-mx6.config b/configs/platform-v7a/barebox-mx6.config index b23558510ec5..5e2d64903720 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 2023.12.0 Configuration +# Barebox/arm 2024.01.0 Configuration # CONFIG_ARM=y CONFIG_ARM_LINUX=y @@ -140,6 +140,7 @@ CONFIG_MACH_UDOO_NEO=y # CONFIG_MACH_WARP7 is not set # CONFIG_MACH_FREESCALE_MX7_SABRESD is not set # CONFIG_MACH_PHYTEC_PHYCORE_IMX7 is not set +# CONFIG_MACH_VARISCITE_SOM_MX7 is not set # CONFIG_MACH_ZII_IMX7D_DEV is not set # CONFIG_MACH_KAMSTRUP_MX7_CONCENTRATOR is not set @@ -336,6 +337,7 @@ CONFIG_DEFAULT_LOGLEVEL=6 CONFIG_DEBUG_IMX_UART_PORT=1 # CONFIG_DEBUG_INITCALLS is not set # CONFIG_DEBUG_PROBES is not set +# CONFIG_DMA_API_DEBUG is not set # CONFIG_PBL_BREAK is not set # CONFIG_PRINTF_FULL is not set # CONFIG_UBSAN is not set @@ -631,6 +633,7 @@ CONFIG_AT803X_PHY=y # CONFIG_DAVICOM_PHY is not set # CONFIG_DP83867_PHY is not set # CONFIG_DP83TD510_PHY is not set +# CONFIG_DP83TG720_PHY is not set # CONFIG_LXT_PHY is not set # CONFIG_MARVELL_PHY is not set CONFIG_MICREL_PHY=y @@ -985,6 +988,12 @@ CONFIG_HW_HAS_PCI=y # # CONFIG_FIRMWARE_ALTERA_SERIAL is not set # CONFIG_QEMU_FW_CFG is not set + +# +# ARM System Control and Management Interface Protocol +# +# CONFIG_ARM_SCMI_PROTOCOL is not set +# end of ARM System Control and Management Interface Protocol # end of Firmware Drivers # @@ -1036,6 +1045,7 @@ CONFIG_USB_NOP_XCEIV=y # CONFIG_POWER_RESET_GPIO_RESTART is not set # CONFIG_VIRTIO_MENU is not set # CONFIG_MAILBOX is not set +# CONFIG_TEE 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 90a8680f65dd..dd4df80b7ade 100644 --- a/configs/platform-v7a/barebox-mx6.config.diff +++ b/configs/platform-v7a/barebox-mx6.config.diff @@ -1,4 +1,4 @@ -53d21fb44946357f79471694e33102cc +60c98fdd624cc491e6ab694be209074e # CONFIG_ARCH_BCM283X is not set CONFIG_ARCH_HAS_FEC_IMX=y CONFIG_ARCH_HAS_IMX_GPT=y @@ -10,7 +10,6 @@ CONFIG_ARCH_IMX_IMXIMAGE=y # CONFIG_ARCH_IMX_USBLOADER is not set # CONFIG_ARCH_TEXT_BASE is undefined CONFIG_ARM_ASM_UNIFIED=y -# CONFIG_ARM_SCMI_PROTOCOL is undefined # CONFIG_ARM_SECURE_MONITOR is undefined # CONFIG_ARM_SMCCC is undefined # CONFIG_ARM_USE_COMPRESSED_DTB is undefined @@ -157,6 +156,7 @@ CONFIG_MACH_SABRELITE=y # CONFIG_MACH_UDOO is not set CONFIG_MACH_UDOO_NEO=y # CONFIG_MACH_VARISCITE_MX6 is not set +# CONFIG_MACH_VARISCITE_SOM_MX7 is not set # CONFIG_MACH_VF610_TWR is not set # CONFIG_MACH_WARP7 is not set # CONFIG_MACH_WEBASTO_CCBV2 is not set diff --git a/configs/platform-v7a/barebox-rpi2.config b/configs/platform-v7a/barebox-rpi2.config index 252c11544fed..43e5ba62ff0d 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 2023.12.0 Configuration +# Barebox/arm 2024.01.0 Configuration # CONFIG_ARM=y CONFIG_ARM_LINUX=y @@ -236,6 +236,7 @@ CONFIG_DEFAULT_LOGLEVEL=6 # CONFIG_DEBUG_LL is not set # CONFIG_DEBUG_INITCALLS is not set # CONFIG_DEBUG_PROBES is not set +# CONFIG_DMA_API_DEBUG is not set # CONFIG_PBL_BREAK is not set # CONFIG_PRINTF_FULL is not set # CONFIG_UBSAN is not set @@ -518,6 +519,7 @@ CONFIG_DRIVER_NET_BCMGENET=y # CONFIG_DAVICOM_PHY is not set # CONFIG_DP83867_PHY is not set # CONFIG_DP83TD510_PHY is not set +# CONFIG_DP83TG720_PHY is not set # CONFIG_LXT_PHY is not set # CONFIG_MARVELL_PHY is not set # CONFIG_MICREL_PHY is not set @@ -797,8 +799,13 @@ CONFIG_REGULATOR_BCM283X=y # Firmware Drivers # # CONFIG_FIRMWARE_ALTERA_SERIAL is not set -# CONFIG_ARM_SCMI_PROTOCOL is not set # CONFIG_QEMU_FW_CFG is not set + +# +# ARM System Control and Management Interface Protocol +# +# CONFIG_ARM_SCMI_PROTOCOL is not set +# end of ARM System Control and Management Interface Protocol # end of Firmware Drivers # @@ -848,6 +855,7 @@ CONFIG_USB_NOP_XCEIV=y # CONFIG_POWER_RESET_GPIO_RESTART is not set # CONFIG_VIRTIO_MENU is not set # CONFIG_MAILBOX is not set +# CONFIG_TEE is not set # end of Drivers # diff --git a/configs/platform-v7a/barebox-rpi2.config.diff b/configs/platform-v7a/barebox-rpi2.config.diff index 996186382782..692f645fd4c9 100644 --- a/configs/platform-v7a/barebox-rpi2.config.diff +++ b/configs/platform-v7a/barebox-rpi2.config.diff @@ -1,4 +1,4 @@ -53d21fb44946357f79471694e33102cc +60c98fdd624cc491e6ab694be209074e CONFIG_ARM_ASM_UNIFIED=y # CONFIG_CMD_NVMEM is not set CONFIG_DRIVER_NET_BCMGENET=y diff --git a/configs/platform-v7a/barebox-stm32mp.config b/configs/platform-v7a/barebox-stm32mp.config index 7bbae9cc0f88..539f0a9dcd08 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 2023.12.0 Configuration +# Barebox/arm 2024.01.0 Configuration # CONFIG_ARM=y CONFIG_ARM_LINUX=y @@ -233,6 +233,7 @@ CONFIG_DEFAULT_LOGLEVEL=7 # CONFIG_DEBUG_INITCALLS is not set # CONFIG_DEBUG_PBL is not set # CONFIG_DEBUG_PROBES is not set +# CONFIG_DMA_API_DEBUG is not set # CONFIG_PBL_BREAK is not set # CONFIG_PRINTF_FULL is not set # CONFIG_UBSAN is not set @@ -518,6 +519,7 @@ CONFIG_AT803X_PHY=y # CONFIG_DAVICOM_PHY is not set # CONFIG_DP83867_PHY is not set # CONFIG_DP83TD510_PHY is not set +# CONFIG_DP83TG720_PHY is not set # CONFIG_LXT_PHY is not set # CONFIG_MARVELL_PHY is not set CONFIG_MICREL_PHY=y @@ -626,6 +628,7 @@ CONFIG_HAVE_CLK=y CONFIG_CLKDEV_LOOKUP=y CONFIG_COMMON_CLK=y CONFIG_COMMON_CLK_OF_PROVIDER=y +CONFIG_COMMON_CLK_STM32MP157=y CONFIG_COMMON_CLK_GPIO=y # @@ -773,8 +776,13 @@ CONFIG_RESET_SIMPLE=y # # Firmware Drivers # -# CONFIG_ARM_SCMI_PROTOCOL is not set # CONFIG_QEMU_FW_CFG is not set + +# +# ARM System Control and Management Interface Protocol +# +# CONFIG_ARM_SCMI_PROTOCOL is not set +# end of ARM System Control and Management Interface Protocol # end of Firmware Drivers # @@ -828,6 +836,7 @@ CONFIG_STM32_FMC2_EBI=y CONFIG_RESET_STM32=y # CONFIG_VIRTIO_MENU is not set # CONFIG_MAILBOX is not set +# CONFIG_TEE 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 1d495508c4b0..f5b6775cee10 100644 --- a/configs/platform-v7a/barebox-stm32mp.config.diff +++ b/configs/platform-v7a/barebox-stm32mp.config.diff @@ -1,4 +1,4 @@ -53d21fb44946357f79471694e33102cc +60c98fdd624cc491e6ab694be209074e # CONFIG_ARCH_BCM283X is not set CONFIG_ARCH_HAS_RESET_CONTROLLER=y CONFIG_ARCH_NR_GPIO=416 @@ -30,6 +30,7 @@ CONFIG_CMD_POWEROFF=y # CONFIG_CMD_PWM is not set # CONFIG_CMD_SPI is undefined # CONFIG_CMD_STACKSMASH is not set +CONFIG_COMMON_CLK_STM32MP157=y CONFIG_COMPILE_LOGLEVEL=6 # CONFIG_CONSOLE_ACTIVATE_FIRST is not set CONFIG_CONSOLE_ACTIVATE_NONE=y diff --git a/configs/platform-v7a/barebox-vexpress.config b/configs/platform-v7a/barebox-vexpress.config index 3b9ab3a0d1fc..4fde5e020bc7 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 2023.12.0 Configuration +# Barebox/arm 2024.01.0 Configuration # CONFIG_ARM=y CONFIG_ARM_LINUX=y @@ -221,6 +221,7 @@ CONFIG_DEFAULT_LOGLEVEL=6 # CONFIG_DEBUG_INITCALLS is not set # CONFIG_DEBUG_PBL is not set # CONFIG_DEBUG_PROBES is not set +# CONFIG_DMA_API_DEBUG is not set # CONFIG_PBL_BREAK is not set # CONFIG_PRINTF_FULL is not set # CONFIG_UBSAN is not set @@ -499,6 +500,7 @@ CONFIG_DRIVER_NET_SMC911X=y # CONFIG_DAVICOM_PHY is not set # CONFIG_DP83867_PHY is not set # CONFIG_DP83TD510_PHY is not set +# CONFIG_DP83TG720_PHY is not set # CONFIG_LXT_PHY is not set # CONFIG_MARVELL_PHY is not set # CONFIG_MICREL_PHY is not set @@ -743,6 +745,12 @@ CONFIG_REGULATOR=y # Firmware Drivers # # CONFIG_QEMU_FW_CFG is not set + +# +# ARM System Control and Management Interface Protocol +# +# CONFIG_ARM_SCMI_PROTOCOL is not set +# end of ARM System Control and Management Interface Protocol # end of Firmware Drivers # @@ -787,6 +795,7 @@ CONFIG_REGULATOR=y # CONFIG_POWER_RESET_SYSCON_POWEROFF is not set # CONFIG_VIRTIO_MENU is not set # CONFIG_MAILBOX is not set +# CONFIG_TEE is not set # end of Drivers # diff --git a/configs/platform-v7a/barebox-vexpress.config.diff b/configs/platform-v7a/barebox-vexpress.config.diff index 973db9d3b772..2d9168e02dbc 100644 --- a/configs/platform-v7a/barebox-vexpress.config.diff +++ b/configs/platform-v7a/barebox-vexpress.config.diff @@ -1,8 +1,7 @@ -53d21fb44946357f79471694e33102cc +60c98fdd624cc491e6ab694be209074e CONFIG_AMBA_SP804=y # CONFIG_ARCH_BCM283X is not set CONFIG_ARCH_VEXPRESS=y -# CONFIG_ARM_SCMI_PROTOCOL is undefined # CONFIG_ARM_SECURE_MONITOR is undefined # CONFIG_ARM_SMCCC is undefined # CONFIG_ARM_USE_COMPRESSED_DTB is undefined diff --git a/configs/platform-v7a/barebox.config b/configs/platform-v7a/barebox.config index 91288607f3cc..375aa9ab3915 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 2023.12.0 Configuration +# Barebox/arm 2024.01.0 Configuration # CONFIG_ARM=y CONFIG_ARM_LINUX=y @@ -236,6 +236,7 @@ CONFIG_DEFAULT_LOGLEVEL=6 # CONFIG_DEBUG_LL is not set # CONFIG_DEBUG_INITCALLS is not set # CONFIG_DEBUG_PROBES is not set +# CONFIG_DMA_API_DEBUG is not set # CONFIG_PBL_BREAK is not set # CONFIG_PRINTF_FULL is not set # CONFIG_UBSAN is not set @@ -517,6 +518,7 @@ CONFIG_PHYLIB=y # CONFIG_DAVICOM_PHY is not set # CONFIG_DP83867_PHY is not set # CONFIG_DP83TD510_PHY is not set +# CONFIG_DP83TG720_PHY is not set # CONFIG_LXT_PHY is not set # CONFIG_MARVELL_PHY is not set # CONFIG_MICREL_PHY is not set @@ -791,8 +793,13 @@ CONFIG_REGULATOR_BCM283X=y # Firmware Drivers # # CONFIG_FIRMWARE_ALTERA_SERIAL is not set -# CONFIG_ARM_SCMI_PROTOCOL is not set # CONFIG_QEMU_FW_CFG is not set + +# +# ARM System Control and Management Interface Protocol +# +# CONFIG_ARM_SCMI_PROTOCOL is not set +# end of ARM System Control and Management Interface Protocol # end of Firmware Drivers # @@ -839,6 +846,7 @@ CONFIG_REGULATOR_BCM283X=y # CONFIG_POWER_RESET_GPIO_RESTART is not set # CONFIG_VIRTIO_MENU is not set # CONFIG_MAILBOX is not set +# CONFIG_TEE is not set # end of Drivers # diff --git a/configs/platform-v7a/patches/barebox-2024.01.0/0001-ARM-rpi-fix-regression-booting-without-VideoCore-DT.patch b/configs/platform-v7a/patches/barebox-2024.01.0/0001-ARM-rpi-fix-regression-booting-without-VideoCore-DT.patch new file mode 100644 index 000000000000..6f261b86cd68 --- /dev/null +++ b/configs/platform-v7a/patches/barebox-2024.01.0/0001-ARM-rpi-fix-regression-booting-without-VideoCore-DT.patch @@ -0,0 +1,130 @@ +From 3ff500b014f4e7901721e5e581d50d7b5a7ff337 Mon Sep 17 00:00:00 2001 +From: Ahmad Fatoum +Date: Tue, 5 Mar 2024 10:31:22 +0100 +Subject: [PATCH] ARM: rpi: fix regression booting without VideoCore DT + +The Raspberry Pi firmware running prior to barebox can load a kernel +directly and thus can boot barebox-dt-2nd.img straight without having to +use the Raspberry Pi specific entry points. + +However, the Raspberry Pi specific entry points, store the VideoCore DT +into a handover area for earlier extraction of fixups done by the +VideoCore firmware. This doesn't happen with barebox-dt-2nd.img. + +Commit 5ea6e19737e1 ("raspi: support to read vc values via dt-2nd boot") +worked around this by using the barebox-internal DT, when a VideoCore DT +wasn't saved, but this in turn added a slew of warnings to the valid setup +of having no VideoCore DT at all and just using a proper Raspberry Pi +PBL with their embedded DTs: + + WARNING: no property 'serial-number' found in vc fdt's '' node + no '/system' node found in vc fdt + no '/axi' node found in vc fdt + no '/hat' node found in vc fdt + no '/chosen/bootloader' node found in vc fdt + WARNING: no property 'bootargs' found in vc fdt's '/chosen' node + WARNING: no property 'overlay_prefix' found in vc fdt's '/chosen' node + WARNING: no property 'os_prefix' found in vc fdt's '/chosen' node + WARNING: 'pm_rsts' value not found in vc fdt + ERROR: Won't delete root device node + +Fix this by not calling rpi_vc_fdt_parse on the barebox DT if a previous +Raspberry Pi PBL has written VIDEOCORE_FDT_ERROR into the handoff area +to indicate a missing VideoCore DT. + +Fixes: 5ea6e19737e1 ("raspi: support to read vc values via dt-2nd boot") +Reported-by: Roland Hieber +Cc: Denis Osterland-Heim +Link: https://lore.barebox.org/barebox/20240219191400.do7ib5rxy7tupv4i@pengutronix.de/ +Signed-off-by: Ahmad Fatoum +--- + arch/arm/boards/raspberry-pi/rpi-common.c | 43 +++++++++++++++++------ + 1 file changed, 33 insertions(+), 10 deletions(-) + +diff --git a/arch/arm/boards/raspberry-pi/rpi-common.c b/arch/arm/boards/raspberry-pi/rpi-common.c +index 1dfd0b0a10f4..7c82c740e256 100644 +--- a/arch/arm/boards/raspberry-pi/rpi-common.c ++++ b/arch/arm/boards/raspberry-pi/rpi-common.c +@@ -332,7 +332,7 @@ static void rpi_vc_fdt_parse(struct device_node *root) + chosen = register_vc_fixup(root, "/chosen"); + if (!chosen) { + pr_err("no '/chosen' node found in vc fdt\n"); +- goto out; ++ return; + } + + bootloader = of_find_node_by_name(chosen, "bootloader"); +@@ -385,13 +385,20 @@ static void rpi_vc_fdt_parse(struct device_node *root) + + of_add_memory(memory, false); + } +- +-out: +- if (root) +- of_delete_node(root); +- return; + } + ++/** ++ * rpi_vc_fdt - unflatten VideoCore provided DT ++ * ++ * If configured via config.txt, the VideoCore firmware will pass barebox PBL ++ * a device-tree in a register. This is saved to a handover memory area by ++ * the Raspberry Pi PBL, which is parsed here. barebox-dt-2nd doesn't ++ * populate this area, instead it uses the VideoCore DT as its own DT. ++ * ++ * Return: an unflattened DT on success, an error pointer if parsing the DT ++ * fails and NULL if a Raspberry Pi PBL has run, but no VideoCore FDT was ++ * saved. ++ */ + static struct device_node *rpi_vc_fdt(void) + { + void *saved_vc_fdt; +@@ -408,7 +415,7 @@ static struct device_node *rpi_vc_fdt(void) + if (oftree->totalsize) + pr_err("there was an error copying fdt in pbl: %d\n", + be32_to_cpu(oftree->totalsize)); +- return ERR_PTR(-EINVAL); ++ return NULL; + } + + if (magic != FDT_MAGIC) +@@ -481,7 +488,7 @@ static int rpi_devices_probe(struct device *dev) + const struct rpi_machine_data *dcfg; + struct regulator *reg; + struct rpi_priv *priv; +- struct device_node *root; ++ struct device_node *vc_root; + const char *name, *ptr; + char *hostname; + int ret; +@@ -510,8 +517,24 @@ static int rpi_devices_probe(struct device *dev) + bcm2835_register_fb(); + armlinux_set_architecture(MACH_TYPE_BCM2708); + rpi_env_init(); +- root = rpi_vc_fdt(); +- rpi_vc_fdt_parse(IS_ERR(root) ? priv->dev->device_node : root); ++ ++ vc_root = rpi_vc_fdt(); ++ if (!vc_root) { ++ dev_dbg(dev, "No VideoCore FDT was provided\n"); ++ } else if (!IS_ERR(vc_root)) { ++ dev_dbg(dev, "VideoCore FDT was provided\n"); ++ rpi_vc_fdt_parse(vc_root); ++ of_delete_node(vc_root); ++ } else if (IS_ERR(vc_root)) { ++ /* This is intentionally at a higher logging level, because we can't ++ * be sure that the external DT is indeed a barebox DT (and not a ++ * kernel DT that happened to be in the partition). So for ease ++ * of debugging, we report this at info log level. ++ */ ++ dev_info(dev, "barebox FDT will be used for VideoCore FDT\n"); ++ rpi_vc_fdt_parse(priv->dev->device_node); ++ } ++ + rpi_set_kernel_name(); + + if (dcfg && dcfg->init) +-- +2.39.2 + diff --git a/configs/platform-v7a/patches/barebox-2024.01.0/series b/configs/platform-v7a/patches/barebox-2024.01.0/series new file mode 100644 index 000000000000..6822bd532ad5 --- /dev/null +++ b/configs/platform-v7a/patches/barebox-2024.01.0/series @@ -0,0 +1 @@ +0001-ARM-rpi-fix-regression-booting-without-VideoCore-DT.patch diff --git a/configs/platform-v7a/platformconfig b/configs/platform-v7a/platformconfig index 45b5477957a6..bd3463ea9b7b 100644 --- a/configs/platform-v7a/platformconfig +++ b/configs/platform-v7a/platformconfig @@ -186,8 +186,8 @@ PTXCONF_AT91BOOTSTRAP2_MD5="ef321a80bf428bfd6cb642c96126ef6c" PTXCONF_AT91BOOTSTRAP2_CONFIG="at91bootstrap-wifx-l1.config" PTXCONF_BAREBOX_COMMON_ARCH_STRING="arm" PTXCONF_BAREBOX_COMMON=y -PTXCONF_BAREBOX_COMMON_VERSION="2023.12.0" -PTXCONF_BAREBOX_COMMON_MD5="e1513be5a2995203b75ac45043eac6d0" +PTXCONF_BAREBOX_COMMON_VERSION="2024.01.0" +PTXCONF_BAREBOX_COMMON_MD5="8a94bdde5eaa1362b6c752f975f9e954" PTXCONF_BAREBOX_COMMON_NEEDS_HOST_LZOP=y PTXCONF_BAREBOX_AM335X_MLO=y PTXCONF_BAREBOX_AM335X=y -- 2.39.2