[U-Boot] [PATCH] mgsuvd: add common directory to Makefile.
Signed-off-by: Heiko Schocher hs@denx.de --- board/keymile/mgsuvd/Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/board/keymile/mgsuvd/Makefile b/board/keymile/mgsuvd/Makefile index af0d400..0326608 100644 --- a/board/keymile/mgsuvd/Makefile +++ b/board/keymile/mgsuvd/Makefile @@ -25,7 +25,7 @@ include $(TOPDIR)/config.mk
LIB = $(obj)lib$(BOARD).a
-COBJS = $(BOARD).o +COBJS = $(BOARD).o ../common/common.o
SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) OBJS := $(addprefix $(obj),$(COBJS))
Dear Heiko Schocher,
In message 48E08A70.7000202@denx.de you wrote:
Signed-off-by: Heiko Schocher hs@denx.de
board/keymile/mgsuvd/Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
Does not apply:
Applying mgsuvd: add common directory to Makefile. error: board/keymile/mgsuvd/Makefile: does not exist in index Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... Renamed board/keymile/mgsuvd/Makefile => tools/env/Makefile Auto-merged tools/env/Makefile CONFLICT (rename/modify): Merge conflict in tools/env/Makefile Failed to merge in the changes. Patch failed at 0008.
Please rebase and resubmit.
Best regards,
Wolfgang Denk
participants (2)
-
Heiko Schocher -
Wolfgang Denk