diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-02-17 22:24:44 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-02-17 22:24:44 +0100 |
| commit | da133cad10885ca36be26b1b043c737e295a4cd4 (patch) | |
| tree | 3fb8e1189dce7188c4681144f96982d30c4511bd /target/linux | |
| parent | 638c9f989542642d52859a56913ae5c2ace93e69 (diff) | |
| parent | 642a45334676311b50bd2b45ae49c45f8b86c86d (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Conflicts:
TODO
Diffstat (limited to 'target/linux')
| -rw-r--r-- | target/linux/Config.in | 1 | ||||
| -rw-r--r-- | target/linux/config/Config.in.netdevice | 32 | ||||
| -rw-r--r-- | target/linux/config/Config.in.virtio | 37 |
3 files changed, 38 insertions, 32 deletions
diff --git a/target/linux/Config.in b/target/linux/Config.in index e4b81dd2f..f4ead4caf 100644 --- a/target/linux/Config.in +++ b/target/linux/Config.in @@ -25,3 +25,4 @@ source target/linux/config/Config.in.serial source target/linux/config/Config.in.spi source target/linux/config/Config.in.kvm source target/linux/config/Config.in.debug +source target/linux/config/Config.in.virtio diff --git a/target/linux/config/Config.in.netdevice b/target/linux/config/Config.in.netdevice index cdd602cd7..7d189a063 100644 --- a/target/linux/config/Config.in.netdevice +++ b/target/linux/config/Config.in.netdevice @@ -144,38 +144,6 @@ config ADK_KERNEL_B44 default n help -config ADK_KERNEL_E1000 - boolean - select ADK_KERNEL_NETDEVICES - select ADK_KERNEL_NET_ETHERNET - select ADK_KERNEL_NETDEV_1000 - default y if ADK_TARGET_SYSTEM_VBOX_I686 - default y if ADK_TARGET_SYSTEM_IBM_X40 - default y if ADK_NATIVE_SYSTEM_IBM_X40 - default y if ADK_TARGET_SYSTEM_QEMU_I686 - default y if ADK_TARGET_SYSTEM_QEMU_X86_64 - default n - help - -config ADK_KERNEL_E1000E - boolean - select ADK_KERNEL_NETDEVICES - select ADK_KERNEL_NET_ETHERNET - select ADK_KERNEL_NETDEV_1000 - default y if ADK_TARGET_SYSTEM_TAROX_PC - default y if ADK_NATIVE_SYSTEM_TAROX_PC - default n - help - -config ADK_KERNEL_SKY2 - boolean - select ADK_KERNEL_NETDEVICES - select ADK_KERNEL_NET_ETHERNET - select ADK_KERNEL_NETDEV_1000 - default y if ADK_TARGET_SYSTEM_SHUTTLE_SA76 - default n - help - config ADK_KERNEL_R8169 boolean select ADK_KERNEL_NETDEVICES diff --git a/target/linux/config/Config.in.virtio b/target/linux/config/Config.in.virtio new file mode 100644 index 000000000..4ee027baa --- /dev/null +++ b/target/linux/config/Config.in.virtio @@ -0,0 +1,37 @@ +config ADK_KERNEL_VIRTIO + boolean + +config ADK_KERNEL_VIRTIO_PCI + boolean + +config ADK_KERNEL_VIRTIO_NET + boolean + +config ADK_KERNEL_VIRTIO_BLK + boolean + +menu "Virtio driver support" +depends on !ADK_TARGET_QEMU_WITH_VIRTIO && ADK_HARDWARE_QEMU + +config ADK_KPACKAGE_KMOD_VIRTIO_NET + prompt "kmod-virtio-net.................... Virtio net driver" + tristate + select ADK_KERNEL_VIRTIO + select ADK_KERNEL_VIRTIO_PCI + depends on !ADK_KERNEL_VIRTIO_NET + default n + help + Enables support for Virtio Net driver. + +config ADK_KPACKAGE_KMOD_VIRTIO_BLK + prompt "kmod-virtio-block.................. Virtio block driver" + tristate + select ADK_KERNEL_VIRTIO + select ADK_KERNEL_VIRTIO_PCI + select ADK_KERNEL_BLK_DEV + depends on !ADK_KERNEL_VIRTIO_BLK + default n + help + Enables support for Virtio Block driver. + +endmenu |