diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2010-06-28 10:38:59 +0200 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-06-28 10:38:59 +0200 |
commit | e9e7c5715ae2cb168dfe56192a3a1d5aacc70b23 (patch) | |
tree | 25656fc11aa2d35418a76114f8d82262e9536bad /target | |
parent | 1143ead360fb043f43388d727e710f358702bc9a (diff) |
fix busybox rebuild issue, simplify target Makefiles
Diffstat (limited to 'target')
29 files changed, 104 insertions, 221 deletions
diff --git a/target/Makefile b/target/Makefile index b3f266ee0..1070ce960 100644 --- a/target/Makefile +++ b/target/Makefile @@ -89,3 +89,4 @@ clean: $(ADK_TARGET)-clean $(ADK_TARGET)-imageclean %-imageinstall: %-imageprepare $(TRACE) target/$(patsubst %-imageinstall,%,$@)-imageinstall $(MAKE) -C $(patsubst %-imageinstall,%,$@) imageinstall + @echo 'Login as user root with password linux123 via ssh or console' diff --git a/target/ag241/Makefile b/target/ag241/Makefile index 05ce25271..ac95593fb 100644 --- a/target/ag241/Makefile +++ b/target/ag241/Makefile @@ -27,7 +27,7 @@ kernel-install: tools-compile -o $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel 2>/dev/null ifeq ($(FS),squashfs) -imageinstall: $(BIN_DIR)/$(ROOTFSSQUASHFS) +imageinstall: kernel-install $(BIN_DIR)/$(ROOTFSSQUASHFS) @if [ $$(stat --format=%s ${BUILD_DIR}/${ROOTFSSQUASHFS}) -gt 3801088 ];then \ echo 'Image is too big!'; \ else \ @@ -37,18 +37,14 @@ imageinstall: $(BIN_DIR)/$(ROOTFSSQUASHFS) echo 'tftp 192.168.1.1'; \ echo 'tftp> binary'; \ echo "tftp> put $(ROOTFSSQUASHFS) upgrade_code.bin"; \ - echo 'Login as user root with password linux123 via ssh or console'; \ fi endif - ifeq ($(FS),nfsroot) -imageinstall: $(BIN_DIR)/$(ROOTFSUSERTARBALL) - @echo +imageinstall: kernel-install $(BIN_DIR)/$(ROOTFSUSERTARBALL) @echo 'The kernel file is: ${BIN_DIR}/${ADK_TARGET}-${FS}-kernel' @echo 'The nfs root tarball is: ${BIN_DIR}/${ROOTFSUSERTARBALL}' @echo 'You can flash the kernel via tftp:' @echo 'tftp 192.168.1.1' @echo 'tftp> binary' @echo 'tftp> put ${ADK_TARGET}-${FS}-kernel upgrade_code.bin' - @echo 'Login as user root with password linux123 via ssh or console' endif diff --git a/target/ag241/tools/rules.mk b/target/ag241/tools/rules.mk index 8d03c031a..a6a3684ac 100644 --- a/target/ag241/tools/rules.mk +++ b/target/ag241/tools/rules.mk @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/target/alix1c/Makefile b/target/alix1c/Makefile index 542f64164..d38eb727b 100644 --- a/target/alix1c/Makefile +++ b/target/alix1c/Makefile @@ -9,33 +9,25 @@ include $(TOPDIR)/mk/image.mk KERNEL:=$(LINUX_DIR)/arch/x86/boot/bzImage -kernel-install: - @cp $(KERNEL) $(TARGET_DIR)/boot/vmlinuz-adk - ifeq ($(FS),ext2-block) imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL) - @echo @echo "The RootFS tarball is: $(BIN_DIR)/$(ROOTFSTARBALL)" @echo "To install everything to CompactFlash use scripts/install.sh" - @echo 'Login as user root with password linux123 via ssh or console' endif ifeq ($(FS),nfsroot) imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL) @cp $(KERNEL) $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel - @echo @echo 'The linux kernel is here: $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel' @echo 'The nfs root tarball is here: ${BIN_DIR}/${ROOTFSTARBALL}' - @echo 'Login as user root with password linux123 via ssh or console' endif ifeq ($(FS),initramfs) imageinstall: $(BIN_DIR)/$(INITRAMFS) + @cp $(KERNEL) $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel @echo 'The kernel file is: ${BIN_DIR}/${ADK_TARGET}-${FS}-kernel' @echo 'The initramfs image is: ${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} createinitramfs @cp $(KERNEL) ${BIN_DIR}/${ADK_TARGET}-${FS}-kernel @echo 'The kernel+initramfs file is: ${BIN_DIR}/${ADK_TARGET}-${FS}-kernel' - @echo 'Login as user root with password linux123 via ssh or console' endif diff --git a/target/alix2d/Makefile b/target/alix2d/Makefile index 9b051dfac..bed5b3c69 100644 --- a/target/alix2d/Makefile +++ b/target/alix2d/Makefile @@ -9,33 +9,25 @@ include $(TOPDIR)/mk/image.mk KERNEL:=$(LINUX_DIR)/arch/x86/boot/bzImage -kernel-install: - @cp $(KERNEL) $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel - ifeq ($(FS),ext2-block) imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL) - @cp $(KERNEL) $(TARGET_DIR)/boot/vmlinuz-adk - @echo @echo "The RootFS tarball is: $(BIN_DIR)/$(ROOTFSTARBALL)" @echo "To install everything to CompactFlash use scripts/install.sh" - @echo 'Login as user root with password linux123 via ssh or console' endif ifeq ($(FS),nfsroot) imageinstall: $(BIN_DIR)/$(ROOTFSUSERTARBALL) - @echo + @cp $(KERNEL) $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel @echo 'The linux kernel is here: $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel' @echo 'The nfs root tarball is here: ${BIN_DIR}/${ROOTFSUSERTARBALL}' - @echo 'Login as user root with password linux123 via ssh or console' endif ifeq ($(FS),initramfs) imageinstall: $(BIN_DIR)/$(INITRAMFS) + @cp $(KERNEL) $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel @echo 'The kernel file is: ${BIN_DIR}/${ADK_TARGET}-${FS}-kernel' @echo 'The initramfs image is: ${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} createinitramfs @cp $(KERNEL) ${BIN_DIR}/${ADK_TARGET}-${FS}-kernel @echo 'The kernel+initramfs file is: ${BIN_DIR}/${ADK_TARGET}-${FS}-kernel' - @echo 'Login as user root with password linux123 via ssh or console' endif diff --git a/target/alix2d13/Makefile b/target/alix2d13/Makefile index 542f64164..ef05ed7da 100644 --- a/target/alix2d13/Makefile +++ b/target/alix2d13/Makefile @@ -9,33 +9,25 @@ include $(TOPDIR)/mk/image.mk KERNEL:=$(LINUX_DIR)/arch/x86/boot/bzImage -kernel-install: - @cp $(KERNEL) $(TARGET_DIR)/boot/vmlinuz-adk - ifeq ($(FS),ext2-block) imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL) - @echo @echo "The RootFS tarball is: $(BIN_DIR)/$(ROOTFSTARBALL)" @echo "To install everything to CompactFlash use scripts/install.sh" - @echo 'Login as user root with password linux123 via ssh or console' endif ifeq ($(FS),nfsroot) imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL) @cp $(KERNEL) $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel - @echo @echo 'The linux kernel is here: $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel' @echo 'The nfs root tarball is here: ${BIN_DIR}/${ROOTFSTARBALL}' - @echo 'Login as user root with password linux123 via ssh or console' endif ifeq ($(FS),initramfs) imageinstall: $(BIN_DIR)/$(INITRAMFS) + @cp $(KERNEL) ${BIN_DIR}/${ADK_TARGET}-${FS}-kernel @echo 'The kernel file is: ${BIN_DIR}/${ADK_TARGET}-${FS}-kernel' @echo 'The initramfs image is: ${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} createinitramfs @cp $(KERNEL) ${BIN_DIR}/${ADK_TARGET}-${FS}-kernel @echo 'The kernel+initramfs file is: ${BIN_DIR}/${ADK_TARGET}-${FS}-kernel' - @echo 'Login as user root with password linux123 via ssh or console' endif diff --git a/target/brcm/Makefile b/target/brcm/Makefile index 633912f9f..d89eaa795 100644 --- a/target/brcm/Makefile +++ b/target/brcm/Makefile @@ -22,11 +22,9 @@ kernel-install: tools-compile $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel ifeq ($(FS),nfsroot) -imageinstall: $(BIN_DIR)/$(ROOTFSUSERTARBALL) - @echo +imageinstall: kernel-install $(BIN_DIR)/$(ROOTFSUSERTARBALL) @echo 'The kernel file is: ${BIN_DIR}/${ADK_TARGET}-${FS}-kernel' @echo 'The nfs root tarball is: ${BIN_DIR}/${ROOTFSUSERTARBALL}' @echo 'Type following on the CFE prompt to boot the kernel:' @echo 'CFE> boot -z -elf -tftp 192.168.1.254:${ADK_TARGET}-${FS}-kernel' - @echo 'Login as user root with password linux123 via ssh or console.' endif diff --git a/target/foxboard/Makefile b/target/foxboard/Makefile index f085a8f64..999ac8ab8 100644 --- a/target/foxboard/Makefile +++ b/target/foxboard/Makefile @@ -21,7 +21,7 @@ kernel-install: tools-compile $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel $(MAKE_TRACE) ifeq ($(FS),squashfs) -imageinstall: $(BIN_DIR)/$(ROOTFSSQUASHFS) +imageinstall: kernel-install $(BIN_DIR)/$(ROOTFSSQUASHFS) dd if=${BUILD_DIR}/${ROOTFSSQUASHFS} of=${BIN_DIR}/${ROOTFSSQUASHFS} \ bs=4063232 conv=sync $(MAKE_TRACE) @if [ $$(stat --format=%s ${BIN_DIR}/${ROOTFSSQUASHFS}) -gt 4063232 ];then \ @@ -29,14 +29,11 @@ imageinstall: $(BIN_DIR)/$(ROOTFSSQUASHFS) else \ echo 'Use sudo ./boot_linux -F -i $(ROOTFSSQUASHFS) to flash'; \ echo 'Do not forget to set the network boot jumper, before you start the foxboard'; \ - echo 'Login as user root with password linux123 via ssh or console'; \ fi endif ifeq ($(FS),nfsroot) -imageinstall: ${BIN_DIR}/${ROOTFSUSERTARBALL} - @echo +imageinstall: kernel-install ${BIN_DIR}/${ROOTFSUSERTARBALL} @echo Use sudo ./boot_linux -F -i ${ADK_TARGET}-${FS}-kernel to flash the kernel @echo Do not forget to set network boot jumper, before you start the foxboard @echo ${ROOTFSUSERTARBALL} is your nfs root and can be extracted on your nfs server - @echo 'Login as user root with password linux123 via ssh or console' endif diff --git a/target/foxg20/Makefile b/target/foxg20/Makefile index 5762b4939..8c97fc4ad 100644 --- a/target/foxg20/Makefile +++ b/target/foxg20/Makefile @@ -7,35 +7,31 @@ include $(TOPDIR)/mk/modules.mk include $(TOPDIR)/mk/kernel-build.mk include $(TOPDIR)/mk/image.mk +KERNEL:=$(BUILD_DIR)/${ADK_TARGET}-${FS}-kernel LOADADDR:= 0x20008000 kernel-install: - gzip -9 < $(LINUX_DIR)/arch/arm/boot/Image > ${BUILD_DIR}/Image.gz - mkimage -A arm -O linux -T kernel -C gzip \ + @gzip -9 < $(LINUX_DIR)/arch/arm/boot/Image > ${BUILD_DIR}/Image.gz + @mkimage -A arm -O linux -T kernel -C gzip \ -a ${LOADADDR} -e ${LOADADDR} -d ${BUILD_DIR}/Image.gz \ - -n foxg20 $(TARGET_DIR)/boot/uImage $(MAKE_TRACE) - @cp $(TARGET_DIR)/boot/uImage \ + -n foxg20 $(TARGET_DIR)/boot/vmlinuz-adk $(MAKE_TRACE) + @cp $(TARGET_DIR)/boot/vmlinuz-adk \ $(BUILD_DIR)/${ADK_TARGET}-${FS}-kernel ifeq ($(FS),nfsroot) -imageinstall: ${BIN_DIR}/${ROOTFSUSERTARBALL} +imageinstall: kernel-install ${BIN_DIR}/${ROOTFSUSERTARBALL} @cp $(BUILD_DIR)/${ADK_TARGET}-${FS}-kernel \ $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel - @echo @echo 'Type dhcp via u-boot prompt to load kernel' @echo 'After that type bootm to load the kernel' - @echo 'Login as user root with password linux123 via ssh or console' endif - ifeq ($(FS),ext2-block) -imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL) - @echo +imageinstall: kernel-install $(BIN_DIR)/$(ROOTFSTARBALL) @echo "The RootFS tarball is:" @echo "$(BIN_DIR)/$(ROOTFSTARBALL)" @echo 'Before booting from MicroSD card you need to set following u-boot environment variables:' - @echo "setenv bootcmd 'mmc init; sleep 1; fatload mmc 0 0x22000000 uimage; bootm 0x22000000'" + @echo "setenv bootcmd 'mmc init; sleep 1; fatload mmc 0 0x22000000 vmlinuz-adk; bootm 0x22000000'" @echo @echo "Boot the board via network and use adkinstall." @echo "If you just want to update, use adkupdate." - @echo 'Login as user root with password linux123 via ssh or console.' endif diff --git a/target/ibmx40/Makefile b/target/ibmx40/Makefile index 65ef6bf14..f3ef6575a 100644 --- a/target/ibmx40/Makefile +++ b/target/ibmx40/Makefile @@ -9,9 +9,6 @@ include $(TOPDIR)/mk/image.mk KERNEL:=$(LINUX_DIR)/arch/x86/boot/bzImage -kernel-install: - @cp $(KERNEL) $(TARGET_DIR)/boot/vmlinuz-adk - createinitcrypt: $(SED) 's#^CONFIG_INITRAMFS_SOURCE.*#CONFIG_INITRAMFS_SOURCE="./initramfs_list"#' $(LINUX_DIR)/.config echo 'CONFIG_INITRAMFS_ROOT_UID=0' >> $(LINUX_DIR)/.config @@ -20,29 +17,24 @@ createinitcrypt: CC="$(TARGET_CC)" oldconfig $(MAKE_TRACE) $(MAKE) -C $(LINUX_DIR) V=1 CROSS_COMPILE="$(TARGET_CROSS)" ARCH=$(ARCH) \ CC="$(TARGET_CC)" $(MAKE_TRACE) - @cp $(LINUX_DIR)/arch/x86/boot/compressed/vmlinux \ - $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel + @cp $(KERNEL) $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel ifeq ($(FS),archive) imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL) + @cp $(KERNEL) ${BIN_DIR}/${ADK_TARGET}-${FS}-kernel + @echo 'The kernel file is: ${BIN_DIR}/${ADK_TARGET}-${FS}-kernel' @echo "The RootFS tarball is: $(BIN_DIR)/$(ROOTFSTARBALL)" - @echo 'Login as user root with password linux123 via ssh or console' endif - ifeq ($(FS),usb) imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL) @echo "The RootFS tarball is: $(BIN_DIR)/$(ROOTFSTARBALL)" @echo "To install everything to USB use scripts/install.sh" - @echo 'Login as user root with password linux123 via ssh or console' endif - ifeq ($(FS),initramfs-piggyback) imageinstall: ${BUILD_DIR}/${INITRAMFS_PIGGYBACK} createinitramfs @cp $(KERNEL) ${BIN_DIR}/${ADK_TARGET}-${FS}-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 - ifeq ($(FS),encrypted) imageinstall: $(BIN_DIR)/$(ROOTFSUSERTARBALL) createinitcrypt @echo 'The kernel+cryptinit file is: ${BIN_DIR}/${ADK_TARGET}-${FS}-kernel' @@ -67,5 +59,4 @@ imageinstall: $(BIN_DIR)/$(ROOTFSUSERTARBALL) createinitcrypt @echo 'Copy $(ROOTFSUSERTARBALL) via scp to /mnt/root and extract it' @echo 'cd /mnt/root ; gunzip $(ROOTFSUSERTARBALL); tar xpvf $(ROOTFSUSERTARBALL)' @echo 'cd /mnt/root ; mknod -m 644 console c 5 1' - @echo 'Login as user root with password linux123 via ssh or console' endif diff --git a/target/lemote/Makefile b/target/lemote/Makefile index 8f8042827..40b19b19c 100644 --- a/target/lemote/Makefile +++ b/target/lemote/Makefile @@ -9,9 +9,6 @@ include $(TOPDIR)/mk/image.mk KERNEL:=$(LINUX_DIR)/vmlinuz -kernel-install: - @cp $(KERNEL) $(TARGET_DIR)/boot/vmlinuz-adk - createinitcrypt: $(SED) 's#^CONFIG_INITRAMFS_SOURCE.*#CONFIG_INITRAMFS_SOURCE="./initramfs_list"#' $(LINUX_DIR)/.config echo 'CONFIG_INITRAMFS_ROOT_UID=0' >> $(LINUX_DIR)/.config @@ -20,18 +17,34 @@ createinitcrypt: CC="$(TARGET_CC)" oldconfig $(MAKE_TRACE) $(MAKE) -C $(LINUX_DIR) V=1 CROSS_COMPILE="$(TARGET_CROSS)" ARCH=$(ARCH) \ CC="$(TARGET_CC)" $(MAKE_TRACE) - @cp $(LINUX_DIR)/vmlinuz $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel + @cp $(KERNEL) $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel ifeq ($(FS),nfsroot) imageinstall: $(BIN_DIR)/$(ROOTFSUSERTARBALL) - @cp $(LINUX_DIR)/vmlinuz $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel + @cp $(KERNEL) $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel @echo 'The kernel file is: ${BIN_DIR}/${ADK_TARGET}-${FS}-kernel' @echo 'The nfs root tarball is: ${BIN_DIR}/${ROOTFSUSERTARBALL}' @echo 'Boot your lemote and type following commands in PMON:' @echo 'PMON> ifaddr rtl0 <ip-address-client>' @echo 'PMON> load tftp://<ip-address-server>/${ADK_TARGET}-${FS}-kernel' @echo 'PMON> g' - @echo 'Login as user root with password linux123 via ssh or console' +endif +ifeq ($(FS),initramfs) +imageinstall: $(BIN_DIR)/$(INITRAMFS) + @cp $(KERNEL) $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel + @echo 'The kernel file is: ${BIN_DIR}/${ADK_TARGET}-${FS}-kernel' + @echo 'The initramfs image is: ${BIN_DIR}/${INITRAMFS}' +endif +ifeq ($(FS),initramfs-piggyback) +imageinstall: $(BUILD_DIR)/$(INITRAMFS_PIGGYBACK) createinitramfs + @cp $(KERNEL) $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel + @echo 'The kernel+initramfs file is: ${BIN_DIR}/${ADK_TARGET}-${FS}-kernel' +endif +ifeq ($(FS),archive) +imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL) + @cp $(KERNEL) $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel + @echo 'The kernel file is: ${BIN_DIR}/${ADK_TARGET}-${FS}-kernel' + @echo "The RootFS tarball is: $(BIN_DIR)/$(ROOTFSTARBALL)" endif ifeq ($(FS),encrypted) imageinstall: $(BIN_DIR)/$(ROOTFSUSERTARBALL) createinitcrypt @@ -60,22 +73,4 @@ imageinstall: $(BIN_DIR)/$(ROOTFSUSERTARBALL) createinitcrypt @echo 'Move boot.cfg to /mnt/boot/boot' @echo 'mv /mnt/root/boot/boot.cfg /mnt/boot/boot' @echo 'cd /mnt/root ; mknod -m 644 console c 5 1' - @echo 'Login as user root with password linux123 via ssh or console' -endif -ifeq ($(FS),initramfs) -imageinstall: $(BIN_DIR)/$(INITRAMFS) - @echo 'The kernel file is: ${BIN_DIR}/${ADK_TARGET}-${FS}-kernel' - @echo 'The initramfs image is: ${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) createinitramfs - @echo 'The kernel+initramfs file is: ${BIN_DIR}/${ADK_TARGET}-${FS}-kernel' - @echo 'Login as user root with password linux123 via ssh or console' -endif -ifeq ($(FS),archive) -imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL) - @echo - @echo "The RootFS tarball is: $(BIN_DIR)/$(ROOTFSTARBALL)" - @echo 'Login as user root with password linux123 via ssh or console' endif diff --git a/target/native/Makefile b/target/native/Makefile index 21fde248a..1999540c4 100644 --- a/target/native/Makefile +++ b/target/native/Makefile @@ -10,14 +10,11 @@ include $(TOPDIR)/mk/image.mk KERNEL:=$(LINUX_DIR)/arch/x86/boot/bzImage -kernel-install: - ifeq ($(FS),initramfs) imageinstall: $(BIN_DIR)/$(INITRAMFS) @cp $(KERNEL) $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel @echo 'The kernel file is: ${BIN_DIR}/${ADK_TARGET}-${FS}-kernel' @echo 'The initramfs image is: ${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} createinitramfs diff --git a/target/qemu-arm/Makefile b/target/qemu-arm/Makefile index 150d25f9c..cdac0a870 100644 --- a/target/qemu-arm/Makefile +++ b/target/qemu-arm/Makefile @@ -7,33 +7,30 @@ include $(TOPDIR)/mk/modules.mk include $(TOPDIR)/mk/kernel-build.mk include $(TOPDIR)/mk/image.mk -kernel-install: - @cp $(LINUX_DIR)/arch/arm/boot/zImage \ - $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel +KERNEL:=$(LINUX_DIR)/arch/arm/boot/zImage ifeq ($(FS),archive) imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL) - @echo - @echo "The RootFS tarball is: $(BIN_DIR)/$(ROOTFSTARBALL)," + @cp $(KERNEL) $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel + @echo 'The kernel file is: ${BIN_DIR}/${ADK_TARGET}-${FS}-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-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) imageinstall: $(BIN_DIR)/$(INITRAMFS) + @cp $(KERNEL) $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel @echo 'The kernel file is: ${BIN_DIR}/${ADK_TARGET}-${FS}-kernel' @echo 'The initramfs image is: ${BIN_DIR}/${INITRAMFS}' @echo "Start qemu with following options:" @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} createinitramfs + @cp $(KERNEL) $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel @echo 'The kernel file is: ${BIN_DIR}/${ADK_TARGET}-${FS}-kernel' @echo "Start qemu with following options:" @echo 'qemu-system-arm -M spitz -portrait -kernel $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel' - @echo 'Login as user root with password linux123 via ssh or console' endif diff --git a/target/qemu-cris/Makefile b/target/qemu-cris/Makefile index b83ff2ac4..f5bbb84c3 100644 --- a/target/qemu-cris/Makefile +++ b/target/qemu-cris/Makefile @@ -7,34 +7,30 @@ include $(TOPDIR)/mk/modules.mk include $(TOPDIR)/mk/kernel-build.mk include $(TOPDIR)/mk/image.mk -kernel-install: - @cp $(LINUX_DIR)/arch/cris/boot/zImage \ - $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel $(MAKE_TRACE) +KERNEL:=$(LINUX_DIR)/arch/cris/boot/zImage ifeq ($(FS),archive) imageinstall: $(BIN_DIR)/$(ROOTFSUSERTARBALL) - @echo + @cp $(KERNEL) $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel + @echo 'The kernel file is: ${BIN_DIR}/${ADK_TARGET}-${FS}-kernel' @echo "The RootFS tarball is: $(BIN_DIR)/$(ROOTFSUSERTARBALL)," @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)/$(ROOTFSUSERTARBALL)" @echo "Start qemu with following command line:" @echo 'qemu-system-cris -nographic -kernel $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel qemu-${CPU_ARCH}.img' - @echo 'Login as user root with password linux123 via ssh or console' endif - ifeq ($(FS),initramfs) imageinstall: $(BIN_DIR)/$(INITRAMFS) + @cp $(KERNEL) $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel @echo 'The kernel file is: ${BIN_DIR}/${ADK_TARGET}-${FS}-kernel' @echo 'The initramfs image is: ${BIN_DIR}/${INITRAMFS}' @echo "Start qemu with following command line:" @echo 'qemu-system-cris -nographic -kernel $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel' - @echo 'Login as user root with password linux123 via ssh or console' endif - ifeq ($(FS),initramfs-piggyback) imageinstall: ${BUILD_DIR}/${INITRAMFS_PIGGYBACK} createinitramfs + @cp $(KERNEL) $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel @echo 'The kernel file is: ${BIN_DIR}/${ADK_TARGET}-${FS}-kernel' @echo "Start qemu with following command line:" @echo 'qemu-system-cris -nographic -kernel $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel' - @echo 'Login as user root with password linux123 via ssh or console' endif diff --git a/target/qemu-mips/Makefile b/target/qemu-mips/Makefile index 878d8562b..79c12b50e 100644 --- a/target/qemu-mips/Makefile +++ b/target/qemu-mips/Makefile @@ -7,32 +7,30 @@ include $(TOPDIR)/mk/modules.mk include $(TOPDIR)/mk/kernel-build.mk include $(TOPDIR)/mk/image.mk -kernel-install: - @cp $(LINUX_DIR)/vmlinux $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel +KERNEL:=$(LINUX_DIR)/vmlinux ifeq ($(FS),archive) imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL) - @echo - @echo "The RootFS tarball is: $(BIN_DIR)/$(ROOTFSTARBALL)," + @cp $(KERNEL) $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel + @echo 'The kernel file is: ${BIN_DIR}/${ADK_TARGET}-${FS}-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 $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel -hda qemu-${CPU_ARCH}.img -append "root=/dev/hda1"' - @echo 'Login as user root with password linux123 via ssh or console' endif ifeq ($(FS),initramfs) imageinstall: $(BIN_DIR)/$(INITRAMFS) + @cp $(KERNEL) $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel @echo 'The kernel file is: ${BIN_DIR}/${ADK_TARGET}-${FS}-kernel' @echo 'The initramfs image is: ${BIN_DIR}/${INITRAMFS}' @echo 'qemu-system-mips -nographic -M malta -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} createinitramfs + @cp $(KERNEL) $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel @echo 'The kernel+initramfs file is: ${BIN_DIR}/${ADK_TARGET}-${FS}-kernel' @echo "Start qemu with following command line:" @echo 'qemu-system-mips -nographic -M malta -kernel $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel' - @echo 'Login as user root with password linux123 via ssh or console' endif diff --git a/target/qemu-mips64/Makefile b/target/qemu-mips64/Makefile index 18f283d4a..302df24e0 100644 --- a/target/qemu-mips64/Makefile +++ b/target/qemu-mips64/Makefile @@ -7,24 +7,19 @@ include $(TOPDIR)/mk/modules.mk include $(TOPDIR)/mk/kernel-build.mk include $(TOPDIR)/mk/image.mk -kernel-install: - @cp $(LINUX_DIR)/vmlinux $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel +KERNEL:=$(LINUX_DIR)/vmlinux ifeq ($(FS),archive) imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL) - @echo - @echo "The RootFS tarball is: $(BIN_DIR)/$(ROOTFSTARBALL)," + @echo "The RootFS tarball is: $(BIN_DIR)/$(ROOTFSTARBALL)" @echo "Use following command to create a QEMU Image:" @echo "sudo ./scripts/create-image.sh qemu-${CPU_ARCH}.img $(BIN_DIR)/$(ROOTFSTARBALL)" @echo "Start qemu with following options:" @echo 'qemu-system-mips64 -nographic -M malta -kernel $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel -hda qemu-${CPU_ARCH}.img -append "root=/dev/hda1"' - @echo 'Login as user root with password linux123 via ssh or console' endif - ifeq ($(FS),initramfs) imageinstall: $(BIN_DIR)/$(INITRAMFS) @echo 'The kernel file is: ${BIN_DIR}/${ADK_TARGET}-${FS}-kernel' @echo 'The initramfs image is: ${BIN_DIR}/${INITRAMFS}' @echo 'qemu-system-mips64 -nographic -M malta -kernel $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel -initrd ${BIN_DIR}/${INITRAMFS}' - @echo 'Login as user root with password linux123 via ssh or console' endif diff --git a/target/qemu-mips64el/Makefile b/target/qemu-mips64el/Makefile index 7445814be..b4bcd24f5 100644 --- a/target/qemu-mips64el/Makefile +++ b/target/qemu-mips64el/Makefile @@ -7,25 +7,21 @@ include $(TOPDIR)/mk/modules.mk include $(TOPDIR)/mk/kernel-build.mk include $(TOPDIR)/mk/image.mk -kernel-install: - @cp $(LINUX_DIR)/vmlinux $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel +KERNEL:=$(LINUX_DIR)/vmlinux ifeq ($(FS),archive) imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL) - @cp $(LINUX_DIR)/vmlinux $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel - @echo + @cp $(KERNEL) $(BIN_DIR)/${ADK_TARGET}-${FS}-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-mips64el -nographic -M malta -kernel $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel -hda qemu-${CPU_ARCH}.img -append "root=/dev/hda1"' - @echo 'Login as user root with password linux123 via ssh or console' endif - ifeq ($(FS),initramfs) imageinstall: $(BIN_DIR)/$(INITRAMFS) + @cp $(KERNEL) $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel @echo 'The kernel file is: ${BIN_DIR}/${ADK_TARGET}-${FS}-kernel' @echo 'The initramfs image is: ${BIN_DIR}/${INITRAMFS}' @echo 'qemu-system-mips64el -nographic -M malta -kernel $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel -initrd ${BIN_DIR}/${INITRAMFS}' - @echo 'Login as user root with password linux123 via ssh or console' endif diff --git a/target/qemu-mipsel/Makefile b/target/qemu-mipsel/Makefile index ed99bcac9..f55aa9cb4 100644 --- a/target/qemu-mipsel/Makefile +++ b/target/qemu-mipsel/Makefile @@ -7,32 +7,30 @@ include $(TOPDIR)/mk/modules.mk include $(TOPDIR)/mk/kernel-build.mk include $(TOPDIR)/mk/image.mk -kernel-install: - @cp $(LINUX_DIR)/vmlinux $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel +KERNEL:=$(LINUX_DIR)/vmlinux ifeq ($(FS),archive) imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL) + @cp $(KERNEL) $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel + @echo 'The kernel file is: ${BIN_DIR}/${ADK_TARGET}-${FS}-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 "Be sure to change permissions after image creation." @echo "Start qemu with following options:" @echo 'qemu-system-mipsel -nographic -M malta -kernel $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel -hda qemu-${CPU_ARCH}.img -append "root=/dev/hda1"' - @echo 'Login as user root with password linux123 via ssh or console' endif - ifeq ($(FS),initramfs) imageinstall: $(BIN_DIR)/$(INITRAMFS) + @cp $(KERNEL) $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel @echo 'The kernel file is: ${BIN_DIR}/${ADK_TARGET}-${FS}-kernel' @echo 'The initramfs image is: ${BIN_DIR}/${INITRAMFS}' @echo 'qemu-system-mipsel -nographic -M malta -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} createinitramfs + @cp $(KERNEL) $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel @echo 'The kernel+initramfs file is: ${BIN_DIR}/${ADK_TARGET}-${FS}-kernel' @echo "Start qemu with following command line:" @echo 'qemu-system-mipsel -nographic -M malta -kernel $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel' - @echo 'Login as user root with password linux123 via ssh or console' endif diff --git a/target/qemu-x86/Makefile b/target/qemu-x86/Makefile index 68e7cb728..ab7106016 100644 --- a/target/qemu-x86/Makefile +++ b/target/qemu-x86/Makefile @@ -9,33 +9,27 @@ include $(TOPDIR)/mk/image.mk KERNEL:=$(LINUX_DIR)/arch/x86/boot/bzImage -kernel-install: - @cp $(KERNEL) $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel - ifeq ($(FS),archive) imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL) - @echo "The RootFS tarball is: $(BIN_DIR)/$(ROOTFSTARBALL)," + @cp $(KERNEL) $(BIN_DIR)/${ADK_TARGET}-${FS}-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 command line:" @echo 'qemu -nographic -net user,hostfwd=tcp::2222-:22 -net nic,model=e1000 -kernel $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel qemu-${CPU_ARCH}.img' - @echo 'Login as user root with password linux123 via ssh or console' endif - ifeq ($(FS),initramfs) imageinstall: $(BIN_DIR)/$(INITRAMFS) + @cp $(KERNEL) $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel @echo 'The kernel file is: ${BIN_DIR}/${ADK_TARGET}-${FS}-kerne |