public inbox for u-boot@lists.denx.de
 help / color / mirror / Atom feed
From: Stephen Warren <swarren@wwwdotorg.org>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH v3 4/7] tegra: Always build a boot image with the same filename
Date: Mon, 1 Feb 2016 15:52:50 -0700	[thread overview]
Message-ID: <56AFE1C2.2050607@wwwdotorg.org> (raw)
In-Reply-To: <1454289055-17054-5-git-send-email-sjg@chromium.org>

On 01/31/2016 06:10 PM, Simon Glass wrote:
> Adjust the Makefile to build u-boot-tegra.bin which contains a device tree
> if OF_SEPARATE is enabled, and does not if not. This mirrors U-Boot's new
> approach of using u-boot.bin to handle both cases.

> diff --git a/Makefile b/Makefile

>   # enable combined SPL/u-boot/dtb rules for tegra
>   ifeq ($(CONFIG_TEGRA)$(CONFIG_SPL),yy)
> -ALL-y += u-boot-nodtb-tegra.bin
> +ALL-y += u-boot-tegra.bin u-boot-nodtb-tegra.bin
>   ALL-$(CONFIG_OF_SEPARATE) += u-boot-dtb-tegra.bin
>   endif

This seems different to the ALL-y entries for u-boot.bin and its 
-dtb/-nodtb variants. I believe that in that case, only u-boot.bin is in 
ALL-Y. No doubt my next comment is related.

> @@ -1080,9 +1080,12 @@ OBJCOPYFLAGS_u-boot-nodtb-tegra.bin = -O binary --pad-to=$(CONFIG_SYS_TEXT_BASE)
>   u-boot-nodtb-tegra.bin: spl/u-boot-spl u-boot-nodtb.bin FORCE
>   	$(call if_changed,pad_cat)
>
> -OBJCOPYFLAGS_u-boot-dtb-tegra.bin = -O binary --pad-to=$(CONFIG_SYS_TEXT_BASE)
> -u-boot-dtb-tegra.bin: spl/u-boot-spl u-boot-dtb.bin FORCE
> +OBJCOPYFLAGS_u-boot-tegra.bin = -O binary --pad-to=$(CONFIG_SYS_TEXT_BASE)
> +u-boot-tegra.bin: spl/u-boot-spl u-boot-dtb.bin FORCE
>   	$(call if_changed,pad_cat)
> +
> +u-boot-dtb-tegra.bin: u-boot-tegra.bin FORCE
> +	$(call if_changed,copy)
>   endif

That looks different to how the main u-boot.bin is handled too. There, 
u-boot.bin is a copy of u-boot-nodtb.bin or u-boot-dtb.bin depending on 
whether a DTB is in use. Here, the copy operation is backwards; 
u-boot-dt-tegra.bin gets copied from u-boot-tegra.bin (which actually 
might not contain a DTB if OF_SEPARATE isn't enabled).

Shouldn't the two sets of rules use identical schemes for the dependency 
chain so it's easy to compare the rules?

  reply	other threads:[~2016-02-01 22:52 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-02-01  1:10 [U-Boot] [PATCH v3 0/7] fdt: Replace u-boot-dtb.bin with u-boot.bin Simon Glass
2016-02-01  1:10 ` [U-Boot] [PATCH v3 1/7] tegra: Clarify generation of -nodtb file with OF_CONTROL Simon Glass
2016-02-02  1:57   ` [U-Boot] [U-Boot, v3, " Tom Rini
2016-02-02  1:58   ` Tom Rini
2016-02-01  1:10 ` [U-Boot] [PATCH v3 2/7] fdt: Build a U-Boot binary without device tree Simon Glass
2016-02-02  1:58   ` [U-Boot] [U-Boot, v3, " Tom Rini
2016-02-01  1:10 ` [U-Boot] [PATCH v3 3/7] fdt: Build an SPL " Simon Glass
2016-02-02  1:58   ` [U-Boot] [U-Boot, v3, " Tom Rini
2016-02-01  1:10 ` [U-Boot] [PATCH v3 4/7] tegra: Always build a boot image with the same filename Simon Glass
2016-02-01 22:52   ` Stephen Warren [this message]
2016-02-02  1:58   ` [U-Boot] [U-Boot, v3, " Tom Rini
2016-02-01  1:10 ` [U-Boot] [PATCH v3 5/7] socfpga: Simplify Makefile filenames Simon Glass
2016-02-02  1:58   ` [U-Boot] [U-Boot,v3,5/7] " Tom Rini
2016-02-01  1:10 ` [U-Boot] [PATCH v3 6/7] Makefile: Make u-boot.img the same as u-boot-dtb.img Simon Glass
2016-02-01 22:54   ` Stephen Warren
2016-02-02  1:59     ` Tom Rini
2016-02-02  1:58   ` [U-Boot] [U-Boot, v3, " Tom Rini
2016-02-01  1:10 ` [U-Boot] [PATCH v3 7/7] Makefile: Drop unnecessary -dtb suffixes Simon Glass
2016-02-02  1:58   ` [U-Boot] [U-Boot, v3, " Tom Rini
2016-02-01  7:31 ` [U-Boot] [PATCH v3 0/7] fdt: Replace u-boot-dtb.bin with u-boot.bin Albert ARIBAUD
2016-02-02  0:05   ` Simon Glass
2016-02-01 23:00 ` Stephen Warren
2016-02-02  1:59   ` Tom Rini

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=56AFE1C2.2050607@wwwdotorg.org \
    --to=swarren@wwwdotorg.org \
    --cc=u-boot@lists.denx.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox