From patchwork Mon May 9 17:28:55 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dimitri John Ledkov X-Patchwork-Id: 1628746 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=VMAhlwgE; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4Kxp7Y4JfPz9sGJ for ; Tue, 10 May 2022 03:29:12 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1no7Bs-0008Uu-JU; Mon, 09 May 2022 17:29:00 +0000 Received: from smtp-relay-internal-0.internal ([10.131.114.225] helo=smtp-relay-internal-0.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1no7Bq-0008Un-Tt for kernel-team@lists.ubuntu.com; Mon, 09 May 2022 17:28:58 +0000 Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id 7C3593F221 for ; Mon, 9 May 2022 17:28:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1652117338; bh=mwKFa55eXDRiJnwG8d5CZstDlztCJXNjibXiKWea6dk=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=VMAhlwgEtNW/FE8VDHHWoAN2VqN9RXLugLHLs4fvtutK5lG0PvMNxrKRjB1blLUdO 4F7CxWjAEsv14856akrMAhmqNv3v5YMYcPXO3yr+wOpuljWU5tiE7J5Xb7HQJlc1qm iLzEu8jW7QYhoQqHNwaYifk9aAe5QLNyk20ee/pIwNKqbFI/Xfo3GFlJUq52yXYyZW sQzdxoJ9H4aMyeAdvkZkcvrhoZMOCqi760VNQPRo+CqrNn152M+5VLUDO6KOnDvldj xYxWTclpWqv7oMSCAHPJx9CrG3SYl4NglAUPn48att+5ji/4nr++Lnk2U07ywuHzpZ 7CB2OBTbRAsdw== Received: by mail-wr1-f69.google.com with SMTP id v29-20020adfa1dd000000b0020ad932b7c0so6024628wrv.0 for ; Mon, 09 May 2022 10:28:58 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=mwKFa55eXDRiJnwG8d5CZstDlztCJXNjibXiKWea6dk=; b=4vod8AkawDEhfS+WCaCzfcNlHiQvpENmZ075JQppRyi1MlkFICaqfjLMY14+Vi9APR h7PcDVuZ85rA/IkEPwIOhSywUDL8FBVfzy2ObX2/s10xBVoBZXg9DlmX3XkUdLekjCFM DQO8cGiZjqbfqkIJJ4KnLY67brC8iyDx+6zGwzkckfqqCuakmRFcEt5ODURUu83eY9XS 5pS8LqXcdVVvjzk0QEcYnnUIFgRa6jjgOXnOmRqkj7cWnmjxxxplI2mUxPKKC4vMvy1i FvWSeVrI1R7VWaoq1ywZRjLJK5ibCIsMvtend4Qgi9CK0JGHlkozfOU1vJ+oJumAVI7p sRMg== X-Gm-Message-State: AOAM533Dw4cwuuEO3EjGUcoeZS6v0w5OOEIXKoUK4m/FcM5Vh4Un2fS2 xf3v+Xcrna06encuCuTmNZMHlMAnrp92I4SLSo3b9lvvwKf0iP/e+OW/yJ29IuuIRz4A1dKyqFo GqP6y9WK5wE7jMRlE/tABTts4kc9LZKn8l+VqpEZx1A== X-Received: by 2002:a7b:c10d:0:b0:393:fbff:24a9 with SMTP id w13-20020a7bc10d000000b00393fbff24a9mr17233680wmi.53.1652117337808; Mon, 09 May 2022 10:28:57 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyBqp6F6GWomlNZCHUmjT7XoZyK1ESPfBlHo4ydbRfhU8TSiH0HrMK3KoZ79bZ43qZMSVqO5w== X-Received: by 2002:a7b:c10d:0:b0:393:fbff:24a9 with SMTP id w13-20020a7bc10d000000b00393fbff24a9mr17233665wmi.53.1652117337553; Mon, 09 May 2022 10:28:57 -0700 (PDT) Received: from localhost ([2a01:4b00:85fd:d700:4359:3fb2:1bdd:60fe]) by smtp.gmail.com with ESMTPSA id az38-20020a05600c602600b003942a244ed2sm15071763wmb.23.2022.05.09.10.28.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 May 2022 10:28:56 -0700 (PDT) From: Dimitri John Ledkov To: kernel-team@lists.ubuntu.com Subject: [kernel-snaps-uc2*/main|master][PATCH] trim-firmware: if intel bluetooth firmware is included, include all of them Date: Mon, 9 May 2022 18:28:55 +0100 Message-Id: <20220509172855.1516319-1-dimitri.ledkov@canonical.com> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" Currently only a subset of intel bluetooth firmware files are declared as required by the btintel driver. If they are included, also copy and include the rest of them for all other (more recent) devices. BugLink: https://bugs.launchpad.net/bugs/1970819 Signed-off-by: Dimitri John Ledkov Acked-by: Tim Gardner --- trim-firmware | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/trim-firmware b/trim-firmware index cc8b61c42d..4990736919 100755 --- a/trim-firmware +++ b/trim-firmware @@ -51,6 +51,13 @@ for d in "${DESTDIR}"/modules/* ; do fi done +# If an intel bluetooth firmware is included, include the rest of them +# LP: #1970819 +if [ -e "${DESTDIR}"/firmware.new/intel/ibt-12-16.sfi ]; then + cp "${DESTDIR}"/firmware/intel/ibt-*.sfi "${DESTDIR}"/firmware.new/intel/ + cp "${DESTDIR}"/firmware/intel/ibt-*.ddc "${DESTDIR}"/firmware.new/intel/ +fi + # Switch to the new firmware directory rm -rf "${DESTDIR}"/firmware mv "${DESTDIR}"/firmware.new "${DESTDIR}"/firmware