mirror of
https://github.com/ARM-software/arm-trusted-firmware.git
synced 2025-04-17 10:04:26 +00:00
Merge "fix(build): ensure $(ROT_KEY)
depends on correct directory rules" into integration
This commit is contained in:
commit
3109367c34
10 changed files with 20 additions and 20 deletions
|
@ -152,11 +152,11 @@ $(BUILD_PLAT)/bl1/hikey_rotpk.o: $(ROTPK_HASH)
|
|||
$(BUILD_PLAT)/bl2/hikey_rotpk.o: $(ROTPK_HASH)
|
||||
|
||||
certificates: $(ROT_KEY)
|
||||
$(ROT_KEY): | $(BUILD_PLAT)
|
||||
$(ROT_KEY): | $$(@D)/
|
||||
$(s)echo " OPENSSL $@"
|
||||
$(q)${OPENSSL_BIN_PATH}/openssl genrsa 2048 > $@ 2>/dev/null
|
||||
|
||||
$(ROTPK_HASH): $(ROT_KEY)
|
||||
$(ROTPK_HASH): $(ROT_KEY) | $$(@D)/
|
||||
$(s)echo " OPENSSL $@"
|
||||
$(q)${OPENSSL_BIN_PATH}/openssl rsa -in $< -pubout -outform DER 2>/dev/null |\
|
||||
${OPENSSL_BIN_PATH}/openssl dgst -sha256 -binary > $@ 2>/dev/null
|
||||
|
|
|
@ -145,11 +145,11 @@ $(BUILD_PLAT)/bl1/hikey960_rotpk.o: $(ROTPK_HASH)
|
|||
$(BUILD_PLAT)/bl2/hikey960_rotpk.o: $(ROTPK_HASH)
|
||||
|
||||
certificates: $(ROT_KEY)
|
||||
$(ROT_KEY): | $(BUILD_PLAT)
|
||||
$(ROT_KEY): | $$(@D)/
|
||||
$(s)echo " OPENSSL $@"
|
||||
$(q)${OPENSSL_BIN_PATH}/openssl genrsa 2048 > $@ 2>/dev/null
|
||||
|
||||
$(ROTPK_HASH): $(ROT_KEY)
|
||||
$(ROTPK_HASH): $(ROT_KEY) | $$(@D)/
|
||||
$(s)echo " OPENSSL $@"
|
||||
$(q)${OPENSSL_BIN_PATH}/openssl rsa -in $< -pubout -outform DER 2>/dev/null |\
|
||||
${OPENSSL_BIN_PATH}/openssl dgst -sha256 -binary > $@ 2>/dev/null
|
||||
|
|
|
@ -76,13 +76,13 @@ $(BUILD_PLAT)/bl2/imx7_rotpk.o: $(ROTPK_HASH)
|
|||
|
||||
certificates: $(ROT_KEY)
|
||||
|
||||
$(ROT_KEY): | $(BUILD_PLAT)
|
||||
$(ROT_KEY): | $$(@D)/
|
||||
$(s)echo " OPENSSL $@"
|
||||
$(q)if [ ! -f $(ROT_KEY) ]; then \
|
||||
${OPENSSL_BIN_PATH}/openssl genrsa 2048 > $@ 2>/dev/null; \
|
||||
fi
|
||||
|
||||
$(ROTPK_HASH): $(ROT_KEY)
|
||||
$(ROTPK_HASH): $(ROT_KEY) | $$(@D)/
|
||||
$(s)echo " OPENSSL $@"
|
||||
$(q)${OPENSSL_BIN_PATH}/openssl rsa -in $< -pubout -outform DER 2>/dev/null |\
|
||||
${OPENSSL_BIN_PATH}/openssl dgst -sha256 -binary > $@ 2>/dev/null
|
||||
|
|
|
@ -132,13 +132,13 @@ $(BUILD_PLAT)/bl2/imx8mm_rotpk.o: $(ROTPK_HASH)
|
|||
|
||||
certificates: $(ROT_KEY)
|
||||
|
||||
$(ROT_KEY): | $(BUILD_PLAT)
|
||||
$(ROT_KEY): | $$(@D)/
|
||||
$(s)echo " OPENSSL $@"
|
||||
$(q)if [ ! -f $(ROT_KEY) ]; then \
|
||||
${OPENSSL_BIN_PATH}/openssl genrsa 2048 > $@ 2>/dev/null; \
|
||||
fi
|
||||
|
||||
$(ROTPK_HASH): $(ROT_KEY)
|
||||
$(ROTPK_HASH): $(ROT_KEY) | $$(@D)/
|
||||
$(s)echo " OPENSSL $@"
|
||||
$(q)${OPENSSL_BIN_PATH}/openssl rsa -in $< -pubout -outform DER 2>/dev/null |\
|
||||
${OPENSSL_BIN_PATH}/openssl dgst -sha256 -binary > $@ 2>/dev/null
|
||||
|
|
|
@ -129,13 +129,13 @@ $(BUILD_PLAT)/bl2/imx8mp_rotpk.o: $(ROTPK_HASH)
|
|||
|
||||
certificates: $(ROT_KEY)
|
||||
|
||||
$(ROT_KEY): | $(BUILD_PLAT)
|
||||
$(ROT_KEY): | $$(@D)/
|
||||
$(s)echo " OPENSSL $@"
|
||||
$(q)if [ ! -f $(ROT_KEY) ]; then \
|
||||
${OPENSSL_BIN_PATH}/openssl genrsa 2048 > $@ 2>/dev/null; \
|
||||
fi
|
||||
|
||||
$(ROTPK_HASH): $(ROT_KEY)
|
||||
$(ROTPK_HASH): $(ROT_KEY) | $$(@D)/
|
||||
$(s)echo " OPENSSL $@"
|
||||
$(q)${OPENSSL_BIN_PATH}/openssl rsa -in $< -pubout -outform DER 2>/dev/null |\
|
||||
${OPENSSL_BIN_PATH}/openssl dgst -sha256 -binary > $@ 2>/dev/null
|
||||
|
|
|
@ -130,13 +130,13 @@ else
|
|||
$(BUILD_PLAT)/bl2/nxp_rotpk.o: $(ROTPK_HASH)
|
||||
|
||||
certificates: $(ROT_KEY)
|
||||
$(ROT_KEY): | $(BUILD_PLAT)
|
||||
$(ROT_KEY): | $$(@D)/
|
||||
$(s)echo " OPENSSL $@"
|
||||
$(q)if [ ! -f $(ROT_KEY) ]; then \
|
||||
${OPENSSL_BIN_PATH}/openssl genrsa 2048 > $@ 2>/dev/null; \
|
||||
fi
|
||||
|
||||
$(ROTPK_HASH): $(ROT_KEY)
|
||||
$(ROTPK_HASH): $(ROT_KEY) | $$(@D)/
|
||||
$(s)echo " OPENSSL $@"
|
||||
$(q)${OPENSSL_BIN_PATH}/openssl rsa -in $< -pubout -outform DER 2>/dev/null |\
|
||||
${OPENSSL_BIN_PATH}/openssl dgst -sha256 -binary > $@ 2>/dev/null
|
||||
|
|
|
@ -78,11 +78,11 @@ ifneq (${TRUSTED_BOARD_BOOT},0)
|
|||
|
||||
certificates: $(ROT_KEY)
|
||||
|
||||
$(ROT_KEY): | $(BUILD_PLAT)
|
||||
$(ROT_KEY): | $$(@D)/
|
||||
$(s)echo " OPENSSL $@"
|
||||
$(q)${OPENSSL_BIN_PATH}/openssl genrsa 2048 > $@ 2>/dev/null
|
||||
|
||||
$(ROTPK_HASH): $(ROT_KEY)
|
||||
$(ROTPK_HASH): $(ROT_KEY) | $$(@D)/
|
||||
$(s)echo " OPENSSL $@"
|
||||
$(q)${OPENSSL_BIN_PATH}/openssl rsa -in $< -pubout -outform DER 2>/dev/null |\
|
||||
${OPENSSL_BIN_PATH}/openssl dgst -sha256 -binary > $@ 2>/dev/null
|
||||
|
|
|
@ -213,11 +213,11 @@ ifneq (${TRUSTED_BOARD_BOOT},0)
|
|||
|
||||
certificates: $(ROT_KEY)
|
||||
|
||||
$(ROT_KEY): | $(BUILD_PLAT)
|
||||
$(ROT_KEY): | $$(@D)/
|
||||
$(s)echo " OPENSSL $@"
|
||||
$(q)${OPENSSL_BIN_PATH}/openssl genrsa 2048 > $@ 2>/dev/null
|
||||
|
||||
$(ROTPK_HASH): $(ROT_KEY)
|
||||
$(ROTPK_HASH): $(ROT_KEY) | $$(@D)/
|
||||
$(s)echo " OPENSSL $@"
|
||||
$(q)${OPENSSL_BIN_PATH}/openssl rsa -in $< -pubout -outform DER 2>/dev/null |\
|
||||
${OPENSSL_BIN_PATH}/openssl dgst -sha256 -binary > $@ 2>/dev/null
|
||||
|
|
|
@ -71,11 +71,11 @@ $(eval $(call add_define_val,ROTPK_HASH,'"$(ROTPK_HASH)"'))
|
|||
$(BUILD_PLAT)/bl2/sq_rotpk.o: $(ROTPK_HASH)
|
||||
|
||||
certificates: $(ROT_KEY)
|
||||
$(ROT_KEY): | $(BUILD_PLAT)
|
||||
$(ROT_KEY): | $$(@D)/
|
||||
$(s)echo " OPENSSL $@"
|
||||
$(q)${OPENSSL_BIN_PATH}/openssl genrsa 2048 > $@ 2>/dev/null
|
||||
|
||||
$(ROTPK_HASH): $(ROT_KEY)
|
||||
$(ROTPK_HASH): $(ROT_KEY) | $$(@D)/
|
||||
$(s)echo " OPENSSL $@"
|
||||
$(q)${OPENSSL_BIN_PATH}/openssl rsa -in $< -pubout -outform DER 2>/dev/null |\
|
||||
${OPENSSL_BIN_PATH}/openssl dgst -sha256 -binary > $@ 2>/dev/null
|
||||
|
|
|
@ -105,11 +105,11 @@ $(eval $(call add_define_val,ROTPK_HASH,'"$(ROTPK_HASH)"'))
|
|||
$(BUILD_PLAT)/bl2/uniphier_rotpk.o: $(ROTPK_HASH)
|
||||
|
||||
certificates: $(ROT_KEY)
|
||||
$(ROT_KEY): | $(BUILD_PLAT)
|
||||
$(ROT_KEY): | $$(@D)/
|
||||
$(s)echo " OPENSSL $@"
|
||||
$(q)${OPENSSL_BIN_PATH}/openssl genrsa 2048 > $@ 2>/dev/null
|
||||
|
||||
$(ROTPK_HASH): $(ROT_KEY)
|
||||
$(ROTPK_HASH): $(ROT_KEY) | $$(@D)/
|
||||
$(s)echo " OPENSSL $@"
|
||||
$(q)${OPENSSL_BIN_PATH}/openssl rsa -in $< -pubout -outform DER 2>/dev/null |\
|
||||
${OPENSSL_BIN_PATH}/openssl dgst -sha256 -binary > $@ 2>/dev/null
|
||||
|
|
Loading…
Add table
Reference in a new issue