X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=target%2Flinux%2Far71xx%2Fimage%2FMakefile;h=e6fe36ad09301a441283adacf16f1d1f24e12f62;hb=8870650b9d072a6ecb8ccc602ac058d3e743096d;hp=78069b8d3dc659198e4eb1552eb038df2bec5428;hpb=2d5ed22d05b45cd33804dba9fd64294de947e84e;p=openwrt.git diff --git a/target/linux/ar71xx/image/Makefile b/target/linux/ar71xx/image/Makefile index 78069b8d3d..e6fe36ad09 100644 --- a/target/linux/ar71xx/image/Makefile +++ b/target/linux/ar71xx/image/Makefile @@ -4,16 +4,17 @@ # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. # + +JFFS2_BLOCKSIZE = 64k 128k 256k + include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/image.mk IMAGE_PROFILE:=$(if $(PROFILE),$(PROFILE),Default) -JFFS2_BLOCKSIZE = 64k 128k 256k - KERNEL_LOADADDR = 0x80060000 -DEVICE_VARS += NETGEAR_KERNEL_MAGIC NETGEAR_BOARD NETGEAR_ID CMDLINE CONSOLE IMAGE_SIZE BOARDNAME LOADER_FLASH_OFFS +DEVICE_VARS += NETGEAR_KERNEL_MAGIC NETGEAR_BOARD_ID NETGEAR_HW_ID CMDLINE CONSOLE IMAGE_SIZE BOARDNAME LOADER_FLASH_OFFS define Build/netgear-squashfs rm -rf $@.fs $@.squashfs @@ -36,15 +37,6 @@ define Build/netgear-uImage $(call Build/uImage,$(1) -M $(NETGEAR_KERNEL_MAGIC)) endef -define Build/netgear-image - $(STAGING_DIR_HOST)/bin/mkdniimg \ - -B $(NETGEAR_BOARD) -v OpenWrt.$(REVISION) \ - $(if $(NETGEAR_ID),-H $(NETGEAR_ID)) \ - -r "$(1)" \ - -i $@ -o $@.new - mv $@.new $@ -endef - # combine kernel and rootfs into one image # -a align the rootfs start on an bytes boundary # -j add jffs2 end-of-filesystem markers @@ -171,6 +163,14 @@ define Device/Default IMAGE/sysupgrade.bin = append-kernel $$$$(BLOCKSIZE) | append-rootfs | pad-rootfs | check-size $$$$(IMAGE_SIZE) endef +define Device/bsb + BOARDNAME = BSB + IMAGE_SIZE = 16000k + CONSOLE = ttyATH0,115200 + MTDPARTS = spi0.0:128k(u-boot)ro,64k(u-boot-env)ro,16128k(firmware),64k(art)ro +endef +TARGET_DEVICES += bsb + define Device/carambola2 BOARDNAME = CARAMBOLA2 IMAGE_SIZE = 16000k @@ -182,22 +182,22 @@ TARGET_DEVICES += carambola2 define Device/wndr3700 BOARDNAME = WNDR3700 NETGEAR_KERNEL_MAGIC = 0x33373030 - NETGEAR_BOARD = WNDR3700 + NETGEAR_BOARD_ID = WNDR3700 IMAGE_SIZE = 7680k MTDPARTS = spi0.0:320k(u-boot)ro,128k(u-boot-env)ro,7680k(firmware),64k(art)ro IMAGES := sysupgrade.bin factory.img factory-NA.img KERNEL := kernel-bin | patch-cmdline | lzma -d20 | netgear-uImage lzma IMAGE/default = append-kernel $$$$(BLOCKSIZE) | netgear-squashfs | append-rootfs | pad-rootfs IMAGE/sysupgrade.bin = $$(IMAGE/default) | check-size $$$$(IMAGE_SIZE) - IMAGE/factory.img = $$(IMAGE/default) | netgear-image | check-size $$$$(IMAGE_SIZE) - IMAGE/factory-NA.img = $$(IMAGE/default) | netgear-image NA | check-size $$$$(IMAGE_SIZE) + IMAGE/factory.img = $$(IMAGE/default) | netgear-dni | check-size $$$$(IMAGE_SIZE) + IMAGE/factory-NA.img = $$(IMAGE/default) | netgear-dni NA | check-size $$$$(IMAGE_SIZE) endef define Device/wndr3700v2 $(Device/wndr3700) - NETGEAR_BOARD = WNDR3700v2 + NETGEAR_BOARD_ID = WNDR3700v2 NETGEAR_KERNEL_MAGIC = 0x33373031 - NETGEAR_ID = 29763654+16+64 + NETGEAR_HW_ID = 29763654+16+64 IMAGE_SIZE = 15872k MTDPARTS = spi0.0:320k(u-boot)ro,128k(u-boot-env)ro,15872k(firmware),64k(art)ro IMAGES := sysupgrade.bin factory.img @@ -205,23 +205,23 @@ endef define Device/wndr3800 $(Device/wndr3700v2) - NETGEAR_BOARD = WNDR3800 - NETGEAR_ID = 29763654+16+128 + NETGEAR_BOARD_ID = WNDR3800 + NETGEAR_HW_ID = 29763654+16+128 endef define Device/wndr3800ch $(Device/wndr3800) - NETGEAR_BOARD = WNDR3800CH + NETGEAR_BOARD_ID = WNDR3800CH endef define Device/wndrmac $(Device/wndr3700v2) - NETGEAR_BOARD = WNDRMAC + NETGEAR_BOARD_ID = WNDRMAC endef define Device/wndrmacv2 $(Device/wndr3800) - NETGEAR_BOARD = WNDRMACv2 + NETGEAR_BOARD_ID = WNDRMACv2 endef TARGET_DEVICES += wndr3700 wndr3700v2 wndr3800 wndr3800ch wndrmac wndrmacv2 @@ -960,7 +960,6 @@ endef LOADER_MAKE := $(NO_TRACE_MAKE) -C lzma-loader KDIR=$(KDIR) -KDIR_TMP:=$(KDIR)/tmp VMLINUX:=$(BIN_DIR)/$(IMG_PREFIX)-vmlinux UIMAGE:=$(BIN_DIR)/$(IMG_PREFIX)-uImage @@ -1737,6 +1736,37 @@ define Image/Build/TPLINK-LZMA/initramfs -o $(call imgname,$(1),$(2))-uImage.bin endef +Image/Build/TPLINK-64K/buildkernel=$(call PatchKernelLzma,$(2),$(3)) + +define Image/Build/TPLINK-64K + -$(STAGING_DIR_HOST)/bin/mkimage \ + -A mips -O linux -T kernel -a 0x80060000 -C lzma \ + -e 0x80060000 -n 'MIPS OpenWrt Linux-$(LINUX_VERSION)' \ + -d $$(KDIR_TMP)/vmlinux-$(2).bin.lzma $(KDIR_TMP)/vmlinux-$(2).bin.lzma.img + -$(STAGING_DIR_HOST)/bin/mktplinkfw \ + -H $(4) -W $(5) -F $(6) -N OpenWrt -m 2 -V $(REVISION) $(7) \ + -X 0x20000 \ + -k $(KDIR_TMP)/vmlinux-$(2).bin.lzma.img \ + -r $(KDIR)/root.$(1) \ + -a $(call rootfs_align,$(1)) -j \ + -o $(call factoryname,$(1),$(2)) + -$(STAGING_DIR_HOST)/bin/mktplinkfw \ + -H $(4) -W $(5) -F $(6) -N OpenWrt -m 2 -V $(REVISION) $(7) -s \ + -X 0x20000 \ + -k $(KDIR_TMP)/vmlinux-$(2).bin.lzma.img \ + -r $(KDIR)/root.$(1) \ + -a $(call rootfs_align,$(1)) -j \ + -o $(call sysupname,$(1),$(2)) +endef + +define Image/Build/TPLINK-64K/initramfs + $(call PatchKernelLzma,$(2),$(3),,-initramfs) + -$(STAGING_DIR_HOST)/bin/mktplinkfw -c \ + -H $(4) -W $(5) -F $(6) -N OpenWrt -m 2 -V $(REVISION) $(7) -s \ + -k $(KDIR_TMP)/vmlinux-initramfs-$(2).bin.lzma.img \ + -o $(call imgname,$(1),$(2))-uImage.bin +endef + Image/Build/TPLINK-SAFELOADER/loader = $(call Image/BuildLoaderPatched,$(1),elf,$(2) $(3)) @@ -2165,6 +2195,8 @@ $(eval $(call SingleProfile,TPLINK,64kraw,TLWR1043V1,tl-wr1043nd-v1,TL-WR1043ND, $(eval $(call SingleProfile,TPLINK-LZMA,64kraw,TLWR1043V2,tl-wr1043nd-v2,TL-WR1043ND-v2,ttyS0,115200,0x10430002,1,8M)) $(eval $(call SingleProfile,TPLINK-LZMA,64kraw,TLWR2543,tl-wr2543-v1,TL-WR2543N,ttyS0,115200,0x25430001,1,8Mlzma,-v 3.13.99)) +$(eval $(call SingleProfile,TPLINK-64K,64kraw,TLWDR6500V2,tl-wdr6500-v2,TL-WDR6500-v2,ttyS0,115200,0x65000002,1,8Mlzma)) + $(eval $(call SingleProfile,TPLINK-SAFELOADER,64kraw,CPE510,cpe210-220-510-520,CPE510,ttyS0,115200,$$(cpe510_mtdlayout),CPE510)) $(eval $(call SingleProfile,WHRHPG300N,64kraw,WHRG301N,whr-g301n,WHR-G301N,ttyS0,115200,$$(whrhpg300n_mtdlayout),WHR-G301N))