Skip to content

Commit 5e0d4f3

Browse files
authored
linux/common-config: remove duplicate conditional for ChromeOS support (#366474)
2 parents 8cb4f5b + 02b6bf8 commit 5e0d4f3

File tree

1 file changed

+11
-19
lines changed

1 file changed

+11
-19
lines changed

pkgs/os-specific/linux/kernel/common-config.nix

Lines changed: 11 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1328,6 +1328,17 @@ let
13281328

13291329
# Enable LEDS to display link-state status of PHY devices (i.e. eth lan/wan interfaces)
13301330
LED_TRIGGER_PHY = yes;
1331+
1332+
# Required for various hardware features on Chrome OS devices
1333+
CHROME_PLATFORMS = yes;
1334+
CHROMEOS_TBMC = module;
1335+
CROS_EC = module;
1336+
CROS_EC_I2C = module;
1337+
CROS_EC_SPI = module;
1338+
CROS_EC_LPC = module;
1339+
CROS_EC_ISHTP = module;
1340+
CROS_KBD_LED_BACKLIGHT = module;
1341+
TCG_TIS_SPI_CR50 = whenAtLeast "5.5" yes;
13311342
}
13321343
//
13331344
lib.optionalAttrs
@@ -1381,25 +1392,6 @@ let
13811392
# aarch64-linux builder, for example
13821393
CP15_BARRIER_EMULATION = lib.mkIf (stdenv.hostPlatform.system == "aarch64-linux") yes;
13831394
}
1384-
//
1385-
lib.optionalAttrs
1386-
(stdenv.hostPlatform.system == "x86_64-linux" || stdenv.hostPlatform.system == "aarch64-linux")
1387-
{
1388-
# Required for various hardware features on Chrome OS devices
1389-
CHROME_PLATFORMS = yes;
1390-
CHROMEOS_TBMC = module;
1391-
1392-
CROS_EC = module;
1393-
1394-
CROS_EC_I2C = module;
1395-
CROS_EC_SPI = module;
1396-
CROS_EC_LPC = module;
1397-
CROS_EC_ISHTP = module;
1398-
1399-
CROS_KBD_LED_BACKLIGHT = module;
1400-
1401-
TCG_TIS_SPI_CR50 = whenAtLeast "5.5" yes;
1402-
}
14031395
// lib.optionalAttrs (stdenv.hostPlatform.system == "x86_64-linux") {
14041396
CHROMEOS_LAPTOP = module;
14051397
CHROMEOS_PSTORE = module;

0 commit comments

Comments
 (0)