summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2014-02-16 14:47:05 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2014-02-16 14:47:05 +0100
commitc062739e40050cc48de91fc4f7bf5c95d57e3963 (patch)
tree1c5a34b62e032e50658b5ce491ba05d99e1cc32c /mk
parentbb54dac334f360b33533d89af8b7823b83df39cf (diff)
parent6fccc935878c544f9b94ab234eb2dbe87c3c49df (diff)
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'mk')
-rw-r--r--mk/modules.mk11
-rw-r--r--mk/rootfs.mk3
2 files changed, 14 insertions, 0 deletions
diff --git a/mk/modules.mk b/mk/modules.mk
index f5660ba97..00667de3e 100644
--- a/mk/modules.mk
+++ b/mk/modules.mk
@@ -1736,3 +1736,14 @@ $(eval $(call KMOD_template,SCx200_ACB,scx200-acb,\
$(MODULES_DIR)/kernel/drivers/i2c/busses/scx200_acb \
,25))
+#
+# VirtIO
+#
+$(eval $(call KMOD_template,VIRTIO_BLK,virtio-block,\
+ $(MODULES_DIR)/kernel/drivers/net/virtio_blk \
+,20))
+
+$(eval $(call KMOD_template,VIRTIO_NET,virtio-net,\
+ $(MODULES_DIR)/kernel/drivers/net/virtio_net \
+,40))
+
diff --git a/mk/rootfs.mk b/mk/rootfs.mk
index f1d0bdf3a..5ec5f3107 100644
--- a/mk/rootfs.mk
+++ b/mk/rootfs.mk
@@ -13,6 +13,9 @@ MTDDEV:= root=/dev/mtdblock0
ifeq ($(ADK_TARGET_ROOTFS_ARCHIVE),y)
ROOTFS:= root=/dev/sda1
endif
+ifeq ($(ADK_TARGET_QEMU_WITH_VIRTIO),y)
+ROOTFS:= root=/dev/vda1
+endif
endif
ifeq ($(ADK_TARGET_SYSTEM_MIKROTIK_RB532),y)