summaryrefslogtreecommitdiff
path: root/target/qemu-x86_64/Makefile
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2010-05-29 14:29:22 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2010-05-29 14:29:22 +0200
commit92dd4fee15cb7c33868c7d7213f82136955397b1 (patch)
treed3a7425301688d031af4e1bc3fa880ec07ff580c /target/qemu-x86_64/Makefile
parent8dc970500b284b1e211551f0492adf5a99f4d715 (diff)
upgrade all targets to Linux 2.6.34
Diffstat (limited to 'target/qemu-x86_64/Makefile')
-rw-r--r--target/qemu-x86_64/Makefile20
1 files changed, 5 insertions, 15 deletions
diff --git a/target/qemu-x86_64/Makefile b/target/qemu-x86_64/Makefile
index 0ac3f3ecf..9d6a8f5b4 100644
--- a/target/qemu-x86_64/Makefile
+++ b/target/qemu-x86_64/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)
@@ -44,7 +33,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-system-x86_64 -nographic -net user,hostfwd=tcp::2222-:22 -net nic,model=e1000 -kernel $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel'