chore: Remove SOC_XAVIER from kconfig

Xavier is end-of-life. Signed-off-by: Jake Garver <jake@nvidia.com> Reviewed-by: Jeshua Smith <jeshuas@nvidia.com>
NVIDIA · Dec 12, 2024 · c9c7f14 · c9c7f14
1 parent f4d4256
commit c9c7f14
Show file tree

Hide file tree

Showing 6 changed files with 0 additions and 46 deletions.
diff --git a/Platform/NVIDIA/Android/Android.defconfig b/Platform/NVIDIA/Android/Android.defconfig
@@ -1,7 +1,6 @@
 # SPDX-FileCopyrightText: Copyright (c) 2023-2024 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 #
 # SPDX-License-Identifier: BSD-2-Clause-Patent
-CONFIG_SOC_XAVIER=y
 CONFIG_SOC_ORIN=y
 CONFIG_SECURITY_TPM_FIRMWARE=y
 CONFIG_SECURITY_UEFI_MENU_USER_AUTH=y

diff --git a/Platform/NVIDIA/Jetson/Jetson.defconfig b/Platform/NVIDIA/Jetson/Jetson.defconfig
@@ -1,7 +1,6 @@
 # SPDX-FileCopyrightText: Copyright (c) 2023-2024 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 #
 # SPDX-License-Identifier: BSD-2-Clause-Patent
-CONFIG_SOC_XAVIER=y
 CONFIG_SOC_ORIN=y
 CONFIG_SECURITY_TPM_FIRMWARE=y
 CONFIG_SECURITY_UEFI_MENU_USER_AUTH=y

diff --git a/Platform/NVIDIA/Kconfig b/Platform/NVIDIA/Kconfig
@@ -17,12 +17,6 @@ menu "General"
 endmenu
 
 menu "SOC Support"
-  config SOC_XAVIER
-  bool "Xavier"
-  select SOC_JETSON
-  help
-    Support for Xavier (T194)
-
   config SOC_ORIN
   bool "Orin"
   select SOC_JETSON

diff --git a/Platform/NVIDIA/NVIDIA.common.dsc.inc b/Platform/NVIDIA/NVIDIA.common.dsc.inc
@@ -67,9 +67,6 @@ CONFIG_ARM_WATCHDOG_INTERRUPT=0
 
 [SkuIds]
   0|DEFAULT
-!ifdef CONFIG_SOC_XAVIER
-  1|T194
-!endif
 !ifdef CONFIG_SOC_ORIN
   2|T234
   3|T234SLT|T234
@@ -1227,25 +1224,6 @@ gUserAuthFeaturePkgTokenSpaceGuid.PcdPasswordCleared|FALSE
   !endif
 !endif
 
-!ifdef CONFIG_SOC_XAVIER
-[PcdsDynamicDefault.common.T194]
-  gArmTokenSpaceGuid.PcdGicDistributorBase|0x03881000
-  gArmTokenSpaceGuid.PcdGicInterruptInterfaceBase|0x03882000
-  gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultOemTableId|'TEGRA194'
-  gEfiMdeModulePkgTokenSpaceGuid.PcdSystemFmpCapsuleImageTypeIdGuid|{GUID("$(FMP_SYSTEM_IMAGE_TYPE_ID_GUID_T194)")}
-  gArmTokenSpaceGuid.PcdSystemMemoryBase|0X80000000
-  gNVIDIATokenSpaceGuid.PcdSdhciCoherentDMADisable|TRUE
-  gNVIDIATokenSpaceGuid.PcdBPMPPCIeControllerEnable|TRUE
-  gNVIDIATokenSpaceGuid.PcdBrBctLogicalSlotSize|0x4000
-  gNVIDIATokenSpaceGuid.PcdBrBctDataSize|0x1000
-  gNVIDIATokenSpaceGuid.PcdAffinityMpIdrSupported|FALSE
-  gNVIDIATokenSpaceGuid.PcdFloorsweepCpusByDtbNop|TRUE
-
-[PcdsDynamicHii.common.T194]
-  gNVIDIATokenSpaceGuid.PcdPcieResourceConfigNeeded|L"PCIeResourceConfig"|gNVIDIATokenSpaceGuid|0x0|1|BS
-  gNVIDIATokenSpaceGuid.PcdPcieEntryInAcpiConfigNeeded|L"PCIeInOsConfig"|gNVIDIATokenSpaceGuid|0x0|1|BS
-!endif
-
 !ifdef CONFIG_SOC_ORIN
 [PcdsDynamicDefault.common.T234]
   gArmTokenSpaceGuid.PcdGicDistributorBase|0X0F400000
@@ -1895,20 +1873,11 @@ gUserAuthFeaturePkgTokenSpaceGuid.PcdPasswordCleared|FALSE
 !ifdef CONFIG_NVIDIA_DISPLAY
   Silicon/NVIDIA/Drivers/NonDiscoverablePciDeviceDxe/NonDiscoverablePciDeviceDxe.inf
   Silicon/NVIDIA/Drivers/NvDisplayControllerDxe/NvDisplayControllerDxe.inf
-  !ifdef CONFIG_SOC_XAVIER
-    Silicon/NVIDIA/Tegra/T194/Drivers/T194GraphicsOutputDxe/T194GraphicsOutputDxe.inf {
-      <LibraryClasses>
-      BaseMemoryLib|MdePkg/Library/BaseMemoryLib/BaseMemoryLib.inf
-    }
-  !endif
 !endif
 
   #
   # SE RNG
   #
-!ifdef CONFIG_SOC_XAVIER
-  Silicon/NVIDIA/Tegra/T194/Drivers/SeRngDxe/SeRngDxe.inf
-!endif
 !ifdef CONFIG_SOC_ORIN
   Silicon/NVIDIA/Tegra/T234/Drivers/SeRngDxe/SeRngDxe.inf
 !endif

diff --git a/Platform/NVIDIA/NVIDIA.fvmain.fdf.inc b/Platform/NVIDIA/NVIDIA.fvmain.fdf.inc
@@ -404,9 +404,6 @@ FvNameGuid         = $(PLATFORM_GUID)
   !include Silicon/NVIDIA/Drivers/NvGopDriver/NvGopDriver.fdf.inc
   INF Silicon/NVIDIA/Drivers/NonDiscoverablePciDeviceDxe/NonDiscoverablePciDeviceDxe.inf
   INF Silicon/NVIDIA/Drivers/NvDisplayControllerDxe/NvDisplayControllerDxe.inf
-  !ifdef CONFIG_SOC_XAVIER
-    INF Silicon/NVIDIA/Tegra/T194/Drivers/T194GraphicsOutputDxe/T194GraphicsOutputDxe.inf
-  !endif
 !endif
 !ifdef CONFIG_ASPEED_2600_DISPLAY
   #
@@ -419,9 +416,6 @@ FvNameGuid         = $(PLATFORM_GUID)
   #
   # SE RNG
   #
-!ifdef CONFIG_SOC_XAVIER
-  INF Silicon/NVIDIA/Tegra/T194/Drivers/SeRngDxe/SeRngDxe.inf
-!endif
 !ifdef CONFIG_SOC_ORIN
   INF Silicon/NVIDIA/Tegra/T234/Drivers/SeRngDxe/SeRngDxe.inf
 !endif

diff --git a/Platform/NVIDIA/ServerIgx/ServerIgx.defconfig b/Platform/NVIDIA/ServerIgx/ServerIgx.defconfig
@@ -1,7 +1,6 @@
 # SPDX-FileCopyrightText: Copyright (c) 2023-2024 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 #
 # SPDX-License-Identifier: BSD-2-Clause-Patent
-CONFIG_SOC_XAVIER=y
 CONFIG_SOC_ORIN=y
 CONFIG_SECURITY_TPM_FIRMWARE=y
 CONFIG_SECURITY_UEFI_MENU_USER_AUTH=y