diff options
| author | Jerome Forissier <jerome.forissier@linaro.org> | 2015-01-23 10:24:42 +0100 |
|---|---|---|
| committer | Jerome Forissier <jerome.forissier@linaro.org> | 2015-01-23 12:36:19 +0100 |
| commit | 3161614e0d09afd5a13a8c117f511c77d35760a6 (patch) | |
| tree | 698840d2e4ca3520db0cb98c7211ce3818d04d88 /core/arch/arm32 | |
| parent | d9428c3ce5925bb568ebf628bd99c70caaa3a2a6 (diff) | |
sunxi: fix parallel build errors
Fixes https://github.com/OP-TEE/optee_os/issues/181.
plat-sunxi/link.mk uses CPP to generate its core linker script.
Commit a3911433960a ("core: get value of CFG_ variables directly from
generated/conf.h") has modified the core CPP flags to include conf.h
automatically, so one must make sure that this file exists when the linker
script is generated. This is done by adding a dependency on $(conf-file).
The vexpress platforms also lack the dependency, but the bug won't show
because of other dependencies which cause conf.h to be generated anyways.
PLATFORM=stm is fine because it does not use CPP.
Signed-off-by: Jerome Forissier <jerome.forissier@linaro.org>
Reviewed-by: Pascal Brand <pascal.brand@linaro.org>
Reviewed-by: Jens Wiklander <jens.wiklander@linaro.org>
Diffstat (limited to 'core/arch/arm32')
| -rw-r--r-- | core/arch/arm32/plat-sunxi/link.mk | 2 | ||||
| -rw-r--r-- | core/arch/arm32/plat-vexpress/link.mk | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/core/arch/arm32/plat-sunxi/link.mk b/core/arch/arm32/plat-sunxi/link.mk index 3ff1f05..c8317e5 100644 --- a/core/arch/arm32/plat-sunxi/link.mk +++ b/core/arch/arm32/plat-sunxi/link.mk @@ -30,7 +30,7 @@ link-script-cppflags := \ -include $(link-script-dep) -$(link-script-pp): $(link-script) +$(link-script-pp): $(link-script) $(conf-file) @echo ' CPP $@' @mkdir -p $(dir $@) $(q)$(CPP) -Wp,-P,-MT,$@,-MD,$(link-script-dep) \ diff --git a/core/arch/arm32/plat-vexpress/link.mk b/core/arch/arm32/plat-vexpress/link.mk index e76232b..db4bc4e 100644 --- a/core/arch/arm32/plat-vexpress/link.mk +++ b/core/arch/arm32/plat-vexpress/link.mk @@ -84,6 +84,7 @@ link-script-extra-deps += $(link-out-dir)/text_unpaged.ld.S link-script-extra-deps += $(link-out-dir)/rodata_unpaged.ld.S link-script-extra-deps += $(link-out-dir)/text_init.ld.S link-script-extra-deps += $(link-out-dir)/rodata_init.ld.S +link-script-extra-deps += $(conf-file) cleanfiles += $(link-script-pp) $(link-script-dep) $(link-script-pp): $(link-script) $(link-script-extra-deps) @echo ' CPP $@' |