From mboxrd@z Thu Jan  1 00:00:00 1970
From: Stephen Warren <swarren@wwwdotorg.org>
Date: Mon, 25 Jan 2016 17:42:04 -0700
Subject: [U-Boot] [PATCH 2/7] fdt: Build a U-Boot binary without device
	tree
In-Reply-To: <56A6903E.3030700@wwwdotorg.org>
References: <1453753831-26411-1-git-send-email-sjg@chromium.org>
 <1453753831-26411-3-git-send-email-sjg@chromium.org>
 <56A6903E.3030700@wwwdotorg.org>
Message-ID: <56A6C0DC.6080406@wwwdotorg.org>
List-Id: <u-boot.lists.denx.de>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
To: u-boot@lists.denx.de

On 01/25/2016 02:14 PM, Stephen Warren wrote:
> On 01/25/2016 01:30 PM, Simon Glass wrote:
>> At present u-boot.bin holds the plain U-Boot binary without the device
>> tree.
>> This is somewhat annoying since you need either u-boot.bin or
>> u-boot-dtb.bin
>> depending on whether device tree is used.
>>
>> Adjust the build such that u-boot.bin includes a device tree, and the
>> plain binary is in u-boot-nodtb.bin. For now u-boot-dtb.bin remains the
>> same.
>>
>> This should be acceptable since:
>>
>> - without OF_CONTROL, u-boot.bin still does not include a device tree
>> - with OF_CONTROL, u-boot-dtb.bin does not change
>>
>> The main impact is build systems which are set up to use u-boot.bin as
>> the output file and then add a device tree. These will have to change
>> to use
>> u-boot-nodtb.bin instead.
>
> That's probably going to annoy somebody. Have you put thought into how
> such a build system could auto-detect which file it should use in order
> to automatically adjust to the different file naming conventions of
> different U-Boot versions or branches? If not, this change will burden
> the operator of any tool or automated system with manually handling the
> difference by branching their own code or processes:-(
>
>> Adjust tegra rules so it continues to produce the correct files.
>
> I don't see anything Tegra-related in this patch. Perhaps patch 1/7 was
> included here in a previous version and the commit description not updated?
>
> Anyway, I think this patch doesn't affect me or Tegra's flashing tools.
> For reference, the tool currently uses the following files:
>
> u-boot
> spl/u-boot-spl
> u-boot-nodtb-tegra.bin
> u-boot.dtb
> u-boot-dtb-tegra.bin

Oh, that list is for ARMv7 targets. For ARMv8 targets, we currently use 
the following instead:

u-boot*
u-boot.bin
u-boot.dtb
u-boot-dtb.bin

Preferably those files won't change either, or if they do, there's a 
trivial way of determining which set of files is present (e.g. perhaps 
we pick up u-boot-nodtb.bin and u-boot-dtb.bin if those two files exist, 
else we pick up u-boot.bin and u-boot-dtb.bin?)