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 /mk | |
| parent | 638c9f989542642d52859a56913ae5c2ace93e69 (diff) | |
| parent | 642a45334676311b50bd2b45ae49c45f8b86c86d (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Conflicts:
TODO
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/build.mk | 2 | ||||
| -rw-r--r-- | mk/kernel-ver.mk | 4 | ||||
| -rw-r--r-- | mk/modules.mk | 11 | ||||
| -rw-r--r-- | mk/rootfs.mk | 3 | ||||
| -rw-r--r-- | mk/vars.mk | 2 |
5 files changed, 18 insertions, 4 deletions
diff --git a/mk/build.mk b/mk/build.mk index 77b70a3f8..07fcbc793 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -544,7 +544,7 @@ endif # ! ifeq ($(strip $(ADK_HAVE_DOT_CONFIG)),y) # build all target architecture and libc combinations (toolchain only) bulktoolchain: - for libc in uclibc eglibc glibc;do \ + for libc in uclibc eglibc glibc musl;do \ while read arch; do \ mkdir -p $(TOPDIR)/bin/toolchain_$${arch}_$$libc; \ ( \ diff --git a/mk/kernel-ver.mk b/mk/kernel-ver.mk index ae4a99069..34c639a62 100644 --- a/mk/kernel-ver.mk +++ b/mk/kernel-ver.mk @@ -1,8 +1,8 @@ ifeq ($(ADK_KERNEL_VERSION_TOOLCHAIN),y) -KERNEL_VERSION:= 3.11.10 +KERNEL_VERSION:= 3.12.6 KERNEL_MOD_VERSION:= $(KERNEL_VERSION) KERNEL_RELEASE:= 1 -KERNEL_MD5SUM:= 59f352d3f4e2cdf6755f79e09fa09176 +KERNEL_MD5SUM:= ab2fcc368e20d804e77970196154fb9e endif ifeq ($(ADK_KERNEL_VERSION_3_12_6),y) KERNEL_VERSION:= 3.12.6 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) diff --git a/mk/vars.mk b/mk/vars.mk index 014017ee8..bc6689cb8 100644 --- a/mk/vars.mk +++ b/mk/vars.mk @@ -82,7 +82,7 @@ TARGET_CFLAGS_LIBC:= $(TARGET_CFLAGS_ARCH) -fwrapv -fno-ident -fhonour-copts $(T endif TARGET_CXXFLAGS:= $(TARGET_CFLAGS_ARCH) -fwrapv -fno-ident TARGET_LDFLAGS:= -L$(STAGING_TARGET_DIR)/lib -L$(STAGING_TARGET_DIR)/usr/lib \ - -Wl,-O2 -Wl,-rpath -Wl,/usr/lib \ + -Wl,-O1 -Wl,-rpath -Wl,/usr/lib \ -Wl,-rpath-link -Wl,${STAGING_TARGET_DIR}/usr/lib \ $(ADK_TARGET_ABI_LDFLAGS) $(TARGET_CFLAGS_ARCH) # security optimization, see http://www.akkadia.org/drepper/dsohowto.pdf |