diff options
Diffstat (limited to 'configs/platform-v7a')
27 files changed, 533 insertions, 226 deletions
diff --git a/configs/platform-v7a/barebox-am335x-mlo.config b/configs/platform-v7a/barebox-am335x-mlo.config index 12707b7..2261f70 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 2024.01.0 Configuration +# Barebox/arm 2024.03.0 Configuration # CONFIG_ARM=y CONFIG_ARM_USE_COMPRESSED_DTB=y @@ -16,7 +16,6 @@ CONFIG_ARCH_MULTIARCH=y # CONFIG_ARCH_DAVINCI is not set # CONFIG_ARCH_DIGIC is not set # CONFIG_ARCH_EP93XX is not set -# CONFIG_ARCH_LAYERSCAPE is not set # CONFIG_ARCH_MVEBU is not set # CONFIG_ARCH_MXS is not set # CONFIG_ARCH_NOMADIK is not set @@ -28,6 +27,7 @@ CONFIG_ARCH_MULTIARCH=y # CONFIG_ARCH_ZYNQ is not set # CONFIG_ARCH_BCM283X is not set # CONFIG_ARCH_IMX is not set +# CONFIG_ARCH_LAYERSCAPE is not set CONFIG_ARCH_OMAP_MULTI=y # CONFIG_ARCH_ROCKCHIP is not set # CONFIG_ARCH_STM32MP is not set @@ -189,6 +189,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_DEBUG_LIST is not set # CONFIG_PBL_BREAK is not set # CONFIG_PRINTF_FULL is not set # CONFIG_UBSAN is not set @@ -313,6 +314,7 @@ CONFIG_MCI_OMAP_HSMMC=y # CONFIG_MCI_ARASAN is not set # CONFIG_MCI_AM654 is not set # CONFIG_MCI_SPI is not set +# CONFIG_COMMON_CLK is not set # # Clocksource @@ -455,6 +457,16 @@ CONFIG_TI_SYSC=y # end of SoC drivers # +# PM Domains +# + +# +# i.MX PM Domains +# +# end of i.MX PM Domains +# end of PM Domains + +# # NVME Support # # end of NVME Support @@ -553,6 +565,7 @@ CONFIG_ARCH_HAS_ZERO_PAGE=y # # Hardening options # +# CONFIG_BUG_ON_DATA_CORRUPTION is not set # CONFIG_STACK_GUARD_PAGE is not set CONFIG_STACKPROTECTOR_NONE=y # CONFIG_STACKPROTECTOR_STRONG is not set diff --git a/configs/platform-v7a/barebox-am335x.config b/configs/platform-v7a/barebox-am335x.config index c1ed474..c0f8c11 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 2024.01.0 Configuration +# Barebox/arm 2024.03.0 Configuration # CONFIG_ARM=y CONFIG_ARM_LINUX=y @@ -17,7 +17,6 @@ CONFIG_ARCH_MULTIARCH=y # CONFIG_ARCH_DAVINCI is not set # CONFIG_ARCH_DIGIC is not set # CONFIG_ARCH_EP93XX is not set -# CONFIG_ARCH_LAYERSCAPE is not set # CONFIG_ARCH_MVEBU is not set # CONFIG_ARCH_MXS is not set # CONFIG_ARCH_NOMADIK is not set @@ -29,6 +28,7 @@ CONFIG_ARCH_MULTIARCH=y # CONFIG_ARCH_ZYNQ is not set # CONFIG_ARCH_BCM283X is not set # CONFIG_ARCH_IMX is not set +# CONFIG_ARCH_LAYERSCAPE is not set CONFIG_ARCH_OMAP_MULTI=y # CONFIG_ARCH_ROCKCHIP is not set # CONFIG_ARCH_STM32MP is not set @@ -199,6 +199,7 @@ CONFIG_CONSOLE_ALLOW_COLOR=y # CONFIG_PBL_CONSOLE is not set # CONFIG_CONSOLE_RATP is not set CONFIG_PARTITION=y +CONFIG_PARTITION_MANIPULATION=y CONFIG_PARTITION_DISK=y CONFIG_PARTITION_DISK_DOS=y CONFIG_PARTITION_DISK_EFI=y @@ -247,6 +248,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_DEBUG_LIST is not set # CONFIG_PBL_BREAK is not set # CONFIG_PRINTF_FULL is not set # CONFIG_UBSAN is not set @@ -318,6 +320,7 @@ CONFIG_CMD_BOOTCHOOSER=y CONFIG_CMD_PARTITION=y CONFIG_CMD_AUTOMOUNT=y CONFIG_CMD_MOUNT=y +CONFIG_CMD_PARTED=y CONFIG_CMD_UMOUNT=y # end of Partition @@ -684,6 +687,7 @@ CONFIG_MCI_OMAP_HSMMC=y # CONFIG_MCI_ARASAN is not set # CONFIG_MCI_AM654 is not set # CONFIG_MCI_SPI is not set +# CONFIG_COMMON_CLK is not set # # Clocksource @@ -865,6 +869,16 @@ CONFIG_REGULATOR_FIXED=y # end of SoC drivers # +# PM Domains +# + +# +# i.MX PM Domains +# +# end of i.MX PM Domains +# end of PM Domains + +# # NVME Support # # end of NVME Support @@ -975,6 +989,7 @@ CONFIG_ARCH_HAS_ZERO_PAGE=y # # Hardening options # +# CONFIG_BUG_ON_DATA_CORRUPTION is not set # CONFIG_STACK_GUARD_PAGE is not set CONFIG_STACKPROTECTOR_NONE=y # CONFIG_STACKPROTECTOR_STRONG is not set diff --git a/configs/platform-v7a/barebox-am335x.config.diff b/configs/platform-v7a/barebox-am335x.config.diff index 08263f1..c0fb0f8 100644 --- a/configs/platform-v7a/barebox-am335x.config.diff +++ b/configs/platform-v7a/barebox-am335x.config.diff @@ -1,4 +1,4 @@ -d3e92d2ec90d9be624961ebc5d6342c0 +7b026e83521009fb334bf433e0530043 # CONFIG_AM33XX_NET_BOOT is not set CONFIG_ARCH_AM33XX=y # CONFIG_ARCH_BCM283X is not set @@ -25,7 +25,7 @@ CONFIG_CMD_NAND=y # CONFIG_CMD_NAND_BITFLIP is not set # CONFIG_CMD_NVMEM is not set # CONFIG_CMD_SMC is undefined -# CONFIG_COMMON_CLK is undefined +# CONFIG_COMMON_CLK is not set # CONFIG_COMMON_CLK_GPIO is undefined # CONFIG_COMMON_CLK_OF_PROVIDER is undefined # CONFIG_CONSOLE_ACTIVATE_FIRST is not set diff --git a/configs/platform-v7a/barebox-at91.config b/configs/platform-v7a/barebox-at91.config index e72af94..90ca630 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 2024.01.0 Configuration +# Barebox/arm 2024.03.0 Configuration # CONFIG_ARM=y CONFIG_ARM_LINUX=y @@ -16,7 +16,6 @@ CONFIG_ARCH_AT91=y # CONFIG_ARCH_DAVINCI is not set # CONFIG_ARCH_DIGIC is not set # CONFIG_ARCH_EP93XX is not set -# CONFIG_ARCH_LAYERSCAPE is not set # CONFIG_ARCH_MVEBU is not set # CONFIG_ARCH_MXS is not set # CONFIG_ARCH_NOMADIK is not set @@ -54,6 +53,7 @@ CONFIG_HAVE_AT91_DDRAMC=y CONFIG_AT91_MCI_PBL=y CONFIG_AT91SAM9_SMC=y CONFIG_HAVE_AT91SAM9_RST=y +CONFIG_SOC_SAM_V7=y CONFIG_SOC_SAMA5=y CONFIG_SOC_SAMA5_MULTI=y CONFIG_SOC_SAMA5D2=y @@ -207,6 +207,7 @@ CONFIG_CONSOLE_ALLOW_COLOR=y CONFIG_PBL_CONSOLE=y # CONFIG_CONSOLE_RATP is not set CONFIG_PARTITION=y +CONFIG_PARTITION_MANIPULATION=y CONFIG_PARTITION_DISK=y CONFIG_PARTITION_DISK_DOS=y CONFIG_PARTITION_DISK_EFI=y @@ -257,6 +258,7 @@ CONFIG_DEBUG_AT91_UART_BASE=0xfc069000 # CONFIG_DEBUG_PBL is not set # CONFIG_DEBUG_PROBES is not set # CONFIG_DMA_API_DEBUG is not set +# CONFIG_DEBUG_LIST is not set # CONFIG_PBL_BREAK is not set # CONFIG_PRINTF_FULL is not set # CONFIG_UBSAN is not set @@ -330,6 +332,7 @@ CONFIG_CMD_BOOTCHOOSER=y CONFIG_CMD_PARTITION=y CONFIG_CMD_AUTOMOUNT=y CONFIG_CMD_MOUNT=y +CONFIG_CMD_PARTED=y CONFIG_CMD_UBI=y CONFIG_CMD_UBIFORMAT=y CONFIG_CMD_UMOUNT=y @@ -871,6 +874,16 @@ CONFIG_ATMEL_EBI=y # end of SoC drivers # +# PM Domains +# + +# +# i.MX PM Domains +# +# end of i.MX PM Domains +# end of PM Domains + +# # NVME Support # # end of NVME Support @@ -982,6 +995,7 @@ CONFIG_GENERIC_ALLOCATOR=y # # Hardening options # +# CONFIG_BUG_ON_DATA_CORRUPTION is not set # CONFIG_STACK_GUARD_PAGE is not set CONFIG_STACKPROTECTOR_NONE=y # CONFIG_STACKPROTECTOR_STRONG is not set diff --git a/configs/platform-v7a/barebox-at91.config.diff b/configs/platform-v7a/barebox-at91.config.diff index b79f60e..3ee11b6 100644 --- a/configs/platform-v7a/barebox-at91.config.diff +++ b/configs/platform-v7a/barebox-at91.config.diff @@ -1,7 +1,8 @@ -d3e92d2ec90d9be624961ebc5d6342c0 +7b026e83521009fb334bf433e0530043 CONFIG_ARCH_AT91=y # CONFIG_ARCH_BCM283X is not set # CONFIG_ARCH_IMX is undefined +# CONFIG_ARCH_LAYERSCAPE is undefined # CONFIG_ARCH_MULTIARCH is not set # CONFIG_ARCH_OMAP_MULTI is undefined # CONFIG_ARCH_ROCKCHIP is undefined @@ -139,6 +140,7 @@ CONFIG_SOC_SAMA5=y CONFIG_SOC_SAMA5D2=y CONFIG_SOC_SAMA5D4=y CONFIG_SOC_SAMA5_MULTI=y +CONFIG_SOC_SAM_V7=y CONFIG_SPI_ATMEL_QUADSPI=y # CONFIG_SPI_CADENCE_QUADSPI is not set CONFIG_SPI_MEM=y diff --git a/configs/platform-v7a/barebox-mx6-defaultenv/nv/fastboot.net.autostart b/configs/platform-v7a/barebox-mx6-defaultenv/nv/fastboot.net.autostart deleted file mode 100644 index d00491f..0000000 --- a/configs/platform-v7a/barebox-mx6-defaultenv/nv/fastboot.net.autostart +++ /dev/null @@ -1 +0,0 @@ -1 diff --git a/configs/platform-v7a/barebox-mx6.config b/configs/platform-v7a/barebox-mx6.config index 42d90a5..bafa946 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 2024.01.0 Configuration +# Barebox/arm 2024.03.0 Configuration # CONFIG_ARM=y CONFIG_ARM_LINUX=y @@ -15,7 +15,6 @@ CONFIG_ARCH_MULTIARCH=y # CONFIG_ARCH_DAVINCI is not set # CONFIG_ARCH_DIGIC is not set # CONFIG_ARCH_EP93XX is not set -# CONFIG_ARCH_LAYERSCAPE is not set # CONFIG_ARCH_MVEBU is not set # CONFIG_ARCH_MXS is not set # CONFIG_ARCH_NOMADIK is not set @@ -27,6 +26,7 @@ CONFIG_ARCH_MULTIARCH=y # CONFIG_ARCH_ZYNQ is not set # CONFIG_ARCH_BCM283X is not set CONFIG_ARCH_IMX=y +# CONFIG_ARCH_LAYERSCAPE is not set # CONFIG_ARCH_OMAP_MULTI is not set # CONFIG_ARCH_ROCKCHIP is not set # CONFIG_ARCH_STM32MP is not set @@ -291,6 +291,7 @@ CONFIG_CONSOLE_ALLOW_COLOR=y # CONFIG_PBL_CONSOLE is not set # CONFIG_CONSOLE_RATP is not set CONFIG_PARTITION=y +CONFIG_PARTITION_MANIPULATION=y CONFIG_PARTITION_DISK=y CONFIG_PARTITION_DISK_DOS=y CONFIG_PARTITION_DISK_EFI=y @@ -340,6 +341,7 @@ 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_DEBUG_LIST is not set # CONFIG_PBL_BREAK is not set # CONFIG_PRINTF_FULL is not set # CONFIG_UBSAN is not set @@ -412,6 +414,7 @@ CONFIG_CMD_BOOTCHOOSER=y CONFIG_CMD_PARTITION=y CONFIG_CMD_AUTOMOUNT=y CONFIG_CMD_MOUNT=y +CONFIG_CMD_PARTED=y CONFIG_CMD_UBI=y CONFIG_CMD_UBIFORMAT=y CONFIG_CMD_UMOUNT=y @@ -1035,6 +1038,16 @@ CONFIG_USB_NOP_XCEIV=y # end of SoC drivers # +# PM Domains +# + +# +# i.MX PM Domains +# +# end of i.MX PM Domains +# end of PM Domains + +# # NVME Support # # end of NVME Support @@ -1162,6 +1175,7 @@ CONFIG_ARCH_HAS_ZERO_PAGE=y # # Hardening options # +# CONFIG_BUG_ON_DATA_CORRUPTION is not set # CONFIG_STACK_GUARD_PAGE is not set CONFIG_STACKPROTECTOR_NONE=y # CONFIG_STACKPROTECTOR_STRONG is not set diff --git a/configs/platform-v7a/barebox-mx6.config.diff b/configs/platform-v7a/barebox-mx6.config.diff index 80ca60d..b98585b 100644 --- a/configs/platform-v7a/barebox-mx6.config.diff +++ b/configs/platform-v7a/barebox-mx6.config.diff @@ -1,4 +1,4 @@ -d3e92d2ec90d9be624961ebc5d6342c0 +7b026e83521009fb334bf433e0530043 # CONFIG_ARCH_BCM283X is not set CONFIG_ARCH_HAS_FEC_IMX=y CONFIG_ARCH_HAS_IMX_GPT=y diff --git a/configs/platform-v7a/barebox-rpi2.config b/configs/platform-v7a/barebox-rpi2.config index 6ed3036..f79b68e 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 2024.01.0 Configuration +# Barebox/arm 2024.03.0 Configuration # CONFIG_ARM=y CONFIG_ARM_LINUX=y @@ -16,7 +16,6 @@ CONFIG_ARCH_MULTIARCH=y # CONFIG_ARCH_DAVINCI is not set # CONFIG_ARCH_DIGIC is not set # CONFIG_ARCH_EP93XX is not set -# CONFIG_ARCH_LAYERSCAPE is not set # CONFIG_ARCH_MVEBU is not set # CONFIG_ARCH_MXS is not set # CONFIG_ARCH_NOMADIK is not set @@ -28,6 +27,7 @@ CONFIG_ARCH_MULTIARCH=y # CONFIG_ARCH_ZYNQ is not set CONFIG_ARCH_BCM283X=y # CONFIG_ARCH_IMX is not set +# CONFIG_ARCH_LAYERSCAPE is not set # CONFIG_ARCH_OMAP_MULTI is not set # CONFIG_ARCH_ROCKCHIP is not set # CONFIG_ARCH_STM32MP is not set @@ -192,6 +192,7 @@ CONFIG_CONSOLE_ALLOW_COLOR=y # CONFIG_PBL_CONSOLE is not set # CONFIG_CONSOLE_RATP is not set CONFIG_PARTITION=y +CONFIG_PARTITION_MANIPULATION=y CONFIG_PARTITION_DISK=y CONFIG_PARTITION_DISK_DOS=y CONFIG_PARTITION_DISK_EFI=y @@ -239,6 +240,7 @@ CONFIG_DEFAULT_LOGLEVEL=6 # CONFIG_DEBUG_INITCALLS is not set # CONFIG_DEBUG_PROBES is not set # CONFIG_DMA_API_DEBUG is not set +# CONFIG_DEBUG_LIST is not set # CONFIG_PBL_BREAK is not set # CONFIG_PRINTF_FULL is not set # CONFIG_UBSAN is not set @@ -310,6 +312,7 @@ CONFIG_CMD_BOOTCHOOSER=y CONFIG_CMD_PARTITION=y CONFIG_CMD_AUTOMOUNT=y CONFIG_CMD_MOUNT=y +CONFIG_CMD_PARTED=y CONFIG_CMD_UMOUNT=y # end of Partition @@ -846,6 +849,16 @@ CONFIG_USB_NOP_XCEIV=y # end of SoC drivers # +# PM Domains +# + +# +# i.MX PM Domains +# +# end of i.MX PM Domains +# end of PM Domains + +# # NVME Support # # end of NVME Support @@ -956,6 +969,7 @@ CONFIG_ARCH_HAS_ZERO_PAGE=y # # Hardening options # +# CONFIG_BUG_ON_DATA_CORRUPTION is not set # CONFIG_STACK_GUARD_PAGE is not set CONFIG_STACKPROTECTOR_NONE=y # CONFIG_STACKPROTECTOR_STRONG is not set diff --git a/configs/platform-v7a/barebox-rpi2.config.diff b/configs/platform-v7a/barebox-rpi2.config.diff index 9b287d4..c42da95 100644 --- a/configs/platform-v7a/barebox-rpi2.config.diff +++ b/configs/platform-v7a/barebox-rpi2.config.diff @@ -1,4 +1,4 @@ -d3e92d2ec90d9be624961ebc5d6342c0 +7b026e83521009fb334bf433e0530043 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 69fd198..f2e61e7 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 2024.01.0 Configuration +# Barebox/arm 2024.03.0 Configuration # CONFIG_ARM=y CONFIG_ARM_LINUX=y @@ -17,7 +17,6 @@ CONFIG_ARCH_MULTIARCH=y # CONFIG_ARCH_DAVINCI is not set # CONFIG_ARCH_DIGIC is not set # CONFIG_ARCH_EP93XX is not set -# CONFIG_ARCH_LAYERSCAPE is not set # CONFIG_ARCH_MVEBU is not set # CONFIG_ARCH_MXS is not set # CONFIG_ARCH_NOMADIK is not set @@ -29,6 +28,7 @@ CONFIG_ARCH_MULTIARCH=y # CONFIG_ARCH_ZYNQ is not set # CONFIG_ARCH_BCM283X is not set # CONFIG_ARCH_IMX is not set +# CONFIG_ARCH_LAYERSCAPE is not set # CONFIG_ARCH_OMAP_MULTI is not set # CONFIG_ARCH_ROCKCHIP is not set CONFIG_ARCH_STM32MP=y @@ -47,8 +47,9 @@ CONFIG_CPU_32v7=y # # CONFIG_BOOT_ENDIANNESS_SWITCH is not set CONFIG_ARCH_NR_GPIO=416 +CONFIG_ARCH_STM32MP13=y CONFIG_ARCH_STM32MP157=y -# CONFIG_MACH_STM32MP13XX_DK is not set +CONFIG_MACH_STM32MP13XX_DK=y CONFIG_MACH_STM32MP15XX_DKX=y CONFIG_MACH_LXA_MC1=y # CONFIG_MACH_SEEED_ODYSSEY is not set @@ -188,6 +189,7 @@ CONFIG_CONSOLE_ALLOW_COLOR=y CONFIG_PBL_CONSOLE=y # CONFIG_CONSOLE_RATP is not set CONFIG_PARTITION=y +CONFIG_PARTITION_MANIPULATION=y CONFIG_PARTITION_DISK=y CONFIG_PARTITION_DISK_DOS=y CONFIG_PARTITION_DISK_EFI=y @@ -215,6 +217,9 @@ CONFIG_EXTERNAL_DTS_FRAGMENTS="${PTXDIST_PLATFORMCONFIGDIR}/dts/bootstate.dtsi" # # OP-TEE loading # +CONFIG_HAVE_OPTEE=y +CONFIG_OPTEE_SIZE=0x03000000 +CONFIG_OPTEE_SHM_SIZE=0x400000 # CONFIG_BOOTM_OPTEE is not set # end of OP-TEE loading @@ -236,6 +241,7 @@ CONFIG_DEFAULT_LOGLEVEL=7 # CONFIG_DEBUG_PBL is not set # CONFIG_DEBUG_PROBES is not set # CONFIG_DMA_API_DEBUG is not set +# CONFIG_DEBUG_LIST is not set # CONFIG_PBL_BREAK is not set # CONFIG_PRINTF_FULL is not set # CONFIG_UBSAN is not set @@ -307,6 +313,7 @@ CONFIG_CMD_BOOTCHOOSER=y CONFIG_CMD_PARTITION=y CONFIG_CMD_AUTOMOUNT=y CONFIG_CMD_MOUNT=y +CONFIG_CMD_PARTED=y CONFIG_CMD_UMOUNT=y # end of Partition @@ -630,7 +637,9 @@ CONFIG_HAVE_CLK=y CONFIG_CLKDEV_LOOKUP=y CONFIG_COMMON_CLK=y CONFIG_COMMON_CLK_OF_PROVIDER=y +CONFIG_COMMON_CLK_STM32MP135=y CONFIG_COMMON_CLK_STM32MP157=y +CONFIG_COMMON_CLK_SCMI=y CONFIG_COMMON_CLK_GPIO=y # @@ -712,6 +721,7 @@ CONFIG_PWM=y CONFIG_PWM_STM32=y CONFIG_HWRNG=y CONFIG_HWRNG_STM32=y +CONFIG_HW_RANDOM_OPTEE=y # # DMA support @@ -749,6 +759,7 @@ CONFIG_NVMEM=y # CONFIG_NVMEM_SNVS_LPGPR is not set CONFIG_STM32_BSEC=y CONFIG_STM32_BSEC_WRITE=y +CONFIG_STM32_BSEC_OPTEE_TA=y # # Bus devices @@ -761,6 +772,7 @@ CONFIG_REGULATOR_STM32_PWR=y CONFIG_REGULATOR_STM32_VREFBUF=y CONFIG_REGULATOR_STPMIC1=y # CONFIG_REGULATOR_ANATOP is not set +CONFIG_REGULATOR_ARM_SCMI=y # # Remoteproc drivers @@ -773,6 +785,7 @@ CONFIG_ARCH_HAS_RESET_CONTROLLER=y CONFIG_RESET_CONTROLLER=y CONFIG_RESET_SIMPLE=y # CONFIG_RESET_IMX7 is not set +CONFIG_RESET_SCMI=y # CONFIG_RTC_CLASS is not set # @@ -783,7 +796,13 @@ CONFIG_RESET_SIMPLE=y # # ARM System Control and Management Interface Protocol # -# CONFIG_ARM_SCMI_PROTOCOL is not set +CONFIG_ARM_SCMI_PROTOCOL=y +CONFIG_ARM_SCMI_HAVE_TRANSPORT=y +CONFIG_ARM_SCMI_HAVE_SHMEM=y +CONFIG_ARM_SCMI_HAVE_MSG=y +CONFIG_ARM_SCMI_TRANSPORT_OPTEE=y +CONFIG_ARM_SCMI_TRANSPORT_SMC=y +# CONFIG_ARM_SCMI_POWER_DOMAIN is not set # end of ARM System Control and Management Interface Protocol # end of Firmware Drivers @@ -825,6 +844,16 @@ CONFIG_STM32_FMC2_EBI=y # end of SoC drivers # +# PM Domains +# + +# +# i.MX PM Domains +# +# end of i.MX PM Domains +# end of PM Domains + +# # NVME Support # # end of NVME Support @@ -838,7 +867,8 @@ 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 +CONFIG_TEE=y +CONFIG_OPTEE=y # end of Drivers # @@ -923,11 +953,13 @@ CONFIG_NLS=y CONFIG_ARCH_HAS_STACK_DUMP=y CONFIG_ARCH_HAS_DATA_ABORT_MASK=y CONFIG_ARCH_HAS_ZERO_PAGE=y +CONFIG_IDR=y # end of Library routines # # Hardening options # +# CONFIG_BUG_ON_DATA_CORRUPTION is not set CONFIG_STACK_GUARD_PAGE=y CONFIG_STACKPROTECTOR=y # CONFIG_STACKPROTECTOR_NONE is not set diff --git a/configs/platform-v7a/barebox-stm32mp.config.diff b/configs/platform-v7a/barebox-stm32mp.config.diff index 3536924..5f8844e 100644 --- a/configs/platform-v7a/barebox-stm32mp.config.diff +++ b/configs/platform-v7a/barebox-stm32mp.config.diff @@ -1,8 +1,9 @@ -d3e92d2ec90d9be624961ebc5d6342c0 +7b026e83521009fb334bf433e0530043 # CONFIG_ARCH_BCM283X is not set CONFIG_ARCH_HAS_RESET_CONTROLLER=y CONFIG_ARCH_NR_GPIO=416 CONFIG_ARCH_STM32=y +CONFIG_ARCH_STM32MP13=y CONFIG_ARCH_STM32MP157=y CONFIG_ARCH_STM32MP=y # CONFIG_ARCH_TEXT_BASE is undefined @@ -11,6 +12,13 @@ CONFIG_ARM_BOARD_APPEND_ATAG=y # CONFIG_ARM_BOARD_PREPEND_ATAG is not set CONFIG_ARM_PSCI_CLIENT=y CONFIG_ARM_PSCI_OF=y +CONFIG_ARM_SCMI_HAVE_MSG=y +CONFIG_ARM_SCMI_HAVE_SHMEM=y +CONFIG_ARM_SCMI_HAVE_TRANSPORT=y +# CONFIG_ARM_SCMI_POWER_DOMAIN is not set +CONFIG_ARM_SCMI_PROTOCOL=y +CONFIG_ARM_SCMI_TRANSPORT_OPTEE=y +CONFIG_ARM_SCMI_TRANSPORT_SMC=y # CONFIG_ARM_SECURE_MONITOR is undefined CONFIG_AT803X_PHY=y # CONFIG_BOARD_ARM_GENERIC_DT is not set @@ -30,6 +38,8 @@ CONFIG_CMD_POWEROFF=y # CONFIG_CMD_PWM is not set # CONFIG_CMD_SPI is undefined # CONFIG_CMD_STACKSMASH is not set +CONFIG_COMMON_CLK_SCMI=y +CONFIG_COMMON_CLK_STM32MP135=y CONFIG_COMMON_CLK_STM32MP157=y CONFIG_COMPILE_LOGLEVEL=6 # CONFIG_CONSOLE_ACTIVATE_FIRST is not set @@ -52,11 +62,14 @@ CONFIG_EEPROM_AT24=y CONFIG_GENERIC_PHY=y # CONFIG_GPIO_74164 is undefined # CONFIG_GPIO_RASPBERRYPI_EXP is undefined +CONFIG_HAVE_OPTEE=y CONFIG_HWRNG_STM32=y +CONFIG_HW_RANDOM_OPTEE=y # CONFIG_I2C_ALGOBIT is undefined # CONFIG_I2C_BCM283X is undefined # CONFIG_I2C_GPIO is not set CONFIG_I2C_STM32=y +CONFIG_IDR=y CONFIG_LED_PWM=y # CONFIG_LED_TRIGGERS is not set # CONFIG_LIBFDT is undefined @@ -71,7 +84,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_STM32MP13XX_DK is not set +CONFIG_MACH_STM32MP13XX_DK=y CONFIG_MACH_STM32MP15XX_DKX=y CONFIG_MACH_STM32MP15X_EV1=y # CONFIG_MCI_BCM283X is undefined @@ -108,6 +121,9 @@ CONFIG_NVMEM=y # CONFIG_NVMEM_REBOOT_MODE is not set # CONFIG_NVMEM_RMEM is not set # CONFIG_NVMEM_SNVS_LPGPR is not set +CONFIG_OPTEE=y +CONFIG_OPTEE_SHM_SIZE=0x400000 +CONFIG_OPTEE_SIZE=0x03000000 # CONFIG_PARTITION_DISK_EFI_GPT_COMPARE is not set # CONFIG_PARTITION_DISK_EFI_GPT_NO_FORCE is not set CONFIG_PBL_CONSOLE=y @@ -122,6 +138,7 @@ CONFIG_PWM_STM32=y CONFIG_REGMAP_FORMATTED=y CONFIG_REGMAP_I2C=y # CONFIG_REGULATOR_ANATOP is not set +CONFIG_REGULATOR_ARM_SCMI=y # CONFIG_REGULATOR_BCM283X is undefined CONFIG_REGULATOR_FIXED=y CONFIG_REGULATOR_STM32_PWR=y @@ -130,6 +147,7 @@ CONFIG_REGULATOR_STPMIC1=y CONFIG_REMOTEPROC=y CONFIG_RESET_CONTROLLER=y # CONFIG_RESET_IMX7 is not set +CONFIG_RESET_SCMI=y CONFIG_RESET_SIMPLE=y CONFIG_RESET_STM32=y # CONFIG_SPI is not set @@ -139,6 +157,7 @@ CONFIG_STACKPROTECTOR=y CONFIG_STACKPROTECTOR_STRONG=y CONFIG_STACK_GUARD_PAGE=y CONFIG_STM32_BSEC=y +CONFIG_STM32_BSEC_OPTEE_TA=y CONFIG_STM32_BSEC_WRITE=y CONFIG_STM32_FMC2_EBI=y CONFIG_STM32_IMAGE=y @@ -146,6 +165,7 @@ CONFIG_STM32_IWDG_WATCHDOG=y CONFIG_STM32_REMOTEPROC=y # CONFIG_STPMIC1_WATCHDOG is not set # CONFIG_SYSCON_REBOOT_MODE is not set +CONFIG_TEE=y CONFIG_THUMB2_BAREBOX=y CONFIG_USB_DWC2=y CONFIG_USB_DWC2_GADGET=y diff --git a/configs/platform-v7a/barebox-vexpress.config b/configs/platform-v7a/barebox-vexpress.config index 06b9ee6..33acadf 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 2024.01.0 Configuration +# Barebox/arm 2024.03.0 Configuration # CONFIG_ARM=y CONFIG_ARM_LINUX=y @@ -15,7 +15,6 @@ CONFIG_ARCH_MULTIARCH=y # CONFIG_ARCH_DAVINCI is not set # CONFIG_ARCH_DIGIC is not set # CONFIG_ARCH_EP93XX is not set -# CONFIG_ARCH_LAYERSCAPE is not set # CONFIG_ARCH_MVEBU is not set # CONFIG_ARCH_MXS is not set # CONFIG_ARCH_NOMADIK is not set @@ -27,6 +26,7 @@ CONFIG_ARCH_MULTIARCH=y # CONFIG_ARCH_ZYNQ is not set # CONFIG_ARCH_BCM283X is not set # CONFIG_ARCH_IMX is not set +# CONFIG_ARCH_LAYERSCAPE is not set # CONFIG_ARCH_OMAP_MULTI is not set # CONFIG_ARCH_ROCKCHIP is not set # CONFIG_ARCH_STM32MP is not set @@ -175,6 +175,7 @@ CONFIG_CONSOLE_ALLOW_COLOR=y CONFIG_PBL_CONSOLE=y # CONFIG_CONSOLE_RATP is not set CONFIG_PARTITION=y +CONFIG_PARTITION_MANIPULATION=y CONFIG_PARTITION_DISK=y CONFIG_PARTITION_DISK_DOS=y CONFIG_PARTITION_DISK_EFI=y @@ -224,6 +225,7 @@ CONFIG_DEFAULT_LOGLEVEL=6 # CONFIG_DEBUG_PBL is not set # CONFIG_DEBUG_PROBES is not set # CONFIG_DMA_API_DEBUG is not set +# CONFIG_DEBUG_LIST is not set # CONFIG_PBL_BREAK is not set # CONFIG_PRINTF_FULL is not set # CONFIG_UBSAN is not set @@ -294,6 +296,7 @@ CONFIG_CMD_BOOTCHOOSER=y CONFIG_CMD_PARTITION=y CONFIG_CMD_AUTOMOUNT=y CONFIG_CMD_MOUNT=y +CONFIG_CMD_PARTED=y CONFIG_CMD_UMOUNT=y # end of Partition @@ -789,6 +792,16 @@ CONFIG_REGULATOR=y # end of SoC drivers # +# PM Domains +# + +# +# i.MX PM Domains +# +# end of i.MX PM Domains +# end of PM Domains + +# # NVME Support # # end of NVME Support @@ -896,6 +909,7 @@ CONFIG_ARCH_HAS_ZERO_PAGE=y # # Hardening options # +# CONFIG_BUG_ON_DATA_CORRUPTION is not set # CONFIG_STACK_GUARD_PAGE is not set CONFIG_STACKPROTECTOR_NONE=y # CONFIG_STACKPROTECTOR_STRONG is not set diff --git a/configs/platform-v7a/barebox-vexpress.config.diff b/configs/platform-v7a/barebox-vexpress.config.diff index 9ed9b5a..3186417 100644 --- a/configs/platform-v7a/barebox-vexpress.config.diff +++ b/configs/platform-v7a/barebox-vexpress.config.diff @@ -1,4 +1,4 @@ -d3e92d2ec90d9be624961ebc5d6342c0 +7b026e83521009fb334bf433e0530043 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 a4ee3a1..855e83c 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 2024.01.0 Configuration +# Barebox/arm 2024.03.0 Configuration # CONFIG_ARM=y CONFIG_ARM_LINUX=y @@ -16,7 +16,6 @@ CONFIG_ARCH_MULTIARCH=y # CONFIG_ARCH_DAVINCI is not set # CONFIG_ARCH_DIGIC is not set # CONFIG_ARCH_EP93XX is not set -# CONFIG_ARCH_LAYERSCAPE is not set # CONFIG_ARCH_MVEBU is not set # CONFIG_ARCH_MXS is not set # CONFIG_ARCH_NOMADIK is not set @@ -28,6 +27,7 @@ CONFIG_ARCH_MULTIARCH=y # CONFIG_ARCH_ZYNQ is not set CONFIG_ARCH_BCM283X=y # CONFIG_ARCH_IMX is not set +# CONFIG_ARCH_LAYERSCAPE is not set # CONFIG_ARCH_OMAP_MULTI is not set # CONFIG_ARCH_ROCKCHIP is not set # CONFIG_ARCH_STM32MP is not set @@ -191,6 +191,7 @@ CONFIG_CONSOLE_ALLOW_COLOR=y # CONFIG_PBL_CONSOLE is not set # CONFIG_CONSOLE_RATP is not set CONFIG_PARTITION=y +CONFIG_PARTITION_MANIPULATION=y CONFIG_PARTITION_DISK=y CONFIG_PARTITION_DISK_DOS=y CONFIG_PARTITION_DISK_EFI=y @@ -239,6 +240,7 @@ CONFIG_DEFAULT_LOGLEVEL=6 # CONFIG_DEBUG_INITCALLS is not set # CONFIG_DEBUG_PROBES is not set # CONFIG_DMA_API_DEBUG is not set +# CONFIG_DEBUG_LIST is not set # CONFIG_PBL_BREAK is not set # CONFIG_PRINTF_FULL is not set # CONFIG_UBSAN is not set @@ -309,6 +311,7 @@ CONFIG_CMD_BOOTCHOOSER=y CONFIG_CMD_PARTITION=y CONFIG_CMD_AUTOMOUNT=y CONFIG_CMD_MOUNT=y +CONFIG_CMD_PARTED=y CONFIG_CMD_UMOUNT=y # end of Partition @@ -838,6 +841,16 @@ CONFIG_REGULATOR_BCM283X=y # end of SoC drivers # +# PM Domains +# + +# +# i.MX PM Domains +# +# end of i.MX PM Domains +# end of PM Domains + +# # NVME Support # # end of NVME Support @@ -947,6 +960,7 @@ CONFIG_ARCH_HAS_ZERO_PAGE=y # # Hardening options # +# CONFIG_BUG_ON_DATA_CORRUPTION is not set # CONFIG_STACK_GUARD_PAGE is not set CONFIG_STACKPROTECTOR_NONE=y # CONFIG_STACKPROTECTOR_STRONG is not set diff --git a/configs/platform-v7a/config/images/stm32mp-optee.config b/configs/platform-v7a/config/images/stm32mp-optee.config new file mode 100644 index 0000000..be3a4b6 --- /dev/null +++ b/configs/platform-v7a/config/images/stm32mp-optee.config @@ -0,0 +1,61 @@ +image @IMAGE@ { + hdimage { + align = 1M + partition-table-type = gpt + gpt-no-backup = true + } + + /* below three partitions are unused when booting from eMMC boot partition */ + partition fsbl1 { + image = "stm32mp1-tf-a-@STM32MP_BOARD@.stm32" + size = 256K + } + partition fsbl2 { + image = "stm32mp1-tf-a-@STM32MP_BOARD@.stm32" + size = 256K + } + partition fip { + image = "@STM32MP_BOARD@.fip" + size = 2M + } + + partition barebox-environment { + partition-type-uuid = 6c3737f2-07f8-45d1-ad45-15d260aab24d + size = 1M + } + partition barebox-state { + partition-type-uuid = barebox-state + size = 1M + } + partition root-A { + partition-type-uuid = root-arm + image = root.ext2 + } +} + +image @STM32MP_BOARD@-emmcboot.img { + hdimage { + partition-table = false + } + + partition fsbl { + image = "stm32mp1-tf-a-@STM32MP_BOARD@.stm32" + size = 256K + } + + partition fip { + image = "@STM32MP_BOARD@.fip" + offset = 256K + } +} + +image @STM32MP_BOARD@.fip { + fip { + fw-config = "stm32mp1-@STM32MP_BOARD@-fw-config.dtb" + hw-config = "@STM32MP_BOARD@.dtb-bb" + nt-fw = "barebox-stm32mp-generic-bl33.img" + tos-fw = { "tee-header_v2.bin", "tee-pager_v2.bin", "tee-pageable_v2.bin" } + } + size = 2M +} +/* vim: set tabstop=8 noexpandtab : */ diff --git a/configs/platform-v7a/config/images/stm32mp.config b/configs/platform-v7a/config/images/stm32mp.config index f75d6ad..45d3c00 100644 --- a/configs/platform-v7a/config/images/stm32mp.config +++ b/configs/platform-v7a/config/images/stm32mp.config @@ -20,6 +20,7 @@ image @IMAGE@ { } partition barebox-environment { + partition-type-uuid = "6c3737f2-07f8-45d1-ad45-15d260aab24d" size = 1M } partition barebox-state { diff --git a/configs/platform-v7a/dts/bootstate.dtsi b/configs/platform-v7a/dts/bootstate.dtsi index cd24d74..c0cade1 100644 --- a/configs/platform-v7a/dts/bootstate.dtsi +++ b/configs/platform-v7a/dts/bootstate.dtsi @@ -25,12 +25,9 @@ barebox: partition@0 { label = "barebox"; - reg = <0x0 0x0 0x0 0xc000>; - }; - environment: partition@c0000 { - label = "barebox-environment"; - reg = <0x0 0xc0000 0x0 0x20000>; + reg = <0x0 0x0 0x0 0xe0000>; }; + backend_state_mmc1: partition@e0000 { label = "state"; reg = <0x0 0xe0000 0x0 0x20000>; @@ -61,7 +58,11 @@ }; }; +#ifdef bcm2711_rpi_4_dts +&emmc2 { +#else &sdhost { +#endif #address-cells = <1>; #size-cells = <1>; @@ -69,11 +70,6 @@ label = "barebox-state"; reg = <0x100000 0x100000>; }; - - partition@200000 { - label = "barebox-environment"; - reg = <0x200000 0x100000>; - }; }; #endif @@ -107,7 +103,8 @@ /** STM32MP1 ******************************************************************/ #if defined(stm32mp157c_lxa_mc1_dts) || \ defined(stm32mp157c_dk2_dts) || \ - defined(stm32mp157c_ev1_dts) + defined(stm32mp157c_ev1_dts) || \ + defined(stm32mp135f_dk_dts) / { aliases { state = &state_mmc0; diff --git a/configs/platform-v7a/kernelconfig b/configs/platform-v7a/kernelconfig index cca7825..e6fadf5 100644 --- a/configs/platform-v7a/kernelconfig +++ b/configs/platform-v7a/kernelconfig @@ -1,10 +1,10 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 6.6 Kernel Configuration +# Linux/arm 6.8 Kernel Configuration # -CONFIG_CC_VERSION_TEXT="arm-v7a-linux-gnueabihf-gcc (OSELAS.Toolchain-2023.07.0 13-20230624) 13.1.1 20230624" +CONFIG_CC_VERSION_TEXT="arm-v7a-linux-gnueabihf-gcc (OSELAS.Toolchain-2023.07.1 13-20231118) 13.2.1 20231118" CONFIG_CC_IS_GCC=y -CONFIG_GCC_VERSION=130101 +CONFIG_GCC_VERSION=130201 CONFIG_CLANG_VERSION=0 CONFIG_AS_IS_GNU=y CONFIG_AS_VERSION=24000 @@ -15,6 +15,7 @@ CONFIG_CC_CAN_LINK=y CONFIG_CC_CAN_LINK_STATIC=y CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y +CONFIG_GCC_ASM_GOTO_OUTPUT_WORKAROUND=y CONFIG_CC_HAS_ASM_INLINE=y CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y CONFIG_PAHOLE_VERSION=0 @@ -99,7 +100,6 @@ CONFIG_HAVE_EBPF_JIT=y CONFIG_BPF_SYSCALL=y # CONFIG_BPF_JIT is not set # CONFIG_BPF_UNPRIV_DEFAULT_OFF is not set -CONFIG_USERMODE_DRIVER=y # CONFIG_BPF_PRELOAD is not set # end of BPF subsystem @@ -155,8 +155,10 @@ CONFIG_GENERIC_SCHED_CLOCK=y # end of Scheduler features CONFIG_CC_IMPLICIT_FALLTHROUGH="-Wimplicit-fallthrough=5" -CONFIG_GCC11_NO_ARRAY_BOUNDS=y +CONFIG_GCC10_NO_ARRAY_BOUNDS=y CONFIG_CC_NO_ARRAY_BOUNDS=y +CONFIG_GCC_NO_STRINGOP_OVERFLOW=y +CONFIG_CC_NO_STRINGOP_OVERFLOW=y CONFIG_CGROUPS=y CONFIG_PAGE_COUNTER=y # CONFIG_CGROUP_FAVOR_DYNMODS is not set @@ -229,18 +231,18 @@ CONFIG_AIO=y CONFIG_IO_URING=y CONFIG_ADVISE_SYSCALLS=y CONFIG_MEMBARRIER=y +# CONFIG_KCMP is not set +CONFIG_RSEQ=y +# CONFIG_DEBUG_RSEQ is not set +CONFIG_CACHESTAT_SYSCALL=y +# CONFIG_PC104 is not set CONFIG_KALLSYMS=y # CONFIG_KALLSYMS_SELFTEST is not set CONFIG_KALLSYMS_ALL=y CONFIG_KALLSYMS_BASE_RELATIVE=y CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y -# CONFIG_KCMP is not set -CONFIG_RSEQ=y -CONFIG_CACHESTAT_SYSCALL=y -# CONFIG_DEBUG_RSEQ is not set CONFIG_HAVE_PERF_EVENTS=y CONFIG_PERF_USE_VMALLOC=y -# CONFIG_PC104 is not set # # Kernel Performance Events And Counters @@ -255,6 +257,7 @@ CONFIG_TRACEPOINTS=y # # Kexec and crash features # +# CONFIG_CRASH_DUMP is not set # end of Kexec and crash features # end of General setup @@ -296,6 +299,9 @@ CONFIG_ARCH_MULTI_V6_V7=y # CONFIG_ARCH_VIRT is not set # CONFIG_ARCH_AIROHA is not set +# CONFIG_ARCH_RDA is not set +# CONFIG_ARCH_SUNPLUS is not set +# CONFIG_ARCH_UNIPHIER is not set # CONFIG_ARCH_ACTIONS is not set # CONFIG_ARCH_ALPINE is not set # CONFIG_ARCH_ARTPEC is not set @@ -420,7 +426,6 @@ CONFIG_MACH_OMAP_GENERIC=y # end of TI OMAP/AM/DM/DRA Family # CONFIG_ARCH_QCOM is not set -# CONFIG_ARCH_RDA is not set # CONFIG_ARCH_REALTEK is not set # CONFIG_ARCH_ROCKCHIP is not set # CONFIG_ARCH_S5PV210 is not set @@ -431,10 +436,8 @@ CONFIG_MACH_OMAP_GENERIC=y CONFIG_ARCH_STM32=y CONFIG_MACH_STM32MP157=y CONFIG_MACH_STM32MP13=y -# CONFIG_ARCH_SUNPLUS is not set # CONFIG_ARCH_SUNXI is not set # CONFIG_ARCH_TEGRA is not set -# CONFIG_ARCH_UNIPHIER is not set # CONFIG_ARCH_U8500 is not set # CONFIG_ARCH_REALVIEW is not set CONFIG_ARCH_VEXPRESS=y @@ -788,6 +791,7 @@ CONFIG_BLOCK=y # CONFIG_BLOCK_LEGACY_AUTOLOAD is not set # CONFIG_BLK_DEV_BSGLIB is not set # CONFIG_BLK_DEV_INTEGRITY is not set +# CONFIG_BLK_DEV_WRITE_MOUNTED is not set # CONFIG_BLK_DEV_ZONED is not set # CONFIG_BLK_DEV_THROTTLING is not set # CONFIG_BLK_WBT is not set @@ -849,9 +853,8 @@ CONFIG_COREDUMP=y # CONFIG_SWAP is not set # -# SLAB allocator options +# Slab allocator options # -# CONFIG_SLAB_DEPRECATED is not set CONFIG_SLUB=y # CONFIG_SLUB_TINY is not set CONFIG_SLAB_MERGE_DEFAULT=y @@ -860,7 +863,7 @@ CONFIG_SLAB_FREELIST_RANDOM=y # CONFIG_SLUB_STATS is not set CONFIG_SLUB_CPU_PARTIAL=y # CONFIG_RANDOM_KMALLOC_CACHES is not set -# end of SLAB allocator options +# end of Slab allocator options # CONFIG_SHUFFLE_PAGE_ALLOCATOR is not set # CONFIG_COMPAT_BRK is not set @@ -877,6 +880,7 @@ CONFIG_COMPACT_UNEVICTABLE_DEFAULT=1 # CONFIG_PAGE_REPORTING is not set CONFIG_MIGRATION=y CONFIG_CONTIG_ALLOC=y +CONFIG_PCP_BATCH_SCALE_MAX=5 CONFIG_BOUNCE=y # CONFIG_KSM is not set CONFIG_DEFAULT_MMAP_MIN_ADDR=32768 @@ -900,6 +904,8 @@ CONFIG_MEMFD_CREATE=y # CONFIG_ANON_VMA_NAME is not set # CONFIG_USERFAULTFD is not set # CONFIG_LRU_GEN is not set +CONFIG_ARCH_SUPPORTS_PER_VMA_LOCK=y +CONFIG_PER_VMA_LOCK=y CONFIG_LOCK_MM_AND_FIND_VMA=y # @@ -1032,8 +1038,6 @@ CONFIG_NETFILTER_BPF_LINK=y # CONFIG_IP6_NF_IPTABLES is not set # end of IPv6: Netfilter Configuration -CONFIG_BPFILTER=y -# CONFIG_BPFILTER_UMH is not set # CONFIG_IP_DCCP is not set # CONFIG_IP_SCTP is not set # CONFIG_RDS is not set @@ -1215,7 +1219,6 @@ CONFIG_GENERIC_ARCH_TOPOLOGY=y # # Bus devices # -# CONFIG_BRCMSTB_GISB_ARB is not set # CONFIG_MOXTET is not set # CONFIG_IMX_WEIM is not set CONFIG_OMAP_INTERCONNECT=y @@ -1245,11 +1248,12 @@ CONFIG_ARM_SCMI_PROTOCOL=y # CONFIG_ARM_SCMI_RAW_MODE_SUPPORT is not set CONFIG_ARM_SCMI_HAVE_TRANSPORT=y CONFIG_ARM_SCMI_HAVE_SHMEM=y +CONFIG_ARM_SCMI_HAVE_MSG=y CONFIG_ARM_SCMI_TRANSPORT_MAILBOX=y +CONFIG_ARM_SCMI_TRANSPORT_OPTEE=y CONFIG_ARM_SCMI_TRANSPORT_SMC=y # CONFIG_ARM_SCMI_TRANSPORT_SMC_ATOMIC_ENABLE is not set # CONFIG_ARM_SCMI_TRANSPORT_VIRTIO is not set -CONFIG_ARM_SCMI_POWER_DOMAIN=y # CONFIG_ARM_SCMI_POWER_CONTROL is not set # end of ARM System Control and Management Interface Protocol @@ -1261,6 +1265,12 @@ CONFIG_RASPBERRYPI_FIRMWARE=y # CONFIG_IMX_DSP is not set # CONFIG_IMX_SCU is not set CONFIG_ARM_PSCI_FW=y + +# +# Qualcomm firmware drivers +# +# end of Qualcomm firmware drivers + CONFIG_HAVE_ARM_SMCCC=y CONFIG_HAVE_ARM_SMCCC_DISCOVERY=y CONFIG_ARM_SMCCC_SOC_ID=y @@ -1278,7 +1288,6 @@ CONFIG_MTD=y # # Partition parsers # -# CONFIG_MTD_AR7_PARTS is not set # CONFIG_MTD_CMDLINE_PARTS is not set CONFIG_MTD_OF_PARTS=y # CONFIG_MTD_AFS_PARTS is not set @@ -1469,6 +1478,7 @@ CONFIG_SRAM_EXEC=y # CONFIG_HISI_HIKEY_USB is not set # CONFIG_OPEN_DICE is not set # CONFIG_VCPU_STALL_DETECTOR is not set +# CONFIG_NSM is not set # CONFIG_C2PORT is not set # @@ -1476,7 +1486,6 @@ CONFIG_SRAM_EXEC=y # CONFIG_EEPROM_AT24=y # CONFIG_EEPROM_AT25 is not set -# CONFIG_EEPROM_LEGACY is not set # CONFIG_EEPROM_MAX6875 is not set CONFIG_EEPROM_93CX6=y # CONFIG_EEPROM_93XX46 is not set @@ -1563,6 +1572,7 @@ CONFIG_WIREGUARD=y # CONFIG_VETH is not set # CONFIG_VIRTIO_NET is not set # CONFIG_NLMON is not set +# CONFIG_NETKIT is not set CONFIG_ETHERNET=y # CONFIG_NET_VENDOR_ALACRITECH is not set # CONFIG_ALTERA_TSE is not set @@ -1643,7 +1653,6 @@ CONFIG_TI_CPTS=y # CONFIG_NET_VENDOR_WIZNET is not set CONFIG_NET_VENDOR_XILINX=y # CONFIG_XILINX_EMACLITE is not set -# CONFIG_XILINX_AXI_EMAC is not set # CONFIG_XILINX_LL_TEMAC is not set CONFIG_PHYLINK=y CONFIG_PHYLIB=y @@ -1705,6 +1714,7 @@ CONFIG_SMSC_PHY=y # CONFIG_DP83867_PHY is not set # CONFIG_DP83869_PHY is not set # CONFIG_DP83TD510_PHY is not set +# CONFIG_DP83TG720_PHY is not set # CONFIG_VITESSE_PHY is not set # CONFIG_XILINX_GMII2RGMII is not set # CONFIG_MICREL_KS8995MA is not set @@ -1923,6 +1933,7 @@ CONFIG_HW_RANDOM_IPROC_RNG200=y CONFIG_HW_RANDOM_OMAP=y CONFIG_HW_RANDOM_VIRTIO=y CONFIG_HW_RANDOM_STM32=y +CONFIG_HW_RANDOM_OPTEE=y # CONFIG_HW_RANDOM_CCTRNG is not set # CONFIG_HW_RANDOM_XIPHERA is not set # CONFIG_HW_RANDOM_ARM_SMCCC_TRNG is not set @@ -2035,7 +2046,6 @@ CONFIG_SPI_OMAP24XX=y # CONFIG_SPI_MXIC is not set # CONFIG_SPI_XCOMM is not set # CONFIG_SPI_XILINX is not set -# CONFIG_SPI_ZYNQMP_GQSPI is not set # CONFIG_SPI_AMD is not set # @@ -2210,7 +2220,6 @@ CONFIG_POWER_RESET_AT91_POWEROFF=y CONFIG_POWER_RESET_AT91_RESET=y CONFIG_POWER_RESET_AT91_SAMA5D2_SHDWC=y # CONFIG_POWER_RESET_BRCMKONA is not set -# CONFIG_POWER_RESET_BRCMSTB is not set # CONFIG_POWER_RESET_GPIO is not set # CONFIG_POWER_RESET_GPIO_RESTART is not set # CONFIG_POWER_RESET_LTC2952 is not set @@ -2235,7 +2244,6 @@ CONFIG_POWER_SUPPLY=y # CONFIG_BATTERY_SBS is not set # CONFIG_CHARGER_SBS is not set # CONFIG_BATTERY_BQ27XXX is not set -# CONFIG_BATTERY_MAX17040 is not set # CONFIG_BATTERY_MAX17042 is not set # CONFIG_CHARGER_ISP1704 is not set # CONFIG_CHARGER_MAX8903 is not set @@ -2265,10 +2273,12 @@ CONFIG_POWER_SUPPLY=y # CONFIG_CHARGER_UCS1002 is not set # CONFIG_CHARGER_BD99954 is not set # CONFIG_BATTERY_UG3105 is not set +# CONFIG_FUEL_GAUGE_MM8013 is not set # CONFIG_HWMON is not set CONFIG_THERMAL=y # CONFIG_THERMAL_NETLINK is not set CONFIG_THERMAL_STATISTICS=y +CONFIG_THERMAL_DEBUGFS=y CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0 CONFIG_THERMAL_OF=y # CONFIG_THERMAL_WRITABLE_TRIPS is not set @@ -2489,6 +2499,7 @@ CONFIG_REGULATOR=y CONFIG_REGULATOR_FIXED_VOLTAGE=y # CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set # CONFIG_REGULATOR_USERSPACE_CONSUMER is not set +# CONFIG_REGULATOR_NETLINK_EVENTS is not set # CONFIG_REGULATOR_88PG86X is not set # CONFIG_REGULATOR_ACT8865 is not set # CONFIG_REGULATOR_AD5398 is not set @@ -2510,6 +2521,7 @@ CONFIG_REGULATOR_GPIO=y # CONFIG_REGULATOR_LTC3589 is not set # CONFIG_REGULATOR_LTC3676 is not set # CONFIG_REGULATOR_MAX1586 is not set +# CONFIG_REGULATOR_MAX77503 is not set # CONFIG_REGULATOR_MAX77857 is not set # CONFIG_REGULATOR_MAX8649 is not set # CONFIG_REGULATOR_MAX8660 is not set @@ -2805,6 +2817,7 @@ CONFIG_USB_DWC2_HOST=y CONFIG_USB_CHIPIDEA=y CONFIG_USB_CHIPIDEA_HOST=y CONFIG_USB_CHIPIDEA_MSM=y +CONFIG_USB_CHIPIDEA_NPCM=y CONFIG_USB_CHIPIDEA_IMX=y CONFIG_USB_CHIPIDEA_GENERIC=y CONFIG_USB_CHIPIDEA_TEGRA=y @@ -2902,7 +2915,6 @@ CONFIG_MMC_BCM2835=y # CONFIG_MMC_MTK is not set # CONFIG_MMC_SDHCI_XENON is not set CONFIG_MMC_SDHCI_OMAP=y -# CONFIG_MMC_SDHCI_AM654 is not set CONFIG_MMC_SDHCI_EXTERNAL_DMA=y # CONFIG_MEMSTICK is not set CONFIG_NEW_LEDS=y @@ -2976,6 +2988,7 @@ CONFIG_LEDS_TRIGGER_HEARTBEAT=y CONFIG_LEDS_TRIGGER_BACKLIGHT=y CONFIG_LEDS_TRIGGER_CPU=y # CONFIG_LEDS_TRIGGER_ACTIVITY is not set +# CONFIG_LEDS_TRIGGER_GPIO is not set CONFIG_LEDS_TRIGGER_DEFAULT_ON=y # @@ -3025,6 +3038,7 @@ CONFIG_RTC_INTF_DEV=y # CONFIG_RTC_DRV_DS1672 is not set # CONFIG_RTC_DRV_HYM8563 is not set # CONFIG_RTC_DRV_MAX6900 is not set +# CONFIG_RTC_DRV_MAX31335 is not set # CONFIG_RTC_DRV_NCT3018Y is not set # CONFIG_RTC_DRV_RS5C372 is not set # CONFIG_RTC_DRV_ISL1208 is not set @@ -3095,6 +3109,7 @@ CONFIG_RTC_I2C_AND_SPI=y # CONFIG_RTC_DRV_M48T59 is not set # CONFIG_RTC_DRV_MSM6242 is not set # CONFIG_RTC_DRV_RP5C01 is not set +# CONFIG_RTC_DRV_OPTEE is not set # CONFIG_RTC_DRV_ZYNQMP is not set # @@ -3223,6 +3238,7 @@ CONFIG_COMMON_CLK_SCMI=y # CONFIG_COMMON_CLK_CDCE706 is not set # CONFIG_COMMON_CLK_CDCE925 is not set # CONFIG_COMMON_CLK_CS2000_CP is not set +# CONFIG_CLK_TWL is not set # CONFIG_CLK_TWL6040 is not set # CONFIG_COMMON_CLK_AXI_CLKGEN is not set CONFIG_COMMON_CLK_PALMAS=y @@ -3232,8 +3248,6 @@ CONFIG_COMMON_CLK_PALMAS=y # CONFIG_COMMON_CLK_VC3 is not set # CONFIG_COMMON_CLK_VC5 is not set # CONFIG_COMMON_CLK_VC7 is not set -CONFIG_COMMON_CLK_STM32MP135=y -CONFIG_COMMON_CLK_STM32MP157=y # CONFIG_COMMON_CLK_FIXED_MMIO is not set CONFIG_CLK_BCM2711_DVP=y CONFIG_CLK_BCM2835=y @@ -3247,6 +3261,9 @@ CONFIG_CLK_IMX6SX=y # CONFIG_CLK_IMX8MQ is not set # CONFIG_CLK_IMX8ULP is not set # CONFIG_CLK_IMX93 is not set +CONFIG_COMMON_CLK_STM32MP=y +CONFIG_COMMON_CLK_STM32MP135=y +CONFIG_COMMON_CLK_STM32MP157=y # CONFIG_COMMON_CLK_TI_ADPLL is not set # CONFIG_XILINX_VCU is not set # CONFIG_COMMON_CLK_XLNX_CLKWZRD is not set @@ -3326,9 +3343,6 @@ CONFIG_AT91_SOC_ID=y # # Broadcom SoC drivers # -CONFIG_BCM2835_POWER=y -CONFIG_RASPBERRYPI_POWER=y -# CONFIG_SOC_BRCMSTB is not set # end of Broadcom SoC drivers # @@ -3346,7 +3360,6 @@ CONFIG_FSL_GUTS=y # # i.MX SoC drivers # -# CONFIG_IMX_GPCV2_PM_DOMAINS is not set # CONFIG_SOC_IMX8M is not set # CONFIG_SOC_IMX9 is not set # end of i.MX SoC drivers @@ -3373,6 +3386,39 @@ CONFIG_SOC_TI=y # end of Xilinx SoC drivers # end of SOC (System On Chip) specific Drivers +# +# PM Domains +# + +# +# Amlogic PM Domains +# +# end of Amlogic PM Domains + +# CONFIG_ARM_SCMI_PERF_DOMAIN is not set +CONFIG_ARM_SCMI_POWER_DOMAIN=y + +# +# Broadcom PM Domains +# +CONFIG_BCM2835_POWER=y +CONFIG_RASPBERRYPI_POWER=y +# end of Broadcom PM Domains + +# +# i.MX PM Domains +# +# CONFIG_IMX_GPCV2_PM_DOMAINS is not set +# end of i.MX PM Domains + +# +# Qualcomm PM Domains +# +# end of Qualcomm PM Domains + +CONFIG_OMAP2PLUS_PRM=y +# end of PM Domains + CONFIG_PM_DEVFREQ=y # @@ -3521,6 +3567,7 @@ CONFIG_ARM_PMU=y # CONFIG_DAX is not set CONFIG_NVMEM=y CONFIG_NVMEM_SYSFS=y +CONFIG_NVMEM_LAYOUTS=y # # Layout Types @@ -3535,6 +3582,7 @@ CONFIG_NVMEM_IMX_OCOTP_ELE=y # CONFIG_NVMEM_MICROCHIP_OTPC is not set CONFIG_NVMEM_RMEM=y # CONFIG_NVMEM_SNVS_LPGPR is not set +CONFIG_NVMEM_STM32_BSEC_OPTEE_TA=y CONFIG_NVMEM_STM32_ROMEM=y # CONFIG_NVMEM_U_BOOT_ENV is not set @@ -3547,7 +3595,8 @@ CONFIG_NVMEM_STM32_ROMEM=y # CONFIG_FPGA is not set # CONFIG_FSI is not set -# CONFIG_TEE is not set +CONFIG_TEE=y +CONFIG_OPTEE=y CONFIG_MULTIPLEXER=y # @@ -3600,6 +3649,7 @@ CONFIG_FS_MBCACHE=y # CONFIG_BTRFS_FS is not set # CONFIG_NILFS2_FS is not set # CONFIG_F2FS_FS is not set +# CONFIG_BCACHEFS_FS is not set CONFIG_FS_POSIX_ACL=y CONFIG_EXPORTFS=y # CONFIG_EXPORTFS_BLOCK_OPS is not set @@ -3718,6 +3768,7 @@ CONFIG_NFS_V3_ACL=y CONFIG_NFS_V4=y # CONFIG_NFS_V4_1 is not set CONFIG_ROOT_NFS=y +# CONFIG_NFS_FSCACHE is not set # CONFIG_NFS_USE_LEGACY_DNS is not set CONFIG_NFS_USE_KERNEL_DNS=y CONFIG_NFS_DISABLE_UDP_SUPPORT=y @@ -3915,14 +3966,12 @@ CONFIG_CRYPTO_DES=y # CONFIG_CRYPTO_ADIANTUM is not set # CONFIG_CRYPTO_CHACHA20 is not set CONFIG_CRYPTO_CBC=y -# CONFIG_CRYPTO_CFB is not set # CONFIG_CRYPTO_CTR is not set # CONFIG_CRYPTO_CTS is not set CONFIG_CRYPTO_ECB=y # CONFIG_CRYPTO_HCTR2 is not set # CONFIG_CRYPTO_KEYWRAP is not set # CONFIG_CRYPTO_LRW is not set -# CONFIG_CRYPTO_OFB is not set # CONFIG_CRYPTO_PCBC is not set CONFIG_CRYPTO_XTS=y # end of Length-preserving ciphers and modes @@ -3951,7 +4000,7 @@ CONFIG_CRYPTO_XTS=y # CONFIG_CRYPTO_MICHAEL_MIC is not set # CONFIG_CRYPTO_POLY1305 is not set # CONFIG_CRYPTO_RMD160 is not set -# CONFIG_CRYPTO_SHA1 is not set +CONFIG_CRYPTO_SHA1=y CONFIG_CRYPTO_SHA256=y # CONFIG_CRYPTO_SHA512 is not set # CONFIG_CRYPTO_SHA3 is not set @@ -4010,8 +4059,8 @@ CONFIG_CRYPTO_CURVE25519_NEON=y CONFIG_CRYPTO_POLY1305_ARM=y CONFIG_CRYPTO_BLAKE2S_ARM=y # CONFIG_CRYPTO_BLAKE2B_NEON is not set -# CONFIG_CRYPTO_SHA1_ARM is not set -# CONFIG_CRYPTO_SHA1_ARM_NEON is not set +CONFIG_CRYPTO_SHA1_ARM=y +CONFIG_CRYPTO_SHA1_ARM_NEON=y # CONFIG_CRYPTO_SHA1_ARM_CE is not set # CONFIG_CRYPTO_SHA2_ARM_CE is not set CONFIG_CRYPTO_SHA256_ARM=y @@ -4126,7 +4175,6 @@ CONFIG_ZSTD_DECOMPRESS=y CONFIG_XZ_DEC=y # CONFIG_XZ_DEC_X86 is not set # CONFIG_XZ_DEC_POWERPC is not set -# CONFIG_XZ_DEC_IA64 is not set CONFIG_XZ_DEC_ARM=y # CONFIG_XZ_DEC_ARMTHUMB is not set # CONFIG_XZ_DEC_SPARC is not set @@ -4147,6 +4195,7 @@ CONFIG_ARCH_HAS_TEARDOWN_DMA_OPS=y CONFIG_ARCH_HAS_SYNC_DMA_FOR_DEVICE=y CONFIG_ARCH_HAS_SYNC_DMA_FOR_CPU=y CONFIG_DMA_NONCOHERENT_MMAP=y +CONFIG_ARCH_HAS_DMA_ALLOC=y CONFIG_DMA_CMA=y # @@ -4179,7 +4228,9 @@ CONFIG_GENERIC_VDSO_32=y CONFIG_SG_SPLIT=y CONFIG_ARCH_STACKWALK=y CONFIG_STACKDEPOT=y +CONFIG_STACKDEPOT_MAX_FRAMES=64 CONFIG_SBITMAP=y +# CONFIG_LWQ_TEST is not set # end of Library routines CONFIG_GENERIC_LIB_DEVMEM_IS_ALLOWED=y @@ -4211,7 +4262,7 @@ CONFIG_DEBUG_MISC=y # Compile-time checks and compiler options # CONFIG_DEBUG_INFO=y -CONFIG_AS_HAS_NON_CONST_LEB128=y +CONFIG_AS_HAS_NON_CONST_ULEB128=y # CONFIG_DEBUG_INFO_NONE is not set CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y # CONFIG_DEBUG_INFO_DWARF4 is not set @@ -4273,6 +4324,7 @@ CONFIG_SLUB_DEBUG=y # CONFIG_DEBUG_WX is not set CONFIG_HAVE_DEBUG_KMEMLEAK=y # CONFIG_DEBUG_KMEMLEAK is not set +# CONFIG_PER_VMA_LOCK_STATS is not set # CONFIG_DEBUG_OBJECTS is not set # CONFIG_SHRINKER_DEBUG is not set # CONFIG_DEBUG_STACK_USAGE is not set @@ -4363,8 +4415,6 @@ CONFIG_STACKTRACE=y # CONFIG_DEBUG_MAPLE_TREE is not set # end of Debug kernel data structures -# CONFIG_DEBUG_CREDENTIALS is not set - # # RCU Debugging # @@ -4502,6 +4552,7 @@ CONFIG_RUNTIME_TESTING_MENU=y # CONFIG_TEST_MEMCAT_P is not set # CONFIG_TEST_MEMINIT is not set # CONFIG_TEST_FREE_PAGES is not set +# CONFIG_TEST_OBJPOOL is not set CONFIG_ARCH_USE_MEMTEST=y # CONFIG_MEMTEST is not set # end of Kernel Testing and Coverage 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 deleted file mode 100644 index 6f261b8..0000000 --- a/configs/platform-v7a/patches/barebox-2024.01.0/0001-ARM-rpi-fix-regression-booting-without-VideoCore-DT.patch +++ /dev/null @@ -1,130 +0,0 @@ -From 3ff500b014f4e7901721e5e581d50d7b5a7ff337 Mon Sep 17 00:00:00 2001 -From: Ahmad Fatoum <a.fatoum@pengutronix.de> -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 <rhi@pengutronix.de> -Cc: Denis Osterland-Heim <denis.osterland@gmail.com> -Link: https://lore.barebox.org/barebox/20240219191400.do7ib5rxy7tupv4i@pengutronix.de/ -Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de> ---- - 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 deleted file mode 100644 index 6822bd5..0000000 --- a/configs/platform-v7a/patches/barebox-2024.01.0/series +++ /dev/null @@ -1 +0,0 @@ -0001-ARM-rpi-fix-regression-booting-without-VideoCore-DT.patch diff --git a/configs/platform-v7a/platformconfig b/configs/platform-v7a/platformconfig index 3525657..f9cdc0f 100644 --- a/configs/platform-v7a/platformconfig +++ b/configs/platform-v7a/platformconfig @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# PTXdist 2024.02.0 +# PTXdist 2024.03.0 # PTXCONF__platformconfig_MAGIC__=y @@ -20,7 +20,7 @@ PTXCONF_PLATFORM_VERSION="-${PTXDIST_BSP_AUTOVERSION}" PTXCONF_RUNTIME=y PTXCONF_BUILDTIME=y PTXCONF_VIRTUAL=y -PTXCONF_PLATFORMCONFIG_VERSION="2024.02.0" +PTXCONF_PLATFORMCONFIG_VERSION="2024.03.0" # # architecture @@ -69,7 +69,7 @@ PTXCONF_SYSROOT_CROSS="${PTXDIST_PLATFORMDIR}/sysroot-cross" # toolchain # PTXCONF_CROSSCHAIN_VENDOR="OSELAS.Toolchain-2023.07" -PTXCONF_CROSSCHAIN_CHECK="13.1.1" +PTXCONF_CROSSCHAIN_CHECK="13.2.1" PTXCONF_LIBC_GLIBC=y # PTXCONF_LIBC_UCLIBC is not set PTXCONF_GLIBC_VERSION="2.37" @@ -124,8 +124,8 @@ PTXCONF_KERNEL_INSTALL=y PTXCONF_KERNEL_MODULES=y PTXCONF_KERNEL_MODULES_INSTALL=y # PTXCONF_KERNEL_MODULES_SIGN is not set -PTXCONF_KERNEL_VERSION="6.6" -PTXCONF_KERNEL_MD5="452098d80ba925af3a4ab35998f3aef5" +PTXCONF_KERNEL_VERSION="6.8" +PTXCONF_KERNEL_MD5="72d623b959a11850b57406f0b9fe3946" # PTXCONF_KERNEL_IMAGE_BZ is not set PTXCONF_KERNEL_IMAGE_Z=y # PTXCONF_KERNEL_IMAGE_XIP is not set @@ -138,7 +138,7 @@ PTXCONF_KERNEL_IMAGE_Z=y PTXCONF_KERNEL_IMAGE="zImage" PTXCONF_KERNEL_DTB=y PTXCONF_KERNEL_DTS_PATH="${PTXDIST_PLATFORMCONFIG_SUBDIR}/dts:${KERNEL_DIR}/arch/${GENERIC_KERNEL_ARCH}/boot/dts" -PTXCONF_KERNEL_DTS="ti/omap/am335x-bone.dts ti/omap/am335x-boneblack.dts arm/vexpress-v2p-ca9.dts broadcom/bcm2836-rpi-2-b.dts nxp/imx/imx6q-sabrelite.dts nxp/imx/imx6sx-udoo-neo-full.dts nxp/imx/imx6dl-riotboard.dts nxp/imx/imx6q-nitrogen6x.dts nxp/imx/imx6qp-nitrogen6_max.dts broadcom/bcm2837-rpi-3-b.dts broadcom/bcm2837-rpi-cm3-io3.dts broadcom/bcm2711-rpi-4-b.dts broadcom/bcm2711-rpi-400.dts st/stm32mp157c-dk2.dts st/stm32mp157c-ev1.dts st/stm32mp157c-lxa-mc1.dts microchip/at91-sama5d27_som1_ek.dts at91-sama5d27_giantboard.dts at91-sama5d4_wifx_l1.dts" +PTXCONF_KERNEL_DTS="ti/omap/am335x-bone.dts ti/omap/am335x-boneblack.dts arm/vexpress-v2p-ca9.dts broadcom/bcm2836-rpi-2-b.dts nxp/imx/imx6q-sabrelite.dts nxp/imx/imx6sx-udoo-neo-full.dts nxp/imx/imx6dl-riotboard.dts nxp/imx/imx6q-nitrogen6x.dts nxp/imx/imx6qp-nitrogen6_max.dts broadcom/bcm2837-rpi-3-b.dts broadcom/bcm2837-rpi-cm3-io3.dts broadcom/bcm2711-rpi-4-b.dts broadcom/bcm2711-rpi-400.dts st/stm32mp157c-dk2.dts st/stm32mp157c-ev1.dts st/stm32mp157c-lxa-mc1.dts st/stm32mp135f-dk.dts microchip/at91-sama5d27_som1_ek.dts at91-sama5d27_giantboard.dts at91-sama5d4_wifx_l1.dts" # PTXCONF_KERNEL_DTBO is not set # PTXCONF_KERNEL_CODE_SIGNING is not set # PTXCONF_KERNEL_ZSTD is not set @@ -183,8 +183,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="2024.01.0" -PTXCONF_BAREBOX_COMMON_MD5="8a94bdde5eaa1362b6c752f975f9e954" +PTXCONF_BAREBOX_COMMON_VERSION="2024.03.0" +PTXCONF_BAREBOX_COMMON_MD5="dcb443c48b64662b52974502c502427e" PTXCONF_BAREBOX_COMMON_NEEDS_HOST_LZOP=y PTXCONF_BAREBOX_AM335X_MLO=y PTXCONF_BAREBOX_AM335X=y @@ -199,11 +199,15 @@ PTXCONF_BAREBOX_ARCH_STRING="arm" PTXCONF_BOOTLOADER=y # PTXCONF_GRUB is not set # PTXCONF_HOST_MXS_UTILS is not set -# PTXCONF_OPTEE is not set +PTXCONF_OPTEE=y +PTXCONF_OPTEE_PLATFORM="stm32mp1" +PTXCONF_OPTEE_PLATFORM_FLAVOUR="135F_DK" +PTXCONF_OPTEE_CFG="CFG_TEE_CORE_LOG_LEVEL=2 CFG_WITH_PAGER=n CFG_GP_SOCKETS=n CFG_TA_MBEDTLS_SELF_TEST=n" +PTXCONF_TF_A_STM32MP13=y PTXCONF_TF_A=y -PTXCONF_TF_A_URL="https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git/snapshot" -PTXCONF_TF_A_VERSION="v2.8" -PTXCONF_TF_A_MD5="784a1e94d4b1e938927372e3bc12d12e" +PTXCONF_TF_A_URL="https://github.com/ARM-software/arm-trusted-firmware/archive/refs/tags" +PTXCONF_TF_A_VERSION="v2.10" +PTXCONF_TF_A_MD5="641f42080967e05d687ef2fa9f8f3bc3 179042745d57dc03cb44063d43dc5301" PTXCONF_TF_A_ARCH_STRING="aarch32" PTXCONF_TF_A_ARM_ARCH_MAJOR_7=y # PTXCONF_TF_A_ARM_ARCH_MAJOR_8_32_BIT is not set @@ -289,6 +293,7 @@ PTXCONF_IMAGE_RPI2=y PTXCONF_IMAGE_SABRELITE=y PTXCONF_IMAGE_SAMA5D27_GIANTBOARD=y PTXCONF_IMAGE_SAMA5D27_SOM1_EK=y +PTXCONF_IMAGE_STM32MP135F_DK=y PTXCONF_IMAGE_STM32MP157C_DK2=y PTXCONF_IMAGE_STM32MP157C_EV1=y PTXCONF_IMAGE_UDOO_NEO=y @@ -349,7 +354,9 @@ PTXCONF_HOST_SYSTEM_PYTHON3_PYPROJECT_HOOKS=y PTXCONF_HOST_SYSTEM_PYTHON3_TOMLI=y PTXCONF_HOST_SYSTEM_PYTHON3_WHEEL=y PTXCONF_HOST_SYSTEM_PYTHON3=y +PTXCONF_HOST_SYSTEM_PYTHON3_CRYPTOGRAPHY=y PTXCONF_HOST_SYSTEM_PYTHON3_SETUPTOOLS=y +PTXCONF_HOST_SYSTEM_PYTHON3_PYELFTOOLS=y PTXCONF_HOST_UTIL_LINUX=y PTXCONF_HOST_ZLIB=y PTXCONF_HOST_TF_A=y diff --git a/configs/platform-v7a/platforms/image-stm32mp135f-dk.in b/configs/platform-v7a/platforms/image-stm32mp135f-dk.in new file mode 100644 index 0000000..4b06817 --- /dev/null +++ b/configs/platform-v7a/platforms/image-stm32mp135f-dk.in @@ -0,0 +1,13 @@ +## SECTION=image + +config IMAGE_STM32MP135F_DK + tristate + select HOST_GENIMAGE + select HOST_TF_A + select IMAGE_ROOT_EXT + select TF_A_STM32MP13 + select OPTEE + select BAREBOX_STM32MP + prompt "Generate images/stm32mp135f-dk.hdimg" + help + Generate GPT image for the STM32MP135F-DK diff --git a/configs/platform-v7a/platforms/tf-a-stm32mp13.in b/configs/platform-v7a/platforms/tf-a-stm32mp13.in new file mode 100644 index 0000000..0dd5804 --- /dev/null +++ b/configs/platform-v7a/platforms/tf-a-stm32mp13.in @@ -0,0 +1,12 @@ +## SECTION=bootloader + +menuconfig TF_A_STM32MP13 + select BOOTLOADER + select HOST_DTC + prompt "ARM Trusted Firmware-A for STM32MP13 with OP-TEE" + depends on ARCH_ARM + bool + help + ARM Trusted Firmware-A for STM32MP13 series SoCs with OP-TEE enabled. + Currently, these can't be built in the same build as the + STM32MP15 with SP_min. diff --git a/configs/platform-v7a/rules/barebox-stm32mp.make b/configs/platform-v7a/rules/barebox-stm32mp.make index 5e47725..e39d7c1 100644 --- a/configs/platform-v7a/rules/barebox-stm32mp.make +++ b/configs/platform-v7a/rules/barebox-stm32mp.make @@ -50,7 +50,8 @@ BAREBOX_STM32MP_IMAGES := \ BAREBOX_STM32MP_FIP_DTBS := \ stm32mp157c-dk2.dtb \ stm32mp157c-ev1.dtb \ - stm32mp157c-lxa-mc1.dtb + stm32mp157c-lxa-mc1.dtb \ + stm32mp135f-dk.dtb BAREBOX_STM32MP_IMAGES := $(addprefix $(BAREBOX_STM32MP_BUILD_DIR)/,$(BAREBOX_STM32MP_IMAGES)) BAREBOX_STM32MP_FIP_DTBS := \ diff --git a/configs/platform-v7a/rules/image-stm32mp135f-dk.make b/configs/platform-v7a/rules/image-stm32mp135f-dk.make new file mode 100644 index 0000000..c7fefb2 --- /dev/null +++ b/configs/platform-v7a/rules/image-stm32mp135f-dk.make @@ -0,0 +1,34 @@ +# -*-makefile-*- +# +# Copyright (C) 2017 by Sascha Hauer <s.hauer@pengutronix.de> +# +# For further information about the PTXdist project and license conditions +# see the README file. +# + +# +# We provide this package +# +IMAGE_PACKAGES-$(PTXCONF_IMAGE_STM32MP135F_DK) += image-stm32mp135f-dk + +IMAGE_STM32MP135F_DK_ENV := STM32MP_BOARD=stm32mp135f-dk + +# +# Paths and names +# +IMAGE_STM32MP135F_DK := image-stm32mp135f-dk +IMAGE_STM32MP135F_DK_DIR := $(BUILDDIR)/$(IMAGE_STM32MP135F_DK) +IMAGE_STM32MP135F_DK_IMAGE := $(IMAGEDIR)/stm32mp135f-dk.hdimg +IMAGE_STM32MP135F_DK_FILES := $(IMAGEDIR)/root.tgz +IMAGE_STM32MP135F_DK_CONFIG := stm32mp-optee.config + +# ---------------------------------------------------------------------------- +# Image +# ---------------------------------------------------------------------------- + +$(IMAGE_STM32MP135F_DK_IMAGE): + @$(call targetinfo) + @$(call image/genimage, IMAGE_STM32MP135F_DK) + @$(call finish) + +# vim: syntax=make diff --git a/configs/platform-v7a/rules/tf-a-stm32mp13.make b/configs/platform-v7a/rules/tf-a-stm32mp13.make new file mode 100644 index 0000000..36feb25 --- /dev/null +++ b/configs/platform-v7a/rules/tf-a-stm32mp13.make @@ -0,0 +1,110 @@ +# -*-makefile-*- +# +# Copyright (C) 2018 by Rouven Czerwinski <r.czerwinski@pengutronix.de> +# 2019 by Ahmad Fatoum <a.fatoum@pengutronix.de> +# +# For further information about the PTXdist project and license conditions +# see the README file. +# + +# +# We provide this package +# +PACKAGES-$(PTXCONF_TF_A_STM32MP13) += tf-a-stm32mp13 + +# +# Paths and names +# +TF_A_STM32MP13_VERSION := $(call ptx/config-version, PTXCONF_TF_A) +TF_A_STM32MP13_MD5 := $(call ptx/config-md5, PTXCONF_TF_A) +TF_A_STM32MP13 := tf-a-stm32mp13-$(TF_A_STM32MP13_VERSION) +TF_A_STM32MP13_SUFFIX := tar.gz +TF_A_STM32MP13_URL := https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git/snapshot/$(TF_A_STM32MP13_VERSION).$(TF_A_STM32MP13_SUFFIX) +TF_A_STM32MP13_SOURCE := $(SRCDIR)/$(TF_A_STM32MP13).$(TF_A_STM32MP13_SUFFIX) +TF_A_STM32MP13_DIR := $(BUILDDIR)/$(TF_A_STM32MP13) +TF_A_STM32MP13_BUILDDIR := $(TF_A_STM32MP13_DIR)/build +TF_A_STM32MP13_BUILD_OOT := YES +TF_A_STM32MP13_LICENSE := BSD-3-Clause AND BSD-2-Clause \ + AND (GPL-2.0-or-later OR BSD-2-Clause) \ + AND (NCSA OR MIT) \ + AND Zlib \ + AND (GPL-2.0-or-later OR BSD-3-Clause) + +# ---------------------------------------------------------------------------- +# Prepare +# ---------------------------------------------------------------------------- + +TF_A_STM32MP13_PLATFORMS := stm32mp1 +TF_A_STM32MP13_ARTIFACTS := tf-a-*.stm32 fdts/*-fw-config.dtb + +TF_A_STM32MP13_WRAPPER_BLACKLIST := \ + $(PTXDIST_LOWLEVEL_WRAPPER_BLACKLIST) + +TF_A_STM32MP13_PATH := PATH=$(CROSS_PATH) +TF_A_STM32MP13_MAKE_OPT := \ + -C $(TF_A_STM32MP13_DIR) \ + CROSS_COMPILE=$(BOOTLOADER_CROSS_COMPILE) \ + HOSTCC=$(HOSTCC) \ + ARCH=aarch32 \ + ARM_ARCH_MAJOR=7 \ + BUILD_STRING=$(TF_A_STM32MP13_VERSION) \ + DTB_FILE_NAME='stm32mp135f-dk.dtb' \ + STM32MP_EMMC=1 STM32MP_SDMMC=1 \ + STM32MP_RAW_NAND=1 STM32MP_SPI_NAND=1 STM32MP_SPI_NOR=1 \ + STM32MP_USB_PROGRAMMER=1 \ + AARCH32_SP=optee \ + all + +TF_A_STM32MP13_CONF_TOOL := NO + +# ---------------------------------------------------------------------------- +# Compile +# ---------------------------------------------------------------------------- + +TF_A_STM32MP13_MAKE_ENV := $(CROSS_ENV) + +$(STATEDIR)/tf-a-stm32mp13.compile: + @$(call targetinfo) + + @$(foreach plat, $(TF_A_STM32MP13_PLATFORMS), \ + $(call compile, TF_A_STM32MP13, \ + $(TF_A_STM32MP13_MAKE_OPT) PLAT=$(plat))$(ptx/nl)) + + @$(call touch) + +# ---------------------------------------------------------------------------- +# Install +# ---------------------------------------------------------------------------- + +tf-a-stm32mp13/inst_plat = $(foreach artifact, \ + $(foreach pattern, $(TF_A_STM32MP13_ARTIFACTS), \ + $(wildcard $(TF_A_STM32MP13_BUILDDIR)/$(1)/$(if $(filter DEBUG=1,TF_A_STM32MP13_MAKE_OPT),debug,release)/$(pattern))), \ + install -v -D -m 644 $(artifact) \ + $(2)/$(1)-$(notdir $(artifact))$(ptx/nl)) + +tf-a-stm32mp13/inst_bins = $(foreach plat, $(TF_A_STM32MP13_PLATFORMS), $(call tf-a-stm32mp13/inst_plat,$(plat),$(1))) + +$(STATEDIR)/tf-a-stm32mp13.install: + @$(call targetinfo) + @$(call tf-a-stm32mp13/inst_bins,$(TF_A_STM32MP13_PKGDIR)/usr/lib/firmware) + @$(call touch) + +# ---------------------------------------------------------------------------- +# Target-Install +# ---------------------------------------------------------------------------- + +$(STATEDIR)/tf-a-stm32mp13.targetinstall: + @$(call targetinfo) + @$(call tf-a-stm32mp13/inst_bins,$(IMAGEDIR)) + @$(call touch) + +# ---------------------------------------------------------------------------- +# Clean +# ---------------------------------------------------------------------------- + +$(STATEDIR)/tf-a-stm32mp13.clean: + @$(call targetinfo) + @rm -vf $(addprefix $(IMAGEDIR)/, $(notdir $(TF_A_STM32MP13_ARTIFACTS_SRC))) + @$(call clean_pkg, TF_A_STM32MP13) + +# vim: syntax=make |