Skip to content

Commit fbd5c2c

Browse files
nijavesairon
andauthored
Update generic-x86-64 Linux kernel to 6.12 (#3767)
* Linux: Update kernel to 6.12.6 * Linux 6.12 * #3767 (comment) * #3767 (comment) * Add patch descriptions, kernel ver conditionals Signed-off-by: Nick Venenga <nick@venenga.com> * Remove extra zram compression algos * Undo fragment files config change ...for platforms that didn't receive kernel updates * Sort Dockerfile apt packages * Add Upstream refs to patches * Re-enable TC * Restore v6.6.y kernel fragments * Update buildroot to rebased branch * Apply 6.12 migration only to generic-x86-64 * package/eq3_char_loop: port patch from RaspberryMatic by @jens-maus * package/generic_raw_uart: port patch from RaspberryMatic by @jens-maus * Restore buildroot-external/board/pc/patches/linux It's used in ova and generic-aarch64 defconfigs. Keep the path removed from generic-x86-64 defconfig. * Split linux patches to be version-specific The IPv6 reachability patch needs different context on 6.6.y and 6.12.y - introduce version-specific linux directories. To avoid the need for extra directory for version used in RPi, copy those patches to its patches directory. * Replace removed Intel Skylake audio driver with Intel AVS The Skylake driver was removed and should be now replaced either by Intel HD Audio or Intel AVS. Remove the old options and enable AVS. SND_SOC_INTEL_SKYLAKE=m not found (defined in /build/buildroot-external/board/pc/generic-x86-64/kernel.config:63) SND_SOC_INTEL_SKL=m not found (defined in /build/buildroot-external/board/pc/generic-x86-64/kernel.config:64) SND_SOC_INTEL_APL=m not found (defined in /build/buildroot-external/board/pc/generic-x86-64/kernel.config:65) SND_SOC_INTEL_KBL=m not found (defined in /build/buildroot-external/board/pc/generic-x86-64/kernel.config:66) SND_SOC_INTEL_GLK=m not found (defined in /build/buildroot-external/board/pc/generic-x86-64/kernel.config:67) SND_SOC_INTEL_CNL=m not found (defined in /build/buildroot-external/board/pc/generic-x86-64/kernel.config:68) SND_SOC_INTEL_CFL=m not found (defined in /build/buildroot-external/board/pc/generic-x86-64/kernel.config:69) SND_SOC_INTEL_CML_H=m not found (defined in /build/buildroot-external/board/pc/generic-x86-64/kernel.config:70) SND_SOC_INTEL_CML_LP=m not found (defined in /build/buildroot-external/board/pc/generic-x86-64/kernel.config:71) SND_SOC_INTEL_SKYLAKE_FAMILY=m not found (defined in /build/buildroot-external/board/pc/generic-x86-64/kernel.config:72) SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC=y not found (defined in /build/buildroot-external/board/pc/generic-x86-64/kernel.config:73) SND_SOC_INTEL_SKYLAKE_COMMON=m not found (defined in /build/buildroot-external/board/pc/generic-x86-64/kernel.config:74) -> torvalds/linux@a882f4d SND_SOC_INTEL_SST=m requested, actual = n (defined in /build/buildroot-external/board/pc/generic-x86-64/kernel.config:58) -> torvalds/linux@970d299 * Remove I2C_COMPAT option I2C_COMPAT=y not found (defined in /build/buildroot-external/board/pc/generic-x86-64/kernel.config:163) -> torvalds/linux@7e72208 * Correctly disable module compression after Kconfig change The Kconfig structure was changed, there's now a top-level bool: torvalds/linux@c7ff693 --------- Signed-off-by: Nick Venenga <nick@venenga.com> Co-authored-by: Jan Čermák <sairon@sairon.cz>
1 parent 4919e4e commit fbd5c2c

26 files changed

+6448
-23
lines changed

Dockerfile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
2121

2222
# Build tools
2323
RUN apt-get update && apt-get install -y --no-install-recommends \
24+
automake \
2425
bash \
2526
bc \
2627
binutils \
@@ -30,6 +31,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
3031
file \
3132
git \
3233
graphviz \
34+
help2man \
3335
jq \
3436
make \
3537
ncurses-dev \
@@ -43,6 +45,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
4345
rsync \
4446
skopeo \
4547
sudo \
48+
texinfo \
4649
unzip \
4750
vim \
4851
wget \

Documentation/kernel.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,5 @@
2020
| ODROID-N2 | 6.6.73 |
2121
| ODROID-XU4 | 6.6.73 |
2222
| Generic aarch64 | 6.6.73 |
23-
| Generic x86-64 | 6.6.73 |
23+
| Generic x86-64 | 6.12.6 |
2424
| Khadas VIM3 | 6.6.73 |

buildroot-external/board/pc/generic-x86-64/kernel.config

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -55,24 +55,12 @@ CONFIG_SND_HDA_I915=y
5555
CONFIG_SND_SOC=m
5656

5757
CONFIG_SND_SOC_INTEL_SST_TOPLEVEL=y
58-
CONFIG_SND_SOC_INTEL_SST=m
5958
CONFIG_SND_SOC_INTEL_CATPT=m
6059
CONFIG_SND_SST_ATOM_HIFI2_PLATFORM=m
6160
CONFIG_SND_SST_ATOM_HIFI2_PLATFORM_PCI=m
6261
CONFIG_SND_SST_ATOM_HIFI2_PLATFORM_ACPI=m
63-
CONFIG_SND_SOC_INTEL_SKYLAKE=m
64-
CONFIG_SND_SOC_INTEL_SKL=m
65-
CONFIG_SND_SOC_INTEL_APL=m
66-
CONFIG_SND_SOC_INTEL_KBL=m
67-
CONFIG_SND_SOC_INTEL_GLK=m
68-
CONFIG_SND_SOC_INTEL_CNL=m
69-
CONFIG_SND_SOC_INTEL_CFL=m
70-
CONFIG_SND_SOC_INTEL_CML_H=m
71-
CONFIG_SND_SOC_INTEL_CML_LP=m
72-
CONFIG_SND_SOC_INTEL_SKYLAKE_FAMILY=m
73-
CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC=y
74-
CONFIG_SND_SOC_INTEL_SKYLAKE_COMMON=m
7562
CONFIG_SND_SOC_ACPI_INTEL_MATCH=m
63+
CONFIG_SND_SOC_INTEL_AVS=m
7664
CONFIG_SND_SOC_INTEL_MACH=y
7765
CONFIG_SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES=y
7866
CONFIG_SND_SOC_INTEL_HDA_DSP_COMMON=m
@@ -160,7 +148,6 @@ CONFIG_EDAC_IGEN6=m
160148

161149
CONFIG_I2C=y
162150
CONFIG_I2C_BOARDINFO=y
163-
CONFIG_I2C_COMPAT=y
164151
CONFIG_I2C_CHARDEV=m
165152
CONFIG_I2C_MUX=y
166153
CONFIG_I2C_TINY_USB=m

buildroot-external/configs/generic_x86_64_defconfig

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ BR2_DL_DIR="/cache/dl"
44
BR2_CCACHE=y
55
BR2_CCACHE_DIR="/cache/cc"
66
BR2_ENABLE_LTO=y
7-
BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_HASSOS_PATH)/patches $(BR2_EXTERNAL_HASSOS_PATH)/board/pc/patches"
7+
BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_HASSOS_PATH)/patches"
88
BR2_SSP_REGULAR=y
99
BR2_TARGET_GENERIC_HOSTNAME="homeassistant"
1010
BR2_TARGET_GENERIC_ISSUE="Welcome to Home Assistant"
@@ -16,9 +16,9 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-image.sh"
1616
BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/pc/generic-x86-64 $(BR2_EXTERNAL_HASSOS_PATH)/board/pc/generic-x86-64/hassos-hook.sh"
1717
BR2_LINUX_KERNEL=y
1818
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
19-
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.73"
19+
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.6"
2020
BR2_LINUX_KERNEL_DEFCONFIG="x86_64"
21-
BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.6.y/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.6.y/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.6.y/device-support.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.6.y/device-support-wireless.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.6.y/device-support-wireless-pci.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.6.y/device-support-pci.config $(BR2_EXTERNAL_HASSOS_PATH)/board/pc/generic-x86-64/kernel.config"
21+
BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.12.y/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.12.y/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.12.y/device-support.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.12.y/device-support-wireless.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.12.y/device-support-wireless-pci.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.12.y/device-support-pci.config $(BR2_EXTERNAL_HASSOS_PATH)/board/pc/generic-x86-64/kernel.config"
2222
BR2_LINUX_KERNEL_LZ4=y
2323
BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
2424
BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF=y
Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
CONFIG_IGB=y
2+
CONFIG_IGC=m
3+
4+
CONFIG_NET_VENDOR_AQUANTIA=y
5+
CONFIG_AQTION=m
6+
7+
CONFIG_NET_VENDOR_ATHEROS=y
8+
CONFIG_ATL2=m
9+
CONFIG_ATL1=m
10+
CONFIG_ATL1C=m
11+
CONFIG_ATL1E=m
12+
CONFIG_ALX=m
13+
14+
CONFIG_NET_VENDOR_BROADCOM=y
15+
CONFIG_B44=m
16+
CONFIG_BCMGENET=m
17+
CONFIG_BNX2=m
18+
CONFIG_TIGON3=m
19+
CONFIG_BNX2X=m
20+
CONFIG_BNXT=m
21+
22+
CONFIG_BROADCOM_PHY=m
23+
24+
CONFIG_NET_VENDOR_STMICRO=y
25+
CONFIG_STMMAC_ETH=m
26+
CONFIG_STMMAC_PCI=m
27+
28+
CONFIG_MEDIA_PCI_SUPPORT=y
29+
30+
# PCI sound drivers
31+
CONFIG_SND_PCI=y
32+
CONFIG_SND_HDA_GENERIC=m
33+
CONFIG_SND_HDA_INTEL=m
34+
CONFIG_SND_HDA_CODEC_REALTEK=m
35+
CONFIG_SND_HDA_CODEC_ANALOG=m
36+
CONFIG_SND_HDA_CODEC_VIA=m
37+
CONFIG_SND_HDA_CODEC_HDMI=m
38+
39+
# NVMe SSD support
40+
CONFIG_NVME_CORE=y
41+
CONFIG_BLK_DEV_NVME=y
Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
# This fragment contains configuration options for WiFi drivers that are
2+
# using PCI or PCIe bus. The device-support-wireless.config fragment must
3+
# be included for this one to work as well as it contains common options.
4+
5+
# Atheros drivers
6+
CONFIG_ATH5K=m
7+
CONFIG_ATH5K_PCI=y
8+
CONFIG_ATH10K_PCI=m
9+
CONFIG_ATH11K=m
10+
CONFIG_ATH11K_PCI=m
11+
CONFIG_ATH12K=m
12+
13+
# Broadcom drivers
14+
CONFIG_BRCMFMAC_PCIE=y
15+
16+
# Intel drivers
17+
CONFIG_IWLEGACY=m
18+
CONFIG_IWL3945=m
19+
CONFIG_IWL4965=m
20+
CONFIG_IWLWIFI=m
21+
CONFIG_IWLDVM=m
22+
CONFIG_IWLMVM=m
23+
24+
# Marvell drivers
25+
CONFIG_MWIFIEX_PCIE=m
26+
CONFIG_MWL8K=m
27+
28+
# Mediatek drivers
29+
CONFIG_MT7603E=m
30+
CONFIG_MT7615E=m
31+
CONFIG_MT7915E=m
32+
CONFIG_MT7921E=m
33+
CONFIG_MT7996E=m
34+
35+
# Ralink drivers
36+
CONFIG_RT2800PCI=m
37+
38+
# Realtek drivers
39+
CONFIG_RTL8192CE=m
40+
CONFIG_RTL8192SE=m
41+
CONFIG_RTL8192DE=m
42+
CONFIG_RTL8723AE=m
43+
CONFIG_RTL8723BE=m
44+
CONFIG_RTL8188EE=m
45+
CONFIG_RTL8192EE=m
46+
CONFIG_RTL8821AE=m
47+
CONFIG_RTW88_8822BE=m
48+
CONFIG_RTW88_8822CE=m
49+
CONFIG_RTW88_8723DE=m
50+
CONFIG_RTW88_8821CE=m
51+
52+
CONFIG_RTW89_8851BE=m
53+
CONFIG_RTW89_8852AE=m
54+
CONFIG_RTW89_8852BE=m
55+
CONFIG_RTW89_8852CE=m
Lines changed: 81 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,81 @@
1+
# This fragment contains configuration options for all platforms that
2+
# should support WiFi connectivity over USB or SDIO. It does not contain
3+
# drivers for PCI or PCIe devices - those need also inclusion of
4+
# device-support-wireless-pci.config fragment.
5+
6+
# Atheros drivers
7+
CONFIG_WLAN_VENDOR_ATH=y
8+
CONFIG_ATH10K=m
9+
CONFIG_ATH10K_SDIO=m
10+
CONFIG_ATH10K_USB=m
11+
CONFIG_ATH6KL=m
12+
CONFIG_ATH6KL_SDIO=m
13+
CONFIG_ATH6KL_USB=m
14+
CONFIG_ATH9K=m
15+
CONFIG_ATH9K_HTC=m
16+
CONFIG_CARL9170=m
17+
18+
# Broadcom drivers
19+
CONFIG_WLAN_VENDOR_BROADCOM=y
20+
CONFIG_B43=m
21+
CONFIG_B43_PHY_G=y
22+
CONFIG_B43_PHY_N=y
23+
CONFIG_B43_PHY_LP=y
24+
CONFIG_B43_PHY_HT=y
25+
CONFIG_BRCMSMAC=m
26+
CONFIG_BRCMFMAC=m
27+
CONFIG_BRCMFMAC_USB=y
28+
29+
# Intel drivers
30+
# Note: enabling it here but Intel drivers are currently exclusively PCI
31+
CONFIG_WLAN_VENDOR_INTEL=y
32+
33+
# Marvell drivers
34+
CONFIG_WLAN_VENDOR_MARVELL=y
35+
CONFIG_MWIFIEX=m
36+
CONFIG_MWIFIEX_SDIO=m
37+
CONFIG_MWIFIEX_USB=m
38+
39+
# Mediatek drivers
40+
CONFIG_WLAN_VENDOR_MEDIATEK=y
41+
CONFIG_MT7601U=m
42+
CONFIG_MT7663U=m
43+
CONFIG_MT7663S=m
44+
CONFIG_MT76x0E=m
45+
CONFIG_MT76x0U=m
46+
CONFIG_MT76x2U=m
47+
CONFIG_MT76x2E=m
48+
CONFIG_MT7921S=m
49+
CONFIG_MT7921U=m
50+
51+
# Ralink drivers
52+
CONFIG_WLAN_VENDOR_RALINK=y
53+
CONFIG_RT2500USB=m
54+
CONFIG_RT73USB=m
55+
CONFIG_RT2800USB=m
56+
CONFIG_RT2800USB_RT3573=y
57+
CONFIG_RT2800USB_RT53XX=y
58+
CONFIG_RT2800USB_RT55XX=y
59+
CONFIG_RT2800USB_UNKNOWN=y
60+
CONFIG_RT2X00=m
61+
62+
# Realtek drivers
63+
CONFIG_WLAN_VENDOR_REALTEK=y
64+
CONFIG_RTL8XXXU=m
65+
CONFIG_RTL8192CU=m
66+
CONFIG_RTL_CARDS=m
67+
CONFIG_RTW88=m
68+
CONFIG_RTW88_8822BS=m
69+
CONFIG_RTW88_8822BU=m
70+
CONFIG_RTW88_8822CS=m
71+
CONFIG_RTW88_8822CU=m
72+
CONFIG_RTW88_8723DS=m
73+
CONFIG_RTW88_8723DU=m
74+
CONFIG_RTW88_8821CS=m
75+
# Use OOT driver for 8821CU instead, see: https://github.com/home-assistant/operating-system/issues/3205
76+
# CONFIG_RTW88_8821CU is not set
77+
CONFIG_RTW89=m
78+
79+
# Staging drivers
80+
CONFIG_STAGING=y
81+
CONFIG_RTL8723BS=m

0 commit comments

Comments
 (0)