mirror of https://gitee.com/openkylin/linux.git
Defconfig changes for omaps
Drop PROVE_LOCKING as it should not be enabled in the defconfig. It causes quite a bit overhead as noted in the patch description. Then let's update omap2plus_defconfig for dropped options and moved options. That way makesavedefconfig can actually be used to generate patches against omap2plus_defconfig. -----BEGIN PGP SIGNATURE----- iQJFBAABCAAvFiEEkgNvrZJU/QSQYIcQG9Q+yVyrpXMFAlxlrd0RHHRvbnlAYXRv bWlkZS5jb20ACgkQG9Q+yVyrpXOMQQ//dnvmQ0xiVFFB/I4hfgcI2kHxk4J3nIoO zPGPb2ygUN6CeFLVSVUv3vytOR4FkvKZU/Z6hyxJTv0cain1yxZ6IfTRjNwKdDxF UA35AvB992WwBqbu7UxUUSI80dAY9CAqY7Cq0niaFbpQ7giIbL+qQtWLoVHFJi76 V3DQa45QXgNGURJ7bMYxjzb2/mH9cAx7UfOIuePNdACGhf9t/PHYIjJnPA9PLurq Umgv00FraiUbSQhVF0Pfdd5ljPrpV0pf3DWrsOAnPuPJo2wmLzrfyLi014JSoifH DGyi47uyq2XXwdHMtfPU0YiRGhP0O9md5nGcGIjKNiAeCISmYgqYtXsTsAah4wDY 2RQajX0y6KKuQobrRewoK82QGgqcJcj3Xd61+luf7wh3w9nTpZ/HrS4pqVC/cvos S/5Wsj7yT/k+g4LOINzhaBaLVlKhW0KPQtiJpexSjgfLoTSQ32H1aCvpEUpwKcYQ nUZX/bgKhNmFLeH7V0MnTcnuR2cWcpyK1yO6HyjfxEA3cEbZkrpBVoGd9xOtqDik miUN54C4vDdidjq20Y+h7ZYvWchBwLbEVr98kaBZvDeBNQpL16+vdx1qLufW/j8F B7gSJJZNYJd4riRF8R7DSnx1eqDsmqedXVmjGGX14QdpP+5BI//DaGfmY3cQN0eE 79Tc2xtnWmY= =Cia+ -----END PGP SIGNATURE----- Merge tag 'omap-for-v5.1/defconfig-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into arm/defconfig Defconfig changes for omaps Drop PROVE_LOCKING as it should not be enabled in the defconfig. It causes quite a bit overhead as noted in the patch description. Then let's update omap2plus_defconfig for dropped options and moved options. That way makesavedefconfig can actually be used to generate patches against omap2plus_defconfig. * tag 'omap-for-v5.1/defconfig-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: ARM: omap2plus_defconfig: Update for moved options ARM: omap2plus_defconfig: Update for dropped options ARM: omap2plus_defconfig: remove PROVE_LOCKING from defconfig Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
commit
0e58c23b52
|
@ -25,16 +25,6 @@ CONFIG_BLK_DEV_INITRD=y
|
||||||
CONFIG_EXPERT=y
|
CONFIG_EXPERT=y
|
||||||
CONFIG_SLAB=y
|
CONFIG_SLAB=y
|
||||||
CONFIG_PROFILING=y
|
CONFIG_PROFILING=y
|
||||||
CONFIG_OPROFILE=y
|
|
||||||
CONFIG_KPROBES=y
|
|
||||||
CONFIG_MODULES=y
|
|
||||||
CONFIG_MODULE_FORCE_LOAD=y
|
|
||||||
CONFIG_MODULE_UNLOAD=y
|
|
||||||
CONFIG_MODULE_FORCE_UNLOAD=y
|
|
||||||
CONFIG_MODVERSIONS=y
|
|
||||||
CONFIG_MODULE_SRCVERSION_ALL=y
|
|
||||||
# CONFIG_BLK_DEV_BSG is not set
|
|
||||||
CONFIG_PARTITION_ADVANCED=y
|
|
||||||
CONFIG_ARCH_MULTI_V6=y
|
CONFIG_ARCH_MULTI_V6=y
|
||||||
CONFIG_POWER_AVS_OMAP=y
|
CONFIG_POWER_AVS_OMAP=y
|
||||||
CONFIG_POWER_AVS_OMAP_CLASS3=y
|
CONFIG_POWER_AVS_OMAP_CLASS3=y
|
||||||
|
@ -48,15 +38,8 @@ CONFIG_SOC_AM43XX=y
|
||||||
CONFIG_SOC_DRA7XX=y
|
CONFIG_SOC_DRA7XX=y
|
||||||
CONFIG_ARM_THUMBEE=y
|
CONFIG_ARM_THUMBEE=y
|
||||||
CONFIG_ARM_ERRATA_411920=y
|
CONFIG_ARM_ERRATA_411920=y
|
||||||
CONFIG_PCI=y
|
|
||||||
CONFIG_PCI_MSI=y
|
|
||||||
CONFIG_PCI_DRA7XX_EP=y
|
|
||||||
CONFIG_PCI_ENDPOINT=y
|
|
||||||
CONFIG_PCI_ENDPOINT_CONFIGFS=y
|
|
||||||
CONFIG_PCI_EPF_TEST=m
|
|
||||||
CONFIG_SMP=y
|
CONFIG_SMP=y
|
||||||
CONFIG_NR_CPUS=2
|
CONFIG_NR_CPUS=2
|
||||||
CONFIG_CMA=y
|
|
||||||
CONFIG_SECCOMP=y
|
CONFIG_SECCOMP=y
|
||||||
CONFIG_ZBOOT_ROM_TEXT=0x0
|
CONFIG_ZBOOT_ROM_TEXT=0x0
|
||||||
CONFIG_ZBOOT_ROM_BSS=0x0
|
CONFIG_ZBOOT_ROM_BSS=0x0
|
||||||
|
@ -74,8 +57,27 @@ CONFIG_CPUFREQ_DT=m
|
||||||
CONFIG_ARM_TI_CPUFREQ=y
|
CONFIG_ARM_TI_CPUFREQ=y
|
||||||
CONFIG_CPU_IDLE=y
|
CONFIG_CPU_IDLE=y
|
||||||
CONFIG_KERNEL_MODE_NEON=y
|
CONFIG_KERNEL_MODE_NEON=y
|
||||||
CONFIG_BINFMT_MISC=y
|
|
||||||
CONFIG_PM_DEBUG=y
|
CONFIG_PM_DEBUG=y
|
||||||
|
CONFIG_ARM_CRYPTO=y
|
||||||
|
CONFIG_CRYPTO_SHA1_ARM_NEON=m
|
||||||
|
CONFIG_CRYPTO_SHA256_ARM=m
|
||||||
|
CONFIG_CRYPTO_SHA512_ARM=m
|
||||||
|
CONFIG_CRYPTO_AES_ARM=m
|
||||||
|
CONFIG_CRYPTO_AES_ARM_BS=m
|
||||||
|
CONFIG_CRYPTO_GHASH_ARM_CE=m
|
||||||
|
CONFIG_CRYPTO_CHACHA20_NEON=m
|
||||||
|
CONFIG_OPROFILE=y
|
||||||
|
CONFIG_KPROBES=y
|
||||||
|
CONFIG_MODULES=y
|
||||||
|
CONFIG_MODULE_FORCE_LOAD=y
|
||||||
|
CONFIG_MODULE_UNLOAD=y
|
||||||
|
CONFIG_MODULE_FORCE_UNLOAD=y
|
||||||
|
CONFIG_MODVERSIONS=y
|
||||||
|
CONFIG_MODULE_SRCVERSION_ALL=y
|
||||||
|
# CONFIG_BLK_DEV_BSG is not set
|
||||||
|
CONFIG_PARTITION_ADVANCED=y
|
||||||
|
CONFIG_BINFMT_MISC=y
|
||||||
|
CONFIG_CMA=y
|
||||||
CONFIG_NET=y
|
CONFIG_NET=y
|
||||||
CONFIG_PACKET=y
|
CONFIG_PACKET=y
|
||||||
CONFIG_UNIX=y
|
CONFIG_UNIX=y
|
||||||
|
@ -118,6 +120,12 @@ CONFIG_AF_RXRPC=m
|
||||||
CONFIG_RXKAD=y
|
CONFIG_RXKAD=y
|
||||||
CONFIG_CFG80211=m
|
CONFIG_CFG80211=m
|
||||||
CONFIG_MAC80211=m
|
CONFIG_MAC80211=m
|
||||||
|
CONFIG_PCI=y
|
||||||
|
CONFIG_PCI_MSI=y
|
||||||
|
CONFIG_PCI_DRA7XX_EP=y
|
||||||
|
CONFIG_PCI_ENDPOINT=y
|
||||||
|
CONFIG_PCI_ENDPOINT_CONFIGFS=y
|
||||||
|
CONFIG_PCI_EPF_TEST=m
|
||||||
CONFIG_DEVTMPFS=y
|
CONFIG_DEVTMPFS=y
|
||||||
CONFIG_DEVTMPFS_MOUNT=y
|
CONFIG_DEVTMPFS_MOUNT=y
|
||||||
CONFIG_DMA_CMA=y
|
CONFIG_DMA_CMA=y
|
||||||
|
@ -132,13 +140,13 @@ CONFIG_MTD_CFI_INTELEXT=y
|
||||||
CONFIG_MTD_PHYSMAP=y
|
CONFIG_MTD_PHYSMAP=y
|
||||||
CONFIG_MTD_PHYSMAP_OF=y
|
CONFIG_MTD_PHYSMAP_OF=y
|
||||||
CONFIG_MTD_M25P80=m
|
CONFIG_MTD_M25P80=m
|
||||||
|
CONFIG_MTD_ONENAND=y
|
||||||
|
CONFIG_MTD_ONENAND_VERIFY_WRITE=y
|
||||||
|
CONFIG_MTD_ONENAND_OMAP2=y
|
||||||
CONFIG_MTD_NAND=y
|
CONFIG_MTD_NAND=y
|
||||||
CONFIG_MTD_NAND_ECC_BCH=y
|
CONFIG_MTD_NAND_ECC_BCH=y
|
||||||
CONFIG_MTD_NAND_OMAP2=y
|
CONFIG_MTD_NAND_OMAP2=y
|
||||||
CONFIG_MTD_NAND_OMAP_BCH=y
|
CONFIG_MTD_NAND_OMAP_BCH=y
|
||||||
CONFIG_MTD_ONENAND=y
|
|
||||||
CONFIG_MTD_ONENAND_VERIFY_WRITE=y
|
|
||||||
CONFIG_MTD_ONENAND_OMAP2=y
|
|
||||||
CONFIG_MTD_SPI_NOR=m
|
CONFIG_MTD_SPI_NOR=m
|
||||||
CONFIG_MTD_UBI=y
|
CONFIG_MTD_UBI=y
|
||||||
CONFIG_BLK_DEV_LOOP=y
|
CONFIG_BLK_DEV_LOOP=y
|
||||||
|
@ -155,7 +163,6 @@ CONFIG_SATA_AHCI_PLATFORM=y
|
||||||
CONFIG_AHCI_DM816=m
|
CONFIG_AHCI_DM816=m
|
||||||
CONFIG_NETDEVICES=y
|
CONFIG_NETDEVICES=y
|
||||||
# CONFIG_NET_VENDOR_ARC is not set
|
# CONFIG_NET_VENDOR_ARC is not set
|
||||||
# CONFIG_NET_CADENCE is not set
|
|
||||||
# CONFIG_NET_VENDOR_BROADCOM is not set
|
# CONFIG_NET_VENDOR_BROADCOM is not set
|
||||||
# CONFIG_NET_VENDOR_CIRRUS is not set
|
# CONFIG_NET_VENDOR_CIRRUS is not set
|
||||||
CONFIG_DM9000=y
|
CONFIG_DM9000=y
|
||||||
|
@ -283,11 +290,9 @@ CONFIG_HWMON=m
|
||||||
CONFIG_SENSORS_GPIO_FAN=m
|
CONFIG_SENSORS_GPIO_FAN=m
|
||||||
CONFIG_SENSORS_LM75=m
|
CONFIG_SENSORS_LM75=m
|
||||||
CONFIG_SENSORS_TMP102=m
|
CONFIG_SENSORS_TMP102=m
|
||||||
CONFIG_THERMAL=m
|
|
||||||
CONFIG_THERMAL_GOV_FAIR_SHARE=y
|
CONFIG_THERMAL_GOV_FAIR_SHARE=y
|
||||||
CONFIG_THERMAL_GOV_USER_SPACE=y
|
CONFIG_THERMAL_GOV_USER_SPACE=y
|
||||||
CONFIG_CPU_THERMAL=y
|
CONFIG_CPU_THERMAL=y
|
||||||
CONFIG_TI_SOC_THERMAL=m
|
|
||||||
CONFIG_TI_THERMAL=y
|
CONFIG_TI_THERMAL=y
|
||||||
CONFIG_OMAP4_THERMAL=y
|
CONFIG_OMAP4_THERMAL=y
|
||||||
CONFIG_OMAP5_THERMAL=y
|
CONFIG_OMAP5_THERMAL=y
|
||||||
|
@ -381,13 +386,12 @@ CONFIG_SND_VERBOSE_PRINTK=y
|
||||||
CONFIG_SND_DEBUG=y
|
CONFIG_SND_DEBUG=y
|
||||||
CONFIG_SND_USB_AUDIO=m
|
CONFIG_SND_USB_AUDIO=m
|
||||||
CONFIG_SND_SOC=m
|
CONFIG_SND_SOC=m
|
||||||
CONFIG_SND_SOC_TLV320AIC3X=m
|
|
||||||
CONFIG_SND_SOC_DAVINCI_MCASP=m
|
CONFIG_SND_SOC_DAVINCI_MCASP=m
|
||||||
CONFIG_SND_SOC_NOKIA_RX51=m
|
CONFIG_SND_SOC_NOKIA_RX51=m
|
||||||
CONFIG_SND_SOC_OMAP_HDMI=m
|
|
||||||
CONFIG_SND_SOC_OMAP_ABE_TWL6040=m
|
|
||||||
CONFIG_SND_SOC_OMAP3_PANDORA=m
|
CONFIG_SND_SOC_OMAP3_PANDORA=m
|
||||||
CONFIG_SND_SOC_OMAP3_TWL4030=m
|
CONFIG_SND_SOC_OMAP3_TWL4030=m
|
||||||
|
CONFIG_SND_SOC_OMAP_ABE_TWL6040=m
|
||||||
|
CONFIG_SND_SOC_OMAP_HDMI=m
|
||||||
CONFIG_SND_SOC_CPCAP=m
|
CONFIG_SND_SOC_CPCAP=m
|
||||||
CONFIG_SND_SOC_TLV320AIC23_I2C=m
|
CONFIG_SND_SOC_TLV320AIC23_I2C=m
|
||||||
CONFIG_SND_SIMPLE_CARD=m
|
CONFIG_SND_SIMPLE_CARD=m
|
||||||
|
@ -475,8 +479,6 @@ CONFIG_RTC_DRV_PALMAS=m
|
||||||
CONFIG_RTC_DRV_OMAP=m
|
CONFIG_RTC_DRV_OMAP=m
|
||||||
CONFIG_RTC_DRV_CPCAP=m
|
CONFIG_RTC_DRV_CPCAP=m
|
||||||
CONFIG_DMADEVICES=y
|
CONFIG_DMADEVICES=y
|
||||||
CONFIG_DMA_OMAP=y
|
|
||||||
CONFIG_TI_EDMA=y
|
|
||||||
CONFIG_OMAP_IOMMU=y
|
CONFIG_OMAP_IOMMU=y
|
||||||
CONFIG_REMOTEPROC=m
|
CONFIG_REMOTEPROC=m
|
||||||
CONFIG_OMAP_REMOTEPROC=m
|
CONFIG_OMAP_REMOTEPROC=m
|
||||||
|
@ -531,24 +533,8 @@ CONFIG_NFS_V4=y
|
||||||
CONFIG_ROOT_NFS=y
|
CONFIG_ROOT_NFS=y
|
||||||
CONFIG_NLS_CODEPAGE_437=y
|
CONFIG_NLS_CODEPAGE_437=y
|
||||||
CONFIG_NLS_ISO8859_1=y
|
CONFIG_NLS_ISO8859_1=y
|
||||||
CONFIG_PRINTK_TIME=y
|
|
||||||
CONFIG_DEBUG_INFO=y
|
|
||||||
CONFIG_DEBUG_INFO_SPLIT=y
|
|
||||||
CONFIG_DEBUG_INFO_DWARF4=y
|
|
||||||
CONFIG_MAGIC_SYSRQ=y
|
|
||||||
CONFIG_SCHEDSTATS=y
|
|
||||||
CONFIG_PROVE_LOCKING=y
|
|
||||||
# CONFIG_DEBUG_BUGVERBOSE is not set
|
|
||||||
CONFIG_SECURITY=y
|
CONFIG_SECURITY=y
|
||||||
CONFIG_CRYPTO_MICHAEL_MIC=y
|
CONFIG_CRYPTO_MICHAEL_MIC=y
|
||||||
CONFIG_ARM_CRYPTO=y
|
|
||||||
CONFIG_CRYPTO_SHA1_ARM_NEON=m
|
|
||||||
CONFIG_CRYPTO_SHA256_ARM=m
|
|
||||||
CONFIG_CRYPTO_SHA512_ARM=m
|
|
||||||
CONFIG_CRYPTO_AES_ARM=m
|
|
||||||
CONFIG_CRYPTO_AES_ARM_BS=m
|
|
||||||
CONFIG_CRYPTO_GHASH_ARM_CE=m
|
|
||||||
CONFIG_CRYPTO_CHACHA20_NEON=m
|
|
||||||
CONFIG_CRC_CCITT=y
|
CONFIG_CRC_CCITT=y
|
||||||
CONFIG_CRC_T10DIF=y
|
CONFIG_CRC_T10DIF=y
|
||||||
CONFIG_CRC_ITU_T=y
|
CONFIG_CRC_ITU_T=y
|
||||||
|
@ -557,3 +543,10 @@ CONFIG_LIBCRC32C=y
|
||||||
CONFIG_FONTS=y
|
CONFIG_FONTS=y
|
||||||
CONFIG_FONT_8x8=y
|
CONFIG_FONT_8x8=y
|
||||||
CONFIG_FONT_8x16=y
|
CONFIG_FONT_8x16=y
|
||||||
|
CONFIG_PRINTK_TIME=y
|
||||||
|
CONFIG_DEBUG_INFO=y
|
||||||
|
CONFIG_DEBUG_INFO_SPLIT=y
|
||||||
|
CONFIG_DEBUG_INFO_DWARF4=y
|
||||||
|
CONFIG_MAGIC_SYSRQ=y
|
||||||
|
CONFIG_SCHEDSTATS=y
|
||||||
|
# CONFIG_DEBUG_BUGVERBOSE is not set
|
||||||
|
|
Loading…
Reference in New Issue