diff --git a/buildroot-external/barebox-env/boot/system0 b/buildroot-external/barebox-env/boot/system0
index 4239b465c..f1b789561 100644
--- a/buildroot-external/barebox-env/boot/system0
+++ b/buildroot-external/barebox-env/boot/system0
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-global bootm.image="/mnt/disk1/boot/bzImage"
+global bootm.image="/mnt/disk0.1/boot/bzImage"
 global linux.bootargs.dyn.root="root=PARTUUID=8d3d53e3-6d49-4c38-8349-aff6859e82fd rootfstype=squashfs ro"
 
diff --git a/buildroot-external/barebox-env/boot/system1 b/buildroot-external/barebox-env/boot/system1
index 3926d4112..c7fdcead3 100644
--- a/buildroot-external/barebox-env/boot/system1
+++ b/buildroot-external/barebox-env/boot/system1
@@ -1,4 +1,4 @@
 #!/bin/sh
 
-global bootm.image="/mnt/disk2/boot/bzImage"
+global bootm.image="/mnt/disk0.2/boot/bzImage"
 global linux.bootargs.dyn.root="root=PARTUUID=a3ec664e-32ce-4665-95ea-7ae90ce9aa20 rootfstype=squashfs ro"
diff --git a/buildroot-external/board/rpi2/barebox.config b/buildroot-external/board/rpi2/barebox.config
index cdeed5a94..370c51e99 100644
--- a/buildroot-external/board/rpi2/barebox.config
+++ b/buildroot-external/board/rpi2/barebox.config
@@ -1,5 +1,6 @@
 CONFIG_ARCH_BCM283X=y
 CONFIG_MACH_RPI2=y
+CONFIG_MACH_RPI_DEBUG_UART_RPI2=y
 CONFIG_AEABI=y
 CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS=y
 CONFIG_ARM_UNWIND=y
@@ -22,6 +23,7 @@ CONFIG_PARTITION_DISK_EFI=y
 CONFIG_DEFAULT_ENVIRONMENT_PATH="/build/buildroot-external/barebox-env"
 CONFIG_STATE=y
 CONFIG_BOOTCHOOSER=y
+CONFIG_DEBUG_LL=y
 # CONFIG_CMD_VERSION is not set
 CONFIG_CMD_BOOT=y
 CONFIG_CMD_UIMAGE=y
@@ -36,14 +38,15 @@ CONFIG_CMD_GETOPT=y
 CONFIG_CMD_MENUTREE=y
 CONFIG_CMD_TIMEOUT=y
 CONFIG_CMD_DETECT=y
+CONFIG_CMD_OF_DUMP=y
 CONFIG_CMD_STATE=y
 CONFIG_CMD_BOOTCHOOSER=y
 CONFIG_SERIAL_AMBA_PL011=y
 # CONFIG_SPI is not set
 CONFIG_MCI=y
+CONFIG_MCI_STARTUP=y
 CONFIG_MCI_BCM283X=y
-CONFIG_WATCHDOG=y
-CONFIG_WATCHDOG_BCM2835=y
+CONFIG_STATE_DRV=y
 CONFIG_GPIO_BCM283X=y
 # CONFIG_PINCTRL is not set
 CONFIG_REGULATOR=y
diff --git a/buildroot-external/board/rpi2/patches/barebox/0001-ARM-dts-bcm2836-rpi-2-re-enable-booting-from-SD-card.patch b/buildroot-external/board/rpi2/patches/barebox/0001-ARM-dts-bcm2836-rpi-2-re-enable-booting-from-SD-card.patch
new file mode 100644
index 000000000..eb106a3f4
--- /dev/null
+++ b/buildroot-external/board/rpi2/patches/barebox/0001-ARM-dts-bcm2836-rpi-2-re-enable-booting-from-SD-card.patch
@@ -0,0 +1,29 @@
+From ef723a74044c8b3ed29a1f3d048debd50fc9df96 Mon Sep 17 00:00:00 2001
+From: Pascal Vizeli <pvizeli@syshack.ch>
+Date: Tue, 22 May 2018 20:11:13 +0000
+Subject: [PATCH 1/1] ARM: dts: bcm2836-rpi-2: re-enable booting from SD card
+
+---
+ arch/arm/dts/bcm2836-rpi-2.dts | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+diff --git a/arch/arm/dts/bcm2836-rpi-2.dts b/arch/arm/dts/bcm2836-rpi-2.dts
+index 42b6abb18..2fa1c8bb4 100644
+--- a/arch/arm/dts/bcm2836-rpi-2.dts
++++ b/arch/arm/dts/bcm2836-rpi-2.dts
+@@ -9,3 +9,12 @@
+ 		reg = <0x0 0x0>;
+ 	};
+ };
++
++&sdhci {
++	status = "okay";
++};
++
++&sdhost {
++	status = "disabled";
++};
++
+-- 
+2.17.0
+
diff --git a/buildroot-external/board/rpi2/patches/barebox/0002-Add-HassOS-bootchoiser-state.patch b/buildroot-external/board/rpi2/patches/barebox/0002-Add-HassOS-bootchoiser-state.patch
new file mode 100644
index 000000000..7f38b0592
--- /dev/null
+++ b/buildroot-external/board/rpi2/patches/barebox/0002-Add-HassOS-bootchoiser-state.patch
@@ -0,0 +1,88 @@
+From af010303ac0e920ac517dc6d742b5ed703841005 Mon Sep 17 00:00:00 2001
+From: Pascal Vizeli <pvizeli@syshack.ch>
+Date: Tue, 22 May 2018 21:08:15 +0000
+Subject: [PATCH 1/1] Add HassOS bootchoiser state
+
+---
+ arch/arm/dts/bcm2836-rpi-2.dts | 68 ++++++++++++++++++++++++++++++++++
+ 1 file changed, 68 insertions(+)
+
+diff --git a/arch/arm/dts/bcm2836-rpi-2.dts b/arch/arm/dts/bcm2836-rpi-2.dts
+index 2fa1c8bb4..d882a9f86 100644
+--- a/arch/arm/dts/bcm2836-rpi-2.dts
++++ b/arch/arm/dts/bcm2836-rpi-2.dts
+@@ -18,3 +18,71 @@
+ 	status = "disabled";
+ };
+ 
++/ {
++
++	aliases {
++		state = &state;
++	};
++
++	state: state {
++		#address-cells = <1>;
++		#size-cells = <1>;
++                magic = <0xef98423f>;
++                compatible = "barebox,state";
++                backend = <&backend_state>;
++                backend-type = "raw";
++                backend-stridesize = <4048>;
++
++		bootstate {
++			#address-cells = <1>;
++			#size-cells = <1>;
++
++			system0 {
++				#address-cells = <1>;
++				#size-cells = <1>;
++				remaining_attempts@0 {
++					reg = <0x0 0x4>;
++					type = "uint32";
++					default = <3>;
++				};
++				priority@4 {
++					reg = <0x4 0x4>;
++					type = "uint32";
++					default = <20>;
++				};
++			};
++			system1 {
++				#address-cells = <1>;
++				#size-cells = <1>;
++				remaining_attempts@8 {
++					reg = <0x8 0x4>;
++					type = "uint32";
++					default = <0>;
++				};
++				priority@c {
++					reg = <0xc 0x4>;
++					type = "uint32";
++					default = <10>;
++				};
++			};
++			last_chosen@10 {
++				reg = <0x10 0x4>;
++				type = "uint32";
++			};
++		};
++	};
++};
++
++&sdhci {
++	partitions {
++		#address-cells = <1>;
++		#size-cells = <1>;
++		compatible = "fixed-partitions";
++
++		backend_state: partition@22100000 {
++			label = "state";
++			reg = <0x22100000 0x800000>;
++		};
++	};
++};
++
+-- 
+2.17.0
+
diff --git a/buildroot-external/configs/rpi2_defconfig b/buildroot-external/configs/rpi2_defconfig
index 04e1dddb7..1d8ab8380 100644
--- a/buildroot-external/configs/rpi2_defconfig
+++ b/buildroot-external/configs/rpi2_defconfig
@@ -4,7 +4,7 @@ BR2_ARM_FPU_VFPV4=y
 BR2_DL_DIR="/cache/dl"
 BR2_CCACHE=y
 BR2_CCACHE_DIR="/cache/cc"
-BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_HASSOS_PATH)/patches"
+BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_HASSOS_PATH)/patches $(BR2_EXTERNAL_HASSOS_PATH)/board/rpi2/patches"
 BR2_TOOLCHAIN_BUILDROOT_GLIBC=y
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y
 BR2_GCC_VERSION_7_X=y