History

Merge tag 'samsung-defconfig-5.3' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into arm/defconfig

Samsung defconfig changes for v5.3 1. Trim several configs with savedefconfig. 2. Enable Lima and Panfrost drivers for Mali GPU. * tag 'samsung-defconfig-5.3' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux: ARM: exynos_defconfig: Enable Panfrost and Lima drivers ARM: multi_v7_defconfig: Enable Panfrost and Lima drivers ARM: defconfig: samsung: Cleanup with savedefconfig ARM: exynos_defconfig: Trim and reorganize with savedefconfig

Olof Johansson committed 7 years ago

Commit a151f272 parents 0145317 dd50a695 files · +60 −84Browse files

Unified · Split

5 files
  1. arch/arm/configs/exynos_defconfig +29 −36
  2. arch/arm/configs/mini2440_defconfig +18 −25
  3. arch/arm/configs/multi_v7_defconfig +0 −1
  4. arch/arm/configs/s3c2410_defconfig +9 −15
  5. arch/arm/configs/s3c6400_defconfig +4 −7
arch/arm/configs/exynos_defconfig+29−36
@@ -1,21 +1,15 @@
11 CONFIG_SYSVIPC=y
22 CONFIG_NO_HZ=y
33 CONFIG_HIGH_RES_TIMERS=y
4+CONFIG_PREEMPT=y
45 CONFIG_CGROUPS=y
56 CONFIG_BLK_DEV_INITRD=y
67 CONFIG_PERF_EVENTS=y
7−CONFIG_MODULES=y
8−CONFIG_MODULE_UNLOAD=y
9−CONFIG_PARTITION_ADVANCED=y
108 CONFIG_ARCH_EXYNOS=y
11−CONFIG_ARCH_EXYNOS3=y
129 CONFIG_SMP=y
1310 CONFIG_BIG_LITTLE=y
1411 CONFIG_NR_CPUS=8
15−CONFIG_PREEMPT=y
16−CONFIG_AEABI=y
1712 CONFIG_HIGHMEM=y
18−CONFIG_CMA=y
1913 CONFIG_SECCOMP=y
2014 CONFIG_ZBOOT_ROM_TEXT=0x0
2115 CONFIG_ZBOOT_ROM_BSS=0x0
@@ -37,6 +31,16 @@ CONFIG_NEON=y · 15 unmodified lines
3731 CONFIG_KERNEL_MODE_NEON=y
3832 CONFIG_PM_DEBUG=y
3933 CONFIG_PM_ADVANCED_DEBUG=y
34+CONFIG_ARM_CRYPTO=y
35+CONFIG_CRYPTO_SHA1_ARM_NEON=m
36+CONFIG_CRYPTO_SHA256_ARM=m
37+CONFIG_CRYPTO_SHA512_ARM=m
38+CONFIG_CRYPTO_AES_ARM_BS=m
39+CONFIG_CRYPTO_CHACHA20_NEON=m
40+CONFIG_MODULES=y
41+CONFIG_MODULE_UNLOAD=y
42+CONFIG_PARTITION_ADVANCED=y
43+CONFIG_CMA=y
4044 CONFIG_NET=y
4145 CONFIG_PACKET=y
4246 CONFIG_UNIX=y
@@ -60,10 +64,7 @@ CONFIG_BT_HCIBTSDIO=m · 17 unmodified lines
6064 CONFIG_BT_HCIUART=m
6165 CONFIG_BT_HCIUART_BCSP=y
6266 CONFIG_BT_HCIUART_ATH3K=y
63−CONFIG_BT_HCIUART_3WIRE=y
6467 CONFIG_BT_HCIUART_INTEL=y
65−CONFIG_BT_HCIUART_BCM=y
66−CONFIG_BT_HCIUART_QCA=y
6768 CONFIG_BT_HCIUART_AG6XX=y
6869 CONFIG_BT_HCIUART_MRVL=y
6970 CONFIG_BT_HCIBCM203X=m
@@ -86,8 +87,6 @@ CONFIG_NFC_SHDLC=y · 16 unmodified lines
8687 CONFIG_NFC_S3FWRN5_I2C=y
8788 CONFIG_DEVTMPFS=y
8889 CONFIG_DEVTMPFS_MOUNT=y
89−CONFIG_DMA_CMA=y
90−CONFIG_CMA_SIZE_MBYTES=96
9190 CONFIG_BLK_DEV_LOOP=y
9291 CONFIG_BLK_DEV_CRYPTOLOOP=y
9392 CONFIG_BLK_DEV_RAM=y
@@ -155,8 +154,6 @@ CONFIG_THERMAL_EMULATION=y · 61 unmodified lines
155154 CONFIG_WATCHDOG=y
156155 CONFIG_S3C2410_WATCHDOG=y
157156 CONFIG_MFD_CROS_EC=y
158−CONFIG_CROS_EC_I2C=y
159−CONFIG_CROS_EC_SPI=y
160157 CONFIG_MFD_MAX14577=y
161158 CONFIG_MFD_MAX77686=y
162159 CONFIG_MFD_MAX77693=y
@@ -215,6 +212,8 @@ CONFIG_DRM_NXP_PTN3460=y · 52 unmodified lines
215212 CONFIG_DRM_PARADE_PS8622=y
216213 CONFIG_DRM_SII9234=y
217214 CONFIG_DRM_TOSHIBA_TC358764=y
215+CONFIG_DRM_LIMA=y
216+CONFIG_DRM_PANFROST=y
218217 CONFIG_LCD_CLASS_DEVICE=y
219218 CONFIG_LCD_PLATFORM=y
220219 CONFIG_BACKLIGHT_PWM=y
@@ -282,16 +281,16 @@ CONFIG_RTC_DRV_S5M=y · 61 unmodified lines
282281 CONFIG_RTC_DRV_S3C=y
283282 CONFIG_DMADEVICES=y
284283 CONFIG_PL330_DMA=y
285−CONFIG_CROS_EC_CHARDEV=y
284+CONFIG_CROS_EC_I2C=y
285+CONFIG_CROS_EC_SPI=y
286286 CONFIG_COMMON_CLK_MAX77686=y
287287 CONFIG_COMMON_CLK_S2MPS11=y
288−CONFIG_PM_DEVFREQ=y
288+CONFIG_EXYNOS_IOMMU=y
289289 CONFIG_DEVFREQ_GOV_PERFORMANCE=y
290290 CONFIG_DEVFREQ_GOV_POWERSAVE=y
291291 CONFIG_DEVFREQ_GOV_USERSPACE=y
292292 CONFIG_ARM_EXYNOS_BUS_DEVFREQ=y
293293 CONFIG_DEVFREQ_EVENT_EXYNOS_NOCP=y
294−CONFIG_EXYNOS_IOMMU=y
295294 CONFIG_EXTCON=y
296295 CONFIG_EXTCON_MAX14577=y
297296 CONFIG_EXTCON_MAX77693=y
@@ -319,21 +318,9 @@ CONFIG_NLS_CODEPAGE_437=y · 21 unmodified lines
319318 CONFIG_NLS_ASCII=y
320319 CONFIG_NLS_ISO8859_1=y
321320 CONFIG_NLS_UTF8=y
322−CONFIG_PRINTK_TIME=y
323−CONFIG_DYNAMIC_DEBUG=y
324−CONFIG_DEBUG_INFO=y
325−CONFIG_DEBUG_FS=y
326−CONFIG_MAGIC_SYSRQ=y
327−CONFIG_DEBUG_KERNEL=y
328−CONFIG_SOFTLOCKUP_DETECTOR=y
329−# CONFIG_DETECT_HUNG_TASK is not set
330−CONFIG_PROVE_LOCKING=y
331−CONFIG_DEBUG_ATOMIC_SLEEP=y
332−CONFIG_DEBUG_USER=y
333−CONFIG_CRYPTO_RSA=m
334−CONFIG_CRYPTO_DH=m
335321 CONFIG_CRYPTO_USER=m
336322 CONFIG_CRYPTO_TEST=m
323+CONFIG_CRYPTO_DH=m
337324 CONFIG_CRYPTO_LRW=m
338325 CONFIG_CRYPTO_XTS=m
339326 CONFIG_CRYPTO_MD5=m
@@ -348,12 +335,18 @@ CONFIG_CRYPTO_USER_API_RNG=m · 8 unmodified lines
348335 CONFIG_CRYPTO_USER_API_AEAD=m
349336 CONFIG_CRYPTO_DEV_EXYNOS_RNG=y
350337 CONFIG_CRYPTO_DEV_S5P=y
351−CONFIG_ARM_CRYPTO=y
352−CONFIG_CRYPTO_SHA1_ARM_NEON=m
353−CONFIG_CRYPTO_SHA256_ARM=m
354−CONFIG_CRYPTO_SHA512_ARM=m
355−CONFIG_CRYPTO_AES_ARM_BS=m
356−CONFIG_CRYPTO_CHACHA20_NEON=m
357338 CONFIG_CRC_CCITT=y
339+CONFIG_DMA_CMA=y
340+CONFIG_CMA_SIZE_MBYTES=96
358341 CONFIG_FONTS=y
359342 CONFIG_FONT_7x14=y
343+CONFIG_PRINTK_TIME=y
344+CONFIG_DYNAMIC_DEBUG=y
345+CONFIG_DEBUG_INFO=y
346+CONFIG_MAGIC_SYSRQ=y
347+CONFIG_DEBUG_KERNEL=y
348+CONFIG_SOFTLOCKUP_DETECTOR=y
349+# CONFIG_DETECT_HUNG_TASK is not set
350+CONFIG_PROVE_LOCKING=y
351+CONFIG_DEBUG_ATOMIC_SLEEP=y
352+CONFIG_DEBUG_USER=y
arch/arm/configs/mini2440_defconfig+18−25
@@ -4,6 +4,16 @@ CONFIG_POSIX_MQUEUE=y · 3 unmodified lines
44 CONFIG_RELAY=y
55 CONFIG_BLK_DEV_INITRD=y
66 # CONFIG_COMPAT_BRK is not set
7+CONFIG_ARCH_S3C24XX=y
8+CONFIG_S3C_ADC=y
9+CONFIG_S3C24XX_PWM=y
10+# CONFIG_CPU_S3C2410 is not set
11+CONFIG_CPU_S3C2440=y
12+CONFIG_MACH_MINI2440=y
13+CONFIG_AEABI=y
14+CONFIG_KEXEC=y
15+CONFIG_CPU_IDLE=y
16+CONFIG_APM_EMULATION=y
717 CONFIG_MODULES=y
818 CONFIG_MODULE_FORCE_LOAD=y
919 CONFIG_MODULE_UNLOAD=y
@@ -16,17 +26,7 @@ CONFIG_MINIX_SUBPARTITION=y · 6 unmodified lines
1626 CONFIG_SOLARIS_X86_PARTITION=y
1727 CONFIG_UNIXWARE_DISKLABEL=y
1828 CONFIG_LDM_PARTITION=y
19−CONFIG_ARCH_S3C24XX=y
20−# CONFIG_CPU_S3C2410 is not set
21−CONFIG_CPU_S3C2440=y
22−CONFIG_MACH_MINI2440=y
23−CONFIG_S3C_ADC=y
24−CONFIG_S3C24XX_PWM=y
25−CONFIG_AEABI=y
26−CONFIG_KEXEC=y
27−CONFIG_CPU_IDLE=y
2829 CONFIG_BINFMT_MISC=m
29−CONFIG_APM_EMULATION=y
3030 CONFIG_NET=y
3131 CONFIG_PACKET=y
3232 CONFIG_UNIX=y
@@ -46,9 +46,6 @@ CONFIG_IP_MROUTE=y · 13 unmodified lines
4646 CONFIG_IP_PIMSM_V1=y
4747 CONFIG_IP_PIMSM_V2=y
4848 CONFIG_SYN_COOKIES=y
49−# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
50−# CONFIG_INET_XFRM_MODE_TUNNEL is not set
51−# CONFIG_INET_XFRM_MODE_BEET is not set
5249 CONFIG_INET_DIAG=m
5350 # CONFIG_IPV6 is not set
5451 CONFIG_NETFILTER=y
@@ -125,7 +122,6 @@ CONFIG_LIBERTAS=m · 70 unmodified lines
125122 CONFIG_LIBERTAS_SDIO=m
126123 CONFIG_ZD1211RW=m
127124 CONFIG_ZD1211RW_DEBUG=y
128−CONFIG_INPUT_FF_MEMLESS=y
129125 CONFIG_INPUT_EVDEV=y
130126 CONFIG_INPUT_EVBUG=m
131127 # CONFIG_KEYBOARD_ATKBD is not set
@@ -172,12 +168,9 @@ CONFIG_LOGO=y · 40 unmodified lines
172168 # CONFIG_LOGO_LINUX_VGA16 is not set
173169 CONFIG_SOUND=y
174170 CONFIG_SND=y
171+CONFIG_SND_DYNAMIC_MINORS=y
175172 CONFIG_SND_SEQUENCER=m
176173 CONFIG_SND_SEQ_DUMMY=m
177−CONFIG_SND_MIXER_OSS=m
178−CONFIG_SND_PCM_OSS=m
179−CONFIG_SND_SEQUENCER_OSS=y
180−CONFIG_SND_DYNAMIC_MINORS=y
181174 # CONFIG_SND_DRIVERS is not set
182175 # CONFIG_SND_ARM is not set
183176 # CONFIG_SND_SPI is not set
@@ -295,13 +288,6 @@ CONFIG_NLS_ISO8859_15=m · 111 unmodified lines
295288 CONFIG_NLS_KOI8_R=m
296289 CONFIG_NLS_KOI8_U=m
297290 CONFIG_NLS_UTF8=m
298−CONFIG_DEBUG_INFO=y
299−# CONFIG_ENABLE_MUST_CHECK is not set
300−CONFIG_STRIP_ASM_SYMS=y
301−CONFIG_DEBUG_FS=y
302−CONFIG_DEBUG_KERNEL=y
303−# CONFIG_SCHED_DEBUG is not set
304−CONFIG_DEBUG_USER=y
305291 CONFIG_CRYPTO_CRYPTD=m
306292 CONFIG_CRYPTO_AUTHENC=m
307293 CONFIG_CRYPTO_TEST=m
@@ -340,3 +326,10 @@ CONFIG_LIBCRC32C=m · 32 unmodified lines
340326 CONFIG_FONTS=y
341327 CONFIG_FONT_8x8=y
342328 CONFIG_FONT_MINI_4x6=y
329+CONFIG_DEBUG_INFO=y
330+# CONFIG_ENABLE_MUST_CHECK is not set
331+CONFIG_STRIP_ASM_SYMS=y
332+CONFIG_DEBUG_FS=y
333+CONFIG_DEBUG_KERNEL=y
334+# CONFIG_SCHED_DEBUG is not set
335+CONFIG_DEBUG_USER=y
arch/arm/configs/multi_v7_defconfig+0−1
@@ -943,7 +943,6 @@ CONFIG_ARCH_TEGRA_2x_SOC=y · 942 unmodified lines
943943 CONFIG_ARCH_TEGRA_3x_SOC=y
944944 CONFIG_ARCH_TEGRA_114_SOC=y
945945 CONFIG_ARCH_TEGRA_124_SOC=y
946−CONFIG_PM_DEVFREQ=y
947946 CONFIG_ARM_TEGRA_DEVFREQ=m
948947 CONFIG_TI_AEMIF=y
949948 CONFIG_IIO=y
arch/arm/configs/s3c2410_defconfig+9−15
@@ -4,13 +4,8 @@ CONFIG_IKCONFIG_PROC=y · 3 unmodified lines
44 CONFIG_LOG_BUF_SHIFT=16
55 CONFIG_BLK_DEV_INITRD=y
66 CONFIG_SLAB=y
7−CONFIG_MODULES=y
8−CONFIG_MODULE_UNLOAD=y
9−# CONFIG_BLK_DEV_BSG is not set
10−CONFIG_PARTITION_ADVANCED=y
11−CONFIG_BSD_DISKLABEL=y
12−CONFIG_SOLARIS_X86_PARTITION=y
137 CONFIG_ARCH_S3C24XX=y
8+CONFIG_S3C_ADC=y
149 CONFIG_CPU_S3C2412=y
1510 CONFIG_CPU_S3C2416=y
1611 CONFIG_CPU_S3C2440=y
@@ -40,13 +35,18 @@ CONFIG_ARCH_S3C2440=y · 23 unmodified lines
4035 CONFIG_MACH_NEO1973_GTA02=y
4136 CONFIG_MACH_RX1950=y
4237 CONFIG_MACH_SMDK2443=y
43−CONFIG_S3C_ADC=y
4438 CONFIG_ZBOOT_ROM_TEXT=0x0
4539 CONFIG_ZBOOT_ROM_BSS=0x0
4640 CONFIG_CMDLINE="root=/dev/hda1 ro init=/bin/bash console=ttySAC0"
4741 CONFIG_FPE_NWFPE=y
4842 CONFIG_FPE_NWFPE_XP=y
4943 CONFIG_APM_EMULATION=m
44+CONFIG_MODULES=y
45+CONFIG_MODULE_UNLOAD=y
46+# CONFIG_BLK_DEV_BSG is not set
47+CONFIG_PARTITION_ADVANCED=y
48+CONFIG_BSD_DISKLABEL=y
49+CONFIG_SOLARIS_X86_PARTITION=y
5050 CONFIG_NET=y
5151 CONFIG_PACKET=y
5252 CONFIG_UNIX=y
@@ -74,7 +74,6 @@ CONFIG_INET6_AH=m · 21 unmodified lines
7474 CONFIG_INET6_ESP=m
7575 CONFIG_INET6_IPCOMP=m
7676 CONFIG_IPV6_MIP6=m
77−CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
7877 CONFIG_IPV6_TUNNEL=m
7978 CONFIG_NETFILTER=y
8079 CONFIG_NF_CONNTRACK=m
@@ -129,7 +128,6 @@ CONFIG_NETFILTER_XT_MATCH_TCPMSS=m · 48 unmodified lines
129128 CONFIG_NETFILTER_XT_MATCH_TIME=m
130129 CONFIG_NETFILTER_XT_MATCH_U32=m
131130 CONFIG_IP_VS=m
132−CONFIG_NF_CONNTRACK_IPV4=m
133131 CONFIG_IP_NF_IPTABLES=m
134132 CONFIG_IP_NF_MATCH_AH=m
135133 CONFIG_IP_NF_MATCH_ECN=m
@@ -148,7 +146,6 @@ CONFIG_IP_NF_RAW=m · 12 unmodified lines
148146 CONFIG_IP_NF_ARPTABLES=m
149147 CONFIG_IP_NF_ARPFILTER=m
150148 CONFIG_IP_NF_ARP_MANGLE=m
151−CONFIG_NF_CONNTRACK_IPV6=m
152149 CONFIG_IP6_NF_IPTABLES=m
153150 CONFIG_IP6_NF_MATCH_AH=m
154151 CONFIG_IP6_NF_MATCH_EUI64=m
@@ -182,9 +179,9 @@ CONFIG_MAC80211=m · 27 unmodified lines
182179 CONFIG_MAC80211_MESH=y
183180 CONFIG_MAC80211_LEDS=y
184181 CONFIG_MTD=y
182+CONFIG_MTD_CMDLINE_PARTS=y
185183 CONFIG_MTD_REDBOOT_PARTS=y
186184 CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED=y
187−CONFIG_MTD_CMDLINE_PARTS=y
188185 CONFIG_MTD_BLOCK=y
189186 CONFIG_MTD_CFI=y
190187 CONFIG_MTD_JEDECPROBE=y
@@ -290,11 +287,8 @@ CONFIG_BACKLIGHT_PWM=m · 99 unmodified lines
290287 CONFIG_FRAMEBUFFER_CONSOLE=y
291288 CONFIG_SOUND=y
292289 CONFIG_SND=y
293−CONFIG_SND_SEQUENCER=m
294−CONFIG_SND_MIXER_OSS=m
295−CONFIG_SND_PCM_OSS=m
296−CONFIG_SND_SEQUENCER_OSS=y
297290 CONFIG_SND_VERBOSE_PRINTK=y
291+CONFIG_SND_SEQUENCER=m
298292 # CONFIG_SND_DRIVERS is not set
299293 # CONFIG_SND_ARM is not set
300294 # CONFIG_SND_SPI is not set
arch/arm/configs/s3c6400_defconfig+4−7
@@ -2,9 +2,6 @@ CONFIG_SYSFS_DEPRECATED=y · 1 unmodified line
22 CONFIG_SYSFS_DEPRECATED_V2=y
33 CONFIG_BLK_DEV_INITRD=y
44 CONFIG_KALLSYMS_ALL=y
5−CONFIG_MODULES=y
6−CONFIG_MODULE_UNLOAD=y
7−# CONFIG_BLK_DEV_BSG is not set
85 CONFIG_ARCH_MULTI_V6=y
96 # CONFIG_ARCH_MULTI_V7 is not set
107 CONFIG_ARCH_S3C64XX=y
@@ -18,9 +15,11 @@ CONFIG_MACH_HMT=y · 7 unmodified lines
1815 CONFIG_MACH_SMARTQ5=y
1916 CONFIG_MACH_SMARTQ7=y
2017 CONFIG_MACH_WLF_CRAGG_6410=y
21−CONFIG_AEABI=y
2218 CONFIG_CMDLINE="console=ttySAC0,115200 root=/dev/ram init=/linuxrc initrd=0x51000000,6M ramdisk_size=6144"
2319 CONFIG_VFP=y
20+CONFIG_MODULES=y
21+CONFIG_MODULE_UNLOAD=y
22+# CONFIG_BLK_DEV_BSG is not set
2423 CONFIG_MTD=y
2524 CONFIG_MTD_RAW_NAND=y
2625 CONFIG_MTD_NAND_S3C2410=y
@@ -45,8 +44,6 @@ CONFIG_BACKLIGHT_CLASS_DEVICE=y · 18 unmodified lines
4544 CONFIG_BACKLIGHT_PWM=y
4645 CONFIG_SOUND=y
4746 CONFIG_SND=m
48−CONFIG_SND_MIXER_OSS=m
49−CONFIG_SND_PCM_OSS=m
5047 CONFIG_SND_SOC=m
5148 CONFIG_USB=y
5249 CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
@@ -59,8 +56,8 @@ CONFIG_USB_SERIAL_EMPEG=m · 6 unmodified lines
5956 CONFIG_USB_SERIAL_FTDI_SIO=m
6057 CONFIG_USB_SERIAL_PL2303=m
6158 CONFIG_MMC=y
62−CONFIG_MMC_DEBUG=y
6359 CONFIG_SDIO_UART=y
60+CONFIG_MMC_DEBUG=y
6461 CONFIG_MMC_SDHCI=y
6562 CONFIG_MMC_SDHCI_S3C=y
6663 CONFIG_RTC_CLASS=y