diff options
author | Andrey Zhizhikin <andrey.z@gmail.com> | 2023-01-10 10:12:07 +0100 |
---|---|---|
committer | Andrey Zhizhikin <andrey.z@gmail.com> | 2023-01-11 09:30:55 +0100 |
commit | c0619a09a491000f091c2f1409964fb5637d2541 (patch) | |
tree | e8a8ea781b03822dcb2250c7ad2780a12e6ebb5a /recipes-kernel/linux/linux-fslc/defconfig | |
parent | 669a3aa639ab496b0e53e703a398faa28d7ee485 (diff) | |
download | meta-freescale-c0619a09a491000f091c2f1409964fb5637d2541.tar.gz |
linux-fslc: re-sync configs with upstream
Re-sync layer configuration files with following from upstream
(including commit log diff to previous sync point):
- arch/arm64/configs/defconfig -> armv8a/defconfig
----
d56f66d2bd4a ("arm64: defconfig: Add Coresight as module")
28fc7c986f01 ("nvmem: prefix all symbols with NVMEM_")
075ed7b9e408 ("arm64: configs: Enable all PMUs provided by Arm")
489dd8611b64 ("arm64: defconfig: Enable Synopsys DWC MSHC driver")
e2c12540420d ("arm64: Enable docker support in defconfig")
31dbadcc2828 ("arm64: defconfig: Enable memory hotplug and hotremove config")
120072f48f4e ("arm64: configs: Enable all PMUs provided by Arm")
25c7d3857950 ("arm64: defconfig: Enabled SC8180x configs")
747c39f0ebfa ("arm64: defconfig: Make TEGRA186_GPC_DMA built-in")
0ddf10a319f1 ("arm64: tegra: Enable Tegra SPI & QSPI in deconfig")
9385eb46e319 ("arm64: defconfig: enable newer Qualcomm SoC sound drivers")
561044b5d652 ("arm64: defconfig: Enable devfreq cooling device")
0fd64e61d2e3 ("arm64: defconfig: enable ARCH_NXP")
7e21f077b1f1 ("arm64: defconfig: enable ARCH_BCM")
4cac4de4b05f ("arm64: defconfig: Enable Tegra MGBE driver")
aa7f46b326e7 ("arm64: defconfig: Config that had RPMSG_CHAR now gets RPMSG_CTRL")
853ff6c32150 ("arm64: defconfig: Drop ARM_CPUIDLE(generic idle driver) config")
eb970f3eb909 ("arm64: defconfig: Enable additional support for Renesas platforms")
4a329fecc9aa ("crypto: Kconfig - submenus for arm and arm64")
6a09ffaed765 ("arm64: defconfig: enable more Qualcomm drivers")
d30b361310f8 ("arm64: defconfig: remove BCM4908")
----
- arch/arm/configs/imx_v6_v7_defconfig -> defconfig
----
0192445cb2f7 ("arch: mm: rename FORCE_MAX_ZONEORDER to ARCH_FORCE_MAX_ORDER")
5b8e894163be ("ARM: configs: replace CONFIG_NO_HZ=y with CONFIG_NO_HZ_IDLE=y")
e92ab51026ae ("ARM: defconfig: reorder defconfig files")
----
- arch/arm/configs/mxs_defconfig -> mxs-generic-bsp/defconfig
----
5b8e894163be ("ARM: configs: replace CONFIG_NO_HZ=y with CONFIG_NO_HZ_IDLE=y")
e92ab51026ae ("ARM: defconfig: reorder defconfig files")
----
Previous upstream kernel sync commit: e60276b8c11a ("Linux 6.0.8")
Current upstream kernel sync commit: 2cb8e624295f ("Linux 6.1.4")
Signed-off-by: Andrey Zhizhikin <andrey.z@gmail.com>
Diffstat (limited to 'recipes-kernel/linux/linux-fslc/defconfig')
-rw-r--r-- | recipes-kernel/linux/linux-fslc/defconfig | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/recipes-kernel/linux/linux-fslc/defconfig b/recipes-kernel/linux/linux-fslc/defconfig index 9c4799f7..4aacdcf7 100644 --- a/recipes-kernel/linux/linux-fslc/defconfig +++ b/recipes-kernel/linux/linux-fslc/defconfig | |||
@@ -1,5 +1,5 @@ | |||
1 | CONFIG_SYSVIPC=y | 1 | CONFIG_SYSVIPC=y |
2 | CONFIG_NO_HZ=y | 2 | CONFIG_NO_HZ_IDLE=y |
3 | CONFIG_HIGH_RES_TIMERS=y | 3 | CONFIG_HIGH_RES_TIMERS=y |
4 | CONFIG_BPF_SYSCALL=y | 4 | CONFIG_BPF_SYSCALL=y |
5 | CONFIG_PREEMPT_VOLUNTARY=y | 5 | CONFIG_PREEMPT_VOLUNTARY=y |
@@ -30,7 +30,7 @@ CONFIG_SOC_VF610=y | |||
30 | CONFIG_SMP=y | 30 | CONFIG_SMP=y |
31 | CONFIG_ARM_PSCI=y | 31 | CONFIG_ARM_PSCI=y |
32 | CONFIG_HIGHMEM=y | 32 | CONFIG_HIGHMEM=y |
33 | CONFIG_FORCE_MAX_ZONEORDER=14 | 33 | CONFIG_ARCH_FORCE_MAX_ORDER=14 |
34 | CONFIG_CMDLINE="noinitrd console=ttymxc0,115200" | 34 | CONFIG_CMDLINE="noinitrd console=ttymxc0,115200" |
35 | CONFIG_KEXEC=y | 35 | CONFIG_KEXEC=y |
36 | CONFIG_CPU_FREQ=y | 36 | CONFIG_CPU_FREQ=y |
@@ -64,7 +64,6 @@ CONFIG_IP_PNP=y | |||
64 | CONFIG_IP_PNP_DHCP=y | 64 | CONFIG_IP_PNP_DHCP=y |
65 | CONFIG_NETFILTER=y | 65 | CONFIG_NETFILTER=y |
66 | CONFIG_CAN=y | 66 | CONFIG_CAN=y |
67 | CONFIG_CAN_FLEXCAN=y | ||
68 | CONFIG_BT=y | 67 | CONFIG_BT=y |
69 | CONFIG_BT_BNEP=m | 68 | CONFIG_BT_BNEP=m |
70 | CONFIG_BT_HCIUART=y | 69 | CONFIG_BT_HCIUART=y |
@@ -135,6 +134,7 @@ CONFIG_SMSC911X=y | |||
135 | # CONFIG_NET_VENDOR_STMICRO is not set | 134 | # CONFIG_NET_VENDOR_STMICRO is not set |
136 | CONFIG_MICREL_PHY=y | 135 | CONFIG_MICREL_PHY=y |
137 | CONFIG_AT803X_PHY=y | 136 | CONFIG_AT803X_PHY=y |
137 | CONFIG_CAN_FLEXCAN=y | ||
138 | CONFIG_USB_PEGASUS=m | 138 | CONFIG_USB_PEGASUS=m |
139 | CONFIG_USB_RTL8150=m | 139 | CONFIG_USB_RTL8150=m |
140 | CONFIG_USB_RTL8152=y | 140 | CONFIG_USB_RTL8152=y |
@@ -154,7 +154,6 @@ CONFIG_WL18XX=m | |||
154 | CONFIG_WLCORE_SDIO=m | 154 | CONFIG_WLCORE_SDIO=m |
155 | # CONFIG_WILINK_PLATFORM_DATA is not set | 155 | # CONFIG_WILINK_PLATFORM_DATA is not set |
156 | CONFIG_INPUT_EVDEV=y | 156 | CONFIG_INPUT_EVDEV=y |
157 | CONFIG_INPUT_EVBUG=m | ||
158 | CONFIG_KEYBOARD_GPIO=y | 157 | CONFIG_KEYBOARD_GPIO=y |
159 | CONFIG_KEYBOARD_SNVS_PWRKEY=y | 158 | CONFIG_KEYBOARD_SNVS_PWRKEY=y |
160 | CONFIG_KEYBOARD_IMX=y | 159 | CONFIG_KEYBOARD_IMX=y |