From f2eb7652ce150e97ea17a37576d4ced5321e2abd Mon Sep 17 00:00:00 2001 From: Daniel DeGrasse Date: Thu, 29 Feb 2024 22:37:42 +0000 Subject: [PATCH] boards: phyboard_pollux: move to HVMv2 Move phyboard_pollux to HWMv2 Signed-off-by: Daniel DeGrasse --- .../mimx8mp_phyboard_pollux/Kconfig.defconfig | 3 --- .../Kconfig.mimx8mp_phyboard_pollux} | 5 +---- .../mimx8mp_phyboard_pollux/board.cmake | 0 boards/phytec/mimx8mp_phyboard_pollux/board.yml | 5 +++++ .../mimx8mp_phyboard_pollux/doc/img/PEB-EVAL-01.jpg | Bin .../doc/img/Phyboard_Pollux.jpg | Bin .../mimx8mp_phyboard_pollux/doc/index.rst | 2 +- .../mimx8mp_phyboard_pollux-pinctrl.dtsi | 0 .../mimx8mp_phyboard_pollux_mimx8ml8_m7.dts} | 0 .../mimx8mp_phyboard_pollux_mimx8ml8_m7.yaml} | 2 +- .../mimx8mp_phyboard_pollux_mimx8ml8_m7_defconfig} | 3 --- 11 files changed, 8 insertions(+), 12 deletions(-) rename boards/{boards_legacy/arm => phytec}/mimx8mp_phyboard_pollux/Kconfig.defconfig (84%) rename boards/{boards_legacy/arm/mimx8mp_phyboard_pollux/Kconfig.board => phytec/mimx8mp_phyboard_pollux/Kconfig.mimx8mp_phyboard_pollux} (60%) rename boards/{boards_legacy/arm => phytec}/mimx8mp_phyboard_pollux/board.cmake (100%) create mode 100644 boards/phytec/mimx8mp_phyboard_pollux/board.yml rename boards/{boards_legacy/arm => phytec}/mimx8mp_phyboard_pollux/doc/img/PEB-EVAL-01.jpg (100%) rename boards/{boards_legacy/arm => phytec}/mimx8mp_phyboard_pollux/doc/img/Phyboard_Pollux.jpg (100%) rename boards/{boards_legacy/arm => phytec}/mimx8mp_phyboard_pollux/doc/index.rst (98%) rename boards/{boards_legacy/arm => phytec}/mimx8mp_phyboard_pollux/mimx8mp_phyboard_pollux-pinctrl.dtsi (100%) rename boards/{boards_legacy/arm/mimx8mp_phyboard_pollux/mimx8mp_phyboard_pollux.dts => phytec/mimx8mp_phyboard_pollux/mimx8mp_phyboard_pollux_mimx8ml8_m7.dts} (100%) rename boards/{boards_legacy/arm/mimx8mp_phyboard_pollux/mimx8mp_phyboard_pollux.yaml => phytec/mimx8mp_phyboard_pollux/mimx8mp_phyboard_pollux_mimx8ml8_m7.yaml} (86%) rename boards/{boards_legacy/arm/mimx8mp_phyboard_pollux/mimx8mp_phyboard_pollux_defconfig => phytec/mimx8mp_phyboard_pollux/mimx8mp_phyboard_pollux_mimx8ml8_m7_defconfig} (78%) diff --git a/boards/boards_legacy/arm/mimx8mp_phyboard_pollux/Kconfig.defconfig b/boards/phytec/mimx8mp_phyboard_pollux/Kconfig.defconfig similarity index 84% rename from boards/boards_legacy/arm/mimx8mp_phyboard_pollux/Kconfig.defconfig rename to boards/phytec/mimx8mp_phyboard_pollux/Kconfig.defconfig index 889b2b24dfa..e860faf97cf 100644 --- a/boards/boards_legacy/arm/mimx8mp_phyboard_pollux/Kconfig.defconfig +++ b/boards/phytec/mimx8mp_phyboard_pollux/Kconfig.defconfig @@ -5,9 +5,6 @@ if BOARD_MIMX8MP_PHYBOARD_POLLUX -config BOARD - default "mimx8mp_phyboard_pollux" - if !XIP config FLASH_SIZE default 0 diff --git a/boards/boards_legacy/arm/mimx8mp_phyboard_pollux/Kconfig.board b/boards/phytec/mimx8mp_phyboard_pollux/Kconfig.mimx8mp_phyboard_pollux similarity index 60% rename from boards/boards_legacy/arm/mimx8mp_phyboard_pollux/Kconfig.board rename to boards/phytec/mimx8mp_phyboard_pollux/Kconfig.mimx8mp_phyboard_pollux index af7975bc3c9..75165bf5a29 100644 --- a/boards/boards_legacy/arm/mimx8mp_phyboard_pollux/Kconfig.board +++ b/boards/phytec/mimx8mp_phyboard_pollux/Kconfig.mimx8mp_phyboard_pollux @@ -1,9 +1,6 @@ -# MIMX8MP PhyBOARD Pollux (i.MX8MP) - # Copyright (c) 2022 PHYTEC Messtechnik GmbH # SPDX-License-Identifier: Apache-2.0 config BOARD_MIMX8MP_PHYBOARD_POLLUX - bool "PhyBOARD Pollux (i.MX8MP)" - depends on SOC_SERIES_IMX8ML_M7 + select SOC_MIMX8MP_M7 if BOARD_MIMX8MP_PHYBOARD_POLLUX_MIMX8ML8_M7 select SOC_PART_NUMBER_MIMX8ML8DVNLZ diff --git a/boards/boards_legacy/arm/mimx8mp_phyboard_pollux/board.cmake b/boards/phytec/mimx8mp_phyboard_pollux/board.cmake similarity index 100% rename from boards/boards_legacy/arm/mimx8mp_phyboard_pollux/board.cmake rename to boards/phytec/mimx8mp_phyboard_pollux/board.cmake diff --git a/boards/phytec/mimx8mp_phyboard_pollux/board.yml b/boards/phytec/mimx8mp_phyboard_pollux/board.yml new file mode 100644 index 00000000000..b871a53e370 --- /dev/null +++ b/boards/phytec/mimx8mp_phyboard_pollux/board.yml @@ -0,0 +1,5 @@ +board: + name: mimx8mp_phyboard_pollux + vendor: phytec + socs: + - name: mimx8ml8 diff --git a/boards/boards_legacy/arm/mimx8mp_phyboard_pollux/doc/img/PEB-EVAL-01.jpg b/boards/phytec/mimx8mp_phyboard_pollux/doc/img/PEB-EVAL-01.jpg similarity index 100% rename from boards/boards_legacy/arm/mimx8mp_phyboard_pollux/doc/img/PEB-EVAL-01.jpg rename to boards/phytec/mimx8mp_phyboard_pollux/doc/img/PEB-EVAL-01.jpg diff --git a/boards/boards_legacy/arm/mimx8mp_phyboard_pollux/doc/img/Phyboard_Pollux.jpg b/boards/phytec/mimx8mp_phyboard_pollux/doc/img/Phyboard_Pollux.jpg similarity index 100% rename from boards/boards_legacy/arm/mimx8mp_phyboard_pollux/doc/img/Phyboard_Pollux.jpg rename to boards/phytec/mimx8mp_phyboard_pollux/doc/img/Phyboard_Pollux.jpg diff --git a/boards/boards_legacy/arm/mimx8mp_phyboard_pollux/doc/index.rst b/boards/phytec/mimx8mp_phyboard_pollux/doc/index.rst similarity index 98% rename from boards/boards_legacy/arm/mimx8mp_phyboard_pollux/doc/index.rst rename to boards/phytec/mimx8mp_phyboard_pollux/doc/index.rst index 04da62c18ed..501c7f541a0 100644 --- a/boards/boards_legacy/arm/mimx8mp_phyboard_pollux/doc/index.rst +++ b/boards/phytec/mimx8mp_phyboard_pollux/doc/index.rst @@ -75,7 +75,7 @@ features: +-----------+------------+-------------------------------------+ The default configuration can be found in the defconfig file: -:zephyr_file:`boards/arm/mimx8mp_phyboard_pollux/mimx8mp_phyboard_pollux_defconfig`. +:zephyr_file:`boards/phytec/mimx8mp_phyboard_pollux/mimx8mp_phyboard_pollux_mimx8ml8_m7_defconfig`. It's recommended to disable peripherals used by the M7-Core on the host running on the Linux host. diff --git a/boards/boards_legacy/arm/mimx8mp_phyboard_pollux/mimx8mp_phyboard_pollux-pinctrl.dtsi b/boards/phytec/mimx8mp_phyboard_pollux/mimx8mp_phyboard_pollux-pinctrl.dtsi similarity index 100% rename from boards/boards_legacy/arm/mimx8mp_phyboard_pollux/mimx8mp_phyboard_pollux-pinctrl.dtsi rename to boards/phytec/mimx8mp_phyboard_pollux/mimx8mp_phyboard_pollux-pinctrl.dtsi diff --git a/boards/boards_legacy/arm/mimx8mp_phyboard_pollux/mimx8mp_phyboard_pollux.dts b/boards/phytec/mimx8mp_phyboard_pollux/mimx8mp_phyboard_pollux_mimx8ml8_m7.dts similarity index 100% rename from boards/boards_legacy/arm/mimx8mp_phyboard_pollux/mimx8mp_phyboard_pollux.dts rename to boards/phytec/mimx8mp_phyboard_pollux/mimx8mp_phyboard_pollux_mimx8ml8_m7.dts diff --git a/boards/boards_legacy/arm/mimx8mp_phyboard_pollux/mimx8mp_phyboard_pollux.yaml b/boards/phytec/mimx8mp_phyboard_pollux/mimx8mp_phyboard_pollux_mimx8ml8_m7.yaml similarity index 86% rename from boards/boards_legacy/arm/mimx8mp_phyboard_pollux/mimx8mp_phyboard_pollux.yaml rename to boards/phytec/mimx8mp_phyboard_pollux/mimx8mp_phyboard_pollux_mimx8ml8_m7.yaml index c696532393d..aa2cc09a553 100644 --- a/boards/boards_legacy/arm/mimx8mp_phyboard_pollux/mimx8mp_phyboard_pollux.yaml +++ b/boards/phytec/mimx8mp_phyboard_pollux/mimx8mp_phyboard_pollux_mimx8ml8_m7.yaml @@ -4,7 +4,7 @@ # SPDX-License-Identifier: Apache-2.0 # -identifier: mimx8mp_phyboard_pollux +identifier: mimx8mp_phyboard_pollux/mimx8ml8/m7 name: PhyBOARD Pollux (i.MX8MP) type: mcu arch: arm diff --git a/boards/boards_legacy/arm/mimx8mp_phyboard_pollux/mimx8mp_phyboard_pollux_defconfig b/boards/phytec/mimx8mp_phyboard_pollux/mimx8mp_phyboard_pollux_mimx8ml8_m7_defconfig similarity index 78% rename from boards/boards_legacy/arm/mimx8mp_phyboard_pollux/mimx8mp_phyboard_pollux_defconfig rename to boards/phytec/mimx8mp_phyboard_pollux/mimx8mp_phyboard_pollux_mimx8ml8_m7_defconfig index 9c2fae84c13..4926fdbe4e1 100644 --- a/boards/boards_legacy/arm/mimx8mp_phyboard_pollux/mimx8mp_phyboard_pollux_defconfig +++ b/boards/phytec/mimx8mp_phyboard_pollux/mimx8mp_phyboard_pollux_mimx8ml8_m7_defconfig @@ -4,9 +4,6 @@ # SPDX-License-Identifier: Apache-2.0 # -CONFIG_SOC_SERIES_IMX8ML_M7=y -CONFIG_SOC_MIMX8ML8=y -CONFIG_BOARD_MIMX8MP_PHYBOARD_POLLUX=y CONFIG_CORTEX_M_SYSTICK=y CONFIG_CLOCK_CONTROL=y CONFIG_UART_CONSOLE=y