* sunxi-5.19: EDGE: switch to v5.19.2 * sunxi-5.19: fix megous patches * sunxi-5.19: adapt armbian patches to v5.19.2 * sunxi-5.19: update upstream megous patches
472 lines
13 KiB
Diff
472 lines
13 KiB
Diff
From fea67738bcd794da18aded57302beab798079ae1 Mon Sep 17 00:00:00 2001
|
|
From: Ondrej Jirman <megi@xff.cz>
|
|
Date: Wed, 17 Aug 2022 20:32:44 +0200
|
|
Subject: [PATCH 425/426] Update defconfigs
|
|
|
|
---
|
|
arch/arm/configs/orangepi_defconfig | 6 +--
|
|
.../configs/pocketbook_touch_lux_3_defconfig | 6 +--
|
|
arch/arm/configs/tbs_a711_defconfig | 5 +--
|
|
arch/arm64/configs/orangepi_defconfig | 9 +----
|
|
arch/arm64/configs/pinebook_pro_defconfig | 40 +++++++++++++------
|
|
arch/arm64/configs/pinephone_defconfig | 7 +---
|
|
.../configs/pinephone_multidist_defconfig | 9 +----
|
|
arch/arm64/configs/pinephone_pro_defconfig | 17 +++-----
|
|
8 files changed, 40 insertions(+), 59 deletions(-)
|
|
|
|
diff --git a/arch/arm/configs/orangepi_defconfig b/arch/arm/configs/orangepi_defconfig
|
|
index f3b0ab5807f1..9c533f53feea 100644
|
|
--- a/arch/arm/configs/orangepi_defconfig
|
|
+++ b/arch/arm/configs/orangepi_defconfig
|
|
@@ -87,10 +87,6 @@ CONFIG_IOSCHED_BFQ=y
|
|
CONFIG_BFQ_GROUP_IOSCHED=y
|
|
CONFIG_CMA=y
|
|
CONFIG_CMA_DEBUGFS=y
|
|
-CONFIG_ZPOOL=y
|
|
-CONFIG_ZBUD=y
|
|
-CONFIG_Z3FOLD=y
|
|
-CONFIG_ZSMALLOC=y
|
|
CONFIG_NET=y
|
|
CONFIG_PACKET=y
|
|
CONFIG_PACKET_DIAG=y
|
|
@@ -364,6 +360,7 @@ CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
|
|
CONFIG_SERIAL_DEV_BUS=y
|
|
CONFIG_HW_RANDOM=y
|
|
# CONFIG_HW_RANDOM_IPROC_RNG200 is not set
|
|
+# CONFIG_RANDOM_TRUST_BOOTLOADER is not set
|
|
CONFIG_I2C_CHARDEV=y
|
|
CONFIG_I2C_MUX=y
|
|
CONFIG_I2C_BCM2835=y
|
|
@@ -704,7 +701,6 @@ CONFIG_DETECT_HUNG_TASK=y
|
|
CONFIG_BOOTPARAM_HUNG_TASK_PANIC=y
|
|
CONFIG_WQ_WATCHDOG=y
|
|
# CONFIG_SCHED_DEBUG is not set
|
|
-CONFIG_STACKTRACE=y
|
|
# CONFIG_RCU_TRACE is not set
|
|
# CONFIG_FTRACE is not set
|
|
# CONFIG_RUNTIME_TESTING_MENU is not set
|
|
diff --git a/arch/arm/configs/pocketbook_touch_lux_3_defconfig b/arch/arm/configs/pocketbook_touch_lux_3_defconfig
|
|
index c1e683f27fd9..72300a2e6c89 100644
|
|
--- a/arch/arm/configs/pocketbook_touch_lux_3_defconfig
|
|
+++ b/arch/arm/configs/pocketbook_touch_lux_3_defconfig
|
|
@@ -85,10 +85,6 @@ CONFIG_IOSCHED_BFQ=y
|
|
CONFIG_BFQ_GROUP_IOSCHED=y
|
|
CONFIG_CMA=y
|
|
CONFIG_CMA_DEBUGFS=y
|
|
-CONFIG_ZPOOL=y
|
|
-CONFIG_ZBUD=y
|
|
-CONFIG_Z3FOLD=y
|
|
-CONFIG_ZSMALLOC=y
|
|
CONFIG_NET=y
|
|
CONFIG_PACKET=y
|
|
CONFIG_PACKET_DIAG=y
|
|
@@ -237,6 +233,7 @@ CONFIG_SERIAL_8250_DW=y
|
|
CONFIG_SERIAL_OF_PLATFORM=y
|
|
CONFIG_SERIAL_DEV_BUS=y
|
|
# CONFIG_HW_RANDOM is not set
|
|
+# CONFIG_RANDOM_TRUST_BOOTLOADER is not set
|
|
CONFIG_I2C_CHARDEV=y
|
|
CONFIG_I2C_MUX=y
|
|
CONFIG_I2C_GPIO=y
|
|
@@ -423,5 +420,4 @@ CONFIG_CMA_SIZE_MBYTES=128
|
|
CONFIG_CONSOLE_LOGLEVEL_DEFAULT=15
|
|
CONFIG_MESSAGE_LOGLEVEL_DEFAULT=7
|
|
CONFIG_DEBUG_FS=y
|
|
-CONFIG_STACKTRACE=y
|
|
# CONFIG_RUNTIME_TESTING_MENU is not set
|
|
diff --git a/arch/arm/configs/tbs_a711_defconfig b/arch/arm/configs/tbs_a711_defconfig
|
|
index 2466706f252e..dc9a37732312 100644
|
|
--- a/arch/arm/configs/tbs_a711_defconfig
|
|
+++ b/arch/arm/configs/tbs_a711_defconfig
|
|
@@ -83,10 +83,6 @@ CONFIG_BLK_CGROUP_IOLATENCY=y
|
|
CONFIG_IOSCHED_BFQ=y
|
|
CONFIG_CMA=y
|
|
CONFIG_CMA_DEBUGFS=y
|
|
-CONFIG_ZPOOL=y
|
|
-CONFIG_ZBUD=y
|
|
-CONFIG_Z3FOLD=y
|
|
-CONFIG_ZSMALLOC=y
|
|
CONFIG_NET=y
|
|
CONFIG_PACKET=y
|
|
CONFIG_PACKET_DIAG=y
|
|
@@ -272,6 +268,7 @@ CONFIG_SERIAL_8250_DW=y
|
|
CONFIG_SERIAL_OF_PLATFORM=y
|
|
CONFIG_SERIAL_DEV_BUS=y
|
|
# CONFIG_HW_RANDOM is not set
|
|
+# CONFIG_RANDOM_TRUST_BOOTLOADER is not set
|
|
CONFIG_I2C_CHARDEV=y
|
|
CONFIG_I2C_MUX=y
|
|
CONFIG_I2C_GPIO=y
|
|
diff --git a/arch/arm64/configs/orangepi_defconfig b/arch/arm64/configs/orangepi_defconfig
|
|
index 932bfe12b70e..64b0dcfa1a08 100644
|
|
--- a/arch/arm64/configs/orangepi_defconfig
|
|
+++ b/arch/arm64/configs/orangepi_defconfig
|
|
@@ -95,10 +95,6 @@ CONFIG_BLK_CGROUP_IOCOST=y
|
|
CONFIG_IOSCHED_BFQ=y
|
|
CONFIG_BFQ_GROUP_IOSCHED=y
|
|
CONFIG_CMA=y
|
|
-CONFIG_ZPOOL=y
|
|
-CONFIG_ZBUD=y
|
|
-CONFIG_Z3FOLD=y
|
|
-CONFIG_ZSMALLOC=y
|
|
CONFIG_NET=y
|
|
CONFIG_PACKET=y
|
|
CONFIG_PACKET_DIAG=y
|
|
@@ -361,6 +357,8 @@ CONFIG_SERIAL_8250_DW=y
|
|
CONFIG_SERIAL_OF_PLATFORM=y
|
|
CONFIG_SERIAL_DEV_BUS=y
|
|
# CONFIG_HW_RANDOM is not set
|
|
+# CONFIG_RANDOM_TRUST_CPU is not set
|
|
+# CONFIG_RANDOM_TRUST_BOOTLOADER is not set
|
|
CONFIG_I2C_CHARDEV=y
|
|
CONFIG_I2C_MV64XXX=y
|
|
CONFIG_SPI=y
|
|
@@ -631,10 +629,8 @@ CONFIG_CRYPTO_ECHAINIV=y
|
|
CONFIG_CRYPTO_BLAKE2B=y
|
|
CONFIG_CRYPTO_BLAKE2S=y
|
|
CONFIG_CRYPTO_MD4=y
|
|
-CONFIG_CRYPTO_SM3=y
|
|
CONFIG_CRYPTO_ARC4=y
|
|
CONFIG_CRYPTO_DES=y
|
|
-CONFIG_CRYPTO_SM4=y
|
|
CONFIG_CRYPTO_DEFLATE=y
|
|
CONFIG_CRYPTO_LZO=y
|
|
CONFIG_CRYPTO_LZ4=y
|
|
@@ -655,7 +651,6 @@ CONFIG_DEBUG_FS=y
|
|
CONFIG_DETECT_HUNG_TASK=y
|
|
CONFIG_BOOTPARAM_HUNG_TASK_PANIC=y
|
|
CONFIG_WQ_WATCHDOG=y
|
|
-CONFIG_STACKTRACE=y
|
|
# CONFIG_RCU_TRACE is not set
|
|
# CONFIG_FTRACE is not set
|
|
# CONFIG_STRICT_DEVMEM is not set
|
|
diff --git a/arch/arm64/configs/pinebook_pro_defconfig b/arch/arm64/configs/pinebook_pro_defconfig
|
|
index 69b2f421177a..ae13afbbb492 100644
|
|
--- a/arch/arm64/configs/pinebook_pro_defconfig
|
|
+++ b/arch/arm64/configs/pinebook_pro_defconfig
|
|
@@ -1,5 +1,7 @@
|
|
CONFIG_SYSVIPC=y
|
|
CONFIG_POSIX_MQUEUE=y
|
|
+CONFIG_WATCH_QUEUE=y
|
|
+CONFIG_GENERIC_IRQ_DEBUGFS=y
|
|
CONFIG_NO_HZ=y
|
|
CONFIG_HIGH_RES_TIMERS=y
|
|
CONFIG_BPF_SYSCALL=y
|
|
@@ -15,16 +17,17 @@ CONFIG_TASK_IO_ACCOUNTING=y
|
|
CONFIG_PSI=y
|
|
CONFIG_IKCONFIG=y
|
|
CONFIG_IKCONFIG_PROC=y
|
|
-CONFIG_CGROUPS=y
|
|
+CONFIG_LOG_CPU_MAX_BUF_SHIFT=14
|
|
CONFIG_MEMCG=y
|
|
CONFIG_BLK_CGROUP=y
|
|
-CONFIG_CGROUP_SCHED=y
|
|
CONFIG_CGROUP_PIDS=y
|
|
CONFIG_CPUSETS=y
|
|
# CONFIG_PROC_PID_CPUSET is not set
|
|
CONFIG_CGROUP_DEVICE=y
|
|
CONFIG_CGROUP_BPF=y
|
|
CONFIG_USER_NS=y
|
|
+CONFIG_SCHED_AUTOGROUP=y
|
|
+CONFIG_RELAY=y
|
|
# CONFIG_RD_BZIP2 is not set
|
|
# CONFIG_RD_LZMA is not set
|
|
# CONFIG_RD_XZ is not set
|
|
@@ -44,6 +47,8 @@ CONFIG_ARCH_ROCKCHIP=y
|
|
# CONFIG_ARM64_ERRATUM_1508412 is not set
|
|
# CONFIG_ARM64_ERRATUM_2051678 is not set
|
|
# CONFIG_ARM64_ERRATUM_2077057 is not set
|
|
+# CONFIG_ARM64_ERRATUM_2054223 is not set
|
|
+# CONFIG_ARM64_ERRATUM_2067961 is not set
|
|
# CONFIG_CAVIUM_ERRATUM_22375 is not set
|
|
# CONFIG_CAVIUM_ERRATUM_23144 is not set
|
|
# CONFIG_CAVIUM_ERRATUM_23154 is not set
|
|
@@ -60,6 +65,7 @@ CONFIG_ARCH_ROCKCHIP=y
|
|
# CONFIG_SOCIONEXT_SYNQUACER_PREITS is not set
|
|
CONFIG_ARM64_VA_BITS_48=y
|
|
CONFIG_SCHED_MC=y
|
|
+CONFIG_SCHED_CLUSTER=y
|
|
CONFIG_NR_CPUS=8
|
|
CONFIG_NUMA=y
|
|
CONFIG_NODES_SHIFT=2
|
|
@@ -71,6 +77,8 @@ CONFIG_ARM64_PMEM=y
|
|
# CONFIG_ARM64_BTI is not set
|
|
# CONFIG_ARM64_E0PD is not set
|
|
# CONFIG_ARCH_RANDOM is not set
|
|
+# CONFIG_ARM64_MTE is not set
|
|
+# CONFIG_ARM64_EPAN is not set
|
|
# CONFIG_ARM64_SVE is not set
|
|
# CONFIG_EFI is not set
|
|
CONFIG_HIBERNATION=y
|
|
@@ -124,13 +132,12 @@ CONFIG_BLK_INLINE_ENCRYPTION=y
|
|
CONFIG_BLK_INLINE_ENCRYPTION_FALLBACK=y
|
|
CONFIG_PARTITION_ADVANCED=y
|
|
# CONFIG_MQ_IOSCHED_KYBER is not set
|
|
+CONFIG_BINFMT_MISC=y
|
|
CONFIG_TRANSPARENT_HUGEPAGE=y
|
|
CONFIG_CMA=y
|
|
+CONFIG_CMA_DEBUGFS=y
|
|
+CONFIG_CMA_SYSFS=y
|
|
CONFIG_CMA_AREAS=7
|
|
-CONFIG_ZPOOL=y
|
|
-CONFIG_ZBUD=y
|
|
-CONFIG_Z3FOLD=y
|
|
-CONFIG_ZSMALLOC=y
|
|
CONFIG_NET=y
|
|
CONFIG_PACKET=y
|
|
CONFIG_PACKET_DIAG=y
|
|
@@ -149,6 +156,7 @@ CONFIG_INET_UDP_DIAG=y
|
|
CONFIG_INET_RAW_DIAG=y
|
|
CONFIG_IPV6_ROUTER_PREF=y
|
|
CONFIG_IPV6_ROUTE_INFO=y
|
|
+CONFIG_IPV6_OPTIMISTIC_DAD=y
|
|
CONFIG_IPV6_MIP6=y
|
|
# CONFIG_IPV6_SIT is not set
|
|
CONFIG_NETFILTER=y
|
|
@@ -275,6 +283,7 @@ CONFIG_CFG80211_DEBUGFS=y
|
|
CONFIG_CFG80211_WEXT=y
|
|
CONFIG_MAC80211=y
|
|
CONFIG_MAC80211_LEDS=y
|
|
+CONFIG_MAC80211_DEBUGFS=y
|
|
CONFIG_RFKILL=y
|
|
CONFIG_RFKILL_GPIO=y
|
|
CONFIG_PCI=y
|
|
@@ -455,6 +464,7 @@ CONFIG_SERIAL_8250_DW=y
|
|
CONFIG_SERIAL_OF_PLATFORM=y
|
|
CONFIG_SERIAL_DEV_BUS=y
|
|
# CONFIG_HW_RANDOM is not set
|
|
+# CONFIG_RANDOM_TRUST_BOOTLOADER is not set
|
|
CONFIG_I2C_CHARDEV=y
|
|
CONFIG_I2C_MUX=y
|
|
CONFIG_I2C_GPIO=y
|
|
@@ -695,6 +705,8 @@ CONFIG_EXT4_FS=y
|
|
CONFIG_EXT4_FS_POSIX_ACL=y
|
|
CONFIG_XFS_FS=y
|
|
CONFIG_XFS_POSIX_ACL=y
|
|
+CONFIG_BTRFS_FS=y
|
|
+CONFIG_BTRFS_FS_POSIX_ACL=y
|
|
CONFIG_F2FS_FS=y
|
|
CONFIG_F2FS_FS_SECURITY=y
|
|
CONFIG_F2FS_CHECK_FS=y
|
|
@@ -707,14 +719,18 @@ CONFIG_FUSE_FS=y
|
|
CONFIG_CUSE=y
|
|
CONFIG_OVERLAY_FS=y
|
|
CONFIG_OVERLAY_FS_INDEX=y
|
|
+CONFIG_OVERLAY_FS_XINO_AUTO=y
|
|
CONFIG_OVERLAY_FS_METACOPY=y
|
|
CONFIG_VFAT_FS=y
|
|
+CONFIG_FAT_DEFAULT_UTF8=y
|
|
+CONFIG_EXFAT_FS=y
|
|
CONFIG_NTFS3_FS=y
|
|
CONFIG_NTFS3_64BIT_CLUSTER=y
|
|
CONFIG_NTFS3_FS_POSIX_ACL=y
|
|
CONFIG_PROC_CHILDREN=y
|
|
CONFIG_TMPFS=y
|
|
CONFIG_TMPFS_POSIX_ACL=y
|
|
+CONFIG_TMPFS_INODE64=y
|
|
CONFIG_ECRYPT_FS=y
|
|
CONFIG_ECRYPT_FS_MESSAGING=y
|
|
CONFIG_SQUASHFS=y
|
|
@@ -726,12 +742,15 @@ CONFIG_SQUASHFS_LZO=y
|
|
CONFIG_SQUASHFS_XZ=y
|
|
CONFIG_SQUASHFS_ZSTD=y
|
|
CONFIG_NFS_FS=y
|
|
-CONFIG_NFS_V3_ACL=y
|
|
+# CONFIG_NFS_V2 is not set
|
|
+# CONFIG_NFS_V3 is not set
|
|
CONFIG_NFS_V4=y
|
|
+CONFIG_NFS_V4_1=y
|
|
+CONFIG_NFS_V4_2=y
|
|
+CONFIG_NFS_V4_2_READ_PLUS=y
|
|
CONFIG_NFSD=y
|
|
CONFIG_NFSD_V3_ACL=y
|
|
CONFIG_NFSD_V4=y
|
|
-CONFIG_SUNRPC_DISABLE_INSECURE_ENCTYPES=y
|
|
CONFIG_CIFS=y
|
|
CONFIG_CIFS_XATTR=y
|
|
CONFIG_CIFS_POSIX=y
|
|
@@ -758,13 +777,9 @@ CONFIG_CRYPTO_CURVE25519=y
|
|
CONFIG_CRYPTO_CHACHA20POLY1305=y
|
|
CONFIG_CRYPTO_SEQIV=y
|
|
CONFIG_CRYPTO_ECHAINIV=y
|
|
-CONFIG_CRYPTO_BLAKE2B=y
|
|
CONFIG_CRYPTO_BLAKE2S=y
|
|
CONFIG_CRYPTO_MD4=y
|
|
-CONFIG_CRYPTO_SM3=y
|
|
CONFIG_CRYPTO_ARC4=y
|
|
-CONFIG_CRYPTO_DES=y
|
|
-CONFIG_CRYPTO_SM4=y
|
|
CONFIG_CRYPTO_DEFLATE=y
|
|
CONFIG_CRYPTO_LZO=y
|
|
CONFIG_CRYPTO_LZ4=y
|
|
@@ -788,7 +803,6 @@ CONFIG_DETECT_HUNG_TASK=y
|
|
CONFIG_BOOTPARAM_HUNG_TASK_PANIC=y
|
|
CONFIG_WQ_WATCHDOG=y
|
|
# CONFIG_SCHED_DEBUG is not set
|
|
-CONFIG_STACKTRACE=y
|
|
# CONFIG_RCU_TRACE is not set
|
|
# CONFIG_FTRACE is not set
|
|
# CONFIG_STRICT_DEVMEM is not set
|
|
diff --git a/arch/arm64/configs/pinephone_defconfig b/arch/arm64/configs/pinephone_defconfig
|
|
index 5b0a10d69b30..027d62023612 100644
|
|
--- a/arch/arm64/configs/pinephone_defconfig
|
|
+++ b/arch/arm64/configs/pinephone_defconfig
|
|
@@ -121,10 +121,6 @@ CONFIG_IOSCHED_BFQ=y
|
|
CONFIG_BFQ_GROUP_IOSCHED=y
|
|
CONFIG_CMA=y
|
|
CONFIG_CMA_DEBUGFS=y
|
|
-CONFIG_ZPOOL=y
|
|
-CONFIG_ZBUD=y
|
|
-CONFIG_Z3FOLD=y
|
|
-CONFIG_ZSMALLOC=y
|
|
CONFIG_NET=y
|
|
CONFIG_PACKET=y
|
|
CONFIG_PACKET_DIAG=y
|
|
@@ -326,6 +322,7 @@ CONFIG_SERIAL_8250_DW=y
|
|
CONFIG_SERIAL_OF_PLATFORM=y
|
|
CONFIG_SERIAL_DEV_BUS=y
|
|
# CONFIG_HW_RANDOM is not set
|
|
+# CONFIG_RANDOM_TRUST_BOOTLOADER is not set
|
|
CONFIG_I2C_CHARDEV=y
|
|
CONFIG_I2C_MUX=y
|
|
CONFIG_I2C_GPIO=y
|
|
@@ -636,10 +633,8 @@ CONFIG_CRYPTO_BLAKE2S=m
|
|
CONFIG_CRYPTO_MD4=m
|
|
CONFIG_CRYPTO_SHA1=y
|
|
CONFIG_CRYPTO_SHA3=y
|
|
-CONFIG_CRYPTO_SM3=y
|
|
CONFIG_CRYPTO_ARC4=m
|
|
CONFIG_CRYPTO_DES=y
|
|
-CONFIG_CRYPTO_SM4=y
|
|
CONFIG_CRYPTO_DEFLATE=y
|
|
CONFIG_CRYPTO_LZO=y
|
|
CONFIG_CRYPTO_LZ4=y
|
|
diff --git a/arch/arm64/configs/pinephone_multidist_defconfig b/arch/arm64/configs/pinephone_multidist_defconfig
|
|
index df9f57177176..30a4e01c1cc9 100644
|
|
--- a/arch/arm64/configs/pinephone_multidist_defconfig
|
|
+++ b/arch/arm64/configs/pinephone_multidist_defconfig
|
|
@@ -35,7 +35,6 @@ CONFIG_SCHED_AUTOGROUP=y
|
|
# CONFIG_RD_ZSTD is not set
|
|
CONFIG_EXPERT=y
|
|
CONFIG_PERF_EVENTS=y
|
|
-# CONFIG_SLUB_DEBUG is not set
|
|
CONFIG_ARCH_SUNXI=y
|
|
# CONFIG_ARM64_ERRATUM_832075 is not set
|
|
# CONFIG_ARM64_ERRATUM_1024718 is not set
|
|
@@ -118,10 +117,6 @@ CONFIG_IOSCHED_BFQ=y
|
|
CONFIG_BFQ_GROUP_IOSCHED=y
|
|
CONFIG_CMA=y
|
|
CONFIG_CMA_DEBUGFS=y
|
|
-CONFIG_ZPOOL=y
|
|
-CONFIG_ZBUD=y
|
|
-CONFIG_Z3FOLD=y
|
|
-CONFIG_ZSMALLOC=y
|
|
CONFIG_NET=y
|
|
CONFIG_PACKET=y
|
|
CONFIG_PACKET_DIAG=y
|
|
@@ -322,6 +317,7 @@ CONFIG_SERIAL_8250_DW=y
|
|
CONFIG_SERIAL_OF_PLATFORM=y
|
|
CONFIG_SERIAL_DEV_BUS=y
|
|
# CONFIG_HW_RANDOM is not set
|
|
+# CONFIG_RANDOM_TRUST_BOOTLOADER is not set
|
|
CONFIG_I2C_CHARDEV=y
|
|
CONFIG_I2C_GPIO=y
|
|
CONFIG_I2C_MV64XXX=y
|
|
@@ -590,9 +586,7 @@ CONFIG_CRYPTO_SEQIV=y
|
|
CONFIG_CRYPTO_ECHAINIV=y
|
|
CONFIG_CRYPTO_BLAKE2S=y
|
|
CONFIG_CRYPTO_MD4=y
|
|
-CONFIG_CRYPTO_SM3=y
|
|
CONFIG_CRYPTO_ARC4=y
|
|
-CONFIG_CRYPTO_SM4=y
|
|
CONFIG_CRYPTO_DEFLATE=y
|
|
CONFIG_CRYPTO_LZO=y
|
|
CONFIG_CRYPTO_LZ4=y
|
|
@@ -613,6 +607,7 @@ CONFIG_DYNAMIC_DEBUG=y
|
|
CONFIG_FRAME_WARN=1024
|
|
CONFIG_MAGIC_SYSRQ=y
|
|
CONFIG_DEBUG_FS=y
|
|
+# CONFIG_SLUB_DEBUG is not set
|
|
CONFIG_BOOTTIME_TRACING=y
|
|
CONFIG_FUNCTION_TRACER=y
|
|
CONFIG_FTRACE_SYSCALLS=y
|
|
diff --git a/arch/arm64/configs/pinephone_pro_defconfig b/arch/arm64/configs/pinephone_pro_defconfig
|
|
index 4cb7efe1e3c2..66bc250b41ec 100644
|
|
--- a/arch/arm64/configs/pinephone_pro_defconfig
|
|
+++ b/arch/arm64/configs/pinephone_pro_defconfig
|
|
@@ -1,10 +1,13 @@
|
|
CONFIG_SYSVIPC=y
|
|
CONFIG_POSIX_MQUEUE=y
|
|
+CONFIG_WATCH_QUEUE=y
|
|
+CONFIG_GENERIC_IRQ_DEBUGFS=y
|
|
CONFIG_NO_HZ=y
|
|
CONFIG_HIGH_RES_TIMERS=y
|
|
CONFIG_BPF_SYSCALL=y
|
|
CONFIG_BPF_JIT=y
|
|
# CONFIG_BPF_UNPRIV_DEFAULT_OFF is not set
|
|
+CONFIG_PREEMPT_VOLUNTARY=y
|
|
CONFIG_BSD_PROCESS_ACCT=y
|
|
CONFIG_BSD_PROCESS_ACCT_V3=y
|
|
CONFIG_TASKSTATS=y
|
|
@@ -124,10 +127,6 @@ CONFIG_TRANSPARENT_HUGEPAGE=y
|
|
CONFIG_CMA=y
|
|
CONFIG_CMA_DEBUGFS=y
|
|
CONFIG_CMA_SYSFS=y
|
|
-CONFIG_ZPOOL=y
|
|
-CONFIG_ZBUD=y
|
|
-CONFIG_Z3FOLD=y
|
|
-CONFIG_ZSMALLOC=y
|
|
CONFIG_NET=y
|
|
CONFIG_PACKET=y
|
|
CONFIG_PACKET_DIAG=y
|
|
@@ -373,7 +372,6 @@ CONFIG_USB_NET_CDC_MBIM=y
|
|
# CONFIG_USB_NET_NET1080 is not set
|
|
# CONFIG_USB_NET_CDC_SUBSET is not set
|
|
# CONFIG_USB_NET_ZAURUS is not set
|
|
-CONFIG_USB_RTL8153_ECM=y
|
|
# CONFIG_WLAN_VENDOR_ADMTEK is not set
|
|
# CONFIG_WLAN_VENDOR_ATH is not set
|
|
# CONFIG_WLAN_VENDOR_ATMEL is not set
|
|
@@ -421,15 +419,14 @@ CONFIG_SERIAL_AMBA_PL011=y
|
|
CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
|
|
CONFIG_SERIAL_DEV_BUS=y
|
|
# CONFIG_HW_RANDOM is not set
|
|
+# CONFIG_RANDOM_TRUST_BOOTLOADER is not set
|
|
CONFIG_I2C_CHARDEV=y
|
|
-CONFIG_I2C_MUX_PINCTRL=y
|
|
-CONFIG_I2C_DEMUX_PINCTRL=y
|
|
CONFIG_I2C_GPIO=y
|
|
CONFIG_I2C_RK3X=y
|
|
CONFIG_SPI=y
|
|
CONFIG_SPI_ROCKCHIP=y
|
|
# CONFIG_PTP_1588_CLOCK is not set
|
|
-CONFIG_PINCTRL_RK805=y
|
|
+CONFIG_SYSCON_REBOOT_MODE=y
|
|
CONFIG_IP5XXX_POWER=y
|
|
CONFIG_CHARGER_GPIO=y
|
|
CONFIG_CHARGER_RK818=y
|
|
@@ -571,7 +568,6 @@ CONFIG_USB_CONFIGFS_F_MIDI=y
|
|
CONFIG_USB_CONFIGFS_F_HID=y
|
|
CONFIG_USB_CONFIGFS_F_UVC=y
|
|
CONFIG_USB_CONFIGFS_F_PRINTER=y
|
|
-CONFIG_USB_CDC_COMPOSITE=y
|
|
CONFIG_TYPEC=y
|
|
CONFIG_TYPEC_TCPM=y
|
|
CONFIG_TYPEC_TCPCI=y
|
|
@@ -709,12 +705,9 @@ CONFIG_CRYPTO_CHACHA20POLY1305=y
|
|
CONFIG_CRYPTO_SEQIV=y
|
|
CONFIG_CRYPTO_ECHAINIV=y
|
|
CONFIG_CRYPTO_BLAKE2B=y
|
|
-CONFIG_CRYPTO_BLAKE2S=y
|
|
CONFIG_CRYPTO_MD4=y
|
|
-CONFIG_CRYPTO_SM3=y
|
|
CONFIG_CRYPTO_ARC4=y
|
|
CONFIG_CRYPTO_DES=y
|
|
-CONFIG_CRYPTO_SM4=y
|
|
CONFIG_CRYPTO_DEFLATE=y
|
|
CONFIG_CRYPTO_LZO=y
|
|
CONFIG_CRYPTO_LZ4=y
|
|
--
|
|
2.35.3
|
|
|