Skip to content
Snippets Groups Projects
Unverified Commit b92f2eff authored by Gianluca Boiano's avatar Gianluca Boiano Committed by Oliver Smith
Browse files

linux-samsung-herolte: change src repo and sync config with upstream (MR 3710)


Signed-off-by: default avatarGianluca Boiano <morf3089@gmail.com>
[ci:skip-build]: already built successfully in CI
parent 32532c75
Branches
No related tags found
No related merge requests found
Pipeline #197882 passed
--- a/drivers/gpu/arm/t8xx/r22p0/mali_kbase_core_linux.c 2022-12-10 16:42:44.274410909 +0100
+++ b/drivers/gpu/arm/t8xx/r22p0/mali_kbase_core_linux.c 2022-12-10 16:44:08.294593787 +0100
@@ -278,7 +278,7 @@
* Older versions, before v4.6, of the kernel doesn't have
* kstrtobool_from_user(), except longterm 4.4.y which had it added in 4.4.28
*/
-static int kstrtobool_from_user(const char __user *s, size_t count, bool *res)
+int kstrtobool_from_user(const char __user *s, size_t count, bool *res)
{
char buf[32];
# This patch removes the __ANDROID__ defines that activate the macros needed for
# the connection gadget system in the kernel.
# Needed for very obvious reasons.
diff --git a/drivers/usb/gadget/function/f_conn_gadget.ioctl.h b/drivers/usb/gadget/function/f_conn_gadget.ioctl.h
index aed3e027..3486e7a3 100644
--- a/drivers/usb/gadget/function/f_conn_gadget.ioctl.h
+++ b/drivers/usb/gadget/function/f_conn_gadget.ioctl.h
@@ -25,8 +25,6 @@ enum {
CONN_GADGET_IOCTL_BIND_STATUS_UNBIND = 2
};
-#if defined(__ANDROID__)||defined(__TIZEN__)
-
enum {
CONN_GADGET_IOCTL_NR_0 = 0,
CONN_GADGET_IOCTL_NR_1,
@@ -42,6 +40,5 @@ enum {
#define CONN_GADGET_IOCTL_BIND_WAIT_NOTIFY _IOR(CONN_GADGET_IOCTL_MAGIC_SIG, CONN_GADGET_IOCTL_NR_1, int)
#define CONN_GADGET_IOCTL_BIND_GET_STATUS _IOR(CONN_GADGET_IOCTL_MAGIC_SIG, CONN_GADGET_IOCTL_NR_2, int)
#define CONN_GADGET_IOCTL_MAX_NR CONN_GADGET_IOCTL_NR_MAX
-#endif
#endif
......@@ -3,7 +3,7 @@
pkgname=linux-samsung-herolte
pkgver=3.18.140
pkgrel=4
pkgrel=5
pkgdesc="Samsung Galaxy S7 kernel fork"
arch="aarch64"
_carch="arm64"
......@@ -14,15 +14,14 @@ options="!strip !check !tracedeps pmb:cross-native"
makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev devicepkg-dev dtbtool-exynos"
# Source - use Ivan Meler's 3.18 upstream kernel
_repository="android_kernel_samsung_herolte"
_commit="4f50ed696fc6ec36d277ba1af73e98d34e7bc0d6"
_repository="android_kernel_samsung_universal8890"
_commit="57884d864fb572642fcf84abf13b099db7efc5b8"
_config="config-$_flavor.$arch"
source="
$pkgname-$_commit.tar.gz::https://github.com/ivanmeler/$_repository/archive/$_commit.tar.gz
$pkgname-$_commit.tar.gz::https://github.com/8890q/$_repository/archive/$_commit.tar.gz
$_config
01-remove-android-defines.patch
01-kstrtobool_from_user.patch
02-fix-wifi-firmware-path.patch
gcc10-extern_YYLOC_global_declaration.patch
"
builddir="$srcdir/$_repository-$_commit"
......@@ -39,7 +38,7 @@ build() {
# Build dt image with exynos dtbtool
dtbTool-exynos --pagesize 2048 \
--platform 0x50a6 \
--subtype 0x217584da \
--subtype 0x217584da \
-o "arch/arm64/boot/dt.img" \
"arch/arm64/boot/dts/exynos8890-herolte_eur_open_04.dtb" \
"arch/arm64/boot/dts/exynos8890-herolte_eur_open_08.dtb" \
......@@ -54,8 +53,9 @@ package() {
"$pkgdir/boot/dt.img"
}
sha512sums="28a447fca84c3c1bc95b505362a989964e652ff0c11a8f99e151225c4a29971c7698c846c7826552fcdc4acff799b3150e577892df88697776ce13cd0e76ac5f linux-samsung-herolte-4f50ed696fc6ec36d277ba1af73e98d34e7bc0d6.tar.gz
5639cd42eded6315c0166250f1980110dd1c14bd9030ed8ce35308eba1f0e65567e96c77c8c88bc881b09d9e9beec29aaaf357985f43ac4979f668eb1f1e7efb config-samsung-herolte.aarch64
66e27a174e12d56f5b77932985f0001b551c834d68b2a1bcc1d0b7d04e555757fc9137c182bd4cf5ffd57bf2cb0918d758dfe153a6140b77f02e7b9f33ecfb2c 01-remove-android-defines.patch
sha512sums="
e7337d87dbc067a0a9cfe8fab8aac41408e5d54b8b138ca01309f5b9a65477ff8faaa995ee1957b664c195a3b9020b33f525864b01b1516dab15f8e2157343d5 linux-samsung-herolte-57884d864fb572642fcf84abf13b099db7efc5b8.tar.gz
205a56597363c295e29db1a294caf1191329a192c1ef2a53478837bd2fc2d9d6aed489b5c724da70c320b6c3663f98334a791da1262022042a827c8b72a0e15e config-samsung-herolte.aarch64
7b0687165fa854c9c60944487cc7ea87758af8612f10125c22643743284d9abcc17c6a40853d05da2e27313a4e830c995a876b306f1488a2fcb72c3cbed3a8ae 01-kstrtobool_from_user.patch
ffef99094b44893d07aedf3bbf12b03f2c26fb93be4eb179ade9552ae82be6680daca06b6fc0f95064ef08fd94ef4a0b192a94f5065314a4608de8b8c413d86e 02-fix-wifi-firmware-path.patch
2b48f1bf0e3f70703d2cdafc47d5e615cc7c56c70bec56b2e3297d3fa4a7a1321d649a8679614553dde8fe52ff1051dae38d5990e3744c9ca986d92187dcdbeb gcc10-extern_YYLOC_global_declaration.patch"
"
../../.shared-patches/linux/gcc10-extern_YYLOC_global_declaration.patch
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment