Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

hwmv2: Native targets covert to HW model v2 #69034

Merged
merged 6 commits into from
Feb 16, 2024
Merged

hwmv2: Native targets covert to HW model v2 #69034

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
14c8d1f
cmake: FindHostTools: Fix for hwmv2 for host based targets
aescolar Feb 14, 2024
8e62996
boards: nrf_bsim: Fix path to pinctrl_soc.h
aescolar Feb 15, 2024
8a05889
soc: native: Convert to HWMv2
aescolar Feb 14, 2024
8109792
board: native_sim/posix: Convert to hwmv2
aescolar Feb 14, 2024
ec70926
boards: nrf*_bsim: Convert to HW model v2
aescolar Feb 15, 2024
aecb641
MAINTAINERS: Change paths to native and nrf*bsim boards
aescolar Feb 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 0 additions & 24 deletions boards/boards_legacy/posix/native_posix/Kconfig.board
View file
Open in desktop

This file was deleted.

17 changes: 0 additions & 17 deletions boards/boards_legacy/posix/native_sim/Kconfig.board
View file
Open in desktop

This file was deleted.

0 ...cy/posix/common/extra_args/CMakeLists.txt → ...s/native/common/extra_args/CMakeLists.txt
View file
Open in desktop
File renamed without changes.
0 ...ds_legacy/posix/common/extra_args/Kconfig → boards/native/common/extra_args/Kconfig
View file
Open in desktop
File renamed without changes.
0 ...gacy/posix/common/extra_args/extra_args.c → boards/native/common/extra_args/extra_args.c
View file
Open in desktop
File renamed without changes.
0 ...oards_legacy/posix/common/irq/board_irq.h → boards/native/common/irq/board_irq.h
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...s_legacy/posix/common/natsim_config.cmake → boards/native/common/natsim_config.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ set(zephyr_build_path ${APPLICATION_BINARY_DIR}/zephyr)
get_property(CCACHE GLOBAL PROPERTY RULE_LAUNCH_COMPILE)

target_link_options(native_simulator INTERFACE
"-T ${ZEPHYR_BASE}/boards/boards_legacy/posix/common/natsim_linker_script.ld")
"-T ${ZEPHYR_BASE}/boards/native/common/natsim_linker_script.ld")

set(nsi_config_content
${nsi_config_content}
Expand Down
0 ...gacy/posix/common/natsim_linker_script.ld → boards/native/common/natsim_linker_script.ld
View file
Open in desktop
File renamed without changes.
0 ...ds_legacy/posix/common/sdl/CMakeLists.txt → boards/native/common/sdl/CMakeLists.txt
View file
Open in desktop
File renamed without changes.
0 ...ds/boards_legacy/posix/common/sdl/Kconfig → boards/native/common/sdl/Kconfig
View file
Open in desktop
File renamed without changes.
0 ...ards_legacy/posix/common/sdl/sdl_events.c → boards/native/common/sdl/sdl_events.c
View file
Open in desktop
File renamed without changes.
0 ...gacy/posix/common/sdl/sdl_events_bottom.c → boards/native/common/sdl/sdl_events_bottom.c
View file
Open in desktop
File renamed without changes.
0 ...gacy/posix/common/sdl/sdl_events_bottom.h → boards/native/common/sdl/sdl_events_bottom.h
View file
Open in desktop
File renamed without changes.
0 ...ards_legacy/posix/doc/Port_vs_QEMU_vs.svg → boards/native/doc/Port_vs_QEMU_vs.svg
View file
Open in desktop
File renamed without changes
0 ...ards_legacy/posix/doc/Zephyr_and_bsim.svg → boards/native/doc/Zephyr_and_bsim.svg
View file
Open in desktop
File renamed without changes
0 boards/boards_legacy/posix/doc/arch_soc.rst → boards/native/doc/arch_soc.rst
View file
Open in desktop
File renamed without changes.
0 ...s_legacy/posix/doc/bsim_boards_design.rst → boards/native/doc/bsim_boards_design.rst
View file
Open in desktop
File renamed without changes.
0 boards/boards_legacy/posix/doc/layering.svg → boards/native/doc/layering.svg
View file
Open in desktop
File renamed without changes
0 ...ards_legacy/posix/doc/layering_natsim.svg → boards/native/doc/layering_natsim.svg
View file
Open in desktop
File renamed without changes
0 boards/boards_legacy/posix/index.rst → boards/native/index.rst
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ..._legacy/posix/native_posix/CMakeLists.txt → boards/native/native_posix/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ zephyr_library_include_directories(
)

if(CONFIG_HAS_SDL)
add_subdirectory(${ZEPHYR_BASE}/boards/boards_legacy/${ARCH}/common/sdl/ ${CMAKE_CURRENT_BINARY_DIR}/sdl)
add_subdirectory(${ZEPHYR_BASE}/boards/native/common/sdl/ ${CMAKE_CURRENT_BINARY_DIR}/sdl)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why is this using a path from zephyr base, and not relative to current folder ?
Such as:

	 add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/../common/sdl/ ${CMAKE_CURRENT_BINARY_DIR}/sdl)

seems a bit safer.
However, current proposal is also ok, as I don't expect we'll be moving boards around so much more.

endif()

zephyr_ld_options(
Expand Down
21 changes: 20 additions & 1 deletion .../boards_legacy/posix/native_posix/Kconfig → boards/native/native_posix/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,25 @@ config BOARD_NATIVE_POSIX
imply NATIVE_POSIX_TIMER
select POSIX_ARCH_CONSOLE
select NATIVE_APPLICATION
help
Native POSIX - 32 bit version
Will produce a console Linux process which can be executed natively
as a 32-bit executable.
It provides some minimal needed models:
An interrupt controller, timer (system tick), and redirects kernel prints to
stdout.

config BOARD_NATIVE_POSIX_64
bool
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This represents an issue @tejlmand

select BOARD_NATIVE_POSIX
select 64BIT
help
Native POSIX - 64 bit version
Will produce a console Linux process which can be executed natively
as a 64-bit executable.
It provides some minimal needed models:
An interrupt controller, timer (system tick), and redirects kernel prints to
stdout.

if BOARD_NATIVE_POSIX

Expand All @@ -22,6 +41,6 @@ config NATIVE_POSIX_SLOWDOWN_TO_REAL_TIME
case the zephyr kernel and application cannot tell the difference unless they
interact with some other driver/device which runs at real time.

source "boards/boards_legacy/$(ARCH)/common/sdl/Kconfig"
source "boards/native/common/sdl/Kconfig"

endif # BOARD_NATIVE_POSIX
4 changes: 0 additions & 4 deletions ...gacy/posix/native_posix/Kconfig.defconfig → boards/native/native_posix/Kconfig.defconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,6 @@ config BUILD_OUTPUT_EXE
config OUTPUT_PRINT_MEMORY_USAGE
default n

config BOARD
default "native_posix_64" if BOARD_NATIVE_POSIX_64BIT
default "native_posix"

if NETWORKING

config NET_L2_ETHERNET
Expand Down
5 changes: 5 additions & 0 deletions boards/native/native_posix/Kconfig.native_posix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# Copyright (c) 2024 Nordic Semiconductor ASA
# SPDX-License-Identifier: Apache-2.0

config BOARD_NATIVE_POSIX
select SOC_POSIX
5 changes: 5 additions & 0 deletions boards/native/native_posix/Kconfig.native_posix_64
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# Copyright (c) 2024 Nordic Semiconductor ASA
# SPDX-License-Identifier: Apache-2.0

config BOARD_NATIVE_POSIX_64
select SOC_POSIX
0 ...rds_legacy/posix/native_posix/board.cmake → boards/native/native_posix/board.cmake
View file
Open in desktop
File renamed without changes.
9 changes: 9 additions & 0 deletions boards/native/native_posix/board.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
boards:
- name: native_posix
vendor: Zephyr
socs:
- name: native
- name: native_posix_64
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should it be the board or the soc that is considered 64bit ?

Meaning, should we instead have:

board:
  name: native_posix
  vendor: Zephyr
  socs:
  - name: native
  - name: native_64

Considering the SoC 64bit then that would also remove the need for:

config BOARD_NATIVE_POSIX_64
	 bool
	 select BOARD_NATIVE_POSIX
	 select 64BIT

as the 64bit is then selected by the soc and there is no need to select BOARD_NATIVE_POSIX.
I also think this aligns more with what is done for qemu boards.

@nordicjm thoughts ?

Copy link
Member Author

@aescolar aescolar Feb 16, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should it be the board or the soc that is considered 64bit ?

I intended to do that as a follow up. In this PR I hoped to bring everything back to working order in the hwmv2 format while keeping the PR reasonably sized. The next steps were to define this and the nrf5340 as having different socs , change all tests and BT test infra accordingly, and then remove this "backwards compatible" board definitions.

@nordicjm 's pointed issue would still apply for the nrf*bsim boards, there the nrf52 will remain separate from the nrf53 anyhow.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

true, and it's a side-effect of allowing multiple boards being defined in board.yml.

Something which would needs to be addressed.

vendor: Zephyr
socs:
- name: native
0 ...rds_legacy/posix/native_posix/board_irq.h → boards/native/native_posix/board_irq.h
View file
Open in desktop
File renamed without changes.
0 ...rds_legacy/posix/native_posix/board_soc.h → boards/native/native_posix/board_soc.h
View file
Open in desktop
File renamed without changes.
0 ...oards_legacy/posix/native_posix/cmdline.c → boards/native/native_posix/cmdline.c
View file
Open in desktop
File renamed without changes.
0 ...oards_legacy/posix/native_posix/cmdline.h → boards/native/native_posix/cmdline.h
View file
Open in desktop
File renamed without changes.
0 ...egacy/posix/native_posix/cmdline_common.c → boards/native/native_posix/cmdline_common.c
View file
Open in desktop
File renamed without changes.
0 ...egacy/posix/native_posix/cmdline_common.h → boards/native/native_posix/cmdline_common.h
View file
Open in desktop
File renamed without changes.
0 ...ards_legacy/posix/native_posix/cpu_wait.c → boards/native/native_posix/cpu_wait.c
View file
Open in desktop
File renamed without changes.
0 ...s_legacy/posix/native_posix/doc/index.rst → boards/native/native_posix/doc/index.rst
View file
Open in desktop
File renamed without changes.
0 ...ds_legacy/posix/native_posix/hw_counter.c → boards/native/native_posix/hw_counter.c
View file
Open in desktop
File renamed without changes.
0 ...ds_legacy/posix/native_posix/hw_counter.h → boards/native/native_posix/hw_counter.h
View file
Open in desktop
File renamed without changes.
0 ...legacy/posix/native_posix/hw_models_top.c → boards/native/native_posix/hw_models_top.c
View file
Open in desktop
File renamed without changes.
0 ...legacy/posix/native_posix/hw_models_top.h → boards/native/native_posix/hw_models_top.h
View file
Open in desktop
File renamed without changes.
0 ...ards_legacy/posix/native_posix/irq_ctrl.c → boards/native/native_posix/irq_ctrl.c
View file
Open in desktop
File renamed without changes.
0 ...ards_legacy/posix/native_posix/irq_ctrl.h → boards/native/native_posix/irq_ctrl.h
View file
Open in desktop
File renamed without changes.
0 ...s_legacy/posix/native_posix/irq_handler.c → boards/native/native_posix/irq_handler.c
View file
Open in desktop
File renamed without changes.
0 ...s_legacy/posix/native_posix/irq_handler.h → boards/native/native_posix/irq_handler.h
View file
Open in desktop
File renamed without changes.
0 ...s/boards_legacy/posix/native_posix/main.c → boards/native/native_posix/main.c
View file
Open in desktop
File renamed without changes.
0 ...egacy/posix/native_posix/native_posix.dts → boards/native/native_posix/native_posix.dts
View file
Open in desktop
File renamed without changes.
0 ...gacy/posix/native_posix/native_posix.yaml → boards/native/native_posix/native_posix.yaml
View file
Open in desktop
File renamed without changes.
0 ...cy/posix/native_posix/native_posix_64.dts → ...s/native/native_posix/native_posix_64.dts
View file
Open in desktop
File renamed without changes.
0 ...y/posix/native_posix/native_posix_64.yaml → .../native/native_posix/native_posix_64.yaml
View file
Open in desktop
File renamed without changes.
2 changes: 0 additions & 2 deletions ...ix/native_posix/native_posix_64_defconfig → ...ve/native_posix/native_posix_64_defconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
# SPDX-License-Identifier: Apache-2.0

CONFIG_SOC_POSIX=y
CONFIG_BOARD_NATIVE_POSIX_64BIT=y
CONFIG_CONSOLE=y
CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=1000000
2 changes: 0 additions & 2 deletions ...posix/native_posix/native_posix_defconfig → ...ative/native_posix/native_posix_defconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
# SPDX-License-Identifier: Apache-2.0

CONFIG_SOC_POSIX=y
CONFIG_BOARD_NATIVE_POSIX_32BIT=y
CONFIG_CONSOLE=y
CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=1000000
0 ...ds_legacy/posix/native_posix/native_rtc.c → boards/native/native_posix/native_rtc.c
View file
Open in desktop
File renamed without changes.
0 ...ds_legacy/posix/native_posix/native_rtc.h → boards/native/native_posix/native_rtc.h
View file
Open in desktop
File renamed without changes.
0 ...egacy/posix/native_posix/native_tracing.h → boards/native/native_posix/native_tracing.h
View file
Open in desktop
File renamed without changes.
0 ...s_legacy/posix/native_posix/timer_model.c → boards/native/native_posix/timer_model.c
View file
Open in desktop
File renamed without changes.
0 ...s_legacy/posix/native_posix/timer_model.h → boards/native/native_posix/timer_model.h
View file
Open in desktop
File renamed without changes.
0 ...oards_legacy/posix/native_posix/tracing.c → boards/native/native_posix/tracing.c
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions ...ds_legacy/posix/native_sim/CMakeLists.txt → boards/native/native_sim/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@ zephyr_library_include_directories(
)

if(CONFIG_HAS_SDL)
add_subdirectory(${ZEPHYR_BASE}/boards/boards_legacy/${ARCH}/common/sdl/ ${CMAKE_CURRENT_BINARY_DIR}/sdl)
add_subdirectory(${ZEPHYR_BASE}/boards/native/common/sdl/ ${CMAKE_CURRENT_BINARY_DIR}/sdl)
endif()

add_subdirectory(${ZEPHYR_BASE}/boards/boards_legacy/${ARCH}/common/extra_args/
add_subdirectory(${ZEPHYR_BASE}/boards/native/common/extra_args/
${CMAKE_CURRENT_BINARY_DIR}/extra_args
)

Expand Down
20 changes: 16 additions & 4 deletions ...ds/boards_legacy/posix/native_sim/Kconfig → boards/native/native_sim/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,24 @@
# SPDX-License-Identifier: Apache-2.0

config BOARD_NATIVE_SIM
bool "Native simulator (Single Core)"
bool
select POSIX_ARCH_CONSOLE
select NATIVE_LIBRARY
select NATIVE_POSIX_TIMER
depends on SOC_POSIX
imply BOARD_NATIVE_POSIX if NATIVE_SIM_NATIVE_POSIX_COMPAT
help
Native simulator (Single Core)
Will produce a console Linux process which can be executed natively
as a 32-bit executable.

config BOARD_NATIVE_SIM_64
bool
select BOARD_NATIVE_SIM
select 64BIT
help
Native simulator (Single Core) - 64 bit version
Will produce a console Linux process which can be executed natively
as a 64-bit executable.

if BOARD_NATIVE_SIM

Expand Down Expand Up @@ -45,7 +57,7 @@ config NATIVE_POSIX_SLOWDOWN_TO_REAL_TIME
Transitional option which allows applications which targeted native_posix
to set the correct native_sim option (CONFIG_NATIVE_SIM_SLOWDOWN_TO_REAL_TIME)

source "boards/boards_legacy/$(ARCH)/common/sdl/Kconfig"
source "boards/boards_legacy/$(ARCH)/common/extra_args/Kconfig"
source "boards/native/common/sdl/Kconfig"
source "boards/native/common/extra_args/Kconfig"

endif # BOARD_NATIVE_SIM
4 changes: 0 additions & 4 deletions ...legacy/posix/native_sim/Kconfig.defconfig → boards/native/native_sim/Kconfig.defconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,6 @@ config BUILD_OUTPUT_EXE
config OUTPUT_PRINT_MEMORY_USAGE
default n

config BOARD
default "native_sim_64" if BOARD_NATIVE_SIM_64BIT
default "native_sim"

if NETWORKING

config NET_L2_ETHERNET
Expand Down
5 changes: 5 additions & 0 deletions boards/native/native_sim/Kconfig.native_sim
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# Copyright (c) 2024 Nordic Semiconductor ASA
# SPDX-License-Identifier: Apache-2.0

config BOARD_NATIVE_SIM
select SOC_POSIX
5 changes: 5 additions & 0 deletions boards/native/native_sim/Kconfig.native_sim_64
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# Copyright (c) 2024 Nordic Semiconductor ASA
# SPDX-License-Identifier: Apache-2.0

config BOARD_NATIVE_SIM_64
select SOC_POSIX
0 ...oards_legacy/posix/native_sim/board.cmake → boards/native/native_sim/board.cmake
View file
Open in desktop
File renamed without changes.
9 changes: 9 additions & 0 deletions boards/native/native_sim/board.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
boards:
- name: native_sim
vendor: Zephyr
socs:
- name: native
- name: native_sim_64
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess similar comment regarding the board or soc being 64bit applies here.

vendor: Zephyr
socs:
- name: native
0 ...oards_legacy/posix/native_sim/board_irq.h → boards/native/native_sim/board_irq.h
View file
Open in desktop
File renamed without changes.
0 ...oards_legacy/posix/native_sim/board_soc.h → boards/native/native_sim/board_soc.h
View file
Open in desktop
File renamed without changes.
0 .../boards_legacy/posix/native_sim/cmdline.c → boards/native/native_sim/cmdline.c
View file
Open in desktop
File renamed without changes.
0 .../boards_legacy/posix/native_sim/cmdline.h → boards/native/native_sim/cmdline.h
View file
Open in desktop
File renamed without changes.
0 ..._legacy/posix/native_sim/cmdline_common.h → boards/native/native_sim/cmdline_common.h
View file
Open in desktop
File renamed without changes.
0 ...boards_legacy/posix/native_sim/cpu_wait.c → boards/native/native_sim/cpu_wait.c
View file
Open in desktop
File renamed without changes.
0 ...rds_legacy/posix/native_sim/doc/index.rst → boards/native/native_sim/doc/index.rst
View file
Open in desktop
File renamed without changes.
0 ...rds_legacy/posix/native_sim/irq_handler.c → boards/native/native_sim/irq_handler.c
View file
Open in desktop
File renamed without changes.
0 ...rds_legacy/posix/native_sim/irq_handler.h → boards/native/native_sim/irq_handler.h
View file
Open in desktop
File renamed without changes.
0 boards/boards_legacy/posix/native_sim/misc.c → boards/native/native_sim/misc.c
View file
Open in desktop
File renamed without changes.
0 ...cy/posix/native_sim/native_posix_compat.h → ...s/native/native_sim/native_posix_compat.h
View file
Open in desktop
File renamed without changes.
0 ...ds_legacy/posix/native_sim/native_sim.dts → boards/native/native_sim/native_sim.dts
View file
Open in desktop
File renamed without changes.
0 ...s_legacy/posix/native_sim/native_sim.yaml → boards/native/native_sim/native_sim.yaml
View file
Open in desktop
File renamed without changes.
0 ...legacy/posix/native_sim/native_sim_64.dts → boards/native/native_sim/native_sim_64.dts
View file
Open in desktop
File renamed without changes.
0 ...egacy/posix/native_sim/native_sim_64.yaml → boards/native/native_sim/native_sim_64.yaml
View file
Open in desktop
File renamed without changes.
2 changes: 0 additions & 2 deletions .../posix/native_sim/native_sim_64_defconfig → ...native/native_sim/native_sim_64_defconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
# SPDX-License-Identifier: Apache-2.0

CONFIG_SOC_POSIX=y
CONFIG_BOARD_NATIVE_SIM_64BIT=y
CONFIG_CONSOLE=y
CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=1000000
2 changes: 0 additions & 2 deletions ...acy/posix/native_sim/native_sim_defconfig → ...ds/native/native_sim/native_sim_defconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
# SPDX-License-Identifier: Apache-2.0

CONFIG_SOC_POSIX=y
CONFIG_BOARD_NATIVE_SIM_32BIT=y
CONFIG_CONSOLE=y
CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=1000000
0 ...s/boards_legacy/posix/native_sim/nsi_if.c → boards/native/native_sim/nsi_if.c
View file
Open in desktop
File renamed without changes.
0 ...s_legacy/posix/native_sim/posix_arch_if.c → boards/native/native_sim/posix_arch_if.c
View file
Open in desktop
File renamed without changes.
0 ...rds_legacy/posix/native_sim/timer_model.h → boards/native/native_sim/timer_model.h
View file
Open in desktop
File renamed without changes.