diff options
author | Max Krummenacher <max.krummenacher@toradex.com> | 2017-09-28 10:49:12 +0200 |
---|---|---|
committer | Stefan Agner <stefan.agner@toradex.com> | 2017-10-02 16:43:56 +0200 |
commit | b893ccb6ee38add7efeb4071035fc56973509e0c (patch) | |
tree | f6edb35d8ebc002aab79de5c810759b514a0906d /arch/arm/configs/apalis_imx6_defconfig | |
parent | 16305502f3ada7818cfeb0c86fb5c0a1b852a147 (diff) |
toradex defconfigs: synchronize with defconfigs in oe
Synchronize the defconfigs with changes done in meta-toradex-nxp.
Normalize the defconfigs by
make ..._defconfig
make savedevconig
cp defconfig arch/arm/configs/..._defconfig
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
Acked-by: Stefan Agner <stefan.agner@toradex.com>
Diffstat (limited to 'arch/arm/configs/apalis_imx6_defconfig')
-rw-r--r-- | arch/arm/configs/apalis_imx6_defconfig | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/arch/arm/configs/apalis_imx6_defconfig b/arch/arm/configs/apalis_imx6_defconfig index 03f9dde0924d..3eca103c3f12 100644 --- a/arch/arm/configs/apalis_imx6_defconfig +++ b/arch/arm/configs/apalis_imx6_defconfig @@ -141,9 +141,9 @@ CONFIG_KEYBOARD_GPIO=y CONFIG_KEYBOARD_IMX=y # CONFIG_MOUSE_PS2 is not set CONFIG_INPUT_TOUCHSCREEN=y +CONFIG_TOUCHSCREEN_ATMEL_MXT=m CONFIG_TOUCHSCREEN_FUSION_F0710A=m CONFIG_TOUCHSCREEN_STMPE=y -CONFIG_TOUCHSCREEN_ATMEL_MXT=m CONFIG_INPUT_MISC=y CONFIG_INPUT_UINPUT=y CONFIG_SERIO_SERPORT=m @@ -268,14 +268,6 @@ CONFIG_USB_CONFIGFS_EEM=y CONFIG_USB_CONFIGFS_MASS_STORAGE=y CONFIG_USB_CONFIGFS_F_LB_SS=y CONFIG_USB_CONFIGFS_F_FS=y -CONFIG_SQUASHFS=m -CONFIG_SQUASHFS_FILE_DIRECT=y -CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU=y -CONFIG_SQUASHFS_XATTR=y -CONFIG_SQUASHFS_ZLIB=y -CONFIG_SQUASHFS_LZ4=y -CONFIG_SQUASHFS_LZO=y -CONFIG_SQUASHFS_XZ=y CONFIG_USB_ZERO=m CONFIG_USB_ETH=m CONFIG_USB_G_NCM=m @@ -327,6 +319,13 @@ CONFIG_NTFS_FS=y CONFIG_NTFS_RW=y CONFIG_TMPFS=y CONFIG_TMPFS_POSIX_ACL=y +CONFIG_SQUASHFS=m +CONFIG_SQUASHFS_FILE_DIRECT=y +CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU=y +CONFIG_SQUASHFS_XATTR=y +CONFIG_SQUASHFS_LZ4=y +CONFIG_SQUASHFS_LZO=y +CONFIG_SQUASHFS_XZ=y CONFIG_NFS_FS=y CONFIG_NFS_V3_ACL=y CONFIG_NFS_V4=y |