TakeV/guix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

gnu: make-qmk-firmware: Use AVR target.

Browse source 
* gnu/packages/firmware.scm (qmk)[inputs]: Remove AVR toolchain.
[arguments]: Adjust phase wrapping output.
(make-qmk-firmware/implementation)[arguments]: Add avr as target.

Change-Id: Ibe09f6ef3c555052faf2c5c243303d85675866be
Signed-off-by: Efraim Flashner <efraim@flashner.co.il>
This commit is contained in:
Jean-Pierre De Jesus DIAZ 2023-11-28 12:35:02 +01:00 committed by Efraim Flashner
parent 30d25ee201
commit 670c7560d1
No known key found for this signature in database
GPG key ID: 41AAE7DCCA3D8351
1 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
gnu/packages/firmware.scm
View file

@ -1344,9 +1344,7 @@ (define-public qmk
`("PATH" prefix
,(map (compose dirname
(cut search-input-file inputs <>))
'("bin/avr-ar"
"bin/avr-gcc"
"bin/avrdude"
'("bin/avrdude"
"bin/awk"
"bin/cmp"
"bin/dfu-programmer"
@ -1359,16 +1357,13 @@ (define-public qmk
;; TODO: Remove after git is wrapped with these.
"bin/basename"
"bin/sed"
"bin/uname")))
`("CROSS_C_INCLUDE_PATH" = (,(getenv "CROSS_C_INCLUDE_PATH")))
`("CROSS_LIBRARY_PATH" = (,(getenv "CROSS_LIBRARY_PATH")))))))))
"bin/uname")))))))))
;; The inputs are not propagated since qmk is to be used strictly as a
;; command.
(inputs
;; The 'qmk setup' command advises to use GCC at version 8, and there are
;; compilation errors in some firmware otherwise.
(list (make-avr-toolchain #:xgcc gcc-8)
avrdude
(list avrdude
bash-minimal
dfu-programmer
dfu-util
@ -1441,6 +1436,7 @@ (define* (make-qmk-firmware/implementation keyboard keymap
(ice-9 ftw)
(ice-9 match)
(srfi srfi-26))
#:target "avr"
;; XXX: Running a test target like "test:$keyboard" doesn't seem to run
;; anything and causes the .hex file to be regenerated; leave the tests
;; out for now.