From 977d4b9d5875ee89eacdd76cc451394a5e851e63 Mon Sep 17 00:00:00 2001
From: Clayton Craft <clayton@craftyguy.net>
Date: Sun, 19 Mar 2023 15:51:26 -0700
Subject: [PATCH] linux-postmarketos-rockchip: update waydroid opts (MR 3901)

[ci:skip-build]: won't finish in time, I've verified that all of them
build (before rebasing again on master, but pretty sure it will build)
---
 .../community/linux-postmarketos-rockchip/APKBUILD   |  4 ++--
 .../config-postmarketos-rockchip.aarch64             | 12 +++++++++++-
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/device/community/linux-postmarketos-rockchip/APKBUILD b/device/community/linux-postmarketos-rockchip/APKBUILD
index b08346f49..951e486cd 100644
--- a/device/community/linux-postmarketos-rockchip/APKBUILD
+++ b/device/community/linux-postmarketos-rockchip/APKBUILD
@@ -11,7 +11,7 @@
 
 pkgname=linux-postmarketos-rockchip
 pkgver=6.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Mainline kernel for rockchip devices"
 arch="aarch64"
 _carch="arm64"
@@ -82,5 +82,5 @@ package() {
 
 sha512sums="
 a01bee0b968b95183934fe3504516be7ef5811944a061f5aed05ecebaa27b5eb64e33232fd0a8dd622b3c8743bfe462ef7e464d381734d111a0ad6a6d9f66ddd  linux-6.2.tar.xz
-080192e97754024e899fe895c3c7064024ed31f51caffca48542f64a9ebb5f464d0a30cc0d4e6e13fe8c182bfa4d22d644d7be184fb495575c6cc3d9c12308c5  config-postmarketos-rockchip.aarch64
+966b32b2aae8419b18afe07977c5ec88d6748b09d01626a120f4da533fb36f9f5f798008f119dc097ea21723e8e9f133df4c1df0bd77f381f1fb2c82867c007a  config-postmarketos-rockchip.aarch64
 "
diff --git a/device/community/linux-postmarketos-rockchip/config-postmarketos-rockchip.aarch64 b/device/community/linux-postmarketos-rockchip/config-postmarketos-rockchip.aarch64
index cad9222af..e768c95ad 100644
--- a/device/community/linux-postmarketos-rockchip/config-postmarketos-rockchip.aarch64
+++ b/device/community/linux-postmarketos-rockchip/config-postmarketos-rockchip.aarch64
@@ -91,8 +91,10 @@ CONFIG_ARCH_WANT_DEFAULT_BPF_JIT=y
 #
 # BPF subsystem
 #
-# CONFIG_BPF_SYSCALL is not set
+CONFIG_BPF_SYSCALL=y
 # CONFIG_BPF_JIT is not set
+CONFIG_BPF_UNPRIV_DEFAULT_OFF=y
+# CONFIG_BPF_PRELOAD is not set
 # end of BPF subsystem
 
 CONFIG_PREEMPT_BUILD=y
@@ -129,6 +131,9 @@ CONFIG_PREEMPT_RCU=y
 # CONFIG_RCU_EXPERT is not set
 CONFIG_SRCU=y
 CONFIG_TREE_SRCU=y
+CONFIG_TASKS_RCU_GENERIC=y
+CONFIG_TASKS_RCU=y
+CONFIG_TASKS_TRACE_RCU=y
 CONFIG_RCU_STALL_COMMON=y
 CONFIG_RCU_NEED_SEGCBLIST=y
 # end of RCU Subsystem
@@ -174,6 +179,7 @@ CONFIG_PROC_PID_CPUSET=y
 CONFIG_CGROUP_DEVICE=y
 CONFIG_CGROUP_CPUACCT=y
 CONFIG_CGROUP_PERF=y
+CONFIG_CGROUP_BPF=y
 # CONFIG_CGROUP_MISC is not set
 CONFIG_SOCK_CGROUP_DATA=y
 CONFIG_NAMESPACES=y
@@ -941,6 +947,7 @@ CONFIG_XFRM_ESP=m
 CONFIG_XFRM_IPCOMP=m
 CONFIG_NET_KEY=m
 CONFIG_NET_KEY_MIGRATE=y
+# CONFIG_XDP_SOCKETS is not set
 CONFIG_INET=y
 CONFIG_IP_MULTICAST=y
 CONFIG_IP_ADVANCED_ROUTER=y
@@ -1571,6 +1578,7 @@ CONFIG_CGROUP_NET_PRIO=y
 CONFIG_CGROUP_NET_CLASSID=y
 CONFIG_NET_RX_BUSY_POLL=y
 CONFIG_BQL=y
+# CONFIG_BPF_STREAM_PARSER is not set
 CONFIG_NET_FLOW_LIMIT=y
 
 #
@@ -7699,6 +7707,8 @@ CONFIG_SYSTEM_TRUSTED_KEYS=""
 # CONFIG_SYSTEM_BLACKLIST_KEYRING is not set
 # end of Certificates for signature checking
 
+CONFIG_BINARY_PRINTF=y
+
 #
 # Library routines
 #