diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-02-18 11:28:02 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-02-18 11:28:02 +0100 |
| commit | f9e8a355d7ff88bae17ea9f2198fbf3f990cd1bc (patch) | |
| tree | 03d4c73e81a736a0d1a37130eb8e2ee0b3471148 /target/x86_64/Makefile | |
| parent | da133cad10885ca36be26b1b043c737e295a4cd4 (diff) | |
use bin directory for host binaries only, use new firmware directory for the resulting firmware
Diffstat (limited to 'target/x86_64/Makefile')
| -rw-r--r-- | target/x86_64/Makefile | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/target/x86_64/Makefile b/target/x86_64/Makefile index 5bfcf3764..b625a374c 100644 --- a/target/x86_64/Makefile +++ b/target/x86_64/Makefile @@ -10,43 +10,43 @@ include $(TOPDIR)/mk/image.mk KERNEL:=$(LINUX_DIR)/arch/x86/boot/bzImage ifeq ($(ADK_TARGET_FS),archive) -imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL) - @echo 'The RootFS tarball is: ${BIN_DIR}/${ROOTFSTARBALL}' +imageinstall: $(FW_DIR)/$(ROOTFSTARBALL) + @echo 'The RootFS tarball is: ${FW_DIR}/${ROOTFSTARBALL}' ifeq ($(ADK_TARGET_SYSTEM_QEMU_X86_64),y) - @cp $(KERNEL) $(BIN_DIR)/$(TARGET_KERNEL) + @cp $(KERNEL) $(FW_DIR)/$(TARGET_KERNEL) @echo "Use following command to create a QEMU Image:" - @echo "./scripts/create.sh qemu-${CPU_ARCH}.img $(BIN_DIR)/$(ROOTFSTARBALL)" + @echo "./scripts/create.sh qemu-${CPU_ARCH}.img $(FW_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 $(BIN_DIR)/$(TARGET_KERNEL) qemu-${CPU_ARCH}.img' + @echo 'qemu-system-x86_64 -nographic -net user,hostfwd=tcp::2222-:22 -net nic,model=e1000 -kernel $(FW_DIR)/$(TARGET_KERNEL) qemu-${CPU_ARCH}.img' endif endif ifeq ($(ADK_TARGET_FS),usb) -imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL) - @echo "The RootFS tarball is: $(BIN_DIR)/$(ROOTFSTARBALL)" +imageinstall: $(FW_DIR)/$(ROOTFSTARBALL) + @echo "The RootFS tarball is: $(FW_DIR)/$(ROOTFSTARBALL)" @echo "To install everything to USB use scripts/install.sh" endif ifeq ($(ADK_TARGET_FS),initramfs) -imageinstall: $(BIN_DIR)/$(INITRAMFS) - @cp $(KERNEL) $(BIN_DIR)/$(TARGET_KERNEL) - @echo 'The kernel file is: $(BIN_DIR)/${TARGET_KERNEL}' - @echo 'The initramfs image is: ${BIN_DIR}/${INITRAMFS}' +imageinstall: $(FW_DIR)/$(INITRAMFS) + @cp $(KERNEL) $(FW_DIR)/$(TARGET_KERNEL) + @echo 'The kernel file is: $(FW_DIR)/${TARGET_KERNEL}' + @echo 'The initramfs image is: ${FW_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 $(BIN_DIR)/$(TARGET_KERNEL) -initrd ${BIN_DIR}/${INITRAMFS}' + @echo 'qemu-system-x86_64 -nographic -net user,hostfwd=tcp::2222-:22 -net nic,model=e1000 -kernel $(FW_DIR)/$(TARGET_KERNEL) -initrd ${FW_DIR}/${INITRAMFS}' endif endif ifeq ($(ADK_TARGET_FS),initramfs-piggyback) imageinstall: createinitramfs - @cp $(KERNEL) $(BIN_DIR)/$(TARGET_KERNEL) - @echo 'The kernel file is: $(BIN_DIR)/${TARGET_KERNEL}' + @cp $(KERNEL) $(FW_DIR)/$(TARGET_KERNEL) + @echo 'The kernel file is: $(FW_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 $(BIN_DIR)/$(TARGET_KERNEL)' + @echo 'qemu-system-x86_64 -nographic -net user,hostfwd=tcp::2222-:22 -net nic,model=e1000 -kernel $(FW_DIR)/$(TARGET_KERNEL)' endif endif ifeq ($(ADK_TARGET_FS),nfsroot) -imageinstall: $(BIN_DIR)/$(ROOTFSUSERTARBALL) - @cp $(KERNEL) $(BIN_DIR)/$(TARGET_KERNEL) - @echo 'The linux kernel is here: $(BIN_DIR)/$(TARGET_KERNEL)' - @echo 'The nfs root tarball is: ${BIN_DIR}/${ROOTFSUSERTARBALL}' +imageinstall: $(FW_DIR)/$(ROOTFSUSERTARBALL) + @cp $(KERNEL) $(FW_DIR)/$(TARGET_KERNEL) + @echo 'The linux kernel is here: $(FW_DIR)/$(TARGET_KERNEL)' + @echo 'The nfs root tarball is: ${FW_DIR}/${ROOTFSUSERTARBALL}' endif |