From e6a1193f3dfef779949e2c67e63bfc6151417cef Mon Sep 17 00:00:00 2001 From: Eisenbahnfan <14128636-Eisenbahnfan@users.noreply.gitlab.com> Date: Thu, 13 Feb 2025 13:31:44 +0100 Subject: [PATCH] linux-samsung-v1awifi: fix for not compiling kernel (MR 6211) The kernel couldn't be compiled. Additional patches were necessary to compile the linux kernel again. [ci:skip-build]: already built successfully in CI --- ...ndom-rndis-host-MAC-address-to-prev.patch} | 0 ...add-guard-for-Finger-Sensing-Pad-cod.patch | 37 +++++++++++++++++++ device/testing/linux-samsung-v1awifi/APKBUILD | 10 +++-- ...ce-Sun-Solaris-style-flag-on-section.patch | 1 + 4 files changed, 45 insertions(+), 3 deletions(-) rename device/testing/linux-samsung-v1awifi/{03-usb_gadget-set-random-rndis-host-MAC-address-to-prev.patch => 01-usb_gadget-set-random-rndis-host-MAC-address-to-prev.patch} (100%) create mode 100644 device/testing/linux-samsung-v1awifi/02-drivers-psmouse-add-guard-for-Finger-Sensing-Pad-cod.patch create mode 120000 device/testing/linux-samsung-v1awifi/linux3.4-ARM-8933-1-replace-Sun-Solaris-style-flag-on-section.patch diff --git a/device/testing/linux-samsung-v1awifi/03-usb_gadget-set-random-rndis-host-MAC-address-to-prev.patch b/device/testing/linux-samsung-v1awifi/01-usb_gadget-set-random-rndis-host-MAC-address-to-prev.patch similarity index 100% rename from device/testing/linux-samsung-v1awifi/03-usb_gadget-set-random-rndis-host-MAC-address-to-prev.patch rename to device/testing/linux-samsung-v1awifi/01-usb_gadget-set-random-rndis-host-MAC-address-to-prev.patch diff --git a/device/testing/linux-samsung-v1awifi/02-drivers-psmouse-add-guard-for-Finger-Sensing-Pad-cod.patch b/device/testing/linux-samsung-v1awifi/02-drivers-psmouse-add-guard-for-Finger-Sensing-Pad-cod.patch new file mode 100644 index 000000000..20e499ab1 --- /dev/null +++ b/device/testing/linux-samsung-v1awifi/02-drivers-psmouse-add-guard-for-Finger-Sensing-Pad-cod.patch @@ -0,0 +1,37 @@ +From 50088414b5eacfa0a2345f26448fd27dc28bc245 Mon Sep 17 00:00:00 2001 +From: Henrik Grimler +Date: Mon, 1 Jan 2024 09:04:29 +0100 +Subject: [PATCH] drivers: psmouse: add guard for Finger Sensing Pad code + +To fix errors like: +armv7-alpine-linux-musleabihf-ld: drivers/built-in.o: in function `psmouse_extensions': +psmouse-base.c:(.text+0x22f0c8): undefined reference to `fsp_detect' +armv7-alpine-linux-musleabihf-ld: psmouse-base.c:(.text+0x22f398): undefined reference to `fsp_detect' +--- + drivers/input/mouse/psmouse-base.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/drivers/input/mouse/psmouse-base.c b/drivers/input/mouse/psmouse-base.c +index 22fe2547e169..d4ec99d8cc84 100644 +--- a/drivers/input/mouse/psmouse-base.c ++++ b/drivers/input/mouse/psmouse-base.c +@@ -818,6 +818,7 @@ static int psmouse_extensions(struct psmouse *psmouse, + return PSMOUSE_TOUCHKIT_PS2; + } + ++#ifdef CONFIG_MOUSE_PS2_SENTELIC + /* + * Try Finger Sensing Pad. We do it here because its probe upsets + * Trackpoint devices (causing TP_READ_ID command to time out). +@@ -833,7 +834,7 @@ static int psmouse_extensions(struct psmouse *psmouse, + max_proto = PSMOUSE_IMEX; + } + } +- ++#endif + /* + * Reset to defaults in case the device got confused by extended + * protocol probes. Note that we follow up with full reset because +-- +2.43.0 + diff --git a/device/testing/linux-samsung-v1awifi/APKBUILD b/device/testing/linux-samsung-v1awifi/APKBUILD index 81d975406..2c4e9fd3a 100644 --- a/device/testing/linux-samsung-v1awifi/APKBUILD +++ b/device/testing/linux-samsung-v1awifi/APKBUILD @@ -3,7 +3,7 @@ pkgname=linux-samsung-v1awifi pkgver=3.4.113 -pkgrel=0 +pkgrel=1 pkgdesc="Samsung Galaxy Note Pro 12.2 Wi-Fi kernel fork" arch="armv7" _carch="arm" @@ -29,10 +29,12 @@ _config="config-$_flavor.$arch" source=" $pkgname-$_commit.tar.gz::https://github.com/exynos5420/$_repository/archive/$_commit.tar.gz $_config - 03-usb_gadget-set-random-rndis-host-MAC-address-to-prev.patch gcc7-give-up-on-ilog2-const-optimizations.patch gcc8-fix-put-user.patch gcc10-extern_YYLOC_global_declaration.patch + linux3.4-ARM-8933-1-replace-Sun-Solaris-style-flag-on-section.patch + 01-usb_gadget-set-random-rndis-host-MAC-address-to-prev.patch + 02-drivers-psmouse-add-guard-for-Finger-Sensing-Pad-cod.patch " builddir="$srcdir/$_repository-$_commit" _outdir="out" @@ -55,8 +57,10 @@ package() { sha512sums=" 807e43b896d83f0a633aa417ad7ffd0a8af3aa5da2c4b1134b604fdadb26b590f04ff24131b3ee2b60b0479ce2e6ba81e3e19e50e0e772d9785b96d60aa65c33 linux-samsung-v1awifi-875b08faaa1a395c233388b4048e4b20bf971db3.tar.gz 028c97dba02b6ec55015e9b822ca017095a98d562e4f75124cb3317313b7062798dbc71e98223e4e1948e5d8ed17c8749313072fb7b9ff37b51d439efdc049d9 config-samsung-v1awifi.armv7 -5fad0940e90da71277b70b6e72fbb75fcc5e12625e65f827ae896d448628b252b3312539f9c184b26ffe5ca3b343a56b388ea6addb7fe446c7d1ae2aefb4b51e 03-usb_gadget-set-random-rndis-host-MAC-address-to-prev.patch 77eba606a71eafb36c32e9c5fe5e77f5e4746caac292440d9fb720763d766074a964db1c12bc76fe583c5d1a5c864219c59941f5e53adad182dbc70bf2bc14a7 gcc7-give-up-on-ilog2-const-optimizations.patch 197d40a214ada87fcb2dfc0ae4911704b9a93354b75179cd6b4aadbb627a37ec262cf516921c84a8b1806809b70a7b440cdc8310a4a55fca5d2c0baa988e3967 gcc8-fix-put-user.patch 2b48f1bf0e3f70703d2cdafc47d5e615cc7c56c70bec56b2e3297d3fa4a7a1321d649a8679614553dde8fe52ff1051dae38d5990e3744c9ca986d92187dcdbeb gcc10-extern_YYLOC_global_declaration.patch +9e3b067fa1b19ad02500c4fce1b6142051df3845c508e615788beb650c4f953683107ac2d80670c4e3df38f532e0e91060d2d13ec04c9ec985abd2dfa82e900b linux3.4-ARM-8933-1-replace-Sun-Solaris-style-flag-on-section.patch +5fad0940e90da71277b70b6e72fbb75fcc5e12625e65f827ae896d448628b252b3312539f9c184b26ffe5ca3b343a56b388ea6addb7fe446c7d1ae2aefb4b51e 01-usb_gadget-set-random-rndis-host-MAC-address-to-prev.patch +a3df24c8d9116a3ad3559aac5ce126049e9123df633990ec72facd64ef538ed773e3ac0da233f2e04d99164d590340d598cfb3da3bbea502cf7c2cd3ef08cf24 02-drivers-psmouse-add-guard-for-Finger-Sensing-Pad-cod.patch " diff --git a/device/testing/linux-samsung-v1awifi/linux3.4-ARM-8933-1-replace-Sun-Solaris-style-flag-on-section.patch b/device/testing/linux-samsung-v1awifi/linux3.4-ARM-8933-1-replace-Sun-Solaris-style-flag-on-section.patch new file mode 120000 index 000000000..858243081 --- /dev/null +++ b/device/testing/linux-samsung-v1awifi/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