build: imx: Fix 'u-boot.imx' build without full OBJTREE reference
Subsystems (2)
PATCH v2 1/1 build: imx: Fix 'u-boot.imx' build without full OBJTREE reference
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
- make u-boot.imx
- make O=/tmp/build
---
Changes in v2:
- Improve commit log
- Fix out of tree build
Makefile | 4 ++-- arch/arm/cpu/arm926ejs/config.mk | 2 +- arch/arm/cpu/armv7/config.mk | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-)
Makefile +2 -2
@@ -467,8 +467,8 @@ $(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 - $(MAKE) -C $(SRCTREE)/arch/arm/imx-common $@ +$(obj)u-boot.imx: $(obj)u-boot.bin depend + $(MAKE) -C $(SRCTREE)/arch/arm/imx-common $(OBJTREE)/u-boot.imx $(obj)u-boot.kwb: $(obj)u-boot.bin $(obj)tools/mkimage -n $(CONFIG_SYS_KWD_CONFIG) -T kwbimage \
arch/arm/cpu/arm926ejs/config.mk +1 -1
@@ -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
arch/arm/cpu/armv7/config.mk +1 -1
@@ -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
Signature · 1 line
1.8.1
PATCH v2 1/1 build: imx: Fix 'u-boot.imx' build without full OBJTREE reference
Dear Otavio Salvador,
Quoted 9 lines
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.
Quoted 5 lines
The build has been test using:
- ./MAKEALL -s mx5 -s mx6
- make u-boot.imx
- make O=/tmp/build
BUILD_DIR=/tmp/xyz MAKEALL please.
Best regards,
Marek Vasut
PATCH v2 1/1 build: imx: Fix 'u-boot.imx' build without full OBJTREE reference
Dear Otavio, Marek,
Quoted 11 lines · Marek Vasut
Dear Otavio Salvador,
Quoted 9 lines
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.
Quoted 7 lines
Quoted 5 lines
The build has been test using:
- ./MAKEALL -s mx5 -s mx6
- make u-boot.imx
- make O=/tmp/buildBUILD_DIR=/tmp/xyz MAKEALL please.
Once you're confident with this patch, do you mind if I integrate it as is in my MXC NAND + SPL series in order to avoid merge conflicts (unless it is applied before)?
Best regards,
Beno?t
PATCH v2 1/1 build: imx: Fix 'u-boot.imx' build without full OBJTREE reference
Quoted 20 lines · Beno?t Th?baudeau
Dear Otavio, Marek,
Quoted 17 lines · Marek Vasut
Dear Otavio Salvador,
Quoted 14 lines
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
- make u-boot.imx
- make O=/tmp/build
Quoted 5 lines
Quoted 1 line
BUILD_DIR=/tmp/xyz MAKEALL please.
Once you're confident with this patch, do you mind if I integrate it as is in my MXC NAND + SPL series in order to avoid merge conflicts (unless it is applied before)?
Alright; It did the test Marek has requested and it works fine. I think this should go to imx/master as it fixes a regression.
Signature · 3 lines
Otavio Salvador O.S. Systems E-mail: otavio at ossystems.com.br http://www.ossystems.com.br Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br
PATCH v2 1/1 build: imx: Fix 'u-boot.imx' build without full OBJTREE reference
Hi Otavio,
Quoted 24 lines · Otavio Salvador
Quoted 22 lines · Beno?t Th?baudeau
Dear Otavio, Marek,
Quoted 18 lines · Marek Vasut
Dear Otavio Salvador,
Quoted 9 lines
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.
Quoted 5 lines
The build has been test using:
- ./MAKEALL -s mx5 -s mx6
- make u-boot.imx
- make O=/tmp/buildBUILD_DIR=/tmp/xyz MAKEALL please.
Quoted 8 lines
Quoted 5 lines
Once you're confident with this patch, do you mind if I integrate it as is in my
MXC NAND + SPL series in order to avoid merge conflicts (unless it is applied
before)?Alright; It did the test Marek has requested and it works fine. I think this should go to imx/master as it fixes a regression.
OK. I include it into my series so that patches apply fine whether Stefano applies it alone first or from my series.
Best regards,
Beno?t
Stefano Babic
AppliedPATCH v2 1/1 build: imx: Fix 'u-boot.imx' build without full OBJTREE reference
Quoted 2 lines · Beno?t Th?baudeau
Hi Otavio,
Hi Beno?t,
Quoted 5 lines
Quoted 2 lines
Alright; It did the test Marek has requested and it works fine. I think this should go to imx/master as it fixes a regression.
OK. I include it into my series so that patches apply fine whether Stefano applies it alone first or from my series.
I merged it - you do not need to bother about it.
Best regards,
Stefano
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de =====================================================================
PATCH v2 1/1 build: imx: Fix 'u-boot.imx' build without full OBJTREE reference
Hi Stefano,
Quoted 7 lines · Stefano Babic
Quoted 2 lines · Beno?t Th?baudeau
Hi Otavio,
Hi Beno?t,
Quoted 7 lines
Quoted 5 lines
Quoted 2 lines
Alright; It did the test Marek has requested and it works fine. I think this should go to imx/master as it fixes a regression.
OK. I include it into my series so that patches apply fine whether Stefano applies it alone first or from my series.
I merged it - you do not need to bother about it.
Great, thanks.
Best regards,
Beno?t