Skip to content

Include qcom.config in KBUILD_CONFIG_EXTRA of linux-qcom-next recipe #1250

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 3 commits into
base: master
Choose a base branch
from
Draft

Include qcom.config in KBUILD_CONFIG_EXTRA of linux-qcom-next recipe #1250

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ea7c9a3
linux-qcom-next: fix missing space when appending prune.config
vkraleti Nov 25, 2025
0898059
linux-qcom-next: include qcom.config in KBUILD_CONFIG_EXTRA
vkraleti Nov 25, 2025
793298f
linux-qcom-next/configs: drop redundant configs already in qcom.config
vkraleti Nov 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions recipes-kernel/linux/linux-qcom-next/configs/qcom.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,8 @@
# for UFS enumeration
CONFIG_PHY_QCOM_QMP=y
CONFIG_SCSI_UFS_QCOM=y
CONFIG_SM_TCSRCC_8750=y
CONFIG_CLK_KAANAPALI_TCSRCC=y

# DMA BUF userspace heaps, for e.g. IMSDK
CONFIG_DMABUF_HEAPS=y
CONFIG_DMABUF_HEAPS_SYSTEM=y
CONFIG_DMABUF_HEAPS_CMA=y

# Net schedulers, aka queue disciplines
CONFIG_NET_SCH_DUALPI2=m
CONFIG_NET_SCH_HTB=m
Expand Down
3 changes: 2 additions & 1 deletion recipes-kernel/linux/linux-qcom-next_git.bb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,8 @@ KBUILD_DEFCONFIG ?= "defconfig"
KBUILD_DEFCONFIG:qcom-armv7a = "qcom_defconfig"

KBUILD_CONFIG_EXTRA = "${@bb.utils.contains('DISTRO_FEATURES', 'hardened', '${S}/kernel/configs/hardening.config', '', d)}"
KBUILD_CONFIG_EXTRA:append:aarch64 = "${S}/arch/arm64/configs/prune.config"
KBUILD_CONFIG_EXTRA:append:aarch64 = " ${S}/arch/arm64/configs/prune.config"
KBUILD_CONFIG_EXTRA:append:aarch64 = " ${S}/arch/arm64/configs/qcom.config"
Copy link
Contributor

@ricardosalveti ricardosalveti Nov 25, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is provided by the kernel tree, but we also have a qcom.cfg fragment (and now qcom.config), not an issue necessarily but might cause confusion later on (what is in tree and what is provided by the recipe).

Copy link
Contributor Author

@vkraleti vkraleti Nov 26, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The in-tree qcom.config fragment and the recipe-provided qcom.cfg fragment are already in separate lists, so users can identify the source. However, similar naming still creates confusion. I’ve created GH issue #1252 to track this.


do_configure:prepend() {
# Use a copy of the 'defconfig' from the actual repo to merge fragments
Expand Down
Loading