From 0ffefa1f46bf95ef4fefe6df632583dbfff35fa3 Mon Sep 17 00:00:00 2001
From: Fathi Boudra <fathi.boudra@linaro.org>
Date: Mon, 22 Dec 2014 12:50:37 +0200
Subject: linaro-edk2-capsule: add startup.nsh

add startup.nsh to boot with LEG kernel
remove kernel/dtb overwrite (used for testing/stub purpose)

Change-Id: Ieadd0442a99d2074fb31cd553c54fd31a70be2b9
Signed-off-by: Fathi Boudra <fathi.boudra@linaro.org>
---
 linaro-edk2-capsule.yaml                                           | 2 ++
 .../lava-job-definitions/rtsm_fvp_base-aemv8a/template.json        | 7 ++-----
 .../lava-job-definitions/rtsm_fvp_base-aemv8a/template.yaml        | 6 ++----
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/linaro-edk2-capsule.yaml b/linaro-edk2-capsule.yaml
index ff0db6b3be..21213a94b6 100644
--- a/linaro-edk2-capsule.yaml
+++ b/linaro-edk2-capsule.yaml
@@ -96,6 +96,7 @@
             IMAGE_BUILD_NUMBER=`wget -q --no-check-certificate -O - https://ci.linaro.org/jenkins/job/linux-leg/lastSuccessfulBuild/buildNumber`
             cat << EOF > lava_job_definition_parameters
             IMAGE_URL=http://snapshots.linaro.org/kernel-hwpack/linux-leg-vexpress64/${IMAGE_BUILD_NUMBER}/vexpress64-leg-sd.img.gz
+            STARTUP_NSH=http://snapshots.linaro.org/kernel-hwpack/linux-leg-vexpress64/${IMAGE_BUILD_NUMBER}/startup.nsh
             EOF
         - inject:
             properties-file: lava_job_definition_parameters
@@ -111,6 +112,7 @@
                 -e "s|\${BUNDLE_STREAM_NAME}|${BUNDLE_STREAM_NAME}|" \
                 -e "s|\${BL1_URL}|${BL1_URL}|" \
                 -e "s|\${FIP_URL}|${FIP_URL}|" \
+                -e "s|\${STARTUP_NSH}|${STARTUP_NSH}|" \
                 -e "s|\${DEVICE_TYPE}|${DEVICE_TYPE}|" \
                 -e "s|\${GIT_BRANCH}|${GIT_BRANCH}|" \
                 -e "s|\${GIT_COMMIT}|${GIT_COMMIT}|" \
diff --git a/linaro-edk2-capsule/lava-job-definitions/rtsm_fvp_base-aemv8a/template.json b/linaro-edk2-capsule/lava-job-definitions/rtsm_fvp_base-aemv8a/template.json
index b0cd8ca7d1..2076db3ede 100644
--- a/linaro-edk2-capsule/lava-job-definitions/rtsm_fvp_base-aemv8a/template.json
+++ b/linaro-edk2-capsule/lava-job-definitions/rtsm_fvp_base-aemv8a/template.json
@@ -8,11 +8,8 @@
             "boot:/fvp": [
               "delete"
             ],
-            "http://people.linaro.org/~fu.wei/LAVA/test/UEFI/uefi_update_capsule/Image_leg_armv8_UpdateCapsule_test": [
-              "boot:/Image"
-            ],
-            "http://people.linaro.org/~fu.wei/LAVA/test/UEFI/uefi_update_capsule/fvp-base-gicv2-psci.dtb_UpdateCapsule_test": [
-              "boot:/fvp-base-gicv2-psci.dtb"
+            "${STARTUP_NSH}": [
+              "boot:/EFI/BOOT/startup.nsh"
             ],
             "${BL1_URL}": [
               "boot:/fvp_bl1.bin"
diff --git a/linaro-edk2-capsule/lava-job-definitions/rtsm_fvp_base-aemv8a/template.yaml b/linaro-edk2-capsule/lava-job-definitions/rtsm_fvp_base-aemv8a/template.yaml
index c8e36fe762..6f6a75a21f 100644
--- a/linaro-edk2-capsule/lava-job-definitions/rtsm_fvp_base-aemv8a/template.yaml
+++ b/linaro-edk2-capsule/lava-job-definitions/rtsm_fvp_base-aemv8a/template.yaml
@@ -5,10 +5,8 @@ actions:
       customize:
         'boot:/fvp':
         - 'delete'
-        'http://people.linaro.org/~fu.wei/LAVA/test/UEFI/uefi_update_capsule/Image_leg_armv8_UpdateCapsule_test':
-        - 'boot:/Image'
-        'http://people.linaro.org/~fu.wei/LAVA/test/UEFI/uefi_update_capsule/fvp-base-gicv2-psci.dtb_UpdateCapsule_test':
-        - 'boot:/fvp-base-gicv2-psci.dtb'
+        '${STARTUP_NSH}':
+        - 'boot:/EFI/BOOT/startup.nsh'
         '${BL1_URL}':
         - 'boot:/fvp_bl1.bin'
         '${FIP_URL}':
-- 
cgit v1.2.3