diff options
| author | davidcunado-arm <david.cunado@arm.com> | 2017-11-07 16:16:51 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-07 16:16:51 +0000 |
| commit | 2904f84e3c8bdd9f3df0415b5a02ab6bcc0ab05b (patch) | |
| tree | f98d4fa95a01e68df3180ac48aadc62b480d1d7e | |
| parent | 92c5066c93bb0c027c9ea8d7028d4fb722d3aec2 (diff) | |
| parent | 3c9461520f734b92f27345da515160d8522eeda6 (diff) | |
Merge pull request #1155 from masahir0y/uniphier
Fix build error when creating ROT key for UniPhier platform
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | make_helpers/build_macros.mk | 2 | ||||
| -rw-r--r-- | plat/rockchip/rk3399/platform.mk | 2 | ||||
| -rw-r--r-- | plat/socionext/uniphier/platform.mk | 2 |
4 files changed, 5 insertions, 3 deletions
@@ -260,6 +260,8 @@ include lib/stack_protector/stack_protector.mk include ${PLAT_MAKEFILE_FULL} +$(eval $(call MAKE_PREREQ_DIR,${BUILD_PLAT})) + # Platform compatibility is not supported in AArch32 ifneq (${ARCH},aarch32) # If the platform has not defined ENABLE_PLAT_COMPAT, then enable it by default diff --git a/make_helpers/build_macros.mk b/make_helpers/build_macros.mk index e59a64b4..7531f6d8 100644 --- a/make_helpers/build_macros.mk +++ b/make_helpers/build_macros.mk @@ -291,7 +291,7 @@ define MAKE_BL # Create generators for object directory structure -$(eval $(call MAKE_PREREQ_DIR,${BUILD_DIR},)) +$(eval $(call MAKE_PREREQ_DIR,${BUILD_DIR},${BUILD_PLAT})) $(eval $(foreach objd,${OBJ_DIRS},$(call MAKE_PREREQ_DIR,${objd},${BUILD_DIR}))) diff --git a/plat/rockchip/rk3399/platform.mk b/plat/rockchip/rk3399/platform.mk index 85cca1b6..6cd5b242 100644 --- a/plat/rockchip/rk3399/platform.mk +++ b/plat/rockchip/rk3399/platform.mk @@ -88,7 +88,7 @@ ${RK_PLAT_SOC}/drivers/pmu/pmu_fw.c: $(RK3399M0FW) ${BUILD_PLAT}/bl31/cdn_dp.o: CCACHE_EXTRAFILES=$(HDCPFW) ${RK_PLAT_SOC}/drivers/dp/cdn_dp.c: $(HDCPFW) -$(eval $(call MAKE_PREREQ_DIR,${BUILD_M0},)) +$(eval $(call MAKE_PREREQ_DIR,${BUILD_M0},${BUILD_PLAT})) .PHONY: $(RK3399M0FW) $(RK3399M0FW): | ${BUILD_M0} $(MAKE) -C ${RK_PLAT_SOC}/drivers/m0 BUILD=$(abspath ${BUILD_PLAT}/m0) diff --git a/plat/socionext/uniphier/platform.mk b/plat/socionext/uniphier/platform.mk index e6f510e0..c91abb6b 100644 --- a/plat/socionext/uniphier/platform.mk +++ b/plat/socionext/uniphier/platform.mk @@ -101,7 +101,7 @@ $(BUILD_PLAT)/bl1/uniphier_rotpk.o: $(ROTPK_HASH) $(BUILD_PLAT)/bl2/uniphier_rotpk.o: $(ROTPK_HASH) certificates: $(ROT_KEY) -$(ROT_KEY): +$(ROT_KEY): | $(BUILD_PLAT) @echo " OPENSSL $@" $(Q)openssl genrsa 2048 > $@ 2>/dev/null |