From 4c0b36e62ee225b7904ad1b655b6ed264f152d26 Mon Sep 17 00:00:00 2001
From: Mitchell Augustin <mitchell.augustin@canonical.com>
Date: Tue, 28 May 2024 18:56:00 +0200
Subject: [PATCH] UBUNTU: [Config]: Configure TPM drivers as builtins for arm64
 in annotations

BugLink: https://bugs.launchpad.net/bugs/2037688

Sets the following configs for arm64 to resolve the above issue on Grace systems:
CONFIG_SPI_TEGRA210_QUAD=y
CONFIG_TCG_TIS_SPI=y

Signed-off-by: Mitchell Augustin <mitchell.augustin@canonical.com>
Acked-by: Tim Gardner <tim.gardner@canonical.com>
Acked-by: Agathe Porte <agathe.porte@canonical.com>
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
---
 debian.master/config/annotations | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian.master/config/annotations b/debian.master/config/annotations
index 251beab61ed1..f307969b7875 100644
--- a/debian.master/config/annotations
+++ b/debian.master/config/annotations
@@ -13321,7 +13321,7 @@ CONFIG_SPI_SYNQUACER                            policy<{'arm64': 'm'}>
 CONFIG_SPI_TEGRA114                             policy<{'arm64': 'm', 'armhf': 'm'}>
 CONFIG_SPI_TEGRA20_SFLASH                       policy<{'arm64': 'm', 'armhf': 'm'}>
 CONFIG_SPI_TEGRA20_SLINK                        policy<{'arm64': 'm', 'armhf': 'm'}>
-CONFIG_SPI_TEGRA210_QUAD                        policy<{'arm64': 'm', 'armhf': 'm'}>
+CONFIG_SPI_TEGRA210_QUAD                        policy<{'arm64': 'y', 'armhf': 'm'}>
 CONFIG_SPI_THUNDERX                             policy<{'arm64': 'm'}>
 CONFIG_SPI_TI_QSPI                              policy<{'armhf': 'm'}>
 CONFIG_SPI_TLE62X0                              policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 'riscv64': 'm', 's390x': '-'}>
@@ -13622,7 +13622,7 @@ CONFIG_TCG_TIS                                  policy<{'amd64': 'y', 'arm64': '
 CONFIG_TCG_TIS_CORE                             policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 'riscv64': 'y'}>
 CONFIG_TCG_TIS_I2C                              policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 'riscv64': 'm', 's390x': 'n'}>
 CONFIG_TCG_TIS_I2C_CR50                         policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 'riscv64': 'm', 's390x': 'n'}>
-CONFIG_TCG_TIS_SPI                              policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 'riscv64': 'm', 's390x': '-'}>
+CONFIG_TCG_TIS_SPI                              policy<{'amd64': 'm', 'arm64': 'y', 'armhf': 'm', 'ppc64el': 'm', 'riscv64': 'm', 's390x': '-'}>
 CONFIG_TCG_TIS_SPI_CR50                         policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 'riscv64': 'y'}>
 CONFIG_TCG_TIS_ST33ZP24                         policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 'riscv64': 'm'}>
 CONFIG_TCG_TIS_ST33ZP24_I2C                     policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 'riscv64': 'm', 's390x': 'n'}>