nios2: move soc to top-level dir soc/
Move the SoC outside of the architecture tree and put them at the same level as boards and architectures allowing both SoCs and boards to be maintained outside the tree. Signed-off-by: Anas Nashif <anas.nashif@intel.com>
This commit is contained in:
parent
279cc2e448
commit
696aa869d5
|
@ -32,5 +32,4 @@ else()
|
|||
zephyr_cc_option(-mno-hw-div)
|
||||
endif()
|
||||
|
||||
add_subdirectory(soc/${SOC_PATH})
|
||||
add_subdirectory(core)
|
||||
|
|
|
@ -7,7 +7,7 @@
|
|||
choice
|
||||
prompt "Nios II configuration selection"
|
||||
depends on NIOS2
|
||||
source "arch/nios2/soc/*/Kconfig.soc"
|
||||
source "soc/nios2/*/Kconfig.soc"
|
||||
endchoice
|
||||
|
||||
menu "Nios II Options"
|
||||
|
@ -17,7 +17,7 @@ menu "Nios II Options"
|
|||
# overriden (by defining symbols in multiple locations)
|
||||
#
|
||||
# (No SoC-specific Kconfig files as of writing, hence the optional source.)
|
||||
osource "arch/nios2/soc/*/Kconfig"
|
||||
osource "soc/nios2/*/Kconfig"
|
||||
|
||||
config ARCH
|
||||
string
|
||||
|
|
|
@ -1,2 +1,2 @@
|
|||
board_runner_args(nios2 "--cpu-sof=${ZEPHYR_BASE}/arch/nios2/soc/nios2f-zephyr/cpu/ghrd_10m50da.sof")
|
||||
board_runner_args(nios2 "--cpu-sof=${ZEPHYR_BASE}/soc/nios2/nios2f-zephyr/cpu/ghrd_10m50da.sof")
|
||||
include(${ZEPHYR_BASE}/boards/common/nios2.board.cmake)
|
||||
|
|
|
@ -94,11 +94,11 @@ Reference CPU
|
|||
=============
|
||||
|
||||
A reference CPU design of a Nios II/f core is included in the Zephyr tree
|
||||
in the :file:`arch/nios2/soc/nios2f-zephyr/cpu` directory.
|
||||
in the :file:`soc/nios2/nios2f-zephyr/cpu` directory.
|
||||
|
||||
Flash this CPU using the ``nios2-configure-sof`` SDK tool with the FPGA
|
||||
configuration file
|
||||
:file:`arch/nios2/soc/nios2f-zephyr/cpu/ghrd_10m50da.sof`:
|
||||
:file:`soc/nios2/nios2f-zephyr/cpu/ghrd_10m50da.sof`:
|
||||
|
||||
.. code-block:: console
|
||||
|
||||
|
|
Loading…
Reference in a new issue