From 1452ce46a478f956a687379561f2b3c39ba14533 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Mon, 28 Dec 2009 10:35:34 +0000
Subject: [PATCH] Fixing the kernel configuration for the sheevaplug

svn path=/nixpkgs/branches/stdenv-updates/; revision=19137
---
 pkgs/os-specific/linux/kernel/generic.nix |  2 +-
 pkgs/top-level/platforms.nix              | 23 ++++++++++++++++++++++-
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix
index 2d9af1b4bd83..3fda2bc3f7cb 100644
--- a/pkgs/os-specific/linux/kernel/generic.nix
+++ b/pkgs/os-specific/linux/kernel/generic.nix
@@ -74,7 +74,7 @@ stdenv.mkDerivation {
     in lib.concatStringsSep "\n" ([config] ++ configFromPatches);
 
   # For UML, just ignore all options that don't apply (I'm lazy).
-  ignoreConfigErrors = userModeLinux;
+  ignoreConfigErrors = (userModeLinux || stdenv.system = "armv5tel-linux");
 
   buildInputs = [ perl mktemp ]
     ++ lib.optional (platform.uboot != null) [platform.uboot];
diff --git a/pkgs/top-level/platforms.nix b/pkgs/top-level/platforms.nix
index 539b83a76570..8664b6d57787 100644
--- a/pkgs/top-level/platforms.nix
+++ b/pkgs/top-level/platforms.nix
@@ -21,11 +21,32 @@ with pkgs;
 
   sheevaplug = assert system == "armv5tel-linux"; {
     name = "sheevaplug";
+    kernelBaseConfig = "kirkwood_defconfig";
+    kernelArch = "arm";
+    kernelExtraConfig =
+      ''
+        # Fail to build
+        DRM n
+        SCSI_ADVANSYS n
+        USB_ISP1362_HCD n
+        SND_SOC n
+        SND_ALI5451 n
+        FB_SAVAGE n
+        SCSI_NSP32 n
+        ATA_SFF n
+        SUNGEM n
+        IRDA n
+        ATM_HE n
+        SCSI_ACARD n
+        BLK_DEV_CMD640_ENHANCED n
+      '';
     inherit uboot;
   };
 
-  platformVersatileARM = assert system == "armv5tel-linux"; {
+  versatileARM = assert system == "armv5tel-linux"; {
     name = "versatileARM";
+    kernelBaseConfig = "versatile_defconfig";
+    kernelArch = "arm";
     uboot = null;
   };
 }