diff options
| author | Takeshi ISHII <2170248+mtei@users.noreply.github.com> | 2019-04-23 03:20:13 +0900 |
|---|---|---|
| committer | Drashna Jaelre <drashna@live.com> | 2019-04-22 11:20:13 -0700 |
| commit | 6d73fe12779d6e8527d404572810ea95e714dce7 (patch) | |
| tree | 9b08909cebf38f06f42e6c6a852880b67e5b5399 | |
| parent | bb52119a6dfe9c6f0314d1bcd948efda59626a70 (diff) | |
| download | qmk_firmware-6d73fe12779d6e8527d404572810ea95e714dce7.tar.gz qmk_firmware-6d73fe12779d6e8527d404572810ea95e714dce7.zip | |
fix LIB_SRC and QUANTUM_LIB_SRC for ARM (#5623)
* fix LIB_SRC and QUANTUM_LIB_SRC for ARM(chibios)
* remove ARFLAGS
* tmk_core/arm_atsam.mk:AR: remove 'rcs'
| -rw-r--r-- | tmk_core/arm_atsam.mk | 2 | ||||
| -rw-r--r-- | tmk_core/avr.mk | 2 | ||||
| -rw-r--r-- | tmk_core/rules.mk | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/tmk_core/arm_atsam.mk b/tmk_core/arm_atsam.mk index 06823fb62..25a3411f4 100644 --- a/tmk_core/arm_atsam.mk +++ b/tmk_core/arm_atsam.mk | |||
| @@ -6,7 +6,7 @@ CC = arm-none-eabi-gcc | |||
| 6 | OBJCOPY = arm-none-eabi-objcopy | 6 | OBJCOPY = arm-none-eabi-objcopy |
| 7 | OBJDUMP = arm-none-eabi-objdump | 7 | OBJDUMP = arm-none-eabi-objdump |
| 8 | SIZE = arm-none-eabi-size | 8 | SIZE = arm-none-eabi-size |
| 9 | AR = arm-none-eabi-ar rcs | 9 | AR = arm-none-eabi-ar |
| 10 | NM = arm-none-eabi-nm | 10 | NM = arm-none-eabi-nm |
| 11 | HEX = $(OBJCOPY) -O $(FORMAT) -R .eeprom -R .fuse -R .lock -R .signature | 11 | HEX = $(OBJCOPY) -O $(FORMAT) -R .eeprom -R .fuse -R .lock -R .signature |
| 12 | EEP = $(OBJCOPY) -j .eeprom --set-section-flags=.eeprom="alloc,load" --change-section-lma .eeprom=0 --no-change-warnings -O $(FORMAT) | 12 | EEP = $(OBJCOPY) -j .eeprom --set-section-flags=.eeprom="alloc,load" --change-section-lma .eeprom=0 --no-change-warnings -O $(FORMAT) |
diff --git a/tmk_core/avr.mk b/tmk_core/avr.mk index f6af3f5e2..6bf86d58a 100644 --- a/tmk_core/avr.mk +++ b/tmk_core/avr.mk | |||
| @@ -6,7 +6,7 @@ CC = avr-gcc | |||
| 6 | OBJCOPY = avr-objcopy | 6 | OBJCOPY = avr-objcopy |
| 7 | OBJDUMP = avr-objdump | 7 | OBJDUMP = avr-objdump |
| 8 | SIZE = avr-size | 8 | SIZE = avr-size |
| 9 | AR = avr-ar rcs | 9 | AR = avr-ar |
| 10 | NM = avr-nm | 10 | NM = avr-nm |
| 11 | HEX = $(OBJCOPY) -O $(FORMAT) -R .eeprom -R .fuse -R .lock -R .signature | 11 | HEX = $(OBJCOPY) -O $(FORMAT) -R .eeprom -R .fuse -R .lock -R .signature |
| 12 | EEP = $(OBJCOPY) -j .eeprom --set-section-flags=.eeprom="alloc,load" --change-section-lma .eeprom=0 --no-change-warnings -O $(FORMAT) | 12 | EEP = $(OBJCOPY) -j .eeprom --set-section-flags=.eeprom="alloc,load" --change-section-lma .eeprom=0 --no-change-warnings -O $(FORMAT) |
diff --git a/tmk_core/rules.mk b/tmk_core/rules.mk index 3a322cee4..6d2bb51f0 100644 --- a/tmk_core/rules.mk +++ b/tmk_core/rules.mk | |||
| @@ -331,7 +331,7 @@ $1/%.o : %.S $1/asflags.txt $1/compiler.txt | $(BEGIN) | |||
| 331 | $1/%.a : $1/%.o | 331 | $1/%.a : $1/%.o |
| 332 | @mkdir -p $$(@D) | 332 | @mkdir -p $$(@D) |
| 333 | @$(SILENT) || printf "Archiving: $$<" | $$(AWK_CMD) | 333 | @$(SILENT) || printf "Archiving: $$<" | $$(AWK_CMD) |
| 334 | $$(eval CMD=$$(AR) $$@ $$<) | 334 | $$(eval CMD=$$(AR) rcs $$@ $$<) |
| 335 | @$$(BUILD_CMD) | 335 | @$$(BUILD_CMD) |
| 336 | 336 | ||
| 337 | $1/force: | 337 | $1/force: |
