summaryrefslogtreecommitdiff
path: root/target/x86
diff options
context:
space:
mode:
Diffstat (limited to 'target/x86')
-rw-r--r--target/x86/Makefile52
1 files changed, 26 insertions, 26 deletions
diff --git a/target/x86/Makefile b/target/x86/Makefile
index b228810c7..ba665e4f2 100644
--- a/target/x86/Makefile
+++ b/target/x86/Makefile
@@ -10,63 +10,63 @@ include $(TOPDIR)/mk/image.mk
KERNEL:=$(LINUX_DIR)/arch/x86/boot/bzImage
ifeq ($(ADK_TARGET_FS),genext2fs)
-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 CompactFlash use scripts/genext2.sh"
endif
ifeq ($(ADK_TARGET_FS),cf)
-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 CompactFlash use scripts/install.sh"
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
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_HARDWARE_QEMU),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-i386 -nographic -net user,hostfwd=tcp::2222-:22 -net nic,model=e1000 -kernel $(BIN_DIR)/$(TARGET_KERNEL) qemu-${CPU_ARCH}.img'
+ @echo 'qemu-system-i386 -nographic -net user,hostfwd=tcp::2222-:22 -net nic,model=e1000 -kernel $(FW_DIR)/$(TARGET_KERNEL) qemu-${CPU_ARCH}.img'
endif
ifeq ($(ADK_HARDWARE_VBOX),y)
- @cp $(KERNEL) $(BIN_DIR)/$(TARGET_KERNEL)
+ @cp $(KERNEL) $(FW_DIR)/$(TARGET_KERNEL)
@echo "Use following command to create a VirtualBox Image:"
- @echo "./scripts/create.sh -T vdi vbox-${CPU_ARCH}.img $(BIN_DIR)/$(ROOTFSTARBALL)"
+ @echo "./scripts/create.sh -T vdi vbox-${CPU_ARCH}.img $(FW_DIR)/$(ROOTFSTARBALL)"
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_HARDWARE_QEMU),y)
@echo "Start qemu with following command line:"
- @echo 'qemu-system-i386 -nographic -net user,hostfwd=tcp::2222-:22 -net nic,model=e1000 -kernel $(BIN_DIR)/$(TARGET_KERNEL) -initrd ${BIN_DIR}/${INITRAMFS}'
+ @echo 'qemu-system-i386 -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+initramfs file is: $(BIN_DIR)/${TARGET_KERNEL}'
+ @cp $(KERNEL) $(FW_DIR)/${TARGET_KERNEL}
+ @echo 'The kernel+initramfs file is: $(FW_DIR)/${TARGET_KERNEL}'
ifeq ($(ADK_HARDWARE_QEMU),y)
@echo "Start qemu with following command line:"
- @echo 'qemu-system-i386 -nographic -net user,hostfwd=tcp::2222-:22 -net nic,model=e1000 -kernel $(BIN_DIR)/$(TARGET_KERNEL)'
+ @echo 'qemu-system-i386 -nographic -net user,hostfwd=tcp::2222-:22 -net nic,model=e1000 -kernel $(FW_DIR)/$(TARGET_KERNEL)'
endif
endif
ifeq (${ADK_TARGET_FS},iso)
-imageinstall: ${BIN_DIR}/${ROOTFSISO}
+imageinstall: ${FW_DIR}/${ROOTFSISO}
@echo 'ISO image is at $<'
endif