From 6960978b4ff2bfe73300a32ec3c70219f7cb8b5e Mon Sep 17 00:00:00 2001
From: chewitt <christianshewitt@gmail.com>
Date: Thu, 20 Feb 2020 11:01:09 +0000
Subject: [PATCH] amlogic: fix project/device options and add
 systemd.debug_shell to boot params

---
 projects/Amlogic/devices/AMLG12/options | 15 ---------------
 projects/Amlogic/devices/AMLGX/options  | 19 ++++---------------
 projects/Amlogic/options                | 17 ++++++++++++++++-
 3 files changed, 20 insertions(+), 31 deletions(-)

diff --git a/projects/Amlogic/devices/AMLG12/options b/projects/Amlogic/devices/AMLG12/options
index 6a43ebe9db..319a48fb87 100644
--- a/projects/Amlogic/devices/AMLG12/options
+++ b/projects/Amlogic/devices/AMLG12/options
@@ -21,21 +21,6 @@
         ;;
     esac
 
-  # Kernel target
-    KERNEL_TARGET="uImage.lzo"
-
-  # Kernel uImage load address
-    KERNEL_UIMAGE_LOADADDR="0x1980000"
-
-  # Kernel uImage entry address
-    KERNEL_UIMAGE_ENTRYADDR="0x1980000"
-
-  # Additional kernel make parameters
-    KERNEL_MAKE_EXTRACMD="dtbs"
-
-  # kernel serial console
-    EXTRA_CMDLINE="console=ttyAML0,115200n8 console=tty0"
-
   # OpenGL-ES implementation to use
     OPENGLES="libmali"
 
diff --git a/projects/Amlogic/devices/AMLGX/options b/projects/Amlogic/devices/AMLGX/options
index 9bab35f01d..f3eac9fba8 100644
--- a/projects/Amlogic/devices/AMLGX/options
+++ b/projects/Amlogic/devices/AMLGX/options
@@ -21,21 +21,6 @@
         ;;
     esac
 
-  # Kernel target
-    KERNEL_TARGET="uImage.lzo"
-
-  # Kernel uImage load address
-    KERNEL_UIMAGE_LOADADDR="0x1980000"
-
-  # Kernel uImage entry address
-    KERNEL_UIMAGE_ENTRYADDR="0x1980000"
-
-  # Additional kernel make parameters
-    KERNEL_MAKE_EXTRACMD="dtbs"
-
-  # kernel serial console
-    EXTRA_CMDLINE="console=ttyAML0,115200n8 console=tty0"
-
   # OpenGL-ES implementation to use
     OPENGLES="mesa"
 
@@ -47,3 +32,7 @@
 
   # Mali GPU family
     MALI_FAMILY="450 t820"
+
+  # set the addon dirs
+    ADDON_PATH="$ADDON_VERSION/AMLG12/$TARGET_ARCH"
+    ADDON_URL="$ADDON_SERVER_URL/$ADDON_PATH"
diff --git a/projects/Amlogic/options b/projects/Amlogic/options
index aa86bf7c0c..d61cd46be2 100644
--- a/projects/Amlogic/options
+++ b/projects/Amlogic/options
@@ -11,6 +11,21 @@
   # Kernel to use
     LINUX="amlogic"
 
+  # Kernel target
+    KERNEL_TARGET="uImage.lzo"
+
+  # Kernel uImage load address
+    KERNEL_UIMAGE_LOADADDR="0x1080000"
+
+  # Kernel uImage entry address
+    KERNEL_UIMAGE_ENTRYADDR="0x1080000"
+
+  # Additional kernel make parameters
+    KERNEL_MAKE_EXTRACMD="dtbs"
+
+  # kernel serial console
+    EXTRA_CMDLINE="systemd.debug_shell=ttyAML0 console=ttyAML0,115200n8 console=tty0"
+
 ################################################################################
 # setup build defaults
 ################################################################################
@@ -43,7 +58,7 @@
   # additional Firmware to use (dvb-firmware, misc-firmware, wlan-firmware)
   # Space separated list is supported,
   # e.g. FIRMWARE="dvb-firmware misc-firmware wlan-firmware"
-    FIRMWARE="dvb-firmware brcmfmac_sdio-firmware kernel-firmware"
+    FIRMWARE="dvb-firmware brcmfmac_sdio-firmware kernel-firmware qca-firmware"
 
   # build with installer (yes / no)
     INSTALLER_SUPPORT="no"