[PATCH 2/3][SRU][G] UBUNTU: [Packaging] Turn on ODM support for amd64

[AceLan Kao]

From: Stefan Bader <stefan.bader at canonical.com>

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 <stefan.bader at canonical.com>
Acked-by: Marcelo Henrique Cerri <marcelo.cerri at canonical.com>
Acked-by: Andy Whitcroft <apw at canonical.com>
Signed-off-by: Kelsey Skunberg <kelsey.skunberg at canonical.com>
(backported from commit 4aeffc246531a666c1fad1925ebf1a6e68a704e4 focal)
Signed-off-by: Chia-Lin Kao (AceLan) <acelan.kao at canonical.com>
---
 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 0b25507258e1..1cdb812a9d72 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -10656,6 +10656,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 a95707b0cdd7..b33aced86921 100644
--- a/debian.master/rules.d/amd64.mk
+++ b/debian.master/rules.d/amd64.mk
@@ -22,3 +22,4 @@ do_extras_package = true
 do_tools_common = true
 do_tools_acpidbg = true
 do_zfs		= true
+do_odm_drivers    = true
-- 
2.25.1