From: Olof Johansson Date: Wed, 6 Nov 2019 15:49:00 +0000 (-0800) Subject: Merge tag 'imx-defconfig-5.5' of git://git.kernel.org/pub/scm/linux/kernel/git/shawng... X-Git-Tag: v5.5-rc1~38^2~3 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1f0753ea6a38addd488ea62adac7fb0e81ac73ea;p=thirdparty%2Fkernel%2Flinux.git Merge tag 'imx-defconfig-5.5' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into arm/defconfig i.MX defconfig update for 5.5: - Enable i.MX7ULP watchdog, DA9052 touch and USB configfs support in imx_v6_v7_defconfig. - Enable newly added S32V234 SoC and its UART driver support in arm64 defconfig. - Built i.MX8QXP SCU key driver as module in arm64 defconfig. - Change AT803X Ethernet PHY driver from module to built-in, so that we can boot i.MX8MM EVK board with rootfs on NFS. * tag 'imx-defconfig-5.5' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: arm64: defconfig: Change CONFIG_AT803X_PHY from m to y ARM: imx_v6_v7_defconfig: Enable CONFIG_TOUCHSCREEN_DA9052 arm64: defconfig: Enable configs for S32V234 arm64: defconfig: Enable CONFIG_KEYBOARD_IMX_SC_KEY as module ARM: imx_v6_v7_defconfig: Build USB_CONFIGFS into kernel ARM: imx_v6_v7_defconfig: Enable CONFIG_IMX7ULP_WDT by default Link: https://lore.kernel.org/r/20191105150315.15477-7-shawnguo@kernel.org Signed-off-by: Olof Johansson --- 1f0753ea6a38addd488ea62adac7fb0e81ac73ea