Skip to content

Commit 7ed7cd1

Browse files
ZhaoxiangJinkartben
authored andcommitted
modules: hal_nxp: Move hal_nxp glue layer to zephyr repo
Move hal_nxp glue layer to zephyr repo. Fix build warnings and failures caused by hal_nxp upgrade. Update manifest to contain hal_nxp changes. Signed-off-by: Zhaoxiang Jin <Zhaoxiang.Jin_1@nxp.com>
1 parent 916897f commit 7ed7cd1

File tree

48 files changed

+1394
-69
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+1394
-69
lines changed

MAINTAINERS.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5006,9 +5006,6 @@ West:
50065006
- bperseghetti
50075007
files:
50085008
- modules/hal_nxp/
5009-
- modules/Kconfig.imx
5010-
- modules/Kconfig.mcux
5011-
- modules/Kconfig.nxp_s32
50125009
labels:
50135010
- "platform: NXP"
50145011

boards/nxp/mimxrt1010_evk/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ if(CONFIG_NXP_IMXRT_BOOT_HEADER)
2020
zephyr_compile_definitions(XIP_BOOT_HEADER_ENABLE=1)
2121
zephyr_compile_definitions(BOARD_FLASH_SIZE=CONFIG_FLASH_SIZE*1024)
2222
set(RT1010_BOARD_DIR
23-
"${ZEPHYR_HAL_NXP_MODULE_DIR}/mcux/mcux-sdk/boards/evkmimxrt1010")
23+
"${ZEPHYR_HAL_NXP_MODULE_DIR}/mcux/mcux-sdk-ng/boards/evkmimxrt1010")
2424
zephyr_library_sources(${RT1010_BOARD_DIR}/xip/evkmimxrt1010_flexspi_nor_config.c)
2525
zephyr_library_include_directories(${RT1010_BOARD_DIR}/xip)
2626
endif()

boards/nxp/mimxrt1015_evk/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ if(CONFIG_NXP_IMXRT_BOOT_HEADER)
1919
zephyr_compile_definitions(XIP_BOOT_HEADER_ENABLE=1)
2020
zephyr_compile_definitions(BOARD_FLASH_SIZE=CONFIG_FLASH_SIZE*1024)
2121
set(RT1015_BOARD_DIR
22-
"${ZEPHYR_HAL_NXP_MODULE_DIR}/mcux/mcux-sdk/boards/evkmimxrt1015")
22+
"${ZEPHYR_HAL_NXP_MODULE_DIR}/mcux/mcux-sdk-ng/boards/evkmimxrt1015")
2323
zephyr_library_sources(${RT1015_BOARD_DIR}/xip/evkmimxrt1015_flexspi_nor_config.c)
2424
zephyr_library_include_directories(${RT1015_BOARD_DIR}/xip)
2525
endif()

boards/nxp/mimxrt1020_evk/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ if(CONFIG_NXP_IMXRT_BOOT_HEADER)
1313
"update your flash configuration or device configuration data blocks")
1414
endif()
1515
set(RT1020_BOARD_DIR
16-
"${ZEPHYR_HAL_NXP_MODULE_DIR}/mcux/mcux-sdk/boards/evkmimxrt1020")
16+
"${ZEPHYR_HAL_NXP_MODULE_DIR}/mcux/mcux-sdk-ng/boards/evkmimxrt1020")
1717
if(CONFIG_BOOT_FLEXSPI_NOR)
1818
# Include flash configuration block for RT1020 EVK from NXP's HAL.
1919
# This configuration block may need modification if another flash chip is

boards/nxp/mimxrt1024_evk/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ if(CONFIG_NXP_IMXRT_BOOT_HEADER)
1313
"update your flash configuration or device configuration data blocks")
1414
endif()
1515
set(RT1024_BOARD_DIR
16-
"${ZEPHYR_HAL_NXP_MODULE_DIR}/mcux/mcux-sdk/boards/evkmimxrt1024")
16+
"${ZEPHYR_HAL_NXP_MODULE_DIR}/mcux/mcux-sdk-ng/boards/evkmimxrt1024")
1717
if(CONFIG_BOOT_FLEXSPI_NOR)
1818
# Include flash configuration block for RT1024 EVK from NXP's HAL.
1919
# This configuration block may need modification if another flash chip is

boards/nxp/mimxrt1040_evk/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ if(CONFIG_NXP_IMXRT_BOOT_HEADER)
1818
"update your flash configuration or device configuration data blocks")
1919
endif()
2020
set(RT1040_BOARD_DIR
21-
"${ZEPHYR_HAL_NXP_MODULE_DIR}/mcux/mcux-sdk/boards/evkmimxrt1040")
21+
"${ZEPHYR_HAL_NXP_MODULE_DIR}/mcux/mcux-sdk-ng/boards/evkmimxrt1040")
2222
if(CONFIG_BOOT_FLEXSPI_NOR)
2323
# Include flash configuration block for RT1040 EVK from NXP's HAL.
2424
# This configuration block may need modification if another flash chip is

boards/nxp/mimxrt1050_evk/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ if(CONFIG_NXP_IMXRT_BOOT_HEADER)
2424
set(FLASH_CONF evkbimxrt1050_flexspi_nor_config.c)
2525
endif()
2626
set(RT1050_BOARD_DIR
27-
"${ZEPHYR_HAL_NXP_MODULE_DIR}/mcux/mcux-sdk/boards/evkbimxrt1050")
27+
"${ZEPHYR_HAL_NXP_MODULE_DIR}/mcux/mcux-sdk-ng/boards/evkbimxrt1050")
2828
if(CONFIG_BOOT_FLEXSPI_NOR)
2929
# Include flash configuration block for RT1050 EVK from NXP's HAL.
3030
# This configuration block may need modification if another flash chip is

boards/nxp/mimxrt1060_evk/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ if(CONFIG_NXP_IMXRT_BOOT_HEADER)
3333
set(BOARD_NAME evkbmimxrt1060)
3434
endif()
3535
set(RT1060_BOARD_DIR
36-
"${ZEPHYR_HAL_NXP_MODULE_DIR}/mcux/mcux-sdk/boards/${BOARD_NAME}")
36+
"${ZEPHYR_HAL_NXP_MODULE_DIR}/mcux/mcux-sdk-ng/boards/${BOARD_NAME}")
3737
if(CONFIG_BOOT_FLEXSPI_NOR)
3838
# Include flash configuration block for RT1060 EVK from NXP's HAL.
3939
# This configuration block may need modification if another flash chip is

boards/nxp/mimxrt1062_fmurt6/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ if(CONFIG_NXP_IMXRT_BOOT_HEADER)
1414
set(BOARD_NAME evkbimxrt1050)
1515
endif()
1616
set(RT1062_BOARD_DIR
17-
"${ZEPHYR_HAL_NXP_MODULE_DIR}/mcux/mcux-sdk/boards/${BOARD_NAME}")
17+
"${ZEPHYR_HAL_NXP_MODULE_DIR}/mcux/mcux-sdk-ng/boards/${BOARD_NAME}")
1818
if(CONFIG_BOOT_FLEXSPI_NOR)
1919
# Include flash configuration block for RT1050 EVK from NXP's HAL.
2020
# This configuration block may need modification if another flash chip is

boards/nxp/mimxrt1064_evk/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ if(CONFIG_NXP_IMXRT_BOOT_HEADER)
1818
"update your flash configuration or device configuration data blocks")
1919
endif()
2020
set(RT1064_BOARD_DIR
21-
"${ZEPHYR_HAL_NXP_MODULE_DIR}/mcux/mcux-sdk/boards/evkmimxrt1064")
21+
"${ZEPHYR_HAL_NXP_MODULE_DIR}/mcux/mcux-sdk-ng/boards/evkmimxrt1064")
2222
if(CONFIG_BOOT_FLEXSPI_NOR)
2323
# Include flash configuration block for RT1064 EVK from NXP's HAL.
2424
# This configuration block may need modification if another flash chip is

0 commit comments

Comments
 (0)