Compare commits

...
Author SHA1 Message Date
Newbyte 39e047c339 linux-oneplus-billie2: upgrade to 4.19.152
And hopefully fix build.
2022-10-10 18:29:39 +02:00
4 changed files with 6 additions and 110 deletions

No files matched your search

@@ -1,63 +0,0 @@
From 857d33abc880163966fcbbfc05da69bd681ea161 Mon Sep 17 00:00:00 2001
From: Iskren Chernev <me@iskren.info>
Date: Thu, 18 Feb 2021 14:59:40 +0200
Subject: [PATCH 1/6] Fix function declarations
- Functions without args, should be declared f(void) [for clang]
- Add missing return type [for gcc]
- Add static to a few places [for gcc]
Signed-off-by: Iskren Chernev <me@iskren.info>
---
drivers/oneplus/coretech/control_center/control_center.c | 2 +-
drivers/oneplus/coretech/memplus/core/memplus_core.c | 4 ++--
drivers/power/oneplus/charger_ic/oneplus_battery_pmi632.c | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/oneplus/coretech/control_center/control_center.c b/drivers/oneplus/coretech/control_center/control_center.c
index 1d9c22cea1ea4..9d49af5d2e278 100644
--- a/drivers/oneplus/coretech/control_center/control_center.c
+++ b/drivers/oneplus/coretech/control_center/control_center.c
@@ -295,7 +295,7 @@ static struct list_head cc_pending_list;
static DEFINE_SPINLOCK(cc_async_lock);
static struct workqueue_struct *cc_wq;
-extern cc_cal_next_freq_with_extra_util(
+extern unsigned cc_cal_next_freq_with_extra_util(
struct cpufreq_policy *pol, unsigned int next_freq);
extern void clk_get_ddr_freq(u64* val);
static void cc_queue_rq(struct cc_command *cc);
diff --git a/drivers/oneplus/coretech/memplus/core/memplus_core.c b/drivers/oneplus/coretech/memplus/core/memplus_core.c
index 1f351cacca2f1..9bd0d155587b6 100755
--- a/drivers/oneplus/coretech/memplus/core/memplus_core.c
+++ b/drivers/oneplus/coretech/memplus/core/memplus_core.c
@@ -128,11 +128,11 @@ static inline bool current_is_gcd(void)
return current == gc_tsk;
}
-bool ctech_current_is_swapind() {
+static bool ctech_current_is_swapind(void) {
return current == swapind_tsk;
}
-bool ctech_memplus_check_isolate_page(struct page*page)
+static bool ctech_memplus_check_isolate_page(struct page*page)
{
return (memplus_enabled() && (!PageSwapCache(page) || PageWillneed(page)));
}
diff --git a/drivers/power/oneplus/charger_ic/oneplus_battery_pmi632.c b/drivers/power/oneplus/charger_ic/oneplus_battery_pmi632.c
index 4ccd81bd8aa38..6a00d21ad76e4 100755
--- a/drivers/power/oneplus/charger_ic/oneplus_battery_pmi632.c
+++ b/drivers/power/oneplus/charger_ic/oneplus_battery_pmi632.c
@@ -14099,7 +14099,7 @@ static int oneplus_chg_get_charger_subtype(void)
return CHARGER_SUBTYPE_DEFAULT;
}
-static int oneplus_set_qc_config()
+static int oneplus_set_qc_config(void)
{
return 0;
}
--
2.30.1
@@ -1,36 +0,0 @@
From 966d3ac2409b59f431e1397f5ab8e9ee74ba5ae0 Mon Sep 17 00:00:00 2001
From: Iskren Chernev <me@iskren.info>
Date: Sat, 20 Feb 2021 00:49:45 +0200
Subject: [PATCH 3/6] Remove gcc python wrapper
---
Makefile | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/Makefile b/Makefile
index 15a18b3cd15f6..e6a72c1a84fe9 100644
--- a/Makefile
+++ b/Makefile
@@ -370,7 +370,7 @@ KBUILD_HOSTLDLIBS := $(HOST_LFS_LIBS) $(HOSTLDLIBS)
# Make variables (CC, etc...)
AS = $(CROSS_COMPILE)as
LD = $(CROSS_COMPILE)ld
-REAL_CC = $(CROSS_COMPILE)gcc
+CC = $(CROSS_COMPILE)gcc
CPP = $(CC) -E
AR = $(CROSS_COMPILE)ar
NM = $(CROSS_COMPILE)nm
@@ -389,10 +389,6 @@ PYTHON2 = python2
PYTHON3 = python3
CHECK = sparse
-# Use the wrapper for the compiler. This wrapper scans for new
-# warnings and causes the build to stop upon encountering them
-CC = $(PYTHON) $(srctree)/scripts/gcc-wrapper.py $(REAL_CC)
-
CHECKFLAGS := -D__linux__ -Dlinux -D__STDC__ -Dunix -D__unix__ \
-Wbitwise -Wno-return-void -Wno-unknown-attribute $(CF)
NOSTDINC_FLAGS =
--
2.30.1
@@ -1 +0,0 @@
../../../device/.shared-patches/linux/linux4.17-gcc10-extern_YYLOC_global_declaration.patch
+6 -10
View File
@@ -6,8 +6,8 @@
# https://builds.sr.ht/~postmarketos/job/858910
pkgname=linux-oneplus-billie2
pkgver=4.19.95
pkgrel=1
pkgver=4.19.152
pkgrel=0
pkgdesc="OnePlus Nord N100 kernel fork"
arch="aarch64"
_carch="arm64"
@@ -19,18 +19,15 @@ makedepends="bash bc bison devicepkg-dev flex openssl-dev perl linux-headers"
# Source
_repository="android_kernel_oneplus_sm4250"
_commit="6db26f433f9a8722d0858562804da13f3090bfd7"
_commit="c28f4e89d604c84cb147798bcebf0f7a0e54b432"
_config="config-$_flavor.$arch"
source="
$pkgname-$_commit.tar.gz::https://github.com/OnePlusOSS/$_repository/archive/$_commit.tar.gz
$_config
0001-Fix-function-declarations.patch
0002-Fix-dangerous-relocation.patch
0003-Remove-gcc-python-wrapper.patch
0004-Fix-reading-after-array-end.patch
0005-Remove-inline-from-external-functions.patch
0006-Suppress-error-about-static-buffer-overflow.patch
0007-linux4.17-gcc10-extern_YYLOC_global_declaration.patch
"
builddir="$srcdir/$_repository-$_commit"
_outdir="out"
@@ -64,12 +61,11 @@ package() {
modules_install
}
sha512sums="9995a00adeceb30d4a64421e17c85a8349fe674b8a20dc2462cf21af867197f23e62326f0948ca12b52c7cb954388a3767122cea85eb033ff9525e15aa5af9b5 linux-oneplus-billie2-6db26f433f9a8722d0858562804da13f3090bfd7.tar.gz
sha512sums="
29f48e1ce67d42afcaeccfba4e055d0c42526d507cedd00291fdf9fb72e4f464d6fc625c68a1edb9b4460e542b03f73d566f2372dec729d9aec84c9f4ff99956 linux-oneplus-billie2-c28f4e89d604c84cb147798bcebf0f7a0e54b432.tar.gz
53d5c7e98bcf0621f15e249393a610f685c9c9b20086dd1d463ce3d6c85df9bb7bed229ba65b80f0b28951ec174981613a48fad0c9d07228b0ae861eac8b98f7 config-oneplus-billie2.aarch64
c6739758f857f3da23702e005b1ed11e30fa28981a4307fa8d5d7419931400c419c3bd0c2dcfb2c0aff8972e5a19125be5074597e094195315d8a760e373802a 0001-Fix-function-declarations.patch
39007dd285b502633c7bbf398acd6841a14fb6f5e0a3ad8570d31be77763b537b2352401701d67c53d36ddbf4068ee32446bf3b4ef9aa20c39f052ca491d2be4 0002-Fix-dangerous-relocation.patch
359f619b7aac5bab061311f0806018ed04ce96a2233584a507b14c50ce616dfbc1681dd465ca3f0182165a6fc6c7b87435615bd1bd93efe174b95deba071f5fc 0003-Remove-gcc-python-wrapper.patch
f8727c9c3b6c42ac921bd31fd05dc507e02a53c1c158fe7b67e75db482067b77ab9e2ffe33088c047a699b79642d6be1722d854cdf74cea6db5b46f586315bd0 0004-Fix-reading-after-array-end.patch
aba7ae12986a2df81c6993f369390c6b3f5586fa70ab747e03d59aaf08cb79482a44eab723aed4469e98cadea0f70912f4e67caaf67cc279e1dc85e485b93a0f 0005-Remove-inline-from-external-functions.patch
3835f7e4fca12aaba82fe21cc9632f0e569a8c4405231d137aea4f2640190d919e1a44612082decfbaaa41faa3c6a3ff0442086afb81d59c984a5697fdb9cac9 0006-Suppress-error-about-static-buffer-overflow.patch
27827877040007fc1c4c719f7e2e19e5c272d44972415cfc53feba0313d87e4074f8204bdb13cbc5fe21ea61bf595314b68f10c081e7b7bac3c888b60f008acf 0007-linux4.17-gcc10-extern_YYLOC_global_declaration.patch"
"