mgsuvd: add common directory to Makefile.
PATCH 1/1 mgsuvd: add common directory to Makefile.
Signed-off-by Heiko Schocher <[email protected]>
--- board/keymile/mgsuvd/Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
board/keymile/mgsuvd/Makefile +1 -1
@@ -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))
Signature · 5 lines
1.5.6.1 -- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
PATCH 1/1 mgsuvd: add common directory to Makefile.
Dear Heiko Schocher,
Quoted 4 lines · In message <[email protected]> you wrote:
Signed-off-by Heiko Schocher <[email protected]>--- 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
Signature · 5 lines
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de "In matters of principle, stand like a rock; in matters of taste, swim with the current." - Thomas Jefferson