From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on atuin.qyliss.net X-Spam-Level: X-Spam-Status: No, score=-3.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 Received: by atuin.qyliss.net (Postfix, from userid 496) id B11A41AC08; Fri, 2 Apr 2021 09:05:09 +0000 (UTC) Received: from [127.0.0.1] (localhost [IPv6:::1]) by atuin.qyliss.net (Postfix) with ESMTP id 05A241AA63; Fri, 2 Apr 2021 09:04:29 +0000 (UTC) Received: by atuin.qyliss.net (Postfix, from userid 496) id F3E781A9FB; Fri, 2 Apr 2021 09:04:26 +0000 (UTC) Received: from a8-86.smtp-out.amazonses.com (a8-86.smtp-out.amazonses.com [54.240.8.86]) by atuin.qyliss.net (Postfix) with ESMTPS id 6A5961AA19 for ; Fri, 2 Apr 2021 09:04:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=ug7nbtf4gccmlpwj322ax3p6ow6yfsug; d=amazonses.com; t=1617354256; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References:MIME-Version:Content-Transfer-Encoding:Feedback-ID; bh=s1zQ5dfyImwG8SW+2Dh3tGi+GNO7qiQH8mbwI+GzS6k=; b=L1TAv7/y3jsWquWuc6wAAyer2mZ1+IVNjm6bsfs07rEzIEvYUH/B6WtIcPuAXBr4 D6+JhyNmQQWZvp2ivyEsPjur4dwQo48TdkX0iomW55FV0eskuFBOEsN6n7b6cIlUuR0 aQx38KRDAGVAk6+9Sbnfip8JimalFxH3QWqlQy0E= From: Jamie McClymont To: devel@spectrum-os.org Subject: [RFC PATCH 2/8] chromiumOSPackages.cros_linux: fix config Date: Fri, 2 Apr 2021 09:04:16 +0000 Message-ID: <0100017891d36eab-b33cd88c-2b79-4848-8f7b-29cf7ea42e93-000000@email.amazonses.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210402090042.2020627-1-jamie@kwiius.com> References: <20210402090042.2020627-1-jamie@kwiius.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SES-Outgoing: 2021.04.02-54.240.8.86 Feedback-ID: 1.us-east-1.9pXRggpcNqPasnyFcFNFQXAg6PTGO6hwgAZOzryQyDc=:AmazonSES Message-ID-Hash: V44NOB6HY5UCNZO4VQEZMYIOMW77LBRX X-Message-ID-Hash: V44NOB6HY5UCNZO4VQEZMYIOMW77LBRX X-MailFrom: 0100017891d36eab-b33cd88c-2b79-4848-8f7b-29cf7ea42e93-000000@amazonses.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header CC: Jamie McClymont X-Mailman-Version: 3.3.1 Precedence: list List-Id: Patches and low-level development discussion Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: The ANALOGIX_ANX7625 option no longer exists, but VIDEO_INTEL_IPU6 is now a source of build errors. --- pkgs/os-specific/linux/kernel/linux-cros.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/kernel/linux-cros.nix b/pkgs/os-specific/linux/kernel/linux-cros.nix index 789a9fb6fd2..d292fe2c54a 100644 --- a/pkgs/os-specific/linux/kernel/linux-cros.nix +++ b/pkgs/os-specific/linux/kernel/linux-cros.nix @@ -29,6 +29,10 @@ buildLinux (args // rec { # Enabling this (the default) caused a build failure. If you can # archieve a successful build with this enabled, go ahead and # enable it. - ANALOGIX_ANX7625 = no; + VIDEO_INTEL_IPU6 = no; + + # RTW88_8822*E were being selected as Y when N/m/? are the only valid options + RTW88_8822BE = lib.mkForce no; + RTW88_8822CE = lib.mkForce no; } // (args.structuredExtraConfig or {}); } // (args.argsOverride or {})) -- 2.31.1