Skip to content

Commit 9812e07

Browse files
nordicjmjhedberg
authored andcommitted
modules: hal_nxp: Remove HWMv1 checks
Removes outdated checks that have not been used for a long time Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
1 parent d884a09 commit 9812e07

File tree

2 files changed

+8
-21
lines changed

2 files changed

+8
-21
lines changed

modules/hal_nxp/mcux/CMakeLists.txt

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -48,18 +48,13 @@ endif()
4848
# MCU_DEVICE_PATH: SOC name without core suffix. Must match the name of the
4949
# folder in MCUX HAL. IE MIMXRT595S, or LPC55S36
5050

51-
if(NOT HWMv2)
52-
# Include HWMv1 logic for MCUX variables
53-
include(${CMAKE_CURRENT_LIST_DIR}/hwmv1.cmake)
54-
else()
55-
string(TOUPPER ${CONFIG_SOC} MCUX_DEVICE_PATH)
56-
string(TOUPPER ${CONFIG_SOC} MCUX_DEVICE)
57-
set(MCUX_CPU CPU_${CONFIG_SOC_PART_NUMBER})
58-
59-
if(DEFINED CONFIG_MCUX_CORE_SUFFIX)
60-
string(APPEND MCUX_DEVICE ${CONFIG_MCUX_CORE_SUFFIX})
61-
string(APPEND MCUX_CPU ${CONFIG_MCUX_CORE_SUFFIX})
62-
endif()
51+
string(TOUPPER ${CONFIG_SOC} MCUX_DEVICE_PATH)
52+
string(TOUPPER ${CONFIG_SOC} MCUX_DEVICE)
53+
set(MCUX_CPU CPU_${CONFIG_SOC_PART_NUMBER})
54+
55+
if(DEFINED CONFIG_MCUX_CORE_SUFFIX)
56+
string(APPEND MCUX_DEVICE ${CONFIG_MCUX_CORE_SUFFIX})
57+
string(APPEND MCUX_CPU ${CONFIG_MCUX_CORE_SUFFIX})
6358
endif()
6459

6560
if(DEFINED CONFIG_SOC_SDKNG_UNSUPPORTED)

modules/hal_nxp/s32/CMakeLists.txt

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,7 @@
11
# Copyright 2022-2025 NXP
22

33
# Set the SoC specific drivers and configuration to build
4-
if(HWMv2)
5-
set(SOC_BASE ${CONFIG_SOC})
6-
else()
7-
if(${CONFIG_SOC} STREQUAL "s32z27")
8-
set(SOC_BASE "s32z270")
9-
else()
10-
set(SOC_BASE ${CONFIG_SOC})
11-
endif()
12-
endif()
4+
set(SOC_BASE ${CONFIG_SOC})
135

146
add_subdirectory(${ZEPHYR_CURRENT_MODULE_DIR}/s32/drivers/${SOC_SERIES} hal_nxp/s32/drivers)
157
add_subdirectory(${ZEPHYR_CURRENT_MODULE_DIR}/s32/soc/${SOC_BASE} hal_nxp/s32/soc)

0 commit comments

Comments
 (0)