From 4e8a038984e8f0b388240070dce5e20cf2053c62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20G=C3=A1lvez?= Date: Wed, 28 Feb 2018 19:45:23 +0100 Subject: [PATCH] Fix warnings in Makefile ELF compilation's condition that is used to generate the objcopy command line is reversed. --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index d5aeb66..eb9465d 100644 --- a/Makefile +++ b/Makefile @@ -298,7 +298,7 @@ $(1)_MAPFILE=$(1)/$$(basename $$(FLASH_EXEC)).map $(1)/$$(FLASH_EXEC): $(1)/$(LIBBAS) $(1)/$$(LDCFILE) $(Q)echo CC $$@ $(Q)$(CC) $$(CFLAGS) -nostdlib -Wl,--oformat -Wl,$$(FORMAT) -Wl,-Map -Wl,$$($(1)_MAPFILE) -Wl,--cref -Wl,-T -Wl,$(1)/$$(LDCFILE) $(LDLIBS) -o $$@ -ifeq ($(COMPILE_ELF),Y) +ifeq ($(COMPILE_ELF),N) $(Q)echo OBJCOPY $$@ $(Q)$(OBJCOPY) -O srec $$@ $$(basename $$@).s19 else @@ -313,7 +313,7 @@ $(1)/$$(RAM_EXEC): $(1)/$(LIBBAS) $(1)/$$(LDCFILE) $(Q)$(CPP) $(INCLUDE) -DCOMPILE_RAM -DOBJDIR=$(1)/objs -P -DFORMAT_ELF=$(FORMAT_ELF) -D$$(MACHINE) $(LDCSRC) -o $(1)/$$(LDRFILE) $(Q)echo CC $$@ $(Q)$(CC) $$(CFLAGS) -nostdlib -Wl,--oformat -Wl,$$(FORMAT) -Wl,-Map -Wl,$$($(1)_MAPFILE_RAM) -Wl,--cref -Wl,-T -Wl,$(1)/$$(LDRFILE) $(LDLIBS) -o $$@ -ifeq ($(COMPILE_ELF),Y) +ifeq ($(COMPILE_ELF),N) $(Q)echo OBJCOPY $$@ $(Q)$(OBJCOPY) -O srec $$@ $$(basename $$@).s19 else @@ -328,7 +328,7 @@ $(1)/$$(BASFLASH_EXEC): $(1)/objs/basflash.o $(1)/objs/basflash_start.o $(1)/$(L $(CPP) $(INCLUDE) -P -DOBJDIR=$(1)/objs -DFORMAT_ELF=$(FORMAT_ELF) -D$$(MACHINE) $(LDCBSRC) -o $(1)/$$(LDCBFS) $(Q)echo CC $$< $(Q)$(CC) -nostdlib -Wl,--oformat -Wl,$$(FORMAT) -Wl,-Map -Wl,$$($(1)_MAPFILE_BFL) -Wl,--cref -Wl,-T -Wl,$(1)/$$(LDCBFS) -L$(1) -lbas $(LDLIBS) -o $$@ -ifeq ($(COMPILE_ELF),Y) +ifeq ($(COMPILE_ELF),N) $(Q)echo OBJCOPY $$< $(Q)$(OBJCOPY) -O srec $$@ $$(basename $$@).s19 else