From 807f48f59c61233945a480f4f5d095678bee501f Mon Sep 17 00:00:00 2001
From: Peter van der Perk <peter.vanderperk@nxp.com>
Date: Tue, 5 Dec 2023 14:39:08 +0100
Subject: [PATCH] imxrt: preprocessor and include fixes

---
 arch/arm/src/imxrt/imxrt_clockconfig_ver1.h | 6 +++---
 arch/arm/src/imxrt/imxrt_gpio.c             | 6 ------
 arch/arm/src/imxrt/imxrt_gpio.h             | 2 ++
 arch/arm/src/imxrt/imxrt_start.c            | 1 +
 4 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/arch/arm/src/imxrt/imxrt_clockconfig_ver1.h b/arch/arm/src/imxrt/imxrt_clockconfig_ver1.h
index cb39e71d1cd3a..88b4ecc1cd671 100644
--- a/arch/arm/src/imxrt/imxrt_clockconfig_ver1.h
+++ b/arch/arm/src/imxrt/imxrt_clockconfig_ver1.h
@@ -18,8 +18,8 @@
  *
  ****************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_IMXRT_IMXRT_CLOCKCONFIG_H
-#define __ARCH_ARM_SRC_IMXRT_IMXRT_CLOCKCONFIG_H
+#ifndef __ARCH_ARM_SRC_IMXRT_IMXRT_CLOCKCONFIG_VER1_H
+#define __ARCH_ARM_SRC_IMXRT_IMXRT_CLOCKCONFIG_VER2_H
 
 /****************************************************************************
  * Included Files
@@ -43,4 +43,4 @@
 
 void imxrt_clockconfig(void);
 
-#endif /* __ARCH_ARM_SRC_IMXRT_IMXRT_CLOCKCONFIG_H */
+#endif /* __ARCH_ARM_SRC_IMXRT_IMXRT_CLOCKCONFIG_VER1_H */
diff --git a/arch/arm/src/imxrt/imxrt_gpio.c b/arch/arm/src/imxrt/imxrt_gpio.c
index 15fe4dab40cca..0b2b832dabfce 100644
--- a/arch/arm/src/imxrt/imxrt_gpio.c
+++ b/arch/arm/src/imxrt/imxrt_gpio.c
@@ -50,12 +50,6 @@
 #  error Unrecognized i.MX RT architecture
 #endif
 
-/****************************************************************************
- * Pre-processor Definitions
- ****************************************************************************/
-
-#define IMXRT_PADMUX_INVALID    255
-
 /****************************************************************************
  * Public Data
  ****************************************************************************/
diff --git a/arch/arm/src/imxrt/imxrt_gpio.h b/arch/arm/src/imxrt/imxrt_gpio.h
index f061000333bef..12b7012d75f1a 100644
--- a/arch/arm/src/imxrt/imxrt_gpio.h
+++ b/arch/arm/src/imxrt/imxrt_gpio.h
@@ -37,6 +37,8 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
+#define IMXRT_PADMUX_INVALID    255
+
 /* 32-bit Encoding:
  *
  *               3322 2222 2222 1111  1111 1100 0000 0000
diff --git a/arch/arm/src/imxrt/imxrt_start.c b/arch/arm/src/imxrt/imxrt_start.c
index 620ca1dd3f7a4..b5aa9c7fc0a30 100644
--- a/arch/arm/src/imxrt/imxrt_start.c
+++ b/arch/arm/src/imxrt/imxrt_start.c
@@ -39,6 +39,7 @@
 #include "imxrt_clockconfig.h"
 #include "imxrt_mpuinit.h"
 #include "imxrt_userspace.h"
+#include "imxrt_lowputc.h"
 #include "imxrt_serial.h"
 #include "imxrt_start.h"
 #include "imxrt_gpio.h"