From f5e431483e2e5a9bb65c8f4ec1994ee05dfdb4d2 Mon Sep 17 00:00:00 2001
From: Michael Mogenson <michael.mogenson@gmail.com>
Date: Wed, 2 Mar 2022 10:21:34 -0500
Subject: [PATCH] imxrt: fix userled config in appinit

The imxrt1064, imxrt1064, and teensy-4.x board configs would fail to
build when CONFIG_USERLED_LOWER was enabled, due to a missing header in
imxrt_appinit.c and an unset local define.

Verified a build succeds for the specified boards with the following
defconfig modifications:

    # CONFIG_ARCH_LEDS is not set
    CONFIG_USERLED=y
    CONFIG_USERLED_LOWER=y

Tested the "leds" Led driver example on a Teensy 4.1.
---
 boards/arm/imxrt/imxrt1060-evk/src/imxrt_appinit.c | 7 ++-----
 boards/arm/imxrt/imxrt1064-evk/src/imxrt_appinit.c | 7 ++-----
 boards/arm/imxrt/teensy-4.x/src/imxrt_appinit.c    | 7 ++-----
 3 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/boards/arm/imxrt/imxrt1060-evk/src/imxrt_appinit.c b/boards/arm/imxrt/imxrt1060-evk/src/imxrt_appinit.c
index bb07ed00c7..f74ba7ed52 100644
--- a/boards/arm/imxrt/imxrt1060-evk/src/imxrt_appinit.c
+++ b/boards/arm/imxrt/imxrt1060-evk/src/imxrt_appinit.c
@@ -27,13 +27,10 @@
 #include <sys/types.h>
 
 #include <nuttx/board.h>
+#include <nuttx/leds/userled.h>
 
 #include "imxrt1060-evk.h"
 
-#if !defined(CONFIG_ARCH_LEDS) && defined(CONFIG_USERLED_LOWER)
-#  define HAVE_LEDS 0
-#endif
-
 #ifdef CONFIG_BOARDCTL
 
 /****************************************************************************
@@ -67,7 +64,7 @@
 
 int board_app_initialize(uintptr_t arg)
 {
-#ifdef HAVE_LEDS
+#if !defined(CONFIG_ARCH_LEDS) && defined(CONFIG_USERLED_LOWER)
   /* Register the LED driver */
 
   int ret;
diff --git a/boards/arm/imxrt/imxrt1064-evk/src/imxrt_appinit.c b/boards/arm/imxrt/imxrt1064-evk/src/imxrt_appinit.c
index 31f4398b0e..2f0be85e09 100644
--- a/boards/arm/imxrt/imxrt1064-evk/src/imxrt_appinit.c
+++ b/boards/arm/imxrt/imxrt1064-evk/src/imxrt_appinit.c
@@ -27,13 +27,10 @@
 #include <sys/types.h>
 
 #include <nuttx/board.h>
+#include <nuttx/leds/userled.h>
 
 #include "imxrt1064-evk.h"
 
-#if !defined(CONFIG_ARCH_LEDS) && defined(CONFIG_USERLED_LOWER)
-#  define HAVE_LEDS 0
-#endif
-
 #ifdef CONFIG_BOARDCTL
 
 /****************************************************************************
@@ -67,7 +64,7 @@
 
 int board_app_initialize(uintptr_t arg)
 {
-#ifdef HAVE_LEDS
+#if !defined(CONFIG_ARCH_LEDS) && defined(CONFIG_USERLED_LOWER)
   /* Register the LED driver */
 
   int ret;
diff --git a/boards/arm/imxrt/teensy-4.x/src/imxrt_appinit.c b/boards/arm/imxrt/teensy-4.x/src/imxrt_appinit.c
index 97ba5d23e4..662cf19fe2 100644
--- a/boards/arm/imxrt/teensy-4.x/src/imxrt_appinit.c
+++ b/boards/arm/imxrt/teensy-4.x/src/imxrt_appinit.c
@@ -28,13 +28,10 @@
 #include <syslog.h>
 
 #include <nuttx/board.h>
+#include <nuttx/leds/userled.h>
 
 #include "teensy-4.h"
 
-#if !defined(CONFIG_ARCH_LEDS) && defined(CONFIG_USERLED_LOWER)
-#  define HAVE_LEDS 0
-#endif
-
 #ifdef CONFIG_BOARDCTL
 
 /****************************************************************************
@@ -69,7 +66,7 @@
 int board_app_initialize(uintptr_t arg)
 {
   int ret;
-  #ifdef HAVE_LEDS
+#if !defined(CONFIG_ARCH_LEDS) && defined(CONFIG_USERLED_LOWER)
   /* Register the LED driver */
 
   ret = userled_lower_initialize(LED_DRIVER_PATH);