On Mon, Jun 05, 2017 at 06:55:12PM +0100, Supreeth Venkatesh wrote:
This patch corrects TOS_BIN Path from "Build/StandaloneSmmPkg/DEBUG_GCC49/FV/STANDALONESMM.fd" to "Build/StandaloneSmmPkg/DEBUG_GCC5/FV/STANDALONESMM.fd"so that normal world firmware image package(fip) is generated successfully.
Also, this patch adds commandline "SPM=1", when there is no secure payload dispatcher defined but TOS_BIN exists.
Signed-off-by: Supreeth Venkatesh supreeth.venkatesh@arm.com
atf-build.sh | 2 +- platforms.config | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/atf-build.sh b/atf-build.sh index 5c45708..1eb1c44 100755 --- a/atf-build.sh +++ b/atf-build.sh @@ -127,7 +127,7 @@ function build_platform if [ X"$SPD" == X"none" ] && [ X"$TOS_BIN" != X"" ]; then BL32=$EDK2_DIR/$TOS_BIN
SPD_OPTION="BL32=$BL32"
SPD_OPTION="SPM=1"diff --git a/platforms.config b/platforms.config index 0639583..82b959c 100644 --- a/platforms.config +++ b/platforms.config @@ -107,9 +107,9 @@ BUILD_ATF=debug UEFI_BIN=FVP_AARCH64_EFI.fd UEFI_IMAGE_DIR=ArmVExpress-FVP-AArch64-MM-Normal ATF_PLATFORM=fvp -TOS_BIN=Build/StandaloneSmmPkg/DEBUG_GCC49/FV/STANDALONESMM.fd +TOS_BIN=Build/StandaloneSmmPkg/DEBUG_GCC5/FV/STANDALONESMM.fd
Well, this was obviously a bit of a hack to begin with, but I didn't really care because the platform owner submitted it.
However, look at the documentation for this option, at the start of the file: # - TOS_BIN Trusted OS image to pass to ARM Trusted # Firmware. # The path is relative to # $EDK2_DIR/Build/$PLATFORM_IMAGE_DIR/$BUILD_PROFILE/FV/.
If this is no longer true, we should fix it to be - and then just use this relative path, like the [hikey] target. No hardwiring of toolchain profile needed.
/ Leif
ATF_SPD=none -ATF_BUILDFLAGS=ARM_BL31_IN_DRAM=1 SPM=1 +ATF_BUILDFLAGS=ARM_BL31_IN_DRAM=1 [tc2] LONGNAME=Versatile Express TC2 -- 2.7.4