boards: nxp: convert hexiwear to hwmv2

Convert hexiwear to hardware model v2. As multiple SOCs exist on this
board, the hexiwear_k64 and hexiwear_kw40z boards are combined into one
target.

Signed-off-by: Daniel DeGrasse <daniel.degrasse@nxp.com>

boards/boards_legacy/arm/hexiwear_k64/Kconfig.board

@@ -1,9 +0,0 @@
-# Hexiwear K64 board
-
-# Copyright (c) 2016, Freescale Semiconductor, Inc.
-# SPDX-License-Identifier: Apache-2.0
-
-config BOARD_HEXIWEAR_K64
-	bool "NXP Hexiwear K64"
-	depends on SOC_SERIES_KINETIS_K6X
-	select SOC_PART_NUMBER_MK64FN1M0VDC12

boards/boards_legacy/arm/hexiwear_k64/board.cmake

@@ -1,7 +0,0 @@
-# SPDX-License-Identifier: Apache-2.0
-
-board_runner_args(pyocd "--target=k64f")
-board_runner_args(jlink "--device=MK64FN1M0xxx12")
-
-include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
-include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake)

boards/boards_legacy/arm/hexiwear_kw40z/CMakeLists.txt

@@ -1 +0,0 @@
-# SPDX-License-Identifier: Apache-2.0

boards/boards_legacy/arm/hexiwear_kw40z/Kconfig.board

@@ -1,9 +0,0 @@
-# Hexiwear KW40Z board
-
-# Copyright (c) 2017, NXP
-# SPDX-License-Identifier: Apache-2.0
-
-config BOARD_HEXIWEAR_KW40Z
-	bool "Hexiwear KW40Z"
-	depends on SOC_SERIES_KINETIS_KWX
-	select SOC_PART_NUMBER_MKW40Z160VHT4

boards/boards_legacy/arm/hexiwear_kw40z/Kconfig.defconfig

@@ -1,20 +0,0 @@
-# Hexiwear KW40Z board
-
-# Copyright (c) 2017, NXP
-# SPDX-License-Identifier: Apache-2.0
-
-if BOARD_HEXIWEAR_KW40Z
-
-config BOARD
-	default "hexiwear_kw40z"
-
-config OSC_XTAL0_FREQ
-	default 32000000
-
-config MCG_FRDIV
-	default 5
-
-config MCG_FCRDIV
-	default 0
-
-endif # BOARD_HEXIWEAR_KW40Z

boards/boards_legacy/arm/hexiwear_kw40z/board.cmake

@@ -1,7 +0,0 @@
-# SPDX-License-Identifier: Apache-2.0
-
-board_runner_args(jlink "--device=MKW40Z160xxx4")
-board_runner_args(pyocd "--target=kw40z4")
-
-include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
-include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake)

boards/boards_legacy/arm/hexiwear_kw40z/doc/index.rst

@@ -1,182 +0,0 @@
-.. _hexiwear_kw40z:
-
-Hexiwear KW40Z
-##############
-
-Overview
-********
-
-See :ref:`hexiwear_k64` for a general overview of the Hexiwear board and the
-main application SoC, the K64. The KW40Z is a secondary SoC on the board that
-provides wireless connectivity with a multimode BLE and 802.15.4 radio.
-
-For more information about the KW40Z SoC:
-
-- `KW40Z Website`_
-- `KW40Z Datasheet`_
-- `KW40Z Reference Manual`_
-
-Supported Features
-==================
-
-The hexiwear_kw40z board configuration supports the following hardware features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| SYSTICK   | on-chip    | systick                             |
-+-----------+------------+-------------------------------------+
-| PINMUX    | on-chip    | pinmux                              |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| ADC       | on-chip    | adc                                 |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
-| RTT       | on-chip    | console                             |
-+-----------+------------+-------------------------------------+
-| FLASH     | on-chip    | soc flash                           |
-+-----------+------------+-------------------------------------+
-| TRNG      | on-chip    | entropy                             |
-+-----------+------------+-------------------------------------+
-
-The default configuration can be found in the defconfig file:
-
-	``boards/arm/hexiwear_kw40z/hexiwear_kw40z_defconfig``
-
-Other hardware features are not currently supported by the port.
-
-Connections and IOs
-===================
-
-The KW40Z SoC has three pairs of pinmux/gpio controllers, but only one is
-currently enabled (PORTC/GPIOC) for the hexiwear_kw40z board.
-
-+-------+-----------------+---------------------------+
-| Name  | Function        | Usage                     |
-+=======+=================+===========================+
-| PTB1  | ADC             | ADC0 channel 1            |
-+-------+-----------------+---------------------------+
-| PTC6  | UART0_RX        | UART BT HCI               |
-+-------+-----------------+---------------------------+
-| PTC7  | UART0_TX        | UART BT HCI               |
-+-------+-----------------+---------------------------+
-
-System Clock
-============
-
-The KW40Z SoC is configured to use the 32 MHz external oscillator on the board
-with the on-chip FLL to generate a 40 MHz system clock.
-
-Serial Port
-===========
-
-The KW40Z SoC has one UART, which is used for BT HCI. There is no UART
-available for a console.
-
-Programming and Debugging
-*************************
-
-Build and flash applications as usual (see :ref:`build_an_application` and
-:ref:`application_run` for more details).
-
-Configuring a Debug Probe
-=========================
-
-A debug probe is used for both flashing and debugging the board. This board is
-configured by default to use the :ref:`opensda-daplink-onboard-debug-probe`,
-but because Segger RTT is required for a console, you must reconfigure the
-board for one of the following debug probes instead.
-
-:ref:`opensda-jlink-onboard-debug-probe`
-----------------------------------------
-
-Install the :ref:`jlink-debug-host-tools` and make sure they are in your search
-path.
-
-Follow the instructions in :ref:`opensda-jlink-onboard-debug-probe` to program
-the `OpenSDA J-Link Generic Firmware for V2.1 Bootloader`_. Check that switches
-SW1 and SW2 are **off**, and SW3 and SW4 are **on**  to ensure KW40Z SWD signals
-are connected to the OpenSDA microcontroller.
-
-Configuring a Console
-=====================
-
-The console is available using `Segger RTT`_.
-
-Connect a USB cable from your PC to CN1.
-
-Once you have started a debug session, run telnet:
-
-.. code-block:: console
-
-    $ telnet localhost 19021
-    Trying 127.0.0.1...
-    Connected to localhost.
-    Escape character is '^]'.
-    SEGGER J-Link V6.44 - Real time terminal output
-    J-Link OpenSDA 2 compiled Feb 28 2017 19:27:57 V1.0, SN=621000000
-    Process: JLinkGDBServerCLExe
-
-Flashing
-========
-
-Here is an example for the :ref:`hello_world` application.
-
-.. zephyr-app-commands::
-   :zephyr-app: samples/hello_world
-   :board: hexiwear_kw40z
-   :goals: flash
-
-The Segger RTT console is only available during a debug session. Use ``attach``
-to start one:
-
-.. zephyr-app-commands::
-   :zephyr-app: samples/hello_world
-   :board: hexiwear_kw40z
-   :goals: attach
-
-Run telnet as shown earlier, and you should see the following message in the
-terminal:
-
-.. code-block:: console
-
-   ***** Booting Zephyr OS v1.14.0-rc1 *****
-   Hello World! hexiwear_kw40z
-
-Debugging
-=========
-
-Here is an example for the :ref:`hello_world` application.
-
-.. zephyr-app-commands::
-   :zephyr-app: samples/hello_world
-   :board: hexiwear_kw40z
-   :goals: debug
-
-Run telnet as shown earlier, step through the application in your debugger, and
-you should see the following message in the terminal:
-
-.. code-block:: console
-
-   ***** Booting Zephyr OS v1.14.0-rc1 *****
-   Hello World! hexiwear_kw40z
-
-.. _KW40Z Website:
-   https://www.nxp.com/products/processors-and-microcontrollers/arm-based-processors-and-mcus/kinetis-cortex-m-mcus/w-serieswireless-conn.m0-plus-m4/kinetis-kw40z-2.4-ghz-dual-mode-ble-and-802.15.4-wireless-radio-microcontroller-mcu-based-on-arm-cortex-m0-plus-core:KW40Z
-
-.. _KW40Z Datasheet:
-   https://www.nxp.com/docs/en/data-sheet/MKW40Z160.pdf
-
-.. _KW40Z Reference Manual:
-   https://www.nxp.com/webapp/Download?colCode=MKW40Z160RM
-
-.. _Segger RTT:
-   https://www.segger.com/products/debug-probes/j-link/technology/about-real-time-transfer/
-
-.. _OpenSDA J-Link Generic Firmware for V2.1 Bootloader:
-   https://www.segger.com/downloads/jlink/OpenSDA_V2_1

boards/nxp/hexiwear/Kconfig.defconfig

@@ -1,12 +1,10 @@
 # Hexiwear K64 board
 
 # Copyright (c) 2016, Freescale Semiconductor, Inc.
+# Copyright 2017,2024 NXP
 # SPDX-License-Identifier: Apache-2.0
 
-if BOARD_HEXIWEAR_K64
+if BOARD_HEXIWEAR_MK64F12
-
-config BOARD
-	default "hexiwear_k64"
 
 config OSC_XTAL0_FREQ
 	default 12000000
@@ -23,4 +21,19 @@ config MCG_FCRDIV
 config REGULATOR
 	default y if ADC || SENSOR
 
-endif # BOARD_HEXIWEAR_K64
+endif # BOARD_HEXIWEAR_MK64F12
+
+# Hexiwear KW40Z board
+
+if BOARD_HEXIWEAR_MKW40Z4
+
+config OSC_XTAL0_FREQ
+	default 32000000
+
+config MCG_FRDIV
+	default 5
+
+config MCG_FCRDIV
+	default 0
+
+endif # BOARD_HEXIWEAR_MKW40Z4

boards/nxp/hexiwear/Kconfig.hexiwear

@@ -0,0 +1,8 @@
+# Copyright 2024 NXP
+# SPDX-License-Identifier: Apache-2.0
+
+config BOARD_HEXIWEAR
+	select SOC_MK64F12 if BOARD_HEXIWEAR_MK64F12
+	select SOC_PART_NUMBER_MK64FN1M0VDC12 if BOARD_HEXIWEAR_MK64F12
+	select SOC_MKW40Z4 if BOARD_HEXIWEAR_MKW40Z4
+	select SOC_PART_NUMBER_MKW40Z160VHT4 if BOARD_HEXIWEAR_MKW40Z4

boards/nxp/hexiwear/board.cmake

@@ -0,0 +1,15 @@
+# SPDX-License-Identifier: Apache-2.0
+
+if (CONFIG_BOARD_HEXIWEAR_MK64F12)
+  board_runner_args(pyocd "--target=k64f")
+  board_runner_args(jlink "--device=MK64FN1M0xxx12")
+
+  include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
+  include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake)
+else()
+  board_runner_args(jlink "--device=MKW40Z160xxx4")
+  board_runner_args(pyocd "--target=kw40z4")
+
+  include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
+  include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake)
+endif()

boards/nxp/hexiwear/board.yml

@@ -0,0 +1,6 @@
+board:
+  name: hexiwear
+  vendor: nxp
+  socs:
+    - name: mk64f12
+    - name: mkw40z4

boards/nxp/hexiwear/doc/index.rst

@@ -1,4 +1,4 @@
-.. _hexiwear_k64:
+.. _hexiwear:
 
 Hexiwear
 ########
@@ -56,7 +56,7 @@ For more information about the K64F SoC and Hexiwear board:
 Supported Features
 ==================
 
-The hexiwear_k64 board configuration supports the following hardware features:
+The hexiwear/mk64f12 board variant supports the following hardware features:
 
 +-----------+------------+-------------------------------------+
 | Interface | Controller | Driver/Component                    |
@@ -94,7 +94,7 @@ The hexiwear_k64 board configuration supports the following hardware features:
 
 The default configuration can be found in the defconfig file:
 
-	``boards/arm/hexiwear_k64/hexiwear_k64_defconfig``
+	:zephyr_file:`boards/nxp/hexiwear/hexiwear_mk64f12_defconfig`
 
 Other hardware features are not currently supported by the port.
 
@@ -204,7 +204,7 @@ default runner from J-Link to pyOCD:
 
 .. zephyr-app-commands::
    :zephyr-app: samples/hello_world
-   :board: hexiwear_k64
+   :board: hexiwear/mk64f12
    :gen-args: -DBOARD_FLASH_RUNNER=pyocd -DBOARD_DEBUG_RUNNER=pyocd
    :goals: build
 
@@ -231,7 +231,7 @@ Here is an example for the :ref:`hello_world` application.
 
 .. zephyr-app-commands::
    :zephyr-app: samples/hello_world
-   :board: hexiwear_k64
+   :board: hexiwear/mk64f12
    :goals: flash
 
 Open a serial terminal, reset the board (press the T4 button), and you should
@@ -240,7 +240,7 @@ see the following message in the terminal:
 .. code-block:: console
 
    ***** Booting Zephyr OS v1.14.0-rc1 *****
-   Hello World! hexiwear_k64
+   Hello World! hexiwear
 
 Debugging
 =========
@@ -249,7 +249,7 @@ Here is an example for the :ref:`hello_world` application.
 
 .. zephyr-app-commands::
    :zephyr-app: samples/hello_world
-   :board: hexiwear_k64
+   :board: hexiwear/mk64f12
    :goals: debug
 
 Open a serial terminal, step through the application in your debugger, and you
@@ -258,7 +258,7 @@ should see the following message in the terminal:
 .. code-block:: console
 
    ***** Booting Zephyr OS v1.14.0-rc1 *****
-   Hello World! hexiwear_k64
+   Hello World! hexiwear
 
 Using Bluetooth
 ***************
@@ -287,7 +287,7 @@ K64.
 
 .. zephyr-app-commands::
    :zephyr-app: samples/bluetooth/peripheral_hr
-   :board: hexiwear_k64
+   :board: hexiwear/mk64f12
    :goals: build flash
 
 Reset the KW40Z and the K64 using the push buttons on the docking station.
@@ -334,3 +334,184 @@ will then see a plot of the heart rate data that updates once per second.
 
 .. _Kinetis BLE Toolbox for Android:
    https://play.google.com/store/apps/details?id=com.freescale.kinetisbletoolbox
+
+
+Hexiwear KW40Z
+##############
+
+Overview
+********
+
+The KW40Z is a secondary SoC on the board that provides wireless connectivity
+with a multimode BLE and 802.15.4 radio.
+
+For more information about the KW40Z SoC:
+
+- `KW40Z Website`_
+- `KW40Z Datasheet`_
+- `KW40Z Reference Manual`_
+
+Supported Features
+==================
+
+The hexiwear/mkw40z4 board variant supports the following hardware features:
+
++-----------+------------+-------------------------------------+
+| Interface | Controller | Driver/Component                    |
++===========+============+=====================================+
+| NVIC      | on-chip    | nested vector interrupt controller  |
++-----------+------------+-------------------------------------+
+| SYSTICK   | on-chip    | systick                             |
++-----------+------------+-------------------------------------+
+| PINMUX    | on-chip    | pinmux                              |
++-----------+------------+-------------------------------------+
+| GPIO      | on-chip    | gpio                                |
++-----------+------------+-------------------------------------+
+| ADC       | on-chip    | adc                                 |
++-----------+------------+-------------------------------------+
+| UART      | on-chip    | serial port-polling;                |
+|           |            | serial port-interrupt               |
++-----------+------------+-------------------------------------+
+| RTT       | on-chip    | console                             |
++-----------+------------+-------------------------------------+
+| FLASH     | on-chip    | soc flash                           |
++-----------+------------+-------------------------------------+
+| TRNG      | on-chip    | entropy                             |
++-----------+------------+-------------------------------------+
+
+The default configuration can be found in the defconfig file:
+
+	:zephyr_file:`boards/nxp/hexiwear/hexiwear_mkw40z4_defconfig`
+
+Other hardware features are not currently supported by the port.
+
+Connections and IOs
+===================
+
+The KW40Z SoC has three pairs of pinmux/gpio controllers, but only one is
+currently enabled (PORTC/GPIOC) for the hexiwear/mkw40z4 board.
+
++-------+-----------------+---------------------------+
+| Name  | Function        | Usage                     |
++=======+=================+===========================+
+| PTB1  | ADC             | ADC0 channel 1            |
++-------+-----------------+---------------------------+
+| PTC6  | UART0_RX        | UART BT HCI               |
++-------+-----------------+---------------------------+
+| PTC7  | UART0_TX        | UART BT HCI               |
++-------+-----------------+---------------------------+
+
+System Clock
+============
+
+The KW40Z SoC is configured to use the 32 MHz external oscillator on the board
+with the on-chip FLL to generate a 40 MHz system clock.
+
+Serial Port
+===========
+
+The KW40Z SoC has one UART, which is used for BT HCI. There is no UART
+available for a console.
+
+Programming and Debugging
+*************************
+
+Build and flash applications as usual (see :ref:`build_an_application` and
+:ref:`application_run` for more details).
+
+Configuring a Debug Probe
+=========================
+
+A debug probe is used for both flashing and debugging the board. This board is
+configured by default to use the :ref:`opensda-daplink-onboard-debug-probe`,
+but because Segger RTT is required for a console, you must reconfigure the
+board for one of the following debug probes instead.
+
+:ref:`opensda-jlink-onboard-debug-probe`
+----------------------------------------
+
+Install the :ref:`jlink-debug-host-tools` and make sure they are in your search
+path.
+
+Follow the instructions in :ref:`opensda-jlink-onboard-debug-probe` to program
+the `OpenSDA J-Link Generic Firmware for V2.1 Bootloader`_. Check that switches
+SW1 and SW2 are **off**, and SW3 and SW4 are **on**  to ensure KW40Z SWD signals
+are connected to the OpenSDA microcontroller.
+
+Configuring a Console
+=====================
+
+The console is available using `Segger RTT`_.
+
+Connect a USB cable from your PC to CN1.
+
+Once you have started a debug session, run telnet:
+
+.. code-block:: console
+
+    $ telnet localhost 19021
+    Trying 127.0.0.1...
+    Connected to localhost.
+    Escape character is '^]'.
+    SEGGER J-Link V6.44 - Real time terminal output
+    J-Link OpenSDA 2 compiled Feb 28 2017 19:27:57 V1.0, SN=621000000
+    Process: JLinkGDBServerCLExe
+
+Flashing
+========
+
+Here is an example for the :ref:`hello_world` application.
+
+.. zephyr-app-commands::
+   :zephyr-app: samples/hello_world
+   :board: hexiwear/mkw40z4
+   :goals: flash
+
+The Segger RTT console is only available during a debug session. Use ``attach``
+to start one:
+
+.. zephyr-app-commands::
+   :zephyr-app: samples/hello_world
+   :board: hexiwear/mkw40z4
+   :goals: attach
+
+Run telnet as shown earlier, and you should see the following message in the
+terminal:
+
+.. code-block:: console
+
+   ***** Booting Zephyr OS v1.14.0-rc1 *****
+   Hello World! hexiwear
+
+Debugging
+=========
+
+Here is an example for the :ref:`hello_world` application.
+
+.. zephyr-app-commands::
+   :zephyr-app: samples/hello_world
+   :board: hexiwear/mkw40z4
+   :goals: debug
+
+Run telnet as shown earlier, step through the application in your debugger, and
+you should see the following message in the terminal:
+
+.. code-block:: console
+
+   ***** Booting Zephyr OS v1.14.0-rc1 *****
+   Hello World! hexiwear
+
+.. _KW40Z Website:
+   https://www.nxp.com/products/processors-and-microcontrollers/arm-based-processors-and-mcus/kinetis-cortex-m-mcus/w-serieswireless-conn.m0-plus-m4/kinetis-kw40z-2.4-ghz-dual-mode-ble-and-802.15.4-wireless-radio-microcontroller-mcu-based-on-arm-cortex-m0-plus-core:KW40Z
+
+.. _KW40Z Datasheet:
+   https://www.nxp.com/docs/en/data-sheet/MKW40Z160.pdf
+
+.. _KW40Z Reference Manual:
+   https://www.nxp.com/webapp/Download?colCode=MKW40Z160RM
+
+.. _Segger RTT:
+   https://www.segger.com/products/debug-probes/j-link/technology/about-real-time-transfer/
+
+.. _OpenSDA J-Link Generic Firmware for V2.1 Bootloader:
+   https://www.segger.com/downloads/jlink/OpenSDA_V2_1

boards/nxp/hexiwear/hexiwear_mk64f12.dts

@@ -4,7 +4,7 @@
 
 #include <nxp/nxp_k6x.dtsi>
 #include <zephyr/dt-bindings/pwm/pwm.h>
-#include "hexiwear_k64-pinctrl.dtsi"
+#include "hexiwear_mk64f12-pinctrl.dtsi"
 
 / {
 	model = "Hexiwear K64 board";

boards/nxp/hexiwear/hexiwear_mk64f12.yaml

@@ -1,4 +1,4 @@
-identifier: hexiwear_k64
+identifier: hexiwear/mk64f12
 name: Hexiwear
 type: mcu
 arch: arm

boards/nxp/hexiwear/hexiwear_mk64f12_defconfig

@@ -1,8 +1,5 @@
 # SPDX-License-Identifier: Apache-2.0
 
-CONFIG_SOC_MK64F12=y
-CONFIG_SOC_SERIES_KINETIS_K6X=y
-CONFIG_BOARD_HEXIWEAR_K64=y
 CONFIG_CONSOLE=y
 CONFIG_UART_CONSOLE=y
 CONFIG_SERIAL=y

boards/nxp/hexiwear/hexiwear_mkw40z4.dts

@@ -3,7 +3,7 @@
 /dts-v1/;
 
 #include <nxp/nxp_kw40z.dtsi>
-#include "hexiwear_kw40z-pinctrl.dtsi"
+#include "hexiwear_mkw40z4-pinctrl.dtsi"
 
 / {
 	model = "Hexiwear KW40 board";

boards/nxp/hexiwear/hexiwear_mkw40z4.yaml

@@ -1,4 +1,4 @@
-identifier: hexiwear_kw40z
+identifier: hexiwear/mkw40z4
 name: Hexiwear KW40Z
 type: mcu
 arch: arm

boards/nxp/hexiwear/hexiwear_mkw40z4_defconfig

@@ -1,8 +1,5 @@
 # SPDX-License-Identifier: Apache-2.0
 
-CONFIG_SOC_MKW40Z4=y
-CONFIG_SOC_SERIES_KINETIS_KWX=y
-CONFIG_BOARD_HEXIWEAR_KW40Z=y
 CONFIG_CONSOLE=y
 CONFIG_RTT_CONSOLE=y
 CONFIG_USE_SEGGER_RTT=y

samples/basic/rgb_led/README.rst

@@ -39,7 +39,7 @@ an unsupported board:
    Unsupported board: green-pwm-led devicetree alias is not defined
    Unsupported board: blue-pwm-led devicetree alias is not defined
 
-See :zephyr_file:`boards/arm/hexiwear_k64/hexiwear_k64.dts` for an example
+See :zephyr_file:`boards/nxp/hexiwear/hexiwear_mk64f12.dts` for an example
 :file:`BOARD.dts` file which supports this sample.
 
 Wiring
@@ -53,12 +53,12 @@ Otherwise, LEDs should be connected to the appropriate PWM channels.
 Building and Running
 ********************
 
-For example, to build and flash this board for :ref:`hexiwear_k64`:
+For example, to build and flash this board for :ref:`hexiwear`:
 
 .. zephyr-app-commands::
    :zephyr-app: samples/basic/rgb_led
-   :board: hexiwear_k64
+   :board: hexiwear/mk64f12
    :goals: build flash
    :compact:
 
-Change ``hexiwear_k64`` appropriately for other supported boards.
+Change ``hexiwear/mk64f12`` appropriately for other supported boards.

samples/sensor/fxas21002/README.rst

@@ -13,12 +13,12 @@ Building and Running
 ********************
 
 This project outputs sensor data to the console. It requires an fxas21002
-sensor, which is present on the :ref:`hexiwear_k64` board. It does not work on
+sensor, which is present on the :ref:`hexiwear` board. It does not work on
 QEMU.
 
 .. zephyr-app-commands::
    :zephyr-app: samples/sensor/fxas21002
-   :board: hexiwear_k64
+   :board: hexiwear/mk64f12
    :goals: build
    :compact:
 

samples/sensor/fxas21002/sample.yaml

@@ -4,6 +4,6 @@ tests:
   sample.sensor.fxas21002:
     harness: sensor
     tags: sensors
-    platform_allow: hexiwear_k64
+    platform_allow: hexiwear/mk64f12
     integration_platforms:
-      - hexiwear_k64
+      - hexiwear/mk64f12

samples/sensor/fxos8700/README.rst

@@ -15,7 +15,7 @@ Building and Running
 
 This project outputs sensor data to the console. FXOS8700
 sensor is present on the :ref:`frdm_k64f`, :ref:`frdm_k22f`,
-:ref:`frdm_kw41z`, :ref:`hexiwear_k64`, and :ref:`twr_ke18f` boards.
+:ref:`frdm_kw41z`, :ref:`hexiwear`, and :ref:`twr_ke18f` boards.
 Accelerometer only devices are present on the :ref:`frdm_kl25z`,
 :ref:`bbc_microbit`, and :ref:`reel_board` boards. It does not work on
 QEMU.

samples/sensor/fxos8700/sample.yaml

@@ -10,7 +10,7 @@ tests:
   sample.sensor.fxos8700.hybrid:
     platform_allow:
       - frdm_k64f
-      - hexiwear_k64
+      - hexiwear/mk64f12
       - warp7_m4
       - frdm_kw41z
       - rv32m1_vega/openisa_rv32m1/ri5cy

samples/sensor/max30101/README.rst

@@ -12,14 +12,14 @@ rate sensor.
 Building and Running
 ********************
 
-This project configures the max30101 sensor on the :ref:`hexiwear_k64` board to
+This project configures the max30101 sensor on the :ref:`hexiwear` board to
 enable the green LED and measure the reflected light with a photodiode. The raw
 ADC data prints to the console. Further processing (not included in this
 sample) is required to extract a heart rate signal from the light measurement.
 
 .. zephyr-app-commands::
    :zephyr-app: samples/sensor/max30101
-   :board: hexiwear_k64
+   :board: hexiwear/mk64f12
    :goals: build
    :compact:
 

samples/sensor/max30101/sample.yaml

@@ -5,7 +5,7 @@ tests:
   sample.sensor.max30101:
     harness: sensor
     tags: sensors
-    platform_allow: hexiwear_k64
+    platform_allow: hexiwear/mk64f12
     depends_on: i2c
     integration_platforms:
-      - hexiwear_k64
+      - hexiwear/mk64f12

tests/subsys/storage/flash_map/testcase.yaml

@@ -17,7 +17,7 @@ tests:
       - nrf52840dk/nrf52840
       - nrf52dk/nrf52832
       - frdm_k64f
-      - hexiwear_k64
+      - hexiwear/mk64f12
       - twr_ke18f
     integration_platforms:
       - nrf52840dk/nrf52840