From 50bae7532d88b607079ac75714a3d6d35da360a2 Mon Sep 17 00:00:00 2001 From: "jianxin.pan" Date: Fri, 30 Jun 2017 14:07:05 +0800 Subject: [PATCH] defconfig: sync defconfig with savedefconfig PD#138714: sync meson_defconfig with savedefconfig Change-Id: I3c464d1f56268530f254d64438df2a20817e8d7d Signed-off-by: jianxin.pan --- arch/arm/configs/meson32_defconfig | 2 +- arch/arm64/configs/meson64_defconfig | 41 +++++++----------------------------- 2 files changed, 9 insertions(+), 34 deletions(-) diff --git a/arch/arm/configs/meson32_defconfig b/arch/arm/configs/meson32_defconfig index 58e45e4..4720318 100644 --- a/arch/arm/configs/meson32_defconfig +++ b/arch/arm/configs/meson32_defconfig @@ -269,8 +269,8 @@ CONFIG_AMLOGIC_SND_CODEC_PCM2BT=y CONFIG_AMLOGIC_SND_CODEC_AMLT9015=y CONFIG_AMLOGIC_SND_CODEC_PMU3=y CONFIG_AMLOGIC_SND_SOC=y -CONFIG_AMLOGIC_SND_SPLIT_MODE=y CONFIG_AMLOGIC_SND_SOC_MESON=y +CONFIG_AMLOGIC_SND_SPLIT_MODE=y CONFIG_USB_HIDDEV=y CONFIG_USB=y CONFIG_USB_ANNOUNCE_NEW_DEVICES=y diff --git a/arch/arm64/configs/meson64_defconfig b/arch/arm64/configs/meson64_defconfig index fdd2587..5285b20 100644 --- a/arch/arm64/configs/meson64_defconfig +++ b/arch/arm64/configs/meson64_defconfig @@ -19,37 +19,8 @@ CONFIG_PROFILING=y CONFIG_JUMP_LABEL=y CONFIG_MODULES=y CONFIG_MODULE_UNLOAD=y -# -# Bus support -# CONFIG_PCI=y -CONFIG_PCI_DOMAINS=y -CONFIG_PCI_DOMAINS_GENERIC=y -CONFIG_PCI_SYSCALL=y -# CONFIG_PCIEPORTBUS is not set -CONFIG_PCI_BUS_ADDR_T_64BIT=y -CONFIG_PCI_MSI=y -CONFIG_PCI_MSI_IRQ_DOMAIN=y -# CONFIG_PCI_DEBUG is not set -# CONFIG_PCI_REALLOC_ENABLE_AUTO is not set -# CONFIG_PCI_STUB is not set -# CONFIG_PCI_IOV is not set -# CONFIG_PCI_PRI is not set -# CONFIG_PCI_PASID is not set -CONFIG_PCI_LABEL=y -# CONFIG_HOTPLUG_PCI is not set -# -# PCI host controller drivers -# CONFIG_PCIE_DW_PLAT=y -CONFIG_PCIE_DW=y -CONFIG_8139CP=y -CONFIG_8139TOO=y -CONFIG_8139TOO_PIO=y -CONFIG_8139TOO_TUNE_TWISTER=y -CONFIG_8139TOO_8129=y -CONFIG_8139_OLD_RX_RESET=y -CONFIG_R8169=y CONFIG_SCHED_MC=y CONFIG_NR_CPUS=8 CONFIG_PREEMPT=y @@ -225,7 +196,6 @@ CONFIG_AMLOGIC_INPUT_KEYBOARD=y CONFIG_AMLOGIC_ADC_KEYPADS=y CONFIG_AMLOGIC_REMOTE=y CONFIG_AMLOGIC_MESON_REMOTE=y -CONFIG_AMLOGIC_IRBLASTER=y CONFIG_AMLOGIC_EFUSE=y CONFIG_AMLOGIC_REBOOT=y CONFIG_AMLOGIC_GX_REBOOT=y @@ -235,7 +205,6 @@ CONFIG_AMLOGIC_PWM=y CONFIG_AMLOGIC_MEDIA_ENABLE=y CONFIG_AMLOGIC_MEDIA_COMMON=y CONFIG_AMLOGIC_MEDIA_DRIVERS=y -CONFIG_AMLOGIC_MEDIA_VIDEO=y CONFIG_AMLOGIC_MEDIA_CODEC_MM=y CONFIG_AMLOGIC_MEDIA_CANVAS=y CONFIG_AMLOGIC_MEDIA_GE2D=y @@ -244,6 +213,7 @@ CONFIG_AMLOGIC_MEDIA_RDMA=y CONFIG_AMLOGIC_MEDIA_VFM=y CONFIG_AMLOGIC_VPU=y CONFIG_AMLOGIC_VIDEOBUF_RESOURCE=y +CONFIG_AMLOGIC_MEDIA_VIDEO=y CONFIG_AMLOGIC_VOUT=y CONFIG_AMLOGIC_CVBS_OUTPUT=y CONFIG_AMLOGIC_WSS=y @@ -327,6 +297,12 @@ CONFIG_DM_CRYPT=y CONFIG_DM_VERITY=y CONFIG_NETDEVICES=y CONFIG_TUN=y +CONFIG_8139CP=y +CONFIG_8139TOO=y +CONFIG_8139TOO_TUNE_TWISTER=y +CONFIG_8139TOO_8129=y +CONFIG_8139_OLD_RX_RESET=y +CONFIG_R8169=y CONFIG_STMMAC_ETH=y CONFIG_DWMAC_MESON=y CONFIG_AMLOGIC_ETH_PRIVE=y @@ -342,7 +318,6 @@ CONFIG_PPPOE=y CONFIG_PPPOL2TP=y CONFIG_PPP_ASYNC=y CONFIG_USB_USBNET=y -CONFIG_ATH_COMMON=m CONFIG_ATH10K=m CONFIG_ATH10K_PCI=m CONFIG_INPUT_POLLDEV=y @@ -389,8 +364,8 @@ CONFIG_AMLOGIC_SND_CODEC_AMLT9015=y CONFIG_AMLOGIC_SND_SOC_TAS5707=y CONFIG_AMLOGIC_SND_SOC_TLV320ADC3101=y CONFIG_AMLOGIC_SND_SOC_PCM186X=y -CONFIG_AMLOGIC_SND_SOC_SSM3515=y CONFIG_AMLOGIC_SND_SOC_SSM3525=y +CONFIG_AMLOGIC_SND_SOC_SSM3515=y CONFIG_AMLOGIC_SND_SOC_TAS575X=y CONFIG_AMLOGIC_SND_SOC=y CONFIG_AMLOGIC_SND_SOC_MESON=y -- 2.7.4