diff --git a/device/testing/device-motorola-ali/APKBUILD b/device/testing/device-motorola-ali/APKBUILD index 1898b9a4d..ae56ad693 100644 --- a/device/testing/device-motorola-ali/APKBUILD +++ b/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" diff --git a/device/testing/device-motorola-ali/deviceinfo b/device/testing/device-motorola-ali/deviceinfo index 3efffc4bc..6b2b36e54 100644 --- a/device/testing/device-motorola-ali/deviceinfo +++ b/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" diff --git a/device/testing/linux-motorola-ali/01_maserati-fix-gcc6-compile.patch b/device/testing/linux-motorola-ali/01_maserati-fix-gcc6-compile.patch deleted file mode 100644 index 4dcc8c941..000000000 --- a/device/testing/linux-motorola-ali/01_maserati-fix-gcc6-compile.patch +++ /dev/null @@ -1,93 +0,0 @@ -From 51a1339a3206ed275b8021958a9a8d237322f9fa Mon Sep 17 00:00:00 2001 -From: NeKit -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 */ - --__BEGIN_DECLS -- - /* Standard ELF types. */ - - #include -@@ -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 - diff --git a/device/testing/linux-motorola-ali/02_fix_msm_dba.patch b/device/testing/linux-motorola-ali/02_fix_msm_dba.patch deleted file mode 100644 index 2061842c0..000000000 --- a/device/testing/linux-motorola-ali/02_fix_msm_dba.patch +++ /dev/null @@ -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 - - #include