From 86dfcdf0a4e7a85a6aa2eee2923fd062830e1acb Mon Sep 17 00:00:00 2001
From: Klaus Goger <klaus.goger@theobroma-systems.com>
Date: Tue, 27 Jun 2017 16:08:27 +0200
Subject: boot: make kernel and initrd filename configurable

like the devicetree the kernel and optional initrd should
be configureable via defaultenv and userenv
---
 boot-script/boot/boot.cmd                   | 6 ++++--
 boot-script/boot/puma_rk3399/defaultEnv.txt | 1 +
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/boot-script/boot/boot.cmd b/boot-script/boot/boot.cmd
index 48a1eea..ab0fd32 100644
--- a/boot-script/boot/boot.cmd
+++ b/boot-script/boot/boot.cmd
@@ -4,6 +4,8 @@
 # fallback default values
 load_addr=0x01000000
 fdtfile=dtb
+kernelfile=Image
+initrdfile=uInitrd
 rootdevice=/dev/mmcblk0p1
 rootdevice_flags=rw
 loglevel=7
@@ -57,9 +59,9 @@ for overlay_file in ${overlays}; do
 	fi
 done
 
-load ${devtype} ${devnum} ${kernel_addr_r} ${load_path}/Image	
+load ${devtype} ${devnum} ${kernel_addr_r} ${load_path}/${kernelfile}
 
-if load ${devtype} ${devnum} ${load_addr} ${load_path}/uInitrd; then
+if load ${devtype} ${devnum} ${load_addr} ${load_path}/${initrdfile}; then
 	booti ${kernel_addr_r} ${ramdisk_addr_r} ${fdt_addr_r}
 else
 	echo "Start Kernel without initrd"
diff --git a/boot-script/boot/puma_rk3399/defaultEnv.txt b/boot-script/boot/puma_rk3399/defaultEnv.txt
index fa13ba1..436e6b4 100644
--- a/boot-script/boot/puma_rk3399/defaultEnv.txt
+++ b/boot-script/boot/puma_rk3399/defaultEnv.txt
@@ -1,4 +1,5 @@
 load_addr=0x01000000
+kernelfile=Image
 fdtfile=rk3399-puma.dtb
 overlays=
 rootdevice_flags=rw
-- 
cgit v1.2.3