diff options
| author | Fathi Boudra <fathi.boudra@linaro.org> | 2014-12-22 15:36:25 +0200 |
|---|---|---|
| committer | Fathi Boudra <fathi.boudra@linaro.org> | 2014-12-22 15:36:25 +0200 |
| commit | c83c92aae76cba20f91b4b0d75285e131dfd4b0b (patch) | |
| tree | 203d3347ecc3a7a9cfcfd04e252aeecdbe0f50ef /linaro-edk2 | |
| parent | 0ffefa1f46bf95ef4fefe6df632583dbfff35fa3 (diff) | |
linaro-edk2: update grub-install template to use startup.nsh
Use the startup.nsh script shipped from linux-leg build jobs.
It makes the grub-install template common to linux-leg, linaro-edk2 and
linaro-edk2 jobs.
Change-Id: Ib464cee5552efd45f546f0fac5fc8ddbab9d0826
Signed-off-by: Fathi Boudra <fathi.boudra@linaro.org>
Diffstat (limited to 'linaro-edk2')
| -rw-r--r-- | linaro-edk2/lava-job-definitions/rtsm_fvp_base-aemv8a/template-grub-install.json | 21 |
1 files changed, 5 insertions, 16 deletions
diff --git a/linaro-edk2/lava-job-definitions/rtsm_fvp_base-aemv8a/template-grub-install.json b/linaro-edk2/lava-job-definitions/rtsm_fvp_base-aemv8a/template-grub-install.json index a90549e2..9bb5ce00 100644 --- a/linaro-edk2/lava-job-definitions/rtsm_fvp_base-aemv8a/template-grub-install.json +++ b/linaro-edk2/lava-job-definitions/rtsm_fvp_base-aemv8a/template-grub-install.json @@ -14,6 +14,9 @@ "${INITRD_URL}": [ "boot:/Initrd" ], + "${STARTUP_NSH}": [ + "boot:/EFI/BOOT/startup.nsh" + ], "${BL1_URL}": [ "boot:/fvp_bl1.bin" ], @@ -35,23 +38,9 @@ "command": "boot_linaro_image", "parameters": { "boot_cmds": [ - "sendline 3", - "expect Choice:", - "sendline 1", - "expect Select the Boot Device:", "sendline 2", - "expect File path of the EFI Application or the kernel:", - "sendline Image", - "expect Is your application an OS loader? [y/n]", - "sendline n", - "expect Arguments to pass to the EFI Application:", - "sendline console=ttySBSA0 earlycon=pl011,0x1c090000 debug uefi_debug ignore_loglevel rootwait root=/dev/vda2 rootfstype=ext4 rw acpi=force", - "expect Description for this new Entry:", - "sendline LAVA", - "expect Choice:", - "sendline 7", - "expect Start:", - "sendline 2" + "expect or any other key to continue.", + "sendline " ] } }, |