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 <[email protected]>
jadonk · Apr 13, 2010 · 0de71d5 · 0de71d5
1 parent 78acc47
commit 0de71d5
Show file tree

Hide file tree

Showing 12 changed files with 7 additions and 7 deletions.
diff --git a/Makefile b/Makefile
@@ -244,7 +244,7 @@ LIBS += drivers/usb/phy/libusb_phy.a
 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 → lib/libfdt/Makefile b/libfdt/Makefile → lib/libfdt/Makefile
diff --git a/libfdt/README → lib/libfdt/README b/libfdt/README → lib/libfdt/README
diff --git a/libfdt/fdt.c → lib/libfdt/fdt.c b/libfdt/fdt.c → lib/libfdt/fdt.c
diff --git a/libfdt/fdt_ro.c → lib/libfdt/fdt_ro.c b/libfdt/fdt_ro.c → lib/libfdt/fdt_ro.c
diff --git a/libfdt/fdt_rw.c → lib/libfdt/fdt_rw.c b/libfdt/fdt_rw.c → lib/libfdt/fdt_rw.c
diff --git a/libfdt/fdt_strerror.c → lib/libfdt/fdt_strerror.c b/libfdt/fdt_strerror.c → lib/libfdt/fdt_strerror.c
diff --git a/libfdt/fdt_sw.c → lib/libfdt/fdt_sw.c b/libfdt/fdt_sw.c → lib/libfdt/fdt_sw.c
diff --git a/libfdt/fdt_wip.c → lib/libfdt/fdt_wip.c b/libfdt/fdt_wip.c → lib/libfdt/fdt_wip.c
diff --git a/libfdt/libfdt_internal.h → lib/libfdt/libfdt_internal.h b/libfdt/libfdt_internal.h → lib/libfdt/libfdt_internal.h
diff --git a/tools/Makefile b/tools/Makefile
@@ -122,7 +122,7 @@ endif
 # 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 @@ NOPEDOBJS := $(addprefix $(obj),$(NOPED_OBJ_FILES-y))
 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)/common/%.c
 $(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
@@ -41,7 +41,7 @@ LIBFDT_OBJ_FILES-y += fdt_wip.o
 # 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 @@ LIBFDT_OBJS	:= $(addprefix $(obj),$(LIBFDT_OBJ_FILES-y))
 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)/common/%.c
 $(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: