From 2ce7bf41d22dd5bc5cdf1f8f65b00fe9d403a9a0 Mon Sep 17 00:00:00 2001
From: Stefano Stabellini
Date: Mon, 21 Oct 2019 16:08:37 -0700
Subject: Pass the config file to uboot-script-gen as parameter

Signed-off-by: Stefano Stabellini <stefano.stabellini@xilinx.com>
---
 scripts/imagebuilder_sd   | 2 +-
 scripts/imagebuilder_tftp | 2 +-
 scripts/uboot-script-gen  | 7 ++++++-
 3 files changed, 8 insertions(+), 3 deletions(-)

(limited to 'scripts')

diff --git a/scripts/imagebuilder_sd b/scripts/imagebuilder_sd
index 0afa75f..fc00716 100644
--- a/scripts/imagebuilder_sd
+++ b/scripts/imagebuilder_sd
@@ -6,5 +6,5 @@ cp config /tmp/output
 cp -r /home/builder/output/* /tmp/output
 cd /tmp/output
 export LOAD_CMD="load scsi 0:1"
-bash /uboot-script-gen
+bash /uboot-script-gen ./config
 bash /disk_image
diff --git a/scripts/imagebuilder_tftp b/scripts/imagebuilder_tftp
index c03633d..1dd2e3f 100644
--- a/scripts/imagebuilder_tftp
+++ b/scripts/imagebuilder_tftp
@@ -6,4 +6,4 @@ cp config /tmp/output
 cp -r /home/builder/output/* /tmp/output
 cd /tmp/output
 export LOAD_CMD="tftpb"
-bash /uboot-script-gen
+bash /uboot-script-gen ./config
diff --git a/scripts/uboot-script-gen b/scripts/uboot-script-gen
index e72f73e..7f217b6 100644
--- a/scripts/uboot-script-gen
+++ b/scripts/uboot-script-gen
@@ -130,7 +130,12 @@ function check_compressed_file_type()
     check_file_type $filename "$type"
 }
 
-. config
+if test $# -lt 1
+then
+    echo "Usage $0 <config_file>"
+    exit 1
+fi
+source $1
 
 rm -f $UBOOT_SOURCE $UBOOT_SCRIPT
 memaddr=$(( $MEMORY_START + $offset ))
-- 
cgit v1.2.3