aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas Dechesne <ndechesne@users.noreply.github.com>2021-04-02 10:57:10 +0200
committerGitHub <noreply@github.com>2021-04-02 10:57:10 +0200
commitd7b4e9f86fc1fca4ad663cf5a37462760f9d38f0 (patch)
tree5b254b0f825859bd0ee9ed1cf8ae52971775816a
parente540194f4c0b959e895e4c090ebeeee9dd0e0985 (diff)
parentc88a593015c815f23bdeb05959c5197d204a528e (diff)
downloadmeta-qcom-d7b4e9f86fc1fca4ad663cf5a37462760f9d38f0.tar.gz
meta-qcom-d7b4e9f86fc1fca4ad663cf5a37462760f9d38f0.tar.bz2
meta-qcom-d7b4e9f86fc1fca4ad663cf5a37462760f9d38f0.zip
Merge pull request #289 from lumag/rb5-rootfs
qrb5165-rb5: use new rootfs partition
-rw-r--r--conf/machine/qcom-armv8a.conf2
-rw-r--r--conf/machine/qrb5165-rb5.conf5
2 files changed, 2 insertions, 5 deletions
diff --git a/conf/machine/qcom-armv8a.conf b/conf/machine/qcom-armv8a.conf
index c171c27..58c9719 100644
--- a/conf/machine/qcom-armv8a.conf
+++ b/conf/machine/qcom-armv8a.conf
@@ -14,8 +14,6 @@ KERNEL_DEVICETREE ?= "qcom/apq8016-sbc.dtb qcom/apq8096-db820c.dtb qcom/sdm845-d
QCOM_BOOTIMG_PAGE_SIZE[apq8016-sbc] = "2048"
QCOM_BOOTIMG_ROOTFS = "/dev/sda1"
QCOM_BOOTIMG_ROOTFS[apq8016-sbc] = "/dev/mmcblk0p14"
-QCOM_BOOTIMG_ROOTFS[qrb5165-rb5] = "PARTLABEL=userdata"
-QCOM_BOOTIMG_ROOTFS[sm8250-rb5-dvt] = "PARTLABEL=userdata"
SD_QCOM_BOOTIMG_ROOTFS[apq8016-sbc] = "/dev/mmcblk1p7"
KERNEL_CMDLINE_EXTRA[sdm845-db845c] = "clk_ignore_unused pd_ignore_unused"
diff --git a/conf/machine/qrb5165-rb5.conf b/conf/machine/qrb5165-rb5.conf
index a15690a..f261075 100644
--- a/conf/machine/qrb5165-rb5.conf
+++ b/conf/machine/qrb5165-rb5.conf
@@ -22,9 +22,8 @@ MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += " \
"
# linux-firmware-qcom-adreno-a650
-# 'userdata' is sda8 with older firmware/GPT and sda6 with newer firmware.
-# Allow kernel to resolve it on it's own. Wipe it and use for our build.
-QCOM_BOOTIMG_ROOTFS ?= "PARTLABEL=userdata"
+# /dev/sda1 is 'rootfs' partition after installing the latest bootloader package from linaro
+QCOM_BOOTIMG_ROOTFS ?= "/dev/sda1"
# UFS partitions setup with 4096 logical sector size
EXTRA_IMAGECMD_ext4 += " -b 4096 "