about summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorLluís Batlle i Rossell <viric@vicerveza.homeunix.net>2010-02-21 12:24:50 +0000
committerLluís Batlle i Rossell <viric@vicerveza.homeunix.net>2010-02-21 12:24:50 +0000
commitbc939a87b412ac0ac3cdd47c0a2e8a1dd8aa07c3 (patch)
tree4bbe876133d4123b6625b5c24b30f2bd2763d9e2 /pkgs
parent8c82537f9a2424c0ae511c876bde2c131f93f796 (diff)
downloadnixlib-bc939a87b412ac0ac3cdd47c0a2e8a1dd8aa07c3.tar
nixlib-bc939a87b412ac0ac3cdd47c0a2e8a1dd8aa07c3.tar.gz
nixlib-bc939a87b412ac0ac3cdd47c0a2e8a1dd8aa07c3.tar.bz2
nixlib-bc939a87b412ac0ac3cdd47c0a2e8a1dd8aa07c3.tar.lz
nixlib-bc939a87b412ac0ac3cdd47c0a2e8a1dd8aa07c3.tar.xz
nixlib-bc939a87b412ac0ac3cdd47c0a2e8a1dd8aa07c3.tar.zst
nixlib-bc939a87b412ac0ac3cdd47c0a2e8a1dd8aa07c3.zip
More platform updates - the serial line in integratorcp kernel still does
not work for me, nevertheless.


svn path=/nixpkgs/trunk/; revision=20153
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/top-level/platforms.nix18
1 files changed, 18 insertions, 0 deletions
diff --git a/pkgs/top-level/platforms.nix b/pkgs/top-level/platforms.nix
index 492a0deaf124..4fa60d72ec76 100644
--- a/pkgs/top-level/platforms.nix
+++ b/pkgs/top-level/platforms.nix
@@ -60,6 +60,12 @@ with pkgs;
     kernelArch = "arm";
     kernelAutoModules = false;
     kernelTarget = "zImage";
+    kernelExtraConfig =
+      ''
+        MMC_ARMMMCI y
+        MMC_SDHCI y
+        SERIO_AMBAKMI y
+      '';
     uboot = null;
   };
 
@@ -76,6 +82,12 @@ with pkgs;
         SERIAL_AMBA_PL011_CONSOLE y
         SERIAL_AMBA_PL010 n
         SERIAL_AMBA_PL010_CONSOLE n
+
+        MMC_ARMMMCI y
+        MMC_SDHCI y
+        SERIO_AMBAKMI y
+
+        CPU_ARM926T y
       '';
     uboot = null;
     ubootConfig = "integratorcp_config";
@@ -94,6 +106,12 @@ with pkgs;
         SERIAL_AMBA_PL011_CONSOLE y
         SERIAL_AMBA_PL010 n
         SERIAL_AMBA_PL010_CONSOLE n
+
+        MMC_ARMMMCI y
+        MMC_SDHCI y
+        SERIO_AMBAKMI y
+
+        CPU_ARM926T y
       '';
     uboot = uboot;
     ubootConfig = "integratorcp_config";