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>
master
Peter Tyser 15 years ago committed by Wolfgang Denk
parent 78acc472d9
commit 0de71d5071
  1. 2
      Makefile
  2. 0
      lib/libfdt/Makefile
  3. 0
      lib/libfdt/README
  4. 0
      lib/libfdt/fdt.c
  5. 0
      lib/libfdt/fdt_ro.c
  6. 0
      lib/libfdt/fdt_rw.c
  7. 0
      lib/libfdt/fdt_strerror.c
  8. 0
      lib/libfdt/fdt_sw.c
  9. 0
      lib/libfdt/fdt_wip.c
  10. 0
      lib/libfdt/libfdt_internal.h
  11. 6
      tools/Makefile
  12. 6
      tools/imls/Makefile

@ -244,7 +244,7 @@ LIBS += drivers/usb/phy/libusb_phy.a
LIBS += drivers/video/libvideo.a LIBS += drivers/video/libvideo.a
LIBS += drivers/watchdog/libwatchdog.a LIBS += drivers/watchdog/libwatchdog.a
LIBS += common/libcommon.a LIBS += common/libcommon.a
LIBS += libfdt/libfdt.a LIBS += lib/libfdt/libfdt.a
LIBS += api/libapi.a LIBS += api/libapi.a
LIBS += post/libpost.a LIBS += post/libpost.a

@ -122,7 +122,7 @@ endif
# now $(obj) is defined # now $(obj) is defined
HOSTSRCS += $(addprefix $(SRCTREE)/,$(EXT_OBJ_FILES-y:.o=.c)) HOSTSRCS += $(addprefix $(SRCTREE)/,$(EXT_OBJ_FILES-y:.o=.c))
HOSTSRCS += $(addprefix $(SRCTREE)/tools/,$(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))) BINS := $(addprefix $(obj),$(sort $(BIN_FILES-y)))
LIBFDT_OBJS := $(addprefix $(obj),$(LIBFDT_OBJ_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 \ HOSTCPPFLAGS = -idirafter $(SRCTREE)/include \
-idirafter $(OBJTREE)/include2 \ -idirafter $(OBJTREE)/include2 \
-idirafter $(OBJTREE)/include \ -idirafter $(OBJTREE)/include \
-I $(SRCTREE)/libfdt \ -I $(SRCTREE)/lib/libfdt \
-I $(SRCTREE)/tools \ -I $(SRCTREE)/tools \
-DTEXT_BASE=$(TEXT_BASE) -DUSE_HOSTCC \ -DTEXT_BASE=$(TEXT_BASE) -DUSE_HOSTCC \
-D__KERNEL_STRICT_NAMES -D__KERNEL_STRICT_NAMES
@ -199,7 +199,7 @@ $(obj)%.o: $(SRCTREE)/common/%.c
$(obj)%.o: $(SRCTREE)/lib/%.c $(obj)%.o: $(SRCTREE)/lib/%.c
$(HOSTCC) -g $(HOSTCFLAGS) -c -o $@ $< $(HOSTCC) -g $(HOSTCFLAGS) -c -o $@ $<
$(obj)%.o: $(SRCTREE)/libfdt/%.c $(obj)%.o: $(SRCTREE)/lib/libfdt/%.c
$(HOSTCC) -g $(HOSTCFLAGS_NOPED) -c -o $@ $< $(HOSTCC) -g $(HOSTCFLAGS_NOPED) -c -o $@ $<
subdirs: subdirs:

@ -41,7 +41,7 @@ LIBFDT_OBJ_FILES-y += fdt_wip.o
# now $(obj) is defined # now $(obj) is defined
SRCS += $(addprefix $(SRCTREE)/,$(EXT_OBJ_FILES-y:.o=.c)) SRCS += $(addprefix $(SRCTREE)/,$(EXT_OBJ_FILES-y:.o=.c))
SRCS += $(addprefix $(SRCTREE)/tools/,$(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))) BINS := $(addprefix $(obj),$(sort $(BIN_FILES-y)))
LIBFDT_OBJS := $(addprefix $(obj),$(LIBFDT_OBJ_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 \ HOSTCPPFLAGS = -idirafter $(SRCTREE)/include \
-idirafter $(OBJTREE)/include2 \ -idirafter $(OBJTREE)/include2 \
-idirafter $(OBJTREE)/include \ -idirafter $(OBJTREE)/include \
-I $(SRCTREE)/libfdt \ -I $(SRCTREE)/lib/libfdt \
-I $(SRCTREE)/tools \ -I $(SRCTREE)/tools \
-DUSE_HOSTCC -D__KERNEL_STRICT_NAMES -DUSE_HOSTCC -D__KERNEL_STRICT_NAMES
@ -81,7 +81,7 @@ $(obj)%.o: $(SRCTREE)/common/%.c
$(obj)%.o: $(SRCTREE)/lib/%.c $(obj)%.o: $(SRCTREE)/lib/%.c
$(CC) -g $(HOSTCFLAGS) -c -o $@ $< $(CC) -g $(HOSTCFLAGS) -c -o $@ $<
$(obj)%.o: $(SRCTREE)/libfdt/%.c $(obj)%.o: $(SRCTREE)/lib/libfdt/%.c
$(CC) -g $(HOSTCFLAGS_NOPED) -c -o $@ $< $(CC) -g $(HOSTCFLAGS_NOPED) -c -o $@ $<
clean: clean:

Loading…
Cancel
Save