Skip to contentSkip to conversation

Makefile: add u-boot-elf.srec if CONFIG_REMAKE_ELF is defined

PATCH New Marek Vasut 2 participants 7 messages Feb 24, 2018

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/2 Makefile: add u-boot-elf.srec if CONFIG_REMAKE_ELF is defined

From: Masaru Nagai <[email protected]>

The u-boot-elf.srec is needed for some platforms, conveniently generate this file.

---
 Makefile | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
Makefile +6 -1
index 57cb4b87d9..cd464c0e69 100644
@@ -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)
 
Signature · 1 line
2.16.1
#1 lore raw

PATCH 2/2 ARM: rmobile: Build u-boot-elf.srec on Gen3

From: Masaru Nagai <[email protected]>

The u-boot-elf.srec is needed for the minimon update on Gen3 SoCs, conveniently generate this file.

Cc Nobuhiro Iwamatsu <[email protected]>
---
 include/configs/rcar-gen3-common.h | 1 +
 1 file changed, 1 insertion(+)
include/configs/rcar-gen3-common.h +1 -0
index 226069d67c..d665caf274 100644
@@ -13,6 +13,7 @@
 #include <asm/arch/rmobile.h>
 
 #define CONFIG_REMAKE_ELF
+#define CONFIG_BUILD_TARGET	"u-boot-elf.srec"
 
 /* boot option */
 #define CONFIG_SUPPORT_RAW_INITRD
Signature · 1 line
2.16.1
#2 lore raw

PATCH 2/2 ARM: rmobile: Build u-boot-elf.srec on Gen3

Quoted 16 lines · Marek Vasut

From: Masaru Nagai <[email protected]>

The u-boot-elf.srec is needed for the minimon update on Gen3 SoCs, conveniently generate this file.

Cc Nobuhiro Iwamatsu <[email protected]>
---
 include/configs/rcar-gen3-common.h | 1 +
 1 file changed, 1 insertion(+)
include/configs/rcar-gen3-common.h +0 -0
index 226069d67c..d665caf274 100644

include/configs/rcar-gen3-common.h line 19

Quoted 7 lines
include/configs/rcar-gen3-common.h +1 -0
@@ -13,6 +13,7 @@
 #include <asm/arch/rmobile.h>
 
 #define CONFIG_REMAKE_ELF
+#define CONFIG_BUILD_TARGET	"u-boot-elf.srec"
 
 /* boot option */
 #define CONFIG_SUPPORT_RAW_INITRD

As is, this is fine. But, there's a small number of CONFIG_BUILD_TARGET platforms, can you take a pass at Kconfig conversion (and you should be able to say default "u-boot-elf.srec" if RCAR_GEN3, default "u-boot.itb" if ARCH_SUNXI, etc, for the few users we have currently. Thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20180224/0be718fb/attachment.sig>
#3 lore raw

PATCH 2/2 ARM: rmobile: Build u-boot-elf.srec on Gen3

Quoted 23 lines · Tom Rini
Quoted 21 lines · Marek Vasut

From: Masaru Nagai <[email protected]>

The u-boot-elf.srec is needed for the minimon update on Gen3 SoCs, conveniently generate this file.

Cc Nobuhiro Iwamatsu <[email protected]>
---
 include/configs/rcar-gen3-common.h | 1 +
 1 file changed, 1 insertion(+)
include/configs/rcar-gen3-common.h +1 -0
index 226069d67c..d665caf274 100644
@@ -13,6 +13,7 @@
 #include <asm/arch/rmobile.h>
 
 #define CONFIG_REMAKE_ELF
+#define CONFIG_BUILD_TARGET	"u-boot-elf.srec"
 
Quoted 7 lines

include/configs/rcar-gen3-common.h line 19

Quoted 2 lines
include/configs/rcar-gen3-common.h +0 -0
 /* boot option */
 #define CONFIG_SUPPORT_RAW_INITRD

As is, this is fine. But, there's a small number of CONFIG_BUILD_TARGET platforms, can you take a pass at Kconfig conversion (and you should be able to say default "u-boot-elf.srec" if RCAR_GEN3, default "u-boot.itb" if ARCH_SUNXI, etc, for the few users we have currently. Thanks!

After 2018.03 release though, I don't want to break the current one for anyone.

Signature · 2 lines
Best regards,
Marek Vasut
#4 lore raw

PATCH 1/2 Makefile: add u-boot-elf.srec if CONFIG_REMAKE_ELF is defined

In reply to Marek Vasut
Quoted 27 lines · Marek Vasut

From: Masaru Nagai <[email protected]>

The u-boot-elf.srec is needed for some platforms, conveniently generate this file.

---
 Makefile | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
Makefile +1 -1
index 57cb4b87d9..cd464c0e69 100644
@@ -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
 

Makefile OBJCOPYFLAGS_u-boot.srec := -O srec · line 935

Quoted 10 lines
Makefile +5 -0
@@ -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?

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20180224/824e82af/attachment.sig>
#5 lore raw

PATCH 1/2 Makefile: add u-boot-elf.srec if CONFIG_REMAKE_ELF is defined

Quoted 32 lines · Tom Rini
Quoted 30 lines · Marek Vasut

From: Masaru Nagai <[email protected]>

The u-boot-elf.srec is needed for some platforms, conveniently generate this file.

---
 Makefile | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
Makefile +1 -1
index 57cb4b87d9..cd464c0e69 100644
@@ -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)
 
Quoted 10 lines

Makefile OBJCOPYFLAGS_u-boot.srec := -O srec · line 935

Quoted 7 lines
Makefile +5 -0
+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 ?

Signature · 2 lines
Best regards,
Marek Vasut
#6 lore raw

PATCH 1/2 Makefile: add u-boot-elf.srec if CONFIG_REMAKE_ELF is defined

Quoted 44 lines · Marek Vasut
Quoted 32 lines · Tom Rini
Quoted 30 lines · Marek Vasut

From: Masaru Nagai <[email protected]>

The u-boot-elf.srec is needed for some platforms, conveniently generate this file.

---
 Makefile | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
Makefile +1 -1
index 57cb4b87d9..cd464c0e69 100644
@@ -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)
 
Quoted 10 lines

Makefile OBJCOPYFLAGS_u-boot.srec := -O srec · line 935

Quoted 7 lines
Makefile +5 -0
+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?

Quoted 2 lines

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.

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20180224/df57bd16/attachment.sig>