summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorBrian McKenna <brian@brianmckenna.org>2015-10-16 22:20:30 +1100
committerBrian McKenna <brian@brianmckenna.org>2015-10-16 22:20:38 +1100
commitfda9d83ddfe833c95ca630064bb6d2cbaad2da6b (patch)
treecf499efbe30fe2f0f650f97c994b01cc09318618 /nixos
parentd0de36ba7ada3c60b387d873621980eede27fa74 (diff)
downloadnixpkgs-fda9d83ddfe833c95ca630064bb6d2cbaad2da6b.tar
nixpkgs-fda9d83ddfe833c95ca630064bb6d2cbaad2da6b.tar.gz
nixpkgs-fda9d83ddfe833c95ca630064bb6d2cbaad2da6b.tar.bz2
nixpkgs-fda9d83ddfe833c95ca630064bb6d2cbaad2da6b.tar.lz
nixpkgs-fda9d83ddfe833c95ca630064bb6d2cbaad2da6b.tar.xz
nixpkgs-fda9d83ddfe833c95ca630064bb6d2cbaad2da6b.tar.zst
nixpkgs-fda9d83ddfe833c95ca630064bb6d2cbaad2da6b.zip
initrd: add mmc_block to default available modules
mmc_block and sdhci_acpi are both necessary for a Bay Trail Chromebook with an
internal eMMC drive. The sdhci_acpi module is detectable but I can not figure
out a way to check whether the mmc_block module is needed by just looking at
/sys/
Diffstat (limited to 'nixos')
-rw-r--r--nixos/modules/installer/cd-dvd/system-tarball-sheevaplug.nix3
-rw-r--r--nixos/modules/installer/cd-dvd/system-tarball.nix2
-rw-r--r--nixos/modules/system/boot/kernel.nix3
3 files changed, 5 insertions, 3 deletions
diff --git a/nixos/modules/installer/cd-dvd/system-tarball-sheevaplug.nix b/nixos/modules/installer/cd-dvd/system-tarball-sheevaplug.nix
index 46dc1c70502..954cc6b2f49 100644
--- a/nixos/modules/installer/cd-dvd/system-tarball-sheevaplug.nix
+++ b/nixos/modules/installer/cd-dvd/system-tarball-sheevaplug.nix
@@ -86,8 +86,7 @@ in
   system.boot.loader.kernelFile = "uImage";
 
   boot.initrd.availableKernelModules =
-    [ "mvsdio" "mmc_block" "reiserfs" "ext3" "ums-cypress" "rtc_mv"
-      "ext4" ];
+    [ "mvsdio" "reiserfs" "ext3" "ums-cypress" "rtc_mv" "ext4" ];
 
   boot.postBootCommands =
     ''
diff --git a/nixos/modules/installer/cd-dvd/system-tarball.nix b/nixos/modules/installer/cd-dvd/system-tarball.nix
index c24fe97fba4..90e9b98a457 100644
--- a/nixos/modules/installer/cd-dvd/system-tarball.nix
+++ b/nixos/modules/installer/cd-dvd/system-tarball.nix
@@ -43,7 +43,7 @@ in
     # so that we don't need to know its device.
     fileSystems = [ ];
 
-    # boot.initrd.availableKernelModules = [ "mvsdio" "mmc_block" "reiserfs" "ext3" "ext4" ];
+    # boot.initrd.availableKernelModules = [ "mvsdio" "reiserfs" "ext3" "ext4" ];
 
     # boot.initrd.kernelModules = [ "rtc_mv" ];
 
diff --git a/nixos/modules/system/boot/kernel.nix b/nixos/modules/system/boot/kernel.nix
index ac40e8a49ac..9dcbce30f7b 100644
--- a/nixos/modules/system/boot/kernel.nix
+++ b/nixos/modules/system/boot/kernel.nix
@@ -184,6 +184,9 @@ in
         "ide_disk"
         "ide_generic"
 
+        # SD cards and internal eMMC drives.
+        "mmc_block"
+
         # Support USB keyboards, in case the boot fails and we only have
         # a USB keyboard.
         "uhci_hcd"