platform: ariane: Move ariane platform from fpga to generic
PATCH 1/1 platform: ariane: Move ariane platform from fpga to generic
The Ariane framework has a generic PMU that is not used by OpenSBI. Due to OpenSBI’s build system we cannot directly reuse the generic platform functions, so move the Ariane platform to generic. Also due to the generic platform is where new features are added.
Signed-off-by Manuel Hernández Méndez <[email protected]>
---
docs/platform/fpga-ariane.md | 4 +-
docs/platform/generic.md | 2 +
docs/platform/platform.md | 5 ---
platform/fpga/ariane/Kconfig | 10 -----
platform/fpga/ariane/configs/defconfig | 0
platform/fpga/ariane/objects.mk | 42 -------------------
platform/generic/Kconfig | 4 ++
platform/generic/configs/defconfig | 1 +
.../openhwgroup/ariane.c} | 42 +++++++++----------
platform/generic/openhwgroup/objects.mk | 3 ++
10 files changed, 31 insertions(+), 82 deletions(-)
delete mode 100644 platform/fpga/ariane/Kconfig
delete mode 100644 platform/fpga/ariane/configs/defconfig
delete mode 100644 platform/fpga/ariane/objects.mk
rename platform/{fpga/ariane/platform.c => generic/openhwgroup/ariane.c} (77%)docs/platform/fpga-ariane.md +2 -2
@@ -13,7 +13,7 @@ The FPGA SoC currently contains the following peripherals: - Bootrom containing zero stage bootloader and device tree. To build platform specific library and firmwares, provide the -*PLATFORM=fpga/ariane* parameter to the top level `make` command. +*PLATFORM=generic* parameter to the top level `make` command. Platform Options ----------------
@@ -26,7 +26,7 @@ Building Ariane FPGA Platform **Linux Kernel Payload** ``` -make PLATFORM=fpga/ariane FW_PAYLOAD_PATH=<linux_build_directory>/arch/riscv/boot/Image +make PLATFORM=generic FW_PAYLOAD_PATH=<linux_build_directory>/arch/riscv/boot/Image ``` Booting Ariane FPGA Platform
docs/platform/generic.md +2 -0
@@ -48,6 +48,7 @@ RISC-V Platforms Using Generic Platform * **Spike** (*[spike.md]*) * **T-HEAD C9xx series Processors** (*[thead-c9xx.md]*) * **OpenPiton FPGA SoC** (*[fpga-openpiton.md]*) +* **Ariane FPGA SoC** (*[fpga-ariane.md]*) [andes-ae350.md]: andes-ae350.md [qemu_virt.md]: qemu_virt.md
@@ -57,3 +58,4 @@ RISC-V Platforms Using Generic Platform [spike.md]: spike.md [thead-c9xx.md]: thead-c9xx.md [fpga-openpiton.md]: fpga-openpiton.md +[fpga-ariane.md]: fpga-ariane.md
docs/platform/platform.md +0 -5
@@ -21,10 +21,6 @@ OpenSBI currently supports the following virtual and hardware platforms: * **Kendryte K210 SoC**: Platform support for the Kendryte K210 SoC used on boards such as the Kendryte KD233 or the Sipeed MAIX Dock. -* **Ariane FPGA SoC**: Platform support for the Ariane FPGA SoC used on - Genesys 2 board. More details on this platform can be found in the file - *[fpga-ariane.md]*. - * **Andes AE350 SoC**: Platform support for the Andes's SoC (AE350). More details on this platform can be found in the file *[andes-ae350.md]*.
@@ -48,7 +44,6 @@ comments to facilitate the implementation. [generic.md]: generic.md [qemu_virt.md]: qemu_virt.md [sifive_fu540.md]: sifive_fu540.md -[fpga-ariane.md]: fpga-ariane.md [andes-ae350.md]: andes-ae350.md [thead-c910.md]: thead-c910.md [spike.md]: spike.md
platform/fpga/ariane/Kconfig deleted +0 -10
@@ -1,10 +0,0 @@ -# SPDX-License-Identifier: BSD-2-Clause - -config PLATFORM_ARIANE_FPGA - bool - select FDT - select IPI_MSWI - select IRQCHIP_PLIC - select SERIAL_UART8250 - select TIMER_MTIMER - default y
platform/fpga/ariane/configs/defconfig deleted +0 -0
platform/fpga/ariane/objects.mk deleted +0 -42
42 lines not on this page · raw message
platform/generic/Kconfig +4 -0
@@ -47,6 +47,10 @@ config PLATFORM_OPENHWGROUP_OPENPITON bool "OpenHWGroup Openpiton support" default n +config PLATFORM_OPENHWGROUP_ARIANE + bool "OpenHWGroup Ariane support" + default n + config PLATFORM_RENESAS_RZFIVE bool "Renesas RZ/Five support" select ANDES_PMA
platform/generic/configs/defconfig +1 -0
@@ -1,6 +1,7 @@ CONFIG_PLATFORM_ALLWINNER_D1=y CONFIG_PLATFORM_ANDES_AE350=y CONFIG_PLATFORM_ANDES_QILAI=y +CONFIG_PLATFORM_OPENHWGROUP_ARIANE=y CONFIG_PLATFORM_OPENHWGROUP_OPENPITON=y CONFIG_PLATFORM_RENESAS_RZFIVE=y CONFIG_PLATFORM_SIFIVE_FU540=y
platform/generic/openhwgroup/ariane.c renamed from platform/fpga/ariane/platform.c +19 -23
60 lines not on this page · raw message
platform/generic/openhwgroup/objects.mk +3 -0
@@ -6,3 +6,6 @@ carray-platform_override_modules-$(CONFIG_PLATFORM_OPENHWGROUP_OPENPITON) += openhwgroup_openpiton platform-objs-$(CONFIG_PLATFORM_OPENHWGROUP_OPENPITON) += openhwgroup/openpiton.o + +carray-platform_override_modules-$(CONFIG_PLATFORM_OPENHWGROUP_ARIANE) += openhwgroup_ariane +platform-objs-$(CONFIG_PLATFORM_OPENHWGROUP_ARIANE) += openhwgroup/ariane.o
Signature · 7 lines
2.34.1 -- opensbi mailing list [email protected] http://lists.infradead.org/mailman/listinfo/opensbi