domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ipq806x: onhub: Enable fstools_partname_fallback_scan

Browse Source 
When fstools is unable to parse our root=<...> arg correctly, it can
fall back to scanning all block devices for a 'rootfs_data' partition.
This fallback was deemed wrong (or at least, a breaking/incompatible
change) for some targets, so we're forced to opt back into it with
fstools_partname_fallback_scan=1.

Without this, OnHub devices will use a rootfs-appended loop device for
rootfs_data instead of the intended 3rd partition.

While I'm at it, just move all the boot args into the 'cros-vboot'
build rule, instead of using the custom bootargs-append. All cros-vboot
subtargets here are using the same rootwait (to support both eMMC and
USB boot) and root/partition args.

Signed-off-by: Brian Norris <computersforpeace@gmail.com>
[ drop unrelated comments in commit description ]
Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
This commit is contained in:
Brian Norris
2023-01-24 22:42:07 -08:00
committed by Christian Marangi
parent 3ef655375a
commit b5193291bd
3 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
target/linux/ipq806x/files-5.15/arch/arm/boot/dts/qcom-ipq8064-asus-onhub.dts
View File

@@ -11,10 +11,6 @@
/ { / {
model = "ASUS OnHub"; model = "ASUS OnHub";
compatible = "asus,onhub", "google,arkham", "qcom,ipq8064"; compatible = "asus,onhub", "google,arkham", "qcom,ipq8064";
chosen {
bootargs-append = " rootwait";
};
}; };
&qcom_pinmux { &qcom_pinmux {

4
target/linux/ipq806x/files-5.15/arch/arm/boot/dts/qcom-ipq8064-tplink-onhub.dts
View File

@@ -11,10 +11,6 @@
/ { / {
model = "TP-Link OnHub"; model = "TP-Link OnHub";
compatible = "tplink,onhub", "google,whirlwind-sp5", "qcom,ipq8064"; compatible = "tplink,onhub", "google,whirlwind-sp5", "qcom,ipq8064";
chosen {
bootargs-append = " rootwait";
};
}; };
&qcom_pinmux { &qcom_pinmux {

4
target/linux/ipq806x/image/chromium.mk
View File

@@ -20,7 +20,9 @@ endef
# (PARTNROFF=1) partition as their rootfs. # (PARTNROFF=1) partition as their rootfs.
define Build/cros-vboot define Build/cros-vboot
$(STAGING_DIR_HOST)/bin/cros-vbutil \ $(STAGING_DIR_HOST)/bin/cros-vbutil \
-k $@ -c "root=PARTUUID=%U/PARTNROFF=1" -o $@.new -k $@ \
-c "root=PARTUUID=%U/PARTNROFF=1 rootwait fstools_partname_fallback_scan=1" \
-o $@.new
@mv $@.new $@ @mv $@.new $@
endef endef