ce93b05bf1
Since the D-Link devices boot from hard disk we need to add the following changes to Gemini: - Supply a bootarg in the device tree so we can boot from the right partition (/dev/sda4 on DNS-313) - Disable forced command line in config so the kernel picks up the right bootargs from the device tree - Enable EXT4 in the config as this is used for rootfs else we get nowhere, we cannot load this as a module because, well, it is supposed to be loaded from the root partition (chicken and egg problem). - Enable jbd2 and mbcache (needed by ext4) Also clean out the premature attempts to dynamically modify the command line in the Image makefile: we should pass this with the device tree bootargs instead, it works much better. Signed-off-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Roman Yeryomin <roman@advem.lv>
45 lines
1.4 KiB
Diff
45 lines
1.4 KiB
Diff
From 5813b729eb9fe91fcf895a5c2f30bf34fbd46379 Mon Sep 17 00:00:00 2001
|
|
From: Linus Walleij <linus.walleij@linaro.org>
|
|
Date: Wed, 2 May 2018 09:17:25 +0200
|
|
Subject: [PATCH] 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>
|
|
---
|
|
arch/arm/boot/dts/gemini-dlink-dir-685.dts | 3 ++-
|
|
arch/arm/boot/dts/gemini-dlink-dns-313.dts | 1 +
|
|
2 files changed, 3 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/arch/arm/boot/dts/gemini-dlink-dir-685.dts b/arch/arm/boot/dts/gemini-dlink-dir-685.dts
|
|
index a39914dece98..840f4a32f37c 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 4904f1251671..685719a0b8c0 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";
|
|
};
|
|
|
|
--
|
|
2.14.3
|
|
|