diff options
Diffstat (limited to 'target/mips')
-rw-r--r-- | target/mips/Config.in | 2 | ||||
-rw-r--r-- | target/mips/Makefile | 22 | ||||
-rw-r--r-- | target/mips/sys-available/qemu-mips (renamed from target/mips/sys-available/qemu) | 2 | ||||
-rw-r--r-- | target/mips/sys-available/toolchain-mips (renamed from target/mips/sys-available/toolchain) | 2 |
4 files changed, 14 insertions, 14 deletions
diff --git a/target/mips/Config.in b/target/mips/Config.in index 90a519f6b..bbae13a6c 100644 --- a/target/mips/Config.in +++ b/target/mips/Config.in @@ -1,5 +1,5 @@ choice -depends on ADK_LINUX_MIPS && ADK_CHOOSE_TARGET_ARCH +depends on ADK_LINUX_MIPS && !ADK_CHOOSE_TARGET_ARCH prompt "Target system" config ADK_CHOOSE_TARGET_SYSTEM_MIPS diff --git a/target/mips/Makefile b/target/mips/Makefile index ddacbf2af..51f1824b0 100644 --- a/target/mips/Makefile +++ b/target/mips/Makefile @@ -16,8 +16,8 @@ kernel-install: ifeq ($(ADK_TARGET_FS),nfsroot) imageinstall: kernel-install $(BIN_DIR)/$(ROOTFSUSERTARBALL) - @cp $(TARGET_DIR)/boot/kernel $(TARGET_KERNEL) - @echo 'The kernel file is: ${TARGET_KERNEL}' + @cp $(TARGET_DIR)/boot/kernel $(BIN_DIR)/$(TARGET_KERNEL) + @echo 'The kernel file is: $(BIN_DIR)/${TARGET_KERNEL}' @echo 'The nfs root tarball is: ${BIN_DIR}/${ROOTFSUSERTARBALL}' endif ifeq ($(ADK_TARGET_FS),yaffs) @@ -29,25 +29,25 @@ imageinstall: kernel-install $(BIN_DIR)/$(ROOTFSTARBALL) endif ifeq ($(ADK_TARGET_FS),archive) imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL) - @cp $(TARGET_DIR)/boot/kernel $(TARGET_KERNEL) - @echo 'The kernel file is: ${TARGET_KERNEL}' + @cp $(TARGET_DIR)/boot/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-mips -nographic -M malta -kernel $(TARGET_KERNEL) -hda qemu-${CPU_ARCH}.img -append "root=/dev/hda1"' + @echo 'qemu-system-mips -nographic -M malta -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-mips -nographic -M malta -kernel $(TARGET_KERNEL) -initrd ${BIN_DIR}/${INITRAMFS}' + @echo 'qemu-system-mips -nographic -M malta -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-mips -nographic -M malta -kernel $(TARGET_KERNEL)' + @echo 'qemu-system-mips -nographic -M malta -kernel $(BIN_DIR)/$(TARGET_KERNEL)' endif diff --git a/target/mips/sys-available/qemu b/target/mips/sys-available/qemu-mips index 103e70f7b..70ac9718b 100644 --- a/target/mips/sys-available/qemu +++ b/target/mips/sys-available/qemu-mips @@ -1,7 +1,7 @@ config ADK_TARGET_SYSTEM_QEMU_MIPS bool "Qemu Emulator" select ADK_mips - select ADK_qemu + select ADK_qemu_mips select ADK_HARDWARE_QEMU select ADK_TARGET_WITH_VGA select ADK_TARGET_WITH_INPUT diff --git a/target/mips/sys-available/toolchain b/target/mips/sys-available/toolchain-mips index accf75240..4b03d9b6f 100644 --- a/target/mips/sys-available/toolchain +++ b/target/mips/sys-available/toolchain-mips @@ -1,7 +1,7 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_MIPS bool "Toolchain only" select ADK_mips - select ADK_toolchain + select ADK_toolchain_mips select ADK_TOOLCHAIN_ONLY help mips toolchain. |