Merge branch 'master' of https://github.com/micropython/micropython i…

…nto ports/psoc6
Infineon · Apr 14, 2023 · 2a562ef · 2a562ef
2 parents 9af2882 + 0acc733
commit 2a562ef
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/ports/mimxrt/Makefile b/ports/mimxrt/Makefile
@@ -136,7 +136,6 @@ SRC_HAL_IMX_C += \
 	$(MCU_DIR)/drivers/fsl_lpuart.c \
 	$(MCU_DIR)/drivers/fsl_pit.c \
 	$(MCU_DIR)/drivers/fsl_pwm.c \
-	$(MCU_DIR)/drivers/fsl_romapi.c \
 	$(MCU_DIR)/drivers/fsl_sai.c \
 	$(MCU_DIR)/drivers/fsl_snvs_lp.c \
 	$(MCU_DIR)/drivers/fsl_wdog.c \
@@ -153,7 +152,8 @@ endif
 
 ifeq ($(MCU_SERIES),$(filter $(MCU_SERIES), MIMXRT1015 MIMXRT1021 MIMXRT1052 MIMXRT1062 MIMXRT1064 MIMXRT1176))
 SRC_HAL_IMX_C += \
-	$(MCU_DIR)/drivers/fsl_qtmr.c
+	$(MCU_DIR)/drivers/fsl_qtmr.c \
+	$(MCU_DIR)/drivers/fsl_romapi.c
 endif
 
 ifeq ($(MCU_SERIES), MIMXRT1176)

diff --git a/ports/mimxrt/modmachine.c b/ports/mimxrt/modmachine.c
@@ -38,7 +38,9 @@
 #include "pin.h"
 #include "modmachine.h"
 #include "fsl_wdog.h"
+#if FSL_FEATURE_BOOT_ROM_HAS_ROMAPI
 #include "fsl_romapi.h"
+#endif
 
 #if MICROPY_PY_MACHINE