diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-19 08:54:59 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-19 08:54:59 +0100 |
| commit | 97089cda799d75fc8515f4e9d78c92cb32432e0e (patch) | |
| tree | 5139205e4baa1b98ab2aab9134fb1b08bccdfba9 /target/ppc64 | |
| parent | e9908f5a7a00fc48f7c9dddf7c234ba689b6d759 (diff) | |
| parent | 95813e9c0009a0fff2e5e30a39e1ea45b061cbc0 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'target/ppc64')
| -rw-r--r-- | target/ppc64/Makefile | 4 | ||||
| -rw-r--r-- | target/ppc64/kernel/qemu-ppc64 | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/target/ppc64/Makefile b/target/ppc64/Makefile index 0ad0843c0..6ee949a09 100644 --- a/target/ppc64/Makefile +++ b/target/ppc64/Makefile @@ -23,10 +23,10 @@ ifeq ($(ADK_HARDWARE_QEMU),y) endif endif ifeq ($(ADK_TARGET_FS),initramfsarchive) -imageinstall: $(FW_DIR)/$(ROOTFSTARBALL) +imageinstall: $(FW_DIR)/$(ROOTFSUSERTARBALL) @cp $(KERNEL) $(FW_DIR)/$(TARGET_KERNEL) @echo 'The kernel file is: $(FW_DIR)/${TARGET_KERNEL}' - @echo "The RootFS tarball is: $(FW_DIR)/$(ROOTFSTARBALL)" + @echo "The RootFS tarball is: $(FW_DIR)/$(ROOTFSUSERTARBALL)" endif ifeq ($(ADK_TARGET_FS),initramfs) imageinstall: $(FW_DIR)/$(INITRAMFS) 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 |