96boards-hikey: refactor UEFI/GRUB files location

* move grub.cfg outside of GRUB efi build job*
* replace hardcoded gpt6 by label
* generate grub.cfg in hikey build job
* install grub.cfg on the rootfs under /boot/grub/cfg
* create Image and initrd symlinks
* mount ESP under /boot/EFI
* install EFI application on ESP under /EFI/$vendor

Change-Id: I33f802c2a2cfbf3590e50115ec25e8a26d29280f
Signed-off-by: Fathi Boudra <fathi.boudra@linaro.org>

1 files changed, 36 insertions, 16 deletions

diff --git a/96boards-hikey.yaml b/96boards-hikey.yaml
index 6ec61b4cc1..a1ca68ef22 100644
--- a/96boards-hikey.yaml
+++ b/96boards-hikey.yaml
@@ -125,7 +125,30 @@
 
             GRUB_EFI_URL="http://builds.96boards.org/snapshots/hikey/linaro/grub/latest"
             wget --progress=dot ${GRUB_EFI_URL}/grubaa64.efi -O grubaa64.efi
-            wget --progress=dot ${GRUB_EFI_URL}/grub.cfg -O grub.cfg
+
+            cat << EOF > grub.cfg
+            set default="0"
+            set timeout=1
+
+            menuentry 'Debian GNU/Linux (eMMC)' {
+                search.fs_label rootfs root
+                linux (\$root)/boot/Image console=tty0 console=ttyAMA3,115200 root=/dev/disk/by-partlabel/system rootwait rw quiet efi=noruntime
+                initrd (\$root)/boot/initrd.img
+                devicetree (\$root)/boot/hi6220-hikey.dtb
+            }
+
+            menuentry 'Debian GNU/Linux (SD card)' {
+                search.fs_label rootfs root
+                linux (\$root)/boot/Image console=tty0 console=ttyAMA3,115200 root=/dev/mmcblk1p2 rootwait rw quiet efi=noruntime
+                initrd (\$root)/boot/initrd.img
+                devicetree (\$root)/boot/hi6220-hikey.dtb
+            }
+
+            menuentry 'Fastboot' {
+                search.fs_label boot root
+                chainloader (\$root)/EFI/debian/fastboot.efi
+            }
+            EOF
 
             cat > out/README.txt << EOF
             Build information:
@@ -197,12 +220,12 @@
             EOF
               fi
 
-              sudo mkdir boot/grub
-              sudo cp -a fastboot.efi boot/fastboot.efi || true
-              sudo cp -a grubaa64.efi boot/grubaa64.efi || true
-              sudo cp -a grub.cfg boot/grub/grub.cfg || true
+              sudo mkdir rootfs/boot/grub
+              sudo cp -a grub.cfg rootfs/boot/grub/grub.cfg
 
               sudo ln -sf /etc/resolvconf/run/resolv.conf rootfs/etc/resolv.conf
+              (cd rootfs/boot && sudo ln -s Image-* Image)
+              (cd rootfs/boot && sudo ln -s initrd.img-* initrd.img)
 
               cat << EOF | sudo tee rootfs/etc/NetworkManager/dispatcher.d/99hikey
             #!/bin/sh
@@ -214,12 +237,12 @@
             EOF
 
               cat << EOF | sudo tee rootfs/etc/fstab
-            /dev/disk/by-partlabel/system /     ext4 errors=remount-ro 0 1
-            /dev/disk/by-partlabel/boot   /boot vfat defaults          0 0
+            /dev/disk/by-partlabel/system /         ext4 errors=remount-ro 0 1
+            /dev/disk/by-partlabel/boot   /boot/efi vfat defaults          0 0
             EOF
 
-              sudo rm -rf rootfs/dev rootfs/boot rootfs/var/lib/apt/lists rootfs/lib/modules/*-linaro-hikey
-              sudo mkdir rootfs/dev rootfs/boot rootfs/var/lib/apt/lists rootfs/home/linaro/bin
+              sudo rm -rf rootfs/dev rootfs/var/lib/apt/lists rootfs/lib/modules/*-linaro-hikey
+              sudo mkdir rootfs/dev rootfs/var/lib/apt/lists rootfs/home/linaro/bin
 
               sudo wget https://raw.githubusercontent.com/96boards/usb_speed_switch/master/usb_speed -O rootfs/home/linaro/bin/usb_speed
               cat << EOF | sudo tee -a rootfs/home/linaro/bin/xmms2-output-plugin-pulse
@@ -254,14 +277,11 @@
             mkdir boot-fat
 
             dd if=/dev/zero of=out/boot-fat.uefi.img bs=512 count=131072
-            sudo mkfs.fat -n "BOOT IMG" out/boot-fat.uefi.img
+            sudo mkfs.fat -F32 -n "boot" out/boot-fat.uefi.img
             sudo mount -o loop,rw,sync out/boot-fat.uefi.img boot-fat
-            sudo mkdir boot-fat/grub
-            sudo cp -a out/Image out/hi6220-hikey.dtb boot-fat/ || true
-            sudo cp -a out/initrd.img-* boot-fat/initrd.img || true
-            sudo cp -a fastboot.efi boot-fat/fastboot.efi || true
-            sudo cp -a grubaa64.efi boot-fat/grubaa64.efi || true
-            sudo cp -a grub.cfg boot-fat/grub/grub.cfg || true
+            sudo mkdir -p boot-fat/EFI/debian
+            sudo cp -a fastboot.efi boot-fat/EFI/debian/fastboot.efi || true
+            sudo cp -a grubaa64.efi boot-fat/EFI/debian/grubaa64.efi || true
             sudo umount boot-fat
             sudo chmod 777 out/boot-fat.uefi.img