diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2009-12-06 22:47:54 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2009-12-06 22:47:54 +0100 |
| commit | b5aee3bd1ae0337b8dbd7512968cebf39d1eae13 (patch) | |
| tree | e0f638580e51628da34fbf14d30ca521ee339bbc /target/qemu-x86_64 | |
| parent | 0151157c0f04799a8c4673fc430c6bfebda83d7e (diff) | |
rework qemu for x86/x86_64
- do not use grub bootloader
- enable kernel+initramfs targets
- use sata drivers by default
Diffstat (limited to 'target/qemu-x86_64')
| -rw-r--r-- | target/qemu-x86_64/Makefile | 32 |
1 files changed, 27 insertions, 5 deletions
diff --git a/target/qemu-x86_64/Makefile b/target/qemu-x86_64/Makefile index f843b9aba..369d4fabd 100644 --- a/target/qemu-x86_64/Makefile +++ b/target/qemu-x86_64/Makefile @@ -8,15 +8,26 @@ include $(TOPDIR)/mk/kernel-build.mk include $(TOPDIR)/mk/image.mk kernel-install: - cp $(LINUX_DIR)/arch/x86/boot/bzImage $(TARGET_DIR)/boot/kernel + @cp $(LINUX_DIR)/arch/x86/boot/bzImage $(BIN_DIR)/${ADK_TARGET}-${ARCH}-kernel + +createinit: + @-rm $(LINUX_DIR)/usr/initramfs_data.cpio.* + $(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}-${ARCH}-kernel ifeq ($(FS),archive) imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL) - @cp $(LINUX_DIR)/arch/x86/boot/bzImage $(BIN_DIR)/${ADK_TARGET}-${ARCH}-kernel @echo @echo "The RootFS tarball is: $(BIN_DIR)/$(ROOTFSTARBALL)," @echo "Use following command to create a QEMU Image:" - @echo "sudo ./scripts/create-image.sh -n -f $(ADK_TARGET_ROOTFS) qemu-${CPU_ARCH}.img $(BIN_DIR)/$(ROOTFSTARBALL)" + @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-system-x86_64 -nographic -kernel $(BIN_DIR)/${ADK_TARGET}-${ARCH}-kernel qemu-${CPU_ARCH}.img' @echo 'Login as user root with password linux123 via ssh or console' @@ -24,10 +35,21 @@ endif ifeq ($(FS),initramfs) imageinstall: $(BIN_DIR)/$(INITRAMFS) - @cp $(LINUX_DIR)/arch/x86/boot/bzImage $(BIN_DIR)/${ADK_TARGET}-${ARCH}-kernel @echo 'The kernel file is: ${BIN_DIR}/${ADK_TARGET}-${ARCH}-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-system-x86_64 -nographic -kernel $(BIN_DIR)/${ADK_TARGET}-${ARCH}-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 '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-system-x86_64 -nographic -kernel $(BIN_DIR)/${ADK_TARGET}-${ARCH}-kernel -initrd ${BIN_DIR}/${INITRAMFS}' + @echo 'qemu-system-x86_64 -nographic -kernel $(BIN_DIR)/${ADK_TARGET}-${ARCH}-kernel qemu.img' @echo 'Login as user root with password linux123 via ssh or console' endif |