Merge branch 'hotfix/rebase-patch-turris-omnia-support' into hbl

patches/openwrt/hack/0004-Drop-Omnia-sysupgrade-and-initramdisk.patch

@@ -11,7 +11,7 @@ Signed-off-by: Michal Hrusecky <Michal@Hrusecky.net>
  1 file changed, 4 deletions(-)
 
 diff --git a/target/linux/mvebu/image/cortex-a9.mk b/target/linux/mvebu/image/cortex-a9.mk
-index 17d950d595..defa956102 100644
+index 0e0bbcac45..cd1378716f 100644
 --- a/target/linux/mvebu/image/cortex-a9.mk
 +++ b/target/linux/mvebu/image/cortex-a9.mk
 @@ -174,10 +174,6 @@ define Device/cznic_turris-omnia
@@ -19,12 +19,12 @@ index 17d950d595..defa956102 100644
      wpad-basic kmod-ath9k kmod-ath10k-ct ath10k-firmware-qca988x-ct \
      partx-utils kmod-i2c-core kmod-i2c-mux kmod-i2c-mux-pca954x
 -  IMAGES := $$(IMAGE_PREFIX)-sysupgrade.img.gz omnia-medkit-$$(IMAGE_PREFIX)-initramfs.tar.gz
--  IMAGE/$$(IMAGE_PREFIX)-sysupgrade.img.gz := boot-img | sdcard-img | gzip | append-metadata
+-  IMAGE/$$(IMAGE_PREFIX)-sysupgrade.img.gz := boot-scr | boot-img | sdcard-img | gzip | append-metadata
 -  IMAGE/omnia-medkit-$$(IMAGE_PREFIX)-initramfs.tar.gz := omnia-medkit-initramfs | gzip
 -  IMAGE_NAME = $$(2)
    DEVICE_DTS := armada-385-turris-omnia
    SUPPORTED_DEVICES += armada-385-turris-omnia
- endef
+   BOOT_SCRIPT := turris-omnia
 -- 
-2.21.0
+2.25.1
 

patches/openwrt/to-upstream/0019-u-boot-tools-Add-mkimage-tool.patch

@@ -59,7 +59,7 @@ index 49428a5..e9f13e6 100644
 +PKG_NAME:=uboot-tools
  PKG_DISTNAME:=u-boot
  PKG_VERSION:=2018.03
- PKG_RELEASE:=4
+ PKG_RELEASE:=3.1
 @@ -43,19 +43,50 @@ define Package/uboot-envtools/description
   This package includes tools to read and modify U-Boot bootloader environment.
  endef

patches/openwrt/wip/0002-Add-Turris-1.X-support-kernel-4.14.patch

@@ -31,8 +31,8 @@ index e9f13e6..8c75e60 100644
  PKG_NAME:=uboot-tools
  PKG_DISTNAME:=u-boot
  PKG_VERSION:=2018.03
--PKG_RELEASE:=4
-+PKG_RELEASE:=5
+-PKG_RELEASE:=3.1
++PKG_RELEASE:=4
  
  PKG_SOURCE_PROTO:=git
  PKG_SOURCE:=$(PKG_DISTNAME)-$(PKG_VERSION).tar.xz