linux/common-config: remove duplicate conditional for ChromeOS support

Redcroft · Dec 19, 2024 · 02b6bf8 · 02b6bf8
1 parent b532e12
commit 02b6bf8
Showing 1 changed file with 11 additions and 19 deletions.
diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -1328,6 +1328,17 @@ let
 
             # Enable LEDS to display link-state status of PHY devices (i.e. eth lan/wan interfaces)
             LED_TRIGGER_PHY = yes;
+
+            # Required for various hardware features on Chrome OS devices
+            CHROME_PLATFORMS = yes;
+            CHROMEOS_TBMC = module;
+            CROS_EC = module;
+            CROS_EC_I2C = module;
+            CROS_EC_SPI = module;
+            CROS_EC_LPC = module;
+            CROS_EC_ISHTP = module;
+            CROS_KBD_LED_BACKLIGHT = module;
+            TCG_TIS_SPI_CR50 = whenAtLeast "5.5" yes;
           }
       //
         lib.optionalAttrs
@@ -1381,25 +1392,6 @@ let
             # aarch64-linux builder, for example
             CP15_BARRIER_EMULATION = lib.mkIf (stdenv.hostPlatform.system == "aarch64-linux") yes;
           }
-      //
-        lib.optionalAttrs
-          (stdenv.hostPlatform.system == "x86_64-linux" || stdenv.hostPlatform.system == "aarch64-linux")
-          {
-            # Required for various hardware features on Chrome OS devices
-            CHROME_PLATFORMS = yes;
-            CHROMEOS_TBMC = module;
-
-            CROS_EC = module;
-
-            CROS_EC_I2C = module;
-            CROS_EC_SPI = module;
-            CROS_EC_LPC = module;
-            CROS_EC_ISHTP = module;
-
-            CROS_KBD_LED_BACKLIGHT = module;
-
-            TCG_TIS_SPI_CR50 = whenAtLeast "5.5" yes;
-          }
       // lib.optionalAttrs (stdenv.hostPlatform.system == "x86_64-linux") {
         CHROMEOS_LAPTOP = module;
         CHROMEOS_PSTORE = module;