From 49380244202460aa2fd322dc9a3bdd79b388bf9d Mon Sep 17 00:00:00 2001 From: Atish Patra Date: Sat, 9 May 2020 16:47:29 -0700 Subject: [PATCH] platform: fpga: Remove redundant platform specific features Any platform feature that belongs to a hart, have already been moved to hart features and are detected at run time. The remaining platform features are identical to platform default features. Use the platform default features instead of defining a separate copy of it. Signed-off-by: Atish Patra Tested-by: Jonathan Balkind Reviewed-by: Anup Patel --- platform/fpga/ariane/platform.c | 6 +----- platform/fpga/openpiton/platform.c | 6 +----- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/platform/fpga/ariane/platform.c b/platform/fpga/ariane/platform.c index ad64c74..ba9ef9d 100644 --- a/platform/fpga/ariane/platform.c +++ b/platform/fpga/ariane/platform.c @@ -26,10 +26,6 @@ #define ARIANE_HART_COUNT 1 #define ARIANE_CLINT_ADDR 0x2000000 -#define SBI_ARIANE_FEATURES \ - (SBI_PLATFORM_HAS_TIMER_VALUE | \ - SBI_PLATFORM_HAS_MFAULTS_DELEGATION) - /* * Ariane platform early initialization. */ @@ -181,7 +177,7 @@ const struct sbi_platform platform = { .opensbi_version = OPENSBI_VERSION, .platform_version = SBI_PLATFORM_VERSION(0x0, 0x01), .name = "ARIANE RISC-V", - .features = SBI_ARIANE_FEATURES, + .features = SBI_PLATFORM_DEFAULT_FEATURES, .hart_count = ARIANE_HART_COUNT, .hart_stack_size = SBI_PLATFORM_DEFAULT_HART_STACK_SIZE, .platform_ops_addr = (unsigned long)&platform_ops diff --git a/platform/fpga/openpiton/platform.c b/platform/fpga/openpiton/platform.c index 89512e1..776ca35 100644 --- a/platform/fpga/openpiton/platform.c +++ b/platform/fpga/openpiton/platform.c @@ -26,10 +26,6 @@ #define OPENPITON_DEFAULT_HART_COUNT 3 #define OPENPITON_DEFAULT_CLINT_ADDR 0xfff1020000 -#define SBI_OPENPITON_FEATURES \ - (SBI_PLATFORM_HAS_TIMER_VALUE | \ - SBI_PLATFORM_HAS_MFAULTS_DELEGATION) - static struct platform_uart_data uart = { OPENPITON_DEFAULT_UART_ADDR, OPENPITON_DEFAULT_UART_FREQ, @@ -213,7 +209,7 @@ const struct sbi_platform platform = { .opensbi_version = OPENSBI_VERSION, .platform_version = SBI_PLATFORM_VERSION(0x0, 0x01), .name = "OPENPITON RISC-V", - .features = SBI_OPENPITON_FEATURES, + .features = SBI_PLATFORM_DEFAULT_FEATURES, .hart_count = OPENPITON_DEFAULT_HART_COUNT, .hart_stack_size = SBI_PLATFORM_DEFAULT_HART_STACK_SIZE, .platform_ops_addr = (unsigned long)&platform_ops -- 2.7.4