From: Seung-Woo Kim <sw0312.kim@samsung.com>
Date: Fri, 2 Jun 2023 06:39:26 +0000 (+0900)
Subject: arm64: configs: tizen_*: Adjust and sync defconfig files with rt patch
X-Git-Tag: accepted/tizen/unified/20230616.172401~5
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ef6c592479f43961c9ce47fb9cc37dbd42dd34c5;p=platform%2Fkernel%2Flinux-amlogic.git

arm64: configs: tizen_*: Adjust and sync defconfig files with rt patch

When applying patch-4.9.241-rt156, defconfig files were not
properly adjusted. Adjust the defconfig and sync with
savedefconfig.

Change-Id: I7c2212ef23009c8d2c45cda667cf17135b645e83
Signed-off-by: Seung-Woo Kim <sw0312.kim@samsung.com>
---

diff --git a/arch/arm64/configs/tizen_kvims_defconfig b/arch/arm64/configs/tizen_kvims_defconfig
index 5305de3860b2..0d52b946ed1c 100644
--- a/arch/arm64/configs/tizen_kvims_defconfig
+++ b/arch/arm64/configs/tizen_kvims_defconfig
@@ -51,7 +51,6 @@ CONFIG_PCIEASPM_POWERSAVE=y
 CONFIG_PCIE_DW_PLAT=y
 CONFIG_SCHED_MC=y
 CONFIG_NR_CPUS=8
-CONFIG_PREEMPT=y
 CONFIG_DEFAULT_MMAP_MIN_ADDR=32768
 CONFIG_CMA=y
 CONFIG_CMA_DEBUGFS=y
@@ -676,7 +675,6 @@ CONFIG_PANIC_ON_RT_THROTTLING=y
 CONFIG_SCHEDSTATS=y
 CONFIG_SCHED_STACK_END_CHECK=y
 CONFIG_TIMER_STATS=y
-# CONFIG_DEBUG_PREEMPT is not set
 CONFIG_DEBUG_ATOMIC_SLEEP=y
 # CONFIG_DEBUG_BUGVERBOSE is not set
 CONFIG_FTRACE_SYSCALLS=y
diff --git a/arch/arm64/configs/tizen_kvims_rt_defconfig b/arch/arm64/configs/tizen_kvims_rt_defconfig
index 0d4f254ddd03..4cdfacbd46c7 100644
--- a/arch/arm64/configs/tizen_kvims_rt_defconfig
+++ b/arch/arm64/configs/tizen_kvims_rt_defconfig
@@ -23,7 +23,6 @@ CONFIG_CGROUP_CPUACCT=y
 CONFIG_MEMCG=y
 CONFIG_MEMCG_SWAP=y
 CONFIG_CGROUP_SCHED=y
-CONFIG_RT_GROUP_SCHED=y
 CONFIG_CGROUP_HUGETLB=y
 CONFIG_CGROUP_PERF=y
 CONFIG_CGROUP_BPF=y
@@ -595,7 +594,6 @@ CONFIG_LEDS_TRIGGER_TIMER=y
 CONFIG_LEDS_TRIGGER_ONESHOT=y
 CONFIG_LEDS_TRIGGER_HEARTBEAT=y
 CONFIG_LEDS_TRIGGER_BACKLIGHT=y
-CONFIG_LEDS_TRIGGER_CPU=y
 CONFIG_LEDS_TRIGGER_GPIO=y
 CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
 CONFIG_LEDS_TRIGGER_TRANSIENT=y
@@ -707,10 +705,6 @@ CONFIG_ASYMMETRIC_KEY_TYPE=y
 CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=y
 CONFIG_X509_CERTIFICATE_PARSER=y
 CONFIG_ARM64_CRYPTO=y
-CONFIG_CRYPTO_SHA1_ARM64_CE=y
-CONFIG_CRYPTO_SHA2_ARM64_CE=y
-CONFIG_CRYPTO_GHASH_ARM64_CE=y
-CONFIG_CRYPTO_AES_ARM64_CE_BLK=y
 # CONFIG_RAID6_PQ_BENCHMARK is not set
 CONFIG_CRC_T10DIF=y
 CONFIG_CRC_ITU_T=y
diff --git a/arch/arm64/configs/tizen_odroidg12_defconfig b/arch/arm64/configs/tizen_odroidg12_defconfig
index 941383aeb1e8..e2aca9432259 100644
--- a/arch/arm64/configs/tizen_odroidg12_defconfig
+++ b/arch/arm64/configs/tizen_odroidg12_defconfig
@@ -52,7 +52,6 @@ CONFIG_PCIE_DW_PLAT=y
 CONFIG_PCI_HOST_GENERIC=y
 CONFIG_SCHED_MC=y
 CONFIG_NR_CPUS=8
-CONFIG_PREEMPT=y
 CONFIG_DEFAULT_MMAP_MIN_ADDR=32768
 CONFIG_CMA=y
 CONFIG_CMA_DEBUGFS=y
@@ -754,7 +753,6 @@ CONFIG_PANIC_ON_RT_THROTTLING=y
 CONFIG_SCHEDSTATS=y
 CONFIG_SCHED_STACK_END_CHECK=y
 CONFIG_TIMER_STATS=y
-# CONFIG_DEBUG_PREEMPT is not set
 CONFIG_DEBUG_ATOMIC_SLEEP=y
 # CONFIG_DEBUG_BUGVERBOSE is not set
 CONFIG_FTRACE_SYSCALLS=y
diff --git a/arch/arm64/configs/tizen_odroidg12_rt_defconfig b/arch/arm64/configs/tizen_odroidg12_rt_defconfig
index 4b372a928662..a7fba6aecae0 100644
--- a/arch/arm64/configs/tizen_odroidg12_rt_defconfig
+++ b/arch/arm64/configs/tizen_odroidg12_rt_defconfig
@@ -23,7 +23,6 @@ CONFIG_CGROUP_CPUACCT=y
 CONFIG_MEMCG=y
 CONFIG_MEMCG_SWAP=y
 CONFIG_CGROUP_SCHED=y
-CONFIG_RT_GROUP_SCHED=y
 CONFIG_CGROUP_BPF=y
 CONFIG_NAMESPACES=y
 CONFIG_USER_NS=y
@@ -52,7 +51,7 @@ CONFIG_PCIE_DW_PLAT=y
 CONFIG_PCI_HOST_GENERIC=y
 CONFIG_SCHED_MC=y
 CONFIG_NR_CPUS=8
-CONFIG_PREEMPT_RT=y
+CONFIG_PREEMPT_RT_FULL=y
 CONFIG_DEFAULT_MMAP_MIN_ADDR=32768
 CONFIG_CMA=y
 CONFIG_CMA_DEBUGFS=y
@@ -662,7 +661,6 @@ CONFIG_LEDS_TRIGGER_TIMER=y
 CONFIG_LEDS_TRIGGER_ONESHOT=y
 CONFIG_LEDS_TRIGGER_HEARTBEAT=y
 CONFIG_LEDS_TRIGGER_BACKLIGHT=y
-CONFIG_LEDS_TRIGGER_CPU=y
 CONFIG_LEDS_TRIGGER_GPIO=y
 CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
 CONFIG_LEDS_TRIGGER_TRANSIENT=y
@@ -784,10 +782,6 @@ CONFIG_ASYMMETRIC_KEY_TYPE=y
 CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=y
 CONFIG_X509_CERTIFICATE_PARSER=y
 CONFIG_ARM64_CRYPTO=y
-CONFIG_CRYPTO_SHA1_ARM64_CE=y
-CONFIG_CRYPTO_SHA2_ARM64_CE=y
-CONFIG_CRYPTO_GHASH_ARM64_CE=y
-CONFIG_CRYPTO_AES_ARM64_CE_BLK=y
 # CONFIG_RAID6_PQ_BENCHMARK is not set
 CONFIG_CRC_T10DIF=y
 CONFIG_CRC_ITU_T=y