[U-Boot] [PATCH 1/2] Makefile: add u-boot-elf.srec if CONFIG_REMAKE_ELF is defined
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)
From: Masaru Nagai masaru.nagai.vx@renesas.com
The u-boot-elf.srec is needed for the minimon update on Gen3 SoCs, conveniently generate this file.
Signed-off-by: Marek Vasut marek.vasut+renesas@gmail.com Cc: Nobuhiro Iwamatsu iwamatsu@nigauri.org --- include/configs/rcar-gen3-common.h | 1 + 1 file changed, 1 insertion(+)
diff --git a/include/configs/rcar-gen3-common.h b/include/configs/rcar-gen3-common.h index 226069d67c..d665caf274 100644 --- a/include/configs/rcar-gen3-common.h +++ b/include/configs/rcar-gen3-common.h @@ -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
On Sat, Feb 24, 2018 at 12:24:18PM +0100, Marek Vasut wrote:
From: Masaru Nagai masaru.nagai.vx@renesas.com
The u-boot-elf.srec is needed for the minimon update on Gen3 SoCs, conveniently generate this file.
Signed-off-by: Marek Vasut marek.vasut+renesas@gmail.com Cc: Nobuhiro Iwamatsu iwamatsu@nigauri.org
include/configs/rcar-gen3-common.h | 1 + 1 file changed, 1 insertion(+)
diff --git a/include/configs/rcar-gen3-common.h b/include/configs/rcar-gen3-common.h index 226069d67c..d665caf274 100644 --- a/include/configs/rcar-gen3-common.h +++ b/include/configs/rcar-gen3-common.h @@ -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!
On 02/24/2018 08:16 PM, Tom Rini wrote:
On Sat, Feb 24, 2018 at 12:24:18PM +0100, Marek Vasut wrote:
From: Masaru Nagai masaru.nagai.vx@renesas.com
The u-boot-elf.srec is needed for the minimon update on Gen3 SoCs, conveniently generate this file.
Signed-off-by: Marek Vasut marek.vasut+renesas@gmail.com Cc: Nobuhiro Iwamatsu iwamatsu@nigauri.org
include/configs/rcar-gen3-common.h | 1 + 1 file changed, 1 insertion(+)
diff --git a/include/configs/rcar-gen3-common.h b/include/configs/rcar-gen3-common.h index 226069d67c..d665caf274 100644 --- a/include/configs/rcar-gen3-common.h +++ b/include/configs/rcar-gen3-common.h @@ -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!
After 2018.03 release though, I don't want to break the current one for anyone.
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.
participants (2)
-
Marek Vasut -
Tom Rini