From bedc19439fb939d55b938f8d0f6bd73b49e07b99 Mon Sep 17 00:00:00 2001
From: zador-blood-stained <zador-blood-stained@users.noreply.github.com>
Date: Sun, 29 Apr 2018 15:47:40 +0300
Subject: [PATCH] Merge safe changes from development to master, part 1

---
 config/boards/bananapim2ultra.csc              | 2 +-
 config/boards/bananapipro.conf                 | 2 +-
 config/boards/odroidc2.conf                    | 4 ++--
 config/boards/orangepiplus2e.conf              | 4 ++--
 config/bootscripts/boot-odroid-xu4-default.ini | 1 +
 config/sources/mvebu.conf                      | 8 ++++----
 config/templates/customize-image.sh.template   | 4 ++++
 7 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/config/boards/bananapim2ultra.csc b/config/boards/bananapim2ultra.csc
index edf6b0608..bf98b73ee 100644
--- a/config/boards/bananapim2ultra.csc
+++ b/config/boards/bananapim2ultra.csc
@@ -1,5 +1,5 @@
 # R40 quad core 2Gb SoC Wifi eMMC
-BOARD_NAME="Banana Pi M2 Ultra"
+BOARD_NAME="Banana Pi M2U"
 BOARDFAMILY="sun8i"
 BOOTCONFIG="Bananapi_M2_Ultra_defconfig"
 MODULES=""
diff --git a/config/boards/bananapipro.conf b/config/boards/bananapipro.conf
index c625030ef..4b310def6 100644
--- a/config/boards/bananapipro.conf
+++ b/config/boards/bananapipro.conf
@@ -9,7 +9,7 @@ KERNEL_TARGET="default,next,dev"
 CLI_TARGET="stretch,xenial:next"
 DESKTOP_TARGET="xenial:default,next"
 #
-CLI_BETA_TARGET=""
+CLI_BETA_TARGET="xenial:dev"
 DESKTOP_BETA_TARGET=""
 #
 RECOMMENDED="Ubuntu_xenial_default_desktop:90,Debian_stretch_next:100"
diff --git a/config/boards/odroidc2.conf b/config/boards/odroidc2.conf
index 35f3ca135..f6f29c16f 100644
--- a/config/boards/odroidc2.conf
+++ b/config/boards/odroidc2.conf
@@ -12,8 +12,8 @@ KERNEL_TARGET="default,next,dev"
 CLI_TARGET="jessie,xenial:default"
 DESKTOP_TARGET="xenial:default"
 
-CLI_BETA_TARGET="stretch:next"
-DESKTOP_BETA_TARGET=""
+CLI_BETA_TARGET="jessie,xenial,stretch:next"
+DESKTOP_BETA_TARGET="jessie,xenial,stretch:next"
 #
 RECOMMENDED="Ubuntu_xenial_default_desktop:90,Debian_jessie_default:90"
 #
diff --git a/config/boards/orangepiplus2e.conf b/config/boards/orangepiplus2e.conf
index 939e5f78d..b9d5d6c98 100644
--- a/config/boards/orangepiplus2e.conf
+++ b/config/boards/orangepiplus2e.conf
@@ -12,8 +12,8 @@ KERNEL_TARGET="default,next,dev"
 CLI_TARGET="stretch,xenial:next"
 DESKTOP_TARGET="xenial:default"
 #
-CLI_BETA_TARGET=""
-DESKTOP_BETA_TARGET=""
+CLI_BETA_TARGET="jessie,xenial,stretch:next"
+DESKTOP_BETA_TARGET="jessie,xenial,stretch:next"
 #
 RECOMMENDED="Ubuntu_xenial_default_desktop:90,Debian_stretch_next:75"
 #
diff --git a/config/bootscripts/boot-odroid-xu4-default.ini b/config/bootscripts/boot-odroid-xu4-default.ini
index 30cb3dadb..722717d6c 100644
--- a/config/bootscripts/boot-odroid-xu4-default.ini
+++ b/config/bootscripts/boot-odroid-xu4-default.ini
@@ -245,6 +245,7 @@ ext4load mmc 0:1 0x42000000 /boot/uInitrd || fatload mmc 0:1 0x42000000 uInitrd
 if test "${board_name}" = "xu4"; then setenv fdtfile "exynos5422-odroidxu4.dtb"; fi
 if test "${board_name}" = "xu3"; then setenv fdtfile "exynos5422-odroidxu3.dtb"; fi
 if test "${board_name}" = "xu3l"; then setenv fdtfile "exynos5422-odroidxu3-lite.dtb"; fi
+if test "${board_name}" = "hc1"; then setenv fdtfile "exynos5422-odroidhc1.dtb"; fi
 
 # legacy shares a single DT for all boards
 if ext4load mmc 0:1 0x00000000 "/boot/.next" || fatload mmc 0:1 0x00000000 ".next"  || ext4load mmc 0:1 0x00000000 ".next"; then echo "Found mainline kernel configuration"; else setenv fdtfile "exynos5422-odroidxu3.dtb"; fi
diff --git a/config/sources/mvebu.conf b/config/sources/mvebu.conf
index 227fdd8b1..700c3742f 100644
--- a/config/sources/mvebu.conf
+++ b/config/sources/mvebu.conf
@@ -37,10 +37,10 @@ case $BRANCH in
 
 	OVERLAY_PREFIX='armada-388'
 
-	KERNELSOURCE='git://git.armlinux.org.uk/~rmk/linux-arm.git'
-	KERNELBRANCH='branch:clearfog'
-	KERNELDIR='linux-mvebu-dev'
-#	LINUXCONFIG='linux-mvebu-next'
+	KERNELSOURCE=$MAINLINE_KERNEL_SOURCE
+	KERNELBRANCH='branch:linux-4.14.y'
+	KERNELDIR=$MAINLINE_KERNEL_DIR
+	LINUXCONFIG='linux-mvebu-next'
 
 	KERNEL_USE_GCC='> 7.0'
 	;;
diff --git a/config/templates/customize-image.sh.template b/config/templates/customize-image.sh.template
index 285de0d35..e1e24a98d 100644
--- a/config/templates/customize-image.sh.template
+++ b/config/templates/customize-image.sh.template
@@ -29,6 +29,10 @@ Main() {
 			# your code here
 			# InstallOpenMediaVault # uncomment to get an OMV 4 image
 			;;
+		bionic)
+			# your code here
+			# InstallOpenMediaVault # uncomment to get an OMV 4 image
+			;;
 	esac
 } # Main