From db0271ecbb954e283dabf3d947697ea6790a2555 Mon Sep 17 00:00:00 2001 From: Jamie McCrae Date: Mon, 19 Feb 2024 09:02:58 +0000 Subject: [PATCH] boards: arm: apollo4p_blue_kxr_evb: Convert to v2 Converts the board to hwmv2 Signed-off-by: Jamie McCrae --- .../Kconfig.apollo4p_blue_kxr_evb} | 3 +-- .../apollo4p_blue_kxr_evb/Kconfig.defconfig | 6 +++--- .../apollo4p_blue_kxr_evb-pinctrl.dtsi | 0 .../apollo4p_blue_kxr_evb/apollo4p_blue_kxr_evb.dts | 0 .../apollo4p_blue_kxr_evb.yaml | 0 .../apollo4p_blue_kxr_evb_defconfig | 2 -- .../arm => ambiq}/apollo4p_blue_kxr_evb/board.cmake | 0 boards/ambiq/apollo4p_blue_kxr_evb/board.yml | 5 +++++ .../doc/apollo4-blue-plus-kxr-soc-eval-board.jpg | Bin .../apollo4p_blue_kxr_evb/doc/index.rst | 0 10 files changed, 9 insertions(+), 7 deletions(-) rename boards/{boards_legacy/arm/apollo4p_blue_kxr_evb/Kconfig.board => ambiq/apollo4p_blue_kxr_evb/Kconfig.apollo4p_blue_kxr_evb} (61%) rename boards/{boards_legacy/arm => ambiq}/apollo4p_blue_kxr_evb/Kconfig.defconfig (86%) rename boards/{boards_legacy/arm => ambiq}/apollo4p_blue_kxr_evb/apollo4p_blue_kxr_evb-pinctrl.dtsi (100%) rename boards/{boards_legacy/arm => ambiq}/apollo4p_blue_kxr_evb/apollo4p_blue_kxr_evb.dts (100%) rename boards/{boards_legacy/arm => ambiq}/apollo4p_blue_kxr_evb/apollo4p_blue_kxr_evb.yaml (100%) rename boards/{boards_legacy/arm => ambiq}/apollo4p_blue_kxr_evb/apollo4p_blue_kxr_evb_defconfig (76%) rename boards/{boards_legacy/arm => ambiq}/apollo4p_blue_kxr_evb/board.cmake (100%) create mode 100644 boards/ambiq/apollo4p_blue_kxr_evb/board.yml rename boards/{boards_legacy/arm => ambiq}/apollo4p_blue_kxr_evb/doc/apollo4-blue-plus-kxr-soc-eval-board.jpg (100%) rename boards/{boards_legacy/arm => ambiq}/apollo4p_blue_kxr_evb/doc/index.rst (100%) diff --git a/boards/boards_legacy/arm/apollo4p_blue_kxr_evb/Kconfig.board b/boards/ambiq/apollo4p_blue_kxr_evb/Kconfig.apollo4p_blue_kxr_evb similarity index 61% rename from boards/boards_legacy/arm/apollo4p_blue_kxr_evb/Kconfig.board rename to boards/ambiq/apollo4p_blue_kxr_evb/Kconfig.apollo4p_blue_kxr_evb index 0ae2283f97d..09de003fc14 100644 --- a/boards/boards_legacy/arm/apollo4p_blue_kxr_evb/Kconfig.board +++ b/boards/ambiq/apollo4p_blue_kxr_evb/Kconfig.apollo4p_blue_kxr_evb @@ -3,5 +3,4 @@ # Copyright (c) 2023 Ambiq Micro Inc. config BOARD_APOLLO4P_BLUE_KXR_EVB - bool "Ambiq Apollo4 Blue Plus KXR Evaluation Board" - depends on SOC_APOLLO4P_BLUE + select SOC_APOLLO4P_BLUE diff --git a/boards/boards_legacy/arm/apollo4p_blue_kxr_evb/Kconfig.defconfig b/boards/ambiq/apollo4p_blue_kxr_evb/Kconfig.defconfig similarity index 86% rename from boards/boards_legacy/arm/apollo4p_blue_kxr_evb/Kconfig.defconfig rename to boards/ambiq/apollo4p_blue_kxr_evb/Kconfig.defconfig index 1edc7b5581b..87e1c5a8764 100644 --- a/boards/boards_legacy/arm/apollo4p_blue_kxr_evb/Kconfig.defconfig +++ b/boards/ambiq/apollo4p_blue_kxr_evb/Kconfig.defconfig @@ -2,9 +2,7 @@ # # Copyright (c) 2023 Ambiq Micro Inc. -config BOARD - default "apollo4p_blue_kxr_evb" - depends on BOARD_APOLLO4P_BLUE_KXR_EVB +if BOARD_APOLLO4P_BLUE_KXR_EVB if BT @@ -36,3 +34,5 @@ config BT_L2CAP_TX_MTU default 247 endif # BT + +endif # BOARD_APOLLO4P_BLUE_KXR_EVB diff --git a/boards/boards_legacy/arm/apollo4p_blue_kxr_evb/apollo4p_blue_kxr_evb-pinctrl.dtsi b/boards/ambiq/apollo4p_blue_kxr_evb/apollo4p_blue_kxr_evb-pinctrl.dtsi similarity index 100% rename from boards/boards_legacy/arm/apollo4p_blue_kxr_evb/apollo4p_blue_kxr_evb-pinctrl.dtsi rename to boards/ambiq/apollo4p_blue_kxr_evb/apollo4p_blue_kxr_evb-pinctrl.dtsi diff --git a/boards/boards_legacy/arm/apollo4p_blue_kxr_evb/apollo4p_blue_kxr_evb.dts b/boards/ambiq/apollo4p_blue_kxr_evb/apollo4p_blue_kxr_evb.dts similarity index 100% rename from boards/boards_legacy/arm/apollo4p_blue_kxr_evb/apollo4p_blue_kxr_evb.dts rename to boards/ambiq/apollo4p_blue_kxr_evb/apollo4p_blue_kxr_evb.dts diff --git a/boards/boards_legacy/arm/apollo4p_blue_kxr_evb/apollo4p_blue_kxr_evb.yaml b/boards/ambiq/apollo4p_blue_kxr_evb/apollo4p_blue_kxr_evb.yaml similarity index 100% rename from boards/boards_legacy/arm/apollo4p_blue_kxr_evb/apollo4p_blue_kxr_evb.yaml rename to boards/ambiq/apollo4p_blue_kxr_evb/apollo4p_blue_kxr_evb.yaml diff --git a/boards/boards_legacy/arm/apollo4p_blue_kxr_evb/apollo4p_blue_kxr_evb_defconfig b/boards/ambiq/apollo4p_blue_kxr_evb/apollo4p_blue_kxr_evb_defconfig similarity index 76% rename from boards/boards_legacy/arm/apollo4p_blue_kxr_evb/apollo4p_blue_kxr_evb_defconfig rename to boards/ambiq/apollo4p_blue_kxr_evb/apollo4p_blue_kxr_evb_defconfig index 4c940d417fd..5f556803e52 100644 --- a/boards/boards_legacy/arm/apollo4p_blue_kxr_evb/apollo4p_blue_kxr_evb_defconfig +++ b/boards/ambiq/apollo4p_blue_kxr_evb/apollo4p_blue_kxr_evb_defconfig @@ -2,8 +2,6 @@ # # Copyright (c) 2023 Ambiq Micro Inc. -CONFIG_SOC_SERIES_APOLLO4X=y -CONFIG_SOC_APOLLO4P_BLUE=y CONFIG_CONSOLE=y CONFIG_UART_CONSOLE=y CONFIG_SERIAL=y diff --git a/boards/boards_legacy/arm/apollo4p_blue_kxr_evb/board.cmake b/boards/ambiq/apollo4p_blue_kxr_evb/board.cmake similarity index 100% rename from boards/boards_legacy/arm/apollo4p_blue_kxr_evb/board.cmake rename to boards/ambiq/apollo4p_blue_kxr_evb/board.cmake diff --git a/boards/ambiq/apollo4p_blue_kxr_evb/board.yml b/boards/ambiq/apollo4p_blue_kxr_evb/board.yml new file mode 100644 index 00000000000..b6b4f5ea9fc --- /dev/null +++ b/boards/ambiq/apollo4p_blue_kxr_evb/board.yml @@ -0,0 +1,5 @@ +board: + name: apollo4p_blue_kxr_evb + vendor: Ambiq + socs: + - name: apollo4p_blue diff --git a/boards/boards_legacy/arm/apollo4p_blue_kxr_evb/doc/apollo4-blue-plus-kxr-soc-eval-board.jpg b/boards/ambiq/apollo4p_blue_kxr_evb/doc/apollo4-blue-plus-kxr-soc-eval-board.jpg similarity index 100% rename from boards/boards_legacy/arm/apollo4p_blue_kxr_evb/doc/apollo4-blue-plus-kxr-soc-eval-board.jpg rename to boards/ambiq/apollo4p_blue_kxr_evb/doc/apollo4-blue-plus-kxr-soc-eval-board.jpg diff --git a/boards/boards_legacy/arm/apollo4p_blue_kxr_evb/doc/index.rst b/boards/ambiq/apollo4p_blue_kxr_evb/doc/index.rst similarity index 100% rename from boards/boards_legacy/arm/apollo4p_blue_kxr_evb/doc/index.rst rename to boards/ambiq/apollo4p_blue_kxr_evb/doc/index.rst