Fix file size check for parallel make #5012
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
mechmerlin
approved these changes
Jan 31, 2019
Shinichi-Ohki
added a commit
to Shinichi-Ohki/qmk_firmware
that referenced
this pull request
Jan 31, 2019
* 'master' of https://github.com/qmk/qmk_firmware: (43 commits) Remove duplicate make invocations Fix file size check for parallel make (qmk#5012) [Keyboard] 40percent.club's Half 'n' half keyboard port (qmk#5005) update canoe/readme (qmk#5014) [Keyboard][S65-X] BACKLIGHT_CAPS_LOCK (qmk#4770) space65-5001 init, small corrections to the total number of leds (qmk#5006) [Keyboard] add dz60rgb keyboard (qmk#4992) [Keyboard] Jj40 doc (qmk#4914) [Keyboard] Redox Wireless configurator bugfix (qmk#4961) added aanzee pcb support (qmk#4962) Sweet16 Keymap by Spaceman added (qmk#5003) [Keyboard] Gray Studio Directory (qmk#5002) Fix link and name spelling in Space65's readme (qmk#5004) [Keymap] Updates to ortho_4x12/buswerks keymap (qmk#4996) [Keyboard] Gray Studio Space 65 Support (qmk#5001) Moving cannonkeys boards to one place, eeprom fix (qmk#4999) convert to unix line-endings [skip ci] S60x Make Default standard layout and have separate Mac OS one (qmk#4964) [Keyboard] Bug Fix To Unigo66 (qmk#4995) Contribute the MechMerlin QMK Configurator docs (qmk#4986) ...
calmh
added a commit
to calmh/qmk_firmware
that referenced
this pull request
Feb 4, 2019
* master: (463 commits) New Keyboard: Sentraq Number Pad RGB DIY Kit (qmk#5047) ergodash Keyboard readme documentation (qmk#5046) [Keyboard] ADB converter lock LED fix (qmk#5035) [Keymap] Added , to fix errors (qmk#5034) Stanrc85 layout update/cleanup (qmk#5029) Add hand-swap config to Gergo layout (qmk#5033) [Keymap] Adds Preonic keymap for muzfuz. Small Planck addition. (qmk#5019) Change return type of layer_switch_get_layer() to uint8_t (qmk#5011) Space65 Updates (qmk#5008) [Keyboard] Add 1upkeyboards 1up80hte (Tsangan style PCB) (qmk#4988) Update info.json (qmk#5015) Fixed TGR Alice pinout and number of LEDs (qmk#5018) Generalized nyquist layout for 5x12 boards. Removed duplicate readme.md that was cased the same and caused issues. Remove duplicate make invocations Fix file size check for parallel make (qmk#5012) [Keyboard] 40percent.club's Half 'n' half keyboard port (qmk#5005) update canoe/readme (qmk#5014) [Keyboard][S65-X] BACKLIGHT_CAPS_LOCK (qmk#4770) space65-5001 init, small corrections to the total number of leds (qmk#5006) [Keyboard] add dz60rgb keyboard (qmk#4992) ...
|
I did, though and yay, finally :D |
zer09
pushed a commit
to zer09/qmk_firmware
that referenced
this pull request
Feb 9, 2019
dlhextall
pushed a commit
to dlhextall/qmk_firmware
that referenced
this pull request
May 24, 2019
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Cherry picked from #4947.
When performing parallel make,
make -jNwhere N > 1, the size check* The firmware size is fine - 19458/28672 (9214 bytes free)does not print out at the end. The change i have added to the make file adds a dependency to make sure it always happens after build.Tested locally with:
Types of changes
Checklist: