diff options
| author | U-windows7\wbx <wbx@windows7.(none)> | 2009-12-20 13:29:10 +0100 |
|---|---|---|
| committer | U-windows7\wbx <wbx@windows7.(none)> | 2009-12-20 13:29:10 +0100 |
| commit | 9115ff8b3139bab8ebc2d25f1ec03a98b2641c99 (patch) | |
| tree | 2c7535d8970d7ebf5a7b5613fc3324b3200c0645 /target/qemu-x86 | |
| parent | 82009b8fa77db023dd186444e2698a5d9c01d496 (diff) | |
| parent | 6b65886e809bdbfd7699e7fbbc8980f5eb4992c4 (diff) | |
Merge branch 'master' of git://openadk.org/git/openadk
Diffstat (limited to 'target/qemu-x86')
| -rw-r--r-- | target/qemu-x86/Makefile | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/target/qemu-x86/Makefile b/target/qemu-x86/Makefile index 75404b25c..d9828d77f 100644 --- a/target/qemu-x86/Makefile +++ b/target/qemu-x86/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/mk/kernel-build.mk include $(TOPDIR)/mk/image.mk kernel-install: - @cp $(LINUX_DIR)/arch/x86/boot/bzImage $(BIN_DIR)/${ADK_TARGET}-${ARCH}-kernel + @cp $(LINUX_DIR)/arch/x86/boot/bzImage $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel createinit: @-rm $(LINUX_DIR)/usr/initramfs_data.cpio.* @@ -20,7 +20,7 @@ createinit: 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}-${ARCH}-kernel + @cp $(LINUX_DIR)/arch/x86/boot/bzImage $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel ifeq ($(FS),archive) imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL) @@ -28,27 +28,27 @@ imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL) @echo "Use following command to create a QEMU Image:" @echo "sudo ./scripts/create-image.sh -f ${ADK_TARGET_ROOTFS} qemu-${CPU_ARCH}.img $(BIN_DIR)/$(ROOTFSTARBALL)" @echo "Start qemu with following command line:" - @echo 'qemu -nographic -net user,hostfwd=tcp::2222-:22 -net nic -kernel $(BIN_DIR)/${ADK_TARGET}-${ARCH}-kernel qemu-${CPU_ARCH}.img' + @echo 'qemu -nographic -net user,hostfwd=tcp::2222-:22 -net nic -kernel $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel qemu-${CPU_ARCH}.img' @echo 'Login as user root with password linux123 via ssh or console' endif ifeq ($(FS),initramfs) imageinstall: $(BIN_DIR)/$(INITRAMFS) - @echo 'The kernel file is: ${BIN_DIR}/${ADK_TARGET}-${ARCH}-kernel' + @echo 'The kernel file is: ${BIN_DIR}/${ADK_TARGET}-${FS}-kernel' @echo 'The initramfs image is: ${BIN_DIR}/${INITRAMFS}' @echo 'You need a dummy qemu.img, create it with:' @echo 'qemu-img create -f raw qemu.img 1M' @echo "Start qemu with following command line:" - @echo 'qemu -nographic -net user,hostfwd=tcp::2222-:22 -net nic -kernel $(BIN_DIR)/${ADK_TARGET}-${ARCH}-kernel -initrd ${BIN_DIR}/${INITRAMFS} qemu.img' + @echo 'qemu -nographic -net user,hostfwd=tcp::2222-:22 -net nic -kernel $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel -initrd ${BIN_DIR}/${INITRAMFS} qemu.img' @echo 'Login as user root with password linux123 via ssh or console' endif ifeq ($(FS),initramfs-piggyback) imageinstall: ${BUILD_DIR}/${INITRAMFS_PIGGYBACK} createinit - @echo 'The kernel+initramfs file is: ${BIN_DIR}/${ADK_TARGET}-${ARCH}-kernel' + @echo 'The kernel+initramfs file is: ${BIN_DIR}/${ADK_TARGET}-${FS}-kernel' @echo 'You need a dummy qemu.img, create it with:' @echo 'qemu-img create -f raw qemu.img 1M' @echo "Start qemu with following command line:" - @echo 'qemu -nographic -net user,hostfwd=tcp::2222-:22 -net nic -kernel $(BIN_DIR)/${ADK_TARGET}-${ARCH}-kernel qemu.img' + @echo 'qemu -nographic -net user,hostfwd=tcp::2222-:22 -net nic -kernel $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel qemu.img' @echo 'Login as user root with password linux123 via ssh or console' endif |