From 86a90e2ef5dc1e9b1c051a3e7e45efeb5623dbfa Mon Sep 17 00:00:00 2001 From: Christopher Swenson Date: Thu, 23 Jan 2025 16:04:06 -0800 Subject: [PATCH] Revert "Fix hardware model offset (how did this get here?)" This reverts commit cab7e4919efeab96abec614185718e4963cf7a72. --- hw-model/c-binding/examples/Makefile | 2 +- hw-model/c-binding/examples/api/caliptra_fuses.h | 2 +- hw-model/c-binding/examples/api/caliptra_mbox.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/hw-model/c-binding/examples/Makefile b/hw-model/c-binding/examples/Makefile index 126935fbd2..67af094a07 100644 --- a/hw-model/c-binding/examples/Makefile +++ b/hw-model/c-binding/examples/Makefile @@ -41,8 +41,8 @@ $(TARGET): $(OUT)/caliptra_model.h $(OBJS) clean: $(RM) -rf $(OUT) - $(RM) -rf api/*.o *.o run: $(TARGET) cargo --config="$(EXTRA_CARGO_CONFIG)" run --manifest-path=$(BUILDER_PATH)/Cargo.toml --bin image -- --rom-with-log $(OUT)/caliptra_rom.bin --fw $(OUT)/image_bundle.bin $(TARGET) -r $(OUT)/caliptra_rom.bin -f $(OUT)/image_bundle.bin + diff --git a/hw-model/c-binding/examples/api/caliptra_fuses.h b/hw-model/c-binding/examples/api/caliptra_fuses.h index df97b0368d..4c0669c769 100644 --- a/hw-model/c-binding/examples/api/caliptra_fuses.h +++ b/hw-model/c-binding/examples/api/caliptra_fuses.h @@ -15,7 +15,7 @@ extern "C" { #endif -#define EXTERNAL_PERIPH_BASE 0x00000000 +#define EXTERNAL_PERIPH_BASE 0x30000000 static inline void caliptra_fuse_write(caliptra_model *model, uint32_t offset, uint32_t data) { diff --git a/hw-model/c-binding/examples/api/caliptra_mbox.h b/hw-model/c-binding/examples/api/caliptra_mbox.h index 82cc8f4f63..0cd0f6e9a5 100644 --- a/hw-model/c-binding/examples/api/caliptra_mbox.h +++ b/hw-model/c-binding/examples/api/caliptra_mbox.h @@ -9,7 +9,7 @@ extern "C" { #endif -#define EXTERNAL_PERIPH_BASE 0x00000000 + #define EXTERNAL_PERIPH_BASE 0x30000000 static inline void caliptra_mbox_write(caliptra_model *model, uint32_t offset, uint32_t data) {