From 65c2ab93616bdf982152a94ab35c2079a5e3a2d7 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 23 May 2014 16:31:14 +0200 Subject: split targethelp from install target cleanup target/*/Makefile stuff. --- target/mips/Makefile | 163 +++++++++++++++++---------------------------------- 1 file changed, 53 insertions(+), 110 deletions(-) (limited to 'target/mips') diff --git a/target/mips/Makefile b/target/mips/Makefile index 06a0a84a2..cdb5b7f8a 100644 --- a/target/mips/Makefile +++ b/target/mips/Makefile @@ -10,39 +10,11 @@ include $(TOPDIR)/mk/image.mk KERNEL:=$(LINUX_DIR)/$(ADK_TARGET_KERNEL) OSTRIP:=-R .reginfo -R .notes -R .note -R .comment -R .mdebug -R .note.gnu.build-id +QEMU_ARGS:=-M malta +QEMU_ARGS+=${ADK_QEMU_ARGS} +QEMU_ARGS+=-device e1000,netdev=adk0 -netdev user,id=adk0 + # target helper text -ifeq ($(ADK_TARGET_FS),nfsroot) -targethelp: - @echo 'The kernel file is: $(FW_DIR)/${TARGET_KERNEL}' - @echo 'The nfs root tarball is: ${FW_DIR}/${ROOTFSUSERTARBALL}' -ifeq ($(ADK_TARGET_SYSTEM_FON_FON2100),y) - @echo 'Type the following in Redboot:' - @echo 'RedBoot> load $(TARGET_KERNEL)' - @echo 'RedBoot> go' -endif -ifeq ($(ADK_TARGET_SYSTEM_LEMOTE_YEELONG),y) - @echo 'Boot your Lemote Yeelong and type following commands in PMON:' - @echo 'PMON> ifaddr rtl0 ' - @echo 'PMON> load tftp:///${TARGET_KERNEL}' - @echo 'PMON> g' -endif -endif -ifeq ($(ADK_TARGET_FS),yaffs) -targethelp: - @echo 'The root tarball is: ${FW_DIR}/${ROOTFSTARBALL}' - @echo 'Format your NAND with Routerboot, boot via NFS and' - @echo 'then install kernel and filesystem via:' - @echo 'adkinstall ${ROOTFSTARBALL}' -endif -ifeq ($(ADK_TARGET_FS),usb) -targethelp: - @echo 'The root tarball is: ${FW_DIR}/${ROOTFSTARBALL}' -ifeq ($(ADK_TARGET_SYSTEM_LEMOTE_YEELONG),y) - @echo "Startup the netbook and type del to enter PMON:" - @echo "PMON> load /dev/fs/ext2@usb0/boot/kernel" - @echo "PMON> g" -endif -endif ifeq ($(ADK_TARGET_FS),archive) targethelp: @echo "The RootFS tarball is: $(FW_DIR)/$(ROOTFSTARBALL)" @@ -51,7 +23,7 @@ ifeq ($(ADK_HARDWARE_QEMU),y) @echo "Use following command to create a QEMU Image:" @echo "./scripts/create.sh qemu-${CPU_ARCH}.img $(FW_DIR)/$(ROOTFSTARBALL)" @echo "Start qemu with following options:" - @echo 'qemu-system-${CPU_ARCH} -nographic -M malta -device e1000,netdev=adk0 -netdev user,id=adk0 -kernel $(FW_DIR)/$(TARGET_KERNEL) qemu-${CPU_ARCH}.img' + @echo 'qemu-system-${CPU_ARCH} ${QEMU_ARGS} -kernel $(FW_DIR)/$(TARGET_KERNEL) qemu-${CPU_ARCH}.img' endif ifeq ($(ADK_TARGET_SYSTEM_LEMOTE_YEELONG),y) @echo "Startup the Lemote Yeelong and type del to enter PMON:" @@ -63,127 +35,98 @@ ifeq ($(ADK_TARGET_SYSTEM_MIKROTIK_RB532),y) @echo "sudo ./scripts/install-rb532.sh /dev/sdX $(FW_DIR)/$(ROOTFSTARBALL)" endif endif -ifeq ($(ADK_TARGET_FS),initramfsarchive) -targethelp: - @echo 'The kernel file is: $(FW_DIR)/${TARGET_KERNEL}' - @echo "The RootFS tarball is: $(FW_DIR)/$(ROOTFSUSERTARBALL)" -endif ifeq ($(ADK_TARGET_FS),initramfs) targethelp: @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-${CPU_ARCH} -nographic -M malta -device e1000,netdev=adk0 -netdev user,id=adk0 -kernel $(FW_DIR)/$(TARGET_KERNEL) -initrd ${FW_DIR}/${INITRAMFS}' + @echo 'qemu-system-${CPU_ARCH} ${QEMU_ARGS} -kernel $(FW_DIR)/$(TARGET_KERNEL) -initrd ${FW_DIR}/${INITRAMFS}' +endif endif +ifeq ($(ADK_TARGET_FS),initramfs-archive) +targethelp: + @echo 'The kernel file is: $(FW_DIR)/${TARGET_KERNEL}' + @echo "The RootFS tarball is: $(FW_DIR)/$(ROOTFSUSERTARBALL)" endif ifeq ($(ADK_TARGET_FS),initramfs-piggyback) targethelp: @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-${CPU_ARCH} -nographic -M malta -device e1000,netdev=adk0 -netdev user,id=adk0 -kernel $(FW_DIR)/$(TARGET_KERNEL)' + @echo 'qemu-system-${CPU_ARCH} ${QEMU_ARGS} -kernel $(FW_DIR)/$(TARGET_KERNEL)' endif endif -ifeq ($(ADK_TARGET_FS),squashfs) +ifeq ($(ADK_TARGET_FS),nfsroot) targethelp: -ifeq ($(ADK_TARGET_SYSTEM_BROADCOM_BCM47XX),y) - @echo 'You can flash the image via tftp:' - @echo 'tftp 192.168.1.1' - @echo 'tftp> binary' - @echo "tftp> put $(ROOTFSSQUASHFS) upgrade_code.bin" + @echo 'The kernel file is: $(FW_DIR)/${TARGET_KERNEL}' + @echo 'The nfs root tarball is: ${FW_DIR}/${ROOTFSUSERTARBALL}' +ifeq ($(ADK_TARGET_SYSTEM_LEMOTE_YEELONG),y) + @echo 'Boot your Lemote Yeelong and type following commands in PMON:' + @echo 'PMON> ifaddr rtl0 ' + @echo 'PMON> load tftp:///${TARGET_KERNEL}' + @echo 'PMON> g' endif endif - -# image creation and kernel install -ifeq ($(ADK_TARGET_SYSTEM_BROADCOM_BCM47XX),y) -kernel-install: - ${TARGET_CROSS}objcopy ${OSTRIP} -S ${LINUX_DIR}/vmlinuz.elf \ - ${BUILD_DIR}/${TARGET_KERNEL} - -${BUILD_DIR}/${ROOTFSSQUASHFS}: ${BUILD_DIR}/root.squashfs - ${TARGET_CROSS}objcopy -O binary ${BUILD_DIR}/${TARGET_KERNEL} \ - ${BUILD_DIR}/${TARGET_KERNEL}.bin - gzip -n9 <${BUILD_DIR}/${TARGET_KERNEL}.bin \ - >${BUILD_DIR}/${TARGET_KERNEL}.bin.gz - printf '\0' >>${BUILD_DIR}/${TARGET_KERNEL}.bin.gz - PATH='${TARGET_PATH}' trx -o $@~ -f ${BUILD_DIR}/${TARGET_KERNEL}.bin.gz -a 1024 -f ${BUILD_DIR}/root.squashfs -ifneq ($(ADK_TARGET_BROADCOM_MODEL_ASUS_WL500GP),y) - PATH='${TARGET_PATH}' addpattern -4 ${ADK_TOOLS_ADDPATTERN_ARGS} -g -i $@~ -o $@ -else - cp $@~ $@ -endif -endif -ifeq ($(ADK_TARGET_SYSTEM_LINKSYS_AG241),y) -kernel-install: - ${TARGET_CROSS}objcopy -S -O srec $(KERNEL) $(LINUX_DIR)/vmlinux.srec - PATH='${TARGET_PATH}' srec2bin $(LINUX_DIR)/vmlinux.srec $(LINUX_DIR)/vmlinux.bin - (dd if=/dev/zero bs=16 count=1; cat $(LINUX_DIR)/vmlinux.bin) > $(LINUX_DIR)/vmlinux.tmp - PATH='${TARGET_PATH}' addpattern -p AG3B -b -r 2.0 -i $(LINUX_DIR)/vmlinux.tmp \ - -o $(BUILD_DIR)/$(TARGET_KERNEL) 2>/dev/null +ifeq ($(ADK_TARGET_FS),usb) +targethelp: + @echo 'The root tarball is: ${FW_DIR}/${ROOTFSTARBALL}' +ifeq ($(ADK_TARGET_SYSTEM_LEMOTE_YEELONG),y) + @echo "Startup the netbook and type del to enter PMON:" + @echo "PMON> load /dev/fs/ext2@usb0/boot/kernel" + @echo "PMON> g" endif -ifeq ($(ADK_TARGET_SYSTEM_MIKROTIK_RB532),y) -kernel-install: - $(TARGET_CROSS)objcopy $(OSTRIP) -S $(KERNEL) $(BUILD_DIR)/$(TARGET_KERNEL) - @cp $(BUILD_DIR)/$(TARGET_KERNEL) $(FW_DIR)/${TARGET_KERNEL} endif -ifeq ($(ADK_TARGET_SYSTEM_MIKROTIK_RB4XX),y) -kernel-install: - $(TARGET_CROSS)objcopy $(OSTRIP) -S $(KERNEL) $(BUILD_DIR)/$(TARGET_KERNEL) - @cp $(BUILD_DIR)/$(TARGET_KERNEL) $(FW_DIR)/${TARGET_KERNEL} +ifeq ($(ADK_TARGET_FS),yaffs) +targethelp: + @echo 'The root tarball is: ${FW_DIR}/${ROOTFSTARBALL}' + @echo 'Format your NAND with Routerboot, boot via NFS and' + @echo 'then install kernel and filesystem via:' + @echo 'adkinstall ${ROOTFSTARBALL}' endif -ifeq ($(ADK_TARGET_SYSTEM_FON_FON2100),y) -kernel-install: + +# image creation and kernel install +ifeq ($(ADK_TARGET_SYSTEM_MIKROTIK_RB532),y) +kernel-strip: $(TARGET_CROSS)objcopy $(OSTRIP) -S $(KERNEL) $(BUILD_DIR)/$(TARGET_KERNEL) - @cp $(BUILD_DIR)/$(TARGET_KERNEL) $(FW_DIR)/${TARGET_KERNEL} -${BUILD_DIR}/${ROOTFSSQUASHFS}: ${BUILD_DIR}/root.squashfs - $(TARGET_CROSS)objcopy $(OSTRIP) -S $(LINUX_DIR)/vmlinux $(BUILD_DIR)/vmlinux.strip - dd if=$(BUILD_DIR)/vmlinux.strip of=${BUILD_DIR}/vmlinux bs=65536 conv=sync - lzma -9efzc ${BUILD_DIR}/vmlinux > $(FW_DIR)/${TARGET_KERNEL} - cp ${BUILD_DIR}/root.squashfs ${BUILD_DIR}/${ROOTFSSQUASHFS} +kernel-install: kernel-strip + @cp $(BUILD_DIR)/$(TARGET_KERNEL) $(FW_DIR)/${TARGET_KERNEL} endif ifeq ($(ADK_TARGET_SYSTEM_LEMOTE_YEELONG),y) -kernel-install: +kernel-strip: $(TARGET_CROSS)objcopy $(OSTRIP) -S $(KERNEL) $(BUILD_DIR)/$(TARGET_KERNEL) + +kernel-install: kernel-strip @cp $(BUILD_DIR)/$(TARGET_KERNEL) $(FW_DIR)/${TARGET_KERNEL} endif ifeq ($(ADK_HARDWARE_QEMU),y) -kernel-install: +kernel-strip: $(TARGET_CROSS)objcopy $(OSTRIP) -S $(KERNEL) $(BUILD_DIR)/$(TARGET_KERNEL) + +kernel-install: kernel-strip @cp $(BUILD_DIR)/$(TARGET_KERNEL) $(FW_DIR)/${TARGET_KERNEL} endif # filesystem specific targets -ifeq ($(ADK_TARGET_FS),nfsroot) -imageinstall: kernel-install $(FW_DIR)/$(ROOTFSUSERTARBALL) targethelp -endif -ifeq ($(ADK_TARGET_FS),yaffs) -imageinstall: $(FW_DIR)/$(ROOTFSTARBALL) targethelp -endif ifeq ($(ADK_TARGET_FS),archive) imageinstall: $(FW_DIR)/$(ROOTFSTARBALL) targethelp endif -ifeq ($(ADK_TARGET_FS),initramfsarchive) -imageinstall: kernel-install $(FW_DIR)/$(ROOTFSUSERTARBALL) targethelp -endif ifeq ($(ADK_TARGET_FS),initramfs) imageinstall: kernel-install $(FW_DIR)/$(INITRAMFS) targethelp endif +ifeq ($(ADK_TARGET_FS),initramfs-archive) +imageinstall: kernel-install $(FW_DIR)/$(ROOTFSUSERTARBALL) targethelp +endif ifeq ($(ADK_TARGET_FS),initramfs-piggyback) imageinstall: createinitramfs targethelp - @cp $(KERNEL) $(FW_DIR)/$(TARGET_KERNEL) +endif +ifeq ($(ADK_TARGET_FS),nfsroot) +imageinstall: kernel-install $(FW_DIR)/$(ROOTFSUSERTARBALL) targethelp endif ifeq ($(ADK_TARGET_FS),usb) imageinstall: $(FW_DIR)/$(ROOTFSTARBALL) targethelp endif -ifeq ($(ADK_TARGET_FS),squashfs) -imageinstall: kernel-install ${BUILD_DIR}/${ROOTFSSQUASHFS} targethelp - @if [ $$($(STATCMD) ${BUILD_DIR}/${ROOTFSSQUASHFS}) -gt 3801088 ];then \ - echo 'Image is too big!'; \ - else \ - ${CP} ${BUILD_DIR}/${ROOTFSSQUASHFS} ${FW_DIR}/${ROOTFSSQUASHFS}; \ - echo The image file is $(ROOTFSSQUASHFS); \ - fi +ifeq ($(ADK_TARGET_FS),yaffs) +imageinstall: $(FW_DIR)/$(ROOTFSTARBALL) targethelp endif - -- cgit v1.2.3