summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrey Zhizhikin <andrey.z@gmail.com>2021-11-08 12:49:05 +0000
committerAndrey Zhizhikin <andrey.z@gmail.com>2021-11-15 21:33:48 +0000
commit9ecba2eb25d90c01c403bb4021b98b6e148306d1 (patch)
tree1caf470365f49abe6d32995f526da71cf671c2e5
parentb5b36b06019f86addd60b92ab1b8bf81a62f8d9b (diff)
downloadmeta-freescale-9ecba2eb25d90c01c403bb4021b98b6e148306d1.tar.gz
linux-fslc: re-sync configs with upstream
Re-sync layer configuration files with following from upstream: arch/arm64/configs/defconfig -> armv8a/defconfig arch/arm/configs/imx_v6_v7_defconfig -> defconfig All remaining config files are currently in-sync with upstream and do not require any further modifications. Upstream kernel sync commit: b6abb62daa55 ("Linux 5.15.1") Signed-off-by: Andrey Zhizhikin <andrey.z@gmail.com>
-rw-r--r--recipes-kernel/linux/linux-fslc/armv8a/defconfig2
-rw-r--r--recipes-kernel/linux/linux-fslc/defconfig3
2 files changed, 3 insertions, 2 deletions
diff --git a/recipes-kernel/linux/linux-fslc/armv8a/defconfig b/recipes-kernel/linux/linux-fslc/armv8a/defconfig
index 65a142a3..198f7e4c 100644
--- a/recipes-kernel/linux/linux-fslc/armv8a/defconfig
+++ b/recipes-kernel/linux/linux-fslc/armv8a/defconfig
@@ -246,7 +246,6 @@ CONFIG_DEVTMPFS_MOUNT=y
246CONFIG_FW_LOADER_USER_HELPER=y 246CONFIG_FW_LOADER_USER_HELPER=y
247CONFIG_FW_LOADER_USER_HELPER_FALLBACK=y 247CONFIG_FW_LOADER_USER_HELPER_FALLBACK=y
248CONFIG_HISILICON_LPC=y 248CONFIG_HISILICON_LPC=y
249CONFIG_SIMPLE_PM_BUS=y
250CONFIG_FSL_MC_BUS=y 249CONFIG_FSL_MC_BUS=y
251CONFIG_TEGRA_ACONNECT=m 250CONFIG_TEGRA_ACONNECT=m
252CONFIG_GNSS=m 251CONFIG_GNSS=m
@@ -974,6 +973,7 @@ CONFIG_TI_SCI_CLK=y
974CONFIG_COMMON_CLK_QCOM=y 973CONFIG_COMMON_CLK_QCOM=y
975CONFIG_QCOM_A53PLL=y 974CONFIG_QCOM_A53PLL=y
976CONFIG_QCOM_CLK_APCS_MSM8916=y 975CONFIG_QCOM_CLK_APCS_MSM8916=y
976CONFIG_QCOM_CLK_APCC_MSM8996=y
977CONFIG_QCOM_CLK_SMD_RPM=y 977CONFIG_QCOM_CLK_SMD_RPM=y
978CONFIG_QCOM_CLK_RPMH=y 978CONFIG_QCOM_CLK_RPMH=y
979CONFIG_IPQ_GCC_8074=y 979CONFIG_IPQ_GCC_8074=y
diff --git a/recipes-kernel/linux/linux-fslc/defconfig b/recipes-kernel/linux/linux-fslc/defconfig
index 2ab6b937..7078f912 100644
--- a/recipes-kernel/linux/linux-fslc/defconfig
+++ b/recipes-kernel/linux/linux-fslc/defconfig
@@ -120,7 +120,6 @@ CONFIG_BLK_DEV_SD=y
120CONFIG_SCSI_CONSTANTS=y 120CONFIG_SCSI_CONSTANTS=y
121CONFIG_SCSI_LOGGING=y 121CONFIG_SCSI_LOGGING=y
122CONFIG_SCSI_SCAN_ASYNC=y 122CONFIG_SCSI_SCAN_ASYNC=y
123# CONFIG_SCSI_LOWLEVEL is not set
124CONFIG_ATA=y 123CONFIG_ATA=y
125CONFIG_SATA_AHCI_PLATFORM=y 124CONFIG_SATA_AHCI_PLATFORM=y
126CONFIG_AHCI_IMX=y 125CONFIG_AHCI_IMX=y
@@ -252,6 +251,7 @@ CONFIG_REGULATOR_DA9052=y
252CONFIG_REGULATOR_DA9062=y 251CONFIG_REGULATOR_DA9062=y
253CONFIG_REGULATOR_DA9063=y 252CONFIG_REGULATOR_DA9063=y
254CONFIG_REGULATOR_GPIO=y 253CONFIG_REGULATOR_GPIO=y
254CONFIG_REGULATOR_LTC3676=y
255CONFIG_REGULATOR_MC13783=y 255CONFIG_REGULATOR_MC13783=y
256CONFIG_REGULATOR_MC13892=y 256CONFIG_REGULATOR_MC13892=y
257CONFIG_REGULATOR_PFUZE100=y 257CONFIG_REGULATOR_PFUZE100=y
@@ -291,6 +291,7 @@ CONFIG_DRM_IMX_LDB=y
291CONFIG_DRM_IMX_HDMI=y 291CONFIG_DRM_IMX_HDMI=y
292CONFIG_DRM_ETNAVIV=y 292CONFIG_DRM_ETNAVIV=y
293CONFIG_DRM_MXSFB=y 293CONFIG_DRM_MXSFB=y
294CONFIG_FB=y
294CONFIG_FB_MODE_HELPERS=y 295CONFIG_FB_MODE_HELPERS=y
295CONFIG_LCD_CLASS_DEVICE=y 296CONFIG_LCD_CLASS_DEVICE=y
296CONFIG_LCD_L4F00242T03=y 297CONFIG_LCD_L4F00242T03=y