From 7ab9118d243141b319bb29d7f04361747ea229d9 Mon Sep 17 00:00:00 2001
From: Leif Lindholm <leif.lindholm@linaro.org>
Date: Mon, 3 Sep 2018 20:21:32 +0100
Subject: update build hashes and platform.conf for 2018.08 releases

Drop cello and overdrive platforms from this build, since we have
iasl compatibility issues between those and d06. We may bring those
back in later releases.

Update hashes - for edk, use the first stable tag!

Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org>
---
 build.sh         |  8 ++++----
 platforms.config | 43 +++++++++++++++++++++++++++----------------
 2 files changed, 31 insertions(+), 20 deletions(-)

diff --git a/build.sh b/build.sh
index 1ce9781..f2e2665 100755
--- a/build.sh
+++ b/build.sh
@@ -10,10 +10,10 @@ EDK2_NON_OSI_REPO=https://github.com/tianocore/edk2-non-osi.git
 UEFI_TOOLS_REPO=https://git.linaro.org/uefi/uefi-tools.git
 
 ARM_TF_HASH=9fd2f13bd608832260300640970f73c62357c684
-EDK2_HASH=6791175f058837b621623d4adf873fcf8cb20e10
-EDK2_PLATFORMS_HASH=a235eabe39fbd458734fa69d38332317c9f7cf11
-EDK2_NON_OSI_HASH=1aaec6758370c441b91e79c6430f7c3a56d55130
-UEFI_TOOLS_HASH=bcaa91c87f170c6de629f57cee06ce1368249a3e
+EDK2_HASH=edk2-stable201808
+EDK2_PLATFORMS_HASH=8c3914c90ecdcd0360b6ecd757a5b29d4e208736
+EDK2_NON_OSI_HASH=572f1053331c3e261e883b51ee66b809ee79a61f
+UEFI_TOOLS_HASH=861ab72179c2ec8cbd5923bfcbd86a9e26b9f2f7
 
 config_git()
 {
diff --git a/platforms.config b/platforms.config
index 11455c6..055fe9d 100644
--- a/platforms.config
+++ b/platforms.config
@@ -54,6 +54,9 @@
 # - TOS_BUILDFLAGS	Any special flags you want to pass to the Trusted OS
 #			build command.
 # - EXTRA_FILES		Any additional files to be copied to output dir.
+# - EXEC_FILES          Any additional files to be copied - relative to <ARCH>
+#                       directory in target build root (<TARGET>_<TOOLCHAIN>)
+#                       instead of FV dir.
 # - PREBUILD_CMDS	Any commands you want to execute before the build step.
 # - POSTBUILD_CMDS	Any commands you want to execute after the build step.
 # - PACKAGES_PATH	Additional directories to search for packages under.
@@ -71,22 +74,6 @@ BUILD_ATF=yes
 UEFI_BIN=FVP_AARCH64_EFI.fd
 UEFI_IMAGE_DIR=ArmVExpress-FVP-AArch64
 
-[overdrive]
-LONGNAME=AMD Overdrive
-BUILDFLAGS=-D DO_CAPSULE=1
-DSC=Platform/AMD/OverdriveBoard/OverdriveBoard.dsc
-ARCH=AARCH64
-UEFI_BIN=STYX_ROM.fd
-UEFI_IMAGE_DIR=Overdrive
-EXTRA_FILES=STYXFIRMWAREUPDATECAPSULEFMPPKCS7.Cap
-
-[cello]
-LONGNAME=LeMaker Cello
-DSC=Platform/LeMaker/CelloBoard/CelloBoard.dsc
-ARCH=AARCH64
-UEFI_BIN=STYX_ROM.fd
-UEFI_IMAGE_DIR=Cello
-
 [d03]
 LONGNAME=Hisilicon D03
 DSC=Platform/Hisilicon/D03/D03.dsc
@@ -103,6 +90,14 @@ UEFI_BIN=D05.fd
 UEFI_IMAGE_DIR=D05
 EXTRA_FILES=D05FIRMWAREUPDATECAPSULEFMPPKCS7.Cap
 
+[d06]
+LONGNAME=HiSilicon D06
+DSC=Platform/Hisilicon/D06/D06.dsc
+ARCH=AARCH64
+UEFI_BIN=D06.fd
+UEFI_IMAGE_DIR=D06
+EXTRA_FILES=D06FIRMWAREUPDATECAPSULEFMPPKCS7.Cap
+
 [qemu-arm]                  
 LONGNAME=QEMU ARM Emulator
 DSC=ArmVirtPkg/ArmVirtQemu.dsc
@@ -126,3 +121,19 @@ ARCH=AARCH64
 UEFI_BIN=SPI_NOR_IMAGE.fd
 UEFI_IMAGE_DIR=DeveloperBox
 EXTRA_FILES=SYNQUACERFIRMWAREUPDATECAPSULEFMPPKCS7.Cap
+
+[capsuleapp]
+LONGNAME=EDK2 Capsule Update application (64-bit)
+DSC=MdeModulePkg/MdeModulePkg.dsc
+INF=MdeModulePkg/Application/CapsuleApp/CapsuleApp.inf
+ARCH=AARCH64
+UEFI_IMAGE_DIR=MdeModule
+EXEC_FILES=CapsuleApp.efi
+
+[capsuleapp32]
+LONGNAME=EDK2 Capsule Update application (32-bit)
+DSC=MdeModulePkg/MdeModulePkg.dsc
+INF=MdeModulePkg/Application/CapsuleApp/CapsuleApp.inf
+ARCH=ARM
+UEFI_IMAGE_DIR=MdeModule
+EXEC_FILES=CapsuleApp.efi
-- 
cgit v1.2.3