From a5293c6d5fdacf84fdd4772d0532aa5478df4d3c Mon Sep 17 00:00:00 2001 From: Yangbo Lu Date: Fri, 19 Jan 2018 10:18:47 +0800 Subject: [PATCH] armv8: ls1046ardb: add LEDE boot support in environment Signed-off-by: Yangbo Lu --- include/configs/ls1046a_common.h | 15 ++++++++++++++- include/configs/ls1046ardb.h | 6 ++++++ 2 files changed, 20 insertions(+), 1 deletions(-) diff --git a/include/configs/ls1046a_common.h b/include/configs/ls1046a_common.h index d163347..d26147b 100644 --- a/include/configs/ls1046a_common.h +++ b/include/configs/ls1046a_common.h @@ -281,7 +281,20 @@ "env exists secureboot && mmc read $kernelheader_addr_r " \ "$kernelhdr_addr_sd $kernelhdr_size_sd " \ " && esbc_validate ${kernelheader_addr_r};" \ - " bootm $load_addr#$board\0" + " bootm $load_addr#$board\0" \ + "lede_setenv=setenv loadaddr 82000000 && " \ + "setenv fdtaddr 8f000000 && " \ + "setenv bootargs ubi.mtd=9 root=ubi0:rootfs rw " \ + "rootfstype=ubifs 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),32M(ubifs)\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 4475ac7..15e7858 100644 --- a/include/configs/ls1046ardb.h +++ b/include/configs/ls1046ardb.h @@ -253,6 +253,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)," \ -- 1.7.1