summaryrefslogtreecommitdiff
path: root/target/ppc64
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/ppc64
parentce0418c732e0d950d3a3c0b2b6726a691b8a0eca (diff)
parent803b9757e040cc1a9090de4ac5572290c83d31fe (diff)
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'target/ppc64')
-rw-r--r--target/ppc64/Makefile6
-rw-r--r--target/ppc64/kernel/qemu-ppc641
2 files changed, 6 insertions, 1 deletions
diff --git a/target/ppc64/Makefile b/target/ppc64/Makefile
index 2bc6e66cb..0ad0843c0 100644
--- a/target/ppc64/Makefile
+++ b/target/ppc64/Makefile
@@ -22,6 +22,12 @@ ifeq ($(ADK_HARDWARE_QEMU),y)
@echo 'qemu-system-ppc64 -nographic -kernel $(FW_DIR)/$(TARGET_KERNEL) 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/ppc64/kernel/qemu-ppc64 b/target/ppc64/kernel/qemu-ppc64
index 0eb40bd77..ebf952146 100644
--- a/target/ppc64/kernel/qemu-ppc64
+++ b/target/ppc64/kernel/qemu-ppc64
@@ -8,7 +8,6 @@ CONFIG_PPC_FPU=y
CONFIG_PPC_STD_MMU=y
CONFIG_PPC_STD_MMU_64=y
CONFIG_PPC_DOORBELL=y
-CONFIG_64BIT=y
CONFIG_PPC_OF=y
CONFIG_PPC_UDBG_16550=y
CONFIG_PPC_PSERIES=y