diff options
| author | Tom Rini <trini@konsulko.com> | 2024-08-29 08:15:37 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2024-08-29 08:15:37 -0600 |
| commit | 57949a99b7bd0aa21abbde1ffa7e50e5d9e10a4e (patch) | |
| tree | 0a6ea6f8d8a0e4c633b63246ff8122a70b5c5f1d | |
| parent | f3a2d793d7ae04634afb727f96ff6b0f6144c8ae (diff) | |
| parent | aec0015a52d3faf723fec9ed9fe1d1af0b89e996 (diff) | |
| download | u-boot-57949a99b7bd0aa21abbde1ffa7e50e5d9e10a4e.tar.gz u-boot-57949a99b7bd0aa21abbde1ffa7e50e5d9e10a4e.tar.bz2 u-boot-57949a99b7bd0aa21abbde1ffa7e50e5d9e10a4e.zip | |
Merge tag 'u-boot-imx-master-20240829' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx
CI: https://source.denx.de/u-boot/custodians/u-boot-imx/-/pipelines/22162
- Fix an issue with "tools/buildman/buildman imx8ulp_evk"
failing every other time.
| -rw-r--r-- | arch/arm/mach-imx/Makefile | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/arch/arm/mach-imx/Makefile b/arch/arm/mach-imx/Makefile index b311d176d6..5262dca4ff 100644 --- a/arch/arm/mach-imx/Makefile +++ b/arch/arm/mach-imx/Makefile @@ -217,8 +217,8 @@ endif ifeq ($(CONFIG_ARCH_IMX9)$(CONFIG_ARCH_IMX8ULP), y) -quiet_cmd_imx9_check = CHECK $@ -cmd_imx9_check = $(srctree)/tools/imx9_image.sh $@ +quiet_cmd_cpp_cfg_imx9_check = CHECK $@ +cmd_cpp_cfg_imx9_check = $(CPP) $(cpp_flags) -D__ASSEMBLY__ -x c -o $@ $< && $(srctree)/tools/imx9_image.sh $@ SPL: spl/u-boot-spl.bin spl/u-boot-spl.cfgout u-boot-container.cfgout FORCE @@ -227,15 +227,13 @@ flash.bin: MKIMAGEOUTPUT = flash.log spl/u-boot-spl.cfgout: $(IMX_CONFIG) FORCE $(Q)mkdir -p $(dir $@) - $(call if_changed_dep,cpp_cfg) - $(call if_changed,imx9_check) + $(call if_changed_dep,cpp_cfg_imx9_check) spl/u-boot-spl-ddr.bin: spl/u-boot-spl.bin spl/u-boot-spl.cfgout FORCE u-boot-container.cfgout: $(IMX_CONTAINER_CFG) FORCE $(Q)mkdir -p $(dir $@) - $(call if_changed_dep,cpp_cfg) - $(call if_changed,imx9_check) + $(call if_changed_dep,cpp_cfg_imx9_check) flash.bin: spl/u-boot-spl-ddr.bin container.cfgout FORCE $(call if_changed,mkimage) |