diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-09-17 15:29:05 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-09-17 15:29:05 +0200 |
| commit | b2e4bbd4e62982852b8a7da8f618d01d2013641e (patch) | |
| tree | 968e7998c78e750162e60c747ab039f78d2f8289 /target/native | |
| parent | 1a2a22729ff0256725a3561e46f465efc18801f7 (diff) | |
| parent | d6aaf0be5bfa8e5944d9ae44cf175f9388564ac6 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Conflicts:
package/binutils/Makefile
Diffstat (limited to 'target/native')
| -rw-r--r-- | target/native/Makefile | 4 | ||||
| -rw-r--r-- | target/native/target.mk | 18 |
2 files changed, 19 insertions, 3 deletions
diff --git a/target/native/Makefile b/target/native/Makefile index 63eeb1842..0904cb491 100644 --- a/target/native/Makefile +++ b/target/native/Makefile @@ -8,7 +8,11 @@ include $(TOPDIR)/mk/modules.mk include $(TOPDIR)/mk/kernel-build.mk include $(TOPDIR)/mk/image.mk +ifeq ($(CPU_ARCH),i686) +KERNEL:=$(LINUX_DIR)/arch/x86/boot/bzImage +else KERNEL:=$(LINUX_DIR)/vmlinuz +endif ifeq ($(FS),initramfs) imageinstall: $(BIN_DIR)/$(INITRAMFS) diff --git a/target/native/target.mk b/target/native/target.mk index e0af34dba..bc6beb034 100644 --- a/target/native/target.mk +++ b/target/native/target.mk @@ -1,6 +1,18 @@ ARCH:= $(shell uname -m|sed -e "s/i.*86/x86/" -e "s/_\?64//") -CPU_ARCH:= $(shell uname -m) -KERNEL_VERSION:= 2.6.34 +CPU_ARCH:= $(shell gcc -dumpmachine | sed -e s'/-.*//' \ + -e 's/sparc.*/sparc/' \ + -e 's/arm.*/arm/g' \ + -e 's/m68k.*/m68k/' \ + -e 's/ppc/powerpc/g' \ + -e 's/v850.*/v850/g' \ + -e 's/sh[234]/sh/' \ + -e 's/mips-.*/mips/' \ + -e 's/mipsel-.*/mipsel/' \ + -e 's/cris.*/cris/' \ + -e 's/i[3-9]86/i686/' \ + ) +KERNEL_VERSION:= 2.6.35 KERNEL_RELEASE:= 1 -KERNEL_MD5SUM:= 10eebcb0178fb4540e2165bfd7efc7ad +KERNEL_MD5SUM:= 091abeb4684ce03d1d936851618687b6 TARGET_OPTIMIZATION:= -Os -pipe +TARGET_CFLAGS_ARCH:= -march=native |