~ruther/qmk_firmware

633d2cb648467ccc410f479eda0828e88b7d0aad — QMK Bot 4 years ago 47b9b11 + 6169b47
Merge remote-tracking branch 'origin/master' into develop
3 files changed, 17 insertions(+), 7 deletions(-)

M build_keyboard.mk
M tmk_core/common/command.c
M tmk_core/rules.mk
M build_keyboard.mk => build_keyboard.mk +1 -0
@@ 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

M tmk_core/common/command.c => tmk_core/common/command.c +1 -3
@@ 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

M tmk_core/rules.mk => tmk_core/rules.mk +15 -4
@@ 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)