soc: nios2f-zephyr: Port to HWMv2

Ports the nios2f-zephyr SoC configuration to hardware model version 2 Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
2024-01-11 13:47:18 +00:00
parent 97401c7d2a
commit c381edcb73
18 changed files with 17 additions and 7 deletions
--- a/soc/v2/altera/zephyr_nios2f/CMakeLists.txt
+++ b/soc/v2/altera/zephyr_nios2f/CMakeLists.txt
@@ -1,5 +1,7 @@
+# Copyright (c) 2016 Intel Corporation
 # SPDX-License-Identifier: Apache-2.0

 zephyr_include_directories(include)
+zephyr_include_directories(.)

 set(SOC_LINKER_SCRIPT ${CMAKE_CURRENT_SOURCE_DIR}/linker.ld CACHE INTERNAL "")
--- a/soc/v2/altera/zephyr_nios2f/Kconfig
+++ b/soc/v2/altera/zephyr_nios2f/Kconfig
@@ -1,7 +1,7 @@
+# Copyright (c) 2016 Intel Corporation
 # SPDX-License-Identifier: Apache-2.0

-config SOC_NIOS2F_ZEPHYR
-	bool "Nios IIf - Zephyr Golden Configuration"
+config SOC_ZEPHYR_NIOS2F
 	select NIOS2
 	select HAS_MUL_INSTRUCTION
 	select HAS_DIV_INSTRUCTION
--- a/soc/v2/altera/zephyr_nios2f/Kconfig.defconfig
+++ b/soc/v2/altera/zephyr_nios2f/Kconfig.defconfig
@@ -1,9 +1,7 @@
+# Copyright (c) 2016 Intel Corporation
 # SPDX-License-Identifier: Apache-2.0

-if SOC_NIOS2F_ZEPHYR
-
-config SOC
-	default "nios2f-zephyr"
+if SOC_ZEPHYR_NIOS2F

 config SYS_CLOCK_HW_CYCLES_PER_SEC
 	default 50000000
@@ -23,4 +21,4 @@ config ALTERA_AVALON_MSGDMA
 	def_bool y
 	depends on DMA_NIOS2_MSGDMA

-endif # SOC_NIOS2F_ZEPHYR
+endif # SOC_ZEPHYR_NIOS2F
--- a/soc/v2/altera/zephyr_nios2f/Kconfig.soc
+++ b/soc/v2/altera/zephyr_nios2f/Kconfig.soc
@@ -0,0 +1,8 @@
+# Copyright (c) 2016 Intel Corporation
+# SPDX-License-Identifier: Apache-2.0
+
+config SOC_ZEPHYR_NIOS2F
+	bool
+
+config SOC
+	default "zephyr_nios2f" if SOC_ZEPHYR_NIOS2F
--- a/soc/v2/altera/zephyr_nios2f/cpu/README
+++ b/soc/v2/altera/zephyr_nios2f/cpu/README
--- a/soc/v2/altera/zephyr_nios2f/cpu/ghrd_10m50da.qpf
+++ b/soc/v2/altera/zephyr_nios2f/cpu/ghrd_10m50da.qpf
--- a/soc/v2/altera/zephyr_nios2f/cpu/ghrd_10m50da.qsf
+++ b/soc/v2/altera/zephyr_nios2f/cpu/ghrd_10m50da.qsf
--- a/soc/v2/altera/zephyr_nios2f/cpu/ghrd_10m50da.qsys
+++ b/soc/v2/altera/zephyr_nios2f/cpu/ghrd_10m50da.qsys
--- a/soc/v2/altera/zephyr_nios2f/cpu/ghrd_10m50da.sof
+++ b/soc/v2/altera/zephyr_nios2f/cpu/ghrd_10m50da.sof
--- a/soc/v2/altera/zephyr_nios2f/cpu/ghrd_10m50da.sopcinfo
+++ b/soc/v2/altera/zephyr_nios2f/cpu/ghrd_10m50da.sopcinfo
--- a/soc/v2/altera/zephyr_nios2f/cpu/ghrd_10m50da_top.v
+++ b/soc/v2/altera/zephyr_nios2f/cpu/ghrd_10m50da_top.v
--- a/soc/v2/altera/zephyr_nios2f/cpu/ghrd_timing.sdc
+++ b/soc/v2/altera/zephyr_nios2f/cpu/ghrd_timing.sdc
--- a/soc/v2/altera/zephyr_nios2f/include/layout.h
+++ b/soc/v2/altera/zephyr_nios2f/include/layout.h
--- a/soc/v2/altera/zephyr_nios2f/include/linker.h
+++ b/soc/v2/altera/zephyr_nios2f/include/linker.h
--- a/soc/v2/altera/zephyr_nios2f/include/system.h
+++ b/soc/v2/altera/zephyr_nios2f/include/system.h
--- a/soc/v2/altera/zephyr_nios2f/linker.ld
+++ b/soc/v2/altera/zephyr_nios2f/linker.ld
--- a/soc/v2/altera/zephyr_nios2f/soc.h
+++ b/soc/v2/altera/zephyr_nios2f/soc.h
--- a/soc/v2/altera/zephyr_nios2f/soc.yml
+++ b/soc/v2/altera/zephyr_nios2f/soc.yml
@@ -0,0 +1,2 @@
+socs:
+  - name: zephyr_nios2f