From 4cacbdd30360b02807f0151392bb843216ead433 Mon Sep 17 00:00:00 2001
From: Pascal Vizeli <pvizeli@syshack.ch>
Date: Thu, 22 Mar 2018 16:00:53 +0100
Subject: [PATCH] Fix partition layout & bootup

---
 .../board/ova/barebox-env/boot/system0            |  5 +++--
 .../board/ova/barebox-env/boot/system1            |  5 +++--
 buildroot-external/board/ova/barebox.config       | 15 ++++++++++++++-
 buildroot-external/board/ova/genimage.cfg         |  2 +-
 4 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/buildroot-external/board/ova/barebox-env/boot/system0 b/buildroot-external/board/ova/barebox-env/boot/system0
index 0baf1a583..9d24de3bb 100644
--- a/buildroot-external/board/ova/barebox-env/boot/system0
+++ b/buildroot-external/board/ova/barebox-env/boot/system0
@@ -1,5 +1,6 @@
 #!/bin/sh
 
-global.bootm.image="/mnt/disk0.3/boot/bzImage"
-global.linux.bootargs.dyn.root="root=/dev/sda3 rootfstype=squashfs ro"
+global.bootm.image="/mnt/disk1/boot/bzImage"
+
+global linux.bootargs.dyn.root="root=/dev/sda2 rootfstype=squashfs ro"
 
diff --git a/buildroot-external/board/ova/barebox-env/boot/system1 b/buildroot-external/board/ova/barebox-env/boot/system1
index 7712550a8..c0103ff42 100644
--- a/buildroot-external/board/ova/barebox-env/boot/system1
+++ b/buildroot-external/board/ova/barebox-env/boot/system1
@@ -1,4 +1,5 @@
 #!/bin/sh
 
-global.bootm.image="/mnt/disk0.4/boot/bzImage"
-global.linux.bootargs.dyn.root="root=/dev/sda4 rootfstype=squashfs ro"
+global.bootm.image="/mnt/disk2/boot/bzImage"
+
+global linux.bootargs.dyn.root="root=/dev/sda3 rootfstype=squashfs ro"
diff --git a/buildroot-external/board/ova/barebox.config b/buildroot-external/board/ova/barebox.config
index 6d1b94e1b..3696195ab 100644
--- a/buildroot-external/board/ova/barebox.config
+++ b/buildroot-external/board/ova/barebox.config
@@ -3,17 +3,30 @@ CONFIG_MMU=y
 CONFIG_MALLOC_SIZE=0x0
 CONFIG_MALLOC_TLSF=y
 CONFIG_PROMPT="hassio-os:"
+CONFIG_GLOB=y
+CONFIG_GLOB_SORT=y
 CONFIG_CMDLINE_EDITING=y
 CONFIG_AUTO_COMPLETE=y
 CONFIG_BOOTM_SHOW_TYPE=y
 CONFIG_BOOTM_OFTREE=y
-CONFIG_DEFAULT_ENVIRONMENT_GENERIC_NEW=y
+CONFIG_FLEXIBLE_BOOTARGS=y
+CONFIG_PARTITION_DISK_EFI=y
+# CONFIG_PARTITION_DISK_EFI_GPT_NO_FORCE is not set
+# CONFIG_PARTITION_DISK_EFI_GPT_COMPARE is not set
 CONFIG_DEFAULT_ENVIRONMENT_PATH="/build/buildroot-external/board/ova/barebox-env"
 CONFIG_STATE=y
 CONFIG_BOOTCHOOSER=y
+CONFIG_CMD_BOOT=y
 CONFIG_CMD_UIMAGE=y
+CONFIG_CMD_AUTOMOUNT=y
+CONFIG_CMD_NV=y
 CONFIG_CMD_EXPORT=y
+CONFIG_CMD_GLOBAL=y
 CONFIG_CMD_MAGICVAR=y
+CONFIG_CMD_BASENAME=y
+CONFIG_CMD_DIRNAME=y
+CONFIG_CMD_READLINK=y
+CONFIG_CMD_GETOPT=y
 CONFIG_CMD_TIMEOUT=y
 CONFIG_CMD_DETECT=y
 CONFIG_CMD_STATE=y
diff --git a/buildroot-external/board/ova/genimage.cfg b/buildroot-external/board/ova/genimage.cfg
index 23b1d4424..94cb9bddc 100644
--- a/buildroot-external/board/ova/genimage.cfg
+++ b/buildroot-external/board/ova/genimage.cfg
@@ -12,7 +12,7 @@ image boot.vfat {
 image sdcard.img {
   hdimage {
     align = 1M
-    extended-partition = 2
+    extended-partition = 4
   }
 
   partition boot {