diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2013-12-08 20:37:42 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2013-12-08 20:37:42 +0100 |
| commit | 0d1648364f45bf64f2e968111a3391c70732371e (patch) | |
| tree | ce0ca8c8ca9747434a8ca897dda3100b801c9a64 /mk | |
| parent | e45bc457ab9015c50a9f4e22ac248d780de826fe (diff) | |
| parent | d89250d99adb969fc91595a63651ec9c927d68e8 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/kernel-build.mk | 4 | ||||
| -rw-r--r-- | mk/vars.mk | 5 |
2 files changed, 9 insertions, 0 deletions
diff --git a/mk/kernel-build.mk b/mk/kernel-build.mk index 3f055e255..59a68eb88 100644 --- a/mk/kernel-build.mk +++ b/mk/kernel-build.mk @@ -7,6 +7,10 @@ include ${TOPDIR}/mk/kernel-vars.mk KERNEL_FILE:=$(ADK_TARGET_KERNEL) KERNEL_TARGET:=$(ADK_TARGET_KERNEL) +ifeq ($(ADK_TARGET_KERNEL_LINUXBIN),y) +KERNEL_FILE:=vmlinux +KERNEL_TARGET:=$(ADK_TARGET_KERNEL) +endif ifeq ($(ADK_TARGET_KERNEL_ZIMAGE),y) KERNEL_FILE:=vmlinux KERNEL_TARGET:=$(ADK_TARGET_KERNEL) diff --git a/mk/vars.mk b/mk/vars.mk index 50e02a204..9f4f8f0b9 100644 --- a/mk/vars.mk +++ b/mk/vars.mk @@ -75,8 +75,13 @@ TARGET_CXX:= ${TARGET_COMPILER_PREFIX}g++ TARGET_LD:= ${TARGET_COMPILER_PREFIX}ld 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) TARGET_CFLAGS_LIBC:= $(TARGET_CFLAGS_ARCH) -fwrapv -fno-ident -fhonour-copts $(TARGET_OPTIMIZATION) +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 \ |