Orin NX: Add support for xavier NX carrier board

Signed-off-by: Tanel Dettenborn <[email protected]>

Author: TanelDettenborn

flake.nix

@@ -70,12 +70,14 @@
               { som = "orin-agx"; carrierBoard = "devkit"; }
               { som = "orin-agx-industrial"; carrierBoard = "devkit"; }
               { som = "orin-nx"; carrierBoard = "devkit"; }
+              { som = "orin-nx"; carrierBoard = "xavierNxDevkit"; }
               { som = "orin-nano"; carrierBoard = "devkit"; }
               { som = "orin-nx"; carrierBoard = "devkit"; super = true; }
               { som = "orin-nano"; carrierBoard = "devkit"; super = true; }
               { som = "orin-agx"; carrierBoard = "devkit"; majorVersion = "5"; }
               { som = "orin-agx-industrial"; carrierBoard = "devkit"; majorVersion = "5"; }
               { som = "orin-nx"; carrierBoard = "devkit"; majorVersion = "5"; }
+              { som = "orin-nx"; carrierBoard = "xavierNxDevkit"; majorVersion = "5"; }
               { som = "orin-nano"; carrierBoard = "devkit"; majorVersion = "5"; }
               { som = "orin-nx"; carrierBoard = "devkit"; super = true; majorVersion = "5"; }
               { som = "orin-nano"; carrierBoard = "devkit"; super = true; majorVersion = "5"; }

modules/default.nix

@@ -123,6 +123,9 @@ in
         type = types.enum [
           "generic"
           "devkit"
+
+          # Use this, if you would like to use Orin NX SOM with the original Xavier NX Devkit module (p3509-a02),
+          "xavierNxDevkit"
         ];
         default = "generic";
         description = ''

modules/devices.nix

@@ -60,7 +60,7 @@ in
     # Set fan control service if we have a config for it
     services.nvfancontrol.configFile = mkIf (nvfancontrolConf ? "${cfg.som}") (mkDefault nvfancontrolConf.${cfg.som});
     # Enable the fan control service if it's a devkit
-    services.nvfancontrol.enable = mkIf (cfg.carrierBoard == "devkit") (mkDefault true);
+    services.nvfancontrol.enable = mkIf (cfg.carrierBoard == "devkit"  || cfg.carrierBoard == "xavierNxDevkit") (mkDefault true);
 
     hardware.nvidia-jetpack.flashScriptOverrides =
       let
@@ -114,9 +114,20 @@ in
         })
 
         (mkIf (cfg.som == "orin-nx" || cfg.som == "orin-nano") {
-          targetBoard = mkDefault "jetson-orin-nano-devkit${lib.optionalString cfg.super "-super"}";
-          # Use this instead if you want to use the original Xavier NX Devkit module (p3509-a02)
-          #targetBoard = mkDefault "p3509-a02+p3767-0000";
+          targetBoard = let
+              defaultConf = mkDefault "jetson-orin-nano-devkit${lib.optionalString cfg.super "-super"}";
+              xavierConf = if cfg.majorVersion == "5" then
+                             mkDefault "p3509-a02+p3767-0000"
+                           else if cfg.majorVersion == "6" then
+                             mkDefault "p3509-a02-p3767-0000"
+                           else
+                             throw "Not supported majorVersion";
+            in {
+              generic = defaultConf;
+              devkit = defaultConf;
+              xavierNxDevkit = xavierConf;
+            }.${cfg.carrierBoard};
+
           partitionTemplate = mkDefault "${pkgs.nvidia-jetpack.bspSrc}/bootloader/${partitionTemplateDirectory}/cfg/flash_t234_qspi.xml";
         })