From 718043e164f93e243dad589af63ab68dbc0c7050 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 17 Mar 2014 14:25:05 +0100 Subject: fix boot from disk for qemu targets --- target/arm/Makefile | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'target/arm') diff --git a/target/arm/Makefile b/target/arm/Makefile index 77148e261..a652003eb 100644 --- a/target/arm/Makefile +++ b/target/arm/Makefile @@ -70,6 +70,12 @@ ifeq ($(ADK_TARGET_SYSTEM_QEMU_ARM)$(ADK_TARGET_SYSTEM_QEMU_ARMHF),y) @echo 'qemu-system-arm -M $(MACH) -nographic $(NET) -kernel $(FW_DIR)/$(TARGET_KERNEL) -hda qemu-${CPU_ARCH}.img' endif endif +ifeq ($(ADK_TARGET_FS),initramfsarchive) +imageinstall: $(FW_DIR)/$(ROOTFSTARBALL) + @cp $(KERNEL) $(FW_DIR)/$(TARGET_KERNEL) + @echo 'The kernel file is: $(FW_DIR)/${TARGET_KERNEL}' + @echo "The RootFS tarball is: $(FW_DIR)/$(ROOTFSTARBALL)" +endif ifeq ($(ADK_TARGET_FS),initramfs) imageinstall: $(FW_DIR)/$(INITRAMFS) @cp $(KERNEL) $(FW_DIR)/$(TARGET_KERNEL) -- cgit v1.2.3 From 803b9757e040cc1a9090de4ac5572290c83d31fe Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 17 Mar 2014 19:04:45 +0100 Subject: remove kernel choice, always use 64 bit for 64bit target --- target/arm/kernel/qemu-arm-versatilepb | 1 + 1 file changed, 1 insertion(+) (limited to 'target/arm') diff --git a/target/arm/kernel/qemu-arm-versatilepb b/target/arm/kernel/qemu-arm-versatilepb index f208772d0..29a82ccf6 100644 --- a/target/arm/kernel/qemu-arm-versatilepb +++ b/target/arm/kernel/qemu-arm-versatilepb @@ -1,3 +1,4 @@ +CONFIG_ARM=y CONFIG_ARM_PATCH_PHYS_VIRT=y CONFIG_ARCH_VERSATILE=y CONFIG_ARCH_VERSATILE_PB=y -- cgit v1.2.3