From 205e4bb760fff1d74474810e5d408cdaddcae948 Mon Sep 17 00:00:00 2001 From: Damodar Santhapuri Date: Fri, 26 Mar 2021 12:44:31 +0000 Subject: [PATCH] arm-bsp/juno: move scp-firmware version from 2.6 to 2.7 Move scp-firmware version to 2.7 for juno platform Change-Id: I7ff1132c1e6a6fee047a268da2d991f81074e672 Signed-off-by: Damodar Santhapuri Signed-off-by: Jon Mason --- meta-arm-bsp/conf/machine/juno.conf | 2 +- .../recipes-bsp/scp-firmware/scp-firmware_2.6%.bbappend | 2 -- .../recipes-bsp/scp-firmware/scp-firmware_2.7%.bbappend | 1 + 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/meta-arm-bsp/conf/machine/juno.conf b/meta-arm-bsp/conf/machine/juno.conf index 0e84dd30..b5959b3f 100644 --- a/meta-arm-bsp/conf/machine/juno.conf +++ b/meta-arm-bsp/conf/machine/juno.conf @@ -20,7 +20,7 @@ SERIAL_CONSOLES = "115200;ttyAMA0" # Use kernel provided by yocto PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" PREFERRED_VERSION_linux-yocto ?= "5.4%" -PREFERRED_VERSION_scp-firmware ?= "2.6%" +PREFERRED_VERSION_scp-firmware ?= "2.7%" PREFERRED_VERSION_trusted-firmware-a ?= "2.4%" PREFERRED_VERSION_u-boot ?= "2020.07" 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 1ddb4974..0d71e555 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,6 +2,4 @@ MACHINE_SCP_REQUIRE ?= "" -MACHINE_SCP_REQUIRE_juno = "scp-firmware-juno.inc" - require ${MACHINE_SCP_REQUIRE} 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 index 443c293f..b419064f 100644 --- 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 @@ -2,6 +2,7 @@ MACHINE_SCP_REQUIRE ?= "" +MACHINE_SCP_REQUIRE_juno = "scp-firmware-juno.inc" MACHINE_SCP_REQUIRE_n1sdp = "scp-firmware-n1sdp.inc" MACHINE_SCP_REQUIRE_sgi575 = "scp-firmware-sgi575.inc" MACHINE_SCP_REQUIRE_tc0 = "scp-firmware-tc0.inc"