Move libfdt/ into lib/
Move the libfdt directory into the common lib/ directory to clean up the
top-level directory.
Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
diff --git a/Makefile b/Makefile
index 0b70dca..fdd781a 100644
--- a/Makefile
+++ b/Makefile
@@ -244,7 +244,7 @@
LIBS += drivers/video/libvideo.a
LIBS += drivers/watchdog/libwatchdog.a
LIBS += common/libcommon.a
-LIBS += libfdt/libfdt.a
+LIBS += lib/libfdt/libfdt.a
LIBS += api/libapi.a
LIBS += post/libpost.a
diff --git a/libfdt/Makefile b/lib/libfdt/Makefile
similarity index 100%
rename from libfdt/Makefile
rename to lib/libfdt/Makefile
diff --git a/libfdt/README b/lib/libfdt/README
similarity index 100%
rename from libfdt/README
rename to lib/libfdt/README
diff --git a/libfdt/fdt.c b/lib/libfdt/fdt.c
similarity index 100%
rename from libfdt/fdt.c
rename to lib/libfdt/fdt.c
diff --git a/libfdt/fdt_ro.c b/lib/libfdt/fdt_ro.c
similarity index 100%
rename from libfdt/fdt_ro.c
rename to lib/libfdt/fdt_ro.c
diff --git a/libfdt/fdt_rw.c b/lib/libfdt/fdt_rw.c
similarity index 100%
rename from libfdt/fdt_rw.c
rename to lib/libfdt/fdt_rw.c
diff --git a/libfdt/fdt_strerror.c b/lib/libfdt/fdt_strerror.c
similarity index 100%
rename from libfdt/fdt_strerror.c
rename to lib/libfdt/fdt_strerror.c
diff --git a/libfdt/fdt_sw.c b/lib/libfdt/fdt_sw.c
similarity index 100%
rename from libfdt/fdt_sw.c
rename to lib/libfdt/fdt_sw.c
diff --git a/libfdt/fdt_wip.c b/lib/libfdt/fdt_wip.c
similarity index 100%
rename from libfdt/fdt_wip.c
rename to lib/libfdt/fdt_wip.c
diff --git a/libfdt/libfdt_internal.h b/lib/libfdt/libfdt_internal.h
similarity index 100%
rename from libfdt/libfdt_internal.h
rename to lib/libfdt/libfdt_internal.h
diff --git a/tools/Makefile b/tools/Makefile
index a6f11c9..749d994 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -122,7 +122,7 @@
# now $(obj) is defined
HOSTSRCS += $(addprefix $(SRCTREE)/,$(EXT_OBJ_FILES-y:.o=.c))
HOSTSRCS += $(addprefix $(SRCTREE)/tools/,$(OBJ_FILES-y:.o=.c))
-HOSTSRCS += $(addprefix $(SRCTREE)/libfdt/,$(LIBFDT_OBJ_FILES-y:.o=.c))
+HOSTSRCS += $(addprefix $(SRCTREE)/lib/libfdt/,$(LIBFDT_OBJ_FILES-y:.o=.c))
BINS := $(addprefix $(obj),$(sort $(BIN_FILES-y)))
LIBFDT_OBJS := $(addprefix $(obj),$(LIBFDT_OBJ_FILES-y))
@@ -136,7 +136,7 @@
HOSTCPPFLAGS = -idirafter $(SRCTREE)/include \
-idirafter $(OBJTREE)/include2 \
-idirafter $(OBJTREE)/include \
- -I $(SRCTREE)/libfdt \
+ -I $(SRCTREE)/lib/libfdt \
-I $(SRCTREE)/tools \
-DTEXT_BASE=$(TEXT_BASE) -DUSE_HOSTCC \
-D__KERNEL_STRICT_NAMES
@@ -199,7 +199,7 @@
$(obj)%.o: $(SRCTREE)/lib/%.c
$(HOSTCC) -g $(HOSTCFLAGS) -c -o $@ $<
-$(obj)%.o: $(SRCTREE)/libfdt/%.c
+$(obj)%.o: $(SRCTREE)/lib/libfdt/%.c
$(HOSTCC) -g $(HOSTCFLAGS_NOPED) -c -o $@ $<
subdirs:
diff --git a/tools/imls/Makefile b/tools/imls/Makefile
index 82c2728..8407277 100644
--- a/tools/imls/Makefile
+++ b/tools/imls/Makefile
@@ -41,7 +41,7 @@
# now $(obj) is defined
SRCS += $(addprefix $(SRCTREE)/,$(EXT_OBJ_FILES-y:.o=.c))
SRCS += $(addprefix $(SRCTREE)/tools/,$(OBJ_FILES-y:.o=.c))
-SRCS += $(addprefix $(SRCTREE)/libfdt/,$(LIBFDT_OBJ_FILES-y:.o=.c))
+SRCS += $(addprefix $(SRCTREE)/lib/libfdt/,$(LIBFDT_OBJ_FILES-y:.o=.c))
BINS := $(addprefix $(obj),$(sort $(BIN_FILES-y)))
LIBFDT_OBJS := $(addprefix $(obj),$(LIBFDT_OBJ_FILES-y))
@@ -52,7 +52,7 @@
HOSTCPPFLAGS = -idirafter $(SRCTREE)/include \
-idirafter $(OBJTREE)/include2 \
-idirafter $(OBJTREE)/include \
- -I $(SRCTREE)/libfdt \
+ -I $(SRCTREE)/lib/libfdt \
-I $(SRCTREE)/tools \
-DUSE_HOSTCC -D__KERNEL_STRICT_NAMES
@@ -81,7 +81,7 @@
$(obj)%.o: $(SRCTREE)/lib/%.c
$(CC) -g $(HOSTCFLAGS) -c -o $@ $<
-$(obj)%.o: $(SRCTREE)/libfdt/%.c
+$(obj)%.o: $(SRCTREE)/lib/libfdt/%.c
$(CC) -g $(HOSTCFLAGS_NOPED) -c -o $@ $<
clean: