diff options
author | Patrick Williams <patrick@stwcx.xyz> | 2023-01-30 22:28:01 +0300 |
---|---|---|
committer | Patrick Williams <patrick@stwcx.xyz> | 2023-01-30 23:15:34 +0300 |
commit | b9af8750acfaddd4a8b99c3e289510b5476c90f3 (patch) | |
tree | 53385dd5fc99ccf4869c9c80fcd1e98e100fe81f /meta-arm/meta-arm | |
parent | 70d69cd8440d2a940a971f262a3e36cc78781461 (diff) | |
download | openbmc-b9af8750acfaddd4a8b99c3e289510b5476c90f3.tar.xz |
subtree updates
meta-security: 3d9dab6d14..7eed4a60f5:
Armin Kuster (2):
linux-yocto.bbappend: bump to kernel version 6.x
meta-tpm: bump linux-yocto to 6.x kernel
Max Krummenacher (1):
samhain: rework due to changed cache handling
meta-openembedded: 2ab113e8be..ea63f13846:
Beniamin Sandu (1):
mbedtls: export source files/headers needed by ATF
Khem Raj (13):
poco: Do not use std::atomic<bool>
libwebsockets: Fix build with gcc13
v4l-utils: Fix build with gcc13
proj: Upgrade to 9.1.1 release
mpd: Upgrade to 0.23.12 release
geos: Upgrade to 3.9.4
geos: Fix build with gcc13
libinih: Upgrade to version 56
python3-pybind11: Upgrade to 2.10.3
waylandpp: Fix build with gcc-13
sedutil: Fix build with gcc13
usbguard: Fix build with gcc13
minifi-cpp: Fix build with gcc13
Martin Jansa (6):
keyutils: fix Upstream-Status formatting
gphoto2: fix Upstream-Status formatting
.patch: fix Upstream-Status formatting issues reported by patchreview tool from oe-core
android-tools: fix Upstream-Status formatting
mm-common: fix Upstream-Status formatting
.patch: fix Signed-off-by formatting issues reported by patchreview tool from oe-core
poky: 5e249ec855..29afbb5e14:
Alejandro Hernandez Samaniego (1):
newlib: Upgrade 4.2.0 -> 4.3.0
Alexander Kanavin (1):
gdk-pixbuf: do not use tools from gdk-pixbuf-native when building tests
Armin Kuster (1):
lttng-modules: Fix for 5.10.163 kernel version
Khem Raj (3):
valgrind: Include missing <cstdint>
webkitgtk: Fix build with gcc 13
gdb: Define alignof using _Alignof when using C11 or newer
Richard Purdie (3):
make-mod-scripts: Ensure kernel build output is deterministic
bitbake.conf: Inject a dash into PN for BB_HASH_CODEPARSER_VALS
scripts/bitbake-prserv-tool: Fix to work with memres bitbake
Ross Burton (1):
Revert "cve-update-db-native: show IP on failure"
meta-arm: 3d51e1117d..aecbb77f72:
Jon Mason (4):
arm/qemuarm-secureboot: Changes for v2023.01 u-boot
arm-bsp/juno: update to use u-boot v2023.01
arm-bsp/juno: update kernel patches for 6.1
arm-bsp/fvp-base: update kernel config to remove warning
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Change-Id: Ia335876b7ce9a4c9d19ca41ae321b266b3b6d00e
Diffstat (limited to 'meta-arm/meta-arm')
5 files changed, 41 insertions, 29 deletions
diff --git a/meta-arm/meta-arm/conf/machine/qemuarm-secureboot.conf b/meta-arm/meta-arm/conf/machine/qemuarm-secureboot.conf index cb54fe9470..db02dc6891 100644 --- a/meta-arm/meta-arm/conf/machine/qemuarm-secureboot.conf +++ b/meta-arm/meta-arm/conf/machine/qemuarm-secureboot.conf @@ -23,4 +23,4 @@ IMAGE_BOOT_FILES = "${KERNEL_IMAGETYPE}" MACHINE_FEATURES += "optee-ftpm" PREFERRED_VERSION_optee-os ?= "3.18.%" -PREFERRED_VERSION_u-boot ?= "2022.10" + diff --git a/meta-arm/meta-arm/recipes-bsp/u-boot/u-boot/0001-qemu-arm-make-QFW-MMIO-implied-on-qemu-arm.patch b/meta-arm/meta-arm/recipes-bsp/u-boot/u-boot/0001-qemu-arm-make-QFW-MMIO-implied-on-qemu-arm.patch new file mode 100644 index 0000000000..8d3b32f803 --- /dev/null +++ b/meta-arm/meta-arm/recipes-bsp/u-boot/u-boot/0001-qemu-arm-make-QFW-MMIO-implied-on-qemu-arm.patch @@ -0,0 +1,34 @@ +From 67bb1f111c4668c4dfdc40547cb83fc6c1f010e9 Mon Sep 17 00:00:00 2001 +From: Jon Mason <jdmason@kudzu.us> +Date: Thu, 26 Jan 2023 11:46:33 -0500 +Subject: [PATCH] qemu: arm: make QFW, MMIO implied on qemu-arm + +There are instances when one would not want QFW enabled, like running +alternative firmware. Make this choice optional instead of forced by +using the implied keyword. + +Signed-off-by: Jon Mason <jdmason@kudzu.us> +Upstream-Status: Pending [Not submitted to upstream yet] + +--- + board/emulation/qemu-arm/Kconfig | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/board/emulation/qemu-arm/Kconfig b/board/emulation/qemu-arm/Kconfig +index ed9949651c4b..93f6f74d5bcc 100644 +--- a/board/emulation/qemu-arm/Kconfig ++++ b/board/emulation/qemu-arm/Kconfig +@@ -5,8 +5,8 @@ config TEXT_BASE + + config BOARD_SPECIFIC_OPTIONS # dummy + def_bool y +- select CMD_QFW +- select QFW_MMIO ++ imply CMD_QFW ++ imply QFW_MMIO + imply VIRTIO_MMIO + imply VIRTIO_PCI + imply VIRTIO_NET +-- +2.30.2 + diff --git a/meta-arm/meta-arm/recipes-bsp/u-boot/u-boot/qemuarm.cfg b/meta-arm/meta-arm/recipes-bsp/u-boot/u-boot/qemuarm.cfg index db8dfec00b..82c25e27c8 100644 --- a/meta-arm/meta-arm/recipes-bsp/u-boot/u-boot/qemuarm.cfg +++ b/meta-arm/meta-arm/recipes-bsp/u-boot/u-boot/qemuarm.cfg @@ -1,6 +1,7 @@ # This must match the address that TF-A jumps to for BL33 -CONFIG_SYS_TEXT_BASE=0x60000000 +CONFIG_TEXT_BASE=0x60000000 CONFIG_ENV_IS_NOWHERE=y # CONFIG_ENV_IS_IN_FLASH is not set # CONFIG_MTD is not set # CONFIG_MTD_NOR_FLASH is not set +# CONFIG_CMD_QFW is not set diff --git a/meta-arm/meta-arm/recipes-bsp/u-boot/u-boot_%.bbappend b/meta-arm/meta-arm/recipes-bsp/u-boot/u-boot_%.bbappend index 0683a78389..58d66e1d68 100644 --- a/meta-arm/meta-arm/recipes-bsp/u-boot/u-boot_%.bbappend +++ b/meta-arm/meta-arm/recipes-bsp/u-boot/u-boot_%.bbappend @@ -1,4 +1,7 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" SRC_URI:append:qemuarm64-secureboot = " file://qemuarm64.cfg" -SRC_URI:append:qemuarm-secureboot = " file://qemuarm.cfg" +SRC_URI:append:qemuarm-secureboot = " \ + file://0001-qemu-arm-make-QFW-MMIO-implied-on-qemu-arm.patch \ + file://qemuarm.cfg \ + " diff --git a/meta-arm/meta-arm/recipes-bsp/u-boot/u-boot_2022.10.bb b/meta-arm/meta-arm/recipes-bsp/u-boot/u-boot_2022.10.bb deleted file mode 100644 index 905ae552a7..0000000000 --- a/meta-arm/meta-arm/recipes-bsp/u-boot/u-boot_2022.10.bb +++ /dev/null @@ -1,26 +0,0 @@ -HOMEPAGE = "http://www.denx.de/wiki/U-Boot/WebHome" -DESCRIPTION = "U-Boot, a boot loader for Embedded boards based on PowerPC, \ -ARM, MIPS and several other processors, which can be installed in a boot \ -ROM and used to initialize and test the hardware or to download and run \ -application code." -SECTION = "bootloaders" -DEPENDS += "flex-native bison-native" - -LICENSE = "GPL-2.0-or-later" -LIC_FILES_CHKSUM = "file://Licenses/README;md5=2ca5f2c35c8cc335f0a19756634782f1" -PE = "1" - -# We use the revision in order to avoid having to fetch it from the -# repo during parse -SRCREV = "4debc57a3da6c3f4d3f89a637e99206f4cea0a96" - -SRC_URI = "git://git.denx.de/u-boot.git;branch=master \ - " - -S = "${WORKDIR}/git" -B = "${WORKDIR}/build" -do_configure[cleandirs] = "${B}" - -require recipes-bsp/u-boot/u-boot.inc - -DEPENDS += "bc-native dtc-native gnutls-native" |