diff options
| author | William A. Kennington III <william@wkennington.com> | 2015-06-07 10:14:51 -0700 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2015-06-07 10:14:51 -0700 |
| commit | 514a9fdf878a65bca0e329cbb733070f3bd0ab0f (patch) | |
| tree | 5f4742e61ec0821d2ccedd3f7a0eb7c546b7a7b6 /pkgs/os-specific | |
| parent | 42c65fd1c9d07aa92ad9a5807c2332cdd9db7d95 (diff) | |
| parent | 6be70d17c0f43368b008f54e3c3f2aa093249e63 (diff) | |
| download | nixlib-514a9fdf878a65bca0e329cbb733070f3bd0ab0f.tar nixlib-514a9fdf878a65bca0e329cbb733070f3bd0ab0f.tar.gz nixlib-514a9fdf878a65bca0e329cbb733070f3bd0ab0f.tar.bz2 nixlib-514a9fdf878a65bca0e329cbb733070f3bd0ab0f.tar.lz nixlib-514a9fdf878a65bca0e329cbb733070f3bd0ab0f.tar.xz nixlib-514a9fdf878a65bca0e329cbb733070f3bd0ab0f.tar.zst nixlib-514a9fdf878a65bca0e329cbb733070f3bd0ab0f.zip | |
Merge pull request #8173 from dezgeg/pr-kernel-config
kernel-config: Enable framebuffer console for BIOS systems & /proc/config.gz for ARM
Diffstat (limited to 'pkgs/os-specific')
| -rw-r--r-- | pkgs/os-specific/linux/kernel/common-config.nix | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 25b707614ed0..a972c4e60f89 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -54,6 +54,7 @@ with stdenv.lib; STANDALONE n # Make /proc/config.gz available. + IKCONFIG y IKCONFIG_PROC y # Optimize with -O2, not -Os. @@ -131,6 +132,8 @@ with stdenv.lib; FB_SIS_300 y FB_SIS_315 y FB_3DFX_ACCEL y + FB_VESA y + FRAMEBUFFER_CONSOLE y ${optionalString (versionOlder version "3.9" || stdenv.system == "i686-linux") '' FB_GEODE y ''} |