diff options
Diffstat (limited to 'target/x86_64')
| -rw-r--r-- | target/x86_64/Makefile | 14 | ||||
| -rw-r--r-- | target/x86_64/files/etc/network/interfaces | 5 | ||||
| -rw-r--r-- | target/x86_64/files/etc/tmpfs | 1 | ||||
| -rw-r--r-- | target/x86_64/sys-available/qemu-x86_64 (renamed from target/x86_64/sys-available/qemu) | 2 | ||||
| -rw-r--r-- | target/x86_64/sys-available/toolchain-x86_64 (renamed from target/x86_64/sys-available/toolchain) | 2 |
5 files changed, 9 insertions, 15 deletions
diff --git a/target/x86_64/Makefile b/target/x86_64/Makefile index ed90f443e..3ae8b112d 100644 --- a/target/x86_64/Makefile +++ b/target/x86_64/Makefile @@ -16,7 +16,7 @@ ifeq ($(ADK_TARGET_SYSTEM_QEMU_X86_64),y) @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 command line:" - @echo 'qemu-system-x86_64 -nographic -net user,hostfwd=tcp::2222-:22 -net nic,model=e1000 -kernel $(TARGET_KERNEL) qemu-${CPU_ARCH}.img' + @echo 'qemu-system-x86_64 -nographic -net user,hostfwd=tcp::2222-:22 -net nic,model=e1000 -kernel $(BIN_DIR)/$(TARGET_KERNEL) qemu-${CPU_ARCH}.img' endif endif ifeq ($(ADK_TARGET_FS),usb) @@ -26,20 +26,20 @@ imageinstall: $(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}' ifeq ($(ADK_TARGET_SYSTEM_QEMU_X86_64),y) @echo "Start qemu with following command line:" - @echo 'qemu-system-x86_64 -nographic -net user,hostfwd=tcp::2222-:22 -net nic,model=e1000 -kernel $(TARGET_KERNEL) -initrd ${BIN_DIR}/${INITRAMFS}' + @echo 'qemu-system-x86_64 -nographic -net user,hostfwd=tcp::2222-:22 -net nic,model=e1000 -kernel $(BIN_DIR)/$(TARGET_KERNEL) -initrd ${BIN_DIR}/${INITRAMFS}' endif endif ifeq ($(ADK_TARGET_FS),initramfs-piggyback) imageinstall: ${BUILD_DIR}/${INITRAMFS_PIGGYBACK} createinitramfs - @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}' ifeq ($(ADK_TARGET_SYSTEM_QEMU_X86_64),y) @echo "Start qemu with following command line:" - @echo 'qemu-system-x86_64 -nographic -net user,hostfwd=tcp::2222-:22 -net nic,model=e1000 -kernel $(TARGET_KERNEL)' + @echo 'qemu-system-x86_64 -nographic -net user,hostfwd=tcp::2222-:22 -net nic,model=e1000 -kernel $(BIN_DIR)/$(TARGET_KERNEL)' endif endif diff --git a/target/x86_64/files/etc/network/interfaces b/target/x86_64/files/etc/network/interfaces deleted file mode 100644 index 104c1a1b6..000000000 --- a/target/x86_64/files/etc/network/interfaces +++ /dev/null @@ -1,5 +0,0 @@ -auto lo -iface lo inet loopback - -auto eth0 -iface eth0 inet dhcp diff --git a/target/x86_64/files/etc/tmpfs b/target/x86_64/files/etc/tmpfs deleted file mode 100644 index 08558e471..000000000 --- a/target/x86_64/files/etc/tmpfs +++ /dev/null @@ -1 +0,0 @@ -16384 diff --git a/target/x86_64/sys-available/qemu b/target/x86_64/sys-available/qemu-x86_64 index 464f284fa..e7dd37fa8 100644 --- a/target/x86_64/sys-available/qemu +++ b/target/x86_64/sys-available/qemu-x86_64 @@ -1,7 +1,7 @@ config ADK_TARGET_SYSTEM_QEMU_X86_64 bool "Qemu Emulator" select ADK_x86_64 - select ADK_qemu + select ADK_qemu_x86_64 select ADK_HARDWARE_QEMU select ADK_TARGET_WITH_VGA select ADK_TARGET_WITH_INPUT diff --git a/target/x86_64/sys-available/toolchain b/target/x86_64/sys-available/toolchain-x86_64 index 1552e0599..be6a9f5b9 100644 --- a/target/x86_64/sys-available/toolchain +++ b/target/x86_64/sys-available/toolchain-x86_64 @@ -1,7 +1,7 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_X86_64 bool "Toolchain only" select ADK_x86_64 - select ADK_toolchain + select ADK_toolchain_x86_64 select ADK_TOOLCHAIN_ONLY help Build a x86_64 toolchain. |