Minor cleanups

cesanta · Sep 6, 2021 · 49909a9 · 49909a9
1 parent 533a37b
commit 49909a9
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 18 deletions.
diff --git a/platforms/esp8266/Makefile.build b/platforms/esp8266/Makefile.build
@@ -384,7 +384,7 @@ $(BUILD_DIR)/%.cpp.o: %.cpp $(GENFILES_FLAG)
 
 # Assembly sources.
 $(BUILD_DIR)/%.S.o: %.S $(GENFILES_FLAG)
-	$(vecho) "AS    $< -> $@"
+	$(vecho) "AS    $<"
 	$(Q) $(CC) -c -mtext-section-literals $(MGOS_CFLAGS) -o $@ $<
 
 # This one is for generated sources in build/gen directory.

diff --git a/platforms/esp8266/common.mk b/platforms/esp8266/common.mk
@@ -25,12 +25,12 @@ $(Q) $(CC_WRAPPER) $(LD) $(LIBDIRS) -T$(LD_SCRIPT) $(LDFLAGS) -o $@ \
 endef
 
 define compile_params
-$(vecho) "$5    $1"
+$(vecho) "$5   $1"
 $(Q) $(CC_WRAPPER) $3 -MD -MP $(INCDIRS) $4 -c $1 -o $2
 endef
 
 define compile
-$(call compile_params,$<,$@, $(CC), $(CFLAGS),"CC")
+$(call compile_params,$<,$@, $(CC), $(CFLAGS),"CC ")
 endef
 
 define compile_cxx

diff --git a/platforms/esp8266/rboot/esptool2/Makefile b/platforms/esp8266/rboot/esptool2/Makefile
@@ -14,13 +14,13 @@ $(BUILD_DIR):
 	@mkdir -p $(BUILD_DIR)
 
 $(BUILD_DIR)/esptool2.o: esptool2.c esptool2.h esptool2_elf.h elf.h
-	@echo "CC $<"
-	$(CC) $(CFLAGS) -c $< -o $@
+	@echo "  CC    $<"
+	@$(CC) $(CFLAGS) -c $< -o $@
 
 $(BUILD_DIR)/esptool2_elf.o: esptool2_elf.c esptool2.h esptool2_elf.h elf.h
-	@echo "CC $<"
-	$(CC) $(CFLAGS) -c $< -o $@
+	@echo "  CC    $<"
+	@$(CC) $(CFLAGS) -c $< -o $@
 
 $(BUILD_DIR)/esptool2: $(BUILD_DIR)/esptool2.o $(BUILD_DIR)/esptool2_elf.o
-	@echo "LD $@"
-	$(LD) -o $@ $^
+	@echo "  LD    $@"
+	@$(LD) -o $@ $^
diff --git a/platforms/esp8266/rboot/rboot/rboot.mk b/platforms/esp8266/rboot/rboot/rboot.mk
@@ -60,30 +60,30 @@ RBOOT_EXTRA_INCDIR := $(addprefix -I,$(RBOOT_EXTRA_INCDIR))
 all: $(RBOOT_BUILD_BASE)/rboot.bin
 
 $(RBOOT_BUILD_BASE)/rboot-stage2a.o: rboot-stage2a.c rboot-private.h rboot.h
-	@echo "CC $<"
+	@echo "  CC    $<"
 	@$(CC_WRAPPER) $(CC) $(CFLAGS) $(RBOOT_EXTRA_INCDIR) -c $< -o $@
 
 $(RBOOT_BUILD_BASE)/rboot-stage2a.elf: $(RBOOT_BUILD_BASE)/rboot-stage2a.o
-	@echo "LD $@"
+	@echo "  LD    $@"
 	@$(CC_WRAPPER) $(LD) -Trboot-stage2a.ld $(LDFLAGS) -Wl,--start-group $^ -Wl,--end-group -o $@
 
 $(RBOOT_GEN_BASE)/rboot-hex2a.h: $(RBOOT_BUILD_BASE)/rboot-stage2a.elf
-	@echo "E2 $@"
+	@echo "  E2    $@"
 	@$(ESPTOOL2) -quiet -header $< $@ .text
 
 $(RBOOT_BUILD_BASE)/rboot.o: rboot.c rboot-private.h rboot.h $(RBOOT_GEN_BASE)/rboot-hex2a.h
-	@echo "CC $<"
+	@echo "  CC    $<"
 	@$(CC) $(CFLAGS) -I$(RBOOT_GEN_BASE) $(RBOOT_EXTRA_INCDIR) -c $< -o $@
 
 $(RBOOT_BUILD_BASE)/%.o: %.c %.h
-	@echo "CC $<"
+	@echo "  CC    $<"
 	@$(CC) $(CFLAGS) $(RBOOT_EXTRA_INCDIR) -c $< -o $@
 
 $(RBOOT_BUILD_BASE)/%.elf: $(RBOOT_BUILD_BASE)/%.o
-	@echo "LD $@"
+	@echo "  LD    $@"
 	@$(LD) -T$(LD_SCRIPT) $(LDFLAGS) -Wl,--start-group $^ -Wl,--end-group -o $@
 
 $(RBOOT_BUILD_BASE)/%.bin: $(RBOOT_BUILD_BASE)/%.elf
-	@echo "E2 $@"
+	@echo "  E2    $@"
 	@$(ESPTOOL2) $(E2_OPTS) $< $@ .text .rodata
 
diff --git a/tools/mk/mgos_fw_meta.mk b/tools/mk/mgos_fw_meta.mk
@@ -12,7 +12,7 @@ FW_META_CMD ?= $(MGOS_PATH)/tools/mgos_fw_meta.py
 MGOS_FW_EXTRA_ATTRS ?=
 
 $(FW_ZIP): $(FW_MANIFEST) $(FW_META_CMD)
-	$(vecho) "ZIP    $@"
+	$(vecho) "ZIP   $@"
 	$(Q) $(FW_META_CMD) create_fw \
 	  --manifest=$(FW_MANIFEST) \
 	  --src_dir=$(FW_STAGING_DIR) \
@@ -21,7 +21,7 @@ $(FW_ZIP): $(FW_MANIFEST) $(FW_META_CMD)
 	$(vecho) "Built $(APP)/$(APP_PLATFORM) version $(shell $(FW_META_CMD) get $(FW_MANIFEST) version) ($(shell $(FW_META_CMD) get $(FW_MANIFEST) build_id))"
 
 $(FW_MANIFEST): $(FW_META_CMD)
-	$(vecho) "GEN    $(FW_MANIFEST)"
+	$(vecho) "GEN   $(FW_MANIFEST)"
 	$(Q) $(FW_META_CMD) create_manifest \
 	  --name=$(APP) --platform=$(APP_PLATFORM) \
 	  --build_info=$(BUILD_INFO_JSON) \