From mboxrd@z Thu Jan 1 00:00:00 1970 From: Nikolaus Schulz Subject: [cbootimage-configs PATCH 2/2] Use fixed variables to track image dependencies Date: Mon, 3 Apr 2017 14:25:11 +0200 Message-ID: <20170403122511.7194-2-nikolaus.schulz@avionic-design.de> References: <8bf27012-af67-3faf-206b-ebd5cd76b276@wwwdotorg.org> <20170403122511.7194-1-nikolaus.schulz@avionic-design.de> Mime-Version: 1.0 Content-Type: text/plain Return-path: In-Reply-To: <20170403122511.7194-1-nikolaus.schulz-RM9K5IK7kjKj5M59NBduVrNAH6kLmebB@public.gmane.org> Sender: linux-tegra-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org To: linux-tegra-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, Stephen Warren Cc: Nikolaus Schulz List-Id: linux-tegra@vger.kernel.org The dependencies of the emmc image on the bootloader image and the bct file are specified in the .img.cfg config files. Currently a shell script extracts these dependencies from the .img.cfg file. But the bct filename is already known to make, so only the bootloader image filename is left as a somewhat dynamic component. Add the bootloader filename to the per-soc Makefiles, and kill the dynamic dependency file. Signed-off-by: Nikolaus Schulz --- build/gen-image-deps.sh | 42 ----------------------------- build/post.mk | 6 +---- tegra114/nvidia/dalmore/Makefile | 3 +++ tegra124/nvidia/jetson-tk1/Makefile | 3 +++ tegra124/nvidia/norrin/Makefile | 3 +++ tegra124/nvidia/venice2/Makefile | 3 +++ tegra20/avionic-design/medcom-wide/Makefile | 3 +++ tegra20/avionic-design/plutux/Makefile | 3 +++ tegra20/avionic-design/tec/Makefile | 3 +++ tegra20/compulab/trimslice/Makefile | 3 +++ tegra20/nvidia/harmony/Makefile | 3 +++ tegra20/nvidia/seaboard/Makefile | 3 +++ tegra20/nvidia/ventana/Makefile | 3 +++ tegra20/nvidia/whistler/Makefile | 3 +++ tegra20/toradex/colibri_t20/Makefile | 3 +++ tegra210/nvidia/p2371-2180/Makefile | 3 +++ tegra30/avionic-design/tec-ng/Makefile | 3 +++ tegra30/nvidia/beaver/Makefile | 3 +++ tegra30/nvidia/cardhu/Makefile | 3 +++ tegra30/toradex/colibri_t30/Makefile | 3 +++ 20 files changed, 55 insertions(+), 47 deletions(-) delete mode 100755 build/gen-image-deps.sh diff --git a/build/gen-image-deps.sh b/build/gen-image-deps.sh deleted file mode 100755 index fcbb64c..0000000 --- a/build/gen-image-deps.sh +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/bash - -# Copyright (c) 2013, NVIDIA CORPORATION. All rights reserved. -# -# This software is provided 'as-is', without any express or implied -# warranty. In no event will the authors be held liable for any damages -# arising from the use of this software. -# -# Permission is granted to anyone to use this software for any purpose, -# including commercial applications, and to alter it and redistribute it -# freely, subject to the following restrictions: -# -# 1. The origin of this software must not be misrepresented; you must not -# claim that you wrote the original software. If you use this software -# in a product, an acknowledgment in the product documentation would be -# appreciated but is not required. -# 2. Altered source versions must be plainly marked as such, and must not be -# misrepresented as being the original software. -# 3. This notice may not be removed or altered from any source distribution. - -deps_script=$0 -img_cfg_file=$1 -img_file=$2 -dep_file=$3 - -rm -f ${dep_file} -bct=`grep -i bctfile ${img_cfg_file} | sed -e 's/^.*=\s*//' -e s'/[,;].*$//'` -bootloader=`grep -i bootloader ${img_cfg_file} | sed -e 's/^.*=\s*//' -e s'/[,;].*$//'` - -cat > ${dep_file} <