From 3a2c3377e88e7d3a21fe1f37ddcd8d98b161be18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20Fr=C3=B6schle?= Date: Sun, 23 Oct 2016 09:28:50 +0000 Subject: [PATCH] silent makefiles --- Makefile | 71 +++++++++++++++++++++------------ tos/Makefile | 22 +++++----- tos/bascook/Makefile | 15 ++++--- tos/fpga_test/Makefile | 13 +++--- tos/jtagwait/Makefile | 15 ++++--- tos/pci_test/Makefile | 15 ++++--- tos/pci_test/sources/pci_test.c | 2 +- tos/vmem_test/Makefile | 15 ++++--- 8 files changed, 101 insertions(+), 67 deletions(-) diff --git a/Makefile b/Makefile index 025ec34..e5f6d1e 100644 --- a/Makefile +++ b/Makefile @@ -182,15 +182,15 @@ ver: touch include/version.h .PHONY: tos tos: - (cd tos; $(MAKE)) + @(cd tos; $(MAKE)) .PHONY: clean clean: - for d in $(TRGTDIRS);\ + @for d in $(TRGTDIRS);\ do rm -f $$d/*.map $$d/*.s19 $$d/*.elf $$d/*.lk $$d/*.a $$d/objs/* $$d/depend;\ done - rm -f tags - (cd tos; make clean) + @rm -f tags + @(cd tos; make clean) @@ -224,10 +224,12 @@ firebee/basflash.$(EXE): CFLAGS += -mcpu=5474 # define CC_TEMPLATE $(1)/objs/%.o:%.c - $(CC) $$(CFLAGS) -D$$(MACHINE) $(INCLUDE) -c $$< -o $$@ + @echo CC $$< + @$(CC) $$(CFLAGS) -D$$(MACHINE) $(INCLUDE) -c $$< -o $$@ $(1)/objs/%.o:%.S - $(CC) $$(CFLAGS) -Wa,--bitwise-or -D$$(MACHINE) $(INCLUDE) -c $$< -o $$@ + @echo CC $$< + @$(CC) $$(CFLAGS) -Wa,--bitwise-or -D$$(MACHINE) $(INCLUDE) -c $$< -o $$@ endef $(foreach DIR,$(TRGTDIRS),$(eval $(call CC_TEMPLATE,$(DIR)))) @@ -243,7 +245,8 @@ else MACHINE=MACHINE_M5484LITE endif $(1)/depend:$(SRCS) - $(CC) $$(CFLAGS) -D$$(MACHINE) $(INCLUDE) -M $$^ | sed -e "s#^\(.*\).o:#"$(1)"/objs/\1.o:#" > $$@ + @echo DEPEND + @$(CC) $$(CFLAGS) -D$$(MACHINE) $(INCLUDE) -M $$^ | sed -e "s#^\(.*\).o:#"$(1)"/objs/\1.o:#" > $$@ endef $(foreach DIR,$(TRGTDIRS),$(eval $(call DEP_TEMPLATE,$(DIR)))) @@ -254,8 +257,9 @@ $(foreach DIR,$(TRGTDIRS),$(eval $(call DEP_TEMPLATE,$(DIR)))) define AR_TEMPLATE $(1)_OBJS=$(patsubst %,$(1)/objs/%,$(OBJS)) $(1)/$(LIBBAS): $$($(1)_OBJS) - $(AR) rv $$@ $$? - $(RANLIB) $$@ + @echo AR $$@ + @$(AR) r $$@ $$? + @$(RANLIB) $$@ endef $(foreach DIR,$(TRGTDIRS),$(eval $(call AR_TEMPLATE,$(DIR)))) @@ -264,44 +268,59 @@ ifeq ($(COMPILE_ELF),Y) else FORMAT_ELF=0 endif + +define LK_TEMPLATE +$(1)/$$(LDCFILE): $(LDCSRC) + @echo CPP $$< + @$(CPP) $(INCLUDE) -DOBJDIR=$(1)/objs -P -DFORMAT_ELF=$(FORMAT_ELF) -D$$(MACHINE) $(LDCSRC) -o $(1)/$$(LDCFILE) +endef +$(foreach DIR,$(TRGTDIRS),$(eval $(call LK_TEMPLATE,$(DIR)))) + # # define pattern rules for binaries # define EX_TEMPLATE # pattern rule for flash $(1)_MAPFILE=$(1)/$$(basename $$(FLASH_EXEC)).map -$(1)/$$(FLASH_EXEC): $(1)/$(LIBBAS) $(LDCSRC) - $(CPP) $(INCLUDE) -DOBJDIR=$(1)/objs -P -DFORMAT_ELF=$(FORMAT_ELF) -D$$(MACHINE) $(LDCSRC) -o $(1)/$$(LDCFILE) - #$(LD) --oformat $$(FORMAT) -Map $$($(1)_MAPFILE) --cref -T $(1)/$$(LDCFILE) $(LDLIBS) -o $$@ - $(CC) $$(CFLAGS) -nostdlib -Wl,--oformat -Wl,$$(FORMAT) -Wl,-Map -Wl,$$($(1)_MAPFILE) -Wl,--cref -Wl,-T -Wl,$(1)/$$(LDCFILE) $(LDLIBS) -o $$@ +$(1)/$$(FLASH_EXEC): $(1)/$(LIBBAS) $(1)/$$(LDCFILE) + @echo CC $$@ + @$(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) - $(OBJCOPY) -O srec $$@ $$(basename $$@).s19 + @echo OBJCOPY $$@ + @$(OBJCOPY) -O srec $$@ $$(basename $$@).s19 else - objcopy -I srec -O elf32-big --alt-machine-code 4 $$@ $$(basename $$@).elf + @echo OBJCOPY $$@ + @objcopy -I srec -O elf32-big --alt-machine-code 4 $$@ $$(basename $$@).elf endif # pattern rule for RAM $(1)_MAPFILE_RAM=$(1)/$$(basename $$(RAM_EXEC)).map -$(1)/$$(RAM_EXEC): $(1)/$(LIBBAS) $(LDCSRC) - $(CPP) $(INCLUDE) -DCOMPILE_RAM -DOBJDIR=$(1)/objs -P -DFORMAT_ELF=$(FORMAT_ELF) -D$$(MACHINE) $(LDCSRC) -o $(1)/$$(LDRFILE) - #$(LD) $(LDFLAGS) --oformat $$(FORMAT) -Map $$($(1)_MAPFILE_RAM) --cref -T $(1)/$$(LDRFILE) $(LDLIBS) -o $$@ - $(CC) $$(CFLAGS) -nostdlib -Wl,--oformat -Wl,$$(FORMAT) -Wl,-Map -Wl,$$($(1)_MAPFILE_RAM) -Wl,--cref -Wl,-T -Wl,$(1)/$$(LDRFILE) $(LDLIBS) -o $$@ +$(1)/$$(RAM_EXEC): $(1)/$(LIBBAS) $(1)/$$(LDCFILE) + @echo CPP $$@ + @$(CPP) $(INCLUDE) -DCOMPILE_RAM -DOBJDIR=$(1)/objs -P -DFORMAT_ELF=$(FORMAT_ELF) -D$$(MACHINE) $(LDCSRC) -o $(1)/$$(LDRFILE) + @echo CC $$@ + @$(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) - $(OBJCOPY) -O srec $$@ $$(basename $$@).s19 + @echo OBJCOPY $$@ + @$(OBJCOPY) -O srec $$@ $$(basename $$@).s19 else - objcopy -I srec -O elf32-big --alt-machine-code 4 $$@ $$(basename $$@).elf + @echo OBJCOPY $$< + @objcopy -I srec -O elf32-big --alt-machine-code 4 $$@ $$(basename $$@).elf endif # pattern rule for basflash $(1)_MAPFILE_BFL=$(1)/$$(basename $$(BASFLASH_EXEC)).map $(1)/$$(BASFLASH_EXEC): $(1)/objs/basflash.o $(1)/objs/basflash_start.o $(1)/$(LIBBAS) $(LDCBFL) - $(CPP) $(INCLUDE) -P -DOBJDIR=$(1)/objs -DFORMAT_ELF=$(FORMAT_ELF) -D$$(MACHINE) $(LDCBSRC) -o $(1)/$$(LDCBFS) - #$(LD) --oformat $$(FORMAT) -Map $$($(1)_MAPFILE_BFL) --cref -T $(1)/$$(LDCFILE) -L$(1) -lbas $(LDLIBS) -o $$@ - $(CC) -nostdlib -Wl,--oformat -Wl,$$(FORMAT) -Wl,-Map -Wl,$$($(1)_MAPFILE_BFL) -Wl,--cref -Wl,-T -Wl,$(1)/$$(LDCFILE) -L$(1) -lbas $(LDLIBS) -o $$@ + @echo CPP $$< + @$(CPP) $(INCLUDE) -P -DOBJDIR=$(1)/objs -DFORMAT_ELF=$(FORMAT_ELF) -D$$(MACHINE) $(LDCBSRC) -o $(1)/$$(LDCBFS) + @echo CC $$< + @$(CC) -nostdlib -Wl,--oformat -Wl,$$(FORMAT) -Wl,-Map -Wl,$$($(1)_MAPFILE_BFL) -Wl,--cref -Wl,-T -Wl,$(1)/$$(LDCFILE) -L$(1) -lbas $(LDLIBS) -o $$@ ifeq ($(COMPILE_ELF),Y) - $(OBJCOPY) -O srec $$@ $$(basename $$@).s19 + @echo OBJCOPY $$< + @$(OBJCOPY) -O srec $$@ $$(basename $$@).s19 else - objcopy -I srec -O elf32-big --alt-machine-code 4 $$@ $$(basename $$@).elf + @echo OBJCOPY $$< + @objcopy -I srec -O elf32-big --alt-machine-code 4 $$@ $$(basename $$@).elf endif endef $(foreach DIR,$(TRGTDIRS),$(eval $(call EX_TEMPLATE,$(DIR)))) diff --git a/tos/Makefile b/tos/Makefile index 3817e1e..2b49c3f 100644 --- a/tos/Makefile +++ b/tos/Makefile @@ -8,29 +8,29 @@ tos: jtagwait bascook vmem_test pci_test pci_mem fpga_test jtagwait: - $(MAKE) -C $@ + @$(MAKE) -s -C $@ bascook: - $(MAKE) -C $@ + @$(MAKE) -s -C $@ vmem_test: - $(MAKE) -C $@ + @$(MAKE) -s -C $@ pci_test: - $(MAKE) -C $@ + @$(MAKE) -s -C $@ pci_mem: - $(MAKE) -C $@ + @$(MAKE) -s -C $@ fpga_test: - $(MAKE) -C $@ + @$(MAKE) -s -C $@ .PHONY: clean clean: - (cd jtagwait; make clean) - (cd bascook; make clean) - (cd vmem_test; make clean) - (cd pci_test; make clean) - (cd fpga_test; make clean) + @(cd jtagwait; make clean) + @(cd bascook; make clean) + @(cd vmem_test; make clean) + @(cd pci_test; make clean) + @(cd fpga_test; make clean) diff --git a/tos/bascook/Makefile b/tos/bascook/Makefile index a04eee0..b2e2b88 100755 --- a/tos/bascook/Makefile +++ b/tos/bascook/Makefile @@ -67,21 +67,24 @@ all: $(TEST_APP) # define CC_TEMPLATE $(1)/objs/%.o:$(SRCDIR)/%.c - $(CC) $$(CFLAGS) $(INCLUDE) -c $$< -o $$@ + @echo CC $$< + @$(CC) $$(CFLAGS) $(INCLUDE) -c $$< -o $$@ $(1)/objs/%.o:$(SRCDIR)/%.S - $(CC) $$(CFLAGS) $(INCLUDE) -c $$< -o $$@ + @echo CC $$< + @$(CC) $$(CFLAGS) $(INCLUDE) -c $$< -o $$@ $(1)_OBJS=$(patsubst %,$(1)/objs/%,$(OBJS)) $(1)/$(APP): $$($(1)_OBJS) - $(CC) $$(CFLAGS) -o $$@ $(LIBCMINI)/m5475/startup.o $$($(1)_OBJS) -L$(LIBCMINI)/m5475 $(LIBS) - $(STRIP) $$@ + @echo CC $$< + @$(CC) $$(CFLAGS) -o $$@ $(LIBCMINI)/m5475/startup.o $$($(1)_OBJS) -L$(LIBCMINI)/m5475 $(LIBS) + @$(STRIP) $$@ endef $(foreach DIR,$(TRGTDIRS),$(eval $(call CC_TEMPLATE,$(DIR)))) $(DEPEND): $(ASRCS) $(CSRCS) - -rm -f $(DEPEND) - for d in $(TRGTDIRS);\ + @-rm -f $(DEPEND) + @for d in $(TRGTDIRS);\ do $(CC) $(CFLAGS) $(INCLUDE) -M $(ASRCS) $(CSRCS) | sed -e "s#^\(.*\).o:#$$d/objs/\1.o:#" >> $(DEPEND); \ done diff --git a/tos/fpga_test/Makefile b/tos/fpga_test/Makefile index f097e46..adeb289 100755 --- a/tos/fpga_test/Makefile +++ b/tos/fpga_test/Makefile @@ -74,21 +74,24 @@ all:$(patsubst %,%/$(APP),$(TRGTDIRS)) # define CC_TEMPLATE $(1)/objs/%.o:$(SRCDIR)/%.c - $(CC) $$(CFLAGS) $(INCLUDE) -c $$< -o $$@ + @echo CC $$< + @$(CC) $$(CFLAGS) $(INCLUDE) -c $$< -o $$@ $(1)/objs/%.o:$(SRCDIR)/%.S - $(CC) $$(CFLAGS) $(INCLUDE) -c $$< -o $$@ + @echo CC $$< + @$(CC) $$(CFLAGS) $(INCLUDE) -c $$< -o $$@ $(1)_OBJS=$(patsubst %,$(1)/objs/%,$(OBJS)) $(1)/$(APP): $$($(1)_OBJS) - $(CC) $$(CFLAGS) -o $$@ $(LIBCMINI)/$(1)/startup.o $$($(1)_OBJS) -L$(LIBCMINI)/$(1) $(LIBS) + @echo CC $$@ + @$(CC) $$(CFLAGS) -o $$@ $(LIBCMINI)/$(1)/startup.o $$($(1)_OBJS) -L$(LIBCMINI)/$(1) $(LIBS) #$(STRIP) $$@ endef $(foreach DIR,$(TRGTDIRS),$(eval $(call CC_TEMPLATE,$(DIR)))) $(DEPEND): $(ASRCS) $(CSRCS) - -rm -f $(DEPEND) - for d in $(TRGTDIRS);\ + @-rm -f $(DEPEND) + @for d in $(TRGTDIRS);\ do $(CC) $(CFLAGS) $(INCLUDE) -M $(ASRCS) $(CSRCS) | sed -e "s#^\(.*\).o:#$$d/objs/\1.o:#" >> $(DEPEND); \ done diff --git a/tos/jtagwait/Makefile b/tos/jtagwait/Makefile index 29f21bc..d893b33 100755 --- a/tos/jtagwait/Makefile +++ b/tos/jtagwait/Makefile @@ -73,21 +73,24 @@ all:$(patsubst %,%/$(APP),$(TRGTDIRS)) # define CC_TEMPLATE $(1)/objs/%.o:$(SRCDIR)/%.c - $(CC) $$(CFLAGS) $(INCLUDE) -c $$< -o $$@ + @echo CC $$< + @$(CC) $$(CFLAGS) $(INCLUDE) -c $$< -o $$@ $(1)/objs/%.o:$(SRCDIR)/%.S - $(CC) $$(CFLAGS) $(INCLUDE) -c $$< -o $$@ + @echo CC $$< + @$(CC) $$(CFLAGS) $(INCLUDE) -c $$< -o $$@ $(1)_OBJS=$(patsubst %,$(1)/objs/%,$(OBJS)) $(1)/$(APP): $$($(1)_OBJS) - $(CC) $$(CFLAGS) -o $$@ $(LIBCMINI)/$(1)/startup.o $$($(1)_OBJS) -L$(LIBCMINI)/$(1) $(LIBS) - $(STRIP) $$@ + @echo CC $$@ + @$(CC) $$(CFLAGS) -o $$@ $(LIBCMINI)/$(1)/startup.o $$($(1)_OBJS) -L$(LIBCMINI)/$(1) $(LIBS) + @$(STRIP) $$@ endef $(foreach DIR,$(TRGTDIRS),$(eval $(call CC_TEMPLATE,$(DIR)))) $(DEPEND): $(ASRCS) $(CSRCS) - -rm -f $(DEPEND) - for d in $(TRGTDIRS);\ + @-rm -f $(DEPEND) + @for d in $(TRGTDIRS);\ do $(CC) $(CFLAGS) $(INCLUDE) -M $(ASRCS) $(CSRCS) | sed -e "s#^\(.*\).o:#$$d/objs/\1.o:#" >> $(DEPEND); \ done diff --git a/tos/pci_test/Makefile b/tos/pci_test/Makefile index 2561a47..cb281ad 100755 --- a/tos/pci_test/Makefile +++ b/tos/pci_test/Makefile @@ -73,21 +73,24 @@ all:$(patsubst %,%/$(APP),$(TRGTDIRS)) # define CC_TEMPLATE $(1)/objs/%.o:$(SRCDIR)/%.c - $(CC) $$(CFLAGS) $(INCLUDE) -c $$< -o $$@ + @echo CC $$< + @$(CC) $$(CFLAGS) $(INCLUDE) -c $$< -o $$@ $(1)/objs/%.o:$(SRCDIR)/%.S - $(CC) $$(CFLAGS) $(INCLUDE) -c $$< -o $$@ + @echo CC $$< + @$(CC) $$(CFLAGS) $(INCLUDE) -c $$< -o $$@ $(1)_OBJS=$(patsubst %,$(1)/objs/%,$(OBJS)) $(1)/$(APP): $$($(1)_OBJS) - $(CC) $$(CFLAGS) -o $$@ $(LIBCMINI)/$(1)/startup.o $$($(1)_OBJS) -L$(LIBCMINI)/$(1) $(LIBS) - $(STRIP) $$@ + @echo CC $$@ + @$(CC) $$(CFLAGS) -o $$@ $(LIBCMINI)/$(1)/startup.o $$($(1)_OBJS) -L$(LIBCMINI)/$(1) $(LIBS) + @$(STRIP) $$@ endef $(foreach DIR,$(TRGTDIRS),$(eval $(call CC_TEMPLATE,$(DIR)))) $(DEPEND): $(ASRCS) $(CSRCS) - -rm -f $(DEPEND) - for d in $(TRGTDIRS);\ + @-rm -f $(DEPEND) + @for d in $(TRGTDIRS);\ do $(CC) $(CFLAGS) $(INCLUDE) -M $(ASRCS) $(CSRCS) | sed -e "s#^\(.*\).o:#$$d/objs/\1.o:#" >> $(DEPEND); \ done diff --git a/tos/pci_test/sources/pci_test.c b/tos/pci_test/sources/pci_test.c index 6ec6d01..f0d2fd9 100644 --- a/tos/pci_test/sources/pci_test.c +++ b/tos/pci_test/sources/pci_test.c @@ -72,7 +72,7 @@ void hexdump(uint8_t buffer[], int size) while (bp < buffer + size) { uint8_t *lbp = bp; - printf("%08lx ", (uintptr_t) buffer + line); + printf("%08lx ", (long) buffer + line); for (i = 0; i < 16; i++) { if (bp + i > buffer + size) { diff --git a/tos/vmem_test/Makefile b/tos/vmem_test/Makefile index a75b4fe..2668436 100755 --- a/tos/vmem_test/Makefile +++ b/tos/vmem_test/Makefile @@ -74,21 +74,24 @@ all:$(patsubst %,%/$(APP),$(TRGTDIRS)) # define CC_TEMPLATE $(1)/objs/%.o:$(SRCDIR)/%.c - $(CC) $$(CFLAGS) $(INCLUDE) -c $$< -o $$@ + @echo CC $$< + @$(CC) $$(CFLAGS) $(INCLUDE) -c $$< -o $$@ $(1)/objs/%.o:$(SRCDIR)/%.S - $(CC) $$(CFLAGS) $(INCLUDE) -c $$< -o $$@ + @echo CC $$< + @$(CC) $$(CFLAGS) $(INCLUDE) -c $$< -o $$@ $(1)_OBJS=$(patsubst %,$(1)/objs/%,$(OBJS)) $(1)/$(APP): $$($(1)_OBJS) - $(CC) $$(CFLAGS) -o $$@ $(LIBCMINI)/$(1)/startup.o $$($(1)_OBJS) -L$(LIBCMINI)/$(1) $(LIBS) - #$(STRIP) $$@ + @echo CC $$@ + @$(CC) $$(CFLAGS) -o $$@ $(LIBCMINI)/$(1)/startup.o $$($(1)_OBJS) -L$(LIBCMINI)/$(1) $(LIBS) + @$(STRIP) $$@ endef $(foreach DIR,$(TRGTDIRS),$(eval $(call CC_TEMPLATE,$(DIR)))) $(DEPEND): $(ASRCS) $(CSRCS) - -rm -f $(DEPEND) - for d in $(TRGTDIRS);\ + @-rm -f $(DEPEND) + @for d in $(TRGTDIRS);\ do $(CC) $(CFLAGS) $(INCLUDE) -M $(ASRCS) $(CSRCS) | sed -e "s#^\(.*\).o:#$$d/objs/\1.o:#" >> $(DEPEND); \ done