summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2014-03-01 09:07:37 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2014-03-01 09:07:37 +0100
commit36b959a9b9a450f0789ecc6d10292efbc1f1eccd (patch)
tree7ba439de3f1ea0a6c3f39253ed17d9a910dc28cc /mk
parentf059dbadc9ba64b475511622166db0719ec91193 (diff)
remove armeb, no hardware, no emulator to test, add armhf instead. fix some toolchain archive creation issues, remove unneeded files before packaging.
Diffstat (limited to 'mk')
-rw-r--r--mk/build.mk2
-rw-r--r--mk/kernel-ver.mk2
-rw-r--r--mk/vars.mk5
3 files changed, 2 insertions, 7 deletions
diff --git a/mk/build.mk b/mk/build.mk
index eadccdcb3..9be651dd0 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 427b5b4ec..4fcff2ade 100644
--- a/mk/vars.mk
+++ b/mk/vars.mk
@@ -82,13 +82,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 \