From 0fbb5439833ac515aefc0a5f0ed2461e9c0c703a Mon Sep 17 00:00:00 2001
From: Jamie McCrae <jamie.mccrae@nordicsemi.no>
Date: Fri, 2 Feb 2024 11:38:09 +0000
Subject: [PATCH] boards: arm: acn52832: Convert to v2

Converts the board to hwmv2

Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
---
 .../Kconfig.board => aconno/acn52832/Kconfig.acn52832}        | 3 +--
 .../{boards_legacy/arm => aconno}/acn52832/Kconfig.defconfig  | 3 ---
 .../arm => aconno}/acn52832/acn52832-pinctrl.dtsi             | 0
 boards/{boards_legacy/arm => aconno}/acn52832/acn52832.dts    | 0
 boards/{boards_legacy/arm => aconno}/acn52832/acn52832.yaml   | 0
 .../{boards_legacy/arm => aconno}/acn52832/acn52832_defconfig | 4 ----
 boards/{boards_legacy/arm => aconno}/acn52832/board.cmake     | 0
 boards/aconno/acn52832/board.yml                              | 3 +++
 boards/{boards_legacy/arm => aconno}/acn52832/doc/index.rst   | 0
 .../{boards_legacy/arm => aconno}/acn52832/pre_dt_board.cmake | 0
 boards/vng/nrf52_vbluno52/board.yml                           | 2 ++
 11 files changed, 6 insertions(+), 9 deletions(-)
 rename boards/{boards_legacy/arm/acn52832/Kconfig.board => aconno/acn52832/Kconfig.acn52832} (74%)
 rename boards/{boards_legacy/arm => aconno}/acn52832/Kconfig.defconfig (86%)
 rename boards/{boards_legacy/arm => aconno}/acn52832/acn52832-pinctrl.dtsi (100%)
 rename boards/{boards_legacy/arm => aconno}/acn52832/acn52832.dts (100%)
 rename boards/{boards_legacy/arm => aconno}/acn52832/acn52832.yaml (100%)
 rename boards/{boards_legacy/arm => aconno}/acn52832/acn52832_defconfig (70%)
 rename boards/{boards_legacy/arm => aconno}/acn52832/board.cmake (100%)
 create mode 100644 boards/aconno/acn52832/board.yml
 rename boards/{boards_legacy/arm => aconno}/acn52832/doc/index.rst (100%)
 rename boards/{boards_legacy/arm => aconno}/acn52832/pre_dt_board.cmake (100%)

diff --git a/boards/boards_legacy/arm/acn52832/Kconfig.board b/boards/aconno/acn52832/Kconfig.acn52832
similarity index 74%
rename from boards/boards_legacy/arm/acn52832/Kconfig.board
rename to boards/aconno/acn52832/Kconfig.acn52832
index 6e19e79560a..ef035c30f9d 100644
--- a/boards/boards_legacy/arm/acn52832/Kconfig.board
+++ b/boards/aconno/acn52832/Kconfig.acn52832
@@ -4,5 +4,4 @@
 # SPDX-License-Identifier: Apache-2.0
 
 config BOARD_ACN52832
-	bool "aconno ACN52832"
-	depends on SOC_NRF52832_QFAA
+	select SOC_NRF52832_QFAA
diff --git a/boards/boards_legacy/arm/acn52832/Kconfig.defconfig b/boards/aconno/acn52832/Kconfig.defconfig
similarity index 86%
rename from boards/boards_legacy/arm/acn52832/Kconfig.defconfig
rename to boards/aconno/acn52832/Kconfig.defconfig
index e389aadf6e7..10c5ce95ed8 100644
--- a/boards/boards_legacy/arm/acn52832/Kconfig.defconfig
+++ b/boards/aconno/acn52832/Kconfig.defconfig
@@ -5,9 +5,6 @@
 
 if BOARD_ACN52832
 
-config BOARD
-	default "acn52832"
-
 config BT_CTLR
 	default BT
 
diff --git a/boards/boards_legacy/arm/acn52832/acn52832-pinctrl.dtsi b/boards/aconno/acn52832/acn52832-pinctrl.dtsi
similarity index 100%
rename from boards/boards_legacy/arm/acn52832/acn52832-pinctrl.dtsi
rename to boards/aconno/acn52832/acn52832-pinctrl.dtsi
diff --git a/boards/boards_legacy/arm/acn52832/acn52832.dts b/boards/aconno/acn52832/acn52832.dts
similarity index 100%
rename from boards/boards_legacy/arm/acn52832/acn52832.dts
rename to boards/aconno/acn52832/acn52832.dts
diff --git a/boards/boards_legacy/arm/acn52832/acn52832.yaml b/boards/aconno/acn52832/acn52832.yaml
similarity index 100%
rename from boards/boards_legacy/arm/acn52832/acn52832.yaml
rename to boards/aconno/acn52832/acn52832.yaml
diff --git a/boards/boards_legacy/arm/acn52832/acn52832_defconfig b/boards/aconno/acn52832/acn52832_defconfig
similarity index 70%
rename from boards/boards_legacy/arm/acn52832/acn52832_defconfig
rename to boards/aconno/acn52832/acn52832_defconfig
index d35096cdd6e..7167aca850a 100644
--- a/boards/boards_legacy/arm/acn52832/acn52832_defconfig
+++ b/boards/aconno/acn52832/acn52832_defconfig
@@ -1,9 +1,5 @@
 # SPDX-License-Identifier: Apache-2.0
 
-CONFIG_SOC_SERIES_NRF52X=y
-CONFIG_SOC_NRF52832_QFAA=y
-CONFIG_BOARD_ACN52832=y
-
 # Enable MPU
 CONFIG_ARM_MPU=y
 
diff --git a/boards/boards_legacy/arm/acn52832/board.cmake b/boards/aconno/acn52832/board.cmake
similarity index 100%
rename from boards/boards_legacy/arm/acn52832/board.cmake
rename to boards/aconno/acn52832/board.cmake
diff --git a/boards/aconno/acn52832/board.yml b/boards/aconno/acn52832/board.yml
new file mode 100644
index 00000000000..08473466abf
--- /dev/null
+++ b/boards/aconno/acn52832/board.yml
@@ -0,0 +1,3 @@
+board:
+  name: acn52832
+  vendor: Aconno
diff --git a/boards/boards_legacy/arm/acn52832/doc/index.rst b/boards/aconno/acn52832/doc/index.rst
similarity index 100%
rename from boards/boards_legacy/arm/acn52832/doc/index.rst
rename to boards/aconno/acn52832/doc/index.rst
diff --git a/boards/boards_legacy/arm/acn52832/pre_dt_board.cmake b/boards/aconno/acn52832/pre_dt_board.cmake
similarity index 100%
rename from boards/boards_legacy/arm/acn52832/pre_dt_board.cmake
rename to boards/aconno/acn52832/pre_dt_board.cmake
diff --git a/boards/vng/nrf52_vbluno52/board.yml b/boards/vng/nrf52_vbluno52/board.yml
index a22a8f3fa22..21e9dc1e0b6 100644
--- a/boards/vng/nrf52_vbluno52/board.yml
+++ b/boards/vng/nrf52_vbluno52/board.yml
@@ -1,3 +1,5 @@
 board:
   name: nrf52_vbluno52
   vendor: VNG Corporation
+  socs:
+  - name: nrf52832