diff options
Diffstat (limited to 'target')
| -rw-r--r-- | target/Config.in | 7 | ||||
| -rw-r--r-- | target/linux/config/Config.in.graphics | 35 | ||||
| -rw-r--r-- | target/linux/patches/2.6.36/drm-kconfig.patch | 34 | ||||
| -rw-r--r-- | target/x86/kernel.config | 20 |
4 files changed, 87 insertions, 9 deletions
diff --git a/target/Config.in b/target/Config.in index a28f4bb29..704c7a561 100644 --- a/target/Config.in +++ b/target/Config.in @@ -137,9 +137,16 @@ config ADK_x86_64 config ADK_x86 tristate +config ADK_ibmx40 + boolean + +config ADK_shuttle + boolean + config ADK_HW string default "ibmx40" if ADK_ibmx40 + default "shuttle" if ADK_shuttle config ADK_TARGET string diff --git a/target/linux/config/Config.in.graphics b/target/linux/config/Config.in.graphics index 0bd468de1..bd737fc70 100644 --- a/target/linux/config/Config.in.graphics +++ b/target/linux/config/Config.in.graphics @@ -9,6 +9,26 @@ config ADK_KERNEL_FRAMEBUFFER_CONSOLE config ADK_KERNEL_FB_GEODE boolean default n + +config ADK_KERNEL_DRM + boolean + default n + +config ADK_KERNEL_DRM_I915 + boolean + default n + +config ADK_KERNEL_DRM_I915_KMS + boolean + default n + +config ADK_KERNEL_AGP + boolean + default n + +config ADK_KERNEL_AGP_INTEL + boolean + default n menu "Graphic devices support" @@ -22,5 +42,20 @@ config ADK_KERNEL_FB_GEODE_LX default n help Framebuffer support for ALIX boards. + +config ADK_HARDWARE_GRAPHICS_INTEL + prompt "graphics-intel.................. support for intel graphic cards (AGP/DRM/KMS)" + boolean + select ADK_KERNEL_FB + select ADK_KERNEL_DRM + select ADK_KERNEL_AGP + select ADK_KERNEL_AGP_INTEL + select ADK_KERNEL_FRAMEBUFFER_CONSOLE + select ADK_KERNEL_DRM_I915_KMS + select ADK_KERNEL_DRM_I915 + default y if ADK_HARDWARE_IBMX40 + default n + help + DRM support for intel chipsets. endmenu diff --git a/target/linux/patches/2.6.36/drm-kconfig.patch b/target/linux/patches/2.6.36/drm-kconfig.patch new file mode 100644 index 000000000..aad193c97 --- /dev/null +++ b/target/linux/patches/2.6.36/drm-kconfig.patch @@ -0,0 +1,34 @@ +diff -Nur linux-2.6.36.orig/drivers/gpu/drm/Kconfig linux-2.6.36/drivers/gpu/drm/Kconfig +--- linux-2.6.36.orig/drivers/gpu/drm/Kconfig 2010-10-20 22:30:22.000000000 +0200 ++++ linux-2.6.36/drivers/gpu/drm/Kconfig 2010-11-24 23:08:39.707247343 +0100 +@@ -79,21 +79,6 @@ + selected, the module will be called i810. AGP support is required + for this driver to work. + +-choice +- prompt "Intel 830M, 845G, 852GM, 855GM, 865G" +- depends on DRM && AGP && AGP_INTEL +- optional +- +-config DRM_I830 +- tristate "i830 driver" +- help +- Choose this option if you have a system that has Intel 830M, 845G, +- 852GM, 855GM or 865G integrated graphics. If M is selected, the +- module will be called i830. AGP support is required for this driver +- to work. This driver is used by the older X releases X.org 6.7 and +- XFree86 4.3. If unsure, build this and i915 as modules and the X server +- will load the correct one. +- + config DRM_I915 + tristate "i915 driver" + depends on AGP_INTEL +@@ -127,8 +112,6 @@ + the driver to bind to PCI devices, which precludes loading things + like intelfb. + +-endchoice +- + config DRM_MGA + tristate "Matrox g200/g400" + depends on DRM && PCI diff --git a/target/x86/kernel.config b/target/x86/kernel.config index b7e4514b8..80b42f0f6 100644 --- a/target/x86/kernel.config +++ b/target/x86/kernel.config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.36 -# Thu Nov 18 19:58:19 2010 +# Wed Nov 24 20:35:48 2010 # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -129,7 +129,7 @@ CONFIG_HAVE_PERF_EVENTS=y CONFIG_PERF_EVENTS=y # CONFIG_PERF_COUNTERS is not set # CONFIG_VM_EVENT_COUNTERS is not set -# CONFIG_PCI_QUIRKS is not set +CONFIG_PCI_QUIRKS=y # CONFIG_COMPAT_BRK is not set CONFIG_SLAB=y # CONFIG_SLUB is not set @@ -285,12 +285,12 @@ CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y CONFIG_VM86=y # CONFIG_TOSHIBA is not set # CONFIG_I8K is not set -# CONFIG_X86_REBOOTFIXUPS is not set +CONFIG_X86_REBOOTFIXUPS=y # CONFIG_MICROCODE is not set # CONFIG_X86_MSR is not set # CONFIG_X86_CPUID is not set -CONFIG_NOHIGHMEM=y -# CONFIG_HIGHMEM4G is not set +# CONFIG_NOHIGHMEM is not set +CONFIG_HIGHMEM4G=y # CONFIG_HIGHMEM64G is not set CONFIG_VMSPLIT_3G=y # CONFIG_VMSPLIT_3G_OPT is not set @@ -298,7 +298,7 @@ CONFIG_VMSPLIT_3G=y # CONFIG_VMSPLIT_2G_OPT is not set # CONFIG_VMSPLIT_1G is not set CONFIG_PAGE_OFFSET=0xC0000000 -# CONFIG_X86_PAE is not set +CONFIG_HIGHMEM=y # CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set CONFIG_NEED_NODE_MEMMAP_SIZE=y CONFIG_ARCH_FLATMEM_ENABLE=y @@ -311,6 +311,7 @@ CONFIG_SPARSEMEM_MANUAL=y CONFIG_SPARSEMEM=y CONFIG_HAVE_MEMORY_PRESENT=y CONFIG_SPARSEMEM_STATIC=y +# CONFIG_MEMORY_HOTPLUG is not set CONFIG_SPLIT_PTLOCK_CPUS=4 # CONFIG_PHYS_ADDR_T_64BIT is not set CONFIG_ZONE_DMA_FLAG=1 @@ -318,13 +319,12 @@ CONFIG_BOUNCE=y CONFIG_VIRT_TO_BUS=y # CONFIG_KSM is not set CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 +# CONFIG_HIGHPTE is not set # CONFIG_X86_CHECK_BIOS_CORRUPTION is not set # CONFIG_X86_RESERVE_LOW_64K is not set # CONFIG_MATH_EMULATION is not set CONFIG_MTRR=y -CONFIG_MTRR_SANITIZER=y -CONFIG_MTRR_SANITIZER_ENABLE_DEFAULT=0 -CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1 +# CONFIG_MTRR_SANITIZER is not set # CONFIG_X86_PAT is not set # CONFIG_SECCOMP is not set # CONFIG_CC_STACKPROTECTOR is not set @@ -335,6 +335,7 @@ CONFIG_HZ_250=y CONFIG_HZ=250 # CONFIG_SCHED_HRTICK is not set # CONFIG_KEXEC is not set +# CONFIG_CRASH_DUMP is not set CONFIG_PHYSICAL_START=0x200000 # CONFIG_RELOCATABLE is not set CONFIG_PHYSICAL_ALIGN=0x200000 @@ -342,6 +343,7 @@ CONFIG_PHYSICAL_ALIGN=0x200000 CONFIG_CMDLINE_BOOL=y CONFIG_CMDLINE="console=tty0 console=ttyS0,115200n8" # CONFIG_CMDLINE_OVERRIDE is not set +CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y # # Power management and ACPI options |