layerscape: support ubifs rootfs in u-boot env
[openwrt/openwrt.git] / package / boot / uboot-layerscape / patches / 0002-armv8-ls1046ardb-add-LEDE-boot-support-in-environmen.patch
1 From a5293c6d5fdacf84fdd4772d0532aa5478df4d3c Mon Sep 17 00:00:00 2001
2 From: Yangbo Lu <yangbo.lu@nxp.com>
3 Date: Fri, 19 Jan 2018 10:18:47 +0800
4 Subject: [PATCH] armv8: ls1046ardb: add LEDE boot support in environment
5
6 Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
7 ---
8 include/configs/ls1046a_common.h | 15 ++++++++++++++-
9 include/configs/ls1046ardb.h | 6 ++++++
10 2 files changed, 20 insertions(+), 1 deletions(-)
11
12 diff --git a/include/configs/ls1046a_common.h b/include/configs/ls1046a_common.h
13 index d163347..d26147b 100644
14 --- a/include/configs/ls1046a_common.h
15 +++ b/include/configs/ls1046a_common.h
16 @@ -281,7 +281,20 @@
17 "env exists secureboot && mmc read $kernelheader_addr_r " \
18 "$kernelhdr_addr_sd $kernelhdr_size_sd " \
19 " && esbc_validate ${kernelheader_addr_r};" \
20 - " bootm $load_addr#$board\0"
21 + " bootm $load_addr#$board\0" \
22 + "lede_setenv=setenv loadaddr 82000000 && " \
23 + "setenv fdtaddr 8f000000 && " \
24 + "setenv bootargs ubi.mtd=9 root=ubi0:rootfs rw " \
25 + "rootfstype=ubifs noinitrd " \
26 + "earlycon=uart8250,mmio,0x21c0500 console=ttyS0,115200 " \
27 + "mtdparts=1550000.quadspi:1M(rcw),2M(u-boot),1M(u-boot-env)," \
28 + "5M(reserved-1),256k(fman),5888k(reserved-2),1M(dtb)," \
29 + "16M(kernel),32M(ubifs)\0" \
30 + "lede_run=sf probe 0:0 && " \
31 + "sf read $fdtaddr f00000 100000 && " \
32 + "sf read $loadaddr 1000000 1000000 && " \
33 + "bootm $loadaddr - $fdtaddr\0" \
34 + "lede_boot=run lede_setenv;run lede_run\0"
35
36
37 #define CONFIG_BOOTARGS "console=ttyS0,115200 root=/dev/ram0 " \
38 diff --git a/include/configs/ls1046ardb.h b/include/configs/ls1046ardb.h
39 index 4475ac7..15e7858 100644
40 --- a/include/configs/ls1046ardb.h
41 +++ b/include/configs/ls1046ardb.h
42 @@ -253,6 +253,12 @@
43 "env exists secureboot && esbc_halt;"
44 #endif
45
46 +#undef CONFIG_BOOTCOMMAND
47 +#define CONFIG_BOOTCOMMAND "run lede_boot"
48 +
49 +#undef CONFIG_BOOTDELAY
50 +#define CONFIG_BOOTDELAY 3
51 +
52 #define MTDPARTS_DEFAULT "mtdparts=1550000.quadspi:1m(rcw)," \
53 "15m(u-boot),48m(kernel.itb);" \
54 "7e800000.flash:16m(nand_uboot)," \
55 --
56 1.7.1
57