diff options
| author | QMK Bot <hello@qmk.fm> | 2020-12-31 06:21:45 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2020-12-31 06:21:45 +0000 |
| commit | 633d2cb648467ccc410f479eda0828e88b7d0aad (patch) | |
| tree | 21fba330d31dafea51b6a219ea6aafa8ae676f1e | |
| parent | 47b9b110097a864d6ab76516b2213afd59948527 (diff) | |
| parent | 6169b47e82b475c629f9a957f8c36ea39e47ea50 (diff) | |
Merge remote-tracking branch 'origin/master' into develop
| -rw-r--r-- | build_keyboard.mk | 1 | ||||
| -rw-r--r-- | tmk_core/common/command.c | 4 | ||||
| -rw-r--r-- | tmk_core/rules.mk | 19 |
3 files changed, 17 insertions, 7 deletions
diff --git a/build_keyboard.mk b/build_keyboard.mk index 816681bd0a..d9bb2b92e2 100644 --- a/build_keyboard.mk +++ b/build_keyboard.mk @@ -395,6 +395,7 @@ endif build: $(KEYBOARD_OUTPUT)/src/info_config.h $(KEYBOARD_OUTPUT)/src/layouts.h elf cpfirmware check-size: build +check-md5: build objs-size: build include show_options.mk diff --git a/tmk_core/common/command.c b/tmk_core/common/command.c index feeb2202e2..59aa4e4d34 100644 --- a/tmk_core/common/command.c +++ b/tmk_core/common/command.c @@ -144,10 +144,8 @@ static void print_version(void) { print("VID: " STR(VENDOR_ID) "(" STR(MANUFACTURER) ") " "PID: " STR(PRODUCT_ID) "(" STR(PRODUCT) ") " "VER: " STR(DEVICE_VER) "\n"); -#ifdef SKIP_VERSION print("BUILD: (" __DATE__ ")\n"); -#else - print("BUILD: " STR(QMK_VERSION) " (" __TIME__ " " __DATE__ ")\n"); +#ifndef SKIP_VERSION # ifdef PROTOCOL_CHIBIOS print("CHIBIOS: " STR(CHIBIOS_VERSION) ", CONTRIB: " STR(CHIBIOS_CONTRIB_VERSION) "\n"); # endif diff --git a/tmk_core/rules.mk b/tmk_core/rules.mk index a7053d185c..a77e55dd13 100644 --- a/tmk_core/rules.mk +++ b/tmk_core/rules.mk @@ -79,7 +79,12 @@ CSTANDARD = -std=gnu99 # -Wall...: warning level # -Wa,...: tell GCC to pass this to the assembler. # -adhlns...: create assembler listing -ifndef SKIP_DEBUG_INFO +DEBUG_ENABLE ?= yes +ifeq ($(strip $(SKIP_DEBUG_INFO)),yes) + DEBUG_ENABLE=no +endif + +ifeq ($(strip $(DEBUG_ENABLE)),yes) CFLAGS += -g$(DEBUG) endif CFLAGS += $(CDEFS) @@ -110,7 +115,7 @@ CFLAGS += $(CSTANDARD) # -Wall...: warning level # -Wa,...: tell GCC to pass this to the assembler. # -adhlns...: create assembler listing -ifndef SKIP_DEBUG_INFO +ifeq ($(strip $(DEBUG_ENABLE)),yes) CXXFLAGS += -g$(DEBUG) endif CXXFLAGS += $(CXXDEFS) @@ -140,7 +145,7 @@ CXXFLAGS += -Wa,-adhlns=$(@:%.o=%.lst) # -listing-cont-lines: Sets the maximum number of continuation lines of hex # dump that will be displayed for a given single line of source input. ASFLAGS += $(ADEFS) -ifndef SKIP_DEBUG_INFO +ifeq ($(strip $(DEBUG_ENABLE)),yes) ASFLAGS += -Wa,-adhlns=$(@:%.o=%.lst),-gstabs,--listing-cont-lines=100 else ASFLAGS += -Wa,-adhlns=$(@:%.o=%.lst),--listing-cont-lines=100 @@ -202,7 +207,10 @@ REMOVEDIR = rmdir COPY = cp WINSHELL = cmd SECHO = $(SILENT) || echo - +MD5SUM ?= md5sum +ifneq ($(filter Darwin FreeBSD,$(shell uname -s)),) + MD5SUM = md5 +endif # Compiler flags to generate dependency files. #GENDEPFLAGS = -MMD -MP -MF .dep/$(@F).d @@ -431,6 +439,9 @@ check-size: $(SILENT) || echo "(Firmware size check does not yet support $(MCU) microprocessors; skipping.)" endif +check-md5: + $(MD5SUM) $(BUILD_DIR)/$(TARGET).$(FIRMWARE_FORMAT) + # Create build directory $(shell mkdir -p $(BUILD_DIR) 2>/dev/null) |