motorola-ali: updated arch to arm64, updated gcc version, and removed unused patches (MR 1281)

device/testing/device-motorola-ali/APKBUILD

@@ -2,10 +2,10 @@
 pkgname=device-motorola-ali
 pkgdesc="Motorola Moto G6"
 pkgver=0.1
-pkgrel=1
+pkgrel=2
 url="https://postmarketos.org"
 license="MIT"
-arch="armv7"
+arch="aarch64"
 options="!check !archcheck"
 depends="postmarketos-base linux-motorola-ali mkbootimg mesa-dri-swrast msm-fb-refresher mdss-fb-init-hack"
 makedepends="devicepkg-dev"
@@ -22,7 +22,7 @@ package() {
 }
 
 
-sha512sums="b48c9ea3ea30546636684af4a884d1c0438cead05ac3e9181a8895ee5dd1022e481fc4c2d935a2590002fb7f0e0fd64da0d11eec8fed1acfab6d76bc5a82a613  deviceinfo
+sha512sums="b2d45dbd55118d6e139196137c14f1510bd6dd4da69f026fe61830d9f68abb8bbe1cd5e4b505bd46f7653247cb699f6051fc343dfadc536c5fd0096962800ff2  deviceinfo
 977537b59e0f89d0db475108baae1d93a6678569ec4d7ab7c909562ebea7d645efb6a73b509b3e37369c1c556a8760cd9f46ba4e9bbb86e400cabcc0c2960230  initfs-hook.sh
 3db3ec596e159be926ea2b5b2496c18e9bc7be24a64a232a56c89a0c9ee710aa2efb2b6fa9fc08efa34759e8242e6c629d08a4ce688ec8aa125830717c191515  directfbrc
 e8ee37f49b360e06f7b5d54a93fcd2a7b3261436b2a228e8457a5c44fb52510f6173332155701a9d8ed435466732921ea5836aed73f1e7bc4049635f5a71fb31  fb.modes"

device/testing/device-motorola-ali/deviceinfo

@@ -8,7 +8,7 @@ deviceinfo_codename="motorola-ali"
 deviceinfo_year="2018"
 deviceinfo_dtb=""
 deviceinfo_modules_initfs=""
-deviceinfo_arch="armv7"
+deviceinfo_arch="aarch64"
 
 # Device related
 deviceinfo_chassis="handset"

device/testing/linux-motorola-ali/01_maserati-fix-gcc6-compile.patch

@@ -1,93 +0,0 @@
-From 51a1339a3206ed275b8021958a9a8d237322f9fa Mon Sep 17 00:00:00 2001
-From: NeKit <nekit1000@gmail.com>
-Date: Sun, 10 Dec 2017 14:41:20 +0300
-Subject: [PATCH] Fix compile errors with gcc6 on postmarketOS
-
-Change-Id: I1f426c864a0377b33b27da5cc6476f6ff888b6cb
----
- arch/arm/include/asm/ftrace.h    | 2 +-
- arch/arm/kernel/return_address.c | 5 -----
- include/linux/i2c/twl.h          | 2 +-
- kernel/timeconst.pl              | 2 +-
- scripts/mod/elf.h                | 5 -----
- 5 files changed, 3 insertions(+), 13 deletions(-)
-
-diff --git a/arch/arm/include/asm/ftrace.h b/arch/arm/include/asm/ftrace.h
-index f89515adac6..2bb8cac28b9 100644
---- a/arch/arm/include/asm/ftrace.h
-+++ b/arch/arm/include/asm/ftrace.h
-@@ -45,7 +45,7 @@ void *return_address(unsigned int);
- 
- #else
- 
--extern inline void *return_address(unsigned int level)
-+static inline void *return_address(unsigned int level)
- {
- 	return NULL;
- }
-diff --git a/arch/arm/kernel/return_address.c b/arch/arm/kernel/return_address.c
-index 0b13a72f855..8bf0a5abec9 100644
---- a/arch/arm/kernel/return_address.c
-+++ b/arch/arm/kernel/return_address.c
-@@ -62,11 +62,6 @@ void *return_address(unsigned int level)
- #warning "TODO: return_address should use unwind tables"
- #endif
- 
--void *return_address(unsigned int level)
--{
--	return NULL;
--}
--
- #endif /* if defined(CONFIG_FRAME_POINTER) && !defined(CONFIG_ARM_UNWIND) / else */
- 
- EXPORT_SYMBOL_GPL(return_address);
-diff --git a/include/linux/i2c/twl.h b/include/linux/i2c/twl.h
-index 947543a0fba..ec7c8855117 100644
---- a/include/linux/i2c/twl.h
-+++ b/include/linux/i2c/twl.h
-@@ -735,7 +735,7 @@ static inline int twl4030_remove_script(u8 flags) { return -EINVAL; }
- #ifdef CONFIG_TWL6030_POWER
- extern void twl6030_power_init(struct twl4030_power_data *power_data);
- #else
--extern inline void twl6030_power_init(struct twl4030_power_data *power_data) { }
-+static inline void twl6030_power_init(struct twl4030_power_data *power_data) { }
- #endif
- 
- struct twl4030_codec_audio_data {
-diff --git a/kernel/timeconst.pl b/kernel/timeconst.pl
-index eb51d76e058..2ccb8fb87a1 100644
---- a/kernel/timeconst.pl
-+++ b/kernel/timeconst.pl
-@@ -370,7 +370,7 @@ if ($hz eq '--can') {
- 	}
- 
- 	@val = @{$canned_values{$hz}};
--	if (!defined(@val)) {
-+	if (!@val) {
- 		@val = compute_values($hz);
- 	}
- 	output($hz, @val);
-diff --git a/scripts/mod/elf.h b/scripts/mod/elf.h
-index aba4d0c4c1c..f898d3ee28b 100644
---- a/scripts/mod/elf.h
-+++ b/scripts/mod/elf.h
-@@ -22,8 +22,6 @@
- 
- /* #include <features.h> */
- 
--__BEGIN_DECLS
--
- /* Standard ELF types.  */
- 
- #include <stdint.h>
-@@ -2507,7 +2505,4 @@ typedef Elf32_Addr Elf32_Conflict;
- /* Keep this the last entry.  */
- #define R_V850_NUM		25
- 
--
--__END_DECLS
--
- #endif	/* elf.h */
--- 
-2.13.2
-

device/testing/linux-motorola-ali/02_fix_msm_dba.patch

@@ -1,13 +0,0 @@
-diff --git a/drivers/video/msm/msm_dba/msm_dba.c b/drivers/video/msm/msm_dba/msm_dba.c
-index cc6512a..eb073a7 100644
---- a/drivers/video/msm/msm_dba/msm_dba.c
-+++ b/drivers/video/msm/msm_dba/msm_dba.c
-@@ -22,7 +22,7 @@
- #include <linux/err.h>
- 
- #include <video/msm_dba.h>
--#include <msm_dba_internal.h>
-+#include "msm_dba_internal.h"
- 
- static DEFINE_MUTEX(register_mutex);
- 

device/testing/linux-motorola-ali/03_fix_rndis_ipa_trace_header_not_found.patch

@@ -1,22 +0,0 @@
-diff --git a/drivers/net/ethernet/msm/rndis_ipa_trace.h b/drivers/net/ethernet/msm/rndis_ipa_trace.h
-index c0fc573..c18046b 100644
---- a/drivers/net/ethernet/msm/rndis_ipa_trace.h
-+++ b/drivers/net/ethernet/msm/rndis_ipa_trace.h
-@@ -77,5 +77,5 @@ TRACE_EVENT(
-
- /* This part must be outside protection */
- #undef TRACE_INCLUDE_PATH
--#define TRACE_INCLUDE_PATH .
-+#define TRACE_INCLUDE_PATH ../../drivers/net/ethernet/msm/
- #include <trace/define_trace.h>
-diff --git a/drivers/platform/msm/ipa/ipa_v2/ipa_trace.h b/drivers/platform/msm/ipa/ipa_v2/ipa_trace.h
-index d70abdf..7f7e452 100644
---- a/drivers/platform/msm/ipa/ipa_v2/ipa_trace.h
-+++ b/drivers/platform/msm/ipa/ipa_v2/ipa_trace.h
-@@ -131,5 +131,5 @@ TRACE_EVENT(
-
- /* This part must be outside protection */
- #undef TRACE_INCLUDE_PATH
--#define TRACE_INCLUDE_PATH .
-+#define TRACE_INCLUDE_PATH ../../drivers/platform/msm/ipa/ipa_v2/
- #include <trace/define_trace.h>

device/testing/linux-motorola-ali/APKBUILD

@@ -1,24 +1,17 @@
+# Maintainer: Uclydde <julianbraha@gmail.com>
 # Reference: <https://postmarketos.org/vendorkernel>
-# Kernel config based on: arch/arm/configs/ali_defconfig
 
 pkgname=linux-motorola-ali
 pkgver=3.18.140
-pkgrel=0
+pkgrel=1
 pkgdesc="Motorola Moto G6 kernel fork"
-arch="armv7"
+arch="aarch64"
-_carch="arm"
+_carch="arm64"
 _flavor="motorola-ali"
 url="https://kernel.org"
 license="GPL-2.0-only"
 options="!strip !check !tracedeps pmb:cross-native"
-makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev devicepkg-dev dtbtool gcc6"
+makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev devicepkg-dev openssl-dev"
-
-# Compiler: GCC 6 (doesn't boot when compiled with newer versions)
-if [ "${CC:0:5}" != "gcc6-" ]; then
-	CC="gcc6-$CC"
-	HOSTCC="gcc6-gcc"
-	CROSS_COMPILE="gcc6-$CROSS_COMPILE"
-fi
 
 # Source
 _repository="kernel-msm"
@@ -27,7 +20,6 @@ _config="config-$_flavor.$arch"
 source="
 	$pkgname-$_commit.tar.gz::https://github.com/Uclydde/$_repository/archive/$_commit.tar.gz
 	$_config
-	01_prima_gcc6.patch
 	04_fix_stmvl53l0_headers.patch
 	fix_focaltech_recursive_dependency.patch
 	fix_mdp_ctrl_off.patch
@@ -46,11 +38,8 @@ prepare() {
 
 build() {
 	unset LDFLAGS
-	make ARCH="$_carch" O="$_outdir" CC="${CC:-gcc}" \
+	make O="$_outdir" ARCH="$_carch" CC="${CC:-gcc}" \
 		KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-postmarketOS"
-
-	# Generate master DTB (deviceinfo_bootimg_qcdt)
-	dtbTool -s 2048 -p "scripts/dtc/" -o "$_outdir/arch/arm/boot/dt.img" "$_outdir/arch/arm/boot/"
 }
 
 package() {
@@ -58,8 +47,7 @@ package() {
 }
 
 sha512sums="9ce6156aa8fd62ba1dff15413b526a870f45368d72774690f43229de82935acc52fcc58467e9bb72cca889ce03f6978ef1be454fd671c0fe845341c09d51d648  linux-motorola-ali-974646412f6e865f6847a7c6b72528f3a14bdb56.tar.gz
-18b2bcf7dacfd2b963162a85a21bed437bbb78aa68f1dd33637d7d853b83897876055467276f8d2d9c057ee6cea139231b37ea4757af3a281ba7e0676a55b818  config-motorola-ali.armv7
+791085fd1dff2041a7346d7665736bfd638b5f96216171254ba5cc2fd164722e41022d38ada700a6d998f40372b09bcb8fddcc41b0cba72f10155022afb2f74c  config-motorola-ali.aarch64
-e32df5d5251c74bafa4a27973129b4a7b79097a8d406832316ae2ff18f516d76fbc0cd289b67344981efdf62d92ff439f7b573a1ac895c3e79271ee95fcf9610  01_prima_gcc6.patch
 1a128e1483459144726458175314c58528e6b1f1a85e5f4230fa0461b0c3dd650037567f672c220a95618f9df023a82a35f010e8e8b784e349806516c1daaf7e  04_fix_stmvl53l0_headers.patch
 e2cf5b20831c05881780b7db1f40135ca7c8e0d2a4f7a8afa4eee16c7eae1711f2f02f72266309d52cb4437e9580ed58472e768c266f1283994ab1098861e9fc  fix_focaltech_recursive_dependency.patch
 3ccfaf591befba3b67d24134a516352173767cac0479d3011f077866e02a792f3581e50d05110375a8f84876213823d37d3791c4cb82f19f212bc4bee57934c8  fix_mdp_ctrl_off.patch

device/testing/linux-motorola-ali/fix-include-msm_camera_i2c.patch

@@ -1,18 +0,0 @@
-diff --git a/drivers/media/platform/msm/camera_v2/sensor/msm_sensor.h b/drivers/media/platform/msm/camera_v2/sensor/msm_sensor.h
-index 5d57ec8c28ff..cc69fa018d65 100644
---- a/drivers/media/platform/msm/camera_v2/sensor/msm_sensor.h
-+++ b/drivers/media/platform/msm/camera_v2/sensor/msm_sensor.h
-@@ -31,9 +31,10 @@
- #include <media/msm_cam_sensor.h>
- #include <media/v4l2-subdev.h>
- #include <media/v4l2-ioctl.h>
--#include "msm_camera_i2c.h"
--#include "msm_camera_dt_util.h"
--#include "msm_sd.h"
-+
-+#include "io/msm_camera_i2c.h"
-+#include "io/msm_camera_dt_util.h"
-+#include "../msm_sd.h"
- 
- #define DEFINE_MSM_MUTEX(mutexname) \
- 	static struct mutex mutexname = __MUTEX_INITIALIZER(mutexname)

device/testing/linux-motorola-ali/fix-include-msm_isp.patch

@@ -1,12 +0,0 @@
-diff --git a/include/trace/events/msm_cam.h b/include/trace/events/msm_cam.h
-index b52845407ef0..2cd283db8d32 100644
---- a/include/trace/events/msm_cam.h
-+++ b/include/trace/events/msm_cam.h
-@@ -16,7 +16,7 @@
- #if !defined(_TRACE_MSM_VFE_H) || defined(TRACE_HEADER_MULTI_READ)
- #define _TRACE_MSM_VFE_H
- 
--#include "msm_isp.h"
-+#include "../../../drivers/media/platform/msm/camera_v2/isp/msm_isp.h"
- #include <linux/types.h>
- #include <linux/tracepoint.h>

device/testing/linux-motorola-ali/fix_msm_dba.patch

@@ -1,13 +0,0 @@
-diff --git a/drivers/video/msm/msm_dba/msm_dba.c b/drivers/video/msm/msm_dba/msm_dba.c
-index cc6512a..eb073a7 100644
---- a/drivers/video/msm/msm_dba/msm_dba.c
-+++ b/drivers/video/msm/msm_dba/msm_dba.c
-@@ -22,7 +22,7 @@
- #include <linux/err.h>
- 
- #include <video/msm_dba.h>
--#include <msm_dba_internal.h>
-+#include "msm_dba_internal.h"
- 
- static DEFINE_MUTEX(register_mutex);
- 

device/testing/linux-motorola-ali/fix_symlink_gsi.patch

@@ -1,10 +0,0 @@
-diff --git a/drivers/usb/gadget/function/f_gsi.c b/drivers/usb/gadget/function/f_gsi.c
-@@ -19,7 +19,7 @@
- #include <linux/timer.h>
- #include "f_gsi.h"
- #include "rndis.h"
--#include "debug.h"
-+#include "../debug.h"
-
- static unsigned int gsi_in_aggr_size;
- module_param(gsi_in_aggr_size, uint, S_IRUGO | S_IWUSR);

device/testing/linux-motorola-ali/fix_symlink_midi.patch

@@ -1,10 +0,0 @@
-diff --git a/drivers/usb/gadget/function/f_midi.c b/drivers/usb/gadget/function/f_midi.c
-@@ -32,7 +32,7 @@
- #include <linux/usb/audio.h>
- #include <linux/usb/midi.h>
-
--#include "u_f.h"
-+#include "../u_f.h"
-
- MODULE_AUTHOR("Ben Williamson");
- MODULE_LICENSE("GPL v2");

device/testing/linux-motorola-ali/fix_symlink_mtp.patch

@@ -1,16 +0,0 @@
-diff --git a/drivers/usb/gadget/function/f_mtp.c b/drivers/usb/gadget/function/f_mtp.c
-@@ -40,7 +40,7 @@
- #include <linux/configfs.h>
- #include <linux/usb/composite.h>
-
--#include "configfs.h"
-+#include "../configfs.h"
-
- #define MTP_RX_BUFFER_INIT_SIZE    1048576
- #define MTP_BULK_BUFFER_SIZE       16384
-@@ -1924,4 +1924,4 @@
- }
-
- DECLARE_USB_FUNCTION_INIT(mtp, mtp_alloc_inst, mtp_alloc);
--MODULE_LICENSE("GPL");
-+MODULE_LICENSE("GPL");

device/testing/linux-motorola-ali/fix_symlink_rndis.patch

@@ -1,10 +0,0 @@
-diff --git a/drivers/usb/gadget/function/f_rndis.c b/drivers/usb/gadget/function/f_rndis.c
-@@ -27,7 +27,7 @@
- #include "u_ether_configfs.h"
- #include "u_rndis.h"
- #include "rndis.h"
--#include "configfs.h"
-+#include "../configfs.h"
-
- /*
-  * This function is an RNDIS Ethernet port -- a Microsoft protocol that's