From d040c1e7040e1478597d2002c45384ada485f8b1 Mon Sep 17 00:00:00 2001
From: Pascal Vizeli <pvizeli@syshack.ch>
Date: Fri, 23 Mar 2018 18:31:53 +0100
Subject: [PATCH] Use state

---
 .../barebox-env/nv/bootchooser.state_prefix   |   1 +
 .../nv/bootchooser.system0.priority           |   1 -
 .../nv/bootchooser.system1.priority           |   1 -
 .../board/ova/barebox-state.dtb               | Bin 1097 -> 1138 bytes
 .../board/ova/barebox-state.dts               |  18 ++++++++++--------
 buildroot-external/board/ova/barebox.config   |   2 --
 buildroot-external/scripts/hdd_image.sh       |   2 +-
 7 files changed, 12 insertions(+), 13 deletions(-)
 create mode 100644 buildroot-external/barebox-env/nv/bootchooser.state_prefix
 delete mode 100644 buildroot-external/barebox-env/nv/bootchooser.system0.priority
 delete mode 100644 buildroot-external/barebox-env/nv/bootchooser.system1.priority

diff --git a/buildroot-external/barebox-env/nv/bootchooser.state_prefix b/buildroot-external/barebox-env/nv/bootchooser.state_prefix
new file mode 100644
index 000000000..6246412a5
--- /dev/null
+++ b/buildroot-external/barebox-env/nv/bootchooser.state_prefix
@@ -0,0 +1 @@
+state.bootstate
diff --git a/buildroot-external/barebox-env/nv/bootchooser.system0.priority b/buildroot-external/barebox-env/nv/bootchooser.system0.priority
deleted file mode 100644
index f599e28b8..000000000
--- a/buildroot-external/barebox-env/nv/bootchooser.system0.priority
+++ /dev/null
@@ -1 +0,0 @@
-10
diff --git a/buildroot-external/barebox-env/nv/bootchooser.system1.priority b/buildroot-external/barebox-env/nv/bootchooser.system1.priority
deleted file mode 100644
index 209e3ef4b..000000000
--- a/buildroot-external/barebox-env/nv/bootchooser.system1.priority
+++ /dev/null
@@ -1 +0,0 @@
-20
diff --git a/buildroot-external/board/ova/barebox-state.dtb b/buildroot-external/board/ova/barebox-state.dtb
index 0092edb115a4d9b14a02c5a5fba2bfb4137023a1..ae2b4b8bbca3977313c71a5077211bf4eb49debd 100644
GIT binary patch
literal 1138
zcmbVL%}(4v44wcg1(gaU`Tz)3a3E?n;ct6k#ij4i3z}q{Wkfa;%{XEguAF-8sgKad
z=_B+7D&7EL=a20!tFAhd<FUv7=CkAZwe|Ezh&3yOI2U5|H|ax?9g=MlUf;?8v)=yo
z^%~2QnU)S5o2w-2y!qr%BJfVEka#a<6|+XZH|!_j9JW8q*n5vZE-#w%_oNSEX(2Y_
zqgSxPncUA--jb`s{!(Aj@%yT@g#<Z7c(F0~3g#kyo|`y?QNXz^_l2<*MpEZGA6`kM
zqypWbN^El9k~R!Pi+j-a@3Pc6MqJg)9o%3(uliY7ZLG%0;Fv=ye~ZO9%V6zN9Anl0
zr>dz(=6}^hvr{eR*YaS!43GJmk~yq*OJZ$OTvt;j9bP5Z#z8*l)m@+F$Me02UyD)o
zrjQmjYLizZ{?GpK9sGU{QauLc&t%WPg^v__A4OqwdeZCrXK57r$0|+z^B@TQDC!6C
zX_!PoUr`({#%JCSB-8KbTVqdi->Bz$Un*t6IX{6cb7J4=J81SJIn;?r%&3s4;|xSB
zlN-oYt9_glozr({wE|A>&K(*nhfv2^7zzccEHe~bcv)&CGM$&>qvBfTitwKS+lZd`

literal 1097
zcma)5%}T>S5Z>B?KllsYJV}vyXfRD`ZM|5$h_B$mvdM1R#WV@K8%zb?!pHL9i->O^
z&g9P&Q|!WY=kNP=W-|TQ`~D=Pbx#Nx64HE!`yAv5<PZeUEBN0sb?LW}TTQrIxsJZV
zJ^&r<2K5D1Tww~vHbG7<l%|@ai)?^2e$5hp`jy-cAcmNIkd8wocfzDwlWR%(3@Ih{
z2J~tzcX>MvCk%BB9<kN@vUasln$Jy)7k#bFm3&S`AcE<HY5+xAjZ<Kb-Gci8!EkV1
z#VoF45op^={ly!Pc|4s>Bt<BNUX1%?PQisd>u~Kr9&%-~PJ8MhS@9m~wf)!h1bdPm
z#1?hny-pp7S?<aG!?n96*Ky93^7&Nhi8~7w55~Q0>ec#imsizS%q6RfN-eYqgLGa0
zoe#c&|CNp>63&ch8U1&!&mh<9jRu#NZQF)zU3rG*^_ej=P0O(Dk?9O9*EUBC^6(%(
z)*XUWzfYXo)!Mh)lrhPbGF<NainNt@;kllz{G3jOOWbfCQ7s&w6NkD_JYa@iM5R$W
hm6n2WBq5Sd3F97(eNC{(I2MffB8Zc2G@}6nsvl#gl6(LF

diff --git a/buildroot-external/board/ova/barebox-state.dts b/buildroot-external/board/ova/barebox-state.dts
index 27aa43a91..43400b1a6 100644
--- a/buildroot-external/board/ova/barebox-state.dts
+++ b/buildroot-external/board/ova/barebox-state.dts
@@ -1,18 +1,19 @@
 /dts-v1/;
 / {
-	#address-cells = <1>;
-	#size-cells = <1>;
 
 	aliases {
 		state = &state;
 	};
 
 	state: state {
-                magic = <0xef784236>;
+		#address-cells = <1>;
+		#size-cells = <1>;
+                magic = <0xef98423f>;
                 compatible = "barebox,state";
-                backend-type = "raw";
                 backend = <&backend_state>;
-                backend-stridesize = <4096>;
+                backend-type = "raw";
+                backend-stridesize = <1024>;
+		backend-storage-type = "direct";
 
 		bootstate {
 			#address-cells = <1>;
@@ -29,7 +30,7 @@
 				priority@4 {
 					reg = <0x4 0x4>;
 					type = "uint32";
-					default = <10>;
+					default = <20>;
 				};
 			};
 			system1 {
@@ -43,7 +44,7 @@
 				priority@c {
 					reg = <0xc 0x4>;
 					type = "uint32";
-					default = <20>;
+					default = <10>;
 				};
 			};
 			last_chosen@10 {
@@ -59,9 +60,10 @@
 		compatible = "fixed-partitions";
 
 		backend_state: state {
-			partuuid = "19652333-327f-ff4d-8002-3390b62c309d";
+			partuuid = "33236519-7f32-4dff-8002-3390b62c309d";
 
 		};
 	};
+
 };
 
diff --git a/buildroot-external/board/ova/barebox.config b/buildroot-external/board/ova/barebox.config
index d0d14a6a2..a04fca3e1 100644
--- a/buildroot-external/board/ova/barebox.config
+++ b/buildroot-external/board/ova/barebox.config
@@ -37,8 +37,6 @@ CONFIG_DRIVER_SERIAL_EFI=y
 CONFIG_DRIVER_SERIAL_EFI_STDIO=y
 # CONFIG_SPI is not set
 CONFIG_DISK=y
-CONFIG_DISK_ATA=y
-CONFIG_USB_HOST=y
 CONFIG_VIDEO=y
 CONFIG_DRIVER_VIDEO_EFI_GOP=y
 CONFIG_CLOCKSOURCE_EFI=y
diff --git a/buildroot-external/scripts/hdd_image.sh b/buildroot-external/scripts/hdd_image.sh
index 69abda3d7..0f43e1bc2 100755
--- a/buildroot-external/scripts/hdd_image.sh
+++ b/buildroot-external/scripts/hdd_image.sh
@@ -71,7 +71,7 @@ function hassio_hdd_image() {
     echo "System1 formating done"
 
     # BootState
-    sgdisk -n 4:0:$bootstate_size -c 4:"hassio-bootstate" -t 4:"0FC63DAF-8483-4772-8E79-3D69D8477DE4" -u 4:$BOOTSTATE_UUID "$hdd_img"
+    sgdisk -n 4:0:$bootstate_size -c 4:"hassio-bootstate" -u 4:$BOOTSTATE_UUID "$hdd_img"
     echo "BootState formating done"
 
     # Overlay