layerscape: update u-boot to LSDK1712

[openwrt/staging/wigyori.git] / package / boot / uboot-layerscape / patches / 0002-armv8-ls1046ardb-add-LEDE-boot-support-in-environmen.patch

diff --git a/package/boot/uboot-layerscape/patches/0002-armv8-ls1046ardb-add-LEDE-boot-support-in-environmen.patch b/package/boot/uboot-layerscape/patches/0002-armv8-ls1046ardb-add-LEDE-boot-support-in-environmen.patch
index 418f6287fba1254e7b85c45d945896674f794ff7..d7a6e053e51274525140353f2f1b03cd40377ec4 100644 (file)
--- a/package/boot/uboot-layerscape/patches/0002-armv8-ls1046ardb-add-LEDE-boot-support-in-environmen.patch
+++ b/package/boot/uboot-layerscape/patches/0002-armv8-ls1046ardb-add-LEDE-boot-support-in-environmen.patch
@@ -1,22 +1,22 @@
-From dc0e8734ea1c679738377d13bdd9bf3fa644e6b3 Mon Sep 17 00:00:00 2001
+From a5293c6d5fdacf84fdd4772d0532aa5478df4d3c 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
+Date: Fri, 19 Jan 2018 10:18:47 +0800
+Subject: [PATCH] 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(-)
+ 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 4fc2f94..53bd41b 100644
+index d163347..d26147b 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 ;"     \
+@@ -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 && " \
@@ -36,10 +36,10 @@ index 4fc2f94..53bd41b 100644
  
  #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
+index 4475ac7..15e7858 100644
 --- a/include/configs/ls1046ardb.h
 +++ b/include/configs/ls1046ardb.h
-@@ -251,6 +251,12 @@
+@@ -253,6 +253,12 @@
                           "env exists secureboot && esbc_halt;"
  #endif
  
@@ -53,5 +53,5 @@ index f8c15a6..c3b50b1 100644
                        "15m(u-boot),48m(kernel.itb);" \
                        "7e800000.flash:16m(nand_uboot)," \
 -- 
-2.7.4
+1.7.1