aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Tyser <ptyser@xes-inc.com>2010-04-12 22:28:06 -0500
committerWolfgang Denk <wd@denx.de>2010-04-13 09:13:04 +0200
commit0de71d507157c4bd4fddcd3a419140d2b986eed2 (patch)
treebf54b9e5f5791bf9a777aa8af310f93c7e26428e
parent78acc472d9719316f22e002a009a998d9ceec29d (diff)
downloadu-boot-linaro-stable-0de71d507157c4bd4fddcd3a419140d2b986eed2.tar.gz
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>
-rw-r--r--Makefile2
-rw-r--r--lib/libfdt/Makefile (renamed from libfdt/Makefile)0
-rw-r--r--lib/libfdt/README (renamed from libfdt/README)0
-rw-r--r--lib/libfdt/fdt.c (renamed from libfdt/fdt.c)0
-rw-r--r--lib/libfdt/fdt_ro.c (renamed from libfdt/fdt_ro.c)0
-rw-r--r--lib/libfdt/fdt_rw.c (renamed from libfdt/fdt_rw.c)0
-rw-r--r--lib/libfdt/fdt_strerror.c (renamed from libfdt/fdt_strerror.c)0
-rw-r--r--lib/libfdt/fdt_sw.c (renamed from libfdt/fdt_sw.c)0
-rw-r--r--lib/libfdt/fdt_wip.c (renamed from libfdt/fdt_wip.c)0
-rw-r--r--lib/libfdt/libfdt_internal.h (renamed from libfdt/libfdt_internal.h)0
-rw-r--r--tools/Makefile6
-rw-r--r--tools/imls/Makefile6
12 files changed, 7 insertions, 7 deletions
diff --git a/Makefile b/Makefile
index 0b70dcae4..fdd781a86 100644
--- 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 b/lib/libfdt/Makefile
index d6e283045..d6e283045 100644
--- a/libfdt/Makefile
+++ b/lib/libfdt/Makefile
diff --git a/libfdt/README b/lib/libfdt/README
index e0598761f..e0598761f 100644
--- a/libfdt/README
+++ b/lib/libfdt/README
diff --git a/libfdt/fdt.c b/lib/libfdt/fdt.c
index b09ea6f04..b09ea6f04 100644
--- a/libfdt/fdt.c
+++ b/lib/libfdt/fdt.c
diff --git a/libfdt/fdt_ro.c b/lib/libfdt/fdt_ro.c
index 1e1e32209..1e1e32209 100644
--- a/libfdt/fdt_ro.c
+++ b/lib/libfdt/fdt_ro.c
diff --git a/libfdt/fdt_rw.c b/lib/libfdt/fdt_rw.c
index 5c27a677e..5c27a677e 100644
--- a/libfdt/fdt_rw.c
+++ b/lib/libfdt/fdt_rw.c
diff --git a/libfdt/fdt_strerror.c b/lib/libfdt/fdt_strerror.c
index 9b00c3a6e..9b00c3a6e 100644
--- a/libfdt/fdt_strerror.c
+++ b/lib/libfdt/fdt_strerror.c
diff --git a/libfdt/fdt_sw.c b/lib/libfdt/fdt_sw.c
index 55ebebf1e..55ebebf1e 100644
--- a/libfdt/fdt_sw.c
+++ b/lib/libfdt/fdt_sw.c
diff --git a/libfdt/fdt_wip.c b/lib/libfdt/fdt_wip.c
index e373677c5..e373677c5 100644
--- a/libfdt/fdt_wip.c
+++ b/lib/libfdt/fdt_wip.c
diff --git a/libfdt/libfdt_internal.h b/lib/libfdt/libfdt_internal.h
index d2dcbd65e..d2dcbd65e 100644
--- a/libfdt/libfdt_internal.h
+++ b/lib/libfdt/libfdt_internal.h
diff --git a/tools/Makefile b/tools/Makefile
index a6f11c9a2..749d99423 100644
--- 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
index 82c272806..840727707 100644
--- 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: