96boards-reference-platform-debian: release updates for hikey

* Installing grub2 by default
* Making grub.cfg compatible to what gets created with update-grub2
* Including libgl1-mesa-dri and xserver-xorg-video-armsoc by default
* Removing staging, we just need linaro-overlay now

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

3 files changed, 95 insertions, 1 deletions

diff --git a/96boards-reference-platform-debian/grub/grub-fastboot.cfg b/96boards-reference-platform-debian/grub/grub-fastboot.cfg
new file mode 100644
index 0000000000..19538d7c52
--- /dev/null
+++ b/96boards-reference-platform-debian/grub/grub-fastboot.cfg
@@ -0,0 +1,4 @@
+menuentry 'Fastboot' {
+    search.fs_label boot boot_part
+    chainloader ($boot_part)/EFI/BOOT/fastboot.efi
+}
diff --git a/96boards-reference-platform-debian/grub/grub-hikey.cfg.in b/96boards-reference-platform-debian/grub/grub-hikey.cfg.in
new file mode 100644
index 0000000000..23dd3ac1ac
--- /dev/null
+++ b/96boards-reference-platform-debian/grub/grub-hikey.cfg.in
@@ -0,0 +1,83 @@
+#
+# DO NOT EDIT THIS FILE
+#
+# It is automatically generated by grub-mkconfig using templates
+# from /etc/grub.d and settings from /etc/default/grub
+#
+
+### BEGIN /etc/grub.d/00_header ###
+set default="0"
+set timeout=5
+menuentry_id_option="--id"
+
+export menuentry_id_option
+### END /etc/grub.d/00_header ###
+
+### BEGIN /etc/grub.d/05_debian_theme ###
+set menu_color_normal=cyan/blue
+set menu_color_highlight=white/blue
+### END /etc/grub.d/05_debian_theme ###
+
+### BEGIN /etc/grub.d/10_linux ###
+menuentry 'Debian GNU/Linux' --class debian --class gnu-linux --class gnu --class os $menuentry_id_option 'gnulinux-simple' {
+        insmod gzio
+        insmod part_gpt
+        insmod ext2
+        search --label --set=root rootfs
+        echo    'Loading Linux KERNEL_VERSION ...'
+        linux   /boot/vmlinuz-KERNEL_VERSION root=/dev/disk/by-label/rootfs rw efi=noruntime quiet
+        echo    'Loading initial ramdisk ...'
+        initrd  /boot/initrd.img-KERNEL_VERSION
+        echo    'Loading devicetree ...'
+        devicetree /boot/hi6220-hikey-KERNEL_VERSION.dtb
+}
+submenu 'Advanced options for Debian GNU/Linux' $menuentry_id_option 'gnulinux-advanced' {
+        menuentry 'Debian GNU/Linux, with Linux KERNEL_VERSION' --class debian --class gnu-linux --class gnu --class os $menuentry_id_option 'gnulinux-KERNEL_VERSION-advanced' {
+                insmod gzio
+                insmod part_gpt
+                insmod ext2
+                search --label --set=root rootfs
+                echo    'Loading Linux KERNEL_VERSION ...'
+                linux   /boot/vmlinuz-KERNEL_VERSION root=/dev/disk/by-label/rootfs rw efi=noruntime quiet
+                echo    'Loading initial ramdisk ...'
+                initrd  /boot/initrd.img-KERNEL_VERSION
+                echo    'Loading devicetree ...'
+                devicetree /boot/hi6220-hikey-KERNEL_VERSION.dtb
+        }
+        menuentry 'Debian GNU/Linux, with Linux KERNEL_VERSION (recovery mode)' --class debian --class gnu-linux --class gnu --class os $menuentry_id_option 'gnulinux-KERNEL_VERSION-recovery' {
+                insmod gzio
+                insmod part_gpt
+                insmod ext2
+                search --label --set=root rootfs
+                echo    'Loading Linux KERNEL_VERSION ...'
+                linux   /boot/vmlinuz-KERNEL_VERSION root=/dev/disk/by-label/rootfs rw efi=noruntime single
+                echo    'Loading initial ramdisk ...'
+                initrd  /boot/initrd.img-KERNEL_VERSION
+                echo    'Loading devicetree ...'
+                devicetree /boot/hi6220-hikey-KERNEL_VERSION.dtb
+        }
+}
+
+### END /etc/grub.d/10_linux ###
+
+### BEGIN /etc/grub.d/20_linux_xen ###
+
+### END /etc/grub.d/20_linux_xen ###
+
+### BEGIN /etc/grub.d/30_os-prober ###
+### END /etc/grub.d/30_os-prober ###
+
+### BEGIN /etc/grub.d/30_uefi-firmware ###
+### END /etc/grub.d/30_uefi-firmware ###
+
+### BEGIN /etc/grub.d/40_custom ###
+# This file provides an easy way to add custom menu entries.  Simply type the
+# menu entries you want to add after this comment.  Be careful not to change
+# the 'exec tail' line above.
+### END /etc/grub.d/40_custom ###
+
+### BEGIN /etc/grub.d/41_custom ###
+if [ -f $prefix/custom.cfg ]; then
+  source $prefix/custom.cfg;
+fi
+### END /etc/grub.d/41_custom ###
diff --git a/96boards-reference-platform-debian/hwpacks/linaro-hikey b/96boards-reference-platform-debian/hwpacks/linaro-hikey
index e387c8981a..e336e1211c 100644
--- a/96boards-reference-platform-debian/hwpacks/linaro-hikey
+++ b/96boards-reference-platform-debian/hwpacks/linaro-hikey
@@ -38,15 +38,22 @@ assume_installed:
 - udev
 - libnl-3-200
 - libnl-genl-3-200
+- libpci3
 - linaro-artwork
+- libdrm2
+- libexpat1
+- xserver-xorg-core
 packages:
 - 96boards-artwork
+- grub-efi-arm64
 - firmware-linux
 - firmware-ti-connectivity
 - ti-uim
 - ti-calibrator
+- xserver-xorg-video-armsoc
+- libgl1-mesa-dri
 - linux-image-reference-arm64
 sources:
   debian: http://http.debian.net/debian/ jessie main contrib non-free
+  backports: http://http.debian.net/debian/ jessie-backports main contrib non-free
   repo: http://repo.linaro.org/ubuntu/linaro-overlay jessie main
-  staging: http://repo.linaro.org/ubuntu/linaro-staging jessie main