From patchwork Fri Jun 11 10:01:29 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: AceLan Kao X-Patchwork-Id: 1490876 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=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=F/FFIBjW; dkim-atps=neutral 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 4G1bwq3SWHz9sSn; Fri, 11 Jun 2021 20:02:03 +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 1lrdzD-0000Ke-Iv; Fri, 11 Jun 2021 10:01:59 +0000 Received: from mail-pf1-f175.google.com ([209.85.210.175]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1lrdzB-0000Fs-Bd for kernel-team@lists.ubuntu.com; Fri, 11 Jun 2021 10:01:57 +0000 Received: by mail-pf1-f175.google.com with SMTP id u18so4023650pfk.11 for ; Fri, 11 Jun 2021 03:01:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ywBxscGnv/AMbyRyx8Eb0NVJeXw/iIq9Ub+LlqBs3JQ=; b=F/FFIBjWOgZ6Mk7m+4V2kIRGc24Gw08WRwWdNjpfIpbN+SCaf4pCSRM0WovnpYuoKf w/TPS4X6ZClSY0b6u7iUTDoEISmiVdmKuYD6oQnz8nHRI9GuNvH28WaDQypqSRCqZ/TF Hc8vYOau4hHA6nA/4/BLZdZmM4K54MDbC5nJcW+bJMGkGlkWtiTlEIttfQePgAwAfhZM J/gX6c37dNNIlZbLsWBxLArHV/aSUsnFDvwN6/8URHnpiUum2IFvypJH5HaenWwnLNmC /Zz7hLdSVqr/H4WkGNkkSBIvFxFmRMDexRoLJfrlYdSgwynCJr7g7M4/grgNlWfGfDax VDFA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=ywBxscGnv/AMbyRyx8Eb0NVJeXw/iIq9Ub+LlqBs3JQ=; b=Y/cTGRdvL7Cq5q590dpJ1wslkd+n4RyHGuYJdv4lIfHF1zsTgetIofyuM9WrQDa9AU LgLcA5SJa286ca25Xcr0TjpX/MPrPc+GfA5HscfIe0GMEbWbsS+ik01jGeqFddGxgge1 OKLU3Xnksf1uEqucY0N7Z8RJPu5zLx6A/u1cZZfSxoceP1/9xFwZ8wwoJB0hBk3gubGp KUdTPNo+ZOqRbfjZ35VBROGp5L7QcGjE2oNT9huW4iql84XxOycDaCLlqXZfb8l1N7Wb +UXEhWS2lW+ejWbuP/2tM8SNF8rvBM/BTmuvlNznrOFhm7w+0SKmjFyqfO+U9e0ff9Yb F74g== X-Gm-Message-State: AOAM531XHk4bbiBuuIrMyLyPxIo/tDzjA75MmBsy2cooCHfqPq3o5LoK S/97HGwZbbYU49gzbluMDdTB5bnnnerCyQ== X-Google-Smtp-Source: ABdhPJy7r8+yhjgKencsQJ88pxK4GOCHsSxPvePqDd0rJu8ifHWAnh6rEbONazhC8AMJPG3staOEHw== X-Received: by 2002:a05:6a00:d65:b029:2ec:2bfa:d0d1 with SMTP id n37-20020a056a000d65b02902ec2bfad0d1mr7577762pfv.14.1623405712356; Fri, 11 Jun 2021 03:01:52 -0700 (PDT) Received: from localhost (220-135-95-34.HINET-IP.hinet.net. [220.135.95.34]) by smtp.gmail.com with ESMTPSA id k1sm4740131pfa.30.2021.06.11.03.01.51 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Jun 2021 03:01:51 -0700 (PDT) From: AceLan Kao To: kernel-team@lists.ubuntu.com Subject: [PATCH 2/4][SRU][Unstable] UBUNTU: [Packaging] Turn on ODM support for amd64 Date: Fri, 11 Jun 2021 18:01:29 +0800 Message-Id: <20210611100131.15133-7-acelan.kao@canonical.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210611100131.15133-1-acelan.kao@canonical.com> References: <20210611100131.15133-1-acelan.kao@canonical.com> MIME-Version: 1.0 Received-SPF: pass client-ip=209.85.210.175; envelope-from=acelan@gmail.com; helo=mail-pf1-f175.google.com 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" From: Stefan Bader 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 Acked-by: Marcelo Henrique Cerri Acked-by: Andy Whitcroft Signed-off-by: Kelsey Skunberg (backported from commit 4aeffc246531a666c1fad1925ebf1a6e68a704e4 focal) Signed-off-by: Chia-Lin Kao (AceLan) --- 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 a605e3e521e5..c5da2b398cd0 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -11223,6 +11223,7 @@ CONFIG_UBIFS_FS_ZLIB=y CONFIG_UBIFS_FS_ZSTD=y # CONFIG_UBSAN is not set CONFIG_UBUNTU_HOST=m +CONFIG_UBUNTU_ODM_DRIVERS=y CONFIG_UCB1400_CORE=m CONFIG_UCC=y CONFIG_UCC_FAST=y diff --git a/debian.master/rules.d/amd64.mk b/debian.master/rules.d/amd64.mk index 35fda32b2571..f8cbb67c1b3a 100644 --- a/debian.master/rules.d/amd64.mk +++ b/debian.master/rules.d/amd64.mk @@ -23,3 +23,4 @@ do_tools_acpidbg = true do_zfs = true do_dkms_nvidia = false do_dkms_nvidia_server = false +do_odm_drivers = true