summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2018-05-02 09:17:25 +0200
committerLinus Walleij <linus.walleij@linaro.org>2018-05-12 13:27:17 +0200
commit0d6ce772187fd74454a5b45aed0a7a7b24d6ea3c (patch)
tree00eecd3c809f7d2440976d9e8e31fe93576e6f50
parenta10d862e585e06aacc3a03e230fdf8faf6b1caf0 (diff)
downloadlinux-stable-0d6ce772187fd74454a5b45aed0a7a7b24d6ea3c.tar.gz
linux-stable-0d6ce772187fd74454a5b45aed0a7a7b24d6ea3c.tar.bz2
linux-stable-0d6ce772187fd74454a5b45aed0a7a7b24d6ea3c.zip
ARM: dts: Fix bootargs for Gemini D-Link devices
These machines need to be booted from very specific harddisk partitions (as the D-Link DNS-313 boots specifically from partition 4). Add the proper bootargs so that everything works smoothly. Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
-rw-r--r--arch/arm/boot/dts/gemini-dlink-dir-685.dts3
-rw-r--r--arch/arm/boot/dts/gemini-dlink-dns-313.dts1
2 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/gemini-dlink-dir-685.dts b/arch/arm/boot/dts/gemini-dlink-dir-685.dts
index 8d3478cf840b..89ce0d1916e3 100644
--- a/arch/arm/boot/dts/gemini-dlink-dir-685.dts
+++ b/arch/arm/boot/dts/gemini-dlink-dir-685.dts
@@ -20,7 +20,8 @@
};
chosen {
- stdout-path = "uart0:115200n8";
+ bootargs = "console=ttyS0,19200n8 root=/dev/sda1 rw rootwait";
+ stdout-path = "uart0:19200n8";
};
gpio_keys {
diff --git a/arch/arm/boot/dts/gemini-dlink-dns-313.dts b/arch/arm/boot/dts/gemini-dlink-dns-313.dts
index d865cde8ed12..da78a0aa389a 100644
--- a/arch/arm/boot/dts/gemini-dlink-dns-313.dts
+++ b/arch/arm/boot/dts/gemini-dlink-dns-313.dts
@@ -26,6 +26,7 @@
};
chosen {
+ bootargs = "console=ttyS0,19200n8 root=/dev/sda4 rw rootwait";
stdout-path = "uart0:19200n8";
};