diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-01-02 13:40:13 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-01-02 13:40:13 +0100 |
| commit | 2b38e5af3eb58c27cc646fed11ac1a24805fa05d (patch) | |
| tree | 780bd8869c0ed798d8c0abce17869a29cc01fb01 /target/ppc64 | |
| parent | 2a2320b4292d4e370cc95aea61525ebd7dc11337 (diff) | |
| parent | 34592482701199604242848b80c39bd07b6c7716 (diff) | |
resolve merge conflict
Diffstat (limited to 'target/ppc64')
| -rw-r--r-- | target/ppc64/Makefile | 12 | ||||
| -rw-r--r-- | target/ppc64/sys-available/toolchain-ppc64 (renamed from target/ppc64/sys-available/toolchain) | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/target/ppc64/Makefile b/target/ppc64/Makefile index 9dd1f139a..a60d376a9 100644 --- a/target/ppc64/Makefile +++ b/target/ppc64/Makefile @@ -11,18 +11,18 @@ KERNEL:=$(LINUX_DIR)/arch/powerpc/boot/zImage ifeq ($(ADK_TARGET_FS),archive) imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL) - @cp $(KERNEL) ${TARGET_KERNEL} - @echo 'The kernel file is: ${TARGET_KERNEL}' + @cp $(KERNEL) $(BIN_DIR)/${TARGET_KERNEL} + @echo 'The kernel file is: $(BIN_DIR)/${TARGET_KERNEL}' @echo "The RootFS tarball is: $(BIN_DIR)/$(ROOTFSTARBALL)" endif ifeq ($(ADK_TARGET_FS),initramfs) imageinstall: $(BIN_DIR)/$(INITRAMFS) - @cp $(KERNEL) $(TARGET_KERNEL) - @echo 'The kernel file is: ${TARGET_KERNEL}' + @cp $(KERNEL) $(BIN_DIR)/$(TARGET_KERNEL) + @echo 'The kernel file is: $(BIN_DIR)/${TARGET_KERNEL}' @echo 'The initramfs image is: ${BIN_DIR}/${INITRAMFS}' endif ifeq ($(ADK_TARGET_FS),initramfs-piggyback) imageinstall: ${BUILD_DIR}/${INITRAMFS_PIGGYBACK} createinitramfs - @cp $(KERNEL) ${TARGET_KERNEL} - @echo 'The kernel+initramfs file is: ${TARGET_KERNEL}' + @cp $(KERNEL) $(BIN_DIR)/${TARGET_KERNEL} + @echo 'The kernel+initramfs file is: $(BIN_DIR)/${TARGET_KERNEL}' endif diff --git a/target/ppc64/sys-available/toolchain b/target/ppc64/sys-available/toolchain-ppc64 index e6aceb55e..1f0061805 100644 --- a/target/ppc64/sys-available/toolchain +++ b/target/ppc64/sys-available/toolchain-ppc64 @@ -1,7 +1,7 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_PPC64 bool "Toolchain only" select ADK_ppc64 - select ADK_toolchain + select ADK_toolchain_ppc64 select ADK_TOOLCHAIN_ONLY help Build a ppc64 toolchain. |