From: jianxin.pan Date: Thu, 13 Jul 2017 03:48:38 +0000 (+0800) Subject: defconfig: meson64: sync savedefconfig X-Git-Tag: khadas-vims-v0.9.6-release~3009 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c91a6b3a68e724dc9aa83c0f9f5256b6da620655;p=platform%2Fkernel%2Flinux-amlogic.git defconfig: meson64: sync savedefconfig PD#146811: generate meson64_defconfig with: make ARCH=arm64 meson64_defconfig make ARCH=arm64 savedefconfig cp defconfig ./arch/arm64/configs/meson64_defconfig Change-Id: I936db023d4812ae6d9b563e56d19e2c3023c8989 Signed-off-by: jianxin.pan --- diff --git a/arch/arm64/configs/meson64_defconfig b/arch/arm64/configs/meson64_defconfig index ef74ee0..b88613f 100644 --- a/arch/arm64/configs/meson64_defconfig +++ b/arch/arm64/configs/meson64_defconfig @@ -219,7 +219,6 @@ CONFIG_AMLOGIC_CVBS_OUTPUT=y CONFIG_AMLOGIC_WSS=y CONFIG_AMLOGIC_VDAC=y CONFIG_AMLOGIC_HDMITX=y -CONFIG_AMLOGIC_ESM=y CONFIG_AMLOGIC_LCD=y CONFIG_AMLOGIC_LCD_TV=y CONFIG_AMLOGIC_LCD_TABLET=y @@ -268,6 +267,7 @@ CONFIG_AMLOGIC_JTAG=y CONFIG_AMLOGIC_JTAG_MESON=y CONFIG_AMLOGIC_WDT=y CONFIG_AMLOGIC_WDT_MESON=y +CONFIG_AMLOGIC_ESM=y CONFIG_AMLOGIC_WIFI=y CONFIG_AMLOGIC_BT_DEVICE=y CONFIG_AMLOGIC_DVB_COMPAT=y