Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
commit
633d2cb648
|
@ -395,6 +395,7 @@ endif
|
||||||
|
|
||||||
build: $(KEYBOARD_OUTPUT)/src/info_config.h $(KEYBOARD_OUTPUT)/src/layouts.h elf cpfirmware
|
build: $(KEYBOARD_OUTPUT)/src/info_config.h $(KEYBOARD_OUTPUT)/src/layouts.h elf cpfirmware
|
||||||
check-size: build
|
check-size: build
|
||||||
|
check-md5: build
|
||||||
objs-size: build
|
objs-size: build
|
||||||
|
|
||||||
include show_options.mk
|
include show_options.mk
|
||||||
|
|
|
@ -144,10 +144,8 @@ static void print_version(void) {
|
||||||
print("VID: " STR(VENDOR_ID) "(" STR(MANUFACTURER) ") "
|
print("VID: " STR(VENDOR_ID) "(" STR(MANUFACTURER) ") "
|
||||||
"PID: " STR(PRODUCT_ID) "(" STR(PRODUCT) ") "
|
"PID: " STR(PRODUCT_ID) "(" STR(PRODUCT) ") "
|
||||||
"VER: " STR(DEVICE_VER) "\n");
|
"VER: " STR(DEVICE_VER) "\n");
|
||||||
#ifdef SKIP_VERSION
|
|
||||||
print("BUILD: (" __DATE__ ")\n");
|
print("BUILD: (" __DATE__ ")\n");
|
||||||
#else
|
#ifndef SKIP_VERSION
|
||||||
print("BUILD: " STR(QMK_VERSION) " (" __TIME__ " " __DATE__ ")\n");
|
|
||||||
# ifdef PROTOCOL_CHIBIOS
|
# ifdef PROTOCOL_CHIBIOS
|
||||||
print("CHIBIOS: " STR(CHIBIOS_VERSION) ", CONTRIB: " STR(CHIBIOS_CONTRIB_VERSION) "\n");
|
print("CHIBIOS: " STR(CHIBIOS_VERSION) ", CONTRIB: " STR(CHIBIOS_CONTRIB_VERSION) "\n");
|
||||||
# endif
|
# endif
|
||||||
|
|
|
@ -79,7 +79,12 @@ CSTANDARD = -std=gnu99
|
||||||
# -Wall...: warning level
|
# -Wall...: warning level
|
||||||
# -Wa,...: tell GCC to pass this to the assembler.
|
# -Wa,...: tell GCC to pass this to the assembler.
|
||||||
# -adhlns...: create assembler listing
|
# -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)
|
CFLAGS += -g$(DEBUG)
|
||||||
endif
|
endif
|
||||||
CFLAGS += $(CDEFS)
|
CFLAGS += $(CDEFS)
|
||||||
|
@ -110,7 +115,7 @@ CFLAGS += $(CSTANDARD)
|
||||||
# -Wall...: warning level
|
# -Wall...: warning level
|
||||||
# -Wa,...: tell GCC to pass this to the assembler.
|
# -Wa,...: tell GCC to pass this to the assembler.
|
||||||
# -adhlns...: create assembler listing
|
# -adhlns...: create assembler listing
|
||||||
ifndef SKIP_DEBUG_INFO
|
ifeq ($(strip $(DEBUG_ENABLE)),yes)
|
||||||
CXXFLAGS += -g$(DEBUG)
|
CXXFLAGS += -g$(DEBUG)
|
||||||
endif
|
endif
|
||||||
CXXFLAGS += $(CXXDEFS)
|
CXXFLAGS += $(CXXDEFS)
|
||||||
|
@ -140,7 +145,7 @@ CXXFLAGS += -Wa,-adhlns=$(@:%.o=%.lst)
|
||||||
# -listing-cont-lines: Sets the maximum number of continuation lines of hex
|
# -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.
|
# dump that will be displayed for a given single line of source input.
|
||||||
ASFLAGS += $(ADEFS)
|
ASFLAGS += $(ADEFS)
|
||||||
ifndef SKIP_DEBUG_INFO
|
ifeq ($(strip $(DEBUG_ENABLE)),yes)
|
||||||
ASFLAGS += -Wa,-adhlns=$(@:%.o=%.lst),-gstabs,--listing-cont-lines=100
|
ASFLAGS += -Wa,-adhlns=$(@:%.o=%.lst),-gstabs,--listing-cont-lines=100
|
||||||
else
|
else
|
||||||
ASFLAGS += -Wa,-adhlns=$(@:%.o=%.lst),--listing-cont-lines=100
|
ASFLAGS += -Wa,-adhlns=$(@:%.o=%.lst),--listing-cont-lines=100
|
||||||
|
@ -202,7 +207,10 @@ REMOVEDIR = rmdir
|
||||||
COPY = cp
|
COPY = cp
|
||||||
WINSHELL = cmd
|
WINSHELL = cmd
|
||||||
SECHO = $(SILENT) || echo
|
SECHO = $(SILENT) || echo
|
||||||
|
MD5SUM ?= md5sum
|
||||||
|
ifneq ($(filter Darwin FreeBSD,$(shell uname -s)),)
|
||||||
|
MD5SUM = md5
|
||||||
|
endif
|
||||||
|
|
||||||
# Compiler flags to generate dependency files.
|
# Compiler flags to generate dependency files.
|
||||||
#GENDEPFLAGS = -MMD -MP -MF .dep/$(@F).d
|
#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.)"
|
$(SILENT) || echo "(Firmware size check does not yet support $(MCU) microprocessors; skipping.)"
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
check-md5:
|
||||||
|
$(MD5SUM) $(BUILD_DIR)/$(TARGET).$(FIRMWARE_FORMAT)
|
||||||
|
|
||||||
# Create build directory
|
# Create build directory
|
||||||
$(shell mkdir -p $(BUILD_DIR) 2>/dev/null)
|
$(shell mkdir -p $(BUILD_DIR) 2>/dev/null)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue