* [PATCH 1/2] arm-bsp/scp-firmware: Update N1SDP SCP firmware to 2.7.0
@ 2020-12-08 11:02 Ross Burton
2020-12-08 11:02 ` [PATCH 2/2] arm-bsp/trusted-firmware-a: move N1SDP to TF-A 2.4 Ross Burton
2020-12-09 15:12 ` [meta-arm] [PATCH 1/2] arm-bsp/scp-firmware: Update N1SDP SCP firmware to 2.7.0 Jon Mason
0 siblings, 2 replies; 3+ messages in thread
From: Ross Burton @ 2020-12-08 11:02 UTC (permalink / raw)
To: meta-arm
From: Khasim Syed Mohammed <khasim.mohammed@arm.com>
SCP firmware recipes are updated to build SCP firmware version 2.7.0 for N1SDP
Change-Id: Ic42fac178cf4ac9e87127e9b6258c9bd15101906
Signed-off-by: Khasim Syed Mohammed <khasim.mohammed@arm.com>
---
meta-arm-bsp/conf/machine/n1sdp.conf | 2 +-
.../recipes-bsp/scp-firmware/scp-firmware-n1sdp.inc | 3 ---
.../recipes-bsp/scp-firmware/scp-firmware_2.6%.bbappend | 1 -
.../recipes-bsp/scp-firmware/scp-firmware_2.7%.bbappend | 7 +++++++
4 files changed, 8 insertions(+), 5 deletions(-)
create mode 100644 meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware_2.7%.bbappend
diff --git a/meta-arm-bsp/conf/machine/n1sdp.conf b/meta-arm-bsp/conf/machine/n1sdp.conf
index 1f11acd..441d8c6 100644
--- a/meta-arm-bsp/conf/machine/n1sdp.conf
+++ b/meta-arm-bsp/conf/machine/n1sdp.conf
@@ -31,7 +31,7 @@ PREFERRED_VERSION_trusted-firmware-a ?= "2.3%"
EXTRA_IMAGEDEPENDS += "virtual/trusted-firmware-a"
EXTRA_IMAGEDEPENDS += "virtual/control-processor-firmware"
-PREFERRED_VERSION_scp-firmware ?= "2.6%"
+PREFERRED_VERSION_scp-firmware ?= "2.7%"
#UEFI EDK2 firmware
EXTRA_IMAGEDEPENDS += "virtual/uefi-firmware"
diff --git a/meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware-n1sdp.inc b/meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware-n1sdp.inc
index efa3acb..635ec39 100644
--- a/meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware-n1sdp.inc
+++ b/meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware-n1sdp.inc
@@ -1,6 +1,5 @@
# N1SDP specific SCP configurations and build instructions
-SRCREV = "350be71a2ecef588b8ff5a095a0840de23506e45"
SCP_PLATFORM = "n1sdp"
SCP_LOG_LEVEL = "INFO"
@@ -12,8 +11,6 @@ SRC_URI_append = " \
COMPATIBLE_MACHINE_n1sdp = "n1sdp"
-PV = "2.6.0+git${SRCPV}"
-
DEPENDS += "fiptool-native"
DEPENDS += "virtual/trusted-firmware-a"
diff --git a/meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware_2.6%.bbappend b/meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware_2.6%.bbappend
index b760ba7..06b236b 100644
--- a/meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware_2.6%.bbappend
+++ b/meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware_2.6%.bbappend
@@ -2,7 +2,6 @@
MACHINE_SCP_REQUIRE ?= ""
-MACHINE_SCP_REQUIRE_n1sdp = "scp-firmware-n1sdp.inc"
MACHINE_SCP_REQUIRE_tc0 = "scp-firmware-tc0.inc"
MACHINE_SCP_REQUIRE_juno = "scp-firmware-juno.inc"
MACHINE_SCP_REQUIRE_sgi575 = "scp-firmware-sgi575.inc"
diff --git a/meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware_2.7%.bbappend b/meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware_2.7%.bbappend
new file mode 100644
index 0000000..53bd022
--- /dev/null
+++ b/meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware_2.7%.bbappend
@@ -0,0 +1,7 @@
+# Include machine specific SCP configurations
+
+MACHINE_SCP_REQUIRE ?= ""
+
+MACHINE_SCP_REQUIRE_n1sdp = "scp-firmware-n1sdp.inc"
+
+require ${MACHINE_SCP_REQUIRE}
--
2.25.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH 2/2] arm-bsp/trusted-firmware-a: move N1SDP to TF-A 2.4
2020-12-08 11:02 [PATCH 1/2] arm-bsp/scp-firmware: Update N1SDP SCP firmware to 2.7.0 Ross Burton
@ 2020-12-08 11:02 ` Ross Burton
2020-12-09 15:12 ` [meta-arm] [PATCH 1/2] arm-bsp/scp-firmware: Update N1SDP SCP firmware to 2.7.0 Jon Mason
1 sibling, 0 replies; 3+ messages in thread
From: Ross Burton @ 2020-12-08 11:02 UTC (permalink / raw)
To: meta-arm
Change-Id: I85a7b9421a6d5267c778c164b8f0e0bdd24b8407
Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Khasim Syed Mohammed <khasim.mohammed@arm.com>
---
meta-arm-bsp/conf/machine/n1sdp.conf | 4 +---
...sdp-arm-tf-disable-workaround-for-N1-Erratum-13157.patch | 1 +
.../trusted-firmware-a/trusted-firmware-a-n1sdp.inc | 6 ------
.../trusted-firmware-a/trusted-firmware-a_2.3.bbappend | 1 -
.../trusted-firmware-a/trusted-firmware-a_2.4.bbappend | 1 +
5 files changed, 3 insertions(+), 10 deletions(-)
diff --git a/meta-arm-bsp/conf/machine/n1sdp.conf b/meta-arm-bsp/conf/machine/n1sdp.conf
index 441d8c6..acb0f5c 100644
--- a/meta-arm-bsp/conf/machine/n1sdp.conf
+++ b/meta-arm-bsp/conf/machine/n1sdp.conf
@@ -24,9 +24,7 @@ PREFERRED_VERSION_linux-linaro-arm ?= "5.4%"
# RTL8168E Gigabit Ethernet Controller is attached to the PCIe interface
MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "linux-firmware-rtl8168"
-# Trusted firmware v2.3 version
-PREFERRED_PROVIDER_virtual/trusted-firmware-a ?= "trusted-firmware-a"
-PREFERRED_VERSION_trusted-firmware-a ?= "2.3%"
+PREFERRED_VERSION_trusted-firmware-a ?= "2.4%"
EXTRA_IMAGEDEPENDS += "virtual/trusted-firmware-a"
EXTRA_IMAGEDEPENDS += "virtual/control-processor-firmware"
diff --git a/meta-arm-bsp/recipes-bsp/trusted-firmware-a/files/n1sdp/0001-n1sdp-arm-tf-disable-workaround-for-N1-Erratum-13157.patch b/meta-arm-bsp/recipes-bsp/trusted-firmware-a/files/n1sdp/0001-n1sdp-arm-tf-disable-workaround-for-N1-Erratum-13157.patch
index 53a6616..c199a7b 100644
--- a/meta-arm-bsp/recipes-bsp/trusted-firmware-a/files/n1sdp/0001-n1sdp-arm-tf-disable-workaround-for-N1-Erratum-13157.patch
+++ b/meta-arm-bsp/recipes-bsp/trusted-firmware-a/files/n1sdp/0001-n1sdp-arm-tf-disable-workaround-for-N1-Erratum-13157.patch
@@ -26,6 +26,7 @@ software running on N1 SDP, including those that do not require mitigation.
This patch is meant for performance evaluation purposes ONLY and should not
be used for software that requires a seccomp computing environment.
+Upstream-Status: Inappropriate
Signed-off-by: James Yang <James.Yang@arm.com>
---
plat/arm/board/n1sdp/platform.mk | 2 ++
diff --git a/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-n1sdp.inc b/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-n1sdp.inc
index f9cb288..fbc4358 100644
--- a/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-n1sdp.inc
+++ b/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-n1sdp.inc
@@ -8,12 +8,6 @@ TFA_DEBUG = "1"
TFA_MBEDTLS = "0"
TFA_UBOOT = "0"
-SRCREV_tfa = "dffd5192df41e77e27bb524bfe64d747c1c43522"
-
SRC_URI_append = " \
file://0001-n1sdp-arm-tf-disable-workaround-for-N1-Erratum-13157.patch \
"
-# This is incorporated into the SRCREV above
-SRC_URI_remove = "file://0001-fdts-a5ds-Fix-for-the-system-timer-issue.patch"
-
-PV = "2.3+git${SRCPV}"
diff --git a/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.3.bbappend b/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.3.bbappend
index 7048097..f1908f8 100644
--- a/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.3.bbappend
+++ b/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.3.bbappend
@@ -3,7 +3,6 @@
MACHINE_TFA_REQUIRE ?= ""
MACHINE_TFA_REQUIRE_tc0 = "trusted-firmware-a-tc0.inc"
MACHINE_TFA_REQUIRE_corstone500 = "trusted-firmware-a-corstone500.inc"
-MACHINE_TFA_REQUIRE_n1sdp = "trusted-firmware-a-n1sdp.inc"
MACHINE_TFA_REQUIRE_juno = "trusted-firmware-a-juno.inc"
MACHINE_TFA_REQUIRE_corstone700 = "trusted-firmware-a-corstone700.inc"
diff --git a/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.4.bbappend b/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.4.bbappend
index 4a89fd5..944dd7a 100644
--- a/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.4.bbappend
+++ b/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.4.bbappend
@@ -3,5 +3,6 @@
MACHINE_TFA_REQUIRE ?= ""
MACHINE_TFA_REQUIRE_fvp-base = "trusted-firmware-a-fvp.inc"
MACHINE_TFA_REQUIRE_fvp-base-arm32 = "trusted-firmware-a-fvp-arm32.inc"
+MACHINE_TFA_REQUIRE_n1sdp = "trusted-firmware-a-n1sdp.inc"
require ${MACHINE_TFA_REQUIRE}
--
2.25.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [meta-arm] [PATCH 1/2] arm-bsp/scp-firmware: Update N1SDP SCP firmware to 2.7.0
2020-12-08 11:02 [PATCH 1/2] arm-bsp/scp-firmware: Update N1SDP SCP firmware to 2.7.0 Ross Burton
2020-12-08 11:02 ` [PATCH 2/2] arm-bsp/trusted-firmware-a: move N1SDP to TF-A 2.4 Ross Burton
@ 2020-12-09 15:12 ` Jon Mason
1 sibling, 0 replies; 3+ messages in thread
From: Jon Mason @ 2020-12-09 15:12 UTC (permalink / raw)
To: Ross Burton; +Cc: meta-arm
On Tue, Dec 08, 2020 at 11:02:21AM +0000, Ross Burton wrote:
> From: Khasim Syed Mohammed <khasim.mohammed@arm.com>
>
> SCP firmware recipes are updated to build SCP firmware version 2.7.0 for N1SDP
>
> Change-Id: Ic42fac178cf4ac9e87127e9b6258c9bd15101906
> Signed-off-by: Khasim Syed Mohammed <khasim.mohammed@arm.com>
Applied to master.
Thanks,
Jon
> ---
> meta-arm-bsp/conf/machine/n1sdp.conf | 2 +-
> .../recipes-bsp/scp-firmware/scp-firmware-n1sdp.inc | 3 ---
> .../recipes-bsp/scp-firmware/scp-firmware_2.6%.bbappend | 1 -
> .../recipes-bsp/scp-firmware/scp-firmware_2.7%.bbappend | 7 +++++++
> 4 files changed, 8 insertions(+), 5 deletions(-)
> create mode 100644 meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware_2.7%.bbappend
>
> diff --git a/meta-arm-bsp/conf/machine/n1sdp.conf b/meta-arm-bsp/conf/machine/n1sdp.conf
> index 1f11acd..441d8c6 100644
> --- a/meta-arm-bsp/conf/machine/n1sdp.conf
> +++ b/meta-arm-bsp/conf/machine/n1sdp.conf
> @@ -31,7 +31,7 @@ PREFERRED_VERSION_trusted-firmware-a ?= "2.3%"
> EXTRA_IMAGEDEPENDS += "virtual/trusted-firmware-a"
> EXTRA_IMAGEDEPENDS += "virtual/control-processor-firmware"
>
> -PREFERRED_VERSION_scp-firmware ?= "2.6%"
> +PREFERRED_VERSION_scp-firmware ?= "2.7%"
>
> #UEFI EDK2 firmware
> EXTRA_IMAGEDEPENDS += "virtual/uefi-firmware"
> diff --git a/meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware-n1sdp.inc b/meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware-n1sdp.inc
> index efa3acb..635ec39 100644
> --- a/meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware-n1sdp.inc
> +++ b/meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware-n1sdp.inc
> @@ -1,6 +1,5 @@
> # N1SDP specific SCP configurations and build instructions
>
> -SRCREV = "350be71a2ecef588b8ff5a095a0840de23506e45"
> SCP_PLATFORM = "n1sdp"
> SCP_LOG_LEVEL = "INFO"
>
> @@ -12,8 +11,6 @@ SRC_URI_append = " \
>
> COMPATIBLE_MACHINE_n1sdp = "n1sdp"
>
> -PV = "2.6.0+git${SRCPV}"
> -
> DEPENDS += "fiptool-native"
> DEPENDS += "virtual/trusted-firmware-a"
>
> diff --git a/meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware_2.6%.bbappend b/meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware_2.6%.bbappend
> index b760ba7..06b236b 100644
> --- a/meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware_2.6%.bbappend
> +++ b/meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware_2.6%.bbappend
> @@ -2,7 +2,6 @@
>
> MACHINE_SCP_REQUIRE ?= ""
>
> -MACHINE_SCP_REQUIRE_n1sdp = "scp-firmware-n1sdp.inc"
> MACHINE_SCP_REQUIRE_tc0 = "scp-firmware-tc0.inc"
> MACHINE_SCP_REQUIRE_juno = "scp-firmware-juno.inc"
> MACHINE_SCP_REQUIRE_sgi575 = "scp-firmware-sgi575.inc"
> diff --git a/meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware_2.7%.bbappend b/meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware_2.7%.bbappend
> new file mode 100644
> index 0000000..53bd022
> --- /dev/null
> +++ b/meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware_2.7%.bbappend
> @@ -0,0 +1,7 @@
> +# Include machine specific SCP configurations
> +
> +MACHINE_SCP_REQUIRE ?= ""
> +
> +MACHINE_SCP_REQUIRE_n1sdp = "scp-firmware-n1sdp.inc"
> +
> +require ${MACHINE_SCP_REQUIRE}
> --
> 2.25.1
>
>
>
>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-12-09 15:12 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-12-08 11:02 [PATCH 1/2] arm-bsp/scp-firmware: Update N1SDP SCP firmware to 2.7.0 Ross Burton
2020-12-08 11:02 ` [PATCH 2/2] arm-bsp/trusted-firmware-a: move N1SDP to TF-A 2.4 Ross Burton
2020-12-09 15:12 ` [meta-arm] [PATCH 1/2] arm-bsp/scp-firmware: Update N1SDP SCP firmware to 2.7.0 Jon Mason
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.