me/guix
Archived
1
0
Fork 0
Code Activity

gnu: ath9k-htc-firmware: Use xtensa-ath9k-elf.

Browse source 
* gnu/packages/firmware.scm (ath9k-htc-firmware): Use the
xtensa-ath9k-elf target for the cross toolchain.

Change-Id: Ic1a7c4088312290a86a508f371f4f0e784e301a5
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
This commit is contained in:
Jean-Pierre De Jesus DIAZ 2024-02-29 16:20:47 +01:00 • committed by Ludovic Courtès
parent c3aba93823
commit f97f5312cc
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
gnu/packages/cross-base.scm
View file

@ -118,8 +118,8 @@
;; target libs, not native libs, so this is safe. ;; target libs, not native libs, so this is safe.
`(cons "--with-sysroot=/" ,flags))))))) `(cons "--with-sysroot=/" ,flags)))))))
;; For Xtensa, apply Qualcomm's patch. ;; For xtensa-ath9k-elf, apply Qualcomm's patch.
(cross (cond ((string-prefix? "xtensa-" target) (cross (cond ((string=? target "xtensa-ath9k-elf")
(package-with-patches binutils (package-with-patches binutils
(search-patches (search-patches
"ath9k-htc-firmware-binutils.patch"))) "ath9k-htc-firmware-binutils.patch")))

8
gnu/packages/firmware.scm
View file

@ -121,7 +121,7 @@
;; 'configure' is a simple script that runs 'cmake' with ;; 'configure' is a simple script that runs 'cmake' with
;; the right flags. ;; the right flags.
(substitute* "configure" (substitute* "configure"
(("^TARGET.*$") "TARGET=xtensa-elf\n") (("^TARGET.*$") "TARGET=xtensa-ath9k-elf\n")
(("^TOOLCHAIN=.*$") (("^TOOLCHAIN=.*$")
(string-append "TOOLCHAIN=" (string-append "TOOLCHAIN="
(assoc-ref (or native-inputs inputs) "cross-gcc") (assoc-ref (or native-inputs inputs) "cross-gcc")
@ -140,12 +140,12 @@
;; The firmware is cross-compiled using a "bare bones" compiler (no libc.) ;; The firmware is cross-compiled using a "bare bones" compiler (no libc.)
;; Use our own tool chain for that. ;; Use our own tool chain for that.
(native-inputs `(("cross-gcc" ,(cross-gcc (native-inputs `(("cross-gcc" ,(cross-gcc
"xtensa-elf" "xtensa-ath9k-elf"
#:xbinutils (cross-binutils #:xbinutils (cross-binutils
"xtensa-elf" "xtensa-ath9k-elf"
#:binutils binutils-2.33))) #:binutils binutils-2.33)))
("cross-binutils" ,(cross-binutils ("cross-binutils" ,(cross-binutils
"xtensa-elf" "xtensa-ath9k-elf"
#:binutils binutils-2.33)) #:binutils binutils-2.33))
("cmake" ,cmake-minimal) ("cmake" ,cmake-minimal)
("perl" ,perl))) ("perl" ,perl)))