From 5cab7646fcaa59adef1a450d22a2e5ecb3ef7720 Mon Sep 17 00:00:00 2001 From: Gregor Haas Date: Thu, 25 Jan 2024 18:00:48 -0800 Subject: [PATCH] fix build --- mkutils/plat/generic/run.mk | 2 +- sm/src/platform/fpga/ariane/platform.h | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/mkutils/plat/generic/run.mk b/mkutils/plat/generic/run.mk index 534310715..6b5f7ad7c 100644 --- a/mkutils/plat/generic/run.mk +++ b/mkutils/plat/generic/run.mk @@ -19,7 +19,7 @@ QEMU_FLAGS := -m $(QEMU_MEM) -smp $(QEMU_SMP) -display none \ -netdev user,id=net0,net=192.168.100.1/24,dhcpstart=192.168.100.128,hostfwd=tcp::$(QEMU_PORT)-:22 \ -device virtio-net-device,netdev=net0 \ -device virtio-rng-pci \ - -serial stdio -serial file:/tmp/serial.out + -serial mon:stdio -serial file:/tmp/serial.out ifneq ($(KEYSTONE_DEBUG),) QEMU_FLAGS += $(QEMU_DEBUG) diff --git a/sm/src/platform/fpga/ariane/platform.h b/sm/src/platform/fpga/ariane/platform.h index 09fa7841f..dbbcdfb1c 100644 --- a/sm/src/platform/fpga/ariane/platform.h +++ b/sm/src/platform/fpga/ariane/platform.h @@ -22,6 +22,11 @@ struct platform_enclave_data{ // CPU configuration #define MAX_HARTS 5 +// Device configuration +#define DEV_NAMELEN 64 +#define NUM_SECURE_DEVS 8 +#define NUM_NONSECURE_DEVS 8 +#define NUM_DISABLED_DEVS 8 // Initialization functions void sm_copy_key(void);