startup.nsh: make it boot directly when select the Shell in UEFI

this will avoid inputing the boot parameters in the UEFI Shell prompt

Change-Id: I0d9a6b40611bffe08200f7f3a2b4524e0d7223f8
Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org>

3 files changed, 34 insertions, 33 deletions

diff --git a/device.mk b/device.mk
index e24a264..98691a9 100644
--- a/device.mk
+++ b/device.mk
@@ -28,7 +28,8 @@ PRODUCT_COPY_FILES += $(call add-to-product-copy-files-if-exists,\
 PRE_BOOT_FILES := bl1.bin fvp_fip.bin
 PRODUCT_COPY_FILES += $(call add-to-product-copy-files-if-exists,\
                         $(LOCAL_PATH)/preboot/bl1.bin:boot/bl1.bin \
-                        $(LOCAL_PATH)/preboot/fip.bin:boot/fvp_fip.bin)
+                        $(LOCAL_PATH)/preboot/fip.bin:boot/fvp_fip.bin \
+                        $(LOCAL_PATH)/preboot/startup.nsh:boot/startup.nsh)
 
 # Set custom settings
 DEVICE_PACKAGE_OVERLAYS := $(LOCAL_PATH)/overlay
diff --git a/howto/armv8-android-fvp-lsk/HOWTO_install.txt b/howto/armv8-android-fvp-lsk/HOWTO_install.txt
index 61d1ecf..fb42913 100644
--- a/howto/armv8-android-fvp-lsk/HOWTO_install.txt
+++ b/howto/armv8-android-fvp-lsk/HOWTO_install.txt
@@ -96,38 +96,37 @@ Escape character is '^Z'.
 [1] Linaro disk image on virtio
 [2] Shell
 [3] Boot Manager
-Start: 3
-[1] Add Boot Device Entry
-[2] Update Boot Device Entry
-[3] Remove Boot Device Entry
-[4] Update FDT path
-[5] Return to main menu
-Choice: 2
-[1] Linaro disk image on virtio
-Update entry: 1
-File path of the EFI Application or the kernel: kernel
-Has FDT support? [y/n] y
-Add an initrd: [y/n] y
-File path of the initrd: ramdisk.img
-Arguments to pass to the binary: console=ttyAMA0 earlyprintk=pl011,0x1c090000 amba-clcd.mode=VGA
-Description for this new Entry: Linaro disk image on virtio
-[1] Add Boot Device Entry
-[2] Update Boot Device Entry
-[3] Remove Boot Device Entry
-[4] Update FDT path
-[5] Return to main menu
-Choice: 5
-[1] Linaro disk image on virtio
-[2] Shell
-[3] Boot Manager
-Start: 1
-   PEI   1122 ms
-   DXE    259 ms
-   BDS      8 ms
-Total Time = 1390 ms
-
-[    0.000000] Initializing cgroup subsys cpu
-[    0.000000] Linux version 3.10.40-04438-g6a78140 (pundiramit@flying-dutchman) (gcc version 4.9 20140514 (prerelease) (GCC) ) #1 SMP Mon Jun 2 14:50:25 IST 2014
+Start: 2
+UEFI Interactive Shell v2.0
+EDK II
+UEFI v2.40 (ARM Fixed Virtual Platform EFI May 23 2014 12:13:52, 0x00000000)
+Mapping table
+      FS2: Alias(s):F8:
+          VenHw(C5B9C74A-6D72-4719-99AB-C59F199091EB)
+      FS0: Alias(s):F3:
+          MemoryMapped(0xB,0x88000000,0x8827FFFF)
+      FS1: Alias(s):F4:
+          MemoryMapped(0xB,0xFEC16000,0xFEDF987F)
+      FS3: Alias(s):HD12b:;BLK5:
+          VenHw(FE61BB5F-1B67-4C24-B346-73DB42E873E5)/HD(1,MBR,0x00000000,0x3F,0x41FC0)
+      FS4: Alias(s):HD12e2:;BLK10:
+          VenHw(FE61BB5F-1B67-4C24-B346-73DB42E873E5)/HD(4,MBR,0x00000000,0x242000,0x1BE000)/HD(2,MBR,0x00000000,0x362020,0x9DFE0)
+     BLK3: Alias(s):
+          VenHw(E7223039-5836-41E1-B542-D7EC736C5E59)
+     BLK0: Alias(s):
+          VenHw(02118005-9DA7-443A-92D5-781F022AEDBB)
+     BLK1: Alias(s):
+          VenHw(1F15DA3C-37FF-4070-B471-BB4AF12A724A)
+     BLK2: Alias(s):
+          VenHw(CC2CBF29-1498-4CDD-8171-F8B6B41D0909)
+     BLK4: Alias(s):
+          VenHw(FE61BB5F-1B67-4C24-B346-73DB42E873E5)
+Press ESC in 1 seconds to skip startup.nsh or any other key to continue.
+Shell> kernel dtb=fvp-base-gicv2-psci.dtb initrd=ramdisk.img console=ttyAMA0 amba-clcd.mode=VGA
+EFI stub: Booting Linux Kernel...
+[    0.000000] Initializing cgroup subsys cpu2E873E5)/HD(3,MBR,0x00000000,0x1C2000,0x80000)
+[    0.000000] Initializing cgroup subsys cpuacct
+[    0.000000] Linux version 3.10.63-00561-g90aa783 (buildslave@x86-64-07-android) (gcc version 4.9 20140514 (prerelease) (GCC) ) #1 SMP PREEMPT Fri Jan 23 14:41:49 CET 2015
 </pre>
 
 h3. Black screen
diff --git a/preboot/startup.nsh b/preboot/startup.nsh
new file mode 100644
index 0000000..e7a99ad
--- /dev/null
+++ b/preboot/startup.nsh
@@ -0,0 +1 @@
+kernel dtb=fvp-base-gicv2-psci.dtb initrd=ramdisk.img console=ttyAMA0 amba-clcd.mode=VGA