This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx-apps.git
The following commit(s) were added to refs/heads/master by this push:
new 1243c0ba4 libfdt: modify makefile
1243c0ba4 is described below
commit 1243c0ba4d673053de5a41bbea10f394ffda5461
Author: liaoao <[email protected]>
AuthorDate: Mon Aug 21 11:23:23 2023 +0800
libfdt: modify makefile
update LIBFDT to LIBC_FDT
move version_gen.h and place it under nuttx/libs/libc/fdt/
change include path to nuttx/libs/libc/fdt/dtc/
Signed-off-by: liaoao <[email protected]>
---
system/fdt/Kconfig | 4 ++--
system/fdt/Makefile | 8 ++++----
system/fdt/version_gen.h | 28 ----------------------------
3 files changed, 6 insertions(+), 34 deletions(-)
diff --git a/system/fdt/Kconfig b/system/fdt/Kconfig
index 6c81f5ba5..0d3af5e54 100644
--- a/system/fdt/Kconfig
+++ b/system/fdt/Kconfig
@@ -9,7 +9,7 @@ config SYSTEM_FDT
---help---
Enable support for fdt utility tools.
-if LIBFDT
+if LIBC_FDT
config SYSTEM_FDTDUMP
bool "system fdtdump command"
@@ -103,4 +103,4 @@ config SYSTEM_FDTOVERLAY_PRIORITY
endif # SYSTEM_FDTOVERLAY
-endif # LIBFDT
+endif # LIBC_FDT
diff --git a/system/fdt/Makefile b/system/fdt/Makefile
index 38583caa8..a0e656e18 100644
--- a/system/fdt/Makefile
+++ b/system/fdt/Makefile
@@ -52,10 +52,10 @@ ifeq ($(CONFIG_SYSTEM_FDTOVERLAY),y)
PRIORITY += $(CONFIG_SYSTEM_FDTOVERLAY_PRIORITY)
endif
-CFLAGS += ${INCDIR_PREFIX}$(APPDIR)/system/fdt/
-CFLAGS += ${INCDIR_PREFIX}$(TOPDIR)/libs/libc/dtc/libfdt/
+CFLAGS += ${INCDIR_PREFIX}$(TOPDIR)/libs/libc/fdt/
+CFLAGS += ${INCDIR_PREFIX}$(TOPDIR)/libs/libc/fdt/dtc/libfdt/
-VPATH += $(TOPDIR)/libs/libc/dtc/
-DEPPATH += --dep-path $(TOPDIR)/libs/libc/dtc/
+VPATH += $(TOPDIR)/libs/libc/fdt/dtc/
+DEPPATH += --dep-path $(TOPDIR)/libs/libc/fdt/dtc/
include $(APPDIR)/Application.mk
diff --git a/system/fdt/version_gen.h b/system/fdt/version_gen.h
deleted file mode 100644
index 56fd9a32b..000000000
--- a/system/fdt/version_gen.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/****************************************************************************
- * apps/system/fdt/version_gen.h
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership. The
- * ASF licenses this file to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the
- * License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- ****************************************************************************/
-
-#ifndef __SYSTEM_FDT_VERSION_GEN_H
-#define __SYSTEM_FDT_VERSION_GEN_H
-
-/* DTC Version should be same as that in nuttx/libs/libc/dtc/ */
-
-#define DTC_VERSION ("DTC "CONFIG_LIBFDT_DTC_VERSION)
-
-#endif /* __SYSTEM_FDT_VERSION_GEN_H */
