Patchwork [U-Boot] build: imx: Fix 'u-boot.imx' build without full OBJTREE reference

login
register
mail settings
Submitter Otavio Salvador
Date Feb. 10, 2013, 7:58 p.m.
Message ID <1360526286-23443-1-git-send-email-otavio@ossystems.com.br>
Download mbox | patch
Permalink /patch/219521/
State Changes Requested
Delegated to: Stefano Babic
Headers show

Comments

Otavio Salvador - Feb. 10, 2013, 7:58 p.m.
When calling 'make u-boot.imx' the build were failing as it were
expecting the full path for the file; this regression has been
included by commit 71a988a (imximage.cfg: run files through C
preprocessor).

The direct references for u-boot.imx were replaced by $(obj) as
config.mk handles the proper setting of it making it set to $(OBJTREE)
when required.

The build has been test using './MAKEALL -s mx5 -s mx6' and direct
call to 'make u-boot.imx'.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 Makefile                         | 2 +-
 arch/arm/cpu/arm926ejs/config.mk | 2 +-
 arch/arm/cpu/armv7/config.mk     | 2 +-
 arch/arm/imx-common/Makefile     | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
Marek Vasut - Feb. 10, 2013, 10:49 p.m.
Dear Otavio Salvador,

> When calling 'make u-boot.imx' the build were failing as it were
> expecting the full path for the file; this regression has been
> included by commit 71a988a (imximage.cfg: run files through C
> preprocessor).
> 
> The direct references for u-boot.imx were replaced by $(obj) as
> config.mk handles the proper setting of it making it set to $(OBJTREE)
> when required.
> 
> The build has been test using './MAKEALL -s mx5 -s mx6' and direct
> call to 'make u-boot.imx'.

Does out-of-tree build still work?

Best regards,
Marek Vasut

Patch

diff --git a/Makefile b/Makefile
index f4a9b33..5d066cb 100644
--- a/Makefile
+++ b/Makefile
@@ -467,7 +467,7 @@  $(obj)u-boot.img:	$(obj)u-boot.bin
 			sed -e 's/"[	 ]*$$/ for $(BOARD) board"/') \
 		-d $< $@
 
-$(OBJTREE)/u-boot.imx : $(obj)u-boot.bin $(SUBDIR_TOOLS) depend
+$(obj)u-boot.imx : $(obj)u-boot.bin $(SUBDIR_TOOLS) depend
 		$(MAKE) -C $(SRCTREE)/arch/arm/imx-common $@
 
 $(obj)u-boot.kwb:       $(obj)u-boot.bin
diff --git a/arch/arm/cpu/arm926ejs/config.mk b/arch/arm/cpu/arm926ejs/config.mk
index 47f24f5..6a3a1bb 100644
--- a/arch/arm/cpu/arm926ejs/config.mk
+++ b/arch/arm/cpu/arm926ejs/config.mk
@@ -34,6 +34,6 @@  PLATFORM_RELFLAGS += $(PF_RELFLAGS_SLB_AT)
 
 ifneq ($(CONFIG_IMX_CONFIG),)
 
-ALL-y	+= $(OBJTREE)/u-boot.imx
+ALL-y	+= $(obj)u-boot.imx
 
 endif
diff --git a/arch/arm/cpu/armv7/config.mk b/arch/arm/cpu/armv7/config.mk
index 350e946..9c3e2f3 100644
--- a/arch/arm/cpu/armv7/config.mk
+++ b/arch/arm/cpu/armv7/config.mk
@@ -40,5 +40,5 @@  PF_NO_UNALIGNED := $(call cc-option, -mno-unaligned-access,)
 PLATFORM_NO_UNALIGNED := $(PF_NO_UNALIGNED)
 
 ifneq ($(CONFIG_IMX_CONFIG),)
-ALL-y	+= $(OBJTREE)/u-boot.imx
+ALL-y	+= $(obj)u-boot.imx
 endif
diff --git a/arch/arm/imx-common/Makefile b/arch/arm/imx-common/Makefile
index 6309fcd..38e8662 100644
--- a/arch/arm/imx-common/Makefile
+++ b/arch/arm/imx-common/Makefile
@@ -46,7 +46,7 @@  $(OBJTREE)/$(patsubst "%",%,$(CONFIG_IMX_CONFIG)).cfgtmp: $(OBJTREE)/%.cfgtmp :
 	mkdir -p $(dir $@)
 	$(CC) -E -x c $< $(CPPFLAGS) -o $@
 
-$(OBJTREE)/u-boot.imx: $(OBJTREE)/u-boot.bin $(OBJTREE)/$(patsubst "%",%,$(CONFIG_IMX_CONFIG)).cfgtmp
+$(obj)u-boot.imx: $(OBJTREE)/u-boot.bin $(OBJTREE)/$(patsubst "%",%,$(CONFIG_IMX_CONFIG)).cfgtmp
 	$(OBJTREE)/tools/mkimage -n $(filter-out %.bin,$^) -T imximage \
 	-e $(CONFIG_SYS_TEXT_BASE) -d $< $@