From patchwork Thu Feb 29 15:20:47 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jean-Pierre De Jesus DIAZ X-Patchwork-Id: 61244 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 731C827BBEA; Thu, 29 Feb 2024 15:23:10 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id BA57727BBE9 for ; Thu, 29 Feb 2024 15:23:09 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rfiF8-00072t-19; Thu, 29 Feb 2024 10:22:42 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rfiF3-0006ye-Qj for guix-patches@gnu.org; Thu, 29 Feb 2024 10:22:38 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rfiF2-0004WN-RP; Thu, 29 Feb 2024 10:22:36 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rfiFU-0004hE-0b; Thu, 29 Feb 2024 10:23:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#69476] [PATCH 5/8] gnu: ath9k-htc-firmware: Use xtensa-ath9k-elf. Resent-From: Jean-Pierre De Jesus DIAZ Original-Sender: "Debbugs-submit" Resent-CC: efraim@flashner.co.il, ludo@gnu.org, vagrant@debian.org, guix-patches@gnu.org Resent-Date: Thu, 29 Feb 2024 15:23:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 69476 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 69476@debbugs.gnu.org Cc: Jean-Pierre De Jesus DIAZ , Efraim Flashner , Ludovic =?utf-8?q?Court=C3=A8s?= , Vagrant Cascadian X-Debbugs-Original-Xcc: Efraim Flashner , Ludovic =?utf-8?q?Court=C3=A8s?= , Vagrant Cascadian Received: via spool by 69476-submit@debbugs.gnu.org id=B69476.170922016617977 (code B ref 69476); Thu, 29 Feb 2024 15:23:03 +0000 Received: (at 69476) by debbugs.gnu.org; 29 Feb 2024 15:22:46 +0000 Received: from localhost ([127.0.0.1]:35031 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rfiFB-0004fs-V2 for submit@debbugs.gnu.org; Thu, 29 Feb 2024 10:22:46 -0500 Received: from mail-wm1-f47.google.com ([209.85.128.47]:60681) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rfiEz-0004eJ-Vz for 69476@debbugs.gnu.org; Thu, 29 Feb 2024 10:22:34 -0500 Received: by mail-wm1-f47.google.com with SMTP id 5b1f17b1804b1-412a14299a4so7993465e9.1 for <69476@debbugs.gnu.org>; Thu, 29 Feb 2024 07:22:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foundationdevices.com; s=google; t=1709220061; x=1709824861; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=nGaEWohkJKsiDn26XxzfyrRm3DHHf3dRP9xNIuceCkY=; b=XoGkri4wd3WCJjdRCX72Fy2IA/3XRGel3U9+dy7O8KL3Lrrb1tK+R52H4Aoci11oJV cq+CNGH/RMG3YLa256tDZhtav3NY20ggqocZ9qnS6cpJcPKivcsifp3vcJvAFfRTSO4t 9LPQ9bLQiOFDFt6wXkYhOKhKqc4pazrzxOJVl9AwRUcwsD7gJr7V4BKS4FCKLFAzjnWT 37DtFYmVXk6bKPBuHKtyHc9edhHc4P755saXV/FsmKsFVUdFrrwsBvwHjQepbLBoAdVe dL7iCdD2tamSG0dTnq0xz8gFDFsaP4zBVyTIpiB++ebPTWnEqevoM03htlNJDxMmaUjK 9E9A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709220061; x=1709824861; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=nGaEWohkJKsiDn26XxzfyrRm3DHHf3dRP9xNIuceCkY=; b=Gozlupf/B1T0SwjbumKbxlsSNCGuZYVyUbdbMWjOFtY0cE24Ev0Kad9VIaAGtlFEQv qtLQTgutaILEmB6TapZBRlWU2zyTzt0AVVW2xYdupj8mUjXtAYtTG79HbhISXILm4XYb TjB6F1IVV8q3Rx28KVaY9b6u5CVKOpr3dXkLDRKZ318c7a6cK9rX0Cad0y86v0U6oF7W ChYTPHrSiQhna1uui3NblZnCpWyxlrPA+y3co8gLXuxVyvX9BLZQbwe8jTv6FDiZhE32 cAJm4AKDaT7qImLRJtiS0M7nufgi9UysFCGDoFBY1/9Mi5jhcjfhJKFEn7xHtgIebC3N opkQ== X-Gm-Message-State: AOJu0YzC0+uKLR5OO0AdyMQ70kF2BDXrK7Tfx9kZdNdQacfl7E61Aj4/ b+f56ZJNcBMGn8b+YSWQJTSuyDgZCb3GAFI+f//bK5eLq4/9kIHmdXw9Ap3nwPACYS4Kk+WxYUJ FTqI= X-Google-Smtp-Source: AGHT+IFxNtGzPVg5TtWcJfYKr/l1oobrAzIt/gkPRXJvRUwFwJuy31T3OSQrnzViVqP/zqjGmQ2Sbg== X-Received: by 2002:a05:600c:a08:b0:412:ae57:379 with SMTP id z8-20020a05600c0a0800b00412ae570379mr1934935wmp.17.1709220060807; Thu, 29 Feb 2024 07:21:00 -0800 (PST) Received: from jeandudey.home ([89.131.29.87]) by smtp.gmail.com with ESMTPSA id n6-20020a05600c4f8600b0041273fc463csm5584786wmq.17.2024.02.29.07.21.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Feb 2024 07:21:00 -0800 (PST) Date: Thu, 29 Feb 2024 16:20:47 +0100 Message-ID: <51b3861e69dc0ab0e52692448e9280a364a3397e.1709219325.git.jean@foundationdevices.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Jean-Pierre De Jesus DIAZ X-ACL-Warn: , Jean-Pierre De Jesus DIAZ via Guix-patches X-Patchwork-Original-From: Jean-Pierre De Jesus DIAZ via Guix-patches via From: Jean-Pierre De Jesus DIAZ Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * 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)))