alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Pull requests Activity

Merge pull request #7740 from dezgeg/arm

Browse source 
ARM changes for the Jetson TK1 (and other multiplatform boards)
This commit is contained in:
viric 2015-05-07 20:53:07 +02:00
commit 1b982918f5
4 changed files with 26 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
pkgs/os-specific/linux/kernel/manual-config.nix
View file

@ -125,7 +125,8 @@ let
mkdir -p $out/lib/firmware mkdir -p $out/lib/firmware
'') + (if (platform ? kernelDTB && platform.kernelDTB) then '' '') + (if (platform ? kernelDTB && platform.kernelDTB) then ''
make $makeFlags "''${makeFlagsArray[@]}" dtbs make $makeFlags "''${makeFlagsArray[@]}" dtbs
cp $buildRoot/arch/$karch/boot/dts/*dtb $out mkdir -p $out/dtbs
cp $buildRoot/arch/$karch/boot/dts/*.dtb $out/dtbs
'' else "") + (if isModular then '' '' else "") + (if isModular then ''
make modules_install $makeFlags "''${makeFlagsArray[@]}" \ make modules_install $makeFlags "''${makeFlagsArray[@]}" \
$installFlags "''${installFlagsArray[@]}" $installFlags "''${installFlagsArray[@]}"

6
pkgs/stdenv/linux/make-bootstrap-tools-cross.nix
View file

@ -34,7 +34,7 @@ let
}; };
}; };
beagleboneCrossSystem = { armv7l-hf-multiplatform-crossSystem = {
crossSystem = rec { crossSystem = rec {
config = "armv7l-unknown-linux-gnueabi"; config = "armv7l-unknown-linux-gnueabi";
bigEndian = false; bigEndian = false;
@ -43,7 +43,7 @@ let
fpu = "vfpv3-d16"; fpu = "vfpv3-d16";
withTLS = true; withTLS = true;
libc = "glibc"; libc = "glibc";
platform = pkgsNoParams.platforms.beaglebone; platform = pkgsNoParams.platforms.armv7l-hf-multiplatform;
openssl.system = "linux-generic32"; openssl.system = "linux-generic32";
inherit (platform) gcc; inherit (platform) gcc;
}; };
@ -52,7 +52,7 @@ let
selectedCrossSystem = selectedCrossSystem =
if toolsArch == "armv5tel" then sheevaplugCrossSystem else if toolsArch == "armv5tel" then sheevaplugCrossSystem else
if toolsArch == "armv6l" then raspberrypiCrossSystem else if toolsArch == "armv6l" then raspberrypiCrossSystem else
if toolsArch == "armv7l" then beagleboneCrossSystem else null; if toolsArch == "armv7l" then armv7l-hf-multiplatform-crossSystem else null;
pkgs = pkgsFun ({inherit system;} // selectedCrossSystem); pkgs = pkgsFun ({inherit system;} // selectedCrossSystem);

2
pkgs/top-level/all-packages.nix
View file

@ -72,7 +72,7 @@ let
platforms = (import ./platforms.nix); platforms = (import ./platforms.nix);
in in
if system == "armv6l-linux" then platforms.raspberrypi if system == "armv6l-linux" then platforms.raspberrypi
else if system == "armv7l-linux" then platforms.beaglebone else if system == "armv7l-linux" then platforms.armv7l-hf-multiplatform
else if system == "armv5tel-linux" then platforms.sheevaplug else if system == "armv5tel-linux" then platforms.sheevaplug
else if system == "mips64el-linux" then platforms.fuloong2f_n32 else if system == "mips64el-linux" then platforms.fuloong2f_n32
else if system == "x86_64-linux" then platforms.pc64 else if system == "x86_64-linux" then platforms.pc64

22
pkgs/top-level/platforms.nix
View file

@ -217,7 +217,7 @@ rec {
raspberrypi2 = { raspberrypi2 = {
name = "raspberrypi2"; name = "raspberrypi2";
kernelMajor = "3.14"; kernelMajor = "3.14";
kernelHeadersBaseConfig = "kirkwood_defconfig"; kernelHeadersBaseConfig = "multi_v7_defconfig";
kernelBaseConfig = "bcm2709_defconfig"; kernelBaseConfig = "bcm2709_defconfig";
kernelArch = "arm"; kernelArch = "arm";
kernelDTB = true; kernelDTB = true;
@ -470,7 +470,7 @@ rec {
beaglebone = { beaglebone = {
name = "beaglebone"; name = "beaglebone";
kernelMajor = "2.6"; kernelMajor = "2.6";
kernelHeadersBaseConfig = "omap2plus_defconfig"; kernelHeadersBaseConfig = "multi_v7_defconfig";
kernelBaseConfig = "omap2plus_defconfig"; kernelBaseConfig = "omap2plus_defconfig";
kernelArch = "arm"; kernelArch = "arm";
kernelAutoModules = false; kernelAutoModules = false;
@ -483,4 +483,22 @@ rec {
float = "hard"; float = "hard";
}; };
}; };
armv7l-hf-multiplatform = {
name = "armv7l-hf-multiplatform";
kernelMajor = "2.6";
kernelHeadersBaseConfig = "multi_v7_defconfig";
kernelBaseConfig = "multi_v7_defconfig";
kernelArch = "arm";
kernelAutoModules = false;
kernelExtraConfig = "";
kernelTarget = "zImage";
kernelDTB = true;
uboot = null;
gcc = {
arch = "armv7-a";
fpu = "vfpv3-d16";
float = "hard";
};
};
} }