diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2013-11-07 13:46:43 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2013-11-07 13:46:43 +0100 |
| commit | 79be206de9335752c6355995961b69846c641410 (patch) | |
| tree | 76c9b28a3406227dcf1dd924467a659a213770d9 /target | |
| parent | 8cc6444e13a2670407eedee0d417cee6b3ce03e8 (diff) | |
| parent | 048f67743435770ed358a9d79323c0a4e04d8c68 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'target')
| -rw-r--r-- | target/linux/config/Config.in.usb | 2 | ||||
| -rw-r--r-- | target/mips/sys-available/qemu-mips64 | 1 | ||||
| -rw-r--r-- | target/mips/sys-available/qemu-mips64el | 1 | ||||
| -rw-r--r-- | target/packages/pkg-available/xorg | 2 | ||||
| -rw-r--r-- | target/x86/sys-available/qemu-i686 | 1 | ||||
| -rw-r--r-- | target/x86_64/sys-available/qemu-x86_64 | 2 |
6 files changed, 8 insertions, 1 deletions
diff --git a/target/linux/config/Config.in.usb b/target/linux/config/Config.in.usb index 1459039b6..e2e3051da 100644 --- a/target/linux/config/Config.in.usb +++ b/target/linux/config/Config.in.usb @@ -176,6 +176,8 @@ config ADK_KPACKAGE_KMOD_USB_EHCI_HCD depends on !ADK_TARGET_SYSTEM_FOXBOARD_LX depends on !ADK_TARGET_SYSTEM_RASPBERRY_PI depends on ADK_KPACKAGE_KMOD_USB + default y if ADK_TARGET_SYSTEM_QEMU_I686 + default y if ADK_TARGET_SYSTEM_QEMU_X86_64 default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D2 default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D13 diff --git a/target/mips/sys-available/qemu-mips64 b/target/mips/sys-available/qemu-mips64 index d5335caa9..ce0e1298c 100644 --- a/target/mips/sys-available/qemu-mips64 +++ b/target/mips/sys-available/qemu-mips64 @@ -4,6 +4,7 @@ config ADK_TARGET_SYSTEM_QEMU_MIPS64 select ADK_big select ADK_qemu_mips64 select ADK_KERNEL_MIPS_MALTA + select ADK_KERNEL_PAGE_SIZE_4KB select ADK_KERNEL_CPU_BIG_ENDIAN select ADK_CPU_MIPS64 select ADK_HARDWARE_QEMU diff --git a/target/mips/sys-available/qemu-mips64el b/target/mips/sys-available/qemu-mips64el index 05b6ed834..37c6be164 100644 --- a/target/mips/sys-available/qemu-mips64el +++ b/target/mips/sys-available/qemu-mips64el @@ -4,6 +4,7 @@ config ADK_TARGET_SYSTEM_QEMU_MIPS64EL select ADK_little select ADK_qemu_mips64el select ADK_KERNEL_MIPS_MALTA + select ADK_KERNEL_PAGE_SIZE_4KB select ADK_KERNEL_CPU_LITTLE_ENDIAN select ADK_KERNEL_CPU_MIPS64 select ADK_KERNEL_CPU_MIPS64_R1 diff --git a/target/packages/pkg-available/xorg b/target/packages/pkg-available/xorg index 5a41eede2..fdb5667da 100644 --- a/target/packages/pkg-available/xorg +++ b/target/packages/pkg-available/xorg @@ -22,6 +22,8 @@ config ADK_PKG_XORG select ADK_PACKAGE_XF86_VIDEO_INTEL if ADK_TARGET_SYSTEM_IBM_X40 select ADK_PACKAGE_XF86_VIDEO_SILICONMOTION if ADK_TARGET_SYSTEM_LEMOTE_YEELONG select ADK_PACKAGE_XF86_VIDEO_INTEL if ADK_TARGET_SYSTEM_TAROX_PC + select ADK_PACKAGE_XF86_VIDEO_CIRRUS if ADK_TARGET_SYSTEM_QEMU_I686 + select ADK_PACKAGE_XF86_VIDEO_CIRRUS if ADK_TARGET_SYSTEM_QEMU_X86_64 select ADK_PACKAGE_FONT_MISC_MISC select ADK_PACKAGE_SETXKBMAP select ADK_PACKAGE_XBINDKEYS diff --git a/target/x86/sys-available/qemu-i686 b/target/x86/sys-available/qemu-i686 index d77d074e3..e78d6579b 100644 --- a/target/x86/sys-available/qemu-i686 +++ b/target/x86/sys-available/qemu-i686 @@ -8,6 +8,7 @@ config ADK_TARGET_SYSTEM_QEMU_I686 select ADK_TARGET_WITH_INPUT select ADK_TARGET_WITH_PCI select ADK_TARGET_WITH_HDD + select ADK_TARGET_WITH_USB help Support for Qemu Emulator (i686). diff --git a/target/x86_64/sys-available/qemu-x86_64 b/target/x86_64/sys-available/qemu-x86_64 index bf3079be7..abffcaae9 100644 --- a/target/x86_64/sys-available/qemu-x86_64 +++ b/target/x86_64/sys-available/qemu-x86_64 @@ -7,9 +7,9 @@ config ADK_TARGET_SYSTEM_QEMU_X86_64 select ADK_HARDWARE_QEMU select ADK_TARGET_WITH_VGA select ADK_TARGET_WITH_INPUT - select ADK_TARGET_WITH_USB select ADK_TARGET_WITH_PCI select ADK_TARGET_WITH_HDD + select ADK_TARGET_WITH_USB select ADK_TARGET_KERNEL_MAY_64BIT help Support for Qemu Emulator. |