From c077c75b8d826ae02b4690a5a548961d8cfcb90f Mon Sep 17 00:00:00 2001 From: Michael Scire Date: Wed, 19 Jun 2019 12:04:43 -0700 Subject: [PATCH] sept: update makefile vars to allow for presigned bin --- sept/sept-secondary/Makefile | 6 +++--- sept/sept-secondary/key_derivation/src/se.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sept/sept-secondary/Makefile b/sept/sept-secondary/Makefile index 6bc94cd3d..fbbcac1a3 100644 --- a/sept/sept-secondary/Makefile +++ b/sept/sept-secondary/Makefile @@ -124,13 +124,13 @@ check_key_derivation: @$(MAKE) -C key_derivation $(BUILD): check_rebootstub check_key_derivation -ifeq ($(strip $(SEPT_ENC_00_PATH)),) +ifeq ($(strip $(SEPT_00_ENC_PATH)),) @[ -d $@ ] || mkdir -p $@ @$(MAKE) --no-print-directory -C $(BUILD) -f $(CURDIR)/Makefile else @touch $(TOPDIR)/$(TARGET).bin - @cp $(SEPT_ENC_00_PATH) $(TOPDIR)/$(TARGET)_00.enc - @cp $(SEPT_ENC_01_PATH) $(TOPDIR)/$(TARGET)_01.enc + @cp $(SEPT_00_ENC_PATH) $(TOPDIR)/$(TARGET)_00.enc + @cp $(SEPT_01_ENC_PATH) $(TOPDIR)/$(TARGET)_01.enc endif #--------------------------------------------------------------------------------- diff --git a/sept/sept-secondary/key_derivation/src/se.c b/sept/sept-secondary/key_derivation/src/se.c index 59ac47242..ede5a05d2 100644 --- a/sept/sept-secondary/key_derivation/src/se.c +++ b/sept/sept-secondary/key_derivation/src/se.c @@ -346,7 +346,7 @@ void trigger_se_blocking_op(unsigned int op, void *dst, size_t dst_size, const v se->ERR_STATUS_REG = se->ERR_STATUS_REG; se->INT_STATUS_REG = se->INT_STATUS_REG; - if (se->IN_LL_ADDR_REG != (uint32_t) get_physical_address(&in_ll) || se->OUT_LL_ADDR_REG != (uint32_t) get_physical_address(&out_ll) || (se->INT_STATUS_REG & 0x10)) { + if (se->IN_LL_ADDR_REG != (uint32_t) get_physical_address(&in_ll) || se->OUT_LL_ADDR_REG != (uint32_t) get_physical_address(&out_ll) || (se->FLAGS_REG & 0x3)) { generic_panic(); }