From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.5 (2021-03-20) on atuin.qyliss.net X-Spam-Level: X-Spam-Status: No, score=-4.5 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, RCVD_IN_DNSWL_LOW,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.5 Received: by atuin.qyliss.net (Postfix, from userid 496) id DC47E19710; Sat, 29 May 2021 14:42:42 +0000 (UTC) Received: from atuin.qyliss.net (localhost [IPv6:::1]) by atuin.qyliss.net (Postfix) with ESMTP id 3324419449; Sat, 29 May 2021 14:41:55 +0000 (UTC) Received: by atuin.qyliss.net (Postfix, from userid 496) id 684E51941B; Sat, 29 May 2021 14:41:51 +0000 (UTC) Received: from wforward1-smtp.messagingengine.com (wforward1-smtp.messagingengine.com [64.147.123.30]) by atuin.qyliss.net (Postfix) with ESMTPS id 4D540194A0 for ; Sat, 29 May 2021 14:41:43 +0000 (UTC) Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailforward.west.internal (Postfix) with ESMTP id C1BEA11EC; Sat, 29 May 2021 10:41:41 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute1.internal (MEProxy); Sat, 29 May 2021 10:41:41 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:date:from :in-reply-to:message-id:mime-version:references:subject:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm2; bh=9AneAUl7H+kIghD3eQ0yx6pw2oEwUadgefNUtKV4OaA=; b=Am1vkKvT u2ROGRdNg21SGagnsJjYdZFic1bOMi1Bxdsq28GWPG1fl8u/vNn3Mlz2mHY1Kl4E Q3Bok2LgfidLXk0eYyD2EHw6KwiB8x3T1DAyhSD7+OctCjirfrqv+xTPLAdlCk2G F+Wu4yKvG+CwWmep47tVMnGpyIvdBMVQz6ym7WN/9+4hEKPg8a1pdbJcOlOVoWPT +gxJai7S8Mc6dCr22J6YHn5aal3cVn8b2kYXBFfaD/nsvor7HegK/8mOA46RICI+ 0LFPVAScoMX4uxTHhUPace09cH8HKNXAiyAwjBrBud11qswJxf0ms2pSffhPu8CT aQXWgrhw2ke6yg== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduledrvdekledgkedtucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpeetlhihshhs rgcutfhoshhsuceohhhisegrlhihshhsrgdrihhsqeenucggtffrrghtthgvrhhnpefgfe dukedvleeileeludefveehgeelgfegvddujedvtdffueeuveffheeljeekvdenucfkphep geeirdektddrudefkedrjeefnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpe hmrghilhhfrhhomhepqhihlhhishhsseigvddvtddrqhihlhhishhsrdhnvght X-ME-Proxy: Received: from x220.qyliss.net (p2e508a49.dip0.t-ipconnect.de [46.80.138.73]) by mail.messagingengine.com (Postfix) with ESMTPA; Sat, 29 May 2021 10:41:41 -0400 (EDT) Received: by x220.qyliss.net (Postfix, from userid 1000) id 37C641664; Sat, 29 May 2021 14:41:39 +0000 (UTC) From: Alyssa Ross To: devel@spectrum-os.org Subject: [PATCH nixpkgs v2 2/8] chromiumOSPackages.linux: fix config Date: Sat, 29 May 2021 14:41:11 +0000 Message-Id: <20210529144117.571353-3-hi@alyssa.is> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210529144117.571353-1-hi@alyssa.is> References: <20210529144117.571353-1-hi@alyssa.is> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Message-ID-Hash: URDAAUEGGXZRHXTDAX72PWZJJAKGMRSA X-Message-ID-Hash: URDAAUEGGXZRHXTDAX72PWZJJAKGMRSA X-MailFrom: qyliss@x220.qyliss.net 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; digests; suspicious-header CC: Jamie McClymont X-Mailman-Version: 3.3.4 Precedence: list List-Id: Patches and low-level development discussion Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: Jamie McClymont Co-authored-by: Alyssa Ross Reviewed-by: Alyssa Ross Tested-by: Alyssa Ross --- 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..edaa33ac0fb 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 module; + RTW88_8822CE = lib.mkForce module; } // (args.structuredExtraConfig or {}); } // (args.argsOverride or {})) -- 2.31.1