From d8b3efcbb0b734b2ed9749a4fcabe381db2ca4a6 Mon Sep 17 00:00:00 2001 From: Alberto Escolar Piedras Date: Fri, 22 Mar 2024 09:22:33 +0100 Subject: [PATCH] boards native_sim_64: Remove hwmv1 compatible board definition To use this functionality one must now use the native_sim//64 (variant) version. The old hwmv1 compatible name for the board was left provisionally while all tests in tree were ported. That being now done, this old name can be removed. After this change one cannot build anymore targeting native_sim_64, but must instead build targeting native_sim/[native]/64. For twister tests the old name is already not valid. Signed-off-by: Alberto Escolar Piedras --- boards/deprecated.cmake | 4 ++++ boards/native/native_sim/Kconfig | 9 --------- boards/native/native_sim/Kconfig.native_sim_64 | 5 ----- boards/native/native_sim/board.yml | 8 -------- boards/native/native_sim/native_sim_64.dts | 7 ------- boards/native/native_sim/native_sim_64_defconfig | 4 ---- 6 files changed, 4 insertions(+), 33 deletions(-) delete mode 100644 boards/native/native_sim/Kconfig.native_sim_64 delete mode 100644 boards/native/native_sim/native_sim_64.dts delete mode 100644 boards/native/native_sim/native_sim_64_defconfig diff --git a/boards/deprecated.cmake b/boards/deprecated.cmake index 0d1d0d35d6..89fe2515d0 100644 --- a/boards/deprecated.cmake +++ b/boards/deprecated.cmake @@ -409,6 +409,10 @@ set(native_posix_64_DEPRECATED native_posix/native/64 ) +set(native_sim_64_DEPRECATED + native_sim/native/64 +) + set(nrf21540dk_nrf52840_DEPRECATED nrf21540dk ) diff --git a/boards/native/native_sim/Kconfig b/boards/native/native_sim/Kconfig index e61028cce0..c2610e840e 100644 --- a/boards/native/native_sim/Kconfig +++ b/boards/native/native_sim/Kconfig @@ -12,15 +12,6 @@ config BOARD_NATIVE_SIM Native simulator (Single Core) Will produce a console Linux process which can be executed natively. -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 comment "Native Simular (Single Core) options" diff --git a/boards/native/native_sim/Kconfig.native_sim_64 b/boards/native/native_sim/Kconfig.native_sim_64 deleted file mode 100644 index c03791abd3..0000000000 --- a/boards/native/native_sim/Kconfig.native_sim_64 +++ /dev/null @@ -1,5 +0,0 @@ -# Copyright (c) 2024 Nordic Semiconductor ASA -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_NATIVE_SIM_64 - select SOC_POSIX diff --git a/boards/native/native_sim/board.yml b/boards/native/native_sim/board.yml index 31ee9fabc0..1949217013 100644 --- a/boards/native/native_sim/board.yml +++ b/boards/native/native_sim/board.yml @@ -5,11 +5,3 @@ boards: - name: native variants: - name: "64" - -# This board definition below, together with its respective -# Kconfig.native_sim_64 exist for backwards compatibility with the hwmv1 board name -# Once all its usage in tree is removed, or an alias has been introduced they can be removed. -- name: native_sim_64 - vendor: zephyr - socs: - - name: native diff --git a/boards/native/native_sim/native_sim_64.dts b/boards/native/native_sim/native_sim_64.dts deleted file mode 100644 index 4ac77d414f..0000000000 --- a/boards/native/native_sim/native_sim_64.dts +++ /dev/null @@ -1,7 +0,0 @@ -/* - * Copyright (c) 2023 Nordic Semiconductor ASA - * - * SPDX-License-Identifier: Apache-2.0 - */ - -#include "native_sim.dts" diff --git a/boards/native/native_sim/native_sim_64_defconfig b/boards/native/native_sim/native_sim_64_defconfig deleted file mode 100644 index b0033eda61..0000000000 --- a/boards/native/native_sim/native_sim_64_defconfig +++ /dev/null @@ -1,4 +0,0 @@ -# SPDX-License-Identifier: Apache-2.0 - -CONFIG_CONSOLE=y -CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=1000000