diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2010-05-30 19:14:27 +0200 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-05-30 19:14:27 +0200 |
commit | d1336177b7215b7a638231bb1ec5fd22a87d9adb (patch) | |
tree | 65efb3b1487f0c658f02a08d97de6dc57de59254 /target/native | |
parent | ed18fdf27be16211745a9d81dbcd3c1f1b529b75 (diff) | |
parent | 1a1c38ece81ef998be92218ade235bc7b44d9643 (diff) |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'target/native')
-rw-r--r-- | target/native/Makefile | 9 | ||||
-rw-r--r-- | target/native/target.mk | 4 |
2 files changed, 10 insertions, 3 deletions
diff --git a/target/native/Makefile b/target/native/Makefile index 2b279e4ff..21fde248a 100644 --- a/target/native/Makefile +++ b/target/native/Makefile @@ -8,12 +8,19 @@ include $(TOPDIR)/mk/modules.mk include $(TOPDIR)/mk/kernel-build.mk include $(TOPDIR)/mk/image.mk +KERNEL:=$(LINUX_DIR)/arch/x86/boot/bzImage + kernel-install: ifeq ($(FS),initramfs) imageinstall: $(BIN_DIR)/$(INITRAMFS) - @cp $(LINUX_DIR)/arch/x86/boot/bzImage $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel + @cp $(KERNEL) $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel @echo 'The kernel file is: ${BIN_DIR}/${ADK_TARGET}-${FS}-kernel' @echo 'The initramfs image is: ${BIN_DIR}/${INITRAMFS}' @echo 'Login as user root with password linux123 via ssh or console' endif +ifeq ($(FS),initramfs-piggyback) +imageinstall: ${BUILD_DIR}/${INITRAMFS_PIGGYBACK} createinitramfs + @cp $(KERNEL) ${BIN_DIR}/${ADK_TARGET}-${FS}-kernel + @echo 'The kernel+initramfs file is: ${BIN_DIR}/${ADK_TARGET}-${FS}-kernel' +endif diff --git a/target/native/target.mk b/target/native/target.mk index c4eb94ace..e0af34dba 100644 --- a/target/native/target.mk +++ b/target/native/target.mk @@ -1,6 +1,6 @@ ARCH:= $(shell uname -m|sed -e "s/i.*86/x86/" -e "s/_\?64//") CPU_ARCH:= $(shell uname -m) -KERNEL_VERSION:= 2.6.33 +KERNEL_VERSION:= 2.6.34 KERNEL_RELEASE:= 1 -KERNEL_MD5SUM:= c3883760b18d50e8d78819c54d579b00 +KERNEL_MD5SUM:= 10eebcb0178fb4540e2165bfd7efc7ad TARGET_OPTIMIZATION:= -Os -pipe |