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>
This commit is contained in:
parent
78acc472d9
commit
0de71d5071
2
Makefile
2
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
|
||||
|
||||
|
@ -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:
|
||||
|
@ -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:
|
||||
|
Loading…
Reference in New Issue
Block a user