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/Makefile | |
| 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/Makefile')
| -rw-r--r-- | target/native/Makefile | 4 |
1 files changed, 4 insertions, 0 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) |