From b583aaf5aa57173100b6569ffc60c34405b7dc38 Mon Sep 17 00:00:00 2001 From: Stefan Lippers-Hollmann Date: Sun, 29 Oct 2017 02:55:27 +0100 Subject: [PATCH] ip806x: nbg6817: don't hardcode the rootfs location by using append-rootblock instead This changes the cmdline from: Kernel command line: root=/dev/mmcblk0p5 rootfstype=squashfs,ext4 rootwait noinitrd Bootloader command line (ignored): board=NBG6817 root=/dev/mmcblk0p5 rootwait zld_ver=2.04 console=ttyHSL1,115200n8 mtdparts=m25p80:0xC0000(SBL)ro,0x40000(TZ)ro,0x40000(RPM)ro,0x80000(u-boot)ro,0x10000(env)ro,0x10000(ART)ro,0x10000(dualflag),0x210000(reserved) to Kernel command line: rootfstype=squashfs,ext4 rootwait noinitrd root=/dev/mmcblk0p5 Bootloader command line (ignored): board=NBG6817 root=/dev/mmcblk0p5 rootwait zld_ver=2.04 console=ttyHSL1,115200n8 mtdparts=m25p80:0xC0000(SBL)ro,0x40000(TZ)ro,0x40000(RPM)ro,0x80000(u-boot)ro,0x10000(env)ro,0x10000(ART)ro,0x10000(dualflag),0x210000(reserved) As a consequence booting from the alternative dual-boot partition set (root=/dev/mmcblk0p8) becomes possible. Signed-off-by: Stefan Lippers-Hollmann --- .../files-4.9/arch/arm/boot/dts/qcom-ipq8065-nbg6817.dts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/target/linux/ipq806x/files-4.9/arch/arm/boot/dts/qcom-ipq8065-nbg6817.dts b/target/linux/ipq806x/files-4.9/arch/arm/boot/dts/qcom-ipq8065-nbg6817.dts index 930f2ad075..15165b9b72 100644 --- a/target/linux/ipq806x/files-4.9/arch/arm/boot/dts/qcom-ipq8065-nbg6817.dts +++ b/target/linux/ipq806x/files-4.9/arch/arm/boot/dts/qcom-ipq8065-nbg6817.dts @@ -33,8 +33,9 @@ }; chosen { - bootargs = "root=/dev/mmcblk0p5 rootfstype=squashfs,ext4 rootwait noinitrd"; + bootargs = "rootfstype=squashfs,ext4 rootwait noinitrd"; linux,stdout-path = "serial0:115200n8"; + append-rootblock = "root=/dev/mmcblk0p"; }; soc {