diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index 620df6dd6cfb..c57082c93305 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -49,7 +49,8 @@ let commonMakeFlags = [ "O=$(buildRoot)" - ]; + ] ++ stdenv.lib.optionals (stdenv.platform ? kernelMakeFlags) + stdenv.platform.kernelMakeFlags; drvAttrs = config_: platform: kernelPatches: configfile: let diff --git a/pkgs/top-level/platforms.nix b/pkgs/top-level/platforms.nix index 8bdc4f77302c..fc0fe23d4fb1 100644 --- a/pkgs/top-level/platforms.nix +++ b/pkgs/top-level/platforms.nix @@ -25,7 +25,7 @@ rec { name = "sheevaplug"; kernelMajor = "2.6"; kernelHeadersBaseConfig = "kirkwood_defconfig"; - kernelBaseConfig = "kirkwood_defconfig"; + kernelBaseConfig = "multi_v5_defconfig"; kernelArch = "arm"; kernelAutoModules = false; kernelExtraConfig = @@ -123,10 +123,12 @@ rec { KGDB_SERIAL_CONSOLE y KGDB_KDB y ''; + kernelMakeFlags = [ "LOADADDR=0x0200000" ]; kernelTarget = "uImage"; uboot = "sheevaplug"; # Only for uboot = uboot : ubootConfig = "sheevaplug_config"; + kernelDTB = true; # Beyond 3.10 }; raspberrypi = {