96boards-reference-uefi: adding firmware for overdrive and husky

Change-Id: Iacfe8543e6655459f985ae0bab32458c8cd39f84
Signed-off-by: Ricardo Salveti <ricardo.salveti@linaro.org>

1 files changed, 44 insertions, 9 deletions

diff --git a/96boards-reference-uefi.yaml b/96boards-reference-uefi.yaml
index d1a2aa67..3d22becd 100644
--- a/96boards-reference-uefi.yaml
+++ b/96boards-reference-uefi.yaml
@@ -38,6 +38,8 @@
                 - hikey
                 - d02
                 - juno
+                - styx
+                - husky
         - axis:
             type: user-defined
             name: MX_TYPE
@@ -155,10 +157,12 @@
                 ATF_GIT_VERSION=873e19dde34efec93a1dd4c6de060ccde57418a0
                 OPEN_PLATFORM_PKG_GIT_URL=https://github.com/96boards-hikey/OpenPlatformPkg.git
                 OPEN_PLATFORM_PKG_GIT_BRANCH=hikey-aosp
-            elif [ "${MX_PLATFORM}" == "styx" ]; then
+            elif [ "${MX_PLATFORM}" == "styx" -o "${MX_PLATFORM}" == "husky" ]; then
                 EDK2_GIT_URL=ssh://dev-private-git.linaro.org/96boards/edk2.git
-                EDK2_GIT_VERSION=HEAD
+                EDK2_GIT_VERSION=811e9249f29c2c4880af293b205ad28c96f0812e
+                ATF_GIT_VERSION=6e9fa3866d2f6382bec5f3e2a215351386a3331b
                 OPEN_PLATFORM_PKG_GIT_URL=ssh://dev-private-git.linaro.org/96boards/OpenPlatformPkg.git
+                OPEN_PLATFORM_PKG_GIT_BRANCH=dev-FDK101
             elif [ "${MX_PLATFORM}" == "d02" ]; then
                 EDK2_GIT_VERSION=d0d34cdf1d2752f0d7c3ca41af7e7ed29c221d11
                 OPEN_PLATFORM_PKG_GIT_BRANCH=d02-release
@@ -188,8 +192,8 @@
             export JENKINS_WORKSPACE=${WORKSPACE}
 
             # Board specific setup
-            if [ "${MX_PLATFORM}" == "styx" ]; then
-                git clone -b FDK84 --depth 1 ssh://dev-private-git.linaro.org/96boards/SeattleFDK.git
+            if [ "${MX_PLATFORM}" == "styx" -o "${MX_PLATFORM}" == "husky" ]; then
+                git clone -b dev-FDK1_0_0_1 --depth 1 ssh://dev-private-git.linaro.org/96boards/SeattleFDK.git
                 cd $EDK2_DIR; ln -s ../SeattleFDK/AmdModulePkg; cd ..
             fi
 
@@ -198,7 +202,7 @@
 
             # Build UEFI for the desired platform, with the specified build type
             cd ${EDK2_DIR}
-            bash -x ${UEFI_TOOLS_DIR}/uefi-build.sh -b ${MX_TYPE} -a $ATF_DIR ${MX_PLATFORM}
+            bash -x ${UEFI_TOOLS_DIR}/uefi-build.sh -b ${MX_TYPE} -a ${ATF_DIR} ${MX_PLATFORM}
 
             unset WORKSPACE
             export WORKSPACE=${JENKINS_WORKSPACE}
@@ -214,6 +218,13 @@
                 cp -a ${EDK2_DIR}/Build/${IMAGE_DIR}/${MX_TYPE}_*/FV/${image} out/${BUILD_TYPE}/
             done
 
+            cat > out/${BUILD_TYPE}/BUILD-INFO.txt << EOF
+            Format-Version: 0.5
+
+            Files-Pattern: *
+            License-Type: open
+            EOF
+
             if [ "${MX_PLATFORM}" == "hikey" ]; then
                 # Additional components for hikey, such as fastboot and l-loader
                 cp -a ${EDK2_DIR}/Build/${IMAGE_DIR}/${MX_TYPE}_*/AARCH64/AndroidFastbootApp.efi out/${BUILD_TYPE}
@@ -226,10 +237,33 @@
                 wget https://raw.githubusercontent.com/96boards/burn-boot/master/hisi-idt.py -O ${WORKSPACE}/out/${BUILD_TYPE}/hisi-idt.py
                 # Ship nvme.img with UEFI binaries for convenience
                 dd if=/dev/zero of=${WORKSPACE}/out/${BUILD_TYPE}/nvme.img bs=128 count=1024
-            elif [ "${MX_PLATFORM}" == "styx" ]; then
-                cd ${WORKSPACE}/${BUILD_NUMBER}/SeattleFDK
-                Linaro/make-rom.sh ${EDK2_DIR}/Build/${IMAGE_DIR}/${MX_TYPE}_*/FV/${IMAGES} >/dev/null
-                cp Linaro/Styx.bin ${WORKSPACE}/out/${BUILD_TYPE}
+            elif [ "${MX_PLATFORM}" == "styx" -o "${MX_PLATFORM}" == "husky" ]; then
+                # Build ARM Trusted Firmware
+                cd ${WORKSPACE}/${BUILD_NUMBER}/SeattleFDK/AmdTrustedFirmwarePkg
+                ln -s ${ATF_DIR} arm-trusted-firmware
+                cp -a Overdrive plat arm-trusted-firmware/
+                cd arm-trusted-firmware; CROSS_COMPILE=aarch64-linux-gnu- make -f Override/Makefile PLAT=seattle EMULATION=0
+                # For the README.textile
+                BUILD_ATF="yes"
+
+                # Make ROM private for now
+                cat > out/${BUILD_TYPE}/BUILD-INFO.txt << EOF
+            Format-Version: 0.5
+
+            Files-Pattern: *
+            License-Type: protected
+            Auth-Groups: employees
+            EOF
+
+                # Build ROM
+                cd ${WORKSPACE}/${BUILD_NUMBER}/SeattleFDK/Linaro
+                if [ "${MX_PLATFORM}" == "styx" ]; then
+                    FLASH_CONFIG="ScpDirectory-Overdrive.txt"
+                elif [ "${MX_PLATFORM}" == "husky" ]
+                    FLASH_CONFIG="ScpDirectory-Husky.txt"
+                fi
+                ./make-rom.sh ${FLASH_CONFIG} ${EDK2_DIR}/Build/${IMAGE_DIR}/${MX_TYPE}_*/FV/${IMAGES} >/dev/null
+                cp Styx.bin ${WORKSPACE}/out/${BUILD_TYPE}
             fi
             cd ${WORKSPACE}
 
@@ -266,6 +300,7 @@
             wget https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
             time python ${HOME}/bin/linaro-cp.py \
               --server ${PUBLISH_SERVER} \
+              --build-info out/${BUILD_TYPE}/BUILD-INFO.txt \
               out/${BUILD_TYPE} snapshots/reference-platform/components/uefi/${BUILD_NUMBER}/${BUILD_TYPE}/${MX_PLATFORM}/
             python ${HOME}/bin/linaro-cp.py \
               --server ${PUBLISH_SERVER} \