From: Arnd Bergmann <arnd@arndb.de>
Date: Fri, 25 Feb 2022 16:20:34 +0000 (+0100)
Subject: Merge tag 'imx-defconfig-5.18' of git://git.kernel.org/pub/scm/linux/kernel/git/shawn... 
X-Git-Tag: microblaze-v5.19~154^2~19
X-Git-Url: http://git.monstr.eu/?a=commitdiff_plain;h=32d748a03e49d2a6093440f5601a2bb8071eedc4;p=linux-2.6-microblaze.git

Merge tag 'imx-defconfig-5.18' of git://git./linux/kernel/git/shawnguo/linux into arm/defconfig

i.MX defconfig change for 5.18:

- Add a new defconfig for Cortex-M based i.MXRT family.
- A series from Marcel Ziswiler to rebuild arm64 defconfig with
  'savedefconfig', and then enable various relevant options needed by
  Toradex verdin-imx8mm device.

* tag 'imx-defconfig-5.18' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  arm64: defconfig: enable verdin-imx8mm relevant drivers as modules
  arm64: defconfig: build r8169 as a module
  arm64: defconfig: build imx-sdma as a module
  arm64: defconfig: enable imx8m pcie phy driver
  arm64: defconfig: enable bpf/cgroup firewalling
  arm64: defconfig: rebuild default configuration
  arm64: defconfig: re-order default configuration
  arm64: defconfig: enable pcieaer configuration
  arm64: defconfig: enable taskstats configuration
  ARM: imxrt_defconfig: Add i.MXRT family defconfig

Link: https://lore.kernel.org/r/20220222075226.160187-6-shawnguo@kernel.org
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---

32d748a03e49d2a6093440f5601a2bb8071eedc4
diff --cc arch/arm64/configs/defconfig
index 74c61174b621,8d2733f8a7d9..082874839f0f
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@@ -1138,8 -1129,8 +1133,9 @@@ CONFIG_RESET_RZG2L_USBPHY_CTRL=
  CONFIG_RESET_TI_SCI=y
  CONFIG_PHY_XGENE=y
  CONFIG_PHY_SUN4I_USB=y
 +CONFIG_PHY_CADENCE_SIERRA=m
  CONFIG_PHY_MIXEL_MIPI_DPHY=m
+ CONFIG_PHY_FSL_IMX8M_PCIE=y
  CONFIG_PHY_HI6220_USB=y
  CONFIG_PHY_HISTB_COMBPHY=y
  CONFIG_PHY_HISI_INNO_USB2=y
@@@ -1162,17 -1153,15 +1158,17 @@@ CONFIG_PHY_SAMSUNG_UFS=
  CONFIG_PHY_UNIPHIER_USB2=y
  CONFIG_PHY_UNIPHIER_USB3=y
  CONFIG_PHY_TEGRA_XUSB=y
 +CONFIG_PHY_AM654_SERDES=m
 +CONFIG_PHY_J721E_WIZ=m
  CONFIG_ARM_SMMU_V3_PMU=m
  CONFIG_FSL_IMX8_DDR_PMU=m
- CONFIG_HISI_PMU=y
  CONFIG_QCOM_L2_PMU=y
  CONFIG_QCOM_L3_PMU=y
+ CONFIG_HISI_PMU=y
  CONFIG_NVMEM_IMX_OCOTP=y
  CONFIG_NVMEM_IMX_OCOTP_SCU=y
- CONFIG_QCOM_QFPROM=y
  CONFIG_MTK_EFUSE=y
+ CONFIG_QCOM_QFPROM=y
  CONFIG_ROCKCHIP_EFUSE=y
  CONFIG_NVMEM_SUNXI_SID=y
  CONFIG_UNIPHIER_EFUSE=y