mirror of
https://xff.cz/git/u-boot/
synced 2025-09-01 16:52:14 +02:00
kbuild: change out-of-tree build
This commit changes the working directory where the build process occurs. Before this commit, build process occurred under the source tree for both in-tree and out-of-tree build. That's why we needed to add $(obj) prefix to all generated files in makefiles like follows: $(obj)u-boot.bin: $(obj)u-boot Here, $(obj) is empty for in-tree build, whereas it points to the output directory for out-of-tree build. And our old build system changes the current working directory with "make -C <sub-dir>" syntax when descending into the sub-directories. On the other hand, Kbuild uses a different idea to handle out-of-tree build and directory descending. The build process of Kbuild always occurs under the output tree. When "O=dir/to/store/output/files" is given, the build system changes the current working directory to that directory and restarts the make. Kbuild uses "make -f $(srctree)/scripts/Makefile.build obj=<sub-dir>" syntax for descending into sub-directories. (We can write it like "make $(obj)=<sub-dir>" with a shorthand.) This means the current working directory is always the top of the output directory. Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com> Tested-by: Gerhard Sittig <gsi@denx.de>
This commit is contained in:
committed by
Tom Rini
parent
d958002589
commit
9e4140329e
@@ -31,7 +31,7 @@ clean-files := $(extra-) $(addsuffix .srec,$(extra-)) $(addsuffix .bin,$(extra-
|
||||
|
||||
COBJS := $(ELF:=.o)
|
||||
|
||||
LIB = $(obj)libstubs.o
|
||||
LIB = $(obj)/libstubs.o
|
||||
|
||||
LIBAOBJS-$(CONFIG_PPC) += ppc_longjmp.o ppc_setjmp.o
|
||||
LIBAOBJS-$(CONFIG_8xx) += test_burst_lib.o
|
||||
@@ -39,11 +39,11 @@ LIBAOBJS := $(LIBAOBJS-y)
|
||||
|
||||
LIBCOBJS = stubs.o
|
||||
|
||||
LIBOBJS = $(addprefix $(obj),$(LIBAOBJS) $(LIBCOBJS))
|
||||
LIBOBJS = $(addprefix $(obj)/,$(LIBAOBJS) $(LIBCOBJS))
|
||||
|
||||
SRCS := $(COBJS:.o=.c) $(LIBCOBJS:.o=.c) $(LIBAOBJS:.o=.S)
|
||||
OBJS := $(addprefix $(obj),$(COBJS))
|
||||
ELF := $(addprefix $(obj),$(ELF))
|
||||
OBJS := $(addprefix $(obj)/,$(COBJS))
|
||||
ELF := $(addprefix $(obj)/,$(ELF))
|
||||
|
||||
gcclibdir := $(shell dirname `$(CC) -print-libgcc-file-name`)
|
||||
|
||||
@@ -67,13 +67,13 @@ $(LIB): $(LIBOBJS)
|
||||
$(call cmd_link_o_target, $(LIBOBJS))
|
||||
|
||||
$(ELF):
|
||||
$(obj)%: $(obj)%.o $(LIB)
|
||||
$(obj)/%: $(obj)/%.o $(LIB)
|
||||
$(LD) $(LDFLAGS) -g -Ttext $(CONFIG_STANDALONE_LOAD_ADDR) \
|
||||
-o $@ -e $(SYM_PREFIX)$(notdir $(<:.o=)) $< $(LIB) \
|
||||
-L$(gcclibdir) -lgcc
|
||||
|
||||
$(obj)%.srec: $(obj)%
|
||||
$(obj)/%.srec: $(obj)/%
|
||||
$(OBJCOPY) -O srec $< $@ 2>/dev/null
|
||||
|
||||
$(obj)%.bin: $(obj)%
|
||||
$(obj)/%.bin: $(obj)/%
|
||||
$(OBJCOPY) -O binary $< $@ 2>/dev/null
|
||||
|
Reference in New Issue
Block a user