From f2898f5c56a518f53168ebfeae11379b7fdfb391 Mon Sep 17 00:00:00 2001 From: Peter Hoyes Date: Fri, 22 Apr 2022 17:08:57 +0100 Subject: [PATCH] arm-bsp/boot-wrapper-aarch64,u-boot: Clarify fvp-baser Upstream-Status The final firmware design for the fvp-baser-aemv8r64 is pending further discussion, so the current implementation contains several "temporary" patches which are likely to be removed or replaced in the future. These are already marked as "Inappropriate" to upstream, but amend the reason to "Implementation pending further discussion" to avoid confusion. Issue-Id: SCM-4304 Signed-off-by: Peter Hoyes Change-Id: I7dc6eae73fbb18f4b7b63540fb45b6a62d455093 Signed-off-by: Jon Mason --- .../0008-aarch64-Disable-CNTPCT_EL0-trap-for-v8-R64.patch | 2 +- .../files/fvp-baser-aemv8r64/0009-lds-Mark-the-mem-range.patch | 2 +- .../fvp-baser-aemv8r64/0010-common-Introduce-the-libfdt.patch | 2 +- .../0011-common-Add-essential-libc-functions.patch | 2 +- .../0012-Makefile-Add-the-libfdt-to-the-Makefile-system.patch | 2 +- .../fvp-baser-aemv8r64/0013-platform-Add-print_hex-func.patch | 2 +- .../0014-common-Add-mem-usage-to-memreserve.patch | 2 +- .../0015-boot-Add-the-enable-keep-el-compile-option.patch | 2 +- .../0006-armv8-Add-ARMv8-MPU-configuration-logic.patch | 2 +- ...7-armv8-Allow-disabling-exception-vectors-on-non-SPL-b.patch | 2 +- .../0008-armv8-ARMV8_SWITCH_TO_EL1-improvements.patch | 2 +- ...9-armv8-Make-disabling-HVC-configurable-when-switching.patch | 2 +- .../0010-vexpress64-Do-not-set-COUNTER_FREQUENCY.patch | 2 +- .../0011-vexpress64-Add-BASER_FVP-vexpress-board-variant.patch | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/meta-arm-bsp/recipes-bsp/boot-wrapper-aarch64/files/fvp-baser-aemv8r64/0008-aarch64-Disable-CNTPCT_EL0-trap-for-v8-R64.patch b/meta-arm-bsp/recipes-bsp/boot-wrapper-aarch64/files/fvp-baser-aemv8r64/0008-aarch64-Disable-CNTPCT_EL0-trap-for-v8-R64.patch index a14e54a2..2ce28b70 100644 --- a/meta-arm-bsp/recipes-bsp/boot-wrapper-aarch64/files/fvp-baser-aemv8r64/0008-aarch64-Disable-CNTPCT_EL0-trap-for-v8-R64.patch +++ b/meta-arm-bsp/recipes-bsp/boot-wrapper-aarch64/files/fvp-baser-aemv8r64/0008-aarch64-Disable-CNTPCT_EL0-trap-for-v8-R64.patch @@ -16,7 +16,7 @@ FEAT_VHE. We can simply set CNTHCTL_EL2.EL1PCTEN to 1. Issue-ID: SCM-3508 Upstream-Status: Inappropriate [other] - Temporary patch + Implementation pending further discussion Signed-off-by: Jaxson Han Change-Id: I4147e66341c8153312021e6f2ab67d0037246da1 --- diff --git a/meta-arm-bsp/recipes-bsp/boot-wrapper-aarch64/files/fvp-baser-aemv8r64/0009-lds-Mark-the-mem-range.patch b/meta-arm-bsp/recipes-bsp/boot-wrapper-aarch64/files/fvp-baser-aemv8r64/0009-lds-Mark-the-mem-range.patch index 3d4fec88..0c310eb5 100644 --- a/meta-arm-bsp/recipes-bsp/boot-wrapper-aarch64/files/fvp-baser-aemv8r64/0009-lds-Mark-the-mem-range.patch +++ b/meta-arm-bsp/recipes-bsp/boot-wrapper-aarch64/files/fvp-baser-aemv8r64/0009-lds-Mark-the-mem-range.patch @@ -9,7 +9,7 @@ calculate the mem range of boot-wrapper and then set the range to Issue-ID: SCM-3815 Upstream-Status: Inappropriate [other] - Temporary patch + Implementation pending further discussion Signed-off-by: Jaxson Han Change-Id: Idc5a2894e193c75381049a0f359b4b2a51c567ee --- diff --git a/meta-arm-bsp/recipes-bsp/boot-wrapper-aarch64/files/fvp-baser-aemv8r64/0010-common-Introduce-the-libfdt.patch b/meta-arm-bsp/recipes-bsp/boot-wrapper-aarch64/files/fvp-baser-aemv8r64/0010-common-Introduce-the-libfdt.patch index e0496dc3..0305f8ba 100644 --- a/meta-arm-bsp/recipes-bsp/boot-wrapper-aarch64/files/fvp-baser-aemv8r64/0010-common-Introduce-the-libfdt.patch +++ b/meta-arm-bsp/recipes-bsp/boot-wrapper-aarch64/files/fvp-baser-aemv8r64/0010-common-Introduce-the-libfdt.patch @@ -15,7 +15,7 @@ We choose BSD because the boot-wrapper is under BSD. Issue-Id: SCM-3814 Upstream-Status: Inappropriate [other] - Temporary patch + Implementation pending further discussion Signed-off-by: Jaxson Han Change-Id: Iec2f469053c8ac0ed38838c597b21a42bdf67b38 --- diff --git a/meta-arm-bsp/recipes-bsp/boot-wrapper-aarch64/files/fvp-baser-aemv8r64/0011-common-Add-essential-libc-functions.patch b/meta-arm-bsp/recipes-bsp/boot-wrapper-aarch64/files/fvp-baser-aemv8r64/0011-common-Add-essential-libc-functions.patch index aa05a720..871a178f 100644 --- a/meta-arm-bsp/recipes-bsp/boot-wrapper-aarch64/files/fvp-baser-aemv8r64/0011-common-Add-essential-libc-functions.patch +++ b/meta-arm-bsp/recipes-bsp/boot-wrapper-aarch64/files/fvp-baser-aemv8r64/0011-common-Add-essential-libc-functions.patch @@ -13,7 +13,7 @@ terms of BSD license. It is the same with boot-wrapper. Issue-Id: SCM-3814 Upstream-Status: Inappropriate [other] - Temporary patch + Implementation pending further discussion Signed-off-by: Jaxson Han Change-Id: If3b55b00afa8694c7522df989a41e0b38eda1d38 --- diff --git a/meta-arm-bsp/recipes-bsp/boot-wrapper-aarch64/files/fvp-baser-aemv8r64/0012-Makefile-Add-the-libfdt-to-the-Makefile-system.patch b/meta-arm-bsp/recipes-bsp/boot-wrapper-aarch64/files/fvp-baser-aemv8r64/0012-Makefile-Add-the-libfdt-to-the-Makefile-system.patch index eeddaace..5917ef20 100644 --- a/meta-arm-bsp/recipes-bsp/boot-wrapper-aarch64/files/fvp-baser-aemv8r64/0012-Makefile-Add-the-libfdt-to-the-Makefile-system.patch +++ b/meta-arm-bsp/recipes-bsp/boot-wrapper-aarch64/files/fvp-baser-aemv8r64/0012-Makefile-Add-the-libfdt-to-the-Makefile-system.patch @@ -9,7 +9,7 @@ compile. Add -fno-stack-protector to fix it. Issue-Id: SCM-3814 Upstream-Status: Inappropriate [other] - Temporary patch + Implementation pending further discussion Signed-off-by: Jaxson Han Change-Id: I472bc28cdc5cde3b22461a4b7d7a3752ae382b4b --- diff --git a/meta-arm-bsp/recipes-bsp/boot-wrapper-aarch64/files/fvp-baser-aemv8r64/0013-platform-Add-print_hex-func.patch b/meta-arm-bsp/recipes-bsp/boot-wrapper-aarch64/files/fvp-baser-aemv8r64/0013-platform-Add-print_hex-func.patch index 7d643ff4..136e18ed 100644 --- a/meta-arm-bsp/recipes-bsp/boot-wrapper-aarch64/files/fvp-baser-aemv8r64/0013-platform-Add-print_hex-func.patch +++ b/meta-arm-bsp/recipes-bsp/boot-wrapper-aarch64/files/fvp-baser-aemv8r64/0013-platform-Add-print_hex-func.patch @@ -8,7 +8,7 @@ numbers. Issue-Id: SCM-3814 Upstream-Status: Inappropriate [other] - Temporary patch + Implementation pending further discussion Signed-off-by: Jaxson Han Change-Id: Ic960345d9ef0b41d81d30c4a4dbd9c31139907c4 --- diff --git a/meta-arm-bsp/recipes-bsp/boot-wrapper-aarch64/files/fvp-baser-aemv8r64/0014-common-Add-mem-usage-to-memreserve.patch b/meta-arm-bsp/recipes-bsp/boot-wrapper-aarch64/files/fvp-baser-aemv8r64/0014-common-Add-mem-usage-to-memreserve.patch index f5263d2a..ea518160 100644 --- a/meta-arm-bsp/recipes-bsp/boot-wrapper-aarch64/files/fvp-baser-aemv8r64/0014-common-Add-mem-usage-to-memreserve.patch +++ b/meta-arm-bsp/recipes-bsp/boot-wrapper-aarch64/files/fvp-baser-aemv8r64/0014-common-Add-mem-usage-to-memreserve.patch @@ -8,7 +8,7 @@ services with libfdt. Issue-Id: SCM-3815 Upstream-Status: Inappropriate [other] - Temporary patch + Implementation pending further discussion Signed-off-by: Jaxson Han Change-Id: I2ea80cdf736a910fa2c3deb622e21d50f04be960 --- diff --git a/meta-arm-bsp/recipes-bsp/boot-wrapper-aarch64/files/fvp-baser-aemv8r64/0015-boot-Add-the-enable-keep-el-compile-option.patch b/meta-arm-bsp/recipes-bsp/boot-wrapper-aarch64/files/fvp-baser-aemv8r64/0015-boot-Add-the-enable-keep-el-compile-option.patch index 6c708e94..0411ef02 100644 --- a/meta-arm-bsp/recipes-bsp/boot-wrapper-aarch64/files/fvp-baser-aemv8r64/0015-boot-Add-the-enable-keep-el-compile-option.patch +++ b/meta-arm-bsp/recipes-bsp/boot-wrapper-aarch64/files/fvp-baser-aemv8r64/0015-boot-Add-the-enable-keep-el-compile-option.patch @@ -12,7 +12,7 @@ Linux PSCI, this option will cause secondary cores booting at EL1. Issue-Id: SCM-3813 Upstream-Status: Inappropriate [other] - Temporary patch + Implementation pending further discussion Signed-off-by: Jaxson Han Change-Id: I3ba9c87cf0b59d163ca433f74c9e3a46e5ca2c63 --- diff --git a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/fvp-baser-aemv8r64/0006-armv8-Add-ARMv8-MPU-configuration-logic.patch b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/fvp-baser-aemv8r64/0006-armv8-Add-ARMv8-MPU-configuration-logic.patch index 6e708e11..08cfa263 100644 --- a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/fvp-baser-aemv8r64/0006-armv8-Add-ARMv8-MPU-configuration-logic.patch +++ b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/fvp-baser-aemv8r64/0006-armv8-Add-ARMv8-MPU-configuration-logic.patch @@ -16,7 +16,7 @@ board configurations. Issue-Id: SCM-2443 Upstream-Status: Inappropriate [other] - Temporary patch + Implementation pending further discussion Signed-off-by: Peter Hoyes Change-Id: I0ee3879f9d7f03fe940664b3551c68eeaa458d17 --- diff --git a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/fvp-baser-aemv8r64/0007-armv8-Allow-disabling-exception-vectors-on-non-SPL-b.patch b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/fvp-baser-aemv8r64/0007-armv8-Allow-disabling-exception-vectors-on-non-SPL-b.patch index 10001230..4c567dce 100644 --- a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/fvp-baser-aemv8r64/0007-armv8-Allow-disabling-exception-vectors-on-non-SPL-b.patch +++ b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/fvp-baser-aemv8r64/0007-armv8-Allow-disabling-exception-vectors-on-non-SPL-b.patch @@ -16,7 +16,7 @@ that both config flags be be targeted using CONFIG_IS_ENABLED. Issue-Id: SCM-3728 Upstream-Status: Inappropriate [other] - Temporary patch + Implementation pending further discussion Signed-off-by: Peter Hoyes Change-Id: I0cf0fc6d7ef4d45791411cf1f67c65e198cc8b2b --- diff --git a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/fvp-baser-aemv8r64/0008-armv8-ARMV8_SWITCH_TO_EL1-improvements.patch b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/fvp-baser-aemv8r64/0008-armv8-ARMV8_SWITCH_TO_EL1-improvements.patch index 046636b5..8cbd1f8c 100644 --- a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/fvp-baser-aemv8r64/0008-armv8-ARMV8_SWITCH_TO_EL1-improvements.patch +++ b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/fvp-baser-aemv8r64/0008-armv8-ARMV8_SWITCH_TO_EL1-improvements.patch @@ -13,7 +13,7 @@ option. Issue-Id: SCM-3728 Upstream-Status: Inappropriate [other] - Temporary patch + Implementation pending further discussion Signed-off-by: Peter Hoyes Change-Id: If98478148d6d8d1f732acac5439276700614815f --- diff --git a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/fvp-baser-aemv8r64/0009-armv8-Make-disabling-HVC-configurable-when-switching.patch b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/fvp-baser-aemv8r64/0009-armv8-Make-disabling-HVC-configurable-when-switching.patch index b12e018f..f1d35d5a 100644 --- a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/fvp-baser-aemv8r64/0009-armv8-Make-disabling-HVC-configurable-when-switching.patch +++ b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/fvp-baser-aemv8r64/0009-armv8-Make-disabling-HVC-configurable-when-switching.patch @@ -12,7 +12,7 @@ control whether to disable HVC exceptions in HCR_EL2->HCD Issue-Id: SCM-3728 Upstream-Status: Inappropriate [other] - Temporary patch + Implementation pending further discussion Signed-off-by: Peter Hoyes Change-Id: I463d82f1db8a3cafcab40a9c0c208753569cc300 --- diff --git a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/fvp-baser-aemv8r64/0010-vexpress64-Do-not-set-COUNTER_FREQUENCY.patch b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/fvp-baser-aemv8r64/0010-vexpress64-Do-not-set-COUNTER_FREQUENCY.patch index 29120705..e63b28de 100644 --- a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/fvp-baser-aemv8r64/0010-vexpress64-Do-not-set-COUNTER_FREQUENCY.patch +++ b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/fvp-baser-aemv8r64/0010-vexpress64-Do-not-set-COUNTER_FREQUENCY.patch @@ -11,7 +11,7 @@ providing PSCI services). Issue-Id: SCM-3728 Upstream-Status: Inappropriate [other] - Temporary patch + Implementation pending further discussion Signed-off-by: Peter Hoyes Change-Id: I137473d721e58e4c348b9641f5b9778178d3bb65 --- diff --git a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/fvp-baser-aemv8r64/0011-vexpress64-Add-BASER_FVP-vexpress-board-variant.patch b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/fvp-baser-aemv8r64/0011-vexpress64-Add-BASER_FVP-vexpress-board-variant.patch index 36e820c1..8a990636 100644 --- a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/fvp-baser-aemv8r64/0011-vexpress64-Add-BASER_FVP-vexpress-board-variant.patch +++ b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/fvp-baser-aemv8r64/0011-vexpress64-Add-BASER_FVP-vexpress-board-variant.patch @@ -19,7 +19,7 @@ inverted from the BASE_FVP Issue-Id: SCM-3728 Upstream-Status: Inappropriate [other] - Temporary patch + Implementation pending further discussion Signed-off-by: Peter Hoyes Change-Id: Id173e52afad473abcf3f61c6bf374fc31f17edd3 ---