meta-nuvoton: trusted-firmware-a: change tf-a load address
For compatible with the newest IGPS 3.9.1 design for new memory map.
We need to modify each image load address individually.
The load address of tf-a from 0x00001000 to 0x02000000
The load address of optee-os from 0x00100000 to 0x02100000
The load address of uboot from 0x03008000 to 0x06208000
We've updated tf-a to 2.8 that keep up with meta-arm.
Thus we remove 2.6.0.bb recipe and replace with 2.8.0.bbappend.
Tested: build pass and boot successfully.
Signed-off-by: Tim Lee <timlee660101@gmail.com>
Change-Id: I730f0a677103b89b78897f0d1860a47933c5b7cc
diff --git a/meta-nuvoton/conf/machine/include/npcm8xx.inc b/meta-nuvoton/conf/machine/include/npcm8xx.inc
index 0a753a1..35d6395 100644
--- a/meta-nuvoton/conf/machine/include/npcm8xx.inc
+++ b/meta-nuvoton/conf/machine/include/npcm8xx.inc
@@ -38,8 +38,6 @@
require conf/machine/include/arm/armv8a/tune-cortexa35.inc
-PREFERRED_VERSION_trusted-firmware-a = "2.6.0"
-
PREFERRED_VERSION_optee-os = "3.18.0"
PREFERRED_VERSION_optee-os-tadevkit = "3.18.0"
PREFERRED_VERSION_optee-test = "3.18.0"
diff --git a/meta-nuvoton/dynamic-layers/arm-layer/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.6.0.bb b/meta-nuvoton/dynamic-layers/arm-layer/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.6.0.bb
deleted file mode 100644
index af4572d..0000000
--- a/meta-nuvoton/dynamic-layers/arm-layer/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.6.0.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-require recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc
-
-# TF-A v2.6
-SRCREV_tfa = "a1f02f4f3daae7e21ee58b4c93ec3e46b8f28d15"
-
-LIC_FILES_CHKSUM += "file://docs/license.rst;md5=b2c740efedc159745b9b31f88ff03dde"
-
-# mbed TLS v2.28.0
-SRC_URI_MBEDTLS = "git://github.com/ARMmbed/mbedtls.git;name=mbedtls;protocol=https;destsuffix=git/mbedtls;branch=mbedtls-2.28"
-SRCREV_mbedtls = "8b3f26a5ac38d4fdccbc5c5366229f3e01dafcc0"
-
-LIC_FILES_CHKSUM_MBEDTLS = "file://mbedtls/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
diff --git a/meta-nuvoton/dynamic-layers/arm-layer/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.6.0.bbappend b/meta-nuvoton/dynamic-layers/arm-layer/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.6.0.bbappend
deleted file mode 100644
index 38b7853..0000000
--- a/meta-nuvoton/dynamic-layers/arm-layer/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.6.0.bbappend
+++ /dev/null
@@ -1,6 +0,0 @@
-SRC_URI:remove = "git://git.trustedfirmware.org/TF-A/trusted-firmware-a.git;protocol=https;name=tfa;branch=master"
-SRC_URI:append = "git://github.com/Nuvoton-Israel/arm-trusted-firmware.git;protocol=https;name=tfa;branch=nuvoton"
-SRCREV_tfa = "47ea2b50c8dd0b19217f70dc127299e23b0fe72c"
-
-# Enable no warning for loading segment with RWX permissions
-EXTRA_OEMAKE += "LDFLAGS='--no-warn-rwx-segments'"
diff --git a/meta-nuvoton/dynamic-layers/arm-layer/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.8.%.bbappend b/meta-nuvoton/dynamic-layers/arm-layer/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.8.%.bbappend
new file mode 100644
index 0000000..a1071dd
--- /dev/null
+++ b/meta-nuvoton/dynamic-layers/arm-layer/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.8.%.bbappend
@@ -0,0 +1,4 @@
+SRC_URI:remove = "git://git.trustedfirmware.org/TF-A/trusted-firmware-a.git;protocol=https;name=tfa;branch=master"
+SRC_URI:append = "git://github.com/Nuvoton-Israel/arm-trusted-firmware.git;protocol=https;name=tfa;branch=nuvoton"
+SRCREV_tfa = "009fd73ba58ac744bf9168e425afa19357ea331d"
+