diff --git a/boards/boards_legacy/arm/npcx4m8f_evb/Kconfig.defconfig b/boards/nuvoton/npcx4m8f_evb/Kconfig.defconfig similarity index 65% rename from boards/boards_legacy/arm/npcx4m8f_evb/Kconfig.defconfig rename to boards/nuvoton/npcx4m8f_evb/Kconfig.defconfig index ae6ce213595..4bd26c0d348 100644 --- a/boards/boards_legacy/arm/npcx4m8f_evb/Kconfig.defconfig +++ b/boards/nuvoton/npcx4m8f_evb/Kconfig.defconfig @@ -1,13 +1,6 @@ # Copyright (c) 2023 Nuvoton Technology Corporation. # SPDX-License-Identifier: Apache-2.0 -if BOARD_NPCX4M8F_EVB - -config BOARD - default "npcx4m8f_evb" - -endif # BOARD_NPCX4M8F_EVB - config SYS_CLOCK_TICKS_PER_SEC default 1000 diff --git a/boards/boards_legacy/arm/npcx4m8f_evb/Kconfig.board b/boards/nuvoton/npcx4m8f_evb/Kconfig.npcx4m8f_evb similarity index 62% rename from boards/boards_legacy/arm/npcx4m8f_evb/Kconfig.board rename to boards/nuvoton/npcx4m8f_evb/Kconfig.npcx4m8f_evb index 093faa1cade..4483d2ee0c2 100644 --- a/boards/boards_legacy/arm/npcx4m8f_evb/Kconfig.board +++ b/boards/nuvoton/npcx4m8f_evb/Kconfig.npcx4m8f_evb @@ -2,5 +2,4 @@ # SPDX-License-Identifier: Apache-2.0 config BOARD_NPCX4M8F_EVB - bool "Nuvoton NPCX4M8F EVB Development board" - depends on SOC_NPCX4M8F + select SOC_NPCX4M8F diff --git a/boards/boards_legacy/arm/npcx4m8f_evb/board.cmake b/boards/nuvoton/npcx4m8f_evb/board.cmake similarity index 100% rename from boards/boards_legacy/arm/npcx4m8f_evb/board.cmake rename to boards/nuvoton/npcx4m8f_evb/board.cmake diff --git a/boards/nuvoton/npcx4m8f_evb/board.yml b/boards/nuvoton/npcx4m8f_evb/board.yml new file mode 100644 index 00000000000..f6706d6da84 --- /dev/null +++ b/boards/nuvoton/npcx4m8f_evb/board.yml @@ -0,0 +1,5 @@ +board: + name: npcx4m8f_evb + vendor: Nuvoton + socs: + - name: npcx4m8f diff --git a/boards/boards_legacy/arm/npcx4m8f_evb/doc/index.rst b/boards/nuvoton/npcx4m8f_evb/doc/index.rst similarity index 100% rename from boards/boards_legacy/arm/npcx4m8f_evb/doc/index.rst rename to boards/nuvoton/npcx4m8f_evb/doc/index.rst diff --git a/boards/boards_legacy/arm/npcx4m8f_evb/doc/npcx4m8f_evb.jpg b/boards/nuvoton/npcx4m8f_evb/doc/npcx4m8f_evb.jpg similarity index 100% rename from boards/boards_legacy/arm/npcx4m8f_evb/doc/npcx4m8f_evb.jpg rename to boards/nuvoton/npcx4m8f_evb/doc/npcx4m8f_evb.jpg diff --git a/boards/boards_legacy/arm/npcx4m8f_evb/npcx4m8f_evb-pinctrl.dtsi b/boards/nuvoton/npcx4m8f_evb/npcx4m8f_evb-pinctrl.dtsi similarity index 100% rename from boards/boards_legacy/arm/npcx4m8f_evb/npcx4m8f_evb-pinctrl.dtsi rename to boards/nuvoton/npcx4m8f_evb/npcx4m8f_evb-pinctrl.dtsi diff --git a/boards/boards_legacy/arm/npcx4m8f_evb/npcx4m8f_evb.dts b/boards/nuvoton/npcx4m8f_evb/npcx4m8f_evb.dts similarity index 100% rename from boards/boards_legacy/arm/npcx4m8f_evb/npcx4m8f_evb.dts rename to boards/nuvoton/npcx4m8f_evb/npcx4m8f_evb.dts diff --git a/boards/boards_legacy/arm/npcx4m8f_evb/npcx4m8f_evb.yaml b/boards/nuvoton/npcx4m8f_evb/npcx4m8f_evb.yaml similarity index 100% rename from boards/boards_legacy/arm/npcx4m8f_evb/npcx4m8f_evb.yaml rename to boards/nuvoton/npcx4m8f_evb/npcx4m8f_evb.yaml diff --git a/boards/boards_legacy/arm/npcx4m8f_evb/npcx4m8f_evb_defconfig b/boards/nuvoton/npcx4m8f_evb/npcx4m8f_evb_defconfig similarity index 88% rename from boards/boards_legacy/arm/npcx4m8f_evb/npcx4m8f_evb_defconfig rename to boards/nuvoton/npcx4m8f_evb/npcx4m8f_evb_defconfig index 4ec779de482..05a91e020f3 100644 --- a/boards/boards_legacy/arm/npcx4m8f_evb/npcx4m8f_evb_defconfig +++ b/boards/nuvoton/npcx4m8f_evb/npcx4m8f_evb_defconfig @@ -4,10 +4,6 @@ # SPDX-License-Identifier: Apache-2.0 # -CONFIG_SOC_NPCX4M8F=y -CONFIG_SOC_SERIES_NPCX4=y -CONFIG_BOARD_NPCX4M8F_EVB=y - # Enable NPCX firmware header CONFIG_NPCX_HEADER=y CONFIG_NPCX_IMAGE_OUTPUT_HEX=y diff --git a/boards/boards_legacy/arm/npcx4m8f_evb/support/openocd.cfg b/boards/nuvoton/npcx4m8f_evb/support/openocd.cfg similarity index 100% rename from boards/boards_legacy/arm/npcx4m8f_evb/support/openocd.cfg rename to boards/nuvoton/npcx4m8f_evb/support/openocd.cfg