diff --git a/device/downstream/linux-wiko-lenny3/APKBUILD b/device/downstream/linux-wiko-lenny3/APKBUILD index 3722255e5..997572bae 100644 --- a/device/downstream/linux-wiko-lenny3/APKBUILD +++ b/device/downstream/linux-wiko-lenny3/APKBUILD @@ -2,7 +2,7 @@ pkgname=linux-wiko-lenny3 pkgver=3.18.19 -pkgrel=6 +pkgrel=7 pkgdesc="Wiko Lenny 3 Kernel" arch="armhf" _carch="arm" @@ -31,6 +31,8 @@ source=" 01_add_generated_cust_dtsi.patch 02_fix_various_include_directives.patch gcc10-extern_YYLOC_global_declaration.patch + linux3.4-ARM-8933-1-replace-Sun-Solaris-style-flag-on-section.patch + linux3.4-fix-piggy.gzip.S.patch " builddir="$srcdir/linux-wiko-lenny3-$_commit" @@ -56,4 +58,6 @@ sha512sums=" adda36d779a79b2f840361a7df91028fdb86dd9aa7d2b431b8bd1fc674175d6c5bd098f7a6765cc4e3f7b3428ff7d35d9f5bac31cb7602ea270a6affe843a2e9 01_add_generated_cust_dtsi.patch 42a7ef954d517f945bdbca16d92aff63b6b07260d666119dc96c33db577231f907c7968d9466bf163c397a37f4fb23a6886047b1eb821aa14687d43442c8e615 02_fix_various_include_directives.patch 2b48f1bf0e3f70703d2cdafc47d5e615cc7c56c70bec56b2e3297d3fa4a7a1321d649a8679614553dde8fe52ff1051dae38d5990e3744c9ca986d92187dcdbeb gcc10-extern_YYLOC_global_declaration.patch +9e3b067fa1b19ad02500c4fce1b6142051df3845c508e615788beb650c4f953683107ac2d80670c4e3df38f532e0e91060d2d13ec04c9ec985abd2dfa82e900b linux3.4-ARM-8933-1-replace-Sun-Solaris-style-flag-on-section.patch +080745ca4ecaa804ee1df26ea81975ca93b74372e0c08322a6c481e97807495ae6ceb6cc77653afa24f9f2df45da8ebf8e5de6b06037fbb08e0279877ce42188 linux3.4-fix-piggy.gzip.S.patch " diff --git a/device/downstream/linux-wiko-lenny3/linux3.4-ARM-8933-1-replace-Sun-Solaris-style-flag-on-section.patch b/device/downstream/linux-wiko-lenny3/linux3.4-ARM-8933-1-replace-Sun-Solaris-style-flag-on-section.patch new file mode 120000 index 000000000..858243081 --- /dev/null +++ b/device/downstream/linux-wiko-lenny3/linux3.4-ARM-8933-1-replace-Sun-Solaris-style-flag-on-section.patch @@ -0,0 +1 @@ +../../.shared-patches/linux/linux3.4-ARM-8933-1-replace-Sun-Solaris-style-flag-on-section.patch \ No newline at end of file diff --git a/device/downstream/linux-wiko-lenny3/linux3.4-fix-piggy.gzip.S.patch b/device/downstream/linux-wiko-lenny3/linux3.4-fix-piggy.gzip.S.patch new file mode 120000 index 000000000..e5975978e --- /dev/null +++ b/device/downstream/linux-wiko-lenny3/linux3.4-fix-piggy.gzip.S.patch @@ -0,0 +1 @@ +../../.shared-patches/linux/linux3.4-fix-piggy.gzip.S.patch \ No newline at end of file diff --git a/device/downstream/linux-wiko-lenny5/APKBUILD b/device/downstream/linux-wiko-lenny5/APKBUILD index a943508cb..f368f857c 100644 --- a/device/downstream/linux-wiko-lenny5/APKBUILD +++ b/device/downstream/linux-wiko-lenny5/APKBUILD @@ -3,7 +3,7 @@ pkgname=linux-wiko-lenny5 pkgver=3.18.79 -pkgrel=2 +pkgrel=3 pkgdesc="Wiko Lenny 5 Kernel" arch="armv7" _carch="arm" @@ -41,6 +41,9 @@ source=" gcc8-fix-put-user.patch gcc10-extern_YYLOC_global_declaration.patch 0001-Include-cust.dtsi-don-t-run-python2-drvgen.patch + head.s-fix.patch + proc-v7-fix.patch + piggy.gzip.s-fix.patch " builddir="$srcdir/android_kernel_wiko_k300-$_commit" @@ -70,4 +73,7 @@ efdb0d3ba7a6e0525bf278db628affd881d2e67f7cc454e8921daa42b9921d46764c2bd304bf533e 197d40a214ada87fcb2dfc0ae4911704b9a93354b75179cd6b4aadbb627a37ec262cf516921c84a8b1806809b70a7b440cdc8310a4a55fca5d2c0baa988e3967 gcc8-fix-put-user.patch 2b48f1bf0e3f70703d2cdafc47d5e615cc7c56c70bec56b2e3297d3fa4a7a1321d649a8679614553dde8fe52ff1051dae38d5990e3744c9ca986d92187dcdbeb gcc10-extern_YYLOC_global_declaration.patch f74ea59d7b43cf65cbf46417c7028152ef39c0234da5aef1a7f72d30dcc56a701cb374a87079fce2194d5e6807686ed46bd846db5f39090a28be745abe014ba6 0001-Include-cust.dtsi-don-t-run-python2-drvgen.patch +b396a1586f9746054f54534891baab8c9c20f49630f74ec99ce7c0f34fdf2f91b0891d747e7cc576be5695056a5453f6595b50e38718db84c4bde11d4dfa7c5f head.s-fix.patch +f1218ddaf456e53945c647cc4e3459acc2a1ec33e20f746cf3d74950fcdbfe50e0eee6e9dadc386f4aecba1495e35f2f24f30325d7fcf1e51d9bd8d648072fad proc-v7-fix.patch +40aac5e96cc9e2c2b5d66665b60311a2eccd001669e98415e48e6f22be344fad01bc6ef6aa125854586a7f930a0623afcbc899accae38bf7dabd457b681fc5ec piggy.gzip.s-fix.patch " diff --git a/device/downstream/linux-wiko-lenny5/head.s-fix.patch b/device/downstream/linux-wiko-lenny5/head.s-fix.patch new file mode 100644 index 000000000..22e78166c --- /dev/null +++ b/device/downstream/linux-wiko-lenny5/head.s-fix.patch @@ -0,0 +1,22 @@ +From 1e5273ea46a2869ad31d9275dc99661ef58f013b Mon Sep 17 00:00:00 2001 +From: BeastRein <80418545+BeastRein@users.noreply.github.com> +Date: Mon, 8 Jan 2024 20:06:32 -0500 +Subject: [PATCH] Update head.S + +--- + arch/arm/boot/compressed/head.S | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/arch/arm/boot/compressed/head.S b/arch/arm/boot/compressed/head.S +index d2e43b053d9b..002cb8ca3d40 100644 +--- a/arch/arm/boot/compressed/head.S ++++ b/arch/arm/boot/compressed/head.S +@@ -112,7 +112,7 @@ + #endif + .endm + +- .section ".start", #alloc, #execinstr ++ .section ".start", "ax" + /* + * sort out different calling conventions + */ diff --git a/device/downstream/linux-wiko-lenny5/piggy.gzip.s-fix.patch b/device/downstream/linux-wiko-lenny5/piggy.gzip.s-fix.patch new file mode 100644 index 000000000..21cc12141 --- /dev/null +++ b/device/downstream/linux-wiko-lenny5/piggy.gzip.s-fix.patch @@ -0,0 +1,19 @@ +From d4501f99a743889e89afea7f3d9675d8a5cb2907 Mon Sep 17 00:00:00 2001 +From: BeastRein <80418545+BeastRein@users.noreply.github.com> +Date: Mon, 8 Jan 2024 20:12:08 -0500 +Subject: [PATCH] Update piggy.gzip.S + +--- + arch/arm/boot/compressed/piggy.gzip.S | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/arch/arm/boot/compressed/piggy.gzip.S b/arch/arm/boot/compressed/piggy.gzip.S +index a68adf91a165..c71952cfe45d 100644 +--- a/arch/arm/boot/compressed/piggy.gzip.S ++++ b/arch/arm/boot/compressed/piggy.gzip.S +@@ -1,4 +1,4 @@ +- .section .piggydata,#alloc ++ .section .piggydata, "a" + .globl input_data + input_data: + .incbin "arch/arm/boot/compressed/piggy.gzip" diff --git a/device/downstream/linux-wiko-lenny5/proc-v7-fix.patch b/device/downstream/linux-wiko-lenny5/proc-v7-fix.patch new file mode 100644 index 000000000..3b96aca7a --- /dev/null +++ b/device/downstream/linux-wiko-lenny5/proc-v7-fix.patch @@ -0,0 +1,22 @@ +From 50f223713472d5edced4cac7b8b32db0310973fc Mon Sep 17 00:00:00 2001 +From: BeastRein <80418545+BeastRein@users.noreply.github.com> +Date: Mon, 8 Jan 2024 19:43:05 -0500 +Subject: [PATCH] Update proc-v7.S + +--- + arch/arm/mm/proc-v7.S | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/arch/arm/mm/proc-v7.S b/arch/arm/mm/proc-v7.S +index 8e1ea433c3f1..e35a5e8cd700 100644 +--- a/arch/arm/mm/proc-v7.S ++++ b/arch/arm/mm/proc-v7.S +@@ -504,7 +504,7 @@ __v7_setup_stack: + string cpu_elf_name, "v7" + .align + +- .section ".proc.info.init", #alloc ++ .section ".proc.info.init", "a" + + /* + * Standard v7 proc info content