From a2ca68aaa76a3d9734d3f3446e4e6c1664031a02 Mon Sep 17 00:00:00 2001
From: liaoao <liaoao@xiaomi.com>
Date: Wed, 13 Sep 2023 21:25:13 +0800
Subject: [PATCH] qemu:fix ci error

Signed-off-by: liaoao <liaoao@xiaomi.com>
---
 boards/arm/qemu/qemu-armv7a/src/Makefile         | 2 ++
 boards/arm/qemu/qemu-armv7a/src/qemu_bringup.c   | 5 ++++-
 boards/arm64/qemu/qemu-armv8a/src/Makefile       | 2 ++
 boards/arm64/qemu/qemu-armv8a/src/qemu_bringup.c | 5 ++++-
 4 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/boards/arm/qemu/qemu-armv7a/src/Makefile b/boards/arm/qemu/qemu-armv7a/src/Makefile
index d14fc7d6ee..d08c4abf66 100644
--- a/boards/arm/qemu/qemu-armv7a/src/Makefile
+++ b/boards/arm/qemu/qemu-armv7a/src/Makefile
@@ -26,6 +26,8 @@ ifeq ($(CONFIG_BOARDCTL),y)
 CSRCS += qemu_appinit.c
 endif
 
+ifeq ($(CONFIG_LIBC_FDT),y)
 CFLAGS += ${INCDIR_PREFIX}$(TOPDIR)$(DELIM)libs$(DELIM)libc$(DELIM)fdt$(DELIM)dtc$(DELIM)libfdt
+endif
 
 include $(TOPDIR)/boards/Board.mk
diff --git a/boards/arm/qemu/qemu-armv7a/src/qemu_bringup.c b/boards/arm/qemu/qemu-armv7a/src/qemu_bringup.c
index aafaaf06ec..035b71e9dd 100644
--- a/boards/arm/qemu/qemu-armv7a/src/qemu_bringup.c
+++ b/boards/arm/qemu/qemu-armv7a/src/qemu_bringup.c
@@ -30,7 +30,10 @@
 #include <nuttx/fs/fs.h>
 #include <nuttx/virtio/virtio-mmio.h>
 #include <nuttx/fdt.h>
-#include <libfdt.h>
+
+#ifdef CONFIG_LIBC_FDT
+#  include <libfdt.h>
+#endif
 
 #include "qemu-armv7a.h"
 
diff --git a/boards/arm64/qemu/qemu-armv8a/src/Makefile b/boards/arm64/qemu/qemu-armv8a/src/Makefile
index 5a380d3a3e..a663eb14b5 100644
--- a/boards/arm64/qemu/qemu-armv8a/src/Makefile
+++ b/boards/arm64/qemu/qemu-armv8a/src/Makefile
@@ -26,6 +26,8 @@ ifeq ($(CONFIG_BOARDCTL),y)
 CSRCS += qemu_appinit.c
 endif
 
+ifeq ($(CONFIG_LIBC_FDT),y)
 CFLAGS += ${INCDIR_PREFIX}$(TOPDIR)$(DELIM)libs$(DELIM)libc$(DELIM)fdt$(DELIM)dtc$(DELIM)libfdt
+endif
 
 include $(TOPDIR)/boards/Board.mk
diff --git a/boards/arm64/qemu/qemu-armv8a/src/qemu_bringup.c b/boards/arm64/qemu/qemu-armv8a/src/qemu_bringup.c
index ad15fd8289..ffdf416baf 100644
--- a/boards/arm64/qemu/qemu-armv8a/src/qemu_bringup.c
+++ b/boards/arm64/qemu/qemu-armv8a/src/qemu_bringup.c
@@ -30,7 +30,10 @@
 #include <nuttx/fs/fs.h>
 #include <nuttx/virtio/virtio-mmio.h>
 #include <nuttx/fdt.h>
-#include <libfdt.h>
+
+#ifdef CONFIG_LIBC_FDT
+#  include <libfdt.h>
+#endif
 
 #include "qemu-armv8a.h"