diff mbox series

[Hirsute,1/2] UBUNTU: [Config] enable ARCH_TEGRA and all Tegra SOC's

Message ID 20210310201537.926-2-kamal@canonical.com
State New
Headers show
Series Enable Tegra support in arm64 for NVIDIA Jetson | expand

Commit Message

Kamal Mostafa March 10, 2021, 8:15 p.m. UTC 
BugLink: https://bugs.launchpad.net/bugs/1918471

Enable ARCH_TEGRA for arm64 (was already enabled for armhf), and all
Tegra SOC support modules.

Also switch SERIAL_TEGRA_TCU to =y to support SERIAL_TEGRA_TCU_CONSOLE.

Signed-off-by: Kamal Mostafa <kamal@canonical.com>
---
 .../abi/5.11.0-10.11/armhf/generic.modules    |   1 -
 debian.master/config/annotations              | 149 +++++++++---------
 .../config/arm64/config.common.arm64          |   2 +-
 debian.master/config/config.common.ubuntu     |  21 ++-
 4 files changed, 96 insertions(+), 77 deletions(-)
diff mbox series

Patch

diff --git a/debian.master/abi/5.11.0-10.11/armhf/generic.modules b/debian.master/abi/5.11.0-10.11/armhf/generic.modules
index 5306a2facc8b..5b751c087394 100644
--- a/debian.master/abi/5.11.0-10.11/armhf/generic.modules
+++ b/debian.master/abi/5.11.0-10.11/armhf/generic.modules
@@ -5682,7 +5682,6 @@  tegra-bpmp-thermal
 tegra-drm
 tegra-gmi
 tegra-kbc
-tegra-tcu
 tegra-vde
 tegra-video
 tegra-xudc
diff --git a/debian.master/config/annotations b/debian.master/config/annotations
index e8e7972ab7f2..d8b3e8df96a2 100644
--- a/debian.master/config/annotations
+++ b/debian.master/config/annotations
@@ -690,7 +690,7 @@  CONFIG_QCOM_EBI2                                policy<{'arm64': 'y', 'armhf': '
 CONFIG_SIMPLE_PM_BUS                            policy<{'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y'}>
 CONFIG_SUN50I_DE2_BUS                           policy<{'arm64': 'y'}>
 CONFIG_SUNXI_RSB                                policy<{'arm64': 'm'}>
-CONFIG_TEGRA_GMI                                policy<{'armhf-generic': 'm'}>
+CONFIG_TEGRA_GMI                                policy<{'arm64': 'm', 'armhf-generic': 'm'}>
 CONFIG_TI_SYSC                                  policy<{'armhf': 'y'}>
 CONFIG_UNIPHIER_SYSTEM_BUS                      policy<{'armhf': 'y'}>
 CONFIG_VEXPRESS_CONFIG                          policy<{'arm64': 'y', 'armhf': 'y'}>
@@ -805,8 +805,9 @@  CONFIG_SERIAL_KGDB_NMI                          policy<{'amd64': 'y', 'arm64': '
 CONFIG_SERIAL_MESON                             policy<{'arm64': 'y', 'armhf': 'y'}>
 CONFIG_SERIAL_MESON_CONSOLE                     policy<{'arm64': 'y', 'armhf': 'y'}>
 CONFIG_SERIAL_SAMSUNG                           policy<{'armhf': 'm'}>
-CONFIG_SERIAL_TEGRA                             policy<{'armhf-generic': 'm'}>
-CONFIG_SERIAL_TEGRA_TCU                         policy<{'armhf-generic': 'm'}>
+CONFIG_SERIAL_TEGRA                             policy<{'arm64': 'm', 'armhf-generic': 'm'}>
+CONFIG_SERIAL_TEGRA_TCU                         policy<{'arm64': 'y', 'armhf-generic': 'y'}>
+CONFIG_SERIAL_TEGRA_TCU_CONSOLE                 policy<{'arm64-generic': 'y', 'armhf-generic': 'y'}>
 CONFIG_SERIAL_MAX3100                           policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm'}>
 CONFIG_SERIAL_MAX310X                           policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y'}>
 CONFIG_SERIAL_IMX                               policy<{'arm64': 'y', 'armhf-generic': 'y'}>
@@ -878,7 +879,7 @@  CONFIG_SERIAL_8250_MT6577                       policy<{'arm64': 'y', 'armhf': '
 CONFIG_SERIAL_8250_UNIPHIER                     policy<{'armhf': 'm'}>
 CONFIG_SERIAL_8250_LPSS                         policy<{'amd64': 'm'}>
 CONFIG_SERIAL_8250_MID                          policy<{'amd64': 'm'}>
-CONFIG_SERIAL_8250_TEGRA                        policy<{'armhf-generic': 'y'}>
+CONFIG_SERIAL_8250_TEGRA                        policy<{'arm64': 'y', 'armhf-generic': 'y'}>
 CONFIG_SERIAL_OF_PLATFORM                       policy<{'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y'}>
 
 # Menu: Device Drivers >> Character devices >> Enable TTY >> Serial drivers >> 8250/16550 and compatible serial support >> Extended 8250/16550 serial driver options
@@ -990,7 +991,7 @@  CONFIG_MESON6_TIMER                             policy<{'armhf': 'y'}>
 CONFIG_ORION_TIMER                              policy<{'armhf': 'y'}>
 CONFIG_OWL_TIMER                                policy<{'arm64': 'y', 'armhf': 'y'}>
 CONFIG_RDA_TIMER                                policy<{'armhf': 'y'}>
-CONFIG_TEGRA_TIMER                              policy<{'armhf-generic': 'y'}>
+CONFIG_TEGRA_TIMER                              policy<{'arm64': 'y', 'armhf-generic': 'y'}>
 CONFIG_NPCM7XX_TIMER                            policy<{'armhf': 'y'}>
 CONFIG_CLKSRC_TI_32K                            policy<{'armhf': 'y'}>
 CONFIG_ARM_ARCH_TIMER_EVTSTREAM                 policy<{'arm64': 'y', 'armhf': 'y'}>
@@ -1380,7 +1381,7 @@  CONFIG_OWL_DMA                                  policy<{'arm64': 'm', 'armhf': '
 CONFIG_PL330_DMA                                policy<{'arm64': 'm', 'armhf': 'm'}>
 CONFIG_PLX_DMA                                  policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm'}>
 CONFIG_SPRD_DMA                                 policy<{'arm64': 'm'}>
-CONFIG_TEGRA20_APB_DMA                          policy<{'armhf-generic': 'y'}>
+CONFIG_TEGRA20_APB_DMA                          policy<{'arm64': 'y', 'armhf-generic': 'y'}>
 CONFIG_UNIPHIER_MDMAC                           policy<{'armhf': 'm'}>
 CONFIG_UNIPHIER_XDMAC                           policy<{'armhf': 'm'}>
 CONFIG_XGENE_DMA                                policy<{'arm64': 'm'}>
@@ -1708,7 +1709,7 @@  CONFIG_GPIO_SIFIVE                              policy<{'arm64': 'y', 'armhf': '
 CONFIG_GPIO_SIOX                                policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 's390x': 'n'}>
 CONFIG_GPIO_SPRD                                policy<{'arm64': 'm'}>
 CONFIG_GPIO_SYSCON                              policy<{'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm'}>
-CONFIG_GPIO_TEGRA                               policy<{'armhf-generic': 'y'}>
+CONFIG_GPIO_TEGRA                               policy<{'arm64': 'y', 'armhf-generic': 'y'}>
 CONFIG_GPIO_TS4800                              policy<{'armhf-generic': 'm'}>
 CONFIG_GPIO_THUNDERX                            policy<{'arm64': 'm'}>
 CONFIG_GPIO_UNIPHIER                            policy<{'armhf': 'm'}>
@@ -1802,7 +1803,7 @@  CONFIG_DEVFREQ_GOV_PASSIVE                      policy<{'amd64': 'y', 'arm64': '
 CONFIG_ARM_EXYNOS_BUS_DEVFREQ                   policy<{'armhf': 'y'}>
 CONFIG_ARM_IMX_BUS_DEVFREQ                      policy<{'arm64': 'm', 'armhf-generic': 'm'}>
 CONFIG_ARM_IMX8M_DDRC_DEVFREQ                   policy<{'arm64': 'm', 'armhf-generic': 'm'}>
-CONFIG_ARM_TEGRA_DEVFREQ                        policy<{'armhf-generic': 'm'}>
+CONFIG_ARM_TEGRA_DEVFREQ                        policy<{'arm64': 'm', 'armhf-generic': 'm'}>
 CONFIG_ARM_RK3399_DMC_DEVFREQ                   policy<{'arm64': 'm', 'armhf': 'm'}>
 
 # Menu: Device Drivers >> Generic Dynamic Voltage and Frequency Scaling (DVFS) support >> DEVFREQ-Event device Support
@@ -1832,8 +1833,8 @@  CONFIG_IDLE_INJECT                              policy<{'amd64': 'y', 'arm64': '
 CONFIG_VGA_ARB                                  policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y'}>
 CONFIG_VGA_ARB_MAX_GPUS                         policy<{'amd64': '16', 'arm64': '16', 'armhf': '16', 'ppc64el': '16'}>
 CONFIG_VGA_SWITCHEROO                           policy<{'amd64': 'y'}>
-CONFIG_TEGRA_HOST1X                             policy<{'armhf-generic': 'm'}>
-CONFIG_TEGRA_HOST1X_FIREWALL                    policy<{'armhf-generic': 'y'}>
+CONFIG_TEGRA_HOST1X                             policy<{'arm64': 'm', 'armhf-generic': 'm'}>
+CONFIG_TEGRA_HOST1X_FIREWALL                    policy<{'arm64': 'y', 'armhf-generic': 'y'}>
 CONFIG_IMX_IPUV3_CORE                           policy<{'armhf': 'm'}>
 CONFIG_DRM_DEBUG_DP_MST_TOPOLOGY_REFS           policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'ppc64el': 'n', 's390x': 'n'}>
 CONFIG_DRM_XEN                                  policy<{'amd64': 'y', 'arm64': 'y'}>
@@ -1951,9 +1952,9 @@  CONFIG_DRM_QXL                                  policy<{'amd64': 'm', 'arm64': '
 CONFIG_DRM_BOCHS                                policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 's390x': 'm'}>
 CONFIG_DRM_VIRTIO_GPU                           policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 's390x': 'm'}>
 CONFIG_DRM_FSL_DCU                              policy<{'armhf': 'm'}>
-CONFIG_DRM_TEGRA                                policy<{'armhf-generic': 'm'}>
-CONFIG_DRM_TEGRA_DEBUG                          policy<{'armhf-generic': 'n'}>
-CONFIG_DRM_TEGRA_STAGING                        policy<{'armhf-generic': 'y'}>
+CONFIG_DRM_TEGRA                                policy<{'arm64': 'm', 'armhf-generic': 'm'}>
+CONFIG_DRM_TEGRA_DEBUG                          policy<{'arm64': 'n', 'armhf-generic': 'n'}>
+CONFIG_DRM_TEGRA_STAGING                        policy<{'arm64': 'y', 'armhf-generic': 'y'}>
 CONFIG_DRM_STM                                  policy<{'armhf': 'm'}>
 CONFIG_DRM_STM_DSI                              policy<{'armhf': 'm'}>
 CONFIG_DRM_STI                                  policy<{'armhf': 'n'}>
@@ -2223,7 +2224,7 @@  CONFIG_DRM_MSM_DSI_7NM_PHY                      policy<{'arm64': 'y', 'armhf': '
 # Menu: Device Drivers >> Graphics support >> Direct Rendering Manager (XFree86 4.1.0 and higher DRI support) >> Nouveau (NVIDIA) cards
 CONFIG_DRM_NOUVEAU                              policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 's390x': 'n'}>
 CONFIG_NOUVEAU_LEGACY_CTX_SUPPORT               policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'ppc64el': 'n'}>
-CONFIG_NOUVEAU_PLATFORM_DRIVER                  policy<{'armhf-generic': 'y'}>
+CONFIG_NOUVEAU_PLATFORM_DRIVER                  policy<{'arm64': 'y', 'armhf-generic': 'y'}>
 CONFIG_NOUVEAU_DEBUG                            policy<{'amd64': '5', 'arm64': '5', 'armhf': '5', 'ppc64el': '5'}>
 CONFIG_NOUVEAU_DEBUG_DEFAULT                    policy<{'amd64': '3', 'arm64': '3', 'armhf': '3', 'ppc64el': '3'}>
 CONFIG_NOUVEAU_DEBUG_MMU                        policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'ppc64el': 'n'}>
@@ -2412,7 +2413,7 @@  CONFIG_CEC_MESON_AO                             policy<{'arm64': 'm', 'armhf': '
 CONFIG_CEC_MESON_G12A_AO                        policy<{'arm64': 'm', 'armhf': 'm'}>
 CONFIG_CEC_GPIO                                 policy<{'amd64-lowlatency': 'm'}>
 CONFIG_CEC_SAMSUNG_S5P                          policy<{'armhf': 'm'}>
-CONFIG_CEC_TEGRA                                policy<{'armhf-generic': 'm'}>
+CONFIG_CEC_TEGRA                                policy<{'arm64': 'm', 'armhf-generic': 'm'}>
 CONFIG_CEC_SECO                                 policy<{'amd64': 'm'}>
 CONFIG_CEC_SECO_RC                              policy<{'amd64': 'y'}>
 CONFIG_USB_PULSE8_CEC                           policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm'}>
@@ -2905,8 +2906,8 @@  CONFIG_I2C_SH_MOBILE                            policy<{'arm64': 'm', 'armhf': '
 CONFIG_I2C_SIMTEC                               policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 's390x': 'n'}>
 CONFIG_I2C_SPRD                                 policy<{'arm64': 'y'}>
 CONFIG_I2C_SYNQUACER                            policy<{'arm64': 'm'}>
-CONFIG_I2C_TEGRA                                policy<{'armhf-generic': 'm'}>
-CONFIG_I2C_TEGRA_BPMP                           policy<{'armhf-generic': 'm'}>
+CONFIG_I2C_TEGRA                                policy<{'arm64': 'm', 'armhf-generic': 'm'}>
+CONFIG_I2C_TEGRA_BPMP                           policy<{'arm64': 'm', 'armhf-generic': 'm'}>
 CONFIG_I2C_UNIPHIER                             policy<{'armhf': 'n'}>
 CONFIG_I2C_UNIPHIER_F                           policy<{'armhf': 'n'}>
 CONFIG_I2C_VERSATILE                            policy<{'arm64': 'm', 'armhf': 'm'}>
@@ -2967,7 +2968,7 @@  CONFIG_OMAP_IOMMU_DEBUG                         policy<{'armhf': 'n'}>
 CONFIG_ROCKCHIP_IOMMU                           policy<{'arm64': 'y', 'armhf': 'y'}>
 CONFIG_SUN50I_IOMMU                             policy<{'arm64': 'y'}>
 CONFIG_TEGRA_IOMMU_GART                         policy<{'armhf-generic': 'y'}>
-CONFIG_TEGRA_IOMMU_SMMU                         policy<{'armhf-generic': 'y'}>
+CONFIG_TEGRA_IOMMU_SMMU                         policy<{'arm64': 'y', 'armhf-generic': 'y'}>
 CONFIG_EXYNOS_IOMMU                             policy<{'armhf': 'y'}>
 CONFIG_EXYNOS_IOMMU_DEBUG                       policy<{'armhf': 'n'}>
 CONFIG_IPMMU_VMSA                               policy<{'arm64': 'n', 'armhf': 'y'}>
@@ -3589,7 +3590,7 @@  CONFIG_KEYBOARD_SNVS_PWRKEY                     policy<{'arm64': 'm', 'armhf-gen
 CONFIG_KEYBOARD_IMX                             policy<{'arm64': 'm', 'armhf-generic': 'm'}>
 CONFIG_KEYBOARD_IMX_SC_KEY                      policy<{'arm64': 'm', 'armhf-generic': 'm'}>
 CONFIG_KEYBOARD_NEWTON                          policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm'}>
-CONFIG_KEYBOARD_TEGRA                           policy<{'armhf-generic': 'm'}>
+CONFIG_KEYBOARD_TEGRA                           policy<{'arm64': 'm', 'armhf-generic': 'm'}>
 CONFIG_KEYBOARD_OPENCORES                       policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm'}>
 CONFIG_KEYBOARD_PMIC8XXX                        policy<{'armhf': 'm'}>
 CONFIG_KEYBOARD_SAMSUNG                         policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm'}>
@@ -4084,7 +4085,7 @@  CONFIG_MMC_SDHCI_OF_SPARX5                      policy<{'arm64': 'm'}>
 CONFIG_MMC_SDHCI_CADENCE                        policy<{'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm'}>
 CONFIG_MMC_SDHCI_ESDHC_IMX                      policy<{'arm64': 'm', 'armhf-generic': 'y'}>
 CONFIG_MMC_SDHCI_DOVE                           policy<{'armhf': 'm'}>
-CONFIG_MMC_SDHCI_TEGRA                          policy<{'armhf-generic': 'm'}>
+CONFIG_MMC_SDHCI_TEGRA                          policy<{'arm64': 'm', 'armhf-generic': 'm'}>
 CONFIG_MMC_SDHCI_PXAV3                          policy<{'arm64': 'm', 'armhf': 'm'}>
 CONFIG_MMC_SDHCI_F_SDH30                        policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm'}>
 CONFIG_MMC_SDHCI_MILBEAUT                       policy<{'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm'}>
@@ -4143,7 +4144,7 @@  CONFIG_HI3660_MBOX                              policy<{'arm64': 'm', 'armhf': '
 CONFIG_HI6220_MBOX                              policy<{'arm64': 'm', 'armhf': 'm'}>
 CONFIG_MAILBOX_TEST                             policy<{'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm'}>
 CONFIG_QCOM_APCS_IPC                            policy<{'arm64': 'm', 'armhf': 'm'}>
-CONFIG_TEGRA_HSP_MBOX                           policy<{'armhf-generic': 'y'}>
+CONFIG_TEGRA_HSP_MBOX                           policy<{'arm64': 'y', 'armhf-generic': 'y'}>
 CONFIG_XGENE_SLIMPRO_MBOX                       policy<{'arm64': 'm'}>
 CONFIG_BCM_PDC_MBOX                             policy<{'arm64': 'm'}>
 CONFIG_BCM_FLEXRM_MBOX                          policy<{'arm64': 'm'}>
@@ -4172,7 +4173,7 @@  CONFIG_EXYNOS_SROM                              policy<{'armhf': 'y'}>
 
 # Menu: Device Drivers >> Memory Controller drivers >> NVIDIA Tegra Memory Controller support
 CONFIG_TEGRA20_EMC                              policy<{'armhf-generic': 'y'}>
-CONFIG_TEGRA_MC                                 policy<{'armhf-generic': 'y'}>
+CONFIG_TEGRA_MC                                 policy<{'arm64': 'y', 'armhf-generic': 'y'}>
 CONFIG_TEGRA30_EMC                              policy<{'armhf-generic': 'y'}>
 CONFIG_TEGRA124_EMC                             policy<{'armhf-generic': 'y'}>
 
@@ -4284,7 +4285,7 @@  CONFIG_MTD_NAND_HISI504                         policy<{'arm64': 'm', 'armhf': '
 CONFIG_MTD_NAND_QCOM                            policy<{'arm64': 'm', 'armhf': 'm'}>
 CONFIG_MTD_NAND_MTK                             policy<{'arm64': 'm', 'armhf': 'm'}>
 CONFIG_MTD_NAND_MXIC                            policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm'}>
-CONFIG_MTD_NAND_TEGRA                           policy<{'armhf-generic': 'm'}>
+CONFIG_MTD_NAND_TEGRA                           policy<{'arm64': 'm', 'armhf-generic': 'm'}>
 CONFIG_MTD_NAND_MESON                           policy<{'arm64': 'm', 'armhf': 'm'}>
 CONFIG_MTD_NAND_GPIO                            policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm'}>
 CONFIG_MTD_NAND_PLATFORM                        policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm'}>
@@ -6729,7 +6730,7 @@  CONFIG_PCI_MVEBU                                policy<{'armhf': 'y'}>
 CONFIG_PCI_AARDVARK                             policy<{'arm64': 'y'}>
 CONFIG_PCIE_XILINX_NWL                          policy<{'arm64': 'y'}>
 CONFIG_PCI_FTPCI100                             policy<{'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y'}>
-CONFIG_PCI_TEGRA                                policy<{'armhf-generic': 'y'}>
+CONFIG_PCI_TEGRA                                policy<{'arm64': 'y', 'armhf-generic': 'y'}>
 CONFIG_PCI_RCAR_GEN2                            policy<{'armhf': 'y'}>
 CONFIG_PCIE_RCAR                                policy<{'arm64': 'y', 'armhf': 'y'}>
 CONFIG_PCIE_RCAR_HOST                           policy<{'arm64': 'y', 'armhf': 'y'}>
@@ -6891,7 +6892,7 @@  CONFIG_PHY_UNIPHIER_USB2                        policy<{'armhf': 'm'}>
 CONFIG_PHY_UNIPHIER_USB3                        policy<{'armhf': 'm'}>
 CONFIG_PHY_UNIPHIER_PCIE                        policy<{'armhf': 'm'}>
 CONFIG_PHY_UNIPHIER_AHCI                        policy<{'armhf': 'm'}>
-CONFIG_PHY_TEGRA_XUSB                           policy<{'armhf-generic': 'm'}>
+CONFIG_PHY_TEGRA_XUSB                           policy<{'arm64': 'm', 'armhf-generic': 'm'}>
 CONFIG_PHY_DM816X_USB                           policy<{'armhf': 'm'}>
 CONFIG_PHY_AM654_SERDES                         policy<{'arm64': 'm'}>
 CONFIG_PHY_J721E_WIZ                            policy<{'arm64': 'm'}>
@@ -7332,7 +7333,7 @@  CONFIG_PWM_SL28CPLD                             policy<{'arm64': 'm'}>
 CONFIG_PWM_SPRD                                 policy<{'arm64': 'm'}>
 CONFIG_PWM_STMPE                                policy<{'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y'}>
 CONFIG_PWM_SUN4I                                policy<{'arm64': 'm'}>
-CONFIG_PWM_TEGRA                                policy<{'armhf-generic': 'm'}>
+CONFIG_PWM_TEGRA                                policy<{'arm64': 'm', 'armhf-generic': 'm'}>
 CONFIG_PWM_TIECAP                               policy<{'arm64': 'm', 'armhf-generic': 'm', 'armhf-generic-lpae': 'n'}>
 CONFIG_PWM_TIEHRPWM                             policy<{'arm64': 'm', 'armhf-generic': 'm', 'armhf-generic-lpae': 'n'}>
 CONFIG_PWM_TWL                                  policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm'}>
@@ -7489,7 +7490,7 @@  CONFIG_RTC_DRV_FTRTC010                         policy<{'amd64': 'm', 'arm64': '
 CONFIG_RTC_DRV_PCAP                             policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm'}>
 CONFIG_RTC_DRV_MC13XXX                          policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm'}>
 CONFIG_RTC_DRV_PM8XXX                           policy<{'arm64': 'm', 'armhf': 'm'}>
-CONFIG_RTC_DRV_TEGRA                            policy<{'armhf-generic': 'm'}>
+CONFIG_RTC_DRV_TEGRA                            policy<{'arm64': 'm', 'armhf-generic': 'm'}>
 CONFIG_RTC_DRV_MXC                              policy<{'arm64': 'm', 'armhf-generic': 'm'}>
 CONFIG_RTC_DRV_MXC_V2                           policy<{'arm64': 'm', 'armhf-generic': 'm'}>
 CONFIG_RTC_DRV_SNVS                             policy<{'arm64': 'm', 'armhf-generic': 'm'}>
@@ -8050,9 +8051,9 @@  CONFIG_SPI_SUN4I                                policy<{'arm64': 'n'}>
 CONFIG_SPI_SUN6I                                policy<{'arm64': 'm'}>
 CONFIG_SPI_SYNQUACER                            policy<{'arm64': 'm'}>
 CONFIG_SPI_MXIC                                 policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm'}>
-CONFIG_SPI_TEGRA114                             policy<{'armhf-generic': 'm'}>
-CONFIG_SPI_TEGRA20_SFLASH                       policy<{'armhf-generic': 'm'}>
-CONFIG_SPI_TEGRA20_SLINK                        policy<{'armhf-generic': 'm'}>
+CONFIG_SPI_TEGRA114                             policy<{'arm64': 'm', 'armhf-generic': 'm'}>
+CONFIG_SPI_TEGRA20_SFLASH                       policy<{'arm64': 'm', 'armhf-generic': 'm'}>
+CONFIG_SPI_TEGRA20_SLINK                        policy<{'arm64': 'm', 'armhf-generic': 'm'}>
 CONFIG_SPI_THUNDERX                             policy<{'arm64': 'm'}>
 CONFIG_SPI_UNIPHIER                             policy<{'armhf': 'm'}>
 CONFIG_SPI_XCOMM                                policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm'}>
@@ -8095,7 +8096,7 @@  CONFIG_AHCI_CEVA                                policy<{'arm64': 'm', 'armhf': '
 CONFIG_AHCI_MTK                                 policy<{'arm64': 'm', 'armhf': 'm'}>
 CONFIG_AHCI_MVEBU                               policy<{'arm64': 'm', 'armhf': 'm'}>
 CONFIG_AHCI_SUNXI                               policy<{'arm64': 'n'}>
-CONFIG_AHCI_TEGRA                               policy<{'armhf-generic': 'm'}>
+CONFIG_AHCI_TEGRA                               policy<{'arm64': 'm', 'armhf-generic': 'm'}>
 CONFIG_AHCI_XGENE                               policy<{'arm64': 'm'}>
 CONFIG_AHCI_QORIQ                               policy<{'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm'}>
 CONFIG_SATA_AHCI_SEATTLE                        policy<{'arm64': 'm'}>
@@ -8622,27 +8623,27 @@  CONFIG_SND_SOC_MIKROE_PROTO                     policy<{'arm64': 'm', 'armhf': '
 # Menu: Device Drivers >> Sound card support >> Advanced Linux Sound Architecture >> ALSA for SoC audio support >> SoC Audio for the Intel PXA2xx chip
 
 # Menu: Device Drivers >> Sound card support >> Advanced Linux Sound Architecture >> ALSA for SoC audio support >> SoC Audio for the Tegra System-on-Chip
-CONFIG_SND_SOC_TEGRA                            policy<{'armhf-generic': 'm'}>
-CONFIG_SND_SOC_TEGRA20_AC97                     policy<{'armhf-generic': 'm'}>
-CONFIG_SND_SOC_TEGRA20_DAS                      policy<{'armhf-generic': 'm'}>
-CONFIG_SND_SOC_TEGRA20_I2S                      policy<{'armhf-generic': 'm'}>
-CONFIG_SND_SOC_TEGRA20_SPDIF                    policy<{'armhf-generic': 'm'}>
-CONFIG_SND_SOC_TEGRA30_AHUB                     policy<{'armhf-generic': 'm'}>
-CONFIG_SND_SOC_TEGRA30_I2S                      policy<{'armhf-generic': 'm'}>
-CONFIG_SND_SOC_TEGRA210_AHUB                    policy<{'armhf-generic': 'm'}>
-CONFIG_SND_SOC_TEGRA210_DMIC                    policy<{'armhf-generic': 'm'}>
-CONFIG_SND_SOC_TEGRA210_I2S                     policy<{'armhf-generic': 'm'}>
-CONFIG_SND_SOC_TEGRA186_DSPK                    policy<{'armhf-generic': 'm'}>
-CONFIG_SND_SOC_TEGRA210_ADMAIF                  policy<{'armhf-generic': 'm'}>
-CONFIG_SND_SOC_TEGRA_RT5640                     policy<{'armhf-generic': 'm'}>
-CONFIG_SND_SOC_TEGRA_WM8753                     policy<{'armhf-generic': 'm'}>
-CONFIG_SND_SOC_TEGRA_WM8903                     policy<{'armhf-generic': 'm'}>
-CONFIG_SND_SOC_TEGRA_WM9712                     policy<{'armhf-generic': 'm'}>
-CONFIG_SND_SOC_TEGRA_TRIMSLICE                  policy<{'armhf-generic': 'm'}>
-CONFIG_SND_SOC_TEGRA_ALC5632                    policy<{'armhf-generic': 'm'}>
-CONFIG_SND_SOC_TEGRA_MAX98090                   policy<{'armhf-generic': 'm'}>
-CONFIG_SND_SOC_TEGRA_RT5677                     policy<{'armhf-generic': 'm'}>
-CONFIG_SND_SOC_TEGRA_SGTL5000                   policy<{'armhf-generic': 'm'}>
+CONFIG_SND_SOC_TEGRA                            policy<{'arm64': 'm', 'armhf-generic': 'm'}>
+CONFIG_SND_SOC_TEGRA20_AC97                     policy<{'arm64': 'm', 'armhf-generic': 'm'}>
+CONFIG_SND_SOC_TEGRA20_DAS                      policy<{'arm64': 'm', 'armhf-generic': 'm'}>
+CONFIG_SND_SOC_TEGRA20_I2S                      policy<{'arm64': 'm', 'armhf-generic': 'm'}>
+CONFIG_SND_SOC_TEGRA20_SPDIF                    policy<{'arm64': 'm', 'armhf-generic': 'm'}>
+CONFIG_SND_SOC_TEGRA30_AHUB                     policy<{'arm64': 'm', 'armhf-generic': 'm'}>
+CONFIG_SND_SOC_TEGRA30_I2S                      policy<{'arm64': 'm', 'armhf-generic': 'm'}>
+CONFIG_SND_SOC_TEGRA210_AHUB                    policy<{'arm64': 'm', 'armhf-generic': 'm'}>
+CONFIG_SND_SOC_TEGRA210_DMIC                    policy<{'arm64': 'm', 'armhf-generic': 'm'}>
+CONFIG_SND_SOC_TEGRA210_I2S                     policy<{'arm64': 'm', 'armhf-generic': 'm'}>
+CONFIG_SND_SOC_TEGRA186_DSPK                    policy<{'arm64': 'm', 'armhf-generic': 'm'}>
+CONFIG_SND_SOC_TEGRA210_ADMAIF                  policy<{'arm64': 'm', 'armhf-generic': 'm'}>
+CONFIG_SND_SOC_TEGRA_RT5640                     policy<{'arm64': 'm', 'armhf-generic': 'm'}>
+CONFIG_SND_SOC_TEGRA_WM8753                     policy<{'arm64': 'm', 'armhf-generic': 'm'}>
+CONFIG_SND_SOC_TEGRA_WM8903                     policy<{'arm64': 'm', 'armhf-generic': 'm'}>
+CONFIG_SND_SOC_TEGRA_WM9712                     policy<{'arm64': 'm', 'armhf-generic': 'm'}>
+CONFIG_SND_SOC_TEGRA_TRIMSLICE                  policy<{'arm64': 'm', 'armhf-generic': 'm'}>
+CONFIG_SND_SOC_TEGRA_ALC5632                    policy<{'arm64': 'm', 'armhf-generic': 'm'}>
+CONFIG_SND_SOC_TEGRA_MAX98090                   policy<{'arm64': 'm', 'armhf-generic': 'm'}>
+CONFIG_SND_SOC_TEGRA_RT5677                     policy<{'arm64': 'm', 'armhf-generic': 'm'}>
+CONFIG_SND_SOC_TEGRA_SGTL5000                   policy<{'arm64': 'm', 'armhf-generic': 'm'}>
 
 # Menu: Device Drivers >> Sound card support >> Advanced Linux Sound Architecture >> ALSA for SoC audio support >> SoC Audio support for Renesas SoCs
 CONFIG_SND_SOC_SH4_FSI                          policy<{'arm64': 'm', 'armhf': 'm'}>
@@ -8731,7 +8732,7 @@  CONFIG_SND_AC97_POWER_SAVE_DEFAULT              policy<{'amd64': '0', 'arm64': '
 
 # Menu: Device Drivers >> Sound card support >> Advanced Linux Sound Architecture >> HD-Audio
 CONFIG_SND_HDA_INTEL                            policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm'}>
-CONFIG_SND_HDA_TEGRA                            policy<{'armhf-generic': 'm'}>
+CONFIG_SND_HDA_TEGRA                            policy<{'arm64': 'm', 'armhf-generic': 'm'}>
 CONFIG_SND_HDA_HWDEP                            policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y'}>
 CONFIG_SND_HDA_RECONFIG                         policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y'}>
 CONFIG_SND_HDA_INPUT_BEEP                       policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y'}>
@@ -9153,11 +9154,11 @@  CONFIG_VIDEO_OMAP4                              policy<{'armhf-generic': 'm'}>
 CONFIG_VIDEO_ROCKCHIP_VDEC                      policy<{'arm64': 'm', 'armhf': 'm'}>
 CONFIG_VIDEO_SUNXI                              policy<{'arm64': 'y'}>
 CONFIG_VIDEO_SUNXI_CEDRUS                       policy<{'arm64': 'm'}>
-CONFIG_TEGRA_VDE                                policy<{'armhf-generic': 'm'}>
+CONFIG_TEGRA_VDE                                policy<{'arm64': 'm', 'armhf-generic': 'm'}>
 CONFIG_VIDEO_ZORAN                              policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm'}>
 CONFIG_VIDEO_ZORAN_DC30                         policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm'}>
-CONFIG_VIDEO_TEGRA                              policy<{'armhf-generic': 'm'}>
-CONFIG_VIDEO_TEGRA_TPG                          policy<{'armhf-generic': 'y'}>
+CONFIG_VIDEO_TEGRA                              policy<{'arm64': 'm', 'armhf-generic': 'm'}>
+CONFIG_VIDEO_TEGRA_TPG                          policy<{'arm64': 'y', 'armhf-generic': 'y'}>
 CONFIG_VIDEO_IPU3_IMGU                          policy<{'amd64': 'm'}>
 
 # Menu: Device Drivers >> Staging drivers >> Media staging drivers >> Enable support to Intel Atom ISP camera drivers
@@ -9188,11 +9189,11 @@  CONFIG_VIDEO_IMX_CSI                            policy<{'armhf-generic': 'm'}>
 CONFIG_VIDEO_IMX7_CSI                           policy<{'armhf-generic': 'm'}>
 
 # Menu: Device Drivers >> Staging drivers >> NV Tegra Embedded Controller SMBus Interface
-CONFIG_MFD_NVEC                                 policy<{'armhf-generic': 'm'}>
-CONFIG_KEYBOARD_NVEC                            policy<{'armhf-generic': 'm'}>
-CONFIG_SERIO_NVEC_PS2                           policy<{'armhf-generic': 'm'}>
-CONFIG_NVEC_POWER                               policy<{'armhf-generic': 'm'}>
-CONFIG_NVEC_PAZ00                               policy<{'armhf-generic': 'm'}>
+CONFIG_MFD_NVEC                                 policy<{'arm64': 'm', 'armhf-generic': 'm'}>
+CONFIG_KEYBOARD_NVEC                            policy<{'arm64': 'm', 'armhf-generic': 'm'}>
+CONFIG_SERIO_NVEC_PS2                           policy<{'arm64': 'm', 'armhf-generic': 'm'}>
+CONFIG_NVEC_POWER                               policy<{'arm64': 'm', 'armhf-generic': 'm'}>
+CONFIG_NVEC_PAZ00                               policy<{'arm64': 'm', 'armhf-generic': 'm'}>
 
 # Menu: Device Drivers >> Staging drivers >> Support for rtllib wireless devices
 CONFIG_RTLLIB                                   policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm'}>
@@ -9322,8 +9323,8 @@  CONFIG_INT340X_THERMAL                          policy<{'amd64': 'm'}>
 CONFIG_INT3406_THERMAL                          policy<{'amd64': 'm'}>
 
 # Menu: Device Drivers >> Thermal drivers >> NVIDIA Tegra thermal drivers
-CONFIG_TEGRA_SOCTHERM                           policy<{'armhf-generic': 'n'}>
-CONFIG_TEGRA_BPMP_THERMAL                       policy<{'armhf-generic': 'm'}>
+CONFIG_TEGRA_SOCTHERM                           policy<{'arm64': 'n', 'armhf-generic': 'n'}>
+CONFIG_TEGRA_BPMP_THERMAL                       policy<{'arm64': 'm', 'armhf-generic': 'm'}>
 
 # Menu: Device Drivers >> Thermal drivers >> Qualcomm thermal drivers
 CONFIG_QCOM_TSENS                               policy<{'arm64-generic': 'm', 'arm64-generic-64k': 'm', 'armhf': 'm'}>
@@ -9481,7 +9482,7 @@  CONFIG_USB_EHCI_FSL                             policy<{'amd64': 'm', 'arm64': '
 CONFIG_USB_EHCI_HCD_NPCM7XX                     policy<{'armhf': 'm'}>
 CONFIG_USB_EHCI_HCD_OMAP                        policy<{'armhf': 'm'}>
 CONFIG_USB_EHCI_HCD_ORION                       policy<{'arm64': 'y', 'armhf': 'y'}>
-CONFIG_USB_EHCI_TEGRA                           policy<{'armhf-generic': 'm'}>
+CONFIG_USB_EHCI_TEGRA                           policy<{'arm64': 'm', 'armhf-generic': 'm'}>
 CONFIG_USB_EHCI_HCD_PPC_OF                      policy<{'ppc64el': 'y'}>
 CONFIG_USB_EHCI_EXYNOS                          policy<{'armhf': 'y'}>
 CONFIG_USB_EHCI_HCD_PLATFORM                    policy<{'amd64': 'y', 'arm64': 'm', 'armhf': 'n', 'ppc64el': 'm'}>
@@ -9632,7 +9633,7 @@  CONFIG_USB_XHCI_HISTB                           policy<{'arm64': 'm', 'armhf': '
 CONFIG_USB_XHCI_MTK                             policy<{'arm64': 'm', 'armhf': 'm'}>
 CONFIG_USB_XHCI_MVEBU                           policy<{'arm64': 'm', 'armhf': 'm'}>
 CONFIG_USB_XHCI_RCAR                            policy<{'arm64': 'm', 'armhf': 'm'}>
-CONFIG_USB_XHCI_TEGRA                           policy<{'armhf-generic': 'm'}>
+CONFIG_USB_XHCI_TEGRA                           policy<{'arm64': 'm', 'armhf-generic': 'm'}>
 #
 CONFIG_USB_XHCI_HCD                             mark<ENFORCED> note<ensures USB 2.0/1.1 probe ordering> flag<REVIEW>
 CONFIG_USB_XHCI_DBGCAP                          note<LP:1730832>
@@ -9726,7 +9727,7 @@  CONFIG_USB_GOKU                                 policy<{'amd64': 'm', 'arm64': '
 CONFIG_USB_EG20T                                policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm'}>
 CONFIG_USB_GADGET_XILINX                        policy<{'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm'}>
 CONFIG_USB_MAX3420_UDC                          policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm'}>
-CONFIG_USB_TEGRA_XUDC                           policy<{'armhf-generic': 'm'}>
+CONFIG_USB_TEGRA_XUDC                           policy<{'arm64': 'm', 'armhf-generic': 'm'}>
 CONFIG_USB_ASPEED_VHUB                          policy<{'armhf': 'm'}>
 CONFIG_USB_DUMMY_HCD                            policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'ppc64el': 'n'}>
 #
@@ -9742,7 +9743,7 @@  CONFIG_TAHVO_USB                                policy<{'amd64': 'm', 'arm64': '
 CONFIG_TAHVO_USB_HOST_BY_DEFAULT                policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y'}>
 CONFIG_USB_ISP1301                              policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm'}>
 CONFIG_USB_MXS_PHY                              policy<{'arm64': 'y', 'armhf-generic': 'y'}>
-CONFIG_USB_TEGRA_PHY                            policy<{'armhf-generic': 'm'}>
+CONFIG_USB_TEGRA_PHY                            policy<{'arm64': 'm', 'armhf-generic': 'm'}>
 CONFIG_USB_ULPI                                 policy<{'arm64': 'y', 'armhf': 'y'}>
 #
 CONFIG_NOP_USB_XCEIV                            note<boot essential on omap/highbank>
@@ -10050,7 +10051,7 @@  CONFIG_IMX2_WDT                                 policy<{'arm64': 'm', 'armhf-gen
 CONFIG_IMX_SC_WDT                               policy<{'arm64': 'm', 'armhf-generic': 'm'}>
 CONFIG_IMX7ULP_WDT                              policy<{'arm64': 'm', 'armhf-generic': 'm'}>
 CONFIG_RETU_WATCHDOG                            policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm'}>
-CONFIG_TEGRA_WATCHDOG                           policy<{'armhf-generic': 'm'}>
+CONFIG_TEGRA_WATCHDOG                           policy<{'arm64': 'm', 'armhf-generic': 'm'}>
 CONFIG_QCOM_WDT                                 policy<{'arm64': 'm', 'armhf': 'm'}>
 CONFIG_MESON_GXBB_WATCHDOG                      policy<{'arm64': 'm', 'armhf': 'm'}>
 CONFIG_MESON_WATCHDOG                           policy<{'arm64': 'm', 'armhf': 'm'}>
@@ -10885,8 +10886,8 @@  CONFIG_GOOGLE_FIRMWARE                          policy<{'amd64': 'n', 'arm64': '
 # Menu: Firmware Drivers >> Google Firmware Drivers >> Coreboot Table Access
 
 # Menu: Firmware Drivers >> Tegra firmware driver
-CONFIG_TEGRA_IVC                                policy<{'armhf-generic': 'y'}>
-CONFIG_TEGRA_BPMP                               policy<{'armhf-generic': 'y'}>
+CONFIG_TEGRA_IVC                                policy<{'arm64': 'y', 'armhf-generic': 'y'}>
+CONFIG_TEGRA_BPMP                               policy<{'arm64': 'y', 'armhf-generic': 'y'}>
 
 # Menu: Firmware Drivers >> Zynq MPSoC Firmware Drivers
 CONFIG_ZYNQMP_FIRMWARE                          policy<{'arm64': 'y'}>
@@ -12787,7 +12788,7 @@  CONFIG_ARCH_QCOM                                policy<{'arm64': 'y', 'armhf': '
 CONFIG_ARCH_REALTEK                             policy<{'arm64': 'y', 'armhf': 'y'}>
 CONFIG_ARCH_RENESAS                             policy<{'arm64': 'y', 'armhf': 'y'}>
 CONFIG_ARCH_ROCKCHIP                            policy<{'arm64': 'y', 'armhf': 'y'}>
-CONFIG_ARCH_TEGRA                               policy<{'arm64': 'n', 'armhf-generic': 'y', 'armhf-generic-lpae': 'n'}>
+CONFIG_ARCH_TEGRA                               policy<{'arm64': 'y', 'armhf-generic': 'y', 'armhf-generic-lpae': 'n'}>
 CONFIG_ARCH_UNIPHIER                            policy<{'arm64': 'n', 'armhf': 'y'}>
 CONFIG_ARCH_VEXPRESS                            policy<{'arm64': 'y', 'armhf': 'y'}>
 CONFIG_ARCH_ZX                                  policy<{'arm64': 'n', 'armhf': 'n'}>
@@ -12910,7 +12911,7 @@  CONFIG_ARM_QCOM_CPUFREQ_NVMEM                   policy<{'arm64': 'm', 'armhf': '
 CONFIG_ARM_QCOM_CPUFREQ_HW                      policy<{'arm64': 'm', 'armhf': 'm'}>
 CONFIG_ARM_RASPBERRYPI_CPUFREQ                  policy<{'arm64': 'm'}>
 CONFIG_ARM_SCMI_CPUFREQ                         policy<{'arm64': 'm', 'armhf': 'm'}>
-CONFIG_ARM_TEGRA186_CPUFREQ                     policy<{'armhf-generic': 'm'}>
+CONFIG_ARM_TEGRA186_CPUFREQ                     policy<{'arm64': 'm', 'armhf-generic': 'm'}>
 CONFIG_ARM_TI_CPUFREQ                           policy<{'armhf': 'y'}>
 CONFIG_POWERNV_CPUFREQ                          policy<{'ppc64el': 'y'}>
 CONFIG_QORIQ_CPUFREQ                            policy<{'arm64': 'm'}>
@@ -12954,8 +12955,8 @@  CONFIG_ARM_ARMADA_37XX_CPUFREQ                  policy<{'arm64': 'm', 'armhf': '
 CONFIG_ARM_ARMADA_8K_CPUFREQ                    policy<{'arm64': 'm', 'armhf': 'm'}>
 CONFIG_ARM_HIGHBANK_CPUFREQ                     policy<{'armhf': 'm'}>
 CONFIG_ARM_IMX_CPUFREQ_DT                       policy<{'arm64': 'm', 'armhf-generic': 'm'}>
-CONFIG_ARM_TEGRA20_CPUFREQ                      policy<{'armhf-generic': 'y'}>
-CONFIG_ARM_TEGRA124_CPUFREQ                     policy<{'armhf-generic': 'y'}>
+CONFIG_ARM_TEGRA20_CPUFREQ                      policy<{'arm64': 'y', 'armhf-generic': 'y'}>
+CONFIG_ARM_TEGRA124_CPUFREQ                     policy<{'arm64': 'y', 'armhf-generic': 'y'}>
 #
 CONFIG_CPUFREQ_DT                               note<not autoloadable>
 
diff --git a/debian.master/config/arm64/config.common.arm64 b/debian.master/config/arm64/config.common.arm64
index 3bf7f15d24b4..bd0b6d2514e7 100644
--- a/debian.master/config/arm64/config.common.arm64
+++ b/debian.master/config/arm64/config.common.arm64
@@ -26,7 +26,7 @@  CONFIG_ARCH_MMAP_RND_COMPAT_BITS=11
 CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MAX=16
 CONFIG_ARCH_MXC=y
 CONFIG_ARCH_SUNXI=y
-# CONFIG_ARCH_TEGRA is not set
+CONFIG_ARCH_TEGRA=y
 # CONFIG_ARCH_UNIPHIER is not set
 CONFIG_ARCNET=m
 CONFIG_ARM_SMMU=y
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 9062e1c8fc86..c16bc8946c62 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -541,6 +541,11 @@  CONFIG_ARCH_SYNQUACER=y
 # CONFIG_ARCH_TANGO is not set
 CONFIG_ARCH_TEGRA_114_SOC=y
 CONFIG_ARCH_TEGRA_124_SOC=y
+CONFIG_ARCH_TEGRA_132_SOC=y
+CONFIG_ARCH_TEGRA_186_SOC=y
+CONFIG_ARCH_TEGRA_194_SOC=y
+CONFIG_ARCH_TEGRA_210_SOC=y
+CONFIG_ARCH_TEGRA_234_SOC=y
 CONFIG_ARCH_TEGRA_2x_SOC=y
 CONFIG_ARCH_TEGRA_3x_SOC=y
 CONFIG_ARCH_THUNDER=y
@@ -718,6 +723,7 @@  CONFIG_ARM_EXYNOS_BUS_DEVFREQ=y
 CONFIG_ARM_EXYNOS_CPUIDLE=y
 CONFIG_ARM_GIC=y
 CONFIG_ARM_GIC_MAX_NR=1
+CONFIG_ARM_GIC_PM=y
 CONFIG_ARM_GIC_V2M=y
 CONFIG_ARM_GIC_V3=y
 CONFIG_ARM_GIC_V3_ITS=y
@@ -777,6 +783,7 @@  CONFIG_ARM_SP805_WATCHDOG=m
 CONFIG_ARM_SPE_PMU=m
 CONFIG_ARM_TEGRA124_CPUFREQ=y
 CONFIG_ARM_TEGRA186_CPUFREQ=m
+CONFIG_ARM_TEGRA194_CPUFREQ=m
 CONFIG_ARM_TEGRA20_CPUFREQ=y
 # CONFIG_ARM_TEGRA_CPUIDLE is not set
 CONFIG_ARM_TEGRA_DEVFREQ=m
@@ -3891,6 +3898,7 @@  CONFIG_GPIO_SYSCON=m
 CONFIG_GPIO_SYSFS=y
 CONFIG_GPIO_TC3589X=y
 CONFIG_GPIO_TEGRA=y
+CONFIG_GPIO_TEGRA186=y
 CONFIG_GPIO_THUNDERX=m
 CONFIG_GPIO_TPS65086=m
 CONFIG_GPIO_TPS65218=m
@@ -7384,6 +7392,9 @@  CONFIG_PCIE_RCAR_HOST=y
 CONFIG_PCIE_ROCKCHIP=y
 CONFIG_PCIE_ROCKCHIP_EP=y
 CONFIG_PCIE_ROCKCHIP_HOST=m
+CONFIG_PCIE_TEGRA194=m
+CONFIG_PCIE_TEGRA194_EP=m
+CONFIG_PCIE_TEGRA194_HOST=m
 CONFIG_PCIE_UNIPHIER=y
 CONFIG_PCIE_UNIPHIER_EP=y
 CONFIG_PCIE_XILINX=y
@@ -7570,6 +7581,7 @@  CONFIG_PHY_SUN4I_USB=m
 CONFIG_PHY_SUN50I_USB3=m
 CONFIG_PHY_SUN6I_MIPI_DPHY=m
 # CONFIG_PHY_SUN9I_USB is not set
+CONFIG_PHY_TEGRA194_P2U=m
 CONFIG_PHY_TEGRA_XUSB=m
 CONFIG_PHY_TUSB1210=m
 CONFIG_PHY_UNIPHIER_AHCI=m
@@ -7791,7 +7803,9 @@  CONFIG_PINCTRL_SX150X=y
 CONFIG_PINCTRL_TEGRA=y
 CONFIG_PINCTRL_TEGRA114=y
 CONFIG_PINCTRL_TEGRA124=y
+CONFIG_PINCTRL_TEGRA194=y
 CONFIG_PINCTRL_TEGRA20=y
+CONFIG_PINCTRL_TEGRA210=y
 CONFIG_PINCTRL_TEGRA30=y
 CONFIG_PINCTRL_TEGRA_XUSB=y
 CONFIG_PINCTRL_TIGERLAKE=m
@@ -9380,7 +9394,8 @@  CONFIG_SERIAL_SIFIVE=m
 CONFIG_SERIAL_SPRD=m
 CONFIG_SERIAL_ST_ASC=m
 CONFIG_SERIAL_TEGRA=m
-CONFIG_SERIAL_TEGRA_TCU=m
+CONFIG_SERIAL_TEGRA_TCU=y
+CONFIG_SERIAL_TEGRA_TCU_CONSOLE=y
 CONFIG_SERIAL_UARTLITE=m
 CONFIG_SERIAL_UARTLITE_NR_UARTS=1
 CONFIG_SERIAL_XILINX_PS_UART=m
@@ -10606,7 +10621,11 @@  CONFIG_TEE_BNXT_FW=m
 CONFIG_TEGRA124_EMC=y
 CONFIG_TEGRA20_APB_DMA=y
 CONFIG_TEGRA20_EMC=y
+CONFIG_TEGRA210_ADMA=m
+CONFIG_TEGRA210_EMC=m
+CONFIG_TEGRA210_EMC_TABLE=y
 CONFIG_TEGRA30_EMC=y
+CONFIG_TEGRA_ACONNECT=m
 CONFIG_TEGRA_AHB=y
 CONFIG_TEGRA_BPMP=y
 CONFIG_TEGRA_BPMP_THERMAL=m