Skip to content

Commit b8fb1aa

Browse files
committed
Add nouveau to the generic kernel config
1 parent 5c22d3e commit b8fb1aa

File tree

2 files changed

+22
-82
lines changed

2 files changed

+22
-82
lines changed

projects/Generic/linux/linux.i386.conf

Lines changed: 11 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#
22
# Automatically generated file; DO NOT EDIT.
3-
# Linux/i386 3.13.2 Kernel Configuration
3+
# Linux/i386 3.13.6 Kernel Configuration
44
#
55
# CONFIG_64BIT is not set
66
CONFIG_X86_32=y
@@ -62,7 +62,7 @@ CONFIG_KERNEL_XZ=y
6262
# CONFIG_KERNEL_LZO is not set
6363
# CONFIG_KERNEL_LZ4 is not set
6464
CONFIG_DEFAULT_HOSTNAME="openelec"
65-
CONFIG_SWAP=y
65+
# CONFIG_SWAP is not set
6666
CONFIG_SYSVIPC=y
6767
CONFIG_SYSVIPC_SYSCTL=y
6868
CONFIG_POSIX_MQUEUE=y
@@ -421,7 +421,6 @@ CONFIG_TRANSPARENT_HUGEPAGE=y
421421
CONFIG_TRANSPARENT_HUGEPAGE_MADVISE=y
422422
CONFIG_CROSS_MEMORY_ATTACH=y
423423
CONFIG_CLEANCACHE=y
424-
# CONFIG_FRONTSWAP is not set
425424
# CONFIG_CMA is not set
426425
# CONFIG_ZBUD is not set
427426
# CONFIG_HIGHPTE is not set
@@ -465,7 +464,6 @@ CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
465464
#
466465
CONFIG_SUSPEND=y
467466
CONFIG_SUSPEND_FREEZER=y
468-
# CONFIG_HIBERNATION is not set
469467
CONFIG_PM_SLEEP=y
470468
CONFIG_PM_SLEEP_SMP=y
471469
# CONFIG_PM_AUTOSLEEP is not set
@@ -1368,17 +1366,8 @@ CONFIG_REALTEK_PHY=y
13681366
# CONFIG_MICREL_PHY is not set
13691367
# CONFIG_FIXED_PHY is not set
13701368
# CONFIG_MDIO_BITBANG is not set
1371-
CONFIG_PPP=y
1372-
CONFIG_PPP_BSDCOMP=m
1373-
CONFIG_PPP_DEFLATE=m
1374-
# CONFIG_PPP_FILTER is not set
1375-
CONFIG_PPP_MPPE=m
1376-
# CONFIG_PPP_MULTILINK is not set
1377-
CONFIG_PPPOE=m
1378-
CONFIG_PPP_ASYNC=m
1379-
# CONFIG_PPP_SYNC_TTY is not set
1369+
# CONFIG_PPP is not set
13801370
# CONFIG_SLIP is not set
1381-
CONFIG_SLHC=y
13821371

13831372
#
13841373
# USB Network Adapters
@@ -2588,7 +2577,10 @@ CONFIG_DRM_TTM=y
25882577
# CONFIG_DRM_R128 is not set
25892578
CONFIG_DRM_RADEON=y
25902579
# CONFIG_DRM_RADEON_UMS is not set
2591-
# CONFIG_DRM_NOUVEAU is not set
2580+
CONFIG_DRM_NOUVEAU=y
2581+
CONFIG_NOUVEAU_DEBUG=5
2582+
CONFIG_NOUVEAU_DEBUG_DEFAULT=3
2583+
CONFIG_DRM_NOUVEAU_BACKLIGHT=y
25922584
# CONFIG_DRM_I810 is not set
25932585
CONFIG_DRM_I915=y
25942586
CONFIG_DRM_I915_KMS=y
@@ -2623,7 +2615,7 @@ CONFIG_FB_CFB_IMAGEBLIT=y
26232615
# CONFIG_FB_SYS_FOPS is not set
26242616
# CONFIG_FB_SVGALIB is not set
26252617
# CONFIG_FB_MACMODES is not set
2626-
# CONFIG_FB_BACKLIGHT is not set
2618+
CONFIG_FB_BACKLIGHT=y
26272619
CONFIG_FB_MODE_HELPERS=y
26282620
# CONFIG_FB_TILEBLITTING is not set
26292621

@@ -3383,7 +3375,7 @@ CONFIG_HP_WMI=m
33833375
# CONFIG_THINKPAD_ACPI is not set
33843376
# CONFIG_SENSORS_HDAPS is not set
33853377
# CONFIG_INTEL_MENLOW is not set
3386-
CONFIG_ACPI_WMI=m
3378+
CONFIG_ACPI_WMI=y
33873379
# CONFIG_MSI_WMI is not set
33883380
# CONFIG_TOPSTAR_LAPTOP is not set
33893381
# CONFIG_ACPI_TOSHIBA is not set
@@ -3393,7 +3385,7 @@ CONFIG_ACPI_WMI=m
33933385
# CONFIG_IBM_RTL is not set
33943386
# CONFIG_XO15_EBOOK is not set
33953387
# CONFIG_SAMSUNG_LAPTOP is not set
3396-
# CONFIG_MXM_WMI is not set
3388+
CONFIG_MXM_WMI=y
33973389
# CONFIG_SAMSUNG_Q10 is not set
33983390
# CONFIG_APPLE_GMUX is not set
33993391
# CONFIG_INTEL_RST is not set
@@ -3594,29 +3586,8 @@ CONFIG_F2FS_STAT_FS=y
35943586
CONFIG_F2FS_CHECK_FS=y
35953587
CONFIG_EFIVAR_FS=y
35963588
CONFIG_NETWORK_FILESYSTEMS=y
3597-
CONFIG_NFS_FS=y
3598-
CONFIG_NFS_V2=y
3599-
CONFIG_NFS_V3=y
3600-
# CONFIG_NFS_V3_ACL is not set
3601-
CONFIG_NFS_V4=y
3602-
CONFIG_NFS_SWAP=y
3603-
CONFIG_NFS_V4_1=y
3604-
CONFIG_NFS_V4_2=y
3605-
CONFIG_PNFS_FILE_LAYOUT=y
3606-
CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="kernel.org"
3607-
CONFIG_NFS_V4_1_MIGRATION=y
3608-
CONFIG_ROOT_NFS=y
3609-
# CONFIG_NFS_USE_LEGACY_DNS is not set
3610-
CONFIG_NFS_USE_KERNEL_DNS=y
3589+
# CONFIG_NFS_FS is not set
36113590
# CONFIG_NFSD is not set
3612-
CONFIG_LOCKD=y
3613-
CONFIG_LOCKD_V4=y
3614-
CONFIG_NFS_COMMON=y
3615-
CONFIG_SUNRPC=y
3616-
CONFIG_SUNRPC_GSS=y
3617-
CONFIG_SUNRPC_BACKCHANNEL=y
3618-
CONFIG_SUNRPC_SWAP=y
3619-
# CONFIG_SUNRPC_DEBUG is not set
36203591
# CONFIG_CEPH_FS is not set
36213592
CONFIG_CIFS=y
36223593
CONFIG_CIFS_STATS=y
@@ -4036,7 +4007,6 @@ CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y
40364007
CONFIG_AVERAGE=y
40374008
# CONFIG_CORDIC is not set
40384009
# CONFIG_DDR is not set
4039-
CONFIG_OID_REGISTRY=y
40404010
CONFIG_UCS2_STRING=y
40414011
CONFIG_FONT_SUPPORT=y
40424012
# CONFIG_FONTS is not set

projects/Generic/linux/linux.x86_64.conf

Lines changed: 11 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#
22
# Automatically generated file; DO NOT EDIT.
3-
# Linux/x86_64 3.13.2 Kernel Configuration
3+
# Linux/x86_64 3.13.6 Kernel Configuration
44
#
55
CONFIG_64BIT=y
66
CONFIG_X86_64=y
@@ -64,7 +64,7 @@ CONFIG_KERNEL_XZ=y
6464
# CONFIG_KERNEL_LZO is not set
6565
# CONFIG_KERNEL_LZ4 is not set
6666
CONFIG_DEFAULT_HOSTNAME="openelec"
67-
CONFIG_SWAP=y
67+
# CONFIG_SWAP is not set
6868
CONFIG_SYSVIPC=y
6969
CONFIG_SYSVIPC_SYSCTL=y
7070
CONFIG_POSIX_MQUEUE=y
@@ -417,7 +417,6 @@ CONFIG_TRANSPARENT_HUGEPAGE=y
417417
CONFIG_TRANSPARENT_HUGEPAGE_MADVISE=y
418418
CONFIG_CROSS_MEMORY_ATTACH=y
419419
CONFIG_CLEANCACHE=y
420-
# CONFIG_FRONTSWAP is not set
421420
# CONFIG_CMA is not set
422421
# CONFIG_ZBUD is not set
423422
# CONFIG_X86_CHECK_BIOS_CORRUPTION is not set
@@ -460,7 +459,6 @@ CONFIG_USE_PERCPU_NUMA_NODE_ID=y
460459
#
461460
CONFIG_SUSPEND=y
462461
CONFIG_SUSPEND_FREEZER=y
463-
# CONFIG_HIBERNATION is not set
464462
CONFIG_PM_SLEEP=y
465463
CONFIG_PM_SLEEP_SMP=y
466464
# CONFIG_PM_AUTOSLEEP is not set
@@ -1359,17 +1357,8 @@ CONFIG_REALTEK_PHY=y
13591357
# CONFIG_MICREL_PHY is not set
13601358
# CONFIG_FIXED_PHY is not set
13611359
# CONFIG_MDIO_BITBANG is not set
1362-
CONFIG_PPP=y
1363-
CONFIG_PPP_BSDCOMP=m
1364-
CONFIG_PPP_DEFLATE=m
1365-
# CONFIG_PPP_FILTER is not set
1366-
CONFIG_PPP_MPPE=m
1367-
# CONFIG_PPP_MULTILINK is not set
1368-
CONFIG_PPPOE=m
1369-
CONFIG_PPP_ASYNC=m
1370-
# CONFIG_PPP_SYNC_TTY is not set
1360+
# CONFIG_PPP is not set
13711361
# CONFIG_SLIP is not set
1372-
CONFIG_SLHC=y
13731362

13741363
#
13751364
# USB Network Adapters
@@ -2568,7 +2557,10 @@ CONFIG_DRM_TTM=y
25682557
# CONFIG_DRM_R128 is not set
25692558
CONFIG_DRM_RADEON=y
25702559
# CONFIG_DRM_RADEON_UMS is not set
2571-
# CONFIG_DRM_NOUVEAU is not set
2560+
CONFIG_DRM_NOUVEAU=y
2561+
CONFIG_NOUVEAU_DEBUG=5
2562+
CONFIG_NOUVEAU_DEBUG_DEFAULT=3
2563+
CONFIG_DRM_NOUVEAU_BACKLIGHT=y
25722564
# CONFIG_DRM_I810 is not set
25732565
CONFIG_DRM_I915=y
25742566
CONFIG_DRM_I915_KMS=y
@@ -2603,7 +2595,7 @@ CONFIG_FB_CFB_IMAGEBLIT=y
26032595
# CONFIG_FB_SYS_FOPS is not set
26042596
# CONFIG_FB_SVGALIB is not set
26052597
# CONFIG_FB_MACMODES is not set
2606-
# CONFIG_FB_BACKLIGHT is not set
2598+
CONFIG_FB_BACKLIGHT=y
26072599
CONFIG_FB_MODE_HELPERS=y
26082600
# CONFIG_FB_TILEBLITTING is not set
26092601

@@ -3359,7 +3351,7 @@ CONFIG_HP_WMI=m
33593351
# CONFIG_THINKPAD_ACPI is not set
33603352
# CONFIG_SENSORS_HDAPS is not set
33613353
# CONFIG_INTEL_MENLOW is not set
3362-
CONFIG_ACPI_WMI=m
3354+
CONFIG_ACPI_WMI=y
33633355
# CONFIG_MSI_WMI is not set
33643356
# CONFIG_TOPSTAR_LAPTOP is not set
33653357
# CONFIG_ACPI_TOSHIBA is not set
@@ -3369,7 +3361,7 @@ CONFIG_ACPI_WMI=m
33693361
# CONFIG_IBM_RTL is not set
33703362
# CONFIG_XO15_EBOOK is not set
33713363
# CONFIG_SAMSUNG_LAPTOP is not set
3372-
# CONFIG_MXM_WMI is not set
3364+
CONFIG_MXM_WMI=y
33733365
# CONFIG_SAMSUNG_Q10 is not set
33743366
# CONFIG_APPLE_GMUX is not set
33753367
# CONFIG_INTEL_RST is not set
@@ -3569,29 +3561,8 @@ CONFIG_F2FS_STAT_FS=y
35693561
CONFIG_F2FS_CHECK_FS=y
35703562
CONFIG_EFIVAR_FS=y
35713563
CONFIG_NETWORK_FILESYSTEMS=y
3572-
CONFIG_NFS_FS=y
3573-
CONFIG_NFS_V2=y
3574-
CONFIG_NFS_V3=y
3575-
# CONFIG_NFS_V3_ACL is not set
3576-
CONFIG_NFS_V4=y
3577-
CONFIG_NFS_SWAP=y
3578-
CONFIG_NFS_V4_1=y
3579-
CONFIG_NFS_V4_2=y
3580-
CONFIG_PNFS_FILE_LAYOUT=y
3581-
CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="kernel.org"
3582-
CONFIG_NFS_V4_1_MIGRATION=y
3583-
CONFIG_ROOT_NFS=y
3584-
# CONFIG_NFS_USE_LEGACY_DNS is not set
3585-
CONFIG_NFS_USE_KERNEL_DNS=y
3564+
# CONFIG_NFS_FS is not set
35863565
# CONFIG_NFSD is not set
3587-
CONFIG_LOCKD=y
3588-
CONFIG_LOCKD_V4=y
3589-
CONFIG_NFS_COMMON=y
3590-
CONFIG_SUNRPC=y
3591-
CONFIG_SUNRPC_GSS=y
3592-
CONFIG_SUNRPC_BACKCHANNEL=y
3593-
CONFIG_SUNRPC_SWAP=y
3594-
# CONFIG_SUNRPC_DEBUG is not set
35953566
# CONFIG_CEPH_FS is not set
35963567
CONFIG_CIFS=y
35973568
CONFIG_CIFS_STATS=y
@@ -4027,7 +3998,6 @@ CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y
40273998
CONFIG_AVERAGE=y
40283999
# CONFIG_CORDIC is not set
40294000
# CONFIG_DDR is not set
4030-
CONFIG_OID_REGISTRY=y
40314001
CONFIG_UCS2_STRING=y
40324002
CONFIG_FONT_SUPPORT=y
40334003
# CONFIG_FONTS is not set

0 commit comments

Comments
 (0)