defconfig: meson32: generate defconfig from savedefconfig

PD#141217: generate meson32_defconfig from savedefconfig

Change-Id: I3370f4c9e936095aeca7d6ec5fb163c91725c7b7
Signed-off-by: Yue Wang <yue.wang@amlogic.com>

diff --git a/arch/arm/configs/meson32_defconfig b/arch/arm/configs/meson32_defconfig
index ae8dc7a..a5890e6 100644 (file)
--- a/arch/arm/configs/meson32_defconfig
+++ b/arch/arm/configs/meson32_defconfig
@@ -42,6 +42,10 @@ CONFIG_AMLOGIC_DRIVER=y
 CONFIG_AMLOGIC_UART=y
 CONFIG_AMLOGIC_SERIAL_MESON_CONSOLE=y
 CONFIG_AMLOGIC_IOMAP=y
+CONFIG_AMLOGIC_USB=y
+CONFIG_AMLOGIC_USB_DWC_OTG_HCD=y
+CONFIG_AMLOGIC_USB_HOST_ELECT_TEST=y
+CONFIG_AMLOGIC_USBPHY=y
 CONFIG_AMLOGIC_CLK=y
 # CONFIG_AMLOGIC_RESET is not set
 CONFIG_AMLOGIC_M8B_CLK=y
@@ -50,6 +54,7 @@ CONFIG_DEVTMPFS_MOUNT=y
 CONFIG_DMA_CMA=y
 CONFIG_CMA_SIZE_MBYTES=64
 CONFIG_BLK_DEV_LOOP=y
+CONFIG_SRAM=y
 CONFIG_SCSI=y
 CONFIG_BLK_DEV_SD=y
 CONFIG_BLK_DEV_SR=y
@@ -57,7 +62,6 @@ CONFIG_MD=y
 CONFIG_BLK_DEV_DM=y
 CONFIG_DM_CRYPT=y
 CONFIG_DM_VERITY=y
-CONFIG_SRAM=y
 # CONFIG_INPUT_MOUSEDEV is not set
 # CONFIG_INPUT_KEYBOARD is not set
 # CONFIG_INPUT_MOUSE is not set
@@ -83,7 +87,20 @@ CONFIG_FB_SIMPLE=y
 CONFIG_FRAMEBUFFER_CONSOLE=y
 CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
 CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
-# CONFIG_HID is not set
+CONFIG_USB_HIDDEV=y
+CONFIG_USB=y
+CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
+CONFIG_USB_ACM=y
+CONFIG_USB_STORAGE=y
+CONFIG_USB_SERIAL=y
+CONFIG_USB_SERIAL_OPTION=y
+CONFIG_USB_GADGET=y
+CONFIG_USB_CONFIGFS=y
+CONFIG_USB_CONFIGFS_F_FS=y
+CONFIG_USB_CONFIGFS_F_MTP=y
+CONFIG_USB_CONFIGFS_F_PTP=y
+CONFIG_USB_CONFIGFS_F_ACC=y
+CONFIG_USB_CONFIGFS_UEVENT=y
 CONFIG_STAGING=y
 CONFIG_CHROME_PLATFORMS=y
 CONFIG_ARM_TIMER_SP804=y
@@ -101,7 +118,6 @@ CONFIG_VFAT_FS=y
 CONFIG_NTFS_FS=y
 CONFIG_TMPFS=y
 CONFIG_TMPFS_POSIX_ACL=y
-CONFIG_CONFIGFS_FS=m
 CONFIG_SQUASHFS=y
 CONFIG_SQUASHFS_LZO=y
 CONFIG_SQUASHFS_XZ=y
@@ -120,28 +136,5 @@ CONFIG_CRYPTO_SEQIV=y
 CONFIG_CRYPTO_DEFLATE=y
 CONFIG_CRYPTO_LZO=y
 # CONFIG_CRYPTO_HW is not set
-CONFIG_USB=y
-CONFIG_USB_SUPPORT=y
-CONFIG_USB_PHY=y
-CONFIG_USB_HIDDEV=y
-CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
-CONFIG_USB_ACM=y
-CONFIG_USB_STORAGE=y
-CONFIG_USB_SERIAL=y
-CONFIG_USB_SERIAL_OPTION=y
-CONFIG_USB_GADGET=y
-CONFIG_USB_GADGET_DWC_OTG=y
-CONFIG_USB_G_ANDROID=y
-CONFIG_AMLOGIC_USB=y
-CONFIG_AMLOGIC_USBPHY=y
-CONFIG_AMLOGIC_USB_DWC_OTG_HCD=y
-CONFIG_AMLOGIC_USB_HOST_ELECT_TEST=y
-CONFIG_USB_LIBCOMPOSITE=y
-CONFIG_USB_CONFIGFS_F_MTP=y
-CONFIG_USB_CONFIGFS_F_PTP=y
-CONFIG_USB_CONFIGFS_F_FS=y
-CONFIG_USB_CONFIGFS=y
-CONFIG_USB_CONFIGFS_UEVENT=y
-CONFIG_USB_CONFIGFS_F_ACC=y
 CONFIG_CRC_CCITT=m
 CONFIG_CRC_ITU_T=m