From: Marek Vasut <marex@denx.de>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH 5/7] socfpga: Simplify Makefile filenames
Date: Mon, 25 Jan 2016 21:43:05 +0100 [thread overview]
Message-ID: <201601252143.05679.marex@denx.de> (raw)
In-Reply-To: <1453753831-26411-6-git-send-email-sjg@chromium.org>
On Monday, January 25, 2016 at 09:30:29 PM, Simon Glass wrote:
> We don't need the -dtb suffix anymore, so drop it.
>
> Signed-off-by: Simon Glass <sjg@chromium.org>
> ---
You should also fix the MCV:
$ git grep u-boot-with-spl-dtb.sfp
...
include/configs/socfpga_mcvevk.h: "update_filename=u-boot-with-spl-dtb.sfp\0"
I have to admit, I am not a big fan of this renaming, since it's just
introducing naming chaos between versions.
> Makefile | 10 +++++-----
> scripts/Makefile.spl | 6 +++---
> 2 files changed, 8 insertions(+), 8 deletions(-)
>
> diff --git a/Makefile b/Makefile
> index fa55c71..66e96cb 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -1015,10 +1015,10 @@ u-boot.spr: spl/u-boot-spl.img u-boot.img FORCE
>
> ifneq ($(CONFIG_ARCH_SOCFPGA),)
> quiet_cmd_socboot = SOCBOOT $@
> -cmd_socboot = cat spl/u-boot-spl-dtb.sfp spl/u-boot-spl-dtb.sfp \
> - spl/u-boot-spl-dtb.sfp spl/u-boot-spl-dtb.sfp \
> - u-boot-dtb.img > $@ || rm -f $@
> -u-boot-with-spl-dtb.sfp: spl/u-boot-spl-dtb.sfp u-boot-dtb.img FORCE
> +cmd_socboot = cat spl/u-boot-spl.sfp spl/u-boot-spl.sfp \
> + spl/u-boot-spl.sfp spl/u-boot-spl.sfp \
> + u-boot.img > $@ || rm -f $@
> +u-boot-with-spl.sfp: spl/u-boot-spl.sfp u-boot.img FORCE
> $(call if_changed,socboot)
> endif
>
> @@ -1323,7 +1323,7 @@ spl/u-boot-spl: tools prepare $(if
> $(CONFIG_OF_SEPARATE),dts/dt.dtb) spl/sunxi-spl.bin: spl/u-boot-spl
> @:
>
> -spl/u-boot-spl-dtb.sfp: spl/u-boot-spl
> +spl/u-boot-spl.sfp: spl/u-boot-spl
> @:
>
> spl/boot.bin: spl/u-boot-spl
> diff --git a/scripts/Makefile.spl b/scripts/Makefile.spl
> index 7bf471a..aa7091c 100644
> --- a/scripts/Makefile.spl
> +++ b/scripts/Makefile.spl
> @@ -146,7 +146,7 @@ ALL-y += $(obj)/$(BOARD)-spl.bin
> endif
>
> ifdef CONFIG_ARCH_SOCFPGA
> -ALL-y += $(obj)/$(SPL_BIN)-dtb.sfp
> +ALL-y += $(obj)/$(SPL_BIN).sfp
> endif
>
> ifdef CONFIG_SUNXI
> @@ -230,8 +230,8 @@ LDFLAGS_$(SPL_BIN) += -Ttext $(CONFIG_SPL_TEXT_BASE)
> endif
>
> ifdef CONFIG_ARCH_SOCFPGA
> -MKIMAGEFLAGS_$(SPL_BIN)-dtb.sfp = -T socfpgaimage
> -$(obj)/$(SPL_BIN)-dtb.sfp: $(obj)/$(SPL_BIN)-dtb.bin FORCE
> +MKIMAGEFLAGS_$(SPL_BIN).sfp = -T socfpgaimage
> +$(obj)/$(SPL_BIN).sfp: $(obj)/$(SPL_BIN).bin FORCE
> $(call if_changed,mkimage)
> endif
Best regards,
Marek Vasut
next prev parent reply other threads:[~2016-01-25 20:43 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-25 20:30 [U-Boot] [PATCH 0/7] fdt: Replace u-boot-dtb.bin with u-boot.bin Simon Glass
2016-01-25 20:30 ` [U-Boot] [PATCH 1/7] tegra: Drop generation of -nodtb file with OF_CONTROL Simon Glass
2016-01-25 21:08 ` Stephen Warren
2016-01-25 21:18 ` Simon Glass
2016-01-25 21:26 ` Stephen Warren
2016-01-25 22:01 ` Simon Glass
2016-01-25 20:30 ` [U-Boot] [PATCH 2/7] fdt: Build a U-Boot binary without device tree Simon Glass
2016-01-25 21:14 ` Stephen Warren
2016-01-25 21:18 ` Simon Glass
2016-01-26 0:42 ` Stephen Warren
2016-01-29 3:06 ` Simon Glass
2016-01-25 20:30 ` [U-Boot] [PATCH 3/7] fdt: Build an SPL " Simon Glass
2016-01-25 20:30 ` [U-Boot] [PATCH 4/7] tegra: Always build a boot image with the same filename Simon Glass
2016-01-25 21:20 ` Stephen Warren
2016-01-25 21:24 ` Simon Glass
2016-01-25 20:30 ` [U-Boot] [PATCH 5/7] socfpga: Simplify Makefile filenames Simon Glass
2016-01-25 20:43 ` Marek Vasut [this message]
2016-01-25 21:18 ` Simon Glass
2016-01-25 20:30 ` [U-Boot] [PATCH 6/7] Makefile: Make u-boot.img the same as u-boot-dtb.img Simon Glass
2016-01-25 20:30 ` [U-Boot] [PATCH 7/7] Makefile: Drop unnecessary -dtb suffixes Simon Glass
2016-01-25 21:57 ` [U-Boot] [PATCH 0/7] fdt: Replace u-boot-dtb.bin with u-boot.bin Otavio Salvador
2016-01-25 22:01 ` Simon Glass
2016-01-28 3:58 ` Simon Glass
2016-01-28 8:25 ` Hans de Goede
2016-01-29 0:18 ` Simon Glass
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=201601252143.05679.marex@denx.de \
--to=marex@denx.de \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.