| Message ID | 20181105100922.21747-2-peng.fan@nxp.com |
|---|---|
| State | Accepted |
| Commit | 4ac94bfa018be2e82e2218d26580d2850e905e65 |
| Delegated to: | Stefano Babic |
| Headers | show |
| Series | [U-Boot,1/2] imx: imx8qxp_mek: imximage: remove config.h | expand |
Hi Peng, On 05/11/18 11:01, Peng Fan wrote: > Build u-boot-dtb.cfgout before checking files, otherwise > u-boot-dtb.cfgout is generated at late stage and cause final image not > generated. > > Signed-off-by: Peng Fan <peng.fan@nxp.com> > --- > arch/arm/mach-imx/Makefile | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/arch/arm/mach-imx/Makefile b/arch/arm/mach-imx/Makefile > index 72fe23a2b9..a3190ad2f0 100644 > --- a/arch/arm/mach-imx/Makefile > +++ b/arch/arm/mach-imx/Makefile > @@ -89,7 +89,7 @@ IMX_CONFIG = $(CONFIG_IMX_CONFIG:"%"=%) > ifeq ($(CONFIG_ARCH_IMX8), y) > CNTR_DEPFILES := $(srctree)/tools/imx_cntr_image.sh > IMAGE_TYPE := imx8image > -DEPFILE_EXISTS := $(shell if [ -f u-boot-dtb.cfgout ]; then $(CNTR_DEPFILES) u-boot-dtb.cfgout; echo $$?; fi) > +DEPFILE_EXISTS := $(shell $(CPP) $(cpp_flags) -x c -o u-boot-dtb.cfgout $(srctree)/$(IMX_CONFIG); if [ -f u-boot-dtb.cfgout ]; then $(CNTR_DEPFILES) u-boot-dtb.cfgout; echo $$?; fi) > else > IMAGE_TYPE := imximage > DEPFILE_EXISTS := 0 > This fixes an issue but it creates apparently a new one. After applying this, the board is not built clean. It looks like it cannot find ahab-container.img, even if it is present in my U-Boot directory. +Fail open first container file ahab-container.img +make[2]: *** [u-boot-dtb.imx] Error 1 +make[1]: *** [u-boot-dtb.imx] Error 2 +make: *** [sub-make] Error 2 Without it, build is fine. Regards, Stefano
diff --git a/arch/arm/mach-imx/Makefile b/arch/arm/mach-imx/Makefile index 72fe23a2b9..a3190ad2f0 100644 --- a/arch/arm/mach-imx/Makefile +++ b/arch/arm/mach-imx/Makefile @@ -89,7 +89,7 @@ IMX_CONFIG = $(CONFIG_IMX_CONFIG:"%"=%) ifeq ($(CONFIG_ARCH_IMX8), y) CNTR_DEPFILES := $(srctree)/tools/imx_cntr_image.sh IMAGE_TYPE := imx8image -DEPFILE_EXISTS := $(shell if [ -f u-boot-dtb.cfgout ]; then $(CNTR_DEPFILES) u-boot-dtb.cfgout; echo $$?; fi) +DEPFILE_EXISTS := $(shell $(CPP) $(cpp_flags) -x c -o u-boot-dtb.cfgout $(srctree)/$(IMX_CONFIG); if [ -f u-boot-dtb.cfgout ]; then $(CNTR_DEPFILES) u-boot-dtb.cfgout; echo $$?; fi) else IMAGE_TYPE := imximage DEPFILE_EXISTS := 0
Build u-boot-dtb.cfgout before checking files, otherwise u-boot-dtb.cfgout is generated at late stage and cause final image not generated. Signed-off-by: Peng Fan <peng.fan@nxp.com> --- arch/arm/mach-imx/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)