aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDmitry Baryshkov <dmitry.baryshkov@linaro.org>2020-11-29 12:12:44 +0300
committerDmitry Baryshkov <dmitry.baryshkov@linaro.org>2021-04-09 16:40:37 +0300
commita62ba4eb2da01041e0e456e36cd4fe6312910265 (patch)
treec9bd36d295df68d87188350bb149b65fd44ae43a
parentc2758dcb23b48ccb50b1dc08987e20b92ebb25ee (diff)
downloadmeta-qcom-a62ba4eb2da01041e0e456e36cd4fe6312910265.tar.gz
meta-qcom-a62ba4eb2da01041e0e456e36cd4fe6312910265.tar.bz2
meta-qcom-a62ba4eb2da01041e0e456e36cd4fe6312910265.zip
linux-qcom-bootimg: move machine-specific KERNEL_CMDLINE to conf file
Move machine-specific KERNEL_CMDLINE append to machine (db845c) config file. Include file should not contain machine-specific settings. Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> (cherry picked from commit 962c9c04f3a30885c5868cd73a8f026bd2b8f5da)
-rw-r--r--conf/machine/dragonboard-845c.conf1
-rw-r--r--conf/machine/qrb5165-rb5.conf1
-rw-r--r--recipes-kernel/linux/linux-qcom-bootimg.inc4
3 files changed, 3 insertions, 3 deletions
diff --git a/conf/machine/dragonboard-845c.conf b/conf/machine/dragonboard-845c.conf
index 8391ef6..e5f0755 100644
--- a/conf/machine/dragonboard-845c.conf
+++ b/conf/machine/dragonboard-845c.conf
@@ -8,6 +8,7 @@ MACHINE_FEATURES = "usbhost usbgadget alsa screen wifi bluetooth ext2"
KERNEL_IMAGETYPE ?= "Image.gz"
KERNEL_DEVICETREE ?= "qcom/sdm845-db845c.dtb"
+KERNEL_CMDLINE_EXTRA ?= "clk_ignore_unused pd_ignore_unused"
SERIAL_CONSOLE ?= "115200 ttyMSM0"
diff --git a/conf/machine/qrb5165-rb5.conf b/conf/machine/qrb5165-rb5.conf
index b50b33d..f261075 100644
--- a/conf/machine/qrb5165-rb5.conf
+++ b/conf/machine/qrb5165-rb5.conf
@@ -8,6 +8,7 @@ MACHINE_FEATURES = "usbhost usbgadget alsa screen wifi bluetooth ext2"
KERNEL_IMAGETYPE ?= "Image.gz"
KERNEL_DEVICETREE ?= "qcom/qrb5165-rb5.dtb qcom/sm8250-rb5-dvt.dtb"
+KERNEL_CMDLINE_EXTRA ?= "pcie_pme=nomsi"
SERIAL_CONSOLE ?= "115200 ttyMSM0"
diff --git a/recipes-kernel/linux/linux-qcom-bootimg.inc b/recipes-kernel/linux/linux-qcom-bootimg.inc
index cfa0cf5..e860c25 100644
--- a/recipes-kernel/linux/linux-qcom-bootimg.inc
+++ b/recipes-kernel/linux/linux-qcom-bootimg.inc
@@ -5,8 +5,6 @@ SD_QCOM_BOOTIMG_ROOTFS ?= "undefined"
# set output file names
KERNEL_CMDLINE = "root=${1} rw rootwait console=${ttydev},${baudrate}n8"
-KERNEL_CMDLINE_append_dragonboard-845c = " clk_ignore_unused pd_ignore_unused"
-KERNEL_CMDLINE_append_qrb5165-rb5 = " pcie_pme=nomsi"
# param ${1} partition where rootfs is located
# param ${2} output boot image file name
@@ -17,7 +15,7 @@ priv_make_image() {
--output ${DEPLOYDIR}/${2}.img \
--pagesize ${QCOM_BOOTIMG_PAGE_SIZE} \
--base ${QCOM_BOOTIMG_KERNEL_BASE} \
- --cmdline "${KERNEL_CMDLINE}"
+ --cmdline "${KERNEL_CMDLINE} ${KERNEL_CMDLINE_EXTRA}"
}
do_deploy_append() {