From d4fe623b6a3caf922ec522945a7aae9c395db0ff Mon Sep 17 00:00:00 2001
From: demetris <ierokipides.dem@gmail.com>
Date: Fri, 30 Dec 2016 00:11:23 +0200
Subject: [PATCH] Add basic *devices* support to all amlogic boards

---
 projects/S802/devices/M8/options          | 3 +++
 projects/S802/devices/MXIII-1G/options    | 3 +++
 projects/S802/devices/S82/options         | 3 +++
 projects/S802/devices/T8/options          | 5 ++++-
 projects/S802/options                     | 6 ------
 projects/S805/devices/MK808B.Plus/options | 3 +++
 projects/S805/devices/MXQ/options         | 3 +++
 projects/S805/devices/m201d/options       | 3 +++
 scripts/image                             | 2 +-
 9 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/projects/S802/devices/M8/options b/projects/S802/devices/M8/options
index a87cd0123..7122f857d 100644
--- a/projects/S802/devices/M8/options
+++ b/projects/S802/devices/M8/options
@@ -1,2 +1,5 @@
   # Kernel extra targets to build
   KERNEL_UBOOT_EXTRA_TARGET="meson8_m8_2G.dtd meson8_m8_2G.dtb"
+
+# Path to a file that will be passed as the --second parameter to Android mkbootimg
+  ANDROID_BOOTIMG_SECOND="arch/arm/boot/dts/amlogic/meson8_m8_2G.dtb"
diff --git a/projects/S802/devices/MXIII-1G/options b/projects/S802/devices/MXIII-1G/options
index 3a6bb3c31..1bd91d994 100644
--- a/projects/S802/devices/MXIII-1G/options
+++ b/projects/S802/devices/MXIII-1G/options
@@ -1,2 +1,5 @@
   # Kernel extra targets to build
   KERNEL_UBOOT_EXTRA_TARGET=" meson8_k200b_1G_emmc_sdio.dtd meson8_k200b_1G_emmc_sdio.dtb"
+
+# Path to a file that will be passed as the --second parameter to Android mkbootimg
+  ANDROID_BOOTIMG_SECOND="arch/arm/boot/dts/amlogic/meson8_k200b_1G_emmc_sdio.dtb"
diff --git a/projects/S802/devices/S82/options b/projects/S802/devices/S82/options
index 22ae0ab59..f56040e7c 100644
--- a/projects/S802/devices/S82/options
+++ b/projects/S802/devices/S82/options
@@ -1,2 +1,5 @@
   # Kernel extra targets to build
   KERNEL_UBOOT_EXTRA_TARGET="meson8_k200b_2G_emmc_sdio.dtd meson8_k200b_2G_emmc_sdio.dtb"
+
+# Path to a file that will be passed as the --second parameter to Android mkbootimg
+  ANDROID_BOOTIMG_SECOND="arch/arm/boot/dts/amlogic/meson8_k200b_2G_emmc_sdio.dtb"
diff --git a/projects/S802/devices/T8/options b/projects/S802/devices/T8/options
index 734c955c5..8ab37598c 100644
--- a/projects/S802/devices/T8/options
+++ b/projects/S802/devices/T8/options
@@ -1,2 +1,5 @@
   # Kernel extra targets to build
-  KERNEL_UBOOT_EXTRA_TARGET="meson8_t8_2G.dtd meson8_t8_2G.dtb"
\ No newline at end of file
+  KERNEL_UBOOT_EXTRA_TARGET="meson8_t8_2G.dtd meson8_t8_2G.dtb"
+
+# Path to a file that will be passed as the --second parameter to Android mkbootimg
+  ANDROID_BOOTIMG_SECOND="arch/arm/boot/dts/amlogic/meson8_t8_2G.dtb"
diff --git a/projects/S802/options b/projects/S802/options
index 17fff11ef..34acd109b 100644
--- a/projects/S802/options
+++ b/projects/S802/options
@@ -23,15 +23,9 @@
   # Kernel target
     KERNEL_UBOOT_TARGET="uImage"
 
- # Kernel extra targets to build
-    KERNEL_UBOOT_EXTRA_TARGET="meson8_k200b_2G_emmc_sdio.dtd meson8_k200b_2G_emmc_sdio.dtb"
-
   # Build Android kernel image using mkbootimg
     BUILD_ANDROID_BOOTIMG="yes"
 
-  # Path to a file that will be passed as the --second parameter to Android mkbootimg
-    ANDROID_BOOTIMG_SECOND="arch/arm/boot/dts/amlogic/meson8_k200b_2G_emmc_sdio.dtb"
-
   # Additional kernel make parameters (for example to specify the u-boot loadaddress)
     KERNEL_MAKE_EXTRACMD=""
 
diff --git a/projects/S805/devices/MK808B.Plus/options b/projects/S805/devices/MK808B.Plus/options
index 3f090b661..394f139ca 100644
--- a/projects/S805/devices/MK808B.Plus/options
+++ b/projects/S805/devices/MK808B.Plus/options
@@ -1,2 +1,5 @@
 # Kernel extra targets to build
   KERNEL_UBOOT_EXTRA_TARGET="meson8b_mk808bplus.dtd meson8b_mk808bplus.dtb"
+
+# Path to a file that will be passed as the --second parameter to Android mkbootimg
+  ANDROID_BOOTIMG_SECOND="arch/arm/boot/dts/amlogic/meson8b_mk808bplus.dtb"
diff --git a/projects/S805/devices/MXQ/options b/projects/S805/devices/MXQ/options
index 55416314e..844ad60d6 100644
--- a/projects/S805/devices/MXQ/options
+++ b/projects/S805/devices/MXQ/options
@@ -1,2 +1,5 @@
 # Kernel extra targets to build
   KERNEL_UBOOT_EXTRA_TARGET="meson8b_mxq.dtd meson8b_mxq.dtb"
+
+# Path to a file that will be passed as the --second parameter to Android mkbootimg
+  ANDROID_BOOTIMG_SECOND="arch/arm/boot/dts/amlogic/meson8b_mxq.dtb"
diff --git a/projects/S805/devices/m201d/options b/projects/S805/devices/m201d/options
index 05c76ddd3..a2bd02042 100644
--- a/projects/S805/devices/m201d/options
+++ b/projects/S805/devices/m201d/options
@@ -1,2 +1,5 @@
 # Kernel extra targets to build
   KERNEL_UBOOT_EXTRA_TARGET="meson8b_m201C_512M.dtd meson8b_m201C_512M.dtb"
+
+# Path to a file that will be passed as the --second parameter to Android mkbootimg
+  ANDROID_BOOTIMG_SECOND="arch/arm/boot/dts/amlogic/meson8b_m201C_512M.dtb"
diff --git a/scripts/image b/scripts/image
index c6082c1f9..3e6b22fe6 100755
--- a/scripts/image
+++ b/scripts/image
@@ -41,7 +41,7 @@ if [ "$OPENELEC_VERSION" = devel ]; then
 fi
 
 TARGET_VERSION="$PROJECT"
-if [ "$PROJECT" == "imx6" -o "$PROJECT" == "H3" -o "$PROJECT" == "S805" ] && [ -n "$SYSTEM" ]; then
+if [ "$PROJECT" == "imx6" -o "$PROJECT" == "H3" -o "$PROJECT" == "S802" -o "$PROJECT" == "S805" ] && [ -n "$SYSTEM" ]; then
   TARGET_VERSION="$TARGET_VERSION.$SYSTEM"
 fi
 TARGET_VERSION="$TARGET_VERSION.$TARGET_ARCH-$OPENELEC_VERSION"