From df5eec9de6bb1d3cb4101292d3112f19638556ba Mon Sep 17 00:00:00 2001 From: Danct12 Date: Wed, 17 Jun 2020 11:27:14 +0700 Subject: [PATCH] main/linux-postmarketos-allwinner: only RTL8723CS_NEW (MR 1322) We cannot have two of them at the same time, most compiler would fail here but for some reason our didn't. However, it's better to just use one (the new one, or the old one). Enable CONFIG_RTL8723CS_NEW, which is the new driver that made it to pine64 kernel since 5.5. Signed-off-by: Danct12 [ci:skip-build]: already built successfully in CI --- main/linux-postmarketos-allwinner/APKBUILD | 4 ++-- .../config-postmarketos-allwinner.aarch64 | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/main/linux-postmarketos-allwinner/APKBUILD b/main/linux-postmarketos-allwinner/APKBUILD index 76c8a237e..fa02647ed 100644 --- a/main/linux-postmarketos-allwinner/APKBUILD +++ b/main/linux-postmarketos-allwinner/APKBUILD @@ -2,7 +2,7 @@ _flavor=postmarketos-allwinner _config="config-$_flavor.$CARCH" pkgname=linux-$_flavor pkgver=5.6.0_git20200429 -pkgrel=3 +pkgrel=4 arch="aarch64" pkgdesc="Kernel fork with Pine64 patches" url="https://gitlab.com/pine64-org/linux/" @@ -65,6 +65,6 @@ dev() { INSTALL_HDR_PATH="$subpkgdir"/usr } sha512sums="5c416e18ab0f798a18549cc63591d3eb29ea9e82ee9e48a34f2debfac590c516cecaa09fc1b51d0baedb330bd0f11c1e1f5868a3010591e73413b6d5397acfde linux-postmarketos-allwinner-2a6074e53b019db8a4a63cb255bc29422db3fe19.tar.gz -15d4ac080c925312971bfde14decf1c89d32879382bdabdb7965652cd6cab51e2dbcf26df8072b6800291de938dd7304fb4b72c7e9a45908b49efa2cd0a772f5 config-postmarketos-allwinner.aarch64 +6a0ea9a21c36fb46573de09f85513ee875e7673db81759246aed030fae3a68415d7b561af3ce52ccfd66ff9097cf9652249a67021b6f1de95e9e89769599f9cf config-postmarketos-allwinner.aarch64 8cdfb6d8a894e610c261446663dfbe34c01612a091fa029645e86913634de4394db0d1ab7dedb190052dff82330f0ddabe31860bbf7cd6fe0cdf23e37d0a6ca6 disable-power-save.patch 5f403bb1e3e7528954adcba4429768ce26bf13382dc6325ced245babcfb5252d515bea812b9df16d0e5370c9d4e07b4e0267f4c750281faf3cb6ffb29906700c touch-dts.patch" diff --git a/main/linux-postmarketos-allwinner/config-postmarketos-allwinner.aarch64 b/main/linux-postmarketos-allwinner/config-postmarketos-allwinner.aarch64 index a019e86b0..36e893a9d 100644 --- a/main/linux-postmarketos-allwinner/config-postmarketos-allwinner.aarch64 +++ b/main/linux-postmarketos-allwinner/config-postmarketos-allwinner.aarch64 @@ -4024,7 +4024,7 @@ CONFIG_STAGING=y # CONFIG_COMEDI is not set # CONFIG_RTLLIB is not set CONFIG_RTL8723BS=m -CONFIG_RTL8723CS=m +# CONFIG_RTL8723CS is not set # CONFIG_R8712U is not set # CONFIG_R8188EU is not set # CONFIG_VT6656 is not set