| Message ID | 20180224112418.14203-1-marek.vasut+renesas@gmail.com |
|---|---|
| State | Deferred |
| Delegated to: | Tom Rini |
| Headers | show |
| Series | [U-Boot,1/2] Makefile: add u-boot-elf.srec if CONFIG_REMAKE_ELF is defined | expand |
On Sat, Feb 24, 2018 at 12:24:17PM +0100, Marek Vasut wrote: > From: Masaru Nagai <masaru.nagai.vx@renesas.com> > > The u-boot-elf.srec is needed for some platforms, conveniently generate this file. > > Signed-off-by: Masaru Nagai <masaru.nagai.vx@renesas.com> > Signed-off-by: Hiroyuki Yokoyama <hiroyuki.yokoyama.vx@renesas.com> > Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com> > Cc: Hiroyuki Yokoyama <hiroyuki.yokoyama.vx@renesas.com> > Cc: Nobuhiro Iwamatsu <iwamatsu@nigauri.org> > --- > Makefile | 7 ++++++- > 1 file changed, 6 insertions(+), 1 deletion(-) > > diff --git a/Makefile b/Makefile > index 57cb4b87d9..cd464c0e69 100644 > --- a/Makefile > +++ b/Makefile > @@ -792,7 +792,7 @@ ALL-$(CONFIG_OF_HOSTFILE) += u-boot.dtb > ifneq ($(CONFIG_SPL_TARGET),) > ALL-$(CONFIG_SPL) += $(CONFIG_SPL_TARGET:"%"=%) > endif > -ALL-$(CONFIG_REMAKE_ELF) += u-boot.elf > +ALL-$(CONFIG_REMAKE_ELF) += u-boot.elf u-boot-elf.srec > ALL-$(CONFIG_EFI_APP) += u-boot-app.efi > ALL-$(CONFIG_EFI_STUB) += u-boot-payload.efi > > @@ -926,6 +926,11 @@ OBJCOPYFLAGS_u-boot.srec := -O srec > u-boot.hex u-boot.srec: u-boot FORCE > $(call if_changed,objcopy) > > +OBJCOPYFLAGS_u-boot-elf.srec := $(OBJCOPYFLAGS_u-boot.srec) > + > +u-boot-elf.srec: u-boot.elf FORCE > + $(call if_changed,objcopy) > + > OBJCOPYFLAGS_u-boot-nodtb.bin := -O binary \ > $(if $(CONFIG_X86_16BIT_INIT),-R .start16 -R .resetvec) Do we really need the first hunk here, esp given that in 2/2 we make use of CONFIG_BUILD_TARGET to say that we need to build u-boot-elf.srec?
On 02/24/2018 08:15 PM, Tom Rini wrote: > On Sat, Feb 24, 2018 at 12:24:17PM +0100, Marek Vasut wrote: > >> From: Masaru Nagai <masaru.nagai.vx@renesas.com> >> >> The u-boot-elf.srec is needed for some platforms, conveniently generate this file. >> >> Signed-off-by: Masaru Nagai <masaru.nagai.vx@renesas.com> >> Signed-off-by: Hiroyuki Yokoyama <hiroyuki.yokoyama.vx@renesas.com> >> Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com> >> Cc: Hiroyuki Yokoyama <hiroyuki.yokoyama.vx@renesas.com> >> Cc: Nobuhiro Iwamatsu <iwamatsu@nigauri.org> >> --- >> Makefile | 7 ++++++- >> 1 file changed, 6 insertions(+), 1 deletion(-) >> >> diff --git a/Makefile b/Makefile >> index 57cb4b87d9..cd464c0e69 100644 >> --- a/Makefile >> +++ b/Makefile >> @@ -792,7 +792,7 @@ ALL-$(CONFIG_OF_HOSTFILE) += u-boot.dtb >> ifneq ($(CONFIG_SPL_TARGET),) >> ALL-$(CONFIG_SPL) += $(CONFIG_SPL_TARGET:"%"=%) >> endif >> -ALL-$(CONFIG_REMAKE_ELF) += u-boot.elf >> +ALL-$(CONFIG_REMAKE_ELF) += u-boot.elf u-boot-elf.srec >> ALL-$(CONFIG_EFI_APP) += u-boot-app.efi >> ALL-$(CONFIG_EFI_STUB) += u-boot-payload.efi >> >> @@ -926,6 +926,11 @@ OBJCOPYFLAGS_u-boot.srec := -O srec >> u-boot.hex u-boot.srec: u-boot FORCE >> $(call if_changed,objcopy) >> >> +OBJCOPYFLAGS_u-boot-elf.srec := $(OBJCOPYFLAGS_u-boot.srec) >> + >> +u-boot-elf.srec: u-boot.elf FORCE >> + $(call if_changed,objcopy) >> + >> OBJCOPYFLAGS_u-boot-nodtb.bin := -O binary \ >> $(if $(CONFIG_X86_16BIT_INIT),-R .start16 -R .resetvec) > > Do we really need the first hunk here, esp given that in 2/2 we make use > of CONFIG_BUILD_TARGET to say that we need to build u-boot-elf.srec? Probably not, but then we can very well convert platforms using REMAKE_ELF to CONFIG_BUILD_TARGET too ?
On Sat, Feb 24, 2018 at 08:49:38PM +0100, Marek Vasut wrote: > On 02/24/2018 08:15 PM, Tom Rini wrote: > > On Sat, Feb 24, 2018 at 12:24:17PM +0100, Marek Vasut wrote: > > > >> From: Masaru Nagai <masaru.nagai.vx@renesas.com> > >> > >> The u-boot-elf.srec is needed for some platforms, conveniently generate this file. > >> > >> Signed-off-by: Masaru Nagai <masaru.nagai.vx@renesas.com> > >> Signed-off-by: Hiroyuki Yokoyama <hiroyuki.yokoyama.vx@renesas.com> > >> Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com> > >> Cc: Hiroyuki Yokoyama <hiroyuki.yokoyama.vx@renesas.com> > >> Cc: Nobuhiro Iwamatsu <iwamatsu@nigauri.org> > >> --- > >> Makefile | 7 ++++++- > >> 1 file changed, 6 insertions(+), 1 deletion(-) > >> > >> diff --git a/Makefile b/Makefile > >> index 57cb4b87d9..cd464c0e69 100644 > >> --- a/Makefile > >> +++ b/Makefile > >> @@ -792,7 +792,7 @@ ALL-$(CONFIG_OF_HOSTFILE) += u-boot.dtb > >> ifneq ($(CONFIG_SPL_TARGET),) > >> ALL-$(CONFIG_SPL) += $(CONFIG_SPL_TARGET:"%"=%) > >> endif > >> -ALL-$(CONFIG_REMAKE_ELF) += u-boot.elf > >> +ALL-$(CONFIG_REMAKE_ELF) += u-boot.elf u-boot-elf.srec > >> ALL-$(CONFIG_EFI_APP) += u-boot-app.efi > >> ALL-$(CONFIG_EFI_STUB) += u-boot-payload.efi > >> > >> @@ -926,6 +926,11 @@ OBJCOPYFLAGS_u-boot.srec := -O srec > >> u-boot.hex u-boot.srec: u-boot FORCE > >> $(call if_changed,objcopy) > >> > >> +OBJCOPYFLAGS_u-boot-elf.srec := $(OBJCOPYFLAGS_u-boot.srec) > >> + > >> +u-boot-elf.srec: u-boot.elf FORCE > >> + $(call if_changed,objcopy) > >> + > >> OBJCOPYFLAGS_u-boot-nodtb.bin := -O binary \ > >> $(if $(CONFIG_X86_16BIT_INIT),-R .start16 -R .resetvec) > > > > Do we really need the first hunk here, esp given that in 2/2 we make use > > of CONFIG_BUILD_TARGET to say that we need to build u-boot-elf.srec? > > Probably not, but then we can very well convert platforms using > REMAKE_ELF to CONFIG_BUILD_TARGET too ? We quite possibly could do that as well, as part of migration of BUILD_TARGET to Kconfig.
diff --git a/Makefile b/Makefile index 57cb4b87d9..cd464c0e69 100644 --- a/Makefile +++ b/Makefile @@ -792,7 +792,7 @@ ALL-$(CONFIG_OF_HOSTFILE) += u-boot.dtb ifneq ($(CONFIG_SPL_TARGET),) ALL-$(CONFIG_SPL) += $(CONFIG_SPL_TARGET:"%"=%) endif -ALL-$(CONFIG_REMAKE_ELF) += u-boot.elf +ALL-$(CONFIG_REMAKE_ELF) += u-boot.elf u-boot-elf.srec ALL-$(CONFIG_EFI_APP) += u-boot-app.efi ALL-$(CONFIG_EFI_STUB) += u-boot-payload.efi @@ -926,6 +926,11 @@ OBJCOPYFLAGS_u-boot.srec := -O srec u-boot.hex u-boot.srec: u-boot FORCE $(call if_changed,objcopy) +OBJCOPYFLAGS_u-boot-elf.srec := $(OBJCOPYFLAGS_u-boot.srec) + +u-boot-elf.srec: u-boot.elf FORCE + $(call if_changed,objcopy) + OBJCOPYFLAGS_u-boot-nodtb.bin := -O binary \ $(if $(CONFIG_X86_16BIT_INIT),-R .start16 -R .resetvec)