From d9db680fbdfb2027ec2a38b4bbd72fd5e234cf88 Mon Sep 17 00:00:00 2001
From: Florin Sarbu <florin@resin.io>
Date: Tue, 9 Oct 2018 09:06:56 +0200
Subject: [PATCH] u-boot_2018.03.bbappend: Integrate with resin-u-boot

Signed-off-by: Florin Sarbu <florin@resin.io>
---
 ...0001-Add-Resin-specific-boot-command.patch | 34 +++++++++++++++++++
 .../u-boot/u-boot_2018.03.bbappend            |  6 ++++
 2 files changed, 40 insertions(+)
 create mode 100644 layers/meta-resin-allwinner/recipes-bsp/u-boot/files/0001-Add-Resin-specific-boot-command.patch
 create mode 100644 layers/meta-resin-allwinner/recipes-bsp/u-boot/u-boot_2018.03.bbappend

diff --git a/layers/meta-resin-allwinner/recipes-bsp/u-boot/files/0001-Add-Resin-specific-boot-command.patch b/layers/meta-resin-allwinner/recipes-bsp/u-boot/files/0001-Add-Resin-specific-boot-command.patch
new file mode 100644
index 0000000..c02d721
--- /dev/null
+++ b/layers/meta-resin-allwinner/recipes-bsp/u-boot/files/0001-Add-Resin-specific-boot-command.patch
@@ -0,0 +1,34 @@
+From 38cf0c1e4a9c1e0f73740f6ba8dc7c39964a0288 Mon Sep 17 00:00:00 2001
+From: Sebastian Panceac <sebastian@resin.io>
+Date: Fri, 16 Mar 2018 15:35:32 +0100
+Subject: [PATCH] Add Resin specific boot command
+
+Upstream-Status: Inappropriate [Resin specific]
+
+Signed-off-by: Sebastian Panceac <sebastian@resin.io>
+---
+ include/configs/sunxi-common.h | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h
+index 4391a8c..2c82dda 100644
+--- a/include/configs/sunxi-common.h
++++ b/include/configs/sunxi-common.h
+@@ -454,6 +454,14 @@ extern int soft_i2c_gpio_scl;
+ #endif
+ 
+ #include <config_distro_bootcmd.h>
++#undef CONFIG_BOOTCOMMAND
++#define CONFIG_BOOTCOMMAND \
++	"setenv resin_kernel_load_addr ${kernel_addr_r};" \
++	"run resin_set_kernel_root;" \
++	"setenv bootargs ${resin_kernel_root} rootfstype=ext4 rootwait console=$console;" \
++	"fatload ${resin_dev_type} ${resin_dev_index}:${resin_boot_part} ${resin_kernel_load_addr} uimage;" \
++	"fatload ${resin_dev_type} ${resin_dev_index}:${resin_boot_part} ${fdt_addr_r} dtb/${fdtfile};" \
++	"bootm ${resin_kernel_load_addr} - ${fdt_addr_r}"
+ 
+ #ifdef CONFIG_USB_KEYBOARD
+ #define CONSOLE_STDIN_SETTINGS \
+-- 
+2.7.4
+
diff --git a/layers/meta-resin-allwinner/recipes-bsp/u-boot/u-boot_2018.03.bbappend b/layers/meta-resin-allwinner/recipes-bsp/u-boot/u-boot_2018.03.bbappend
new file mode 100644
index 0000000..b0d8e18
--- /dev/null
+++ b/layers/meta-resin-allwinner/recipes-bsp/u-boot/u-boot_2018.03.bbappend
@@ -0,0 +1,6 @@
+UBOOT_KCONFIG_SUPPORT = "1"
+inherit resin-u-boot
+
+FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
+
+SRC_URI += "file://0001-Add-Resin-specific-boot-command.patch"