From 03424331873269da7b92c8f15bb4e50d548421f6 Mon Sep 17 00:00:00 2001 From: Jamie McCrae Date: Fri, 2 Feb 2024 09:13:35 +0000 Subject: [PATCH] boards: arm: npcx9m6f_evb: Convert to v2 Converts the board to hwmv2 Signed-off-by: Jamie McCrae --- .../arm => nuvoton}/npcx9m6f_evb/Kconfig.defconfig | 7 ------- .../npcx9m6f_evb/Kconfig.npcx9m6f_evb} | 3 +-- .../arm => nuvoton}/npcx9m6f_evb/board.cmake | 0 boards/nuvoton/npcx9m6f_evb/board.yml | 5 +++++ .../arm => nuvoton}/npcx9m6f_evb/doc/index.rst | 0 .../npcx9m6f_evb/doc/npcx9m6f_evb.jpg | Bin .../npcx9m6f_evb/npcx9m6f_evb-pinctrl.dtsi | 0 .../arm => nuvoton}/npcx9m6f_evb/npcx9m6f_evb.dts | 0 .../arm => nuvoton}/npcx9m6f_evb/npcx9m6f_evb.yaml | 0 .../npcx9m6f_evb/npcx9m6f_evb_defconfig | 4 ---- .../npcx9m6f_evb/support/openocd.cfg | 0 11 files changed, 6 insertions(+), 13 deletions(-) rename boards/{boards_legacy/arm => nuvoton}/npcx9m6f_evb/Kconfig.defconfig (65%) rename boards/{boards_legacy/arm/npcx9m6f_evb/Kconfig.board => nuvoton/npcx9m6f_evb/Kconfig.npcx9m6f_evb} (62%) rename boards/{boards_legacy/arm => nuvoton}/npcx9m6f_evb/board.cmake (100%) create mode 100644 boards/nuvoton/npcx9m6f_evb/board.yml rename boards/{boards_legacy/arm => nuvoton}/npcx9m6f_evb/doc/index.rst (100%) rename boards/{boards_legacy/arm => nuvoton}/npcx9m6f_evb/doc/npcx9m6f_evb.jpg (100%) rename boards/{boards_legacy/arm => nuvoton}/npcx9m6f_evb/npcx9m6f_evb-pinctrl.dtsi (100%) rename boards/{boards_legacy/arm => nuvoton}/npcx9m6f_evb/npcx9m6f_evb.dts (100%) rename boards/{boards_legacy/arm => nuvoton}/npcx9m6f_evb/npcx9m6f_evb.yaml (100%) rename boards/{boards_legacy/arm => nuvoton}/npcx9m6f_evb/npcx9m6f_evb_defconfig (88%) rename boards/{boards_legacy/arm => nuvoton}/npcx9m6f_evb/support/openocd.cfg (100%) diff --git a/boards/boards_legacy/arm/npcx9m6f_evb/Kconfig.defconfig b/boards/nuvoton/npcx9m6f_evb/Kconfig.defconfig similarity index 65% rename from boards/boards_legacy/arm/npcx9m6f_evb/Kconfig.defconfig rename to boards/nuvoton/npcx9m6f_evb/Kconfig.defconfig index d5953dd04fe..3004ce803d4 100644 --- a/boards/boards_legacy/arm/npcx9m6f_evb/Kconfig.defconfig +++ b/boards/nuvoton/npcx9m6f_evb/Kconfig.defconfig @@ -1,13 +1,6 @@ # Copyright (c) 2021 Nuvoton Technology Corporation. # SPDX-License-Identifier: Apache-2.0 -if BOARD_NPCX9M6F_EVB - -config BOARD - default "npcx9m6f_evb" - -endif # BOARD_NPCX9M6F_EVB - config SYS_CLOCK_TICKS_PER_SEC default 1000 diff --git a/boards/boards_legacy/arm/npcx9m6f_evb/Kconfig.board b/boards/nuvoton/npcx9m6f_evb/Kconfig.npcx9m6f_evb similarity index 62% rename from boards/boards_legacy/arm/npcx9m6f_evb/Kconfig.board rename to boards/nuvoton/npcx9m6f_evb/Kconfig.npcx9m6f_evb index a652be619d0..792ab76ad47 100644 --- a/boards/boards_legacy/arm/npcx9m6f_evb/Kconfig.board +++ b/boards/nuvoton/npcx9m6f_evb/Kconfig.npcx9m6f_evb @@ -2,5 +2,4 @@ # SPDX-License-Identifier: Apache-2.0 config BOARD_NPCX9M6F_EVB - bool "Nuvoton NPCX9M6F EVB Development board" - depends on SOC_NPCX9M6F + select SOC_NPCX9M6F diff --git a/boards/boards_legacy/arm/npcx9m6f_evb/board.cmake b/boards/nuvoton/npcx9m6f_evb/board.cmake similarity index 100% rename from boards/boards_legacy/arm/npcx9m6f_evb/board.cmake rename to boards/nuvoton/npcx9m6f_evb/board.cmake diff --git a/boards/nuvoton/npcx9m6f_evb/board.yml b/boards/nuvoton/npcx9m6f_evb/board.yml new file mode 100644 index 00000000000..00a0a8d1875 --- /dev/null +++ b/boards/nuvoton/npcx9m6f_evb/board.yml @@ -0,0 +1,5 @@ +board: + name: npcx9m6f_evb + vendor: Nuvoton + socs: + - name: npcx9m6f diff --git a/boards/boards_legacy/arm/npcx9m6f_evb/doc/index.rst b/boards/nuvoton/npcx9m6f_evb/doc/index.rst similarity index 100% rename from boards/boards_legacy/arm/npcx9m6f_evb/doc/index.rst rename to boards/nuvoton/npcx9m6f_evb/doc/index.rst diff --git a/boards/boards_legacy/arm/npcx9m6f_evb/doc/npcx9m6f_evb.jpg b/boards/nuvoton/npcx9m6f_evb/doc/npcx9m6f_evb.jpg similarity index 100% rename from boards/boards_legacy/arm/npcx9m6f_evb/doc/npcx9m6f_evb.jpg rename to boards/nuvoton/npcx9m6f_evb/doc/npcx9m6f_evb.jpg diff --git a/boards/boards_legacy/arm/npcx9m6f_evb/npcx9m6f_evb-pinctrl.dtsi b/boards/nuvoton/npcx9m6f_evb/npcx9m6f_evb-pinctrl.dtsi similarity index 100% rename from boards/boards_legacy/arm/npcx9m6f_evb/npcx9m6f_evb-pinctrl.dtsi rename to boards/nuvoton/npcx9m6f_evb/npcx9m6f_evb-pinctrl.dtsi diff --git a/boards/boards_legacy/arm/npcx9m6f_evb/npcx9m6f_evb.dts b/boards/nuvoton/npcx9m6f_evb/npcx9m6f_evb.dts similarity index 100% rename from boards/boards_legacy/arm/npcx9m6f_evb/npcx9m6f_evb.dts rename to boards/nuvoton/npcx9m6f_evb/npcx9m6f_evb.dts diff --git a/boards/boards_legacy/arm/npcx9m6f_evb/npcx9m6f_evb.yaml b/boards/nuvoton/npcx9m6f_evb/npcx9m6f_evb.yaml similarity index 100% rename from boards/boards_legacy/arm/npcx9m6f_evb/npcx9m6f_evb.yaml rename to boards/nuvoton/npcx9m6f_evb/npcx9m6f_evb.yaml diff --git a/boards/boards_legacy/arm/npcx9m6f_evb/npcx9m6f_evb_defconfig b/boards/nuvoton/npcx9m6f_evb/npcx9m6f_evb_defconfig similarity index 88% rename from boards/boards_legacy/arm/npcx9m6f_evb/npcx9m6f_evb_defconfig rename to boards/nuvoton/npcx9m6f_evb/npcx9m6f_evb_defconfig index ae8b83cf8eb..c076f906112 100644 --- a/boards/boards_legacy/arm/npcx9m6f_evb/npcx9m6f_evb_defconfig +++ b/boards/nuvoton/npcx9m6f_evb/npcx9m6f_evb_defconfig @@ -4,10 +4,6 @@ # SPDX-License-Identifier: Apache-2.0 # -CONFIG_SOC_NPCX9M6F=y -CONFIG_SOC_SERIES_NPCX9=y -CONFIG_BOARD_NPCX9M6F_EVB=y - # Enable NPCX firmware header CONFIG_NPCX_HEADER=y CONFIG_NPCX_IMAGE_OUTPUT_HEX=y diff --git a/boards/boards_legacy/arm/npcx9m6f_evb/support/openocd.cfg b/boards/nuvoton/npcx9m6f_evb/support/openocd.cfg similarity index 100% rename from boards/boards_legacy/arm/npcx9m6f_evb/support/openocd.cfg rename to boards/nuvoton/npcx9m6f_evb/support/openocd.cfg