Adjusted OpenSbi configuration

Signed-off-by: Wojciech Ozga <woz@zurich.ibm.com>
IBM · Sep 5, 2024 · 0698575 · 0698575
1 parent ceccd81
commit 0698575
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/security-monitor/platform/generic/configs/defconfig b/security-monitor/platform/generic/configs/defconfig
@@ -1,8 +1,9 @@
 # CONFIG_FDT_GPIO=y
 # CONFIG_FDT_I2C=y
 CONFIG_FDT_IPI=y
-# CONFIG_FDT_IRQCHIP=y
-# CONFIG_FDT_IRQCHIP_APLIC=y
+CONFIG_FDT_IRQCHIP=y
+CONFIG_FDT_IRQCHIP_APLIC=y
+CONFIG_FDT_IRQCHIP_IMSIC=y
 CONFIG_FDT_IRQCHIP_PLIC=y
 # CONFIG_FDT_REGMAP=y
 # CONFIG_FDT_REGMAP_SYSCON=y

diff --git a/security-monitor/platform/generic/include/platform_override.h b/security-monitor/platform/generic/include/platform_override.h
@@ -36,4 +36,4 @@ struct platform_override {
 				   const struct fdt_match *match);
 };
 
-#endif
+#endif
diff --git a/security-monitor/platform/generic/objects.mk b/security-monitor/platform/generic/objects.mk
@@ -11,7 +11,7 @@
 platform-cppflags-y =
 platform-cflags-y =
 platform-asflags-y =
-platform-ldflags-y =-L$(SM_WORK_DIR) -lace
+platform-ldflags-y = -L$(SM_WORK_DIR) -lace
 
 # Command for platform specific "make run"
 platform-runcmd = qemu-system-riscv$(PLATFORM_RISCV_XLEN) -M virt -m 256M \

diff --git a/security-monitor/platform/generic/platform.c b/security-monitor/platform/generic/platform.c
@@ -16,7 +16,6 @@
 #include <sbi/sbi_platform.h>
 #include <sbi/sbi_string.h>
 #include <sbi/sbi_system.h>
-#include <sbi/sbi_console.h>
 #include <sbi/sbi_tlb.h>
 #include <sbi_utils/fdt/fdt_domain.h>
 #include <sbi_utils/fdt/fdt_fixup.h>
@@ -293,7 +292,7 @@ static int generic_domains_init(void)
 		if (offset >= 0 &&
 		    fdt_get_property(fdt, offset, "system-suspend-test", NULL))
 			sbi_system_suspend_test_enable();
-	}	
+	}
 
 	return 0;
 }
@@ -395,4 +394,4 @@ struct sbi_platform platform = {
 	.hart_stack_size	= SBI_PLATFORM_DEFAULT_HART_STACK_SIZE,
 	.heap_size		= SBI_PLATFORM_DEFAULT_HEAP_SIZE(0),
 	.platform_ops_addr	= (unsigned long)&platform_ops
-};
+};
diff --git a/security-monitor/platform/generic/platform_override_modules.carray b/security-monitor/platform/generic/platform_override_modules.carray
@@ -1,3 +1,3 @@
 HEADER: platform_override.h
 TYPE: const struct platform_override
-NAME: platform_override_modules
+NAME: platform_override_modules
-Original file line number
+Diff line change
@@ Expand Up / @@ -36,4 +36,4 @@ struct platform_override { @@
     				   const struct fdt_match *match);
     };
-    #endif
+    #endif