Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix LIB_SRC and QUANTUM_LIB_SRC for ARM(chibios) #5623

Merged
merged 3 commits into from
Apr 22, 2019
Merged

fix LIB_SRC and QUANTUM_LIB_SRC for ARM(chibios) #5623

merged 3 commits into from
Apr 22, 2019

Conversation

mtei
Copy link
Contributor

@mtei mtei commented Apr 15, 2019

Description

On ARM targets, the LIB_SRC and QUANTUM_LIB_SRC macros have been corrected as they do not function properly.

Types of Changes

  • Core
  • Bugfix
  • New feature
  • Enhancement/optimization
  • Keyboard (addition or update)
  • Keymap/layout/userspace (addition or update)
  • Documentation

Issues Fixed or Closed by This PR

Checklist

  • My code follows the code style of this project.
  • My change requires a change to the documentation.
  • I have updated the documentation accordingly.
  • I have read the CONTRIBUTING document.
  • I have added tests to cover my changes.
  • I have tested the changes and verified that they work and don't break anything (as well as I can manage).

@mtei mtei mentioned this pull request Apr 15, 2019
Merged
12 tasks
pelrun
pelrun suggested changes Apr 16, 2019
View reviewed changes
tmk_core/rules.mk Outdated Show resolved Hide resolved
@pelrun
Copy link
Contributor

pelrun commented Apr 16, 2019

arm_atsam.mk also needs the same fix, although I don't know how many keebs we have that are using that backend.

@mtei
Copy link
Contributor Author

mtei commented Apr 16, 2019 •
edited
Loading

Hmmm, what should we do?

$ (find . -name '[Mm]akefile'; find . -name '*.mk' ) | xargs grep '^AR[ ]*=' | grep rcs
./lib/chibios/demos/AVR/NIL-ARDUINOMEGA/Makefile:AR = avr-ar rcs
./lib/chibios/demos/AVR/NIL-ARDUINOUNO/Makefile:AR = avr-ar rcs
./lib/chibios/demos/AVR/RT-ARDUINOLEONARDO/Makefile:AR = avr-ar rcs
./lib/chibios/demos/AVR/RT-ARDUINOMEGA/Makefile:AR = avr-ar rcs
./lib/chibios/demos/AVR/RT-ARDUINOMINI/Makefile:AR = avr-ar rcs
./lib/chibios/demos/AVR/RT-ARDUINONANO/Makefile:AR = avr-ar rcs
./lib/chibios/demos/AVR/RT-ARDUINOUNO/Makefile:AR = avr-ar rcs
./lib/chibios/demos/AVR/RT-PRO_MICRO/Makefile:AR = avr-ar rcs
./lib/chibios/demos/AVR/RT-TEENSY2-USB/Makefile:AR = avr-ar rcs
./lib/chibios/testhal/AVR/ADC/Makefile:AR = avr-ar rcs
./lib/chibios/testhal/AVR/EXT/Makefile:AR = avr-ar rcs
./lib/chibios/testhal/AVR/GPT/Makefile:AR = avr-ar rcs
./lib/chibios/testhal/AVR/I2C/Makefile:AR = avr-ar rcs
./lib/chibios/testhal/AVR/ICU/Makefile:AR = avr-ar rcs
./lib/chibios/testhal/AVR/PWM/Makefile:AR = avr-ar rcs
./lib/chibios/testhal/AVR/SPI/Makefile:AR = avr-ar rcs
./tmk_core/arm_atsam.mk:AR = arm-none-eabi-ar rcs

$ (find . -name Makefile; find . -name makefile ; find . -name '*.mk' ) | xargs grep '^AR[ ]*=' | grep -v rcs | wc -l
     265

@pelrun
Copy link
Contributor

pelrun commented Apr 16, 2019

Don't worry about the demos in /lib/chibios - they aren't used and they're on a different repository anyway.

@drashna
Copy link
Member

drashna commented Apr 19, 2019

@pelrun So far, the only boards that use ATSAM are the Massdrop boards (CTRL and ALT), but yes, they do need this fix applied as well.

That said, @patrickmt any issue with this change?

patrickmt
patrickmt approved these changes Apr 19, 2019
View reviewed changes
Copy link
Contributor

@patrickmt patrickmt left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good and compiles properly!

@drashna drashna merged commit 6d73fe1 into qmk:master Apr 22, 2019
drashna pushed a commit to zsa/qmk_firmware that referenced this pull request Apr 24, 2019
@mtei @drashna
fix LIB_SRC and QUANTUM_LIB_SRC for ARM (qmk#5623)
d663b42 
* fix LIB_SRC and QUANTUM_LIB_SRC for ARM(chibios)

* remove ARFLAGS

* tmk_core/arm_atsam.mk:AR: remove 'rcs'
Shinichi-Ohki added a commit to Shinichi-Ohki/qmk_firmware that referenced this pull request Apr 26, 2019
@Shinichi-Ohki
Merge branch 'master' of https://github.com/qmk/qmk_firmware
bc5db1c 
* 'master' of https://github.com/qmk/qmk_firmware: (99 commits)
  [Keyboard] Add a new keyboard ADKB96 (qmk#5685)
  test commit
  add RGBLIGHT_SPLIT_SET_CHANGE_MODEHSVS; to rgblight_update_dword()
  add RGBLIGHT_SPLIT_SET_CHANGE_MODEHSVS; to eeconfig_update_rgblight_default()
  Refactor cospad to current standards and enable support for backlight keycodes (qmk#5582)
  [Keymap] update (mouse emulation, rev 6 compatibility) (qmk#5696)
  [Keyboard] fix project zen rev1 bootloader declaration (qmk#5695)
  [FIX] Misspelled RGB_YELLOW (qmk#5692)
  [Keymap] Fix broken Shift-Insert binding (qmk#5689)
  [Keyboard] forgot to omit k05 from the electrical matrix in hhkb layout (qmk#5684)
  [Keyboard] Fix red an green leds location (qmk#5698)
  Translate docs into Chinese (qmk#5693)
  [Keymap] Fix my userspace RGB bug (qmk#5686)
  Boston meetup 2019 (qmk#5611)
  [Keymap] Update to Drashna Keymaps (qmk#5594)
  fix LIB_SRC and QUANTUM_LIB_SRC for ARM (qmk#5623)
  RGB Matrix Animations: Three/six new reactive effects (wide, cross, nexus) (qmk#5602)
  Fix qmk#3566 use an hardware timer for software PWM stability (qmk#3615)
  added info.json for ymd96 (qmk#4982)
  Define RGB colors (qmk#5300)
  ...
KauyonKais pushed a commit to KauyonKais/qmk_firmware that referenced this pull request Apr 27, 2019
@mtei @KauyonKais
fix LIB_SRC and QUANTUM_LIB_SRC for ARM (qmk#5623)
2b08f8e 
* fix LIB_SRC and QUANTUM_LIB_SRC for ARM(chibios)

* remove ARFLAGS

* tmk_core/arm_atsam.mk:AR: remove 'rcs'
foosinn pushed a commit to foosinn/qmk_firmware that referenced this pull request May 6, 2019
@mtei @foosinn
fix LIB_SRC and QUANTUM_LIB_SRC for ARM (qmk#5623)
265d8b0 
* fix LIB_SRC and QUANTUM_LIB_SRC for ARM(chibios)

* remove ARFLAGS

* tmk_core/arm_atsam.mk:AR: remove 'rcs'
@mtei mtei deleted the fix-LIB_SRC branch May 11, 2019 06:39
Timbus pushed a commit to Timbus/qmk_firmware that referenced this pull request Jun 23, 2019
@mtei @Timbus
fix LIB_SRC and QUANTUM_LIB_SRC for ARM (qmk#5623)
0929e31 
* fix LIB_SRC and QUANTUM_LIB_SRC for ARM(chibios)

* remove ARFLAGS

* tmk_core/arm_atsam.mk:AR: remove 'rcs'
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@pelrun pelrun pelrun approved these changes

@drashna drashna drashna approved these changes

@XScorpion2 XScorpion2 XScorpion2 approved these changes

@patrickmt patrickmt patrickmt approved these changes

@yanfali yanfali Awaiting requested review from yanfali

@mechmerlin mechmerlin Awaiting requested review from mechmerlin

@jackhumbert jackhumbert Awaiting requested review from jackhumbert

@algernon algernon Awaiting requested review from algernon

@ezuk ezuk Awaiting requested review from ezuk

@fredizzimo fredizzimo Awaiting requested review from fredizzimo

@skullydazed skullydazed Awaiting requested review from skullydazed

Assignees
No one assigned
Labels
bug core
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@mtei @pelrun @drashna @XScorpion2 @patrickmt