From 2ff878036044b856227caa4a53d2caf2736614ac Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 18 Nov 2010 18:00:52 +0100 Subject: convert qemu for x86/x86_64 to hardware profiles --- target/x86_64/Makefile | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) (limited to 'target/x86_64/Makefile') diff --git a/target/x86_64/Makefile b/target/x86_64/Makefile index f5084a2db..84b02e9c2 100644 --- a/target/x86_64/Makefile +++ b/target/x86_64/Makefile @@ -13,15 +13,35 @@ ifeq ($(FS),archive) imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL) @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}/${ROOTFSTARBALL}' + @echo 'The RootFS tarball is: ${BIN_DIR}/${ROOTFSTARBALL}' +ifeq ($(ADK_HARDWARE_QEMU_X86_64),y) + @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,model=e1000 -kernel $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel qemu-${CPU_ARCH}.img' +endif endif ifeq ($(FS),usb) imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL) @echo "The RootFS tarball is: $(BIN_DIR)/$(ROOTFSTARBALL)" @echo "To install everything to USB use scripts/install.sh" endif +ifeq ($(FS),initramfs) +imageinstall: $(BIN_DIR)/$(INITRAMFS) + @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}' +ifeq ($(ADK_HARDWARE_QEMU_X86_64),y) + @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 -initrd ${BIN_DIR}/${INITRAMFS}' +endif +endif ifeq ($(FS),initramfs-piggyback) imageinstall: ${BUILD_DIR}/${INITRAMFS_PIGGYBACK} createinitramfs @cp $(KERNEL) $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel @echo 'The kernel file is: ${BIN_DIR}/${ADK_TARGET}-${FS}-kernel' +ifeq ($(ADK_HARDWARE_QEMU_X86_64),y) + @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' +endif endif -- cgit v1.2.3 From 434f07ef1c5d536e9e94561b5e7a066f1d9cd954 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 18 Nov 2010 20:12:49 +0100 Subject: optimize shuttle and ibmx40 hardware profile --- target/x86_64/Makefile | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'target/x86_64/Makefile') diff --git a/target/x86_64/Makefile b/target/x86_64/Makefile index 84b02e9c2..b206f5f13 100644 --- a/target/x86_64/Makefile +++ b/target/x86_64/Makefile @@ -9,6 +9,12 @@ include $(TOPDIR)/mk/image.mk KERNEL:=$(LINUX_DIR)/arch/x86/boot/bzImage +$(TOOLS_BUILD_DIR): + @mkdir -p $(TOOLS_BUILD_DIR) + +tools-compile: $(TOOLS_BUILD_DIR) + $(MAKE) -C ../tools/grub prepare compile install + ifeq ($(FS),archive) imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL) @cp $(KERNEL) $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel @@ -22,7 +28,7 @@ ifeq ($(ADK_HARDWARE_QEMU_X86_64),y) endif endif ifeq ($(FS),usb) -imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL) +imageinstall: tools-compile $(BIN_DIR)/$(ROOTFSTARBALL) @echo "The RootFS tarball is: $(BIN_DIR)/$(ROOTFSTARBALL)" @echo "To install everything to USB use scripts/install.sh" endif -- cgit v1.2.3