From patchwork Mon Jan 25 13:41:59 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Bader X-Patchwork-Id: 1431230 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) 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 ozlabs.org (Postfix) with ESMTPS id 4DPWJ13nXqz9sVm; Tue, 26 Jan 2021 00:42:07 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1l4284-0003BL-5l; Mon, 25 Jan 2021 13:42:04 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1l4282-0003AL-59 for kernel-team@lists.ubuntu.com; Mon, 25 Jan 2021 13:42:02 +0000 Received: from 1.general.smb.uk.vpn ([10.172.193.28] helo=canonical.com) by youngberry.canonical.com with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1l4281-0006Og-HO for kernel-team@lists.ubuntu.com; Mon, 25 Jan 2021 13:42:01 +0000 From: Stefan Bader To: kernel-team@lists.ubuntu.com Subject: [SRU F][PATCH 2/2] UBUNTU: [Packaging] Turn on ODM support for amd64 Date: Mon, 25 Jan 2021 14:41:59 +0100 Message-Id: <20210125134159.142286-3-stefan.bader@canonical.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210125134159.142286-1-stefan.bader@canonical.com> References: <20210125134159.142286-1-stefan.bader@canonical.com> 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" BugLink: https://bugs.launchpad.net/1912789 Now there is the support in place let us turn this on for amd64. This is added as enabled generally in the config because otherwise updating the config for drivers depending on it would not work. It is changed at build time for arches which have not enabled it. Also it will automatically go away for backports. Signed-off-by: Stefan Bader --- debian.master/config/config.common.ubuntu | 1 + debian.master/rules.d/amd64.mk | 1 + 2 files changed, 2 insertions(+) diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index 75cc55c2d321..00fae58b1ade 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -10362,6 +10362,7 @@ CONFIG_UBIFS_FS_ZLIB=y CONFIG_UBIFS_FS_ZSTD=y # CONFIG_UBSAN is not set CONFIG_UBSAN_ALIGNMENT=y +CONFIG_UBUNTU_ODM_DRIVERS=y CONFIG_UCB1400_CORE=m CONFIG_UCLAMP_BUCKETS_COUNT=5 CONFIG_UCLAMP_TASK=y diff --git a/debian.master/rules.d/amd64.mk b/debian.master/rules.d/amd64.mk index d253402ae066..c201b5da0b13 100644 --- a/debian.master/rules.d/amd64.mk +++ b/debian.master/rules.d/amd64.mk @@ -26,3 +26,4 @@ do_dkms_nvidia = true do_dkms_nvidia_server = true do_dkms_vbox = true do_dkms_wireguard = true +do_odm_drivers = true