From c82ce1f2b7457165349fba221ab74db4fa73c21c Mon Sep 17 00:00:00 2001
From: M0Rf30 <morf3089@gmail.com>
Date: Sat, 10 Dec 2022 17:34:13 +0100
Subject: [PATCH] linux-samsung-hero2lte: fix wifi firmware path, change
sources, regenerate config
Signed-off-by: Gianluca Boiano <morf3089@gmail.com>
---
.../01-kstrtobool_from_user.patch | 11 +
.../01-remove-android-defines.patch | 24 --
.../02-fix-wifi-firmware-path.patch | 22 +
.../testing/linux-samsung-hero2lte/APKBUILD | 25 +-
.../config-samsung-hero2lte.aarch64 | 377 +++++++++++-------
...cc10-extern_YYLOC_global_declaration.patch | 1 -
6 files changed, 283 insertions(+), 177 deletions(-)
create mode 100644 device/testing/linux-samsung-hero2lte/01-kstrtobool_from_user.patch
delete mode 100644 device/testing/linux-samsung-hero2lte/01-remove-android-defines.patch
create mode 100644 device/testing/linux-samsung-hero2lte/02-fix-wifi-firmware-path.patch
delete mode 120000 device/testing/linux-samsung-hero2lte/gcc10-extern_YYLOC_global_declaration.patch
diff --git a/device/testing/linux-samsung-hero2lte/01-kstrtobool_from_user.patch b/device/testing/linux-samsung-hero2lte/01-kstrtobool_from_user.patch
new file mode 100644
index 00000000000..11ced994072
--- /dev/null
+++ b/device/testing/linux-samsung-hero2lte/01-kstrtobool_from_user.patch
@@ -0,0 +1,11 @@
+--- 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];
+
diff --git a/device/testing/linux-samsung-hero2lte/01-remove-android-defines.patch b/device/testing/linux-samsung-hero2lte/01-remove-android-defines.patch
deleted file mode 100644
index b517a05641d..00000000000
--- a/device/testing/linux-samsung-hero2lte/01-remove-android-defines.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-# 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
diff --git a/device/testing/linux-samsung-hero2lte/02-fix-wifi-firmware-path.patch b/device/testing/linux-samsung-hero2lte/02-fix-wifi-firmware-path.patch
new file mode 100644
index 00000000000..7709536020a
--- /dev/null
+++ b/device/testing/linux-samsung-hero2lte/02-fix-wifi-firmware-path.patch
@@ -0,0 +1,22 @@
+--- a/drivers/net/wireless/bcmdhd4359/dhd.h 2019-01-28 13:51:47.000000000 +0100
++++ b/drivers/net/wireless/bcmdhd4359/dhd.h 2019-04-13 12:22:40.501393213 +0200
+@@ -2126,18 +2126,7 @@ extern uint dhd_pktgen_len;
+ extern char fw_path2[MOD_PARAM_PATHLEN];
+ #endif
+
+-#if defined(ANDROID_PLATFORM_VERSION)
+-#if (ANDROID_PLATFORM_VERSION < 7)
+-#define DHD_LEGACY_FILE_PATH
+-#define VENDOR_PATH "/system"
+-#elif (ANDROID_PLATFORM_VERSION == 7)
+-#define VENDOR_PATH "/system"
+-#elif (ANDROID_PLATFORM_VERSION >= 8)
+-#define VENDOR_PATH "/vendor"
+-#endif /* ANDROID_PLATFORM_VERSION < 7 */
+-#else
+-#define VENDOR_PATH ""
+-#endif /* ANDROID_PLATFORM_VERSION */
++#define VENDOR_PATH "/lib/firmware/postmarketos"
+
+ #ifdef DHD_LEGACY_FILE_PATH
+ #define PLATFORM_PATH "/data/"
diff --git a/device/testing/linux-samsung-hero2lte/APKBUILD b/device/testing/linux-samsung-hero2lte/APKBUILD
index 8f25c3d0b87..20275f6b358 100644
--- a/device/testing/linux-samsung-hero2lte/APKBUILD
+++ b/device/testing/linux-samsung-hero2lte/APKBUILD
@@ -3,8 +3,8 @@
pkgname=linux-samsung-hero2lte
pkgver=3.18.140
-pkgrel=3
-pkgdesc="Samsung Galaxy S7 edge kernel fork"
+pkgrel=4
+pkgdesc="Samsung Galaxy S7 Edge kernel fork"
arch="aarch64"
_carch="arm64"
_flavor="samsung-hero2lte"
@@ -14,14 +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
- gcc10-extern_YYLOC_global_declaration.patch
+ 01-kstrtobool_from_user.patch
+ 02-fix-wifi-firmware-path.patch
"
builddir="$srcdir/$_repository-$_commit"
@@ -40,6 +40,7 @@ build() {
--platform 0x50a6 \
--subtype 0x217584da \
-o "arch/arm64/boot/dt.img" \
+ "arch/arm64/boot/dts/exynos8890-hero2lte_eur_open_04.dtb" \
"arch/arm64/boot/dts/exynos8890-hero2lte_eur_open_08.dtb"
}
@@ -51,7 +52,9 @@ package() {
"$pkgdir/boot/dt.img"
}
-sha512sums="28a447fca84c3c1bc95b505362a989964e652ff0c11a8f99e151225c4a29971c7698c846c7826552fcdc4acff799b3150e577892df88697776ce13cd0e76ac5f linux-samsung-hero2lte-4f50ed696fc6ec36d277ba1af73e98d34e7bc0d6.tar.gz
-11cf3a6d9bf4f41ee8c7c9999bccf2d8d20469fd91d6cd6dca9c25f0ced6dfd6cb53aafac1896267004f52f186a67b5950e582928c1174a145b01b60bd800c65 config-samsung-hero2lte.aarch64
-66e27a174e12d56f5b77932985f0001b551c834d68b2a1bcc1d0b7d04e555757fc9137c182bd4cf5ffd57bf2cb0918d758dfe153a6140b77f02e7b9f33ecfb2c 01-remove-android-defines.patch
-2b48f1bf0e3f70703d2cdafc47d5e615cc7c56c70bec56b2e3297d3fa4a7a1321d649a8679614553dde8fe52ff1051dae38d5990e3744c9ca986d92187dcdbeb gcc10-extern_YYLOC_global_declaration.patch"
+sha512sums="
+e7337d87dbc067a0a9cfe8fab8aac41408e5d54b8b138ca01309f5b9a65477ff8faaa995ee1957b664c195a3b9020b33f525864b01b1516dab15f8e2157343d5 linux-samsung-hero2lte-57884d864fb572642fcf84abf13b099db7efc5b8.tar.gz
+48c2fcf7cc3538764a162321c81084352e20afcaefae1f6a1eaa2eda13d9a10b78aaf3aeba55011c03d9c98d52950c84a62bb7ed6f59b832290ba1699d31b0c3 config-samsung-hero2lte.aarch64
+7b0687165fa854c9c60944487cc7ea87758af8612f10125c22643743284d9abcc17c6a40853d05da2e27313a4e830c995a876b306f1488a2fcb72c3cbed3a8ae 01-kstrtobool_from_user.patch
+ffef99094b44893d07aedf3bbf12b03f2c26fb93be4eb179ade9552ae82be6680daca06b6fc0f95064ef08fd94ef4a0b192a94f5065314a4608de8b8c413d86e 02-fix-wifi-firmware-path.patch
+"
diff --git a/device/testing/linux-samsung-hero2lte/config-samsung-hero2lte.aarch64 b/device/testing/linux-samsung-hero2lte/config-samsung-hero2lte.aarch64
index 2b7175a6aec..62abe8b3f3b 100644
--- a/device/testing/linux-samsung-hero2lte/config-samsung-hero2lte.aarch64
+++ b/device/testing/linux-samsung-hero2lte/config-samsung-hero2lte.aarch64
@@ -49,7 +49,7 @@ CONFIG_SYSVIPC_SYSCTL=y
# CONFIG_POSIX_MQUEUE is not set
CONFIG_CROSS_MEMORY_ATTACH=y
# CONFIG_FHANDLE is not set
-CONFIG_USELIB=y
+# CONFIG_USELIB is not set
CONFIG_AUDIT=y
CONFIG_HAVE_ARCH_AUDITSYSCALL=y
CONFIG_AUDITSYSCALL=y
@@ -91,7 +91,7 @@ CONFIG_TICK_CPU_ACCOUNTING=y
# CONFIG_SCHED_WALT is not set
# CONFIG_BSD_PROCESS_ACCT is not set
CONFIG_TASKSTATS=y
-# CONFIG_TASK_DELAY_ACCT is not set
+CONFIG_TASK_DELAY_ACCT=y
CONFIG_TASK_XACCT=y
CONFIG_TASK_IO_ACCOUNTING=y
@@ -110,8 +110,9 @@ CONFIG_RCU_FANOUT_LEAF=16
# CONFIG_TREE_RCU_TRACE is not set
# CONFIG_RCU_BOOST is not set
# CONFIG_RCU_NOCB_CPU is not set
-# CONFIG_BUILD_BIN2C is not set
-# CONFIG_IKCONFIG is not set
+CONFIG_BUILD_BIN2C=y
+CONFIG_IKCONFIG=y
+CONFIG_IKCONFIG_PROC=y
CONFIG_LOG_BUF_SHIFT=19
CONFIG_LOG_CPU_MAX_BUF_SHIFT=12
CONFIG_GENERIC_SCHED_CLOCK=y
@@ -123,13 +124,18 @@ CONFIG_CPUSETS=y
CONFIG_PROC_PID_CPUSET=y
CONFIG_CGROUP_CPUACCT=y
CONFIG_RESOURCE_COUNTERS=y
-# CONFIG_MEMCG is not set
+CONFIG_MEMCG=y
+CONFIG_MEMCG_SWAP=y
+CONFIG_MEMCG_SWAP_ENABLED=y
+CONFIG_MEMCG_FORCE_USE_VM_SWAPPINESS=y
+# CONFIG_MEMCG_KMEM is not set
# CONFIG_CGROUP_PERF is not set
CONFIG_CGROUP_SCHED=y
CONFIG_FAIR_GROUP_SCHED=y
CONFIG_CFS_BANDWIDTH=y
-CONFIG_RT_GROUP_SCHED=y
-# CONFIG_BLK_CGROUP is not set
+# CONFIG_RT_GROUP_SCHED is not set
+CONFIG_BLK_CGROUP=y
+# CONFIG_DEBUG_BLK_CGROUP is not set
# CONFIG_CHECKPOINT_RESTORE is not set
CONFIG_NAMESPACES=y
CONFIG_UTS_NS=y
@@ -146,9 +152,10 @@ CONFIG_INITRAMFS_SOURCE=""
CONFIG_RD_GZIP=y
# CONFIG_RD_BZIP2 is not set
# CONFIG_RD_LZMA is not set
-# CONFIG_RD_XZ is not set
+CONFIG_RD_XZ=y
# CONFIG_RD_LZO is not set
# CONFIG_RD_LZ4 is not set
+# CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE is not set
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
CONFIG_SYSCTL=y
CONFIG_ANON_INODES=y
@@ -161,7 +168,7 @@ CONFIG_UID16=y
CONFIG_SYSFS_SYSCALL=y
# CONFIG_SYSCTL_SYSCALL is not set
CONFIG_KALLSYMS=y
-# CONFIG_KALLSYMS_ALL is not set
+CONFIG_KALLSYMS_ALL=y
CONFIG_PRINTK=y
CONFIG_BUG=y
CONFIG_ELF_CORE=y
@@ -171,7 +178,7 @@ CONFIG_EPOLL=y
CONFIG_SIGNALFD=y
CONFIG_TIMERFD=y
CONFIG_EVENTFD=y
-# CONFIG_BPF_SYSCALL is not set
+CONFIG_BPF_SYSCALL=y
CONFIG_SHMEM=y
CONFIG_AIO=y
CONFIG_ADVISE_SYSCALLS=y
@@ -216,10 +223,10 @@ CONFIG_ARCH_WANT_COMPAT_IPC_PARSE_VERSION=y
CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
CONFIG_SECCOMP_FILTER=y
CONFIG_HAVE_CC_STACKPROTECTOR=y
-# CONFIG_CC_STACKPROTECTOR is not set
-CONFIG_CC_STACKPROTECTOR_NONE=y
+CONFIG_CC_STACKPROTECTOR=y
+# CONFIG_CC_STACKPROTECTOR_NONE is not set
# CONFIG_CC_STACKPROTECTOR_REGULAR is not set
-# CONFIG_CC_STACKPROTECTOR_STRONG is not set
+CONFIG_CC_STACKPROTECTOR_STRONG=y
CONFIG_HAVE_CONTEXT_TRACKING=y
CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y
CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y
@@ -245,6 +252,7 @@ CONFIG_BLOCK=y
# CONFIG_BLK_DEV_BSG is not set
# CONFIG_BLK_DEV_BSGLIB is not set
# CONFIG_BLK_DEV_INTEGRITY is not set
+# CONFIG_BLK_DEV_THROTTLING is not set
# CONFIG_BLK_CMDLINE_PARSER is not set
CONFIG_JOURNAL_DATA_TAG=y
# CONFIG_JOURNAL_DATA_TAG_DEBUG is not set
@@ -281,7 +289,11 @@ CONFIG_BLOCK_SUPPORT_STLOG=y
CONFIG_IOSCHED_NOOP=y
# CONFIG_IOSCHED_DEADLINE is not set
CONFIG_IOSCHED_CFQ=y
+CONFIG_CFQ_GROUP_IOSCHED=y
+CONFIG_IOSCHED_BFQ=y
+CONFIG_CGROUP_BFQIO=y
CONFIG_DEFAULT_CFQ=y
+# CONFIG_DEFAULT_BFQ is not set
# CONFIG_DEFAULT_NOOP is not set
CONFIG_DEFAULT_IOSCHED="cfq"
CONFIG_UNINLINE_SPIN_UNLOCK=y
@@ -304,6 +316,7 @@ CONFIG_ARCH_EXYNOS=y
CONFIG_SOC_EXYNOS8890=y
CONFIG_MODEL_HERO2LTE=y
# CONFIG_MODEL_HEROLTE is not set
+# CONFIG_MODEL_GRACELTE is not set
CONFIG_ARCH_EXYNOS8=y
CONFIG_PWRCAL=y
CONFIG_ARM_TRUSTZONE=y
@@ -354,6 +367,7 @@ CONFIG_ARM64_ERRATUM_832075=y
CONFIG_ARM64_ERRATUM_845719=y
# CONFIG_TIMA is not set
# CONFIG_TIMA_LKMAUTH is not set
+# CONFIG_UH_RKP is not set
CONFIG_ARM64_4K_PAGES=y
# CONFIG_ARM64_64K_PAGES is not set
CONFIG_ARM64_VA_BITS_39=y
@@ -377,7 +391,12 @@ CONFIG_HOTPLUG_CPU=y
# CONFIG_PREEMPT_VOLUNTARY is not set
CONFIG_PREEMPT=y
CONFIG_PREEMPT_COUNT=y
-CONFIG_HZ=100
+# CONFIG_HZ_100 is not set
+# CONFIG_HZ_250 is not set
+CONFIG_HZ_300=y
+# CONFIG_HZ_1000 is not set
+CONFIG_HZ=300
+CONFIG_SCHED_HRTICK=y
CONFIG_ARCH_HAS_HOLES_MEMORYMODEL=y
CONFIG_ARCH_SPARSEMEM_ENABLE=y
CONFIG_ARCH_SPARSEMEM_DEFAULT=y
@@ -405,7 +424,7 @@ CONFIG_COMPACTION=y
CONFIG_MIGRATION=y
CONFIG_PHYS_ADDR_T_64BIT=y
CONFIG_ZONE_DMA_FLAG=0
-CONFIG_KSM=y
+# CONFIG_KSM is not set
CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
# CONFIG_TRANSPARENT_HUGEPAGE is not set
# CONFIG_CLEANCACHE is not set
@@ -413,24 +432,20 @@ CONFIG_FRONTSWAP=y
CONFIG_CMA=y
# CONFIG_CMA_DEBUG is not set
CONFIG_CMA_PINPAGE_MIGRATION=y
-CONFIG_CMA_AREAS=7
-CONFIG_ZSWAP=y
-# CONFIG_ZSWAP_ENABLE_WRITEBACK is not set
-# CONFIG_ZSWAP_COMPACTION is not set
-CONFIG_ZPOOL=y
+CONFIG_CMA_AREAS=8
+# CONFIG_ZSWAP is not set
+# CONFIG_ESWAP is not set
+# CONFIG_ZPOOL is not set
# CONFIG_ZBUD is not set
CONFIG_ZSMALLOC=y
CONFIG_PGTABLE_MAPPING=y
CONFIG_ZSMALLOC_STAT=y
# CONFIG_ZSMALLOC_OBJ_SEQ is not set
-CONFIG_DIRECT_RECLAIM_FILE_PAGES_ONLY=y
-CONFIG_INCREASE_MAXIMUM_SWAPPINESS=y
-CONFIG_FIX_INACTIVE_RATIO=y
-CONFIG_TIGHT_PGDAT_BALANCE=y
# CONFIG_SWAP_ENABLE_READAHEAD is not set
CONFIG_GENERIC_EARLY_IOREMAP=y
-CONFIG_MMAP_READAROUND_LIMIT=0
+CONFIG_MMAP_READAROUND_LIMIT=32
CONFIG_LARGE_DIRTY_BUFFER=y
+CONFIG_RBIN=y
CONFIG_SECCOMP=y
# CONFIG_XEN is not set
CONFIG_FORCE_MAX_ZONEORDER=11
@@ -467,8 +482,11 @@ CONFIG_BINFMT_SCRIPT=y
# CONFIG_BINFMT_MISC is not set
CONFIG_COREDUMP=y
CONFIG_COMPAT=y
+CONFIG_KUSER_HELPERS=y
CONFIG_SYSVIPC_COMPAT=y
CONFIG_KEYS_COMPAT=y
+# CONFIG_COMPAT_VDSO is not set
+CONFIG_CROSS_COMPILE_ARM32=""
#
# Power management options
@@ -478,7 +496,7 @@ CONFIG_SUSPEND_FREEZER=y
CONFIG_WAKELOCK=y
CONFIG_PM_SLEEP=y
CONFIG_PM_SLEEP_SMP=y
-CONFIG_PM_AUTOSLEEP=y
+# CONFIG_PM_AUTOSLEEP is not set
CONFIG_PM_WAKELOCKS=y
CONFIG_PM_WAKELOCKS_LIMIT=0
# CONFIG_PM_WAKELOCKS_GC is not set
@@ -492,7 +510,7 @@ CONFIG_PM_SLEEP_DEBUG=y
CONFIG_PM_OPP=y
CONFIG_PM_CLK=y
CONFIG_PM_GENERIC_DOMAINS=y
-# CONFIG_WQ_POWER_EFFICIENT_DEFAULT is not set
+CONFIG_WQ_POWER_EFFICIENT_DEFAULT=y
CONFIG_PM_GENERIC_DOMAINS_SLEEP=y
CONFIG_PM_GENERIC_DOMAINS_RUNTIME=y
CONFIG_PM_GENERIC_DOMAINS_OF=y
@@ -562,8 +580,7 @@ CONFIG_EXYNOS_BIG_FREQ_BOOST=y
#
# Control Flow Protection
#
-CONFIG_RKP_CFP_JOPP_MAGIC=0xb3ea3bad
-# CONFIG_EXYNOS_DTBTOOL is not set
+CONFIG_RKP_CFP_JOPP_MAGIC=0x00be7bad
CONFIG_NET=y
CONFIG_COMPAT_NETLINK_MESSAGES=y
@@ -579,7 +596,7 @@ CONFIG_XFRM_ALGO=y
CONFIG_XFRM_USER=y
# CONFIG_XFRM_SUB_POLICY is not set
# CONFIG_XFRM_MIGRATE is not set
-# CONFIG_XFRM_STATISTICS is not set
+CONFIG_XFRM_STATISTICS=y
CONFIG_XFRM_IPCOMP=y
CONFIG_NET_KEY=y
# CONFIG_NET_KEY_MIGRATE is not set
@@ -595,12 +612,13 @@ CONFIG_IP_PNP_DHCP=y
CONFIG_IP_PNP_BOOTP=y
CONFIG_IP_PNP_RARP=y
# CONFIG_NET_IPIP is not set
-# CONFIG_NET_IPGRE_DEMUX is not set
+CONFIG_NET_IPGRE_DEMUX=y
CONFIG_NET_IP_TUNNEL=y
+# CONFIG_NET_IPGRE is not set
# CONFIG_IP_MROUTE is not set
# CONFIG_SYN_COOKIES is not set
-# CONFIG_NET_IPVTI is not set
-# CONFIG_NET_UDP_TUNNEL is not set
+CONFIG_NET_IPVTI=y
+CONFIG_NET_UDP_TUNNEL=y
# CONFIG_NET_FOU is not set
# CONFIG_GENEVE is not set
CONFIG_INET_AH=y
@@ -614,7 +632,7 @@ CONFIG_INET_XFRM_MODE_BEET=y
# CONFIG_INET_LRO is not set
CONFIG_INET_DIAG=y
CONFIG_INET_TCP_DIAG=y
-# CONFIG_INET_UDP_DIAG is not set
+CONFIG_INET_UDP_DIAG=y
CONFIG_INET_DIAG_DESTROY=y
CONFIG_TCP_CONG_ADVANCED=y
CONFIG_TCP_CONG_BIC=y
@@ -658,7 +676,7 @@ CONFIG_INET6_XFRM_MODE_TRANSPORT=y
CONFIG_INET6_XFRM_MODE_TUNNEL=y
CONFIG_INET6_XFRM_MODE_BEET=y
# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
-# CONFIG_IPV6_VTI is not set
+CONFIG_IPV6_VTI=y
CONFIG_IPV6_SIT=y
# CONFIG_IPV6_SIT_6RD is not set
CONFIG_IPV6_NDISC_NODETYPE=y
@@ -693,6 +711,7 @@ CONFIG_NF_CONNTRACK=y
CONFIG_NF_LOG_COMMON=y
CONFIG_NF_CONNTRACK_MARK=y
CONFIG_NF_CONNTRACK_SECMARK=y
+CONFIG_NF_CONNTRACK_ZONES=y
CONFIG_NF_CONNTRACK_PROCFS=y
CONFIG_NF_CONNTRACK_EVENTS=y
# CONFIG_NF_CONNTRACK_TIMEOUT is not set
@@ -743,7 +762,7 @@ CONFIG_NETFILTER_XT_CONNMARK=y
CONFIG_NETFILTER_XT_TARGET_CLASSIFY=y
CONFIG_NETFILTER_XT_TARGET_CONNMARK=y
CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=y
-# CONFIG_NETFILTER_XT_TARGET_CT is not set
+CONFIG_NETFILTER_XT_TARGET_CT=y
# CONFIG_NETFILTER_XT_TARGET_DSCP is not set
# CONFIG_NETFILTER_XT_TARGET_HL is not set
# CONFIG_NETFILTER_XT_TARGET_HMARK is not set
@@ -768,7 +787,7 @@ CONFIG_NETFILTER_XT_TARGET_TCPMSS=y
# Xtables matches
#
# CONFIG_NETFILTER_XT_MATCH_ADDRTYPE is not set
-# CONFIG_NETFILTER_XT_MATCH_BPF is not set
+CONFIG_NETFILTER_XT_MATCH_BPF=y
# CONFIG_NETFILTER_XT_MATCH_CGROUP is not set
# CONFIG_NETFILTER_XT_MATCH_CLUSTER is not set
CONFIG_NETFILTER_XT_MATCH_COMMENT=y
@@ -892,7 +911,9 @@ CONFIG_IP6_NF_TARGET_MASQUERADE=y
# CONFIG_RDS is not set
# CONFIG_TIPC is not set
# CONFIG_ATM is not set
-# CONFIG_L2TP is not set
+CONFIG_L2TP=y
+# CONFIG_L2TP_DEBUGFS is not set
+# CONFIG_L2TP_V3 is not set
# CONFIG_BRIDGE is not set
CONFIG_HAVE_NET_DSA=y
# CONFIG_VLAN_8021Q is not set
@@ -922,16 +943,16 @@ CONFIG_NET_SCH_PRIO=y
# CONFIG_NET_SCH_TBF is not set
# CONFIG_NET_SCH_GRED is not set
# CONFIG_NET_SCH_DSMARK is not set
-# CONFIG_NET_SCH_NETEM is not set
+CONFIG_NET_SCH_NETEM=y
# CONFIG_NET_SCH_DRR is not set
# CONFIG_NET_SCH_MQPRIO is not set
# CONFIG_NET_SCH_CHOKE is not set
# CONFIG_NET_SCH_QFQ is not set
# CONFIG_NET_SCH_CODEL is not set
-# CONFIG_NET_SCH_FQ_CODEL is not set
+CONFIG_NET_SCH_FQ_CODEL=y
# CONFIG_NET_SCH_FQ is not set
# CONFIG_NET_SCH_HHF is not set
-# CONFIG_NET_SCH_PIE is not set
+CONFIG_NET_SCH_PIE=y
CONFIG_NET_SCH_INGRESS=y
# CONFIG_NET_SCH_PLUG is not set
@@ -950,7 +971,7 @@ CONFIG_NET_CLS_U32=y
# CONFIG_NET_CLS_RSVP6 is not set
# CONFIG_NET_CLS_FLOW is not set
# CONFIG_NET_CLS_CGROUP is not set
-# CONFIG_NET_CLS_BPF is not set
+CONFIG_NET_CLS_BPF=y
CONFIG_NET_EMATCH=y
CONFIG_NET_EMATCH_STACK=32
# CONFIG_NET_EMATCH_CMP is not set
@@ -979,7 +1000,6 @@ CONFIG_NET_SCH_FIFO=y
# CONFIG_NETLINK_DIAG is not set
# CONFIG_NET_MPLS_GSO is not set
# CONFIG_HSR is not set
-CONFIG_KNOX_NCM=y
CONFIG_RPS=y
CONFIG_RFS_ACCEL=y
CONFIG_XPS=y
@@ -1041,10 +1061,8 @@ CONFIG_RFKILL_PM=y
# CONFIG_NET_9P is not set
# CONFIG_CAIF is not set
# CONFIG_CEPH_LIB is not set
-CONFIG_NFC=y
-# CONFIG_NFC_DIGITAL is not set
-# CONFIG_NFC_NCI is not set
-# CONFIG_NFC_HCI is not set
+# CONFIG_NFC is not set
+CONFIG_SAMSUNG_NFC=y
#
# Near Field Communication (NFC) devices
@@ -1062,6 +1080,7 @@ CONFIG_ESE_SECURE_GPIO="gpf2"
# CONFIG_SEC_NFC_SENN3AB is not set
# CONFIG_NFC_DEBUG is not set
# CONFIG_NFC_EDC_TUNING is not set
+CONFIG_DST_CACHE=y
CONFIG_HAVE_BPF_JIT=y
#
@@ -1134,14 +1153,14 @@ CONFIG_BLK_DEV=y
# CONFIG_BLK_DEV_NULL_BLK is not set
# CONFIG_BLK_DEV_PCIESSD_MTIP32XX is not set
CONFIG_ZRAM=y
-# CONFIG_ZRAM_LZ4_COMPRESS is not set
+CONFIG_ZRAM_LZ4_COMPRESS=y
# CONFIG_ZRAM_DEBUG is not set
# CONFIG_BLK_CPQ_CISS_DA is not set
# CONFIG_BLK_DEV_DAC960 is not set
# CONFIG_BLK_DEV_UMEM is not set
# CONFIG_BLK_DEV_COW_COMMON is not set
CONFIG_BLK_DEV_LOOP=y
-CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
+CONFIG_BLK_DEV_LOOP_MIN_COUNT=16
# CONFIG_BLK_DEV_CRYPTOLOOP is not set
# CONFIG_BLK_DEV_DRBD is not set
# CONFIG_BLK_DEV_NBD is not set
@@ -1256,6 +1275,7 @@ CONFIG_CP_SECURE_BOOT=y
CONFIG_HW_REV_DETECT=y
# CONFIG_MODEM_IF_LEGACY_QOS is not set
# CONFIG_MODEM_IF_QOS is not set
+CONFIG_DEV_RIL_BRIDGE=y
#
# NOTIFIER configs
@@ -1283,7 +1303,7 @@ CONFIG_SCSI_MOD=y
# CONFIG_RAID_ATTRS is not set
CONFIG_SCSI=y
CONFIG_UFS_FMP_DM_CRYPT=y
-CONFIG_UFS_FMP_ECRYPT_FS=y
+# CONFIG_UFS_FMP_ECRYPT_FS is not set
CONFIG_SRPMB=y
CONFIG_SCSI_DMA=y
# CONFIG_SCSI_NETLINK is not set
@@ -1346,7 +1366,7 @@ CONFIG_UFS_DYNAMIC_H8=y
CONFIG_SCSI_UFSHCD_PLATFORM=y
# CONFIG_SCSI_UFS_TEST_MODE is not set
CONFIG_SCSI_UFS_EXYNOS=y
-CONFIG_NO_ORDERED_DISCARD=y
+# CONFIG_NO_ORDERED_DISCARD is not set
# CONFIG_SCSI_HPTIOP is not set
# CONFIG_SCSI_DMX3191D is not set
# CONFIG_SCSI_FUTURE_DOMAIN is not set
@@ -1373,7 +1393,6 @@ CONFIG_MD=y
CONFIG_BLK_DEV_DM_BUILTIN=y
CONFIG_BLK_DEV_DM=y
# CONFIG_DM_DEBUG is not set
-CONFIG_DM_BUFIO=y
CONFIG_DM_CRYPT=y
# CONFIG_DM_SNAPSHOT is not set
# CONFIG_DM_THIN_PROVISIONING is not set
@@ -1384,10 +1403,9 @@ CONFIG_DM_CRYPT=y
# CONFIG_DM_ZERO is not set
# CONFIG_DM_MULTIPATH is not set
# CONFIG_DM_DELAY is not set
-# CONFIG_DM_UEVENT is not set
+CONFIG_DM_UEVENT=y
# CONFIG_DM_FLAKEY is not set
-CONFIG_DM_VERITY=y
-# CONFIG_DM_VERITY_FEC is not set
+# CONFIG_DM_VERITY is not set
# CONFIG_DM_SWITCH is not set
# CONFIG_DM_LOG_WRITES is not set
# CONFIG_TARGET_CORE is not set
@@ -1404,6 +1422,8 @@ CONFIG_MII=y
CONFIG_NET_CORE=y
# CONFIG_BONDING is not set
# CONFIG_DUMMY is not set
+CONFIG_WIREGUARD=y
+# CONFIG_WIREGUARD_DEBUG is not set
# CONFIG_EQUALIZER is not set
# CONFIG_NET_FC is not set
# CONFIG_IFB is not set
@@ -1615,6 +1635,8 @@ CONFIG_PPP_DEFLATE=y
CONFIG_PPP_MPPE=y
# CONFIG_PPP_MULTILINK is not set
# CONFIG_PPPOE is not set
+CONFIG_PPTP=y
+CONFIG_PPPOL2TP=y
CONFIG_PPPOLAC=y
CONFIG_PPPOPNS=y
# CONFIG_PPP_ASYNC is not set
@@ -1645,6 +1667,7 @@ CONFIG_USB_NET_NET1080=y
# CONFIG_USB_NET_PLUSB is not set
# CONFIG_USB_NET_MCS7830 is not set
# CONFIG_USB_NET_RNDIS_HOST is not set
+CONFIG_USB_NET_CDC_SUBSET_ENABLE=y
CONFIG_USB_NET_CDC_SUBSET=y
# CONFIG_USB_ALI_M5632 is not set
# CONFIG_USB_AN2720 is not set
@@ -1700,7 +1723,7 @@ CONFIG_BCMDHD_PREALLOC_MEMDUMP=y
CONFIG_WLAN_HERO2=y
CONFIG_BCMDHD_OOB_HOST_WAKE=y
CONFIG_SPLIT_ARGOS_SET=y
-# CONFIG_WLAN_GRACE is not set
+CONFIG_WLAN_GRACE=y
# CONFIG_WLAN_GREAT is not set
# CONFIG_BCM_DETECT_CONSECUTIVE_HANG is not set
# CONFIG_WLAN_5GDISABLE is not set
@@ -1876,7 +1899,6 @@ CONFIG_TOUCHSCREEN_SEC_TS=y
# CONFIG_TOUCHSCREEN_ATMEL_MXT1664 is not set
# CONFIG_TOUCHSCREEN_ATMEL_MXT874U is not set
# CONFIG_TOUCHSCREEN_G2TOUCH is not set
-CONFIG_WAKE_GESTURES=y
# CONFIG_INPUT_WACOM is not set
# CONFIG_EPEN_WACOM_G5SP is not set
# CONFIG_EPEN_WACOM_G9PM is not set
@@ -2104,6 +2126,7 @@ CONFIG_SENSORS_FP_SPI_NUMBER=4
#
# CONFIG_SPI_SPIDEV is not set
# CONFIG_SPI_TLE62X0 is not set
+# CONFIG_SPI_DYNAMIC is not set
# CONFIG_SPMI is not set
# CONFIG_HSI is not set
@@ -2612,7 +2635,87 @@ CONFIG_VIDEO_EXYNOS_FIMG2D_V5=y
# CONFIG_VIDEO_EXYNOS_FIMG2D_LEGACY is not set
CONFIG_VIDEO_EXYNOS_FIMG2D_1SHOT2=y
CONFIG_VIDEO_EXYNOS_SMFC=y
-# CONFIG_VIDEO_EXYNOS_FIMC_IS2 is not set
+CONFIG_VIDEO_EXYNOS_FIMC_IS2=y
+CONFIG_EXYNOS_CAMERA_MODULE=y
+# CONFIG_MODULE_ALL_INCLUDE is not set
+CONFIG_CAMERA_MODULE_SELECT=y
+# CONFIG_CAMERA_SENSOR_8B1 is not set
+# CONFIG_CAMERA_SENSOR_6D1 is not set
+# CONFIG_CAMERA_SENSOR_VIRTUAL_ZEBU_OBJ is not set
+# CONFIG_CAMERA_SENSOR_8B1_OBJ is not set
+# CONFIG_CAMERA_SENSOR_6D1_OBJ is not set
+# CONFIG_CAMERA_SENSOR_6B2_OBJ is not set
+# CONFIG_CAMERA_SENSOR_6A3_OBJ is not set
+# CONFIG_CAMERA_SENSOR_5E3_OBJ is not set
+# CONFIG_CAMERA_SENSOR_IMX135_OBJ is not set
+# CONFIG_CAMERA_SENSOR_IMX134_OBJ is not set
+# CONFIG_CAMERA_SENSOR_3L2_OBJ is not set
+# CONFIG_CAMERA_SENSOR_3L8_OBJ is not set
+# CONFIG_CAMERA_SENSOR_2P2_OBJ is not set
+# CONFIG_CAMERA_SENSOR_2P2_12M_OBJ is not set
+# CONFIG_CAMERA_SENSOR_2P8_OBJ is not set
+# CONFIG_CAMERA_SENSOR_2T2_OBJ is not set
+# CONFIG_CAMERA_SENSOR_2P3_OBJ is not set
+CONFIG_CAMERA_SENSOR_2L1_OBJ=y
+# CONFIG_CAMERA_SENSOR_3H5_OBJ is not set
+# CONFIG_CAMERA_SENSOR_3H7_OBJ is not set
+# CONFIG_CAMERA_SENSOR_3H7_SUNNY_OBJ is not set
+# CONFIG_CAMERA_SENSOR_4E5_OBJ is not set
+# CONFIG_CAMERA_SENSOR_IMX175_OBJ is not set
+# CONFIG_CAMERA_SENSOR_IMX219_OBJ is not set
+# CONFIG_CAMERA_SENSOR_IMX240_OBJ is not set
+CONFIG_CAMERA_SENSOR_IMX260_OBJ=y
+# CONFIG_CAMERA_SENSOR_4H5_OBJ is not set
+# CONFIG_CAMERA_SENSOR_4H5YC_OBJ is not set
+# CONFIG_CAMERA_SENSOR_SR261_OBJ is not set
+CONFIG_CAMERA_SENSOR_4E6_OBJ=y
+CONFIG_CAMERA_SENSOR_4E6_C2_OBJ=y
+# CONFIG_CAMERA_SENSOR_3M2_OBJ is not set
+# CONFIG_CAMERA_SENSOR_5E2_OBJ is not set
+# CONFIG_CAMERA_SENSOR_3P3_OBJ is not set
+# CONFIG_CAMERA_SENSOR_5E6_OBJ is not set
+CONFIG_EXYNOS_MIPI_CSIS=y
+# CONFIG_EXYNOS_DEVICE_MIPI_CSIS is not set
+CONFIG_EXYNOS_DEVICE_MIPI_CSIS_VER2=y
+# CONFIG_CSIS_V4_0 is not set
+CONFIG_CSIS_V4_1=y
+CONFIG_USE_CSI_DMAOUT_FEATURE=y
+CONFIG_EXYNOS_FIMC_BNS=y
+# CONFIG_FIMC_BNS_V2_0 is not set
+# CONFIG_FIMC_BNS_V4_0 is not set
+# CONFIG_FIMC_BNS_V4_10_0 is not set
+CONFIG_FIMC_BNS_V4_20_0=y
+CONFIG_EXYNOS_FIMC_IS=y
+CONFIG_FIMC_IS_V4_3_0=y
+# CONFIG_FIMC_IS_V4_0_0 is not set
+# CONFIG_FIMC_IS_V3_1_1 is not set
+# CONFIG_FIMC_IS_V3_11_0 is not set
+CONFIG_VENDER_FEATURE=y
+# CONFIG_VENDER_DEFAULT is not set
+CONFIG_VENDER_MCD=y
+# CONFIG_CAMERA_EEPROM_SUPPORT_REAR is not set
+CONFIG_CAMERA_EEPROM_SUPPORT_FRONT=y
+CONFIG_COMPANION_USE=y
+# CONFIG_COMPANION_C1_USE is not set
+# CONFIG_COMPANION_C2_USE is not set
+CONFIG_COMPANION_C3_USE=y
+CONFIG_COMPANION_DCDC_USE=y
+CONFIG_PREPROCESSOR_STANDBY_USE=y
+CONFIG_SENSOR_RETENTION_USE=y
+CONFIG_OIS_USE=y
+# CONFIG_OIS_FW_UPDATE_THREAD_USE is not set
+CONFIG_AF_HOST_CONTROL=y
+# CONFIG_TORCH_CURRENT_CHANGE_SUPPORT is not set
+# CONFIG_CAMERA_HERO is not set
+CONFIG_CAMERA_GRACE=y
+# CONFIG_CAMERA_VJFLTE is not set
+# CONFIG_CAMERA_ULTE is not set
+CONFIG_OIS_USE_RUMBA_S4=y
+CONFIG_COMPANION_FACTORY_VALIDATION=y
+# CONFIG_SECURE_CAMERA_USE is not set
+# CONFIG_USE_DIRECT_IS_CONTROL is not set
+CONFIG_EXYNOS_FIMC_IS_HARDWARE=y
+CONFIG_USE_HW_API_COMMON=y
CONFIG_MEDIA_EXYNOS=y
# CONFIG_SOC_CAMERA is not set
# CONFIG_VIDEO_SAMSUNG_EXYNOS4_IS is not set
@@ -2687,24 +2790,24 @@ CONFIG_MEDIA_SUBDRV_AUTOSELECT=y
#
# ARM GPU Configuration
#
-CONFIG_DDK_VERSION_OS="o"
+CONFIG_DDK_VERSION_OS="p"
CONFIG_MALI_T8XX=y
# CONFIG_MALI_R7P0 is not set
# CONFIG_MALI_R9P0 is not set
# CONFIG_MALI_R12P0 is not set
# CONFIG_MALI_R15P0 is not set
-CONFIG_MALI_R22P0=y
+# CONFIG_MALI_R22P0 is not set
+CONFIG_MALI_R28P0=y
CONFIG_MALI_SYSTRACE_SUPPORT=y
CONFIG_MALI_DVFS=y
CONFIG_MALI_RT_PM=y
CONFIG_MALI_MIDGARD_ENABLE_TRACE=y
CONFIG_MALI_EXYNOS_TRACE=y
CONFIG_MALI_DEBUG_SYS=y
-# CONFIG_MALI_DEVFREQ is not set
+CONFIG_MALI_DEVFREQ=y
CONFIG_MALI_EXPERT=y
# CONFIG_MALI_DEBUG is not set
# CONFIG_MALI_NO_MALI is not set
-# CONFIG_MALI_TRACE_TIMELINE is not set
# CONFIG_MALI_SYSTEM_TRACE is not set
# CONFIG_MALI_SEC_HWCNT is not set
# CONFIG_MALI_DMA_FENCE is not set
@@ -2712,7 +2815,6 @@ CONFIG_MALI_EXPERT=y
CONFIG_EXYNOS_SOC_NAME="8890"
CONFIG_MALI_MIDGARD=y
# CONFIG_MALI_GATOR_SUPPORT is not set
-# CONFIG_MALI_MIDGARD_DVFS is not set
# CONFIG_MALI_CORESTACK is not set
# CONFIG_MALI_FENCE_DEBUG is not set
CONFIG_MALI_SEC_CL_BOOST=y
@@ -2723,10 +2825,10 @@ CONFIG_MALI_DEBUG_KERNEL_SYSFS=y
CONFIG_MALI_EXYNOS_SECURE_RENDERING=y
CONFIG_MALI_SEC_ASP_SECURE_BUF_CTRL=y
CONFIG_MALI_PLATFORM_NAME="exynos"
-# CONFIG_MALI_JOB_DUMPING is not set
# CONFIG_MALI_2MB_ALLOC is not set
# CONFIG_MALI_PWRSOFT_765 is not set
CONFIG_MALI_SEC_JOB_STATUS_CHECK=y
+# CONFIG_MALI_JOB_DUMP is not set
CONFIG_VGA_ARB=y
CONFIG_VGA_ARB_MAX_GPUS=16
@@ -2816,7 +2918,7 @@ CONFIG_DSIM_ESD_REMOVE_DISP_DET=y
CONFIG_CHECK_OCTA_CHIP_ID=y
# CONFIG_LCD_RES is not set
# CONFIG_DECON_SELF_REFRESH is not set
-CONFIG_LOGGING_BIGDATA_BUG=y
+# CONFIG_LOGGING_BIGDATA_BUG is not set
# CONFIG_DUMPSTATE_LOGGING is not set
CONFIG_EXYNOS_VPP=y
CONFIG_EXYNOS_DECON_LCD=y
@@ -3241,7 +3343,12 @@ CONFIG_USB_DEFAULT_PERSIST=y
CONFIG_USB_XHCI_HCD=y
CONFIG_USB_XHCI_PCI=y
CONFIG_USB_XHCI_PLATFORM=y
-# CONFIG_USB_EHCI_HCD is not set
+CONFIG_USB_EHCI_HCD=y
+# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
+CONFIG_USB_EHCI_TT_NEWSCHED=y
+CONFIG_USB_EHCI_PCI=y
+# CONFIG_USB_EHCI_EXYNOS is not set
+# CONFIG_USB_EHCI_HCD_PLATFORM is not set
# CONFIG_USB_OXU210HP_HCD is not set
# CONFIG_USB_ISP116X_HCD is not set
# CONFIG_USB_ISP1760_HCD is not set
@@ -3397,7 +3504,6 @@ CONFIG_USB_SERIAL_PL2303=y
# CONFIG_USB_EMI26 is not set
# CONFIG_USB_ADUTUX is not set
# CONFIG_USB_SEVSEG is not set
-# CONFIG_USB_RIO500 is not set
# CONFIG_USB_LEGOTOWER is not set
# CONFIG_USB_LCD is not set
# CONFIG_USB_LED is not set
@@ -3406,6 +3512,7 @@ CONFIG_USB_SERIAL_PL2303=y
# CONFIG_USB_IDMOUSE is not set
# CONFIG_USB_FTDI_ELAN is not set
# CONFIG_USB_APPLEDISPLAY is not set
+# CONFIG_USB_SISUSBVGA is not set
# CONFIG_USB_LD is not set
# CONFIG_USB_TRANCEVIBRATOR is not set
# CONFIG_USB_IOWARRIOR is not set
@@ -3480,6 +3587,10 @@ CONFIG_USB_ANDROID_SAMSUNG_COMPOSITE=y
# CONFIG_USB_G_HID is not set
# CONFIG_USB_G_DBGP is not set
# CONFIG_USB_G_WEBCAM is not set
+
+#
+# USB Power Delivery and Type-C drivers
+#
# CONFIG_UWB is not set
CONFIG_MMC=y
# CONFIG_MMC_DEBUG is not set
@@ -3552,7 +3663,7 @@ CONFIG_LEDS_CLASS=y
#
# CONFIG_LEDS_BLINKM is not set
# CONFIG_LEDS_SYSCON is not set
-# CONFIG_LEDS_S2MPB02 is not set
+CONFIG_LEDS_S2MPB02=y
# CONFIG_LEDS_KTD2692 is not set
# CONFIG_LEDS_S2MPB02_MULTI_TORCH_REAR2 is not set
# CONFIG_LEDS_KTD2692_MULTI_TORCH_REAR3 is not set
@@ -3656,7 +3767,7 @@ CONFIG_HAVE_S3C_RTC=y
# CONFIG_RTC_DRV_S3C is not set
CONFIG_EXYNOS_PERSISTENT_CLOCK=y
CONFIG_RTC_DRV_SEC=y
-# CONFIG_RTC_RESET_COUNT is not set
+CONFIG_RTC_RESET_COUNT=y
# CONFIG_RTC_DRV_PL030 is not set
# CONFIG_RTC_DRV_PL031 is not set
# CONFIG_RTC_DRV_SNVS is not set
@@ -3818,8 +3929,7 @@ CONFIG_SEC_TRACE_BINDERCNT=y
CONFIG_ASHMEM=y
CONFIG_ANDROID_TIMED_OUTPUT=y
# CONFIG_ANDROID_TIMED_GPIO is not set
-CONFIG_ANDROID_LOW_MEMORY_KILLER=y
-CONFIG_ANDROID_LOW_MEMORY_KILLER_AUTODETECT_OOM_ADJ_VALUES=y
+# CONFIG_ANDROID_LOW_MEMORY_KILLER is not set
CONFIG_ANDROID_INTF_ALARM_DEV=y
CONFIG_SYNC=y
CONFIG_SW_SYNC=y
@@ -3830,9 +3940,8 @@ CONFIG_ION=y
# CONFIG_ION_DUMMY is not set
CONFIG_ION_EXYNOS=y
CONFIG_ION_EXYNOS_STAT_LOG=y
+CONFIG_ION_RBIN_HEAP=y
CONFIG_ION_EXYNOS_OF=y
-# CONFIG_FIQ_DEBUGGER is not set
-# CONFIG_FIQ_WATCHDOG is not set
# CONFIG_USB_WPAN_HCD is not set
# CONFIG_WIMAX_GDM72XX is not set
# CONFIG_DGNC is not set
@@ -3853,7 +3962,6 @@ CONFIG_SEC_DEBUG_RESET_REASON=y
# CONFIG_SEC_DEBUG_EXTRA_INFO is not set
# CONFIG_SEC_DEBUG_HW_PARAM is not set
# CONFIG_SEC_DEBUG_AUTO_SUMMARY is not set
-CONFIG_SEC_DEBUG_LAST_KMSG=y
CONFIG_SEC_UPLOAD=y
#
@@ -3881,11 +3989,10 @@ CONFIG_SEC_PM_DEBUG=y
#
CONFIG_SEC_BSP=y
CONFIG_SEC_NAD=y
-# CONFIG_SEC_NAD_API is not set
+CONFIG_SEC_NAD_API=y
CONFIG_SEC_NAD_MANUAL_PARAM_READTIME=10
# CONFIG_SEC_EVENT_LOG is not set
# CONFIG_BOOTING_VALIDATION is not set
-CONFIG_VNSWAP=y
# CONFIG_GOLDFISH is not set
#
@@ -3934,7 +4041,7 @@ CONFIG_COMMON_CLK_SAMSUNG=y
CONFIG_CLKSRC_OF=y
CONFIG_ARM_ARCH_TIMER=y
CONFIG_ARM_ARCH_TIMER_EVTSTREAM=y
-# CONFIG_ARM_ARCH_TIMER_VCT_ACCESS is not set
+CONFIG_ARM_ARCH_TIMER_VCT_ACCESS=y
# CONFIG_ATMEL_PIT is not set
CONFIG_CLKSRC_EXYNOS_MCT=y
# CONFIG_SH_TIMER_CMT is not set
@@ -4189,7 +4296,7 @@ CONFIG_WIRELESS_FIRMWARE_UPDATE=y
CONFIG_AFC_CHARGER_MODE=y
# CONFIG_SAMSUNG_LPM_MODE is not set
# CONFIG_EN_OOPS is not set
-# CONFIG_STORE_MODE is not set
+CONFIG_STORE_MODE=y
# CONFIG_BATTERY_NOTIFIER is not set
# CONFIG_BATTERY_SAMSUNG_V2 is not set
# CONFIG_BATTERY_AGE_FORECAST_DETACHABLE is not set
@@ -4206,8 +4313,6 @@ CONFIG_AFC_CHARGER_MODE=y
# CONFIG_RESET_CONTROLLER is not set
CONFIG_SENSORS_SSP=y
# CONFIG_SENSORS_SSP_STM is not set
-# CONFIG_SENSORS_MAX86900 is not set
-CONFIG_SENSORS_MAX86902=y
CONFIG_SENSORS_MULTIPLE_GLASS_TYPE=y
CONFIG_SENSORS_SSP_IRDATA_FOR_CAMERA=y
CONFIG_SENSORS_SX9310=y
@@ -4226,7 +4331,6 @@ CONFIG_SENSORS_SSP_TMD4903=y
# CONFIG_SENSORS_SSP_TMG399X is not set
# CONFIG_SENSORS_SSP_AK09911 is not set
CONFIG_SENSORS_SSP_MOBEAM=y
-# CONFIG_SENSORS_MAX_NOTCHFILTER is not set
CONFIG_SENSORS_SYSFS=y
# CONFIG_SENSORS_SSP_ATMEL is not set
# CONFIG_SENSORS_SSP_AK8963C is not set
@@ -4258,11 +4362,7 @@ CONFIG_SENSORS_SSP_YAS537=y
# CONFIG_SENSORS_SSP_LPS22H is not set
# CONFIG_SENSORS_SSP_STM32F401 is not set
# CONFIG_SENSORS_SSP_IRLED is not set
-# CONFIG_SENSORS_HRMSENSOR is not set
-# CONFIG_SENSORS_MAX86902_LED_5V is not set
# CONFIG_SENSOR_SSP_PROXIMTY_FOR_WINDOW_TYPE is not set
-# CONFIG_SENSORS_ADPD142 is not set
-# CONFIG_SENSORS_ADPD143 is not set
# CONFIG_SENSORS_SSP_TMD4905 is not set
# CONFIG_SENSORS_SSP_TMD4904 is not set
# CONFIG_SENSORS_SSP_TMD3725 is not set
@@ -4292,6 +4392,13 @@ CONFIG_SSP_MOTOR=y
# CONFIG_BCM_GPS_TTY_DRIVER is not set
# CONFIG_BCM_GPS_I2C_DRIVER is not set
CONFIG_BCM_GPS_SPI_DRIVER=y
+# CONFIG_SENSORS_HRMSENSOR is not set
+# CONFIG_SENSORS_MAX86900 is not set
+CONFIG_SENSORS_MAX86902=y
+# CONFIG_SENSORS_MAX86902_LED_5V is not set
+# CONFIG_SENSORS_ADPD142 is not set
+# CONFIG_SENSORS_ADPD143 is not set
+# CONFIG_SENSORS_MAX_NOTCHFILTER is not set
CONFIG_GPS_BCMxxxxx=y
# CONFIG_GPS_BCM4752 is not set
# CONFIG_GPS_BCM47521 is not set
@@ -4329,23 +4436,12 @@ CONFIG_TRACE=y
CONFIG_EXYNOS_BUSMONITOR=y
CONFIG_EXYNOS_SNAPSHOT=y
CONFIG_EXYNOS_SNAPSHOT_CALLSTACK=4
-CONFIG_EXYNOS_SNAPSHOT_IRQ_EXIT=y
-CONFIG_EXYNOS_SNAPSHOT_IRQ_EXIT_THRESHOLD=0
-# CONFIG_EXYNOS_SNAPSHOT_IRQ_DISABLED is not set
-CONFIG_EXYNOS_SNAPSHOT_CLK=y
-CONFIG_EXYNOS_SNAPSHOT_FREQ=y
-# CONFIG_EXYNOS_SNAPSHOT_HRTIMER is not set
-# CONFIG_EXYNOS_SNAPSHOT_REG is not set
-CONFIG_EXYNOS_SNAPSHOT_REGULATOR=y
-CONFIG_EXYNOS_SNAPSHOT_THERMAL=y
-CONFIG_EXYNOS_SNAPSHOT_MBOX=y
CONFIG_EXYNOS_SNAPSHOT_HOOK_LOGGER=y
CONFIG_EXYNOS_SNAPSHOT_PSTORE=y
CONFIG_EXYNOS_SNAPSHOT_PANIC_REBOOT=y
CONFIG_EXYNOS_SNAPSHOT_WATCHDOG_RESET=y
# CONFIG_EXYNOS_SNAPSHOT_CRASH_KEY is not set
-# CONFIG_EXYNOS_SNAPSHOT_SFRDUMP is not set
-# CONFIG_EXYNOS_SNAPSHOT_MINIMIZED_MODE is not set
+CONFIG_EXYNOS_SNAPSHOT_MINIMIZED_MODE=y
# CONFIG_EXYNOS_SNAPSHOT_LOGGING_SMC_CALL is not set
CONFIG_EXYNOS_CORESIGHT=y
CONFIG_EXYNOS_CORESIGHT_PC_INFO=y
@@ -4358,6 +4454,7 @@ CONFIG_EXYNOS8890_BTS=y
CONFIG_EXYNOS8890_BTS_OPTIMIZATION=y
CONFIG_MOTOR_DRV_MAX77854=y
CONFIG_MOTOR_DRV_SENSOR=y
+# CONFIG_SOC_EXYNOS8890_KINIBI311 is not set
CONFIG_TRUSTONIC_TEE=y
CONFIG_TRUSTONIC_TEE_LPAE=y
# CONFIG_TRUSTONIC_TEE_DEBUG is not set
@@ -4406,19 +4503,15 @@ CONFIG_EXT2_FS_XATTR=y
# CONFIG_EXT2_FS_POSIX_ACL is not set
CONFIG_EXT2_FS_SECURITY=y
# CONFIG_EXT2_FS_XIP is not set
-CONFIG_EXT3_FS=y
-CONFIG_EXT3_DEFAULTS_TO_ORDERED=y
-CONFIG_EXT3_FS_XATTR=y
-# CONFIG_EXT3_FS_POSIX_ACL is not set
-# CONFIG_EXT3_FS_SECURITY is not set
+# CONFIG_EXT3_FS is not set
CONFIG_EXT4_FS=y
-# CONFIG_EXT4_FS_POSIX_ACL is not set
+CONFIG_EXT4_USE_FOR_EXT23=y
+CONFIG_EXT4_FS_POSIX_ACL=y
CONFIG_EXT4_FS_SECURITY=y
-# CONFIG_EXT4_ENCRYPTION is not set
+CONFIG_EXT4_ENCRYPTION=y
+CONFIG_EXT4_FS_ENCRYPTION=y
# CONFIG_EXT4_DEBUG is not set
CONFIG_SDCARD_FS=y
-CONFIG_JBD=y
-# CONFIG_JBD_DEBUG is not set
CONFIG_JBD2=y
# CONFIG_JBD2_DEBUG is not set
CONFIG_FS_MBCACHE=y
@@ -4431,7 +4524,7 @@ CONFIG_FS_MBCACHE=y
# CONFIG_NILFS2_FS is not set
CONFIG_FS_POSIX_ACL=y
CONFIG_FILE_LOCKING=y
-# CONFIG_FS_ENCRYPTION is not set
+CONFIG_FS_ENCRYPTION=y
CONFIG_FSNOTIFY=y
CONFIG_DNOTIFY=y
CONFIG_INOTIFY_USER=y
@@ -4467,20 +4560,17 @@ CONFIG_FAT_FS=y
CONFIG_MSDOS_FS=y
CONFIG_VFAT_FS=y
CONFIG_FAT_DEFAULT_CODEPAGE=437
-CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
+CONFIG_FAT_DEFAULT_IOCHARSET="utf8"
CONFIG_FAT_VIRTUAL_XATTR=y
CONFIG_FAT_VIRTUAL_XATTR_SELINUX_LABEL="u:object_r:sdcard_external:s0"
CONFIG_FAT_SUPPORT_STLOG=y
-CONFIG_EXFAT_FS=y
-CONFIG_EXFAT_VIRTUAL_XATTR=y
-CONFIG_EXFAT_VIRTUAL_XATTR_SELINUX_LABEL="u:object_r:sdcard_external:s0"
-CONFIG_EXFAT_SUPPORT_STLOG=y
CONFIG_SDFAT_FS=y
+CONFIG_SDFAT_USE_FOR_EXFAT=y
CONFIG_SDFAT_DELAYED_META_DIRTY=y
-# CONFIG_SDFAT_SUPPORT_DIR_SYNC is not set
+CONFIG_SDFAT_SUPPORT_DIR_SYNC=y
CONFIG_SDFAT_DEFAULT_CODEPAGE=437
CONFIG_SDFAT_DEFAULT_IOCHARSET="utf8"
-# CONFIG_SDFAT_CHECK_RO_ATTR is not set
+CONFIG_SDFAT_CHECK_RO_ATTR=y
CONFIG_SDFAT_ALIGNED_MPAGE_WRITE=y
CONFIG_SDFAT_VIRTUAL_XATTR=y
CONFIG_SDFAT_VIRTUAL_XATTR_SELINUX_LABEL="u:object_r:sdcard_external:s0"
@@ -4490,6 +4580,7 @@ CONFIG_SDFAT_DEBUG=y
CONFIG_SDFAT_DBG_MSG=y
# CONFIG_SDFAT_DBG_BUGON is not set
CONFIG_SDFAT_STATISTICS=y
+CONFIG_SDFAT_UEVENT=y
# CONFIG_NTFS_FS is not set
#
@@ -4499,7 +4590,9 @@ CONFIG_PROC_FS=y
# CONFIG_PROC_KCORE is not set
CONFIG_PROC_SYSCTL=y
CONFIG_PROC_PAGE_MONITOR=y
+CONFIG_PROC_FSLOG=y
CONFIG_PROC_STLOG=y
+CONFIG_PROC_DLOG=y
CONFIG_KERNFS=y
CONFIG_SYSFS=y
CONFIG_TMPFS=y
@@ -4534,7 +4627,7 @@ CONFIG_CRAMFS=y
# CONFIG_QNX6FS_FS is not set
# CONFIG_ROMFS_FS is not set
CONFIG_PSTORE=y
-# CONFIG_PSTORE_CONSOLE is not set
+CONFIG_PSTORE_CONSOLE=y
CONFIG_PSTORE_PMSG=y
CONFIG_PSTORE_RAM=y
# CONFIG_SYSV_FS is not set
@@ -4726,24 +4819,7 @@ CONFIG_EVENT_TRACING=y
CONFIG_GPU_TRACEPOINTS=y
CONFIG_CONTEXT_SWITCH_TRACER=y
CONFIG_TRACING=y
-CONFIG_TRACING_SUPPORT=y
-CONFIG_FTRACE=y
-# CONFIG_FUNCTION_TRACER is not set
-# CONFIG_IRQSOFF_TRACER is not set
-# CONFIG_PREEMPT_TRACER is not set
-# CONFIG_SCHED_TRACER is not set
-CONFIG_ENABLE_DEFAULT_TRACERS=y
-# CONFIG_FTRACE_SYSCALLS is not set
-# CONFIG_TRACER_SNAPSHOT is not set
-CONFIG_BRANCH_PROFILE_NONE=y
-# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
-# CONFIG_PROFILE_ALL_BRANCHES is not set
-# CONFIG_STACK_TRACER is not set
-# CONFIG_BLK_DEV_IO_TRACE is not set
-# CONFIG_PROBE_EVENTS is not set
-# CONFIG_TRACEPOINT_BENCHMARK is not set
-# CONFIG_RING_BUFFER_BENCHMARK is not set
-# CONFIG_RING_BUFFER_STARTUP_TEST is not set
+# CONFIG_TRACING_SUPPORT is not set
#
# Runtime Testing
@@ -4756,6 +4832,7 @@ CONFIG_ATOMIC64_SELFTEST=y
# CONFIG_TEST_STRING_HELPERS is not set
# CONFIG_TEST_KSTRTOX is not set
# CONFIG_TEST_RHASHTABLE is not set
+# CONFIG_TEST_HASH is not set
# CONFIG_DMA_API_DEBUG is not set
# CONFIG_TEST_FIRMWARE is not set
# CONFIG_TEST_UDELAY is not set
@@ -4780,10 +4857,10 @@ CONFIG_HAVE_ARCH_KGDB=y
CONFIG_KEYS=y
# CONFIG_PERSISTENT_KEYRINGS is not set
# CONFIG_BIG_KEYS is not set
-# CONFIG_ENCRYPTED_KEYS is not set
+CONFIG_ENCRYPTED_KEYS=y
CONFIG_KEYS_DEBUG_PROC_KEYS=y
# CONFIG_SECURITY_DMESG_RESTRICT is not set
-# CONFIG_SECURITY_PERF_EVENTS_RESTRICT is not set
+CONFIG_SECURITY_PERF_EVENTS_RESTRICT=y
CONFIG_SECURITY=y
# CONFIG_SECURITYFS is not set
CONFIG_SECURITY_NETWORK=y
@@ -4792,7 +4869,8 @@ CONFIG_SECURITY_NETWORK=y
CONFIG_LSM_MMAP_MIN_ADDR=4096
CONFIG_HAVE_HARDENED_USERCOPY_ALLOCATOR=y
CONFIG_HAVE_ARCH_HARDENED_USERCOPY=y
-# CONFIG_HARDENED_USERCOPY is not set
+CONFIG_HARDENED_USERCOPY=y
+# CONFIG_HARDENED_USERCOPY_PAGESPAN is not set
CONFIG_SECURITY_SELINUX=y
# CONFIG_SECURITY_SELINUX_BOOTPARAM is not set
# CONFIG_SECURITY_SELINUX_DISABLE is not set
@@ -4805,6 +4883,10 @@ CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1
# CONFIG_SECURITY_APPARMOR is not set
# CONFIG_SECURITY_YAMA is not set
CONFIG_MST_LDO=y
+# CONFIG_MST_NONSECURE is not set
+# CONFIG_MFC_CHARGER is not set
+# CONFIG_MST_TEEGRIS is not set
+# CONFIG_MST_LPM_CONTROL is not set
CONFIG_INTEGRITY=y
# CONFIG_INTEGRITY_SIGNATURE is not set
CONFIG_INTEGRITY_AUDIT=y
@@ -4812,6 +4894,9 @@ CONFIG_INTEGRITY_AUDIT=y
# CONFIG_EVM is not set
# CONFIG_TZ_ICCC_MOS_SUPPORT is not set
# CONFIG_TZ_ICCC_NOS_SUPPORT is not set
+# CONFIG_SECURITY_DEFEX is not set
+# CONFIG_DEFEX_KERNEL_ONLY is not set
+# CONFIG_SECURITY_DSMS is not set
CONFIG_DEFAULT_SECURITY_SELINUX=y
# CONFIG_DEFAULT_SECURITY_DAC is not set
CONFIG_DEFAULT_SECURITY="selinux"
@@ -4858,7 +4943,7 @@ CONFIG_CRYPTO_SEQIV=y
#
CONFIG_CRYPTO_CBC=y
CONFIG_CRYPTO_CTR=y
-# CONFIG_CRYPTO_CTS is not set
+CONFIG_CRYPTO_CTS=y
CONFIG_CRYPTO_ECB=y
# CONFIG_CRYPTO_LRW is not set
# CONFIG_CRYPTO_PCBC is not set
@@ -4876,7 +4961,7 @@ CONFIG_CRYPTO_HMAC=y
# Digest
#
CONFIG_CRYPTO_CRC32C=y
-# CONFIG_CRYPTO_CRC32 is not set
+CONFIG_CRYPTO_CRC32=y
# CONFIG_CRYPTO_CRCT10DIF is not set
CONFIG_CRYPTO_GHASH=y
# CONFIG_CRYPTO_MD4 is not set
@@ -4919,7 +5004,7 @@ CONFIG_CRYPTO_TWOFISH_COMMON=y
CONFIG_CRYPTO_DEFLATE=y
# CONFIG_CRYPTO_ZLIB is not set
CONFIG_CRYPTO_LZO=y
-# CONFIG_CRYPTO_LZ4 is not set
+CONFIG_CRYPTO_LZ4=y
# CONFIG_CRYPTO_LZ4HC is not set
#
@@ -4986,9 +5071,19 @@ CONFIG_ZLIB_INFLATE=y
CONFIG_ZLIB_DEFLATE=y
CONFIG_LZO_COMPRESS=y
CONFIG_LZO_DECOMPRESS=y
-# CONFIG_XZ_DEC is not set
-# CONFIG_XZ_DEC_BCJ is not set
+CONFIG_LZ4_COMPRESS=y
+CONFIG_LZ4_DECOMPRESS=y
+CONFIG_XZ_DEC=y
+CONFIG_XZ_DEC_X86=y
+CONFIG_XZ_DEC_POWERPC=y
+CONFIG_XZ_DEC_IA64=y
+CONFIG_XZ_DEC_ARM=y
+CONFIG_XZ_DEC_ARMTHUMB=y
+CONFIG_XZ_DEC_SPARC=y
+CONFIG_XZ_DEC_BCJ=y
+# CONFIG_XZ_DEC_TEST is not set
CONFIG_DECOMPRESS_GZIP=y
+CONFIG_DECOMPRESS_XZ=y
CONFIG_GENERIC_ALLOCATOR=y
CONFIG_REED_SOLOMON=y
CONFIG_REED_SOLOMON_ENC8=y
diff --git a/device/testing/linux-samsung-hero2lte/gcc10-extern_YYLOC_global_declaration.patch b/device/testing/linux-samsung-hero2lte/gcc10-extern_YYLOC_global_declaration.patch
deleted file mode 120000
index fe99abf4d25..00000000000
--- a/device/testing/linux-samsung-hero2lte/gcc10-extern_YYLOC_global_declaration.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../.shared-patches/linux/gcc10-extern_YYLOC_global_declaration.patch
\ No newline at end of file
--
GitLab