Skip to content
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.

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

Rework MACHINE_FEATURES #764

Merged
merged 2 commits into from
Feb 24, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions conf/machine/include/qcom-common.inc
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
SOC_FAMILY:prepend = "qcom:"
require conf/machine/include/soc-family.inc

# Set a default set of MACHINE_FEATURES, indivudual MACHINEs can append it
MACHINE_FEATURES = "alsa bluetooth usbgadget ushbost wifi"

XSERVER_OPENGL ?= " \
xf86-video-modesetting \
xserver-xorg-extension-glx \
Expand Down
2 changes: 1 addition & 1 deletion conf/machine/qcm6490-idp.conf
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

require conf/machine/include/qcom-qcs6490.inc

MACHINE_FEATURES = "efi usbhost usbgadget alsa wifi bluetooth"
MACHINE_FEATURES += "efi pci"

KERNEL_DEVICETREE ?= " \
qcom/qcm6490-idp.dtb \
Expand Down
2 changes: 1 addition & 1 deletion conf/machine/qcom-armv7a.conf
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ require conf/machine/include/arm/armv7a/tune-cortexa15.inc
# Android boot image settings
QCOM_BOOTIMG_PAGE_SIZE = "2048"

MACHINE_FEATURES = "alsa screen alsa bluetooth ext2 ext3 opengl usb usbhost usbgadget"
MACHINE_FEATURES += "screen ext2 ext3 opengl usb"

KERNEL_IMAGETYPE ?= "zImage"
KERNEL_DEVICETREE ?= " \
Expand Down
2 changes: 1 addition & 1 deletion conf/machine/qcom-armv8a.conf
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
require conf/machine/include/qcom-common.inc
require conf/machine/include/arm/arch-armv8a.inc

MACHINE_FEATURES = "usbhost usbgadget alsa screen wifi bluetooth ext2"
MACHINE_FEATURES += "screen ext2"

# UFS partitions in 820/845/RB5 setup with 4096 logical sector size
EXTRA_IMAGECMD:ext4 += " -b 4096 "
Expand Down
2 changes: 1 addition & 1 deletion conf/machine/qcs6490-rb3gen2-core-kit.conf
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

require conf/machine/include/qcom-qcs6490.inc

MACHINE_FEATURES = "efi usbhost usbgadget alsa wifi bluetooth"
MACHINE_FEATURES += "efi pci"

KERNEL_DEVICETREE ?= " \
qcom/qcs6490-rb3gen2.dtb \
Expand Down
2 changes: 1 addition & 1 deletion conf/machine/qcs9100-ride-sx.conf
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

require conf/machine/include/qcom-qcs9100.inc

MACHINE_FEATURES = "efi usbhost usbgadget alsa wifi"
MACHINE_FEATURES += "efi pci"

KERNEL_DEVICETREE ?= " \
qcom/qcs9100-ride.dtb \
Expand Down
Loading