From d5c2ddca945c055d5ba2b1635f6fca36b592dd5c Mon Sep 17 00:00:00 2001
From: John Ogness <john.ogness@linutronix.de>
Date: Thu, 5 Apr 2018 09:50:23 +0200
Subject: lx-trainer-vm: change boot to uefi/bios hybrid

This requires devel/elbe-3.0 branch to build! In
particular, commit 79adee34de55 ("Add support for hybrid
images (UEFI+Bios)")

Signed-off-by: John Ogness <john.ogness@linutronix.de>
---
 lx-trainer-vm/lx-trainer-vm.xml | 31 ++++++++++++++++++++++++++++---
 1 file changed, 28 insertions(+), 3 deletions(-)

diff --git a/lx-trainer-vm/lx-trainer-vm.xml b/lx-trainer-vm/lx-trainer-vm.xml
index 3174038..0dd4750 100644
--- a/lx-trainer-vm/lx-trainer-vm.xml
+++ b/lx-trainer-vm/lx-trainer-vm.xml
@@ -66,16 +66,29 @@
 		<passwd>root</passwd>
 		<console>ttyS0,115200</console>
 		<images>
-			<msdoshd>
+			<!-- use GPT for UEFI -->
+			<gpthd>
 				<name>lx-trainer.img</name>
 				<size>16GiB</size>
 				<grub-install/>
+				<!-- small partition for the MBR
+					in case of bios boot -->
+				<partition>
+					<size>1MiB</size>
+					<label>bios</label>
+					<biosgrub>true</biosgrub>
+				</partition>
+				<!-- the EFI system partition -->
+				<partition>
+					<size>100MiB</size>
+					<label>uefi</label>
+					<bootable>true</bootable>
+				</partition>
 				<partition>
 					<size>remain</size>
 					<label>rfs</label>
-					<bootable/>
 				</partition>
-			</msdoshd>
+			</gpthd>
 		</images>
 		<fstab>
 			<bylabel>
@@ -93,6 +106,15 @@
 					<type>debugfs</type>
 				</fs>
 			</bydev>
+			<!-- the EFI system partition needs to
+				be mounted at /boot/efi -->
+			<bylabel>
+				<label>uefi</label>
+				<mountpoint>/boot/efi</mountpoint>
+				<fs>
+					<type>vfat</type>
+				</fs>
+			</bylabel>
 		</fstab>
 		<finetuning>
 			<!-- install armhf toolchain -->
@@ -138,6 +160,9 @@
 			<rm>var/cache/apt/archives/*.deb</rm>
 		</finetuning>
 		<pkg-list>
+			<!-- grub-efi-amd64 conflicts with grub-pc, so
+				install grub-efi-amd64-bin and grub-pc -->
+			<pkg>grub-efi-amd64-bin</pkg>
 			<pkg>grub-pc</pkg>
 			<pkg>linux-image-amd64</pkg>
 			<pkg>linux-headers-amd64</pkg>
-- 
cgit v1.2.3