meta-nuvoton: trusted-firmware-a: update to v2.10
Remove PREFERRED_VERSION_trusted-firmware-a ?= "2.9.%" in npcm8xx.inc,
and create a new 2.10.%.bbappend to align current version in arm layer.
Tested:
Device can boot successfully with correct version as below:
NOTICE: BL31: v2.10.0(release)
Signed-off-by: Tim Lee <timlee660101@gmail.com>
Change-Id: Ie62df7a91f359eac94696b6033543a3a6ef439e3
diff --git a/meta-nuvoton/conf/machine/include/npcm8xx.inc b/meta-nuvoton/conf/machine/include/npcm8xx.inc
index a0f347c..96fed00 100644
--- a/meta-nuvoton/conf/machine/include/npcm8xx.inc
+++ b/meta-nuvoton/conf/machine/include/npcm8xx.inc
@@ -47,7 +47,6 @@
COMPATIBLE_MACHINE:npcm8xx = "npcm8xx"
TFA_PLATFORM = "npcm845x"
-PREFERRED_VERSION_trusted-firmware-a ?= "2.9.%"
# Nuvoton prefers optee for BL32.
TFA_SPD = "opteed"
diff --git a/meta-nuvoton/dynamic-layers/arm-layer/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.10.%.bbappend b/meta-nuvoton/dynamic-layers/arm-layer/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.10.%.bbappend
new file mode 100644
index 0000000..c27ec5b
--- /dev/null
+++ b/meta-nuvoton/dynamic-layers/arm-layer/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.10.%.bbappend
@@ -0,0 +1,3 @@
+SRC_URI:remove = "${SRC_URI_TRUSTED_FIRMWARE_A};name=tfa;branch=${SRCBRANCH}"
+SRC_URI:append = "git://github.com/Nuvoton-Israel/arm-trusted-firmware.git;protocol=https;name=tfa;branch=npcm_2_10"
+SRCREV_tfa = "bd1389a26c3db06353b24aaaf8276b3d6723a801"
diff --git a/meta-nuvoton/dynamic-layers/arm-layer/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.9.%.bbappend b/meta-nuvoton/dynamic-layers/arm-layer/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.9.%.bbappend
deleted file mode 100644
index cfbbc65..0000000
--- a/meta-nuvoton/dynamic-layers/arm-layer/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.9.%.bbappend
+++ /dev/null
@@ -1,3 +0,0 @@
-SRC_URI:remove = "${SRC_URI_TRUSTED_FIRMWARE_A};name=tfa;branch=${SRCBRANCH}"
-SRC_URI:append = "git://github.com/Nuvoton-Israel/arm-trusted-firmware.git;protocol=https;name=tfa;branch=nuvoton"
-SRCREV_tfa = "ef86e361efaa8d59cb12bcf2dfc88c9994a8a16e"