diff options
author | Andrey Zhizhikin <andrey.z@gmail.com> | 2021-11-08 12:49:05 +0000 |
---|---|---|
committer | Andrey Zhizhikin <andrey.z@gmail.com> | 2021-11-15 21:33:48 +0000 |
commit | 9ecba2eb25d90c01c403bb4021b98b6e148306d1 (patch) | |
tree | 1caf470365f49abe6d32995f526da71cf671c2e5 /recipes-kernel | |
parent | b5b36b06019f86addd60b92ab1b8bf81a62f8d9b (diff) | |
download | meta-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>
Diffstat (limited to 'recipes-kernel')
-rw-r--r-- | recipes-kernel/linux/linux-fslc/armv8a/defconfig | 2 | ||||
-rw-r--r-- | recipes-kernel/linux/linux-fslc/defconfig | 3 |
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 | |||
246 | CONFIG_FW_LOADER_USER_HELPER=y | 246 | CONFIG_FW_LOADER_USER_HELPER=y |
247 | CONFIG_FW_LOADER_USER_HELPER_FALLBACK=y | 247 | CONFIG_FW_LOADER_USER_HELPER_FALLBACK=y |
248 | CONFIG_HISILICON_LPC=y | 248 | CONFIG_HISILICON_LPC=y |
249 | CONFIG_SIMPLE_PM_BUS=y | ||
250 | CONFIG_FSL_MC_BUS=y | 249 | CONFIG_FSL_MC_BUS=y |
251 | CONFIG_TEGRA_ACONNECT=m | 250 | CONFIG_TEGRA_ACONNECT=m |
252 | CONFIG_GNSS=m | 251 | CONFIG_GNSS=m |
@@ -974,6 +973,7 @@ CONFIG_TI_SCI_CLK=y | |||
974 | CONFIG_COMMON_CLK_QCOM=y | 973 | CONFIG_COMMON_CLK_QCOM=y |
975 | CONFIG_QCOM_A53PLL=y | 974 | CONFIG_QCOM_A53PLL=y |
976 | CONFIG_QCOM_CLK_APCS_MSM8916=y | 975 | CONFIG_QCOM_CLK_APCS_MSM8916=y |
976 | CONFIG_QCOM_CLK_APCC_MSM8996=y | ||
977 | CONFIG_QCOM_CLK_SMD_RPM=y | 977 | CONFIG_QCOM_CLK_SMD_RPM=y |
978 | CONFIG_QCOM_CLK_RPMH=y | 978 | CONFIG_QCOM_CLK_RPMH=y |
979 | CONFIG_IPQ_GCC_8074=y | 979 | CONFIG_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 | |||
120 | CONFIG_SCSI_CONSTANTS=y | 120 | CONFIG_SCSI_CONSTANTS=y |
121 | CONFIG_SCSI_LOGGING=y | 121 | CONFIG_SCSI_LOGGING=y |
122 | CONFIG_SCSI_SCAN_ASYNC=y | 122 | CONFIG_SCSI_SCAN_ASYNC=y |
123 | # CONFIG_SCSI_LOWLEVEL is not set | ||
124 | CONFIG_ATA=y | 123 | CONFIG_ATA=y |
125 | CONFIG_SATA_AHCI_PLATFORM=y | 124 | CONFIG_SATA_AHCI_PLATFORM=y |
126 | CONFIG_AHCI_IMX=y | 125 | CONFIG_AHCI_IMX=y |
@@ -252,6 +251,7 @@ CONFIG_REGULATOR_DA9052=y | |||
252 | CONFIG_REGULATOR_DA9062=y | 251 | CONFIG_REGULATOR_DA9062=y |
253 | CONFIG_REGULATOR_DA9063=y | 252 | CONFIG_REGULATOR_DA9063=y |
254 | CONFIG_REGULATOR_GPIO=y | 253 | CONFIG_REGULATOR_GPIO=y |
254 | CONFIG_REGULATOR_LTC3676=y | ||
255 | CONFIG_REGULATOR_MC13783=y | 255 | CONFIG_REGULATOR_MC13783=y |
256 | CONFIG_REGULATOR_MC13892=y | 256 | CONFIG_REGULATOR_MC13892=y |
257 | CONFIG_REGULATOR_PFUZE100=y | 257 | CONFIG_REGULATOR_PFUZE100=y |
@@ -291,6 +291,7 @@ CONFIG_DRM_IMX_LDB=y | |||
291 | CONFIG_DRM_IMX_HDMI=y | 291 | CONFIG_DRM_IMX_HDMI=y |
292 | CONFIG_DRM_ETNAVIV=y | 292 | CONFIG_DRM_ETNAVIV=y |
293 | CONFIG_DRM_MXSFB=y | 293 | CONFIG_DRM_MXSFB=y |
294 | CONFIG_FB=y | ||
294 | CONFIG_FB_MODE_HELPERS=y | 295 | CONFIG_FB_MODE_HELPERS=y |
295 | CONFIG_LCD_CLASS_DEVICE=y | 296 | CONFIG_LCD_CLASS_DEVICE=y |
296 | CONFIG_LCD_L4F00242T03=y | 297 | CONFIG_LCD_L4F00242T03=y |