mirror of
https://github.com/Fishwaldo/u-boot.git
synced 2025-03-21 14:41:31 +00:00
api_examples/Makefile: Combine ELF and BIN targets
Combining the two rules cleans up the Makefile a bit Signed-off-by: Peter Tyser <ptyser@xes-inc.com> Acked-by: Rafal Jaworowski <raj@semihalf.com>
This commit is contained in:
parent
644cb38108
commit
117d0ab5e6
1 changed files with 8 additions and 13 deletions
|
@ -29,18 +29,18 @@ endif
|
||||||
|
|
||||||
include $(TOPDIR)/config.mk
|
include $(TOPDIR)/config.mk
|
||||||
|
|
||||||
ELF-$(CONFIG_API) += demo
|
# Resulting ELF and binary exectuables will be named demo and demo.bin
|
||||||
BIN-$(CONFIG_API) += demo.bin
|
OUTPUT-$(CONFIG_API) = $(obj)demo
|
||||||
ELF := $(ELF-y)
|
|
||||||
BIN := $(BIN-y)
|
|
||||||
|
|
||||||
#CFLAGS += -v
|
#CFLAGS += -v
|
||||||
|
|
||||||
COBJS-$(CONFIG_API) += $(ELF:=.o)
|
|
||||||
SOBJS-$(CONFIG_API) += crt0.o
|
SOBJS-$(CONFIG_API) += crt0.o
|
||||||
|
COBJS-$(CONFIG_API) += demo.o
|
||||||
ifeq ($(ARCH),ppc)
|
ifeq ($(ARCH),ppc)
|
||||||
SOBJS-$(CONFIG_API) += ppcstring.o
|
SOBJS-$(CONFIG_API) += ppcstring.o
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
OUTPUT := $(OUTPUT-y)
|
||||||
COBJS := $(COBJS-y)
|
COBJS := $(COBJS-y)
|
||||||
SOBJS := $(SOBJS-y)
|
SOBJS := $(SOBJS-y)
|
||||||
|
|
||||||
|
@ -60,28 +60,23 @@ SRCS += $(COBJS:.o=.c)
|
||||||
SRCS += $(LIBCOBJS:.o=.c)
|
SRCS += $(LIBCOBJS:.o=.c)
|
||||||
SRCS += $(SOBJS:.o=.S)
|
SRCS += $(SOBJS:.o=.S)
|
||||||
OBJS := $(addprefix $(obj),$(COBJS))
|
OBJS := $(addprefix $(obj),$(COBJS))
|
||||||
ELF := $(addprefix $(obj),$(ELF))
|
|
||||||
BIN := $(addprefix $(obj),$(BIN))
|
|
||||||
|
|
||||||
gcclibdir := $(shell dirname `$(CC) -print-libgcc-file-name`)
|
gcclibdir := $(shell dirname `$(CC) -print-libgcc-file-name`)
|
||||||
|
|
||||||
CPPFLAGS += -I..
|
CPPFLAGS += -I..
|
||||||
|
|
||||||
all: $(obj).depend $(OBJS) $(LIB) $(ELF) $(BIN)
|
all: $(obj).depend $(OBJS) $(LIB) $(OUTPUT)
|
||||||
|
|
||||||
#########################################################################
|
#########################################################################
|
||||||
$(LIB): $(obj).depend $(LIBOBJS)
|
$(LIB): $(obj).depend $(LIBOBJS)
|
||||||
$(AR) $(ARFLAGS) $@ $(LIBOBJS)
|
$(AR) $(ARFLAGS) $@ $(LIBOBJS)
|
||||||
|
|
||||||
$(ELF):
|
$(OUTPUT):
|
||||||
$(obj)%: $(obj)%.o $(LIB)
|
$(obj)%: $(obj)%.o $(LIB)
|
||||||
$(LD) $(obj)crt0.o -Ttext $(LOAD_ADDR) \
|
$(LD) $(obj)crt0.o -Ttext $(LOAD_ADDR) \
|
||||||
-o $@ $< $(LIB) \
|
-o $@ $< $(LIB) \
|
||||||
-L$(gcclibdir) -lgcc
|
-L$(gcclibdir) -lgcc
|
||||||
|
$(OBJCOPY) -O binary $@ $(OUTPUT).bin 2>/dev/null
|
||||||
$(BIN):
|
|
||||||
$(obj)%.bin: $(obj)%
|
|
||||||
$(OBJCOPY) -O binary $< $@ 2>/dev/null
|
|
||||||
|
|
||||||
$(obj)crc32.c:
|
$(obj)crc32.c:
|
||||||
@rm -f $(obj)crc32.c
|
@rm -f $(obj)crc32.c
|
||||||
|
|
Loading…
Add table
Reference in a new issue