From 713f0a3b341845c36c2a33357727388eef268dc7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20=C4=8Cerm=C3=A1k?= Date: Thu, 18 Jan 2024 14:47:37 +0100 Subject: [PATCH 1/6] Remove all non-existing kernel config symbols --- .../board/arm-uefi/generic-aarch64/kernel.config | 1 - buildroot-external/board/khadas/kernel-vim.config | 1 - buildroot-external/board/pc/ova/kernel.config | 2 -- buildroot-external/board/raspberrypi/kernel.config | 1 - buildroot-external/kernel/device-support.config | 9 --------- buildroot-external/kernel/docker.config | 5 ----- buildroot-external/kernel/hassos.config | 2 -- 7 files changed, 21 deletions(-) diff --git a/buildroot-external/board/arm-uefi/generic-aarch64/kernel.config b/buildroot-external/board/arm-uefi/generic-aarch64/kernel.config index 2990764b7f3..0e720761154 100644 --- a/buildroot-external/board/arm-uefi/generic-aarch64/kernel.config +++ b/buildroot-external/board/arm-uefi/generic-aarch64/kernel.config @@ -9,7 +9,6 @@ CONFIG_VIRTIO_BALLOON=m CONFIG_VIRTIO_MEM=m CONFIG_VIRTIO_INPUT=m CONFIG_VIRTIO_BLK=y -CONFIG_VIRTIO_BLK_SCSI=y CONFIG_VIRTIO_CONSOLE=m CONFIG_VIRTIO_VSOCKETS=m CONFIG_VIRTIO_MMIO=y diff --git a/buildroot-external/board/khadas/kernel-vim.config b/buildroot-external/board/khadas/kernel-vim.config index d695ea09f59..cd5de759faf 100644 --- a/buildroot-external/board/khadas/kernel-vim.config +++ b/buildroot-external/board/khadas/kernel-vim.config @@ -451,7 +451,6 @@ CONFIG_USB_GSPCA_ZC3XX=m CONFIG_USB_PWC=m CONFIG_VIDEO_CPIA2=m CONFIG_USB_ZR364XX=m -CONFIG_USB_STKWEBCAM=m CONFIG_USB_S2255=m CONFIG_VIDEO_USBTV=m CONFIG_VIDEO_PVRUSB2=m diff --git a/buildroot-external/board/pc/ova/kernel.config b/buildroot-external/board/pc/ova/kernel.config index 5de433d3108..5ed571f914b 100644 --- a/buildroot-external/board/pc/ova/kernel.config +++ b/buildroot-external/board/pc/ova/kernel.config @@ -39,7 +39,6 @@ CONFIG_VIRTIO_BALLOON=m CONFIG_VIRTIO_MEM=m CONFIG_VIRTIO_INPUT=m CONFIG_VIRTIO_BLK=y -CONFIG_VIRTIO_BLK_SCSI=y CONFIG_VIRTIO_CONSOLE=m CONFIG_VIRTIO_VSOCKETS=m CONFIG_VIRTIO_MMIO=y @@ -55,7 +54,6 @@ CONFIG_FUSE_FS=y CONFIG_VIRTIO_FS=y CONFIG_DAX=y CONFIG_FS_DAX=y -CONFIG_DAX_DRIVER=y CONFIG_ZONE_DEVICE=y CONFIG_FUSION=y diff --git a/buildroot-external/board/raspberrypi/kernel.config b/buildroot-external/board/raspberrypi/kernel.config index 14fbc057ec9..9462a2da22f 100644 --- a/buildroot-external/board/raspberrypi/kernel.config +++ b/buildroot-external/board/raspberrypi/kernel.config @@ -1,5 +1,4 @@ # CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set -# CONFIG_PGTABLE_MAPPING is not set # CONFIG_ZSWAP_COMPRESSOR_DEFAULT_LZO is not set # CONFIG_ZSWAP_ZPOOL_DEFAULT_ZBUD is not set diff --git a/buildroot-external/kernel/device-support.config b/buildroot-external/kernel/device-support.config index 7c1625e8ef2..5f1d9c44024 100644 --- a/buildroot-external/kernel/device-support.config +++ b/buildroot-external/kernel/device-support.config @@ -64,7 +64,6 @@ CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y CONFIG_MEDIA_USB_SUPPORT=y CONFIG_MEDIA_PCI_SUPPORT=y CONFIG_VIDEO_DEV=m -CONFIG_VIDEO_V4L2=m CONFIG_VIDEO_V4L2_SUBDEV_API=y CONFIG_VIDEO_V4L2_TPG=m CONFIG_VIDEO_TVEEPROM=m @@ -137,7 +136,6 @@ CONFIG_USB_PWC=m CONFIG_USB_PWC_INPUT_EVDEV=y CONFIG_VIDEO_CPIA2=m CONFIG_USB_ZR364XX=m -CONFIG_USB_STKWEBCAM=m CONFIG_USB_S2255=m # Analog capture USB devices @@ -146,7 +144,6 @@ CONFIG_VIDEO_PVRUSB2=m CONFIG_VIDEO_PVRUSB2_SYSFS=y CONFIG_VIDEO_PVRUSB2_DVB=y CONFIG_VIDEO_HDPVR=m -CONFIG_VIDEO_USBVISION=m CONFIG_VIDEO_STK1160_COMMON=m CONFIG_VIDEO_STK1160=m CONFIG_VIDEO_SAA7146=m @@ -201,9 +198,3 @@ CONFIG_W1=y CONFIG_W1_MASTER_DS2490=m CONFIG_W1_MASTER_DS2482=m CONFIG_W1_MASTER_GPIO=m - -# Gasket devices -CONFIG_STAGING=y -CONFIG_STAGING_GASKET_FRAMEWORK=m -CONFIG_STAGING_APEX_DRIVER=m -# end of Gasket devices diff --git a/buildroot-external/kernel/docker.config b/buildroot-external/kernel/docker.config index 46c40e5a85e..b5d5982b2e5 100644 --- a/buildroot-external/kernel/docker.config +++ b/buildroot-external/kernel/docker.config @@ -1,5 +1,4 @@ CONFIG_POSIX_MQUEUE=y -CONFIG_CFQ_GROUP_IOSCHED=y CONFIG_CFS_BANDWIDTH=y CONFIG_FAIR_GROUP_SCHED=y CONFIG_NET_SCHED=y @@ -23,7 +22,6 @@ CONFIG_CGROUP_BPF=y CONFIG_BPF_SYSCALL=y CONFIG_MEMCG=y -CONFIG_MEMCG_SWAP=y CONFIG_NAMESPACES=y CONFIG_USER_NS=y @@ -40,14 +38,11 @@ CONFIG_VXLAN=m CONFIG_INET=y CONFIG_IPV6=y CONFIG_INET_ESP=m -CONFIG_INET_XFRM_MODE_TRANSPORT=m CONFIG_NETCONSOLE=y CONFIG_VETH=y CONFIG_NETFILTER=y CONFIG_NF_CONNTRACK=y CONFIG_NF_NAT=y -CONFIG_NF_NAT_NEEDED=y -CONFIG_NF_CONNTRACK_IPV4=y CONFIG_IP6_NF_IPTABLES=y CONFIG_IP6_NF_FILTER=y CONFIG_IP6_NF_MANGLE=y diff --git a/buildroot-external/kernel/hassos.config b/buildroot-external/kernel/hassos.config index fc917fc85e8..08440811e0a 100644 --- a/buildroot-external/kernel/hassos.config +++ b/buildroot-external/kernel/hassos.config @@ -108,7 +108,6 @@ CONFIG_NF_TABLES_BRIDGE=m CONFIG_NFT_NUMGEN=m CONFIG_NFT_CT=m CONFIG_NFT_FLOW_OFFLOAD=m -CONFIG_NFT_COUNTER=m CONFIG_NFT_CONNLIMIT=m CONFIG_NFT_LOG=m CONFIG_NFT_LIMIT=m @@ -184,7 +183,6 @@ CONFIG_CFG80211_WEXT=y CONFIG_CIFS=m CONFIG_CIFS_XATTR=y CONFIG_CIFS_POSIX=y -CONFIG_CIFS_ACL=y CONFIG_CIFS_DFS_UPCALL=y CONFIG_WIREGUARD=m From 6856b4a38feb258cb7048b7b63263002789fb5dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20=C4=8Cerm=C3=A1k?= Date: Thu, 18 Jan 2024 15:08:06 +0100 Subject: [PATCH 2/6] Remove unapplied x86 Intel sound options These are missing various subsystem dependencies and were never in fact enabled, assuming they're rather exotic and removing them completely. --- .../board/pc/generic-x86-64/kernel.config | 30 ------------------- 1 file changed, 30 deletions(-) diff --git a/buildroot-external/board/pc/generic-x86-64/kernel.config b/buildroot-external/board/pc/generic-x86-64/kernel.config index 2fd183816de..cf984ac7079 100644 --- a/buildroot-external/board/pc/generic-x86-64/kernel.config +++ b/buildroot-external/board/pc/generic-x86-64/kernel.config @@ -59,7 +59,6 @@ CONFIG_SND_SOC_INTEL_CFL=m CONFIG_SND_SOC_INTEL_CML_H=m CONFIG_SND_SOC_INTEL_CML_LP=m CONFIG_SND_SOC_INTEL_SKYLAKE_FAMILY=m -CONFIG_SND_SOC_INTEL_SKYLAKE_SSP_CLK=m CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC=y CONFIG_SND_SOC_INTEL_SKYLAKE_COMMON=m CONFIG_SND_SOC_ACPI_INTEL_MATCH=m @@ -67,13 +66,8 @@ CONFIG_SND_SOC_INTEL_MACH=y CONFIG_SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES=y CONFIG_SND_SOC_INTEL_HDA_DSP_COMMON=m CONFIG_SND_SOC_INTEL_SOF_MAXIM_COMMON=m -CONFIG_SND_SOC_INTEL_HASWELL_MACH=m -CONFIG_SND_SOC_INTEL_BDW_RT5650_MACH=m -CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH=m -CONFIG_SND_SOC_INTEL_BROADWELL_MACH=m CONFIG_SND_SOC_INTEL_BYTCR_RT5640_MACH=m CONFIG_SND_SOC_INTEL_BYTCR_RT5651_MACH=m -CONFIG_SND_SOC_INTEL_BYTCR_WM5102_MACH=m CONFIG_SND_SOC_INTEL_CHT_BSW_RT5672_MACH=m CONFIG_SND_SOC_INTEL_CHT_BSW_RT5645_MACH=m CONFIG_SND_SOC_INTEL_CHT_BSW_MAX98090_TI_MACH=m @@ -82,38 +76,15 @@ CONFIG_SND_SOC_INTEL_BYT_CHT_CX2072X_MACH=m CONFIG_SND_SOC_INTEL_BYT_CHT_DA7213_MACH=m CONFIG_SND_SOC_INTEL_BYT_CHT_ES8316_MACH=m # CONFIG_SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH is not set -CONFIG_SND_SOC_INTEL_SKL_RT286_MACH=m -CONFIG_SND_SOC_INTEL_SKL_NAU88L25_SSM4567_MACH=m -CONFIG_SND_SOC_INTEL_SKL_NAU88L25_MAX98357A_MACH=m -CONFIG_SND_SOC_INTEL_DA7219_MAX98357A_GENERIC=m -CONFIG_SND_SOC_INTEL_BXT_DA7219_MAX98357A_COMMON=m -CONFIG_SND_SOC_INTEL_BXT_DA7219_MAX98357A_MACH=m -CONFIG_SND_SOC_INTEL_BXT_RT298_MACH=m -CONFIG_SND_SOC_INTEL_SOF_WM8804_MACH=m -CONFIG_SND_SOC_INTEL_KBL_RT5663_MAX98927_MACH=m -CONFIG_SND_SOC_INTEL_KBL_RT5663_RT5514_MAX98927_MACH=m -CONFIG_SND_SOC_INTEL_KBL_DA7219_MAX98357A_MACH=m -CONFIG_SND_SOC_INTEL_KBL_DA7219_MAX98927_MACH=m -CONFIG_SND_SOC_INTEL_KBL_RT5660_MACH=m -CONFIG_SND_SOC_INTEL_GLK_DA7219_MAX98357A_MACH=m -CONFIG_SND_SOC_INTEL_GLK_RT5682_MAX98357A_MACH=m CONFIG_SND_SOC_INTEL_SKL_HDA_DSP_GENERIC_MACH=m CONFIG_SND_SOC_INTEL_SOF_RT5682_MACH=m -CONFIG_SND_SOC_INTEL_SOF_CS42L42_MACH=m CONFIG_SND_SOC_INTEL_SOF_PCM512x_MACH=m -CONFIG_SND_SOC_INTEL_SOF_ES8336_MACH=m -CONFIG_SND_SOC_INTEL_CML_LP_DA7219_MAX98357A_MACH=m -CONFIG_SND_SOC_INTEL_SOF_CML_RT1011_RT5682_MACH=m -CONFIG_SND_SOC_INTEL_SOF_DA7219_MAX98373_MACH=m -CONFIG_SND_SOC_INTEL_EHL_RT5660_MACH=m -CONFIG_SND_SOC_INTEL_SOUNDWIRE_SOF_MACH=m CONFIG_SND_SOC_MTK_BTCVSD=m CONFIG_SND_SOC_SOF_TOPLEVEL=y CONFIG_SND_SOC_SOF_PCI_DEV=m CONFIG_SND_SOC_SOF_PCI=m CONFIG_SND_SOC_SOF_ACPI=m CONFIG_SND_SOC_SOF_ACPI_DEV=m -# CONFIG_SND_SOC_SOF_DEBUG_PROBES is not set CONFIG_SND_SOC_SOF=m CONFIG_SND_SOC_SOF_PROBE_WORK_QUEUE=y CONFIG_SND_SOC_SOF_INTEL_TOPLEVEL=y @@ -143,7 +114,6 @@ CONFIG_SND_SOC_SOF_HDA_AUDIO_CODEC=y CONFIG_SND_SOC_SOF_HDA_LINK_BASELINE=m CONFIG_SND_SOC_SOF_HDA=m CONFIG_SND_SOC_SOF_INTEL_SOUNDWIRE_LINK_BASELINE=m -CONFIG_SND_SOC_SOF_INTEL_SOUNDWIRE=m CONFIG_SND_SOC_SOF_XTENSA=m CONFIG_THINKPAD_ACPI=m From 719e752a92d1beaffc3445ad64add8a5405e4cc8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20=C4=8Cerm=C3=A1k?= Date: Tue, 23 Jan 2024 17:16:51 +0100 Subject: [PATCH 3/6] Add missing dependencies, adjust tristate values, remove nonsense --- .../arm-uefi/generic-aarch64/kernel.config | 7 ++-- .../board/asus/tinker/kernel.config | 2 +- .../board/hardkernel/kernel-amlogic.config | 1 + .../board/khadas/kernel-vim.config | 1 + .../board/pc/generic-x86-64/kernel.config | 8 +++-- buildroot-external/board/pc/ova/kernel.config | 7 ++-- .../kernel/device-support.config | 34 +++++++------------ buildroot-external/kernel/docker.config | 11 ++---- buildroot-external/kernel/hassos.config | 11 +++--- 9 files changed, 40 insertions(+), 42 deletions(-) diff --git a/buildroot-external/board/arm-uefi/generic-aarch64/kernel.config b/buildroot-external/board/arm-uefi/generic-aarch64/kernel.config index 0e720761154..9658e5b7fa0 100644 --- a/buildroot-external/board/arm-uefi/generic-aarch64/kernel.config +++ b/buildroot-external/board/arm-uefi/generic-aarch64/kernel.config @@ -2,6 +2,10 @@ CONFIG_EFI_STUB=y # CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL is not set +CONFIG_CONNECTOR=y + +CONFIG_VSOCKETS=y + CONFIG_VIRTIO=y CONFIG_VIRTIO_PCI=y CONFIG_VIRTIO_NET=y @@ -13,7 +17,7 @@ CONFIG_VIRTIO_CONSOLE=m CONFIG_VIRTIO_VSOCKETS=m CONFIG_VIRTIO_MMIO=y CONFIG_SCSI_VIRTIO=y -CONFIG_HW_RANDOM_VIRTIO=y +CONFIG_HW_RANDOM_VIRTIO=m CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y CONFIG_VIRTIO_IOMMU=m CONFIG_CRYPTO_ENGINE=m @@ -35,7 +39,6 @@ CONFIG_NVME_HWMON=y CONFIG_DRM_VIRTIO_GPU=m -CONFIG_HYPERVISOR_GUEST=y CONFIG_HYPERV=y CONFIG_HYPERV_UTILS=m CONFIG_HYPERV_BALLOON=m diff --git a/buildroot-external/board/asus/tinker/kernel.config b/buildroot-external/board/asus/tinker/kernel.config index 66ce9b78d4f..a642ae82585 100644 --- a/buildroot-external/board/asus/tinker/kernel.config +++ b/buildroot-external/board/asus/tinker/kernel.config @@ -481,7 +481,7 @@ CONFIG_NETLINK_DIAG=m CONFIG_HSR=m CONFIG_CGROUP_NET_PRIO=y CONFIG_CAN=m -CONFIG_BT=y +CONFIG_BT=m CONFIG_BT_RFCOMM=m CONFIG_BT_RFCOMM_TTY=y CONFIG_BT_BNEP=m diff --git a/buildroot-external/board/hardkernel/kernel-amlogic.config b/buildroot-external/board/hardkernel/kernel-amlogic.config index 32192717d05..6135f694006 100644 --- a/buildroot-external/board/hardkernel/kernel-amlogic.config +++ b/buildroot-external/board/hardkernel/kernel-amlogic.config @@ -385,6 +385,7 @@ CONFIG_TCG_TIS_I2C_INFINEON=y # CONFIG_RANDOM_TRUST_CPU is not set # CONFIG_RANDOM_TRUST_BOOTLOADER is not set CONFIG_I2C_CHARDEV=y +CONFIG_I2C_MUX=y CONFIG_I2C_MUX_PCA954x=y CONFIG_I2C_DESIGNWARE_PLATFORM=y CONFIG_I2C_GPIO=m diff --git a/buildroot-external/board/khadas/kernel-vim.config b/buildroot-external/board/khadas/kernel-vim.config index cd5de759faf..6ba86a8436a 100644 --- a/buildroot-external/board/khadas/kernel-vim.config +++ b/buildroot-external/board/khadas/kernel-vim.config @@ -299,6 +299,7 @@ CONFIG_HW_RANDOM_OPTEE=m CONFIG_TCG_TPM=y CONFIG_TCG_TIS_I2C_INFINEON=y CONFIG_I2C_CHARDEV=y +CONFIG_I2C_MUX=y CONFIG_I2C_MUX_PCA954x=y CONFIG_I2C_DESIGNWARE_PLATFORM=y CONFIG_I2C_GPIO=m diff --git a/buildroot-external/board/pc/generic-x86-64/kernel.config b/buildroot-external/board/pc/generic-x86-64/kernel.config index cf984ac7079..1ddb6e7b51b 100644 --- a/buildroot-external/board/pc/generic-x86-64/kernel.config +++ b/buildroot-external/board/pc/generic-x86-64/kernel.config @@ -28,6 +28,8 @@ CONFIG_DRM_I915_CAPTURE_ERROR=y CONFIG_DRM_I915_COMPRESS_ERROR=y CONFIG_DRM_I915_USERPTR=y +CONFIG_PWM=y + CONFIG_BACKLIGHT_CLASS_DEVICE=y CONFIG_BACKLIGHT_PWM=m @@ -41,6 +43,8 @@ CONFIG_X86_INTEL_LPSS=y CONFIG_MISC_RTSX_PCI=m CONFIG_MISC_RTSX_USB=m +CONFIG_SND_HDA_I915=y + CONFIG_SND_SOC=m CONFIG_SND_SOC_INTEL_SST_TOPLEVEL=y @@ -129,7 +133,6 @@ CONFIG_IT87_WDT=y CONFIG_RAS=y CONFIG_EDAC=y CONFIG_EDAC_DECODE_MCE=m -CONFIG_EDAC_GHES=y CONFIG_EDAC_AMD64=m CONFIG_EDAC_E752X=m CONFIG_EDAC_I82975X=m @@ -151,11 +154,10 @@ CONFIG_I2C=y CONFIG_I2C_BOARDINFO=y CONFIG_I2C_COMPAT=y CONFIG_I2C_CHARDEV=m -CONFIG_I2C_MUX=m +CONFIG_I2C_MUX=y CONFIG_I2C_TINY_USB=m CONFIG_I2C_DLN2=m -CONFIG_SPI_DLN2=m CONFIG_GPIO_DLN2=m CONFIG_MFD_DLN2=m CONFIG_DLN2_ADC=m diff --git a/buildroot-external/board/pc/ova/kernel.config b/buildroot-external/board/pc/ova/kernel.config index 5ed571f914b..cacdb494708 100644 --- a/buildroot-external/board/pc/ova/kernel.config +++ b/buildroot-external/board/pc/ova/kernel.config @@ -14,7 +14,7 @@ CONFIG_DMI_SYSFS=m CONFIG_FW_CFG_SYSFS=m CONFIG_VMXNET3=y -CONFIG_VMWARE_VMCI_VSOCKETS=y +CONFIG_VMWARE_VMCI_VSOCKETS=m CONFIG_VMWARE_VMCI=y CONFIG_VMWARE_BALLOON=y CONFIG_VMWARE_PVSCSI=y @@ -93,7 +93,7 @@ CONFIG_X86_INTEL_LPSS=y CONFIG_DRM=y CONFIG_DRM_FBDEV_EMULATION=y CONFIG_DRM_SIMPLEDRM=y -CONFIG_DRM_XEN=y +CONFIG_DRM_XEN_FRONTEND=y CONFIG_HYPERVISOR_GUEST=y CONFIG_HYPERV=y @@ -114,3 +114,6 @@ CONFIG_MLX5_CORE=m CONFIG_MLX5_CORE_EN=y CONFIG_I6300ESB_WDT=y + +CONFIG_I2C=y +CONFIG_I2C_MUX=y diff --git a/buildroot-external/kernel/device-support.config b/buildroot-external/kernel/device-support.config index 5f1d9c44024..0fd052578bc 100644 --- a/buildroot-external/kernel/device-support.config +++ b/buildroot-external/kernel/device-support.config @@ -1,3 +1,5 @@ +CONFIG_USB_GADGET=y + CONFIG_USBIP_CORE=m CONFIG_USBIP_VHCI_HCD=m CONFIG_USBIP_VHCI_HC_PORTS=8 @@ -9,7 +11,6 @@ CONFIG_USB_SERIAL=y CONFIG_USB_SERIAL_CONSOLE=y CONFIG_USB_SERIAL_GENERIC=y CONFIG_USB_SERIAL_OPTION=m -CONFIG_USB_SERIAL_WWAN=m CONFIG_USB_SERIAL_SIMPLE=m CONFIG_USB_SERIAL_CP210X=m CONFIG_USB_SERIAL_FTDI_SIO=m @@ -36,6 +37,9 @@ CONFIG_USB_NET_SMSC95XX=m CONFIG_MEDIA_CEC_SUPPORT=y +# Required for BT drivers +CONFIG_SERIAL_DEV_BUS=y + # Bluetooth device drivers CONFIG_BT_HCIBTUSB=m CONFIG_BT_HCIBTUSB_BCM=y @@ -56,6 +60,7 @@ CONFIG_BT_MTKUART=m # Multimedia core support CONFIG_MEDIA_SUPPORT=y +CONFIG_MEDIA_SUPPORT_FILTER=n CONFIG_MEDIA_CONTROLLER=y CONFIG_MEDIA_CONTROLLER_DVB=y CONFIG_MEDIA_CAMERA_SUPPORT=y @@ -65,18 +70,13 @@ CONFIG_MEDIA_USB_SUPPORT=y CONFIG_MEDIA_PCI_SUPPORT=y CONFIG_VIDEO_DEV=m CONFIG_VIDEO_V4L2_SUBDEV_API=y -CONFIG_VIDEO_V4L2_TPG=m CONFIG_VIDEO_TVEEPROM=m -CONFIG_VIDEOBUF_GEN=m -CONFIG_VIDEOBUF_DMA_SG=m -CONFIG_VIDEOBUF_VMALLOC=m CONFIG_VIDEOBUF2_CORE=m CONFIG_VIDEOBUF2_V4L2=m CONFIG_VIDEOBUF2_MEMOPS=m -CONFIG_VIDEOBUF2_DMA_CONTIG=m CONFIG_VIDEOBUF2_VMALLOC=m -CONFIG_VIDEOBUF2_DMA_SG=m -CONFIG_VIDEOBUF2_DVB=m +CONFIG_MEDIA_PLATFORM_SUPPORT=y +CONFIG_MEDIA_PLATFORM_DRIVERS=y CONFIG_V4L_PLATFORM_DRIVERS=y # Webcam devices @@ -134,8 +134,6 @@ CONFIG_USB_GSPCA_XIRLINK_CIT=m CONFIG_USB_GSPCA_ZC3XX=m CONFIG_USB_PWC=m CONFIG_USB_PWC_INPUT_EVDEV=y -CONFIG_VIDEO_CPIA2=m -CONFIG_USB_ZR364XX=m CONFIG_USB_S2255=m # Analog capture USB devices @@ -146,19 +144,13 @@ CONFIG_VIDEO_PVRUSB2_DVB=y CONFIG_VIDEO_HDPVR=m CONFIG_VIDEO_STK1160_COMMON=m CONFIG_VIDEO_STK1160=m -CONFIG_VIDEO_SAA7146=m -CONFIG_VIDEO_SAA7146_VV=m # Analog/digital capture USB devices CONFIG_VIDEO_AU0828=m CONFIG_VIDEO_AU0828_V4L2=y CONFIG_VIDEO_CX231XX=m -CONFIG_VIDEO_CX231XX_RC=y CONFIG_VIDEO_CX231XX_ALSA=m CONFIG_VIDEO_CX231XX_DVB=m -CONFIG_VIDEO_TM6000=m -CONFIG_VIDEO_TM6000_ALSA=m -CONFIG_VIDEO_TM6000_DVB=m CONFIG_VIDEO_CX2341X=m # Webcam/capture (analog/digital) USB devices @@ -166,15 +158,15 @@ CONFIG_VIDEO_EM28XX=m CONFIG_VIDEO_EM28XX_V4L2=m CONFIG_VIDEO_EM28XX_ALSA=m CONFIG_VIDEO_EM28XX_DVB=m -CONFIG_VIDEO_EM28XX_RC=m # Audio devices (USB/PCI) CONFIG_SND_USB_AUDIO=m -CONFIG_SND_HDA=y -CONFIG_SND_HDA_CORE=y -CONFIG_SND_HDA_GENERIC=y + +# FIXME: drop following line and extract PCI options +CONFIG_PCI=y +CONFIG_SND_PCI=y +CONFIG_SND_HDA_GENERIC=m CONFIG_SND_HDA_INTEL=m -CONFIG_SND_HDA_I915=y CONFIG_SND_HDA_CODEC_REALTEK=m CONFIG_SND_HDA_CODEC_ANALOG=m CONFIG_SND_HDA_CODEC_VIA=m diff --git a/buildroot-external/kernel/docker.config b/buildroot-external/kernel/docker.config index b5d5982b2e5..3e80bc7f3e7 100644 --- a/buildroot-external/kernel/docker.config +++ b/buildroot-external/kernel/docker.config @@ -6,13 +6,11 @@ CONFIG_NET_SCHED=y CONFIG_CGROUPS=y CONFIG_CPUSETS=y -CONFIG_HUGETLB_PAGE=y CONFIG_BLK_CGROUP=y CONFIG_BLK_DEV_THROTTLING=y CONFIG_CGROUP_SCHED=y CONFIG_CGROUP_PIDS=y CONFIG_CGROUP_FREEZER=y -CONFIG_CGROUP_HUGETLB=y CONFIG_CGROUP_DEVICE=y CONFIG_CGROUP_CPUACCT=y CONFIG_CGROUP_PERF=y @@ -61,9 +59,7 @@ CONFIG_IP_NF_TARGET_MASQUERADE=y CONFIG_IP_NF_TARGET_REDIRECT=y CONFIG_BRIDGE=y CONFIG_BRIDGE_NETFILTER=y -CONFIG_XFRM=y CONFIG_XFRM_USER=m -CONFIG_XFRM_ALGO=m CONFIG_NET_L3_MASTER_DEV=y CONFIG_EXT4_FS=y @@ -73,7 +69,6 @@ CONFIG_OVERLAY_FS=y # CONFIG_OVERLAY_FS_METACOPY is not set # CONFIG_OVERLAY_FS_REDIRECT_DIR is not set -CONFIG_CRYPTO_CCM=m -CONFIG_CRYPTO_GCM=m -CONFIG_CRYPTO_CMAC=m -CONFIG_CRYPTO_ARC4=m +CONFIG_CRYPTO_CCM=y +CONFIG_CRYPTO_GCM=y +CONFIG_CRYPTO_CMAC=y diff --git a/buildroot-external/kernel/hassos.config b/buildroot-external/kernel/hassos.config index 08440811e0a..4ff21015804 100644 --- a/buildroot-external/kernel/hassos.config +++ b/buildroot-external/kernel/hassos.config @@ -1,6 +1,7 @@ CONFIG_LOCALVERSION="-haos" -CONFIG_KERNEL_LZ4=y +# FIXME: for non-aarch64: CONFIG_KERNEL_LZ4=y # CONFIG_KERNEL_GZIP is not set +CONFIG_EXPERT=y # GCC plugins are disabled by linux.mk, disable them here to reduce # linux-diff-config noise @@ -72,7 +73,7 @@ CONFIG_MSDOS_PARTITION=y # CONFIG_LOGO is not set # CONFIG_DEBUG_STACK_USAGE is not set -CONFIG_BT=y +CONFIG_BT=m CONFIG_BT_BREDR=y CONFIG_BT_RFCOMM=m CONFIG_BT_RFCOMM_TTY=y @@ -80,7 +81,6 @@ CONFIG_BT_LE=y CONFIG_BT_BNEP=m CONFIG_BT_BNEP_MC_FILTER=y CONFIG_BT_BNEP_PROTO_FILTER=y -CONFIG_BT_CMTP=m CONFIG_BT_HIDP=m CONFIG_BT_LEDS=y @@ -104,6 +104,7 @@ CONFIG_NF_TABLES_ARP=y CONFIG_NF_TPROXY_IPV6=m CONFIG_NF_TABLES_IPV6=y CONFIG_NF_TABLES_BRIDGE=m +CONFIG_NF_FLOW_TABLE=m CONFIG_NFT_NUMGEN=m CONFIG_NFT_CT=m @@ -142,6 +143,7 @@ CONFIG_NFT_FIB_IPV6=m CONFIG_NFT_BRIDGE_META=m CONFIG_NFT_BRIDGE_REJECT=m +CONFIG_NETFILTER_NETLINK_QUEUE=m CONFIG_NETFILTER_XT_SET=m CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m @@ -178,7 +180,6 @@ CONFIG_WEXT_CORE=y CONFIG_WEXT_PROC=y CONFIG_CFG80211=m CONFIG_CFG80211_WEXT=y -# CONFIG_CFG80211_CRDA_SUPPORT is not set CONFIG_CIFS=m CONFIG_CIFS_XATTR=y @@ -187,7 +188,7 @@ CONFIG_CIFS_DFS_UPCALL=y CONFIG_WIREGUARD=m -CONFIG_HID=m +CONFIG_HID=y CONFIG_HIDRAW=y CONFIG_UHID=y From 4708438067f8ec4db06f8aa9678c6c7ebcd2c235 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20=C4=8Cerm=C3=A1k?= Date: Wed, 24 Jan 2024 10:20:44 +0100 Subject: [PATCH 4/6] Use KERNEL_LZ4 only for non-aarch64 Since aarch64 doesn't use self-extracting kernel: https://patchwork.kernel.org/project/linux-arm-kernel/patch/20190119185540.20526-1-tobias.johannes.klausmann@mni.thm.de/ --- buildroot-external/board/hardkernel/odroid-xu4/kernel.config | 3 +++ buildroot-external/board/pc/generic-x86-64/kernel.config | 3 +++ buildroot-external/board/pc/ova/kernel.config | 3 +++ buildroot-external/board/raspberrypi/kernel-32b.config | 4 ++++ buildroot-external/configs/rpi2_defconfig | 2 +- buildroot-external/configs/rpi3_defconfig | 2 +- buildroot-external/configs/rpi4_defconfig | 2 +- buildroot-external/kernel/hassos.config | 2 -- 8 files changed, 16 insertions(+), 5 deletions(-) create mode 100644 buildroot-external/board/raspberrypi/kernel-32b.config diff --git a/buildroot-external/board/hardkernel/odroid-xu4/kernel.config b/buildroot-external/board/hardkernel/odroid-xu4/kernel.config index d71e8f38e8a..14a5ba6081d 100644 --- a/buildroot-external/board/hardkernel/odroid-xu4/kernel.config +++ b/buildroot-external/board/hardkernel/odroid-xu4/kernel.config @@ -1 +1,4 @@ +CONFIG_KERNEL_LZ4=y +# CONFIG_KERNEL_GZIP is not set + # CONFIG_S3C2410_WATCHDOG is not set diff --git a/buildroot-external/board/pc/generic-x86-64/kernel.config b/buildroot-external/board/pc/generic-x86-64/kernel.config index 1ddb6e7b51b..60c1b16db92 100644 --- a/buildroot-external/board/pc/generic-x86-64/kernel.config +++ b/buildroot-external/board/pc/generic-x86-64/kernel.config @@ -1,3 +1,6 @@ +CONFIG_KERNEL_LZ4=y +# CONFIG_KERNEL_GZIP is not set + CONFIG_EFI_STUB=y CONFIG_CPU_IDLE=y diff --git a/buildroot-external/board/pc/ova/kernel.config b/buildroot-external/board/pc/ova/kernel.config index cacdb494708..b4a41a7746e 100644 --- a/buildroot-external/board/pc/ova/kernel.config +++ b/buildroot-external/board/pc/ova/kernel.config @@ -1,3 +1,6 @@ +CONFIG_KERNEL_LZ4=y +# CONFIG_KERNEL_GZIP is not set + CONFIG_EFI_STUB=y # CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set diff --git a/buildroot-external/board/raspberrypi/kernel-32b.config b/buildroot-external/board/raspberrypi/kernel-32b.config new file mode 100644 index 00000000000..692c14071f1 --- /dev/null +++ b/buildroot-external/board/raspberrypi/kernel-32b.config @@ -0,0 +1,4 @@ +# Config options specific only to 32bit (armv7) builds + +CONFIG_KERNEL_LZ4=y +# CONFIG_KERNEL_GZIP is not set diff --git a/buildroot-external/configs/rpi2_defconfig b/buildroot-external/configs/rpi2_defconfig index afb8831aee2..a53e5359a8b 100644 --- a/buildroot-external/configs/rpi2_defconfig +++ b/buildroot-external/configs/rpi2_defconfig @@ -21,7 +21,7 @@ BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/stable_20231123.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcm2709" -BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support-wireless.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/kernel.config" +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support-wireless.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/kernel.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/kernel-32b.config" BR2_LINUX_KERNEL_LZ4=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm2709-rpi-2-b bcm2710-rpi-2-b" diff --git a/buildroot-external/configs/rpi3_defconfig b/buildroot-external/configs/rpi3_defconfig index a4865304355..b8b4cd85eb6 100644 --- a/buildroot-external/configs/rpi3_defconfig +++ b/buildroot-external/configs/rpi3_defconfig @@ -21,7 +21,7 @@ BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/stable_20231123.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcm2709" -BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support-wireless.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/kernel.config" +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support-wireless.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/kernel.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/kernel-32b.config" BR2_LINUX_KERNEL_LZ4=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm2710-rpi-3-b bcm2710-rpi-3-b-plus bcm2710-rpi-cm3 bcm2710-rpi-zero-2-w" diff --git a/buildroot-external/configs/rpi4_defconfig b/buildroot-external/configs/rpi4_defconfig index b980ac41ce7..e0db1447a3d 100644 --- a/buildroot-external/configs/rpi4_defconfig +++ b/buildroot-external/configs/rpi4_defconfig @@ -21,7 +21,7 @@ BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/stable_20231123.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcm2711" -BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support-wireless.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/kernel.config" +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support-wireless.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/kernel.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/kernel-32b.config" BR2_LINUX_KERNEL_LZ4=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm2711-rpi-4-b bcm2711-rpi-400 bcm2711-rpi-cm4" diff --git a/buildroot-external/kernel/hassos.config b/buildroot-external/kernel/hassos.config index 4ff21015804..45972db5ec0 100644 --- a/buildroot-external/kernel/hassos.config +++ b/buildroot-external/kernel/hassos.config @@ -1,6 +1,4 @@ CONFIG_LOCALVERSION="-haos" -# FIXME: for non-aarch64: CONFIG_KERNEL_LZ4=y -# CONFIG_KERNEL_GZIP is not set CONFIG_EXPERT=y # GCC plugins are disabled by linux.mk, disable them here to reduce From e6f3d6208f2c9ccf207bd829a8d06012f1319a67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20=C4=8Cerm=C3=A1k?= Date: Wed, 24 Jan 2024 11:03:03 +0100 Subject: [PATCH 5/6] Extract PCI options to device-support-pci fragment (renamed from device-support-pcie) RPi 4+ should use this fragment too, since CM4 has PCIe support. --- .../board/pc/generic-x86-64/kernel.config | 1 - buildroot-external/board/pc/ova/kernel.config | 4 +++- .../board/raspberrypi/kernel.config | 3 --- .../configs/generic_x86_64_defconfig | 2 +- buildroot-external/configs/ova_defconfig | 2 +- buildroot-external/configs/rpi4_64_defconfig | 2 +- buildroot-external/configs/rpi4_defconfig | 2 +- buildroot-external/configs/rpi5_64_defconfig | 2 +- buildroot-external/configs/yellow_defconfig | 2 +- ...port-pcie.config => device-support-pci.config} | 15 ++++++++++++++- buildroot-external/kernel/device-support.config | 11 ----------- 11 files changed, 23 insertions(+), 23 deletions(-) rename buildroot-external/kernel/{device-support-pcie.config => device-support-pci.config} (53%) diff --git a/buildroot-external/board/pc/generic-x86-64/kernel.config b/buildroot-external/board/pc/generic-x86-64/kernel.config index 60c1b16db92..72602c5cd3c 100644 --- a/buildroot-external/board/pc/generic-x86-64/kernel.config +++ b/buildroot-external/board/pc/generic-x86-64/kernel.config @@ -14,7 +14,6 @@ CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL=y CONFIG_SCSI_LOWLEVEL=y CONFIG_SCSI_HPSA=y CONFIG_USB_XHCI_HCD=y -CONFIG_BLK_DEV_NVME=y CONFIG_BCMA=m diff --git a/buildroot-external/board/pc/ova/kernel.config b/buildroot-external/board/pc/ova/kernel.config index b4a41a7746e..57a618c3956 100644 --- a/buildroot-external/board/pc/ova/kernel.config +++ b/buildroot-external/board/pc/ova/kernel.config @@ -66,7 +66,6 @@ CONFIG_FUSION_MAX_SGE=128 CONFIG_SCSI_LOWLEVEL=y CONFIG_USB_XHCI_HCD=y -CONFIG_BLK_DEV_NVME=y CONFIG_PARAVIRT=y CONFIG_PARAVIRT_SPINLOCKS=y @@ -116,6 +115,9 @@ CONFIG_I40EVF=m CONFIG_MLX5_CORE=m CONFIG_MLX5_CORE_EN=y +# x86-specific network driver, requires more options from device-support.config fragment +CONFIG_DWMAC_INTEL=m + CONFIG_I6300ESB_WDT=y CONFIG_I2C=y diff --git a/buildroot-external/board/raspberrypi/kernel.config b/buildroot-external/board/raspberrypi/kernel.config index 9462a2da22f..7409b137eaa 100644 --- a/buildroot-external/board/raspberrypi/kernel.config +++ b/buildroot-external/board/raspberrypi/kernel.config @@ -4,9 +4,6 @@ CONFIG_LOCALVERSION="-haos-raspi" -CONFIG_NVME_CORE=y -CONFIG_BLK_DEV_NVME=y - CONFIG_LEDS_TRIGGERS=y CONFIG_LEDS_TRIGGER_DISK=y CONFIG_LEDS_TRIGGER_ACTIVITY=y diff --git a/buildroot-external/configs/generic_x86_64_defconfig b/buildroot-external/configs/generic_x86_64_defconfig index f9dfcdd6214..28b2d600838 100644 --- a/buildroot-external/configs/generic_x86_64_defconfig +++ b/buildroot-external/configs/generic_x86_64_defconfig @@ -19,7 +19,7 @@ BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.74" BR2_LINUX_KERNEL_DEFCONFIG="x86_64" -BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support-wireless.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support-wireless-pci.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support-pcie.config $(BR2_EXTERNAL_HASSOS_PATH)/board/pc/generic-x86-64/kernel.config" +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support-wireless.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support-wireless-pci.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support-pci.config $(BR2_EXTERNAL_HASSOS_PATH)/board/pc/generic-x86-64/kernel.config" BR2_LINUX_KERNEL_LZ4=y BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF=y diff --git a/buildroot-external/configs/ova_defconfig b/buildroot-external/configs/ova_defconfig index 61664b4224f..51429413d15 100644 --- a/buildroot-external/configs/ova_defconfig +++ b/buildroot-external/configs/ova_defconfig @@ -19,7 +19,7 @@ BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.74" BR2_LINUX_KERNEL_DEFCONFIG="x86_64" -BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support-pcie.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support-wireless.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support-wireless-pci.config $(BR2_EXTERNAL_HASSOS_PATH)/board/pc/ova/kernel.config" +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support-pci.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support-wireless.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support-wireless-pci.config $(BR2_EXTERNAL_HASSOS_PATH)/board/pc/ova/kernel.config" BR2_LINUX_KERNEL_LZ4=y BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF=y diff --git a/buildroot-external/configs/rpi4_64_defconfig b/buildroot-external/configs/rpi4_64_defconfig index d431c71fa5e..4db6add9f21 100644 --- a/buildroot-external/configs/rpi4_64_defconfig +++ b/buildroot-external/configs/rpi4_64_defconfig @@ -20,7 +20,7 @@ BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/stable_20231123.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcm2711" -BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support-wireless.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/kernel.config" +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support-pci.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support-wireless.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/kernel.config" BR2_LINUX_KERNEL_LZ4=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2711-rpi-4-b broadcom/bcm2711-rpi-400 broadcom/bcm2711-rpi-cm4" diff --git a/buildroot-external/configs/rpi4_defconfig b/buildroot-external/configs/rpi4_defconfig index e0db1447a3d..b6207334222 100644 --- a/buildroot-external/configs/rpi4_defconfig +++ b/buildroot-external/configs/rpi4_defconfig @@ -21,7 +21,7 @@ BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/stable_20231123.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcm2711" -BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support-wireless.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/kernel.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/kernel-32b.config" +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support-pci.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support-wireless.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/kernel.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/kernel-32b.config" BR2_LINUX_KERNEL_LZ4=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm2711-rpi-4-b bcm2711-rpi-400 bcm2711-rpi-cm4" diff --git a/buildroot-external/configs/rpi5_64_defconfig b/buildroot-external/configs/rpi5_64_defconfig index dff9ecdd632..c1ff7abd3e9 100644 --- a/buildroot-external/configs/rpi5_64_defconfig +++ b/buildroot-external/configs/rpi5_64_defconfig @@ -20,7 +20,7 @@ BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/stable_20231123.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcm2712" -BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support-wireless.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/kernel.config" +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support-pci.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support-wireless.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/kernel.config" BR2_LINUX_KERNEL_LZ4=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2712-rpi-5-b" diff --git a/buildroot-external/configs/yellow_defconfig b/buildroot-external/configs/yellow_defconfig index 494c18ee57a..1078a10fc20 100644 --- a/buildroot-external/configs/yellow_defconfig +++ b/buildroot-external/configs/yellow_defconfig @@ -20,7 +20,7 @@ BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/stable_20231123.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcm2711" -BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support-wireless.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/kernel.config" +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support-pci.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support-wireless.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/kernel.config" BR2_LINUX_KERNEL_LZ4=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2711-rpi-cm4-ha-yellow" diff --git a/buildroot-external/kernel/device-support-pcie.config b/buildroot-external/kernel/device-support-pci.config similarity index 53% rename from buildroot-external/kernel/device-support-pcie.config rename to buildroot-external/kernel/device-support-pci.config index 576d24a4afc..b574437ede2 100644 --- a/buildroot-external/kernel/device-support-pcie.config +++ b/buildroot-external/kernel/device-support-pci.config @@ -20,6 +20,19 @@ CONFIG_BROADCOM_PHY=m CONFIG_NET_VENDOR_STMICRO=y CONFIG_STMMAC_ETH=m -CONFIG_DWMAC_INTEL=m CONFIG_STMMAC_PCI=m +CONFIG_MEDIA_PCI_SUPPORT=y + +# PCI sound drivers +CONFIG_SND_PCI=y +CONFIG_SND_HDA_GENERIC=m +CONFIG_SND_HDA_INTEL=m +CONFIG_SND_HDA_CODEC_REALTEK=m +CONFIG_SND_HDA_CODEC_ANALOG=m +CONFIG_SND_HDA_CODEC_VIA=m +CONFIG_SND_HDA_CODEC_HDMI=m + +# NVMe SSD support +CONFIG_NVME_CORE=y +CONFIG_BLK_DEV_NVME=y diff --git a/buildroot-external/kernel/device-support.config b/buildroot-external/kernel/device-support.config index 0fd052578bc..d7ece43833d 100644 --- a/buildroot-external/kernel/device-support.config +++ b/buildroot-external/kernel/device-support.config @@ -67,7 +67,6 @@ CONFIG_MEDIA_CAMERA_SUPPORT=y CONFIG_MEDIA_ANALOG_TV_SUPPORT=y CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y CONFIG_MEDIA_USB_SUPPORT=y -CONFIG_MEDIA_PCI_SUPPORT=y CONFIG_VIDEO_DEV=m CONFIG_VIDEO_V4L2_SUBDEV_API=y CONFIG_VIDEO_TVEEPROM=m @@ -162,16 +161,6 @@ CONFIG_VIDEO_EM28XX_DVB=m # Audio devices (USB/PCI) CONFIG_SND_USB_AUDIO=m -# FIXME: drop following line and extract PCI options -CONFIG_PCI=y -CONFIG_SND_PCI=y -CONFIG_SND_HDA_GENERIC=m -CONFIG_SND_HDA_INTEL=m -CONFIG_SND_HDA_CODEC_REALTEK=m -CONFIG_SND_HDA_CODEC_ANALOG=m -CONFIG_SND_HDA_CODEC_VIA=m -CONFIG_SND_HDA_CODEC_HDMI=m - # GPIO support CONFIG_GPIOLIB=y CONFIG_GPIO_SYSFS=y From 25a4080e81b376566179e2d30fd8190e519b29db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20=C4=8Cerm=C3=A1k?= Date: Wed, 24 Jan 2024 11:54:30 +0100 Subject: [PATCH 6/6] Rename RPi's kernel-32b fragment to kernel-armv7 --- .../raspberrypi/{kernel-32b.config => kernel-armv7.config} | 0 buildroot-external/configs/rpi2_defconfig | 2 +- buildroot-external/configs/rpi3_defconfig | 2 +- buildroot-external/configs/rpi4_defconfig | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) rename buildroot-external/board/raspberrypi/{kernel-32b.config => kernel-armv7.config} (100%) diff --git a/buildroot-external/board/raspberrypi/kernel-32b.config b/buildroot-external/board/raspberrypi/kernel-armv7.config similarity index 100% rename from buildroot-external/board/raspberrypi/kernel-32b.config rename to buildroot-external/board/raspberrypi/kernel-armv7.config diff --git a/buildroot-external/configs/rpi2_defconfig b/buildroot-external/configs/rpi2_defconfig index a53e5359a8b..03932262192 100644 --- a/buildroot-external/configs/rpi2_defconfig +++ b/buildroot-external/configs/rpi2_defconfig @@ -21,7 +21,7 @@ BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/stable_20231123.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcm2709" -BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support-wireless.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/kernel.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/kernel-32b.config" +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support-wireless.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/kernel.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/kernel-armv7.config" BR2_LINUX_KERNEL_LZ4=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm2709-rpi-2-b bcm2710-rpi-2-b" diff --git a/buildroot-external/configs/rpi3_defconfig b/buildroot-external/configs/rpi3_defconfig index b8b4cd85eb6..02e48aaeafc 100644 --- a/buildroot-external/configs/rpi3_defconfig +++ b/buildroot-external/configs/rpi3_defconfig @@ -21,7 +21,7 @@ BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/stable_20231123.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcm2709" -BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support-wireless.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/kernel.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/kernel-32b.config" +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support-wireless.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/kernel.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/kernel-armv7.config" BR2_LINUX_KERNEL_LZ4=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm2710-rpi-3-b bcm2710-rpi-3-b-plus bcm2710-rpi-cm3 bcm2710-rpi-zero-2-w" diff --git a/buildroot-external/configs/rpi4_defconfig b/buildroot-external/configs/rpi4_defconfig index b6207334222..321311f32c4 100644 --- a/buildroot-external/configs/rpi4_defconfig +++ b/buildroot-external/configs/rpi4_defconfig @@ -21,7 +21,7 @@ BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/stable_20231123.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcm2711" -BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support-pci.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support-wireless.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/kernel.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/kernel-32b.config" +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support-pci.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support-wireless.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/kernel.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/kernel-armv7.config" BR2_LINUX_KERNEL_LZ4=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm2711-rpi-4-b bcm2711-rpi-400 bcm2711-rpi-cm4"