diff mbox series

[U-Boot,v5,1/2] imx: fix building for i.mx8 without spl

Message ID 20190428234533.9601-2-marcel@ziswiler.com
State Superseded
Delegated to: Stefano Babic
Headers show
Series colibri imx8qxp 2gb wb it v1.0b module support | expand

Commit Message

Marcel Ziswiler April 28, 2019, 11:45 p.m. UTC 
From: Marcel Ziswiler <marcel.ziswiler@toradex.com>

Building with Travis CI complained and stopped with the following error:
+cc1: fatal error: opening output file spl/u-boot-spl.cfgout: No such
file or directory
+compilation terminated.

This fixes commit caceb739ea07 ("imx: build flash.bin for i.MX8") which
took SPL being enabled on i.MX8 for granted.

Reported-by: Stefano Babic <sbabic@denx.de>
Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>

---

Changes in v5: None
Changes in v4: None
Changes in v3: None
Changes in v2: None

 arch/arm/mach-imx/Makefile | 2 ++
 1 file changed, 2 insertions(+)

Comments

Peng Fan April 29, 2019, 1:40 a.m. UTC | #1 
> Subject: [PATCH v5 1/2] imx: fix building for i.mx8 without spl
> 
> From: Marcel Ziswiler <marcel.ziswiler@toradex.com>
> 
> Building with Travis CI complained and stopped with the following error:
> +cc1: fatal error: opening output file spl/u-boot-spl.cfgout: No such
> file or directory
> +compilation terminated.
> 
> This fixes commit caceb739ea07 ("imx: build flash.bin for i.MX8") which took
> SPL being enabled on i.MX8 for granted.
> 
> Reported-by: Stefano Babic <sbabic@denx.de>
> Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
> 
> ---
> 
> Changes in v5: None
> Changes in v4: None
> Changes in v3: None
> Changes in v2: None
> 
>  arch/arm/mach-imx/Makefile | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/arch/arm/mach-imx/Makefile b/arch/arm/mach-imx/Makefile
> index 37675d0558..6531c67fc6 100644
> --- a/arch/arm/mach-imx/Makefile
> +++ b/arch/arm/mach-imx/Makefile
> @@ -107,7 +107,9 @@ IMX_CONFIG = $(CONFIG_IMX_CONFIG:"%"=%)
> ifeq ($(CONFIG_ARCH_IMX8), y)  CNTR_DEPFILES :=
> $(srctree)/tools/imx_cntr_image.sh
>  IMAGE_TYPE := imx8image
> +ifeq ($(CONFIG_SPL_BUILD),y)
>  SPL_DEPFILE_EXISTS := $(shell $(CPP) $(cpp_flags) -x c -o
> spl/u-boot-spl.cfgout $(srctree)/$(IMX_CONFIG); if [ -f spl/u-boot-spl.cfgout ];
> then $(CNTR_DEPFILES) spl/u-boot-spl.cfgout; echo $$?; fi)
> +endif
>  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 ifeq ($(CONFIG_ARCH_IMX8M), y)
> IMAGE_TYPE := imx8mimage

Reviewed-by: Peng Fan <peng.fan@nxp.com>

> --
> 2.20.1
diff mbox series

Patch

diff --git a/arch/arm/mach-imx/Makefile b/arch/arm/mach-imx/Makefile
index 37675d0558..6531c67fc6 100644
--- a/arch/arm/mach-imx/Makefile
+++ b/arch/arm/mach-imx/Makefile
@@ -107,7 +107,9 @@  IMX_CONFIG = $(CONFIG_IMX_CONFIG:"%"=%)
 ifeq ($(CONFIG_ARCH_IMX8), y)
 CNTR_DEPFILES := $(srctree)/tools/imx_cntr_image.sh
 IMAGE_TYPE := imx8image
+ifeq ($(CONFIG_SPL_BUILD),y)
 SPL_DEPFILE_EXISTS := $(shell $(CPP) $(cpp_flags) -x c -o spl/u-boot-spl.cfgout $(srctree)/$(IMX_CONFIG); if [ -f spl/u-boot-spl.cfgout ]; then $(CNTR_DEPFILES) spl/u-boot-spl.cfgout; echo $$?; fi)
+endif
 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 ifeq ($(CONFIG_ARCH_IMX8M), y)
 IMAGE_TYPE := imx8mimage