diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-01 09:32:47 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-01 09:32:47 +0100 |
| commit | bba1d4f4e14ee3a0bf55ab88caa70dc7f7667d95 (patch) | |
| tree | d1090994d50da48ac08d0d817c1d48ffac913efa /mk | |
| parent | b700bbdede249dd290dc67ff2ebdaf730e3ffa6a (diff) | |
| parent | e5c844f443a59fca7b421518682f5ae113a7a49f (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/build.mk | 2 | ||||
| -rw-r--r-- | mk/kernel-ver.mk | 2 | ||||
| -rw-r--r-- | mk/vars.mk | 5 |
3 files changed, 2 insertions, 7 deletions
diff --git a/mk/build.mk b/mk/build.mk index d6fd9b20c..90fce65a8 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -535,7 +535,7 @@ bulktoolchain: $(GMAKE) prereq && \ $(GMAKE) ARCH=$$tarch SYSTEM=toolchain-$$arch LIBC=$$libc defconfig; \ $(GMAKE) VERBOSE=1 all; if [ $$? -ne 0 ]; then touch .exit;fi; \ - tar -cJf ${TOPDIR}/firmware/toolchain_$${arch}_$${libc}.tar.xz host_$${arch}_*_$${libc} target_$${arch}_*_$${libc}; \ + tar -cvJf ${TOPDIR}/firmware/toolchain_$${arch}_$${libc}.tar.xz host_$${arch}_*_$${libc} target_$${arch}_*_$${libc}; \ rm .config; \ ) 2>&1 | tee $(TOPDIR)/firmware/toolchain_$${arch}_$${libc}/build.log; \ if [ -f .exit ];then break;fi \ diff --git a/mk/kernel-ver.mk b/mk/kernel-ver.mk index 17f189d04..09362fbae 100644 --- a/mk/kernel-ver.mk +++ b/mk/kernel-ver.mk @@ -2,7 +2,7 @@ ifeq ($(ADK_KERNEL_VERSION_TOOLCHAIN),y) KERNEL_VERSION:= 3.12.13 KERNEL_MOD_VERSION:= $(KERNEL_VERSION) KERNEL_RELEASE:= 1 -KERNEL_MD5SUM:= c5b0775d187bc79992bae17ae781de1e +KERNEL_MD5SUM:= 345f5883cfb906dac4aef87e303d3a2d endif ifeq ($(ADK_KERNEL_VERSION_3_13_5),y) KERNEL_VERSION:= 3.13.5 diff --git a/mk/vars.mk b/mk/vars.mk index a9b213e4c..a0898ae2d 100644 --- a/mk/vars.mk +++ b/mk/vars.mk @@ -86,13 +86,8 @@ endif endif TARGET_CPPFLAGS:= -ifeq ($(ADK_LINUX_MICROBLAZE),y) -TARGET_CFLAGS:= $(TARGET_CFLAGS_ARCH) -fwrapv -fno-ident $(ADK_TARGET_ABI_CFLAGS) -TARGET_CFLAGS_LIBC:= $(TARGET_CFLAGS_ARCH) -fwrapv -fno-ident $(TARGET_OPTIMIZATION) -else TARGET_CFLAGS:= $(TARGET_CFLAGS_ARCH) -fwrapv -fno-ident -fhonour-copts $(ADK_TARGET_ABI_CFLAGS) $(MODE_FLAGS) TARGET_CFLAGS_LIBC:= $(TARGET_CFLAGS_ARCH) -fwrapv -fno-ident -fhonour-copts $(TARGET_OPTIMIZATION) $(MODE_FLAGS) -endif TARGET_CXXFLAGS:= $(TARGET_CFLAGS_ARCH) -fwrapv -fno-ident $(MODE_FLAGS) TARGET_LDFLAGS:= -L$(STAGING_TARGET_DIR)/lib -L$(STAGING_TARGET_DIR)/usr/lib \ -Wl,-O1 -Wl,-rpath -Wl,/usr/lib \ |