Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

hwmv2: soc:nxp: lpc: convert LPC SOC family to hardware model V2 #69260

Merged
merged 13 commits into from
Feb 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 9 additions & 10 deletions MAINTAINERS.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3302,18 +3302,17 @@ NXP Platforms (MCUX):
- EmilioCBen
- decsny
files:
- boards/arm/mimx*/
- boards/arm/frdm*/
- boards/arm/lpcxpress*/
- boards/arm/twr_*/
- boards/arm/vmu*/
- soc/arm/nxp_imx/
- soc/arm/nxp_kinetis/
- soc/arm/nxp_lpc/
- boards/nxp/mimx*/
- boards/nxp/frdm*/
- boards/nxp/lpcxpress*/
- boards/nxp/twr_*/
- boards/nxp/vmu*/
- soc/nxp/imx/
- soc/nxp/kinetis/
- soc/nxp/lpc/
- dts/arm/nxp/
- samples/boards/nxp*/
files-exclude:
- boards/arm/*s32*/
- dts/arm/nxp/*s32*
- samples/boards/nxp_s32/
labels:
Expand All @@ -3333,7 +3332,7 @@ NXP Platforms (S32):
- boards/arm/mr_canhubk3/
- boards/arm/ucans32k1sic/
- boards/common/*nxp_s32*
- soc/arm/nxp_s32/
- soc/nxp/s32/
- drivers/*/*nxp_s32*
- drivers/misc/*nxp_s32*/
- dts/bindings/*/nxp,s32*
Expand Down
9 changes: 0 additions & 9 deletions boards/boards_legacy/arm/faze/Kconfig.board

This file was deleted.

11 changes: 0 additions & 11 deletions boards/boards_legacy/arm/faze/Kconfig.defconfig

This file was deleted.

11 changes: 0 additions & 11 deletions boards/boards_legacy/arm/lpcxpresso11u68/Kconfig.defconfig

This file was deleted.

11 changes: 0 additions & 11 deletions boards/boards_legacy/arm/lpcxpresso51u68/Kconfig.defconfig

This file was deleted.

14 changes: 0 additions & 14 deletions boards/boards_legacy/arm/lpcxpresso54114/Kconfig.board

This file was deleted.

23 changes: 0 additions & 23 deletions boards/boards_legacy/arm/lpcxpresso54114/Kconfig.defconfig

This file was deleted.

13 changes: 0 additions & 13 deletions boards/boards_legacy/arm/lpcxpresso54114/board.cmake

This file was deleted.

14 changes: 0 additions & 14 deletions boards/boards_legacy/arm/lpcxpresso55s69/Kconfig.board

This file was deleted.

28 changes: 0 additions & 28 deletions boards/boards_legacy/arm/lpcxpresso55s69/board.cmake

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
# LPCXpresso11U68 board

# Copyright (c) 2020, Seagate
# Copyright 2024 NXP
#
# SPDX-License-Identifier: Apache-2.0

config BOARD_LPCXPRESSO11U68
bool "NXP LPCXPRESSO-11U68"
depends on SOC_SERIES_LPC11U6X
select SOC_LPC11U68
select SOC_PART_NUMBER_LPC11U68JBD100
5 changes: 5 additions & 0 deletions boards/nxp/lpcxpresso11u68/board.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
board:
name: lpcxpresso11u68
vendor: nxp
socs:
- name: lpc11u68
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ CONFIG_UART_INTERRUPT_DRIVEN=y
CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=48000000
CONFIG_GPIO=y
CONFIG_BUILD_OUTPUT_HEX=y
CONFIG_SOC_SERIES_LPC11U6X=y
# Since the board has little memory (32k), stack sizes are lowered
# so that the application has more RAM for itself.
CONFIG_MAIN_STACK_SIZE=512
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
# LPCXpresso51U68 board

# Copyright (c) 2021 metraTec GmbH
# Copyright 2024 NXP
#
# SPDX-License-Identifier: Apache-2.0

config BOARD_LPCXPRESSO51U68
bool "NXP LPCXPRESSO-51U68"
depends on SOC_SERIES_LPC51U68
select SOC_LPC51U68
select SOC_PART_NUMBER_LPC51U68JBD64
5 changes: 5 additions & 0 deletions boards/nxp/lpcxpresso51u68/board.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
board:
name: lpcxpresso51u68
vendor: nxp
socs:
- name: lpc51u68
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
CONFIG_SOC_SERIES_LPC51U68=y
CONFIG_SOC_LPC51U68=y
CONFIG_BOARD_LPCXPRESSO51U68=y
CONFIG_CONSOLE=y
CONFIG_UART_CONSOLE=y
CONFIG_SERIAL=y
Expand Down
15 changes: 15 additions & 0 deletions boards/nxp/lpcxpresso54114/Kconfig.defconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# LPCXpresso54114 board
#
# Copyright (c) 2017, 2024 NXP
# SPDX-License-Identifier: Apache-2.0

# Place size restrictions on first image if dual core is enabled
if SECOND_CORE_MCUX && BOARD_LPCXPRESSO54114_LPC54114_M4

# Workaround for not being able to have commas in macro arguments
DT_CHOSEN_Z_CODE_PARTITION := zephyr,code-partition

config FLASH_LOAD_SIZE
default $(dt_chosen_reg_size_hex,$(DT_CHOSEN_Z_CODE_PARTITION))

endif # SECOND_CORE_MCUX && BOARD_LPCXPRESSO54114_LPC54114_M4
9 changes: 9 additions & 0 deletions boards/nxp/lpcxpresso54114/Kconfig.lpcxpresso54114
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# LPCXpresso54114 board

# Copyright 2017, 2024 NXP
# SPDX-License-Identifier: Apache-2.0

config BOARD_LPCXPRESSO54114
select SOC_LPC54114_M4 if BOARD_LPCXPRESSO54114_LPC54114_M4
select SOC_LPC54114_M0 if BOARD_LPCXPRESSO54114_LPC54114_M0
select SOC_PART_NUMBER_LPC54114J256BD64
13 changes: 13 additions & 0 deletions boards/nxp/lpcxpresso54114/board.cmake
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
#
# Copyright (c) 2017, NXP
#
# SPDX-License-Identifier: Apache-2.0
#

if(BOARD_LPCXPRESSO54114_LPC54114_M4 OR CONFIG_SECOND_CORE_MCUX)
board_runner_args(jlink "--device=LPC54114J256_M4" "--reset-after-load")
elseif(BOARD_LPCXPRESSO54114_LPC54114_M0)
board_runner_args(jlink "--device=LPC54114J256_M0" "--reset-after-load")
endif()

include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
5 changes: 5 additions & 0 deletions boards/nxp/lpcxpresso54114/board.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
board:
name: lpcxpresso54114
vendor: nxp
socs:
- name: lpc54114
dleach02 marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,8 @@ features:

The default configuration for each core can be found in the defconfig files:

``boards/arm/lpcxpresso54114/lpcxpresso54114_m4_defconfig``
``boards/arm/lpcxpresso54114/lpcxpresso54114_m0_defconfig``
`boards/nxp/lpcxpresso54114/lpcxpresso54114_lpc54114_m4_defconfig`
`boards/nxp/lpcxpresso54114/lpcxpresso54114_lpc54114_m0_defconfig`

Other hardware features are not currently supported by the port.

Expand Down Expand Up @@ -170,7 +170,7 @@ Here is an example for the :ref:`hello_world` application.

.. zephyr-app-commands::
:zephyr-app: samples/hello_world
:board: lpcxpresso54114_m4
:board: lpcxpresso54114/lpc54114/m4
:goals: flash

Open a serial terminal, reset the board (press the SW4 button), and you should
Expand All @@ -188,7 +188,7 @@ Here is an example for the :ref:`hello_world` application.

.. zephyr-app-commands::
:zephyr-app: samples/hello_world
:board: lpcxpresso54114_m4
:board: lpcxpresso54114/lpc54114/m4
:goals: debug

Open a serial terminal, step through the application in your debugger, and you
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
#
# Copyright (c) 2017, NXP
# Copyright (c) 2017, 2024 NXP
#
# SPDX-License-Identifier: Apache-2.0
#

identifier: lpcxpresso54114_m0
identifier: lpcxpresso54114/lpc54114/m0
name: NXP LPCXpresso54114 M0
type: mcu
arch: arm
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,9 @@
#
# Copyright (c) 2017, NXP
# Copyright (c) 2017, 2024 NXP
#
# SPDX-License-Identifier: Apache-2.0
#

CONFIG_SOC_LPC54114_M0=y
CONFIG_SOC_SERIES_LPC54XXX=y
CONFIG_BOARD_LPCXPRESSO54114_M0=y
CONFIG_USE_SEGGER_RTT=y
CONFIG_SERIAL=n
CONFIG_GPIO=n
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
#
# Copyright (c) 2017, NXP
# Copyright (c) 2017, 2024 NXP
#
# SPDX-License-Identifier: Apache-2.0
#

identifier: lpcxpresso54114_m4
identifier: lpcxpresso54114/lpc54114/m4
name: NXP LPCXpresso54114 M4
type: mcu
arch: arm
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,9 @@
#
# Copyright (c) 2017, NXP
# Copyright (c) 2017, 2024 NXP
#
# SPDX-License-Identifier: Apache-2.0
#

CONFIG_SOC_LPC54114_M4=y
CONFIG_SOC_SERIES_LPC54XXX=y
CONFIG_BOARD_LPCXPRESSO54114_M4=y
CONFIG_CONSOLE=y
CONFIG_UART_CONSOLE=y
CONFIG_SERIAL=y
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
# LPCXpresso55S06 board

# Copyright (c) 2022 metraTec
# Copyright 2024 NXP
# SPDX-License-Identifier: Apache-2.0

if BOARD_LPCXPRESSO55S06

config BOARD
default "lpcxpresso55s06"

if BOOTLOADER_MCUBOOT
choice MCUBOOT_BOOTLOADER_MODE
# Board only supports MCUBoot via "upgrade only" method:
Expand Down
Loading
Loading