blob: 71eaaaa4e1eeb4dcbe5591e9d8780b7a0ca8ba3a [file] [log] [blame]
Jan Kundráta1d6f312017-10-19 11:59:30 +02001From 9b6df01de8944114d5563a434df143be1ed2dad1 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Jan=20Kundr=C3=A1t?= <jan.kundrat@cesnet.cz>
3Date: Thu, 19 Oct 2017 11:45:23 +0200
4Subject: [PATCH 5/5] clearfog: Move all extra bootargs to a special variable
5
6I have two reasons for this, and both of them center around making it
7possible to perform changes to the boot process.
8
9It is quite dangerous to attempt to re-flash the entire card, including
10the bootloader, on the fly. Moving as much bits as possible to the
11environment makes it a bit easier to introduce important changes such
12as, for example, volatile rootfs, later on.
13
14The second one is for testing -- it's much easier to just rewrite one
15reasonable variable. Changes no longer require struggling with overly
16long lines (bootcmd), at least.
17---
18 include/configs/clearfog.h | 3 ++-
19 1 file changed, 2 insertions(+), 1 deletion(-)
20
21diff --git a/include/configs/clearfog.h b/include/configs/clearfog.h
22index d251278885..04faf5c49f 100644
23--- a/include/configs/clearfog.h
24+++ b/include/configs/clearfog.h
25@@ -178,6 +178,7 @@
26 RELOCATION_LIMITS_ENV_SETTINGS \
27 LOAD_ADDRESS_ENV_SETTINGS \
28 "console=ttyS0,115200\0" \
29+ "extra_bootargs=panic=10 oops=panic\0" \
30 "bootcmd=test -n \"${BOOT_A_LEFT}\" || setenv BOOT_A_LEFT 3;" \
31 "test -n \"${BOOT_B_LEFT}\" || setenv BOOT_B_LEFT 3;" \
32 "setenv rauc_part;" \
33@@ -209,7 +210,7 @@
34 " saveenv;" \
35 " reset;" \
36 "fi;" \
37- "setenv bootargs root=/dev/mmcblk0p${rauc_part} rauc.slot=${rauc_slot} czechlight=${czechlight} panic=10 oops=panic;" \
38+ "setenv bootargs root=/dev/mmcblk0p${rauc_part} rauc.slot=${rauc_slot} czechlight=${czechlight} ${extra_bootargs};" \
39 "load mmc 0:${rauc_part} ${fdt_addr_r} /boot/armada-388-clearfog-base.dtb || reset;" \
40 "load mmc 0:${rauc_part} ${kernel_addr_r} /boot/zImage || reset;" \
41 "bootz ${kernel_addr_r} - ${fdt_addr_r} || reset\0"
42--
432.14.1
44