58 lines
2 KiB
Diff
58 lines
2 KiB
Diff
|
From dc0e8734ea1c679738377d13bdd9bf3fa644e6b3 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Yangbo Lu <yangbo.lu@nxp.com>
|
||
|
|
Date: Fri, 22 Sep 2017 11:36:43 +0800
|
||
|
|
Subject: [PATCH 2/3] armv8: ls1046ardb: add LEDE boot support in environment
|
||
|
|
|
||
|
|
Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
|
||
|
|
---
|
||
|
|
include/configs/ls1046a_common.h | 15 ++++++++++++++-
|
||
|
|
include/configs/ls1046ardb.h | 6 ++++++
|
||
|
|
2 files changed, 20 insertions(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/include/configs/ls1046a_common.h b/include/configs/ls1046a_common.h
|
||
|
|
index 4fc2f94..53bd41b 100644
|
||
|
|
--- a/include/configs/ls1046a_common.h
|
||
|
|
+++ b/include/configs/ls1046a_common.h
|
||
|
|
@@ -276,7 +276,20 @@
|
||
|
|
"sd_bootcmd=echo Trying load from SD ..;" \
|
||
|
|
"mmcinfo; mmc read $load_addr " \
|
||
|
|
"$kernel_addr_sd $kernel_size_sd ;" \
|
||
|
|
- " bootm $load_addr#$board\0"
|
||
|
|
+ " bootm $load_addr#$board\0" \
|
||
|
|
+ "lede_setenv=setenv loadaddr 82000000 && " \
|
||
|
|
+ "setenv fdtaddr 8f000000 && " \
|
||
|
|
+ "setenv bootargs root=/dev/mtdblock9 " \
|
||
|
|
+ "rootfstype=ext4 noinitrd " \
|
||
|
|
+ "earlycon=uart8250,mmio,0x21c0500 console=ttyS0,115200 " \
|
||
|
|
+ "mtdparts=1550000.quadspi:1M(rcw),2M(u-boot),1M(u-boot-env)," \
|
||
|
|
+ "5M(reserved-1),256k(fman),5888k(reserved-2),1M(dtb)," \
|
||
|
|
+ "16M(kernel),22M(ext4rfs),10M(user)\0" \
|
||
|
|
+ "lede_run=sf probe 0:0 && " \
|
||
|
|
+ "sf read $fdtaddr f00000 100000 && " \
|
||
|
|
+ "sf read $loadaddr 1000000 1000000 && " \
|
||
|
|
+ "bootm $loadaddr - $fdtaddr\0" \
|
||
|
|
+ "lede_boot=run lede_setenv;run lede_run\0"
|
||
|
|
|
||
|
|
|
||
|
|
#define CONFIG_BOOTARGS "console=ttyS0,115200 root=/dev/ram0 " \
|
||
|
|
diff --git a/include/configs/ls1046ardb.h b/include/configs/ls1046ardb.h
|
||
|
|
index f8c15a6..c3b50b1 100644
|
||
|
|
--- a/include/configs/ls1046ardb.h
|
||
|
|
+++ b/include/configs/ls1046ardb.h
|
||
|
|
@@ -251,6 +251,12 @@
|
||
|
|
"env exists secureboot && esbc_halt;"
|
||
|
|
#endif
|
||
|
|
|
||
|
|
+#undef CONFIG_BOOTCOMMAND
|
||
|
|
+#define CONFIG_BOOTCOMMAND "run lede_boot"
|
||
|
|
+
|
||
|
|
+#undef CONFIG_BOOTDELAY
|
||
|
|
+#define CONFIG_BOOTDELAY 3
|
||
|
|
+
|
||
|
|
#define MTDPARTS_DEFAULT "mtdparts=1550000.quadspi:1m(rcw)," \
|
||
|
|
"15m(u-boot),48m(kernel.itb);" \
|
||
|
|
"7e800000.flash:16m(nand_uboot)," \
|
||
|
|
--
|
||
|
|
2.7.4
|
||
|
|
|