summaryrefslogtreecommitdiff
path: root/target/qemu-arm/Makefile
diff options
context:
space:
mode:
authorU-windows7\wbx <wbx@windows7.(none)>2009-12-20 13:29:10 +0100
committerU-windows7\wbx <wbx@windows7.(none)>2009-12-20 13:29:10 +0100
commit9115ff8b3139bab8ebc2d25f1ec03a98b2641c99 (patch)
tree2c7535d8970d7ebf5a7b5613fc3324b3200c0645 /target/qemu-arm/Makefile
parent82009b8fa77db023dd186444e2698a5d9c01d496 (diff)
parent6b65886e809bdbfd7699e7fbbc8980f5eb4992c4 (diff)
Merge branch 'master' of git://openadk.org/git/openadk
Diffstat (limited to 'target/qemu-arm/Makefile')
-rw-r--r--target/qemu-arm/Makefile12
1 files changed, 6 insertions, 6 deletions
diff --git a/target/qemu-arm/Makefile b/target/qemu-arm/Makefile
index 4f7c7904a..cda4e95bb 100644
--- a/target/qemu-arm/Makefile
+++ b/target/qemu-arm/Makefile
@@ -8,10 +8,10 @@ include $(TOPDIR)/mk/kernel-build.mk
include $(TOPDIR)/mk/image.mk
kernel-install:
- cp $(LINUX_DIR)/arch/arm/boot/zImage $(BIN_DIR)/${ADK_TARGET}-${ARCH}-kernel
+ @cp $(LINUX_DIR)/arch/arm/boot/zImage $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel
createinit:
- @-rm $(LINUX_DIR)/usr/initramfs_data.cpio.lzma
+ @-rm $(LINUX_DIR)/usr/initramfs_data.cpio.*
$(SED) 's#^CONFIG_INITRAMFS_SOURCE.*#CONFIG_INITRAMFS_SOURCE="${BUILD_DIR}/${INITRAMFS_PIGGYBACK}"#' $(LINUX_DIR)/.config
echo 'CONFIG_INITRAMFS_ROOT_UID=0' >> $(LINUX_DIR)/.config
echo 'CONFIG_INITRAMFS_ROOT_GID=0' >> $(LINUX_DIR)/.config
@@ -20,7 +20,7 @@ createinit:
$(MAKE) -C $(LINUX_DIR) V=1 CROSS_COMPILE="$(TARGET_CROSS)" ARCH=$(ARCH) \
CC="$(TARGET_CC)" $(MAKE_TRACE)
$(CP) $(LINUX_DIR)/arch/arm/boot/zImage \
- $(BIN_DIR)/${ADK_TARGET}-${ARCH}-kernel
+ $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel
ifeq ($(FS),archive)
imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL)
@@ -30,14 +30,14 @@ imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL)
endif
ifeq ($(FS),initramfs)
imageinstall: $(BIN_DIR)/$(INITRAMFS)
- @echo 'The kernel file is: ${BIN_DIR}/${ADK_TARGET}-${ARCH}-kernel'
+ @echo 'The kernel file is: ${BIN_DIR}/${ADK_TARGET}-${FS}-kernel'
@echo 'The initramfs image is: ${BIN_DIR}/${INITRAMFS}'
- @echo 'qemu-system-arm -M spitz -portrait -kernel $(BIN_DIR)/${ADK_TARGET}-${ARCH}-kernel -initrd ${BIN_DIR}/${INITRAMFS}'
+ @echo 'qemu-system-arm -M spitz -portrait -kernel $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel -initrd ${BIN_DIR}/${INITRAMFS}'
@echo 'Login as user root with password linux123 via ssh or console'
endif
ifeq ($(FS),initramfs-piggyback)
imageinstall: ${BUILD_DIR}/${INITRAMFS_PIGGYBACK} createinit
- @echo 'The kernel file is: ${BIN_DIR}/${ADK_TARGET}-${ARCH}-kernel'
+ @echo 'The kernel file is: ${BIN_DIR}/${ADK_TARGET}-${FS}-kernel'
@echo 'Login as user root with password linux123 via ssh or console'
endif