[U-Boot] [PATCH] mcu25: fix out of tree building

Out of tree building of the Netstal hcu4 and hcu5 boards failed like that:
Configuring for mcu25 board... Assembler messages: Fatal error: can't create /work/wd/tmp-ppc/board/netstal/mcu25/../common/fixed_sdram.o: No such file or directory Assembler messages: Fatal error: can't create /work/wd/tmp-ppc/board/netstal/mcu25/../common/nm_bsp.o: No such file or directory
Adapt (and simplify) the Makefile.
Signed-off-by: Wolfgang Denk wd@denx.de Cc: Niklaus Giger niklaus.giger@netstal.com --- board/netstal/mcu25/Makefile | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/board/netstal/mcu25/Makefile b/board/netstal/mcu25/Makefile index 6722d53..cd62642 100644 --- a/board/netstal/mcu25/Makefile +++ b/board/netstal/mcu25/Makefile @@ -19,24 +19,24 @@ #
include $(TOPDIR)/config.mk +ifneq ($(OBJTREE),$(SRCTREE)) +$(shell mkdir -p $(obj)../common) +endif
LIB = $(obj)lib$(BOARD).a
-# NOBJS : Netstal common objects -NOBJS = fixed_sdram.o nm_bsp.o -COBJS = $(BOARD).o -SOBJS = +COBJS = $(BOARD).o \ + ../common/fixed_sdram.o \ + ../common/nm_bsp.o
-SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) $(addprefix ../common/,$(NOBJS:.o=.c)) +SRCS := $(COBJS:.o=.c) OBJS := $(addprefix $(obj),$(COBJS)) -NOBJS := $(addprefix $(obj)../common/,$(NOBJS)) -SOBJS := $(addprefix $(obj),$(SOBJS))
-$(LIB): $(OBJS) $(SOBJS) $(NOBJS) - $(AR) $(ARFLAGS) $@ $(OBJS) $(SOBJS) $(NOBJS) +$(LIB): $(OBJS) + $(AR) $(ARFLAGS) $@ $^
clean: - rm -f $(SOBJS) $(OBJS) + rm -f $(OBJS)
distclean: clean rm -f $(LIB) core *.bak $(obj).depend

In message 1288168304-2717-1-git-send-email-wd@denx.de you wrote:
Out of tree building of the Netstal hcu4 and hcu5 boards failed like that:
Configuring for mcu25 board...
Please s/hcu4 and hcu5 boards/mcu25 board/ in the first line of the commit message.
[not resending; will fix when applying, assuming no other comments come in.]
Best regards,
Wolfgang Denk

Dear Wolfgang Denk,
In message 1288168304-2717-1-git-send-email-wd@denx.de you wrote:
Out of tree building of the Netstal hcu4 and hcu5 boards failed like that:
Configuring for mcu25 board... Assembler messages: Fatal error: can't create /work/wd/tmp-ppc/board/netstal/mcu25/../common/fixed_sdram.o: No such file or directory Assembler messages: Fatal error: can't create /work/wd/tmp-ppc/board/netstal/mcu25/../common/nm_bsp.o: No such file or directory
Adapt (and simplify) the Makefile.
Signed-off-by: Wolfgang Denk wd@denx.de Cc: Niklaus Giger niklaus.giger@netstal.com
board/netstal/mcu25/Makefile | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-)
Applied (with the ...of the Netstal mcu25 board... fix)
Best regards,
Wolfgang Denk
participants (1)
-
Wolfgang Denk