[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#69476] [PATCH 5/8] gnu: ath9k-htc-firmware: Use xtensa-ath9k-elf.
From: |
Jean-Pierre De Jesus DIAZ |
Subject: |
[bug#69476] [PATCH 5/8] gnu: ath9k-htc-firmware: Use xtensa-ath9k-elf. |
Date: |
Thu, 29 Feb 2024 16:20:47 +0100 |
* gnu/packages/firmware.scm (ath9k-htc-firmware): Use the
xtensa-ath9k-elf target for the cross toolchain.
Change-Id: Ic1a7c4088312290a86a508f371f4f0e784e301a5
---
gnu/packages/cross-base.scm | 4 ++--
gnu/packages/firmware.scm | 8 ++++----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/gnu/packages/cross-base.scm b/gnu/packages/cross-base.scm
index 2d79e0acf6..93383089e5 100644
--- a/gnu/packages/cross-base.scm
+++ b/gnu/packages/cross-base.scm
@@ -118,8 +118,8 @@ (define* (cross-binutils* target #:key (binutils binutils))
;; target libs, not native libs, so this is safe.
`(cons "--with-sysroot=/" ,flags)))))))
- ;; For Xtensa, apply Qualcomm's patch.
- (cross (cond ((string-prefix? "xtensa-" target)
+ ;; For xtensa-ath9k-elf, apply Qualcomm's patch.
+ (cross (cond ((string=? target "xtensa-ath9k-elf")
(package-with-patches binutils
(search-patches
"ath9k-htc-firmware-binutils.patch")))
diff --git a/gnu/packages/firmware.scm b/gnu/packages/firmware.scm
index da7835a95d..6993925387 100644
--- a/gnu/packages/firmware.scm
+++ b/gnu/packages/firmware.scm
@@ -121,7 +121,7 @@ (define-public ath9k-htc-firmware
;; 'configure' is a simple script that runs 'cmake' with
;; the right flags.
(substitute* "configure"
- (("^TARGET.*$") "TARGET=xtensa-elf\n")
+ (("^TARGET.*$") "TARGET=xtensa-ath9k-elf\n")
(("^TOOLCHAIN=.*$")
(string-append "TOOLCHAIN="
(assoc-ref (or native-inputs inputs)
"cross-gcc")
@@ -140,12 +140,12 @@ (define-public ath9k-htc-firmware
;; The firmware is cross-compiled using a "bare bones" compiler (no libc.)
;; Use our own tool chain for that.
(native-inputs `(("cross-gcc" ,(cross-gcc
- "xtensa-elf"
+ "xtensa-ath9k-elf"
#:xbinutils (cross-binutils
- "xtensa-elf"
+ "xtensa-ath9k-elf"
#:binutils binutils-2.33)))
("cross-binutils" ,(cross-binutils
- "xtensa-elf"
+ "xtensa-ath9k-elf"
#:binutils binutils-2.33))
("cmake" ,cmake-minimal)
("perl" ,perl)))
--
2.41.0
- [bug#69476] [PATCH 0/8] guix: Add xtensa-ath9k-elf platform., Jean-Pierre De Jesus DIAZ, 2024/02/29
- [bug#69476] [PATCH 1/8] doc: Add documentation for x86_64-linux-gnux32., Jean-Pierre De Jesus DIAZ, 2024/02/29
- [bug#69476] [PATCH 6/8] gnu: cross-binutils: Use binutils-2.33 for ath9k., Jean-Pierre De Jesus DIAZ, 2024/02/29
- [bug#69476] [PATCH 7/8] guix: cmake-build-system: Handle unknown systems., Jean-Pierre De Jesus DIAZ, 2024/02/29
- [bug#69476] [PATCH 3/8] gnu: ath9k-htc-firmware: Remove binary blobs., Jean-Pierre De Jesus DIAZ, 2024/02/29
- [bug#69476] [PATCH 4/8] gnu: ath9k-htc-firmware: Allow using other targets., Jean-Pierre De Jesus DIAZ, 2024/02/29
- [bug#69476] [PATCH 5/8] gnu: ath9k-htc-firmware: Use xtensa-ath9k-elf.,
Jean-Pierre De Jesus DIAZ <=
- [bug#69476] [PATCH 8/8] gnu: ath9k-htc-firmware: Split package., Jean-Pierre De Jesus DIAZ, 2024/02/29
- [bug#69476] [PATCH 2/8] guix: Add xtensa-ath9k-elf platform., Jean-Pierre De Jesus DIAZ, 2024/02/29