Skip to content

Commit d73b04e

Browse files
author
Viswanath Kraleti
committed
conf/machine: Build add-on DTBs with linux-qcom-staging kernel
The linux-qcom-staging kernel can produce an additional set of DTB files called 'addons DTB' files with downstream additions. Build them along with upstream DTB files to allow users to use downstream features. As these features are accepted upstream, parts of the addon DTB will be merged into the main DTB files. Eventually, all of these addon DTBs will be dropped. Signed-off-by: Viswanath Kraleti <[email protected]>
1 parent 347df1d commit d73b04e

File tree

3 files changed

+35
-0
lines changed

3 files changed

+35
-0
lines changed

conf/machine/qcm6490-idp.conf

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,14 @@ MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += " \
1414
packagegroup-rb3gen2-firmware \
1515
packagegroup-rb3gen2-hexagon-dsp-binaries \
1616
"
17+
18+
#
19+
# Configuration variables for linux-qcom-staging kernel
20+
#
21+
22+
# These addon DTs are not yet upstreamed. Build them only in staging kernel
23+
# to avoid conflicts with other kernel providers like linux-yocto-dev.
24+
KERNEL_DEVICETREE:append:pn-linux-qcom-staging = " \
25+
qcom/qcm6490-addons-idp.dtb \
26+
qcom/qcm6490-addons-idp-amoled.dtb \
27+
"

conf/machine/qcs6490-rb3gen2-core-kit.conf

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,3 +21,14 @@ MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += " \
2121
QCOM_CDT_FILE = "cdt_core_kit"
2222
QCOM_BOOT_FILES_SUBDIR = "qcm6490"
2323
QCOM_PARTITION_CONF = "qcom-partition-conf-qcs6490-rb3gen2"
24+
25+
#
26+
# Configuration variables for linux-qcom-staging kernel
27+
#
28+
29+
# These addon DTs are not yet upstreamed. Build them only in staging kernel
30+
# to avoid conflicts with other kernel providers like linux-yocto-dev.
31+
KERNEL_DEVICETREE:append:pn-linux-qcom-staging = " \
32+
qcom/qcs6490-addons-rb3gen2.dtb \
33+
qcom/qcs6490-addons-rb3gen2-vision-mezz.dtb \
34+
"

conf/machine/qcs9100-ride-sx.conf

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,3 +23,16 @@ MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += " \
2323
QCOM_CDT_FILE = "cdt_ride_sx"
2424
QCOM_BOOT_FILES_SUBDIR = "qcs9100"
2525
QCOM_PARTITION_CONF = "qcom-partition-conf-qcs9100-ride-sx"
26+
27+
#
28+
# Configuration variables for linux-qcom-staging kernel
29+
#
30+
31+
# These addon DTs are not yet upstreamed. Build them only in staging kernel
32+
# to avoid conflicts with other kernel providers like linux-yocto-dev.
33+
KERNEL_DEVICETREE:append:pn-linux-qcom-staging = " \
34+
qcom/qcs9100-addons-ride.dtb \
35+
qcom/qcs9100-addons-ride-r3.dtb \
36+
qcom/sa8775p-addons-ride.dtb \
37+
qcom/sa8775p-addons-ride-r3.dtb \
38+
"

0 commit comments

Comments
 (0)