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/qemu-x86 | |
| parent | ed18fdf27be16211745a9d81dbcd3c1f1b529b75 (diff) | |
| parent | 1a1c38ece81ef998be92218ade235bc7b44d9643 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'target/qemu-x86')
| -rw-r--r-- | target/qemu-x86/Makefile | 20 | ||||
| -rw-r--r-- | target/qemu-x86/target.mk | 4 |
2 files changed, 7 insertions, 17 deletions
diff --git a/target/qemu-x86/Makefile b/target/qemu-x86/Makefile index 9ad697fb5..68e7cb728 100644 --- a/target/qemu-x86/Makefile +++ b/target/qemu-x86/Makefile @@ -7,21 +7,10 @@ include $(TOPDIR)/mk/modules.mk include $(TOPDIR)/mk/kernel-build.mk include $(TOPDIR)/mk/image.mk -kernel-install: - @cp $(LINUX_DIR)/arch/x86/boot/bzImage \ - $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel +KERNEL:=$(LINUX_DIR)/arch/x86/boot/bzImage -createinit: - @-rm $(LINUX_DIR)/usr/initramfs_data.cpio.* $(MAKE_TRACE) - $(SED) 's#^CONFIG_INITRAMFS_SOURCE.*#CONFIG_INITRAMFS_SOURCE="${BUILD_DIR}/${INITRAMFS_PIGGYBACK}"#' \ - $(LINUX_DIR)/.config - echo 'CONFIG_INITRAMFS_ROOT_UID=0' >> $(LINUX_DIR)/.config - echo 'CONFIG_INITRAMFS_ROOT_GID=0' >> $(LINUX_DIR)/.config - echo N |$(MAKE) -C $(LINUX_DIR) V=1 CROSS_COMPILE="$(TARGET_CROSS)" ARCH=$(ARCH) \ - CC="$(TARGET_CC)" oldconfig $(MAKE_TRACE) - $(MAKE) -C $(LINUX_DIR) V=1 CROSS_COMPILE="$(TARGET_CROSS)" ARCH=$(ARCH) \ - CC="$(TARGET_CC)" $(MAKE_TRACE) - @cp $(LINUX_DIR)/arch/x86/boot/bzImage $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel +kernel-install: + @cp $(KERNEL) $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel ifeq ($(FS),archive) imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL) @@ -43,7 +32,8 @@ imageinstall: $(BIN_DIR)/$(INITRAMFS) endif ifeq ($(FS),initramfs-piggyback) -imageinstall: ${BUILD_DIR}/${INITRAMFS_PIGGYBACK} createinit +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' @echo "Start qemu with following command line:" @echo 'qemu -nographic -net user,hostfwd=tcp::2222-:22 -net nic,model=e1000 -kernel $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel' diff --git a/target/qemu-x86/target.mk b/target/qemu-x86/target.mk index 39eb1651d..466b646f8 100644 --- a/target/qemu-x86/target.mk +++ b/target/qemu-x86/target.mk @@ -1,7 +1,7 @@ ARCH:= x86 CPU_ARCH:= i586 -KERNEL_VERSION:= 2.6.33 +KERNEL_VERSION:= 2.6.34 KERNEL_RELEASE:= 1 -KERNEL_MD5SUM:= c3883760b18d50e8d78819c54d579b00 +KERNEL_MD5SUM:= 10eebcb0178fb4540e2165bfd7efc7ad TARGET_OPTIMIZATION:= -Os -pipe TARGET_CFLAGS_ARCH:= -march=i586 |