diff --git a/target/linux/ar71xx/image/Makefile b/target/linux/ar71xx/image/Makefile index 57eebb195..9476f74db 100644 --- a/target/linux/ar71xx/image/Makefile +++ b/target/linux/ar71xx/image/Makefile @@ -7,24 +7,51 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/image.mk -VMLINUX:=openwrt-$(BOARD)-vmlinux +IMGNAME:=$(BIN_DIR)/openwrt-$(BOARD) +define imgname +$(IMGNAME)-$(2)-$(patsubst jffs2-%,jffs2,$(1)) +endef + +VMLINUX:=$(IMGNAME)-vmlinux ifeq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),y) - VMLINUX:=openwrt-$(BOARD)-vmlinux-initramfs + VMLINUX:=$(IMGNAME)-vmlinux-initramfs endif define Image/BuildKernel - cp $(KDIR)/vmlinux.elf $(BIN_DIR)/$(VMLINUX).elf - cp $(KDIR)/vmlinux $(BIN_DIR)/$(VMLINUX).bin + cp $(KDIR)/vmlinux.elf $(VMLINUX).elf + cp $(KDIR)/vmlinux $(VMLINUX).bin gzip -9 -c $(KDIR)/vmlinux > $(KDIR)/vmlinux.bin.gz $(STAGING_DIR_HOST)/bin/lzma e $(KDIR)/vmlinux $(KDIR)/vmlinux.bin.l7 - dd if=$(KDIR)/vmlinux.bin.l7 of=$(BIN_DIR)/$(VMLINUX).lzma bs=65536 conv=sync - dd if=$(KDIR)/vmlinux.bin.gz of=$(BIN_DIR)/$(VMLINUX).gz bs=65536 conv=sync - $(STAGING_DIR_HOST)/bin/lzma e $(KDIR)/vmlinux $(KDIR)/vmlinux.lzma + dd if=$(KDIR)/vmlinux.bin.l7 of=$(VMLINUX).lzma bs=65536 conv=sync + dd if=$(KDIR)/vmlinux.bin.gz of=$(VMLINUX).gz bs=65536 conv=sync + $(STAGING_DIR_HOST)/bin/lzma e $(KDIR)/vmlinux -lc1 -lp2 -pb2 $(KDIR)/vmlinux.lzma mkimage -A mips -O linux -T kernel -a 0x80060000 -C gzip -e \ 0x80060000 \ -n 'MIPS OpenWrt Linux-$(LINUX_VERSION)' \ - -d $(KDIR)/vmlinux.bin.gz $(BIN_DIR)/openwrt-$(BOARD)-uImage.gz + -d $(KDIR)/vmlinux.bin.gz $(IMGNAME)-uImage.gz + +endef + +define Image/Build/MyLoader + $(STAGING_DIR_HOST)/bin/mkmylofw -B $(2) \ + -p0x30000:0xd0000:ahl:0x80060000 \ + -p0x100000:0 \ + -b0x30000:0xd0000:h:$(KDIR)/vmlinux.lzma \ + -b0x100000:0::$(KDIR)/root.$(1) \ + $(call imgname,$(1),$(2)).img +endef + +define Image/Build/Template/Compex + $(call Image/Build/MyLoader,$(1),$(2)) +endef + +define Image/Build/Template/Compex/squashfs + $(call Image/Build/Template/Compex,squashfs,$(1)) +endef + +define Image/Build/Profile/WP543 + $(call Image/Build/Template/Compex/$(1),wp543) endef define Image/Build/squashfs @@ -33,7 +60,9 @@ endef define Image/Build $(call Image/Build/$(1)) - dd if=$(KDIR)/root.$(1) of=$(BIN_DIR)/openwrt-$(BOARD)-root.$(1) bs=128k conv=sync + dd if=$(KDIR)/root.$(1) of=$(IMGNAME)-root.$(1) bs=128k conv=sync + + $(call Image/Build/Profile/WP543,$(1)) endef