From 26c45677979b592ccda7d6e7c76b3ba3c649a492 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Mon, 22 Feb 2010 23:44:02 +0000 Subject: [PATCH] Making the integratorCP board boot. It still has no mmc support. svn path=/nixpkgs/trunk/; revision=20184 --- pkgs/top-level/platforms.nix | 28 ++++++++-------------------- 1 file changed, 8 insertions(+), 20 deletions(-) diff --git a/pkgs/top-level/platforms.nix b/pkgs/top-level/platforms.nix index 4fa60d72ec7..6af6e9955bf 100644 --- a/pkgs/top-level/platforms.nix +++ b/pkgs/top-level/platforms.nix @@ -1,6 +1,6 @@ { system, pkgs}: with pkgs; -{ +rec { pc = assert system == "i686-linux" || system == "x86_64-linux"; { name = "pc"; uboot = null; @@ -65,6 +65,8 @@ with pkgs; MMC_ARMMMCI y MMC_SDHCI y SERIO_AMBAKMI y + + AEABI y ''; uboot = null; }; @@ -88,31 +90,17 @@ with pkgs; SERIO_AMBAKMI y CPU_ARM926T y + ARCH_INTEGRATOR_CP y + VGA_CONSOLE n + AEABI y ''; uboot = null; ubootConfig = "integratorcp_config"; }; - integratorCPuboot = { - name = "integratorCP"; - kernelBaseConfig = "integrator_defconfig"; - kernelArch = "arm"; - kernelAutoModules = false; + integratorCPuboot = integratorCP // { + name = "integratorCPuboot"; kernelTarget = "uImage"; - kernelExtraConfig = - '' - # needed for qemu integrator/cp - SERIAL_AMBA_PL011 y - 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"; };