Skip to content

Commit 1342a6a

Browse files
committed
Merge tag 'samsung-defconfig-5.6' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into arm/defconfig
Samsung defconfig changes for v5.6 1. Bring back explicitly wanted options which were removed through `make savedefconfig`. savedefconfig removes options selected by other symbol, however developers of this other symbol can remove anytime 'select' statement. 2. Enable NFS v4.1 and v4.2, useful in testing/CI systems. 3. Enable thermal throttling through devfreq framework. * tag 'samsung-defconfig-5.6' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux: ARM: multi_v7_defconfig: Enable devfreq thermal integration ARM: exynos_defconfig: Enable devfreq thermal integration ARM: multi_v7_defconfig: Enable NFS v4.1 and v4.2 ARM: exynos_defconfig: Enable NFS v4.1 and v4.2 ARM: exynos_defconfig: Bring back explicitly wanted options Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Olof Johansson <[email protected]>
2 parents 5ad4436 + cdfc88f commit 1342a6a

File tree

2 files changed

+12
-0
lines changed

2 files changed

+12
-0
lines changed

arch/arm/configs/exynos_defconfig

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ CONFIG_CRYPTO_SHA256_ARM=m
3838
CONFIG_CRYPTO_SHA512_ARM=m
3939
CONFIG_CRYPTO_AES_ARM_BS=m
4040
CONFIG_CRYPTO_CHACHA20_NEON=m
41+
CONFIG_KALLSYMS_ALL=y
4142
CONFIG_MODULES=y
4243
CONFIG_MODULE_UNLOAD=y
4344
CONFIG_PARTITION_ADVANCED=y
@@ -92,6 +93,7 @@ CONFIG_BLK_DEV_LOOP=y
9293
CONFIG_BLK_DEV_CRYPTOLOOP=y
9394
CONFIG_BLK_DEV_RAM=y
9495
CONFIG_BLK_DEV_RAM_SIZE=8192
96+
CONFIG_SCSI=y
9597
CONFIG_BLK_DEV_SD=y
9698
CONFIG_CHR_DEV_SG=y
9799
CONFIG_ATA=y
@@ -154,6 +156,7 @@ CONFIG_SENSORS_NTC_THERMISTOR=y
154156
CONFIG_SENSORS_PWM_FAN=y
155157
CONFIG_SENSORS_INA2XX=y
156158
CONFIG_CPU_THERMAL=y
159+
CONFIG_DEVFREQ_THERMAL=y
157160
CONFIG_THERMAL_EMULATION=y
158161
CONFIG_WATCHDOG=y
159162
CONFIG_S3C2410_WATCHDOG=y
@@ -291,6 +294,7 @@ CONFIG_CROS_EC_SPI=y
291294
CONFIG_COMMON_CLK_MAX77686=y
292295
CONFIG_COMMON_CLK_S2MPS11=y
293296
CONFIG_EXYNOS_IOMMU=y
297+
CONFIG_PM_DEVFREQ=y
294298
CONFIG_DEVFREQ_GOV_PERFORMANCE=y
295299
CONFIG_DEVFREQ_GOV_POWERSAVE=y
296300
CONFIG_DEVFREQ_GOV_USERSPACE=y
@@ -319,6 +323,8 @@ CONFIG_CRAMFS=y
319323
CONFIG_ROMFS_FS=y
320324
CONFIG_NFS_FS=y
321325
CONFIG_NFS_V4=y
326+
CONFIG_NFS_V4_1=y
327+
CONFIG_NFS_V4_2=y
322328
CONFIG_ROOT_NFS=y
323329
CONFIG_NLS_CODEPAGE_437=y
324330
CONFIG_NLS_ASCII=y
@@ -355,4 +361,7 @@ CONFIG_SOFTLOCKUP_DETECTOR=y
355361
# CONFIG_DETECT_HUNG_TASK is not set
356362
CONFIG_PROVE_LOCKING=y
357363
CONFIG_DEBUG_ATOMIC_SLEEP=y
364+
CONFIG_DEBUG_RT_MUTEXES=y
365+
CONFIG_DEBUG_SPINLOCK=y
366+
CONFIG_DEBUG_MUTEXES=y
358367
CONFIG_DEBUG_USER=y

arch/arm/configs/multi_v7_defconfig

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -492,6 +492,7 @@ CONFIG_SENSORS_PWM_FAN=m
492492
CONFIG_SENSORS_RASPBERRYPI_HWMON=m
493493
CONFIG_SENSORS_INA2XX=m
494494
CONFIG_CPU_THERMAL=y
495+
CONFIG_DEVFREQ_THERMAL=y
495496
CONFIG_IMX_THERMAL=y
496497
CONFIG_ROCKCHIP_THERMAL=y
497498
CONFIG_RCAR_THERMAL=y
@@ -1092,6 +1093,8 @@ CONFIG_PSTORE_RAM=y
10921093
CONFIG_NFS_FS=y
10931094
CONFIG_NFS_V3_ACL=y
10941095
CONFIG_NFS_V4=y
1096+
CONFIG_NFS_V4_1=y
1097+
CONFIG_NFS_V4_2=y
10951098
CONFIG_ROOT_NFS=y
10961099
CONFIG_NLS_CODEPAGE_437=y
10971100
CONFIG_NLS_ISO8859_1=y

0 commit comments

Comments
 (0)