derivations.nix

@@ -16,5 +16,18 @@ rec {
   heavycomps = pkgs.callPackage ./heavycomps.nix { inherit nmigen; };
 
   binutils-riscv = pkgs.callPackage ./compilers/binutils.nix { platform = "riscv32"; };
-  rust-riscv32imc-crates = pkgs.callPackage ./compilers/rust-riscv32imc-crates.nix { };
+  llvm_7 = pkgs.llvm_7.overrideAttrs(oa: {
+    name = oa.name + "-riscv";
+    cmakeFlags = oa.cmakeFlags ++ ["-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD=RISCV"];
+  });
+  rustc = (pkgs.rustc.overrideAttrs(oa: {
+    name = "${oa.pname}-${oa.version}-riscv";
+  })).override {
+    inherit llvm_7;
+    pkgsBuildBuild = pkgs.pkgsBuildBuild // { inherit llvm_7; };
+    pkgsBuildHost = pkgs.pkgsBuildHost // { inherit llvm_7; };
+    pkgsBuildTarget = pkgs.pkgsBuildTarget // { inherit llvm_7; };
+  };
+  rust-riscv32imc-crates = pkgs.callPackage ./compilers/rust-riscv32imc-crates.nix { inherit rustc; };
+  cargo = pkgs.cargo.override { inherit rustc; };
 }

firmware/memory.x

@@ -1,5 +1,5 @@
 MEMORY
 {
-  FLASH : ORIGIN = 0x80000000, LENGTH = 16M
+  FLASH : ORIGIN = 0x20000000, LENGTH = 16M
-  RAM : ORIGIN = 0x81000000, LENGTH = 16K
+  RAM : ORIGIN = 0x80000000, LENGTH = 16K
 }

firmware/src/main.rs

@@ -8,11 +8,5 @@ use riscv_rt::entry;
 
 #[entry]
 fn main() -> ! {
-    let foo = "hello world\n";
+    loop {}
-    loop {
-        for c in foo.chars() {
-            let mem = 0x1001_3000 as *mut u8;
-            unsafe { *mem = c as u8 }
-        }
-    }
 }

overlay.nix

@@ -1,7 +0,0 @@
-self: super:
-{
-  llvm_7 = super.llvm_7.overrideAttrs(oa: {
-    name = oa.name + "-riscv";
-    cmakeFlags = oa.cmakeFlags ++ ["-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD=RISCV"];
-  });
-}

release.nix

@@ -1,12 +1,7 @@
-{ }:
+{ pkgs ? import <nixpkgs> {}}:
 let
-  pkgs = import <nixpkgs> { overlays = [ import ./overlay.nix ]; };
   derivations = import ./derivations.nix { inherit pkgs; };
   jobs = derivations // {
-    rustc = pkgs.rustc;
-    cargo = pkgs.cargo;
-    cargo-vendor = pkgs.cargo-vendor;
-
     helloworld_ecp5 = import ./examples/helloworld_ecp5.nix { inherit pkgs; };
     helloworld_kintex7 = import ./examples/helloworld_kintex7.nix { inherit pkgs; };
     simplesoc_ecp5 = import ./examples/simplesoc_ecp5.nix { inherit pkgs; };

shell-firmware.nix

@@ -1,6 +1,5 @@
-{ }:
+{ pkgs ? import <nixpkgs> {}}:
 let
-  pkgs = import <nixpkgs> { overlays = [ import ./overlay.nix ]; };
   hx = import ./derivations.nix { inherit pkgs; };
 in
   pkgs.mkShell {