[openwrt/openwrt] mvebu: image: add check for fdt_add_r and kernel_addr_r variables

[LEDE Commits]

adrian pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/9f0d8826800eef8018720b76b0f4e56fb59b7448

commit 9f0d8826800eef8018720b76b0f4e56fb59b7448
Author: Vladimir Vid <vladimir.vid at sartura.hr>
AuthorDate: Mon Sep 14 17:24:24 2020 +0200

    mvebu: image: add check for fdt_add_r and kernel_addr_r variables
    
    fdt_addr and kernel_addr variables are getting obsolete in the mainline
    u-boot in favor of fdt_addr_r and kernel_addr_r.
    
    By checking if the new variables exist, we can make sure that devices with newer
    version of u-boot will work while not breaking support for the existing ones.
    
    Signed-off-by: Vladimir Vid <vladimir.vid at sartura.hr>
    Acked-by: Tomasz Maciej Nowak <tomek_n at o2.pl>
---
 target/linux/mvebu/image/generic-arm64.bootscript | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/target/linux/mvebu/image/generic-arm64.bootscript b/target/linux/mvebu/image/generic-arm64.bootscript
index bb78948253..c7688fd73f 100644
--- a/target/linux/mvebu/image/generic-arm64.bootscript
+++ b/target/linux/mvebu/image/generic-arm64.bootscript
@@ -10,6 +10,14 @@ elif mmc dev 1; then
 	setenv mmcdev 1
 fi
 
+if test -n "${fdt_addr_r}"; then
+       setenv fdt_addr ${fdt_addr_r}
+fi
+
+if test -n "${kernel_addr_r}"; then
+       setenv kernel_addr ${kernel_addr_r}
+fi
+
 load mmc ${mmcdev}:1 ${fdt_addr} @DTB at .dtb
 load mmc ${mmcdev}:1 ${kernel_addr} Image