From 9497b712f6704c2ac3857df38464e81a328a5df1 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Mon, 8 Jun 2026 17:55:31 +1000
Subject: [PATCH] linux/common-config: move USB_XHCI_TEGRA from lib/systems
 aarch64-multiplatform

Co-authored-by: Emily <vcs@emily.moe>
---
 lib/systems/platforms.nix                       | 5 -----
 pkgs/os-specific/linux/kernel/common-config.nix | 4 ++++
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/lib/systems/platforms.nix b/lib/systems/platforms.nix
index b10c787728a0..7c49b40e53d4 100644
--- a/lib/systems/platforms.nix
+++ b/lib/systems/platforms.nix
@@ -152,11 +152,6 @@ rec {
       DTB = true;
       autoModules = true;
       preferBuiltin = true;
-      extraConfig = ''
-        # The default (=y) forces us to have the XHCI firmware available in initrd,
-        # which our initrd builder can't currently do easily.
-        USB_XHCI_TEGRA m
-      '';
       target = "Image";
     };
     gcc = {
diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index e5f06e7d481d..0eca336e62be 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -672,6 +672,10 @@ let
       USB_DWC3_DUAL_ROLE = yes;
 
       USB_XHCI_SIDEBAND = whenAtLeast "6.16" yes; # needed for audio offload
+
+      # The default (=y) forces us to have the XHCI firmware available in initrd,
+      # which our initrd builder can't currently do easily.
+      USB_XHCI_TEGRA = lib.mkIf stdenv.hostPlatform.isAarch64 module;
     };
 
     usb-serial = {