diff options
Diffstat (limited to 'target/arm')
| -rw-r--r-- | target/arm/Makefile | 20 | ||||
| -rw-r--r-- | target/arm/sys-available/toolchain-arm (renamed from target/arm/sys-available/toolchain) | 2 |
2 files changed, 11 insertions, 11 deletions
diff --git a/target/arm/Makefile b/target/arm/Makefile index 17ed6b4b5..c2885e917 100644 --- a/target/arm/Makefile +++ b/target/arm/Makefile @@ -24,7 +24,7 @@ kernel-install: tools-compile ifeq ($(ADK_TARGET_FS),nfsroot) imageinstall: kernel-install ${BIN_DIR}/${ROOTFSUSERTARBALL} - @cp $(KERNEL) $(TARGET_KERNEL) + @cp $(KERNEL) $(BIN_DIR)/$(TARGET_KERNEL) @echo 'Type dhcp via u-boot prompt to load kernel' @echo 'After that type bootm to load the kernel' endif @@ -41,25 +41,25 @@ imageinstall: kernel-install $(BIN_DIR)/$(ROOTFSTARBALL) endif 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)" @echo "Use following command to create a QEMU Image:" @echo "sudo ./scripts/create-image.sh -f $(ADK_TARGET_ROOTFS) qemu-${CPU_ARCH}.img $(BIN_DIR)/$(ROOTFSTARBALL)" @echo "Start qemu with following options:" - @echo 'qemu-system-arm -nographic -kernel $(TARGET_KERNEL) -hda qemu-${CPU_ARCH}.img -append "root=/dev/hda1"' + @echo 'qemu-system-arm -nographic -kernel $(BIN_DIR)/$(TARGET_KERNEL) -hda qemu-${CPU_ARCH}.img -append "root=/dev/hda1"' 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}' - @echo 'qemu-system-arm -nographic -kernel $(TARGET_KERNEL) -initrd ${BIN_DIR}/${INITRAMFS}' + @echo 'qemu-system-arm -nographic -kernel $(BIN_DIR)/$(TARGET_KERNEL) -initrd ${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}' @echo "Start qemu with following command line:" - @echo 'qemu-system-arm -nographic -kernel $(TARGET_KERNEL)' + @echo 'qemu-system-arm -nographic -kernel $(BIN_DIR)/$(TARGET_KERNEL)' endif diff --git a/target/arm/sys-available/toolchain b/target/arm/sys-available/toolchain-arm index af1aa06a1..83a9bb5de 100644 --- a/target/arm/sys-available/toolchain +++ b/target/arm/sys-available/toolchain-arm @@ -1,7 +1,7 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_ARM bool "Toolchain only" select ADK_arm - select ADK_toolchain + select ADK_toolchain_arm select ADK_TOOLCHAIN_ONLY select ADK_EABI select ADK_TARGET_NO_FPU |