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 <jianxin.pan@amlogic.com>

diff --git a/arch/arm64/configs/meson64_defconfig b/arch/arm64/configs/meson64_defconfig
index ef74ee0..b88613f 100644 (file)
--- 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