diff --git a/device/.shared-patches/linux/linux3.4-ARM-8933-1-replace-Sun-Solaris-style-flag-on-section-xz-supplementation.patch b/device/.shared-patches/linux/linux3.4-ARM-8933-1-replace-Sun-Solaris-style-flag-on-section-xz-supplementation.patch deleted file mode 100644 index 4155f162a..000000000 --- a/device/.shared-patches/linux/linux3.4-ARM-8933-1-replace-Sun-Solaris-style-flag-on-section-xz-supplementation.patch +++ /dev/null @@ -1,12 +0,0 @@ -This patch is the supplementation of linux3.4-ARM-8933-1-replace-Sun-Solaris-style-flag-on-section.patch. - -diff --git a/arch/arm/boot/compressed/piggy.xzkern.S b/arch/arm/boot/compressed/piggy.xzkern.S -index d7e69cffbc0a..cfea81ae8f4b 100644 ---- a/arch/arm/boot/compressed/piggy.xzkern.S -+++ b/arch/arm/boot/compressed/piggy.xzkern.S -@@ -1,4 +1,4 @@ -- .section .piggydata,#alloc -+ .section .piggydata, "a" - .globl input_data - input_data: - .incbin "arch/arm/boot/compressed/piggy.xzkern" diff --git a/device/.shared-patches/linux/linux3.4-ARM-8933-1-replace-Sun-Solaris-style-flag-on-section.patch b/device/.shared-patches/linux/linux3.4-ARM-8933-1-replace-Sun-Solaris-style-flag-on-section.patch index b338d0a53..d38b80369 100644 --- a/device/.shared-patches/linux/linux3.4-ARM-8933-1-replace-Sun-Solaris-style-flag-on-section.patch +++ b/device/.shared-patches/linux/linux3.4-ARM-8933-1-replace-Sun-Solaris-style-flag-on-section.patch @@ -1,4 +1,4 @@ -From 3020e3a81b63e05891ef5d40f3acfbd00040ba17 Mon Sep 17 00:00:00 2001 +From 704dfdbbc7df036ed1d5d234dfc67d765804eb4d Mon Sep 17 00:00:00 2001 From: Nick Desaulniers Date: Mon, 4 Nov 2019 19:31:45 +0100 Subject: [PATCH] ARM: 8933/1: replace Sun/Solaris style flag on section @@ -26,12 +26,13 @@ Suggested-by: Peter Smith Signed-off-by: Russell King [ partial backport to 3.4 ] --- - arch/arm/boot/bootp/init.S | 2 +- - arch/arm/boot/compressed/big-endian.S | 2 +- - arch/arm/boot/compressed/head.S | 2 +- - arch/arm/boot/compressed/piggy.lzma.S | 2 +- - arch/arm/mm/proc-v7.S | 2 +- - 5 files changed, 5 insertions(+), 5 deletions(-) + arch/arm/boot/bootp/init.S | 2 +- + arch/arm/boot/compressed/big-endian.S | 2 +- + arch/arm/boot/compressed/head.S | 2 +- + arch/arm/boot/compressed/piggy.lzma.S | 2 +- + arch/arm/boot/compressed/piggy.xzkern.S | 2 +- + arch/arm/mm/proc-v7.S | 2 +- + 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/arch/arm/boot/bootp/init.S b/arch/arm/boot/bootp/init.S index 78b508075161..868eeeaaa46e 100644 @@ -82,6 +83,16 @@ index d7e69cffbc0a..cfea81ae8f4b 100644 .globl input_data input_data: .incbin "arch/arm/boot/compressed/piggy.lzma" +diff --git a/arch/arm/boot/compressed/piggy.xzkern.S b/arch/arm/boot/compressed/piggy.xzkern.S +index 5703f300d027..a135d3b549c5 100644 +--- a/arch/arm/boot/compressed/piggy.xzkern.S ++++ b/arch/arm/boot/compressed/piggy.xzkern.S +@@ -1,4 +1,4 @@ +- .section .piggydata,#alloc ++ .section .piggydata, "a" + .globl input_data + input_data: + .incbin "arch/arm/boot/compressed/piggy.xzkern" diff --git a/arch/arm/mm/proc-v7.S b/arch/arm/mm/proc-v7.S index 69363be2f241..321cb1c6a091 100644 --- a/arch/arm/mm/proc-v7.S @@ -96,5 +107,5 @@ index 69363be2f241..321cb1c6a091 100644 /* * Standard v7 proc info content -- -2.30.2 +2.43.0 diff --git a/device/testing/linux-samsung-serranolte/APKBUILD b/device/testing/linux-samsung-serranolte/APKBUILD index 8b3053bb0..328b46ea9 100644 --- a/device/testing/linux-samsung-serranolte/APKBUILD +++ b/device/testing/linux-samsung-serranolte/APKBUILD @@ -2,7 +2,7 @@ pkgname=linux-samsung-serranolte pkgver=3.4.113 -pkgrel=3 +pkgrel=4 pkgdesc="Samsung Samsung Galaxy S4 Mini kernel fork" arch="armv7" _carch="arm" @@ -33,7 +33,6 @@ source=" 03_fix-video-argb-setting.patch 04_usb_gadget-set-random-rndis-host-MAC-address-to-prev.patch linux3.4-ARM-8933-1-replace-Sun-Solaris-style-flag-on-section.patch - linux3.4-ARM-8933-1-replace-Sun-Solaris-style-flag-on-section-xz-supplementation.patch " builddir="$srcdir/$_repository-$_commit" @@ -59,6 +58,5 @@ f85ced49ee2f2461adea68dac0a10452aa809a7d41d869092d94eb085344919a9a385dec0c48011f 7be03a9e78b7ac330a54b1f00509caa0621a95c0c55901878ad757f9dd69cc05ba2c8b5ea987063ae1224f92c4d090d515fa5d369e7755181a4871b0d0f82881 02_gpu-msm-fix-gcc5-compile.patch e3083c260ed9c4fc0d83f43106700b6173876dbfae072f6e6696ac6785a4dc17771fbcb3e21601e04ed29a11bf0f7a2a09ad549375e0c34cea245c7f2e2bcbbd 03_fix-video-argb-setting.patch 27f890cf82027649ba742b606a87ce6a82f9685b075bb7b50bffec77221e70434ee78d118d39048350537c5ecdad208658967e492eeeb997e7f6884fa78ac696 04_usb_gadget-set-random-rndis-host-MAC-address-to-prev.patch -b14c0033045dd1ec5dd03612d8fb6361c4a0fa3eb54f7e262628d18756456c2e569a437d1b35099a8302577d1e471bbf9222b4b1b30f6578af7e4342a0009815 linux3.4-ARM-8933-1-replace-Sun-Solaris-style-flag-on-section.patch -a6b6c781dd23f9a45a1605456d8c9af3ec6b5c389acd2b5d4c32280dcb59118996d794165bea2005dbdd9415297e5060bcac7579f908f7d65406a862b743fed5 linux3.4-ARM-8933-1-replace-Sun-Solaris-style-flag-on-section-xz-supplementation.patch +9e3b067fa1b19ad02500c4fce1b6142051df3845c508e615788beb650c4f953683107ac2d80670c4e3df38f532e0e91060d2d13ec04c9ec985abd2dfa82e900b linux3.4-ARM-8933-1-replace-Sun-Solaris-style-flag-on-section.patch " diff --git a/device/testing/linux-samsung-serranolte/linux3.4-ARM-8933-1-replace-Sun-Solaris-style-flag-on-section-xz-supplementation.patch b/device/testing/linux-samsung-serranolte/linux3.4-ARM-8933-1-replace-Sun-Solaris-style-flag-on-section-xz-supplementation.patch deleted file mode 120000 index 5dbf2a3be..000000000 --- a/device/testing/linux-samsung-serranolte/linux3.4-ARM-8933-1-replace-Sun-Solaris-style-flag-on-section-xz-supplementation.patch +++ /dev/null @@ -1 +0,0 @@ -../../.shared-patches/linux/linux3.4-ARM-8933-1-replace-Sun-Solaris-style-flag-on-section-xz-supplementation.patch \ No newline at end of file diff --git a/device/testing/linux-samsung-treltexx/APKBUILD b/device/testing/linux-samsung-treltexx/APKBUILD index f221b78d2..5f72fc29a 100644 --- a/device/testing/linux-samsung-treltexx/APKBUILD +++ b/device/testing/linux-samsung-treltexx/APKBUILD @@ -2,7 +2,7 @@ # Kernel config based on: arch/arm/configs/lineage_trelte_defconfig pkgname=linux-samsung-treltexx pkgver=3.10.9 -pkgrel=1 +pkgrel=2 pkgdesc="samsung Galaxy Note 4 kernel fork" arch="armv7" _carch="arm" @@ -39,7 +39,6 @@ source=" security-tima_uevent-fix.patch treltexx_hw_rev.patch linux3.4-ARM-8933-1-replace-Sun-Solaris-style-flag-on-section.patch - linux3.4-ARM-8933-1-replace-Sun-Solaris-style-flag-on-section-xz-supplementation.patch " builddir="$srcdir/$_repository-$_commit" _outdir="out" @@ -81,6 +80,5 @@ dd5d6ec38bd6f026bd811e0dfd190bfa8926b088669315ed179c16f1c32008592c585bbc6681c589 e2e550d9d5020c2f51e1af0576236ac9d57b2e0c10c14a2a92dc7b1bf4100ebc15a6bf0fff4f57232164e84358dc37d24721e1d9f133a526bf78b610eaf00add drivers-muic-fix.patch f48216b4f2068d7ee2788d18deee4af769bcfa8cb88d4257275285a6017e8f193d527a1ede1ef1fb3a1bf7795f633434b57c13aed95ab1161066f215619a8c8b security-tima_uevent-fix.patch fc618784b85fd77609e32a2af3a68456d66a3b6126c52d00e8a531e6c2c3c54c455330d9f4a9f857f2cc6e3d406a47c5d01ec9f7a96fede031f2dde136184ae1 treltexx_hw_rev.patch -b14c0033045dd1ec5dd03612d8fb6361c4a0fa3eb54f7e262628d18756456c2e569a437d1b35099a8302577d1e471bbf9222b4b1b30f6578af7e4342a0009815 linux3.4-ARM-8933-1-replace-Sun-Solaris-style-flag-on-section.patch -a6b6c781dd23f9a45a1605456d8c9af3ec6b5c389acd2b5d4c32280dcb59118996d794165bea2005dbdd9415297e5060bcac7579f908f7d65406a862b743fed5 linux3.4-ARM-8933-1-replace-Sun-Solaris-style-flag-on-section-xz-supplementation.patch +9e3b067fa1b19ad02500c4fce1b6142051df3845c508e615788beb650c4f953683107ac2d80670c4e3df38f532e0e91060d2d13ec04c9ec985abd2dfa82e900b linux3.4-ARM-8933-1-replace-Sun-Solaris-style-flag-on-section.patch " diff --git a/device/testing/linux-samsung-treltexx/linux3.4-ARM-8933-1-replace-Sun-Solaris-style-flag-on-section-xz-supplementation.patch b/device/testing/linux-samsung-treltexx/linux3.4-ARM-8933-1-replace-Sun-Solaris-style-flag-on-section-xz-supplementation.patch deleted file mode 120000 index 5dbf2a3be..000000000 --- a/device/testing/linux-samsung-treltexx/linux3.4-ARM-8933-1-replace-Sun-Solaris-style-flag-on-section-xz-supplementation.patch +++ /dev/null @@ -1 +0,0 @@ -../../.shared-patches/linux/linux3.4-ARM-8933-1-replace-Sun-Solaris-style-flag-on-section-xz-supplementation.patch \ No newline at end of file