summaryrefslogtreecommitdiff
path: root/target/arm
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2014-03-17 19:18:17 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2014-03-17 19:18:17 +0100
commit2e07ff18d429eba848413488bd220fef4b024dea (patch)
tree32580004089bd6b61cf56447c4a1744186d28295 /target/arm
parentce0418c732e0d950d3a3c0b2b6726a691b8a0eca (diff)
parent803b9757e040cc1a9090de4ac5572290c83d31fe (diff)
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'target/arm')
-rw-r--r--target/arm/Makefile6
-rw-r--r--target/arm/kernel/qemu-arm-versatilepb1
2 files changed, 7 insertions, 0 deletions
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)
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