From b72c8fafc0bd2049b93936685b7287e55ce18cba Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 3 Jan 2011 20:52:25 +0100 Subject: fix qemu targets, make them bootable again --- mk/rootfs.mk | 2 +- package/cfgfs/Makefile | 2 +- scripts/update-sys | 3 +- target/linux/config/Config.in.block | 5 +- target/linux/config/Config.in.graphics | 12 +++ target/linux/config/Config.in.systems | 5 + target/linux/patches/2.6.36/io_map_base.patch | 52 ----------- target/mips/Makefile | 2 +- target/mips/kernel.config | 130 +++++++++----------------- target/mips/sys-available/qemu-mips | 1 + target/mipsel/Makefile | 2 +- target/mipsel/kernel.config | 2 +- target/mipsel/sys-available/qemu-mipsel | 1 + target/x86_64/Makefile | 1 + 14 files changed, 75 insertions(+), 145 deletions(-) delete mode 100644 target/linux/patches/2.6.36/io_map_base.patch diff --git a/mk/rootfs.mk b/mk/rootfs.mk index 5ad4e9381..ee63d8c2d 100644 --- a/mk/rootfs.mk +++ b/mk/rootfs.mk @@ -8,7 +8,7 @@ FS_CMDLINE:=$(3) endif endef -ifeq ($(ADK_TARGET_SYSTEM_QEMU_X86),y) +ifeq ($(ADK_HARDWARE_QEMU),y) ROOTFS:= root=/dev/sda1 endif diff --git a/package/cfgfs/Makefile b/package/cfgfs/Makefile index 1b6d6366c..0b83d3192 100644 --- a/package/cfgfs/Makefile +++ b/package/cfgfs/Makefile @@ -16,7 +16,7 @@ PKG_CFLINE_CFGFS+= select BUSYBOX_XARGS@ PKG_CFLINE_CFGFS+= select BUSYBOX_FEATURE_SORT_BIG@ PKG_CFLINE_CFGFS+= select BUSYBOX_DIFF@ PKG_CFLINE_CFGFS+= depends on !ADK_TARGET_ROOTFS_NFSROOT && !ADK_TARGET_ROOTFS_INITRAMFS_PIGGYBACK && !ADK_TARGET_ROOTFS_INITRAMFS -PKG_DFLT_CFGFS:= y if !ADK_TOOLCHAIN_ONLY +PKG_DFLT_CFGFS:= y if !(ADK_TOOLCHAIN_ONLY || ADK_HARDWARE_QEMU) WRKDIST= ${WRKDIR}/${PKG_NAME}-${PKG_VERSION} NO_DISTFILES:= 1 diff --git a/scripts/update-sys b/scripts/update-sys index 7b5688b83..dd1b4c9a5 100755 --- a/scripts/update-sys +++ b/scripts/update-sys @@ -1,4 +1,5 @@ #!/usr/bin/env bash +#set -x # 1. create Config.in.systems with all available target systems for each architecture # 2. if ADK configuration exist, create Config.in.arch/Config.in.system with fixed values # 3. exit when native system build is detected @@ -47,7 +48,7 @@ config $archsym boolean EOF -if [ "${system}" = "toolchain" ];then +if [ "${system}" = "toolchain" -o "${system}" = "qemu" ];then sys=${system}-$arch else sys=$system diff --git a/target/linux/config/Config.in.block b/target/linux/config/Config.in.block index f70c8f162..59fad2d4a 100644 --- a/target/linux/config/Config.in.block +++ b/target/linux/config/Config.in.block @@ -117,11 +117,14 @@ config ADK_KERNEL_ATA_PIIX select ADK_KERNEL_SCSI select ADK_KERNEL_ATA select ADK_KERNEL_ATA_SFF + select ADK_KERNEL_ATA_BMDMA select ADK_KERNEL_BLK_DEV select ADK_KERNEL_BLK_DEV_SD - default y if ADK_TARGET_SYSTEM_IBM_X40 + default y if ADK_TARGET_SYSTEM_QEMU_MIPS + default y if ADK_TARGET_SYSTEM_QEMU_MIPSEL default y if ADK_TARGET_SYSTEM_QEMU_X86 default y if ADK_TARGET_SYSTEM_QEMU_X86_64 + default y if ADK_TARGET_SYSTEM_IBM_X40 default n config ADK_KERNEL_SATA_AHCI diff --git a/target/linux/config/Config.in.graphics b/target/linux/config/Config.in.graphics index c49d0f644..122827bde 100644 --- a/target/linux/config/Config.in.graphics +++ b/target/linux/config/Config.in.graphics @@ -1,3 +1,15 @@ +config ADK_KERNEL_VT + boolean + default y if ADK_HARDWARE_QEMU + default y if ADK_TARGET_WITH_VGA + default n + +config ADK_KERNEL_VT_CONSOLE + boolean + default y if ADK_HARDWARE_QEMU + default y if ADK_TARGET_WITH_VGA + default n + config ADK_KERNEL_FB boolean diff --git a/target/linux/config/Config.in.systems b/target/linux/config/Config.in.systems index 40fd80a8c..5ded9d0cf 100644 --- a/target/linux/config/Config.in.systems +++ b/target/linux/config/Config.in.systems @@ -1,3 +1,7 @@ +# mips systems +config ADK_KERNEL_MIPS_MALTA + boolean + config ADK_KERNEL_MIKROTIK_RB532 boolean @@ -13,6 +17,7 @@ config ADK_KERNEL_ATHEROS_AR71XX config ADK_KERNEL_AR71XX_MACH_RB4XX boolean +# arm systems config ADK_KERNEL_ARCH_AT91 boolean diff --git a/target/linux/patches/2.6.36/io_map_base.patch b/target/linux/patches/2.6.36/io_map_base.patch deleted file mode 100644 index be39ffe09..000000000 --- a/target/linux/patches/2.6.36/io_map_base.patch +++ /dev/null @@ -1,52 +0,0 @@ -diff -Nur linux-2.6.28.orig/arch/mips/include/asm/mips-boards/generic.h linux-2.6.28/arch/mips/include/asm/mips-boards/generic.h ---- linux-2.6.28.orig/arch/mips/include/asm/mips-boards/generic.h 2008-12-25 00:26:37.000000000 +0100 -+++ linux-2.6.28/arch/mips/include/asm/mips-boards/generic.h 2009-01-09 23:03:02.000000000 +0100 -@@ -92,7 +92,7 @@ - extern void mips_reboot_setup(void); - - #ifdef CONFIG_PCI --extern void mips_pcibios_init(void); -+extern int mips_pcibios_init(void); - #else - #define mips_pcibios_init() do { } while (0) - #endif -diff -Nur linux-2.6.28.orig/arch/mips/mti-malta/malta-pci.c linux-2.6.28/arch/mips/mti-malta/malta-pci.c ---- linux-2.6.28.orig/arch/mips/mti-malta/malta-pci.c 2008-12-25 00:26:37.000000000 +0100 -+++ linux-2.6.28/arch/mips/mti-malta/malta-pci.c 2009-01-09 23:02:02.000000000 +0100 -@@ -87,10 +87,11 @@ - .mem_resource = &msc_mem_resource, - }; - --void __init mips_pcibios_init(void) -+int __init mips_pcibios_init(void) - { - struct pci_controller *controller; - resource_size_t start, end, map, start1, end1, map1, map2, map3, mask; -+ void __iomem *io_map_base; - - switch (mips_revision_sconid) { - case MIPS_REVISION_SCON_GT64120: -@@ -230,7 +231,7 @@ - controller = &msc_controller; - break; - default: -- return; -+ return 0; - } - - if (controller->io_resource->start < 0x00001000UL) /* FIXME */ -@@ -239,5 +240,14 @@ - iomem_resource.end &= 0xfffffffffULL; /* 64 GB */ - ioport_resource.end = controller->io_resource->end; - -+ io_map_base = ioremap(MIPS_MSC01_PCI_REG_BASE, -+ controller->io_resource->end - controller->io_resource->start + 1); -+ if (!io_map_base) -+ return -EBUSY; -+ -+ controller->io_map_base = (unsigned long)io_map_base; -+ - register_pci_controller(controller); -+ -+ return 0; - } diff --git a/target/mips/Makefile b/target/mips/Makefile index 51f1824b0..26532e64b 100644 --- a/target/mips/Makefile +++ b/target/mips/Makefile @@ -35,7 +35,7 @@ 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 options:" - @echo 'qemu-system-mips -nographic -M malta -kernel $(BIN_DIR)/$(TARGET_KERNEL) -hda qemu-${CPU_ARCH}.img -append "root=/dev/hda1"' + @echo 'qemu-system-mips -nographic -M malta -kernel $(BIN_DIR)/$(TARGET_KERNEL) qemu-${CPU_ARCH}.img' endif ifeq ($(ADK_TARGET_FS),initramfs) imageinstall: $(BIN_DIR)/$(INITRAMFS) diff --git a/target/mips/kernel.config b/target/mips/kernel.config index b07bc038f..dd4326205 100644 --- a/target/mips/kernel.config +++ b/target/mips/kernel.config @@ -1,16 +1,17 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.36 -# Thu Dec 23 18:34:04 2010 +# Sun Jan 2 23:03:13 2011 # CONFIG_MIPS=y # # Machine selection # +CONFIG_ZONE_DMA=y # CONFIG_MIPS_ALCHEMY is not set # CONFIG_AR7 is not set -CONFIG_ATHEROS_AR71XX=y +# CONFIG_ATHEROS_AR71XX is not set # CONFIG_BCM47XX is not set # CONFIG_BCM63XX is not set # CONFIG_MIPS_COBALT is not set @@ -19,7 +20,7 @@ CONFIG_ATHEROS_AR71XX=y # CONFIG_MACH_JZ4740 is not set # CONFIG_LASAT is not set # CONFIG_MACH_LOONGSON is not set -# CONFIG_MIPS_MALTA is not set +CONFIG_MIPS_MALTA=y # CONFIG_MIPS_SIM is not set # CONFIG_NEC_MARKEINS is not set # CONFIG_MACH_VR41XX is not set @@ -50,48 +51,6 @@ CONFIG_ATHEROS_AR71XX=y # CONFIG_CAVIUM_OCTEON_SIMULATOR is not set # CONFIG_CAVIUM_OCTEON_REFERENCE_BOARD is not set # CONFIG_ALCHEMY_GPIO_INDIRECT is not set - -# -# Atheros AR71xx machine selection -# -# CONFIG_AR71XX_MACH_AP81 is not set -# CONFIG_AR71XX_MACH_AP83 is not set -# CONFIG_AR71XX_MACH_DIR_600_A1 is not set -# CONFIG_AR71XX_MACH_DIR_615_C1 is not set -# CONFIG_AR71XX_MACH_DIR_825_B1 is not set -# CONFIG_AR71XX_MACH_PB42 is not set -# CONFIG_AR71XX_MACH_PB44 is not set -# CONFIG_AR71XX_MACH_PB92 is not set -# CONFIG_AR71XX_MACH_AW_NR580 is not set -# CONFIG_AR71XX_MACH_WZR_HP_G300NH is not set -# CONFIG_AR71XX_MACH_WP543 is not set -# CONFIG_AR71XX_MACH_WRT160NL is not set -# CONFIG_AR71XX_MACH_WRT400N is not set -CONFIG_AR71XX_MACH_RB4XX=y -# CONFIG_AR71XX_MACH_RB750 is not set -# CONFIG_AR71XX_MACH_WNDR3700 is not set -# CONFIG_AR71XX_MACH_WNR2000 is not set -# CONFIG_AR71XX_MACH_MZK_W04NU is not set -# CONFIG_AR71XX_MACH_MZK_W300NH is not set -# CONFIG_AR71XX_MACH_NBG460N is not set -# CONFIG_AR71XX_MACH_TL_WR741ND is not set -# CONFIG_AR71XX_MACH_TL_WR841N_V1 is not set -# CONFIG_AR71XX_MACH_TL_WR941ND is not set -# CONFIG_AR71XX_MACH_TL_WR1043ND is not set -# CONFIG_AR71XX_MACH_TEW_632BRP is not set -# CONFIG_AR71XX_MACH_UBNT is not set -# CONFIG_AR71XX_DEV_M25P80 is not set -# CONFIG_AR71XX_DEV_AP91_PCI is not set -# CONFIG_AR71XX_DEV_AP91_ETH is not set -# CONFIG_AR71XX_DEV_AP94_PCI is not set -# CONFIG_AR71XX_DEV_AR913X_WMAC is not set -# CONFIG_AR71XX_DEV_DSA is not set -CONFIG_AR71XX_DEV_GPIO_BUTTONS=y -CONFIG_AR71XX_DEV_LEDS_GPIO=y -# CONFIG_AR71XX_DEV_PB42_PCI is not set -# CONFIG_AR71XX_DEV_PB9X_PCI is not set -CONFIG_AR71XX_DEV_USB=y -# CONFIG_AR71XX_NVRAM is not set CONFIG_CAVIUM_OCTEON_HELPER=y CONFIG_LOONGSON_UART_BASE=y # CONFIG_LOONGSON_MC146818 is not set @@ -106,6 +65,8 @@ CONFIG_GENERIC_CLOCKEVENTS=y CONFIG_GENERIC_CMOS_UPDATE=y CONFIG_SCHED_OMIT_FRAME_POINTER=y CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y +CONFIG_ARCH_MAY_HAVE_PC_FDC=y +CONFIG_BOOT_RAW=y CONFIG_CEVT_R4K_LIB=y CONFIG_CEVT_R4K=y CONFIG_CSRC_R4K_LIB=y @@ -113,14 +74,24 @@ CONFIG_CSRC_R4K=y CONFIG_DMA_NONCOHERENT=y CONFIG_NEED_DMA_MAP_STATE=y CONFIG_SYS_HAS_EARLY_PRINTK=y -CONFIG_MIPS_MACHINE=y +CONFIG_I8259=y +CONFIG_MIPS_BONITO64=y +CONFIG_MIPS_MSC=y +# CONFIG_MIPS_MACHINE is not set # CONFIG_NO_IOPORT is not set -CONFIG_GENERIC_GPIO=y +CONFIG_GENERIC_ISA_DMA=y +CONFIG_ISA_DMA_API=y CONFIG_CPU_BIG_ENDIAN=y # CONFIG_CPU_LITTLE_ENDIAN is not set CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y +CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y CONFIG_IRQ_CPU=y -CONFIG_MIPS_L1_CACHE_SHIFT=5 +CONFIG_IRQ_GIC=y +CONFIG_MIPS_BOARDS_GEN=y +CONFIG_PCI_GT64XXX_PCI0=y +CONFIG_SWAP_IO_SPACE=y +CONFIG_BOOT_ELF32=y +CONFIG_MIPS_L1_CACHE_SHIFT=6 # # CPU selection @@ -130,11 +101,16 @@ CONFIG_CPU_MIPS32_R1=y # CONFIG_CPU_MIPS64_R1 is not set # CONFIG_CPU_NEVADA is not set # CONFIG_CPU_RM7000 is not set +CONFIG_SYS_SUPPORTS_ZBOOT=y CONFIG_SYS_HAS_CPU_MIPS32_R1=y CONFIG_SYS_HAS_CPU_MIPS32_R2=y +CONFIG_SYS_HAS_CPU_MIPS64_R1=y +CONFIG_SYS_HAS_CPU_NEVADA=y +CONFIG_SYS_HAS_CPU_RM7000=y CONFIG_CPU_MIPS32=y CONFIG_CPU_MIPSR1=y CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y +CONFIG_SYS_SUPPORTS_64BIT_KERNEL=y CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y CONFIG_HARDWARE_WATCHPOINTS=y @@ -145,14 +121,21 @@ CONFIG_32BIT=y CONFIG_PAGE_SIZE_4KB=y # CONFIG_PAGE_SIZE_16KB is not set # CONFIG_PAGE_SIZE_64KB is not set +CONFIG_BOARD_SCACHE=y +CONFIG_MIPS_CPU_SCACHE=y CONFIG_CPU_HAS_PREFETCH=y CONFIG_MIPS_MT_DISABLED=y # CONFIG_MIPS_MT_SMP is not set +CONFIG_SYS_SUPPORTS_MULTITHREADING=y +# CONFIG_MIPS_VPE_LOADER is not set +# CONFIG_MIPS_CMP is not set # CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set +# CONFIG_CPU_HAS_SMARTMIPS is not set CONFIG_CPU_HAS_SYNC=y CONFIG_GENERIC_HARDIRQS=y CONFIG_GENERIC_IRQ_PROBE=y CONFIG_CPU_SUPPORTS_HIGHMEM=y +CONFIG_SYS_SUPPORTS_SMARTMIPS=y CONFIG_ARCH_FLATMEM_ENABLE=y CONFIG_ARCH_POPULATES_NODE_MAP=y CONFIG_SELECT_MEMORY_MODEL=y @@ -162,10 +145,11 @@ CONFIG_FLAT_NODE_MEM_MAP=y CONFIG_PAGEFLAGS_EXTENDED=y CONFIG_SPLIT_PTLOCK_CPUS=4 # CONFIG_PHYS_ADDR_T_64BIT is not set -CONFIG_ZONE_DMA_FLAG=0 +CONFIG_ZONE_DMA_FLAG=1 CONFIG_VIRT_TO_BUS=y # CONFIG_KSM is not set CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 +CONFIG_SYS_SUPPORTS_MIPS_CMP=y # CONFIG_NO_HZ is not set # CONFIG_HIGH_RES_TIMERS is not set CONFIG_GENERIC_CLOCKEVENTS_BUILD=y @@ -198,7 +182,11 @@ CONFIG_INIT_ENV_ARG_LIMIT=32 CONFIG_CROSS_COMPILE="" CONFIG_LOCALVERSION="" # CONFIG_LOCALVERSION_AUTO is not set -# CONFIG_KERNEL_GZIP is not set +CONFIG_HAVE_KERNEL_GZIP=y +CONFIG_HAVE_KERNEL_BZIP2=y +CONFIG_HAVE_KERNEL_LZMA=y +CONFIG_HAVE_KERNEL_LZO=y +CONFIG_KERNEL_GZIP=y # CONFIG_KERNEL_BZIP2 is not set # CONFIG_KERNEL_LZMA is not set # CONFIG_KERNEL_LZO is not set @@ -214,7 +202,6 @@ CONFIG_POSIX_MQUEUE_SYSCTL=y # RCU Subsystem # CONFIG_TREE_RCU=y -# CONFIG_TREE_PREEMPT_RCU is not set # CONFIG_TINY_RCU is not set # CONFIG_RCU_TRACE is not set CONFIG_RCU_FANOUT=32 @@ -277,6 +264,9 @@ CONFIG_MODULE_FORCE_UNLOAD=y # CONFIG_MODVERSIONS is not set # CONFIG_MODULE_SRCVERSION_ALL is not set # CONFIG_BLOCK is not set +# CONFIG_DEFAULT_DEADLINE is not set +# CONFIG_DEFAULT_CFQ is not set +# CONFIG_DEFAULT_NOOP is not set # CONFIG_INLINE_SPIN_TRYLOCK is not set # CONFIG_INLINE_SPIN_TRYLOCK_BH is not set # CONFIG_INLINE_SPIN_LOCK is not set @@ -318,6 +308,7 @@ CONFIG_PCI_DOMAINS=y # CONFIG_PCI_STUB is not set # CONFIG_PCI_IOV is not set CONFIG_MMU=y +CONFIG_I8253=y # CONFIG_PCCARD is not set # CONFIG_HOTPLUG_PCI is not set @@ -335,6 +326,7 @@ CONFIG_TRAD_SIGNALS=y CONFIG_ARCH_HIBERNATION_POSSIBLE=y CONFIG_ARCH_SUSPEND_POSSIBLE=y # CONFIG_PM is not set +CONFIG_MIPS_EXTERNAL_TIMER=y CONFIG_NET=y # @@ -500,7 +492,6 @@ CONFIG_UNIX98_PTYS=y # CONFIG_HW_RANDOM is not set # CONFIG_R3964 is not set # CONFIG_APPLICOM is not set -# CONFIG_GPIO_DEVICE is not set # CONFIG_TCG_TPM is not set CONFIG_DEVPORT=y # CONFIG_RAMOOPS is not set @@ -511,39 +502,6 @@ CONFIG_DEVPORT=y # PPS support # # CONFIG_PPS is not set -CONFIG_ARCH_REQUIRE_GPIOLIB=y -CONFIG_GPIOLIB=y -# CONFIG_GPIO_SYSFS is not set - -# -# Memory mapped GPIO expanders: -# -# CONFIG_GPIO_IT8761E is not set -# CONFIG_GPIO_SCH is not set - -# -# I2C GPIO expanders: -# - -# -# PCI GPIO expanders: -# -# CONFIG_GPIO_CS5535 is not set -# CONFIG_GPIO_BT8XX is not set -# CONFIG_GPIO_LANGWELL is not set -# CONFIG_GPIO_RDC321X is not set - -# -# SPI GPIO expanders: -# - -# -# AC97 GPIO expanders: -# - -# -# MODULbus GPIO expanders: -# # CONFIG_W1 is not set # CONFIG_POWER_SUPPLY is not set # CONFIG_HWMON is not set @@ -653,7 +611,7 @@ CONFIG_TRACING_SUPPORT=y CONFIG_HAVE_ARCH_KGDB=y CONFIG_EARLY_PRINTK=y CONFIG_CMDLINE_BOOL=y -CONFIG_CMDLINE="" +CONFIG_CMDLINE="init=/init" # CONFIG_CMDLINE_OVERRIDE is not set # diff --git a/target/mips/sys-available/qemu-mips b/target/mips/sys-available/qemu-mips index 70ac9718b..20a4dae3d 100644 --- a/target/mips/sys-available/qemu-mips +++ b/target/mips/sys-available/qemu-mips @@ -2,6 +2,7 @@ config ADK_TARGET_SYSTEM_QEMU_MIPS bool "Qemu Emulator" select ADK_mips select ADK_qemu_mips + select ADK_KERNEL_MIPS_MALTA select ADK_HARDWARE_QEMU select ADK_TARGET_WITH_VGA select ADK_TARGET_WITH_INPUT diff --git a/target/mipsel/Makefile b/target/mipsel/Makefile index ccce77c16..d0aa6e5c9 100644 --- a/target/mipsel/Makefile +++ b/target/mipsel/Makefile @@ -86,7 +86,7 @@ imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL) @echo "sudo ./scripts/create-image.sh -f $(ADK_TARGET_ROOTFS) qemu-${CPU_ARCH}.img $(BIN_DIR)/$(ROOTFSTARBALL)" @echo "Be sure to change permissions after image creation." @echo "Start qemu with following options:" - @echo 'qemu-system-mipsel -nographic -M malta -kernel $(BIN_DIR)/$(TARGET_KERNEL) -hda qemu-${CPU_ARCH}.img -append "root=/dev/hda1"' + @echo 'qemu-system-mipsel -nographic -M malta -kernel $(BIN_DIR)/$(TARGET_KERNEL) qemu-${CPU_ARCH}.img' endif ifeq ($(ADK_TARGET_FS),initramfs) imageinstall: $(BIN_DIR)/$(INITRAMFS) diff --git a/target/mipsel/kernel.config b/target/mipsel/kernel.config index 4995e1207..cbb30047f 100644 --- a/target/mipsel/kernel.config +++ b/target/mipsel/kernel.config @@ -656,7 +656,7 @@ CONFIG_TRACING_SUPPORT=y CONFIG_HAVE_ARCH_KGDB=y CONFIG_EARLY_PRINTK=y CONFIG_CMDLINE_BOOL=y -CONFIG_CMDLINE="" +CONFIG_CMDLINE="init=/init" # CONFIG_CMDLINE_OVERRIDE is not set # diff --git a/target/mipsel/sys-available/qemu-mipsel b/target/mipsel/sys-available/qemu-mipsel index d29333c8d..6193adaa1 100644 --- a/target/mipsel/sys-available/qemu-mipsel +++ b/target/mipsel/sys-available/qemu-mipsel @@ -2,6 +2,7 @@ config ADK_TARGET_SYSTEM_QEMU_MIPSEL bool "Qemu Emulator" select ADK_mipsel select ADK_qemu_mipsel + select ADK_KERNEL_MIPS_MALTA select ADK_HARDWARE_QEMU select ADK_TARGET_WITH_VGA select ADK_TARGET_WITH_INPUT diff --git a/target/x86_64/Makefile b/target/x86_64/Makefile index 3ae8b112d..cf27d05df 100644 --- a/target/x86_64/Makefile +++ b/target/x86_64/Makefile @@ -13,6 +13,7 @@ ifeq ($(ADK_TARGET_FS),archive) imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL) @echo 'The RootFS tarball is: ${BIN_DIR}/${ROOTFSTARBALL}' ifeq ($(ADK_TARGET_SYSTEM_QEMU_X86_64),y) + @cp $(KERNEL) $(BIN_DIR)/$(TARGET_KERNEL) @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:" -- cgit v1.2.3