diff --git a/lib/systems/platforms.nix b/lib/systems/platforms.nix
index 32f055b6b1c..00b2b683db0 100644
--- a/lib/systems/platforms.nix
+++ b/lib/systems/platforms.nix
@@ -167,7 +167,7 @@ rec {
   raspberrypi = {
     name = "raspberrypi";
     kernelMajor = "2.6";
-    kernelBaseConfig = "bcmrpi_defconfig";
+    kernelBaseConfig = "bcm2835_defconfig";
     kernelDTB = true;
     kernelArch = "arm";
     kernelAutoModules = false;
@@ -254,8 +254,6 @@ rec {
 
   raspberrypi2 = armv7l-hf-multiplatform // {
     name = "raspberrypi2";
-    kernelBaseConfig = "bcm2709_defconfig";
-    kernelDTB = true;
     kernelAutoModules = false;
     kernelExtraConfig = ''
       BLK_DEV_RAM y
diff --git a/pkgs/os-specific/linux/kernel/linux-rpi.nix b/pkgs/os-specific/linux/kernel/linux-rpi.nix
index a96a910c68c..d8558324221 100644
--- a/pkgs/os-specific/linux/kernel/linux-rpi.nix
+++ b/pkgs/os-specific/linux/kernel/linux-rpi.nix
@@ -15,6 +15,11 @@ stdenv.lib.overrideDerivation (buildLinux (args // rec {
     sha256 = "19lb1gxz21x1d5zdznzqfq60kxg7iqmyl6l0mb9qg2vrl8fcgnxk";
   };
 
+  defconfig = {
+    "armv6l-linux" = "bcmrpi_defconfig";
+    "armv7l-linux" = "bcm2709_defconfig";
+  }.${stdenv.system} or (throw "linux_rpi not supported on '${stdenv.system}'");
+
   features = {
     efiBootStub = false;
   } // (args.features or {});