projects / openwrt / openwrt.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
brcm47xx: image: use "-" separator for device version
[openwrt/openwrt.git] / target / linux / brcm47xx / image / Makefile
diff --git a/target/linux/brcm47xx/image/Makefile b/target/linux/brcm47xx/image/Makefile
index 9bdc838ca87308856145e82d049d94b6db6bc61f..a3c8489f19746e6e025cb16e95511935f2f513ac 100644 (file)
--- a/target/linux/brcm47xx/image/Makefile
+++ b/target/linux/brcm47xx/image/Makefile
@@ -12,10 +12,16 @@ define Build/Clean
 endef
 
 define Image/Prepare
+       # Optimized LZMA compression (with dictionary), handled by lzma-loader.
        cat $(KDIR)/vmlinux | $(STAGING_DIR_HOST)/bin/lzma e -si -so -eos -lc1 -lp2 -pb2 > $(KDIR)/vmlinux.lzma
+
+       # Less optimal LZMA compression (no dictionary), handled by CFE.
+       $(STAGING_DIR_HOST)/bin/lzma e -so -d16 $(KDIR)/vmlinux > $(KDIR)/vmlinux-nodictionary.lzma
+
        gzip -nc9 $(KDIR)/vmlinux > $(KDIR)/vmlinux.gz
 ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),)
        cat $(KDIR)/vmlinux-initramfs | $(STAGING_DIR_HOST)/bin/lzma e -si -so -eos -lc1 -lp2 -pb2 > $(KDIR)/vmlinux-initramfs.lzma
+       $(STAGING_DIR_HOST)/bin/lzma e -so -d16 $(KDIR)/vmlinux-initramfs > $(KDIR)/vmlinux-initramfs-nodictionary.lzma
 endif
        rm -f $(KDIR)/loader.gz
        $(MAKE) -C lzma-loader \
@@ -99,52 +105,103 @@ define Image/Build/trxV2
 endef
 
 #################################################
-# Subtarget generic
+# Images
 #################################################
 
-# $(1): filesystem type.
-define Image/Build/generic/jffs2-64k
-       # BCM4705 with tg3
-       $(call Image/Build/CyberTAN,$(1),wrt300n_v11,EWC2,1.51.2,$(patsubst jffs2-%,jffs2,$(1)))
-       $(call Image/Build/CyberTAN,$(1),wrt310n_v1,310N,1.0.10,$(patsubst jffs2-%,jffs2,$(1)))
-       $(call Image/Build/CyberTAN,$(1),wrt350n_v1,EWCG,1.04.1,$(patsubst jffs2-%,jffs2,$(1)))
-       $(call Image/Build/CyberTAN,$(1),wrt610n_v1,610N,1.0.1,$(patsubst jffs2-%,jffs2,$(1)))
+define Build/trx-with-loader
+       $(STAGING_DIR_HOST)/bin/trx \
+               -o $@ \
+               -f $(KDIR)/loader.gz \
+               -f $(word 1,$^) \
+               $(call trxalign/$(FILESYSTEM),$(FILESYSTEM))
+endef
 
-       # BCMA SoC with SSB WiFi
-       $(call Image/Build/CyberTAN,$(1),wrt610n_v2,610N,2.0.0,$(patsubst jffs2-%,jffs2,$(1)))
-       $(call Image/Build/CyberTAN,$(1),e3000_v1,61XN,1.0.3,$(patsubst jffs2-%,jffs2,$(1)))
+define Build/linksys-bin
+       $(STAGING_DIR_HOST)/bin/addpattern -4 -p $(DEVICE_ID) -v v$(VERSION) -i $@ -o $@.new
+       mv $@.new $@
 endef
 
-# $(1): filesystem type.
-define Image/Build/generic/squashfs
-       $(call Image/Build/generic/jffs2-64k,$(1))
-       $(call Image/Build/generic/jffs2-128k,$(1))
+define Build/netgear-chk
+       $(STAGING_DIR_HOST)/bin/mkchkimg \
+               -o $@.new \
+               -k $@ \
+               -b $(BOARD_ID) \
+               -r $(REGION)
+       mv $@.new $@
+endef
+
+#################################################
+# Devices
+#################################################
+
+DEVICE_VARS += DEVICE_ID VERSION
+DEVICE_VARS += BOARD_ID REGION
+
+define Device/Default
+       KERNEL := kernel-bin
+       IMAGE_NAME = $$(IMAGE_PREFIX)-$$(1).$$(2)
+       KERNEL_NAME = vmlinux.lzma
+       FILESYSTEMS := $(FS_64K)
+       IMAGES := trx
+       IMAGE/trx := trx-with-loader
+endef
+
+define Device/linksys
+       IMAGES := bin
+       IMAGE/bin := trx-with-loader | linksys-bin
 endef
 
+define LinksysDevice
+  define Device/linksys-$(1)
+       $$(Device/linksys)
+       DEVICE_ID := $(2)
+       VERSION := $(3)
+  endef
+  TARGET_DEVICES += linksys-$(1)
+endef
+
+define Device/netgear
+       IMAGES := chk
+       IMAGE/chk := trx-with-loader | netgear-chk
+endef
+
+define NetgearDevice
+  define Device/netgear-$(1)
+       $$(Device/netgear)
+       BOARD_ID := $(2)
+       REGION := $(3)
+  endef
+  TARGET_DEVICES += netgear-$(1)
+endef
+
+#################################################
+# Subtarget generic
+#################################################
+
+ifeq ($(SUBTARGET),generic)
+  # BCM4705 with tg3
+  $(eval $(call LinksysDevice,wrt300n-v1.1,EWC2,1.51.2))
+  $(eval $(call LinksysDevice,wrt310n-v1,310N,1.0.10))
+  $(eval $(call LinksysDevice,wrt350n-v1,EWCG,1.04.1))
+  $(eval $(call LinksysDevice,wrt610n-v1,610N,1.0.1))
+
+  # BCMA SoC with SSB WiFi
+  $(eval $(call LinksysDevice,wrt610n-v2,610N,2.0.0))
+  $(eval $(call LinksysDevice,e3000-v1,61XN,1.0.3))
+endif
+
 #################################################
 # Subtarget legacy
 #################################################
 
 # $(1): filesystem type.
 define Image/Build/legacy/devices-with-128k-blocks
-       $(call Image/Build/CyberTAN,$(1),wrt54gs,W54S,4.80.1,$(patsubst jffs2-%,jffs2,$(1)))
-       $(call Image/Build/CyberTAN,$(1),wrtsl54gs,W54U,2.08.1,$(patsubst jffs2-%,jffs2,$(1)))
        $(call Image/Build/trxV2,$(1),wrt54g3gv2-vf,3G2V,3.00.24,$(patsubst jffs2-%,jffs2,$(1)),6)
        $(call Image/Build/wgt634u,$(1),$(patsubst jffs2-%,jffs2,$(1)))
 endef
 
 # $(1): filesystem type.
 define Image/Build/legacy/devices-with-64k-blocks
-       $(call Image/Build/Chk,$(1),wgr614_v8,U12H072T00_NETGEAR,2,$(patsubst jffs2-%,jffs2,$(1)))
-       $(call Image/Build/Chk,$(1),wndr3300_v1,U12H093T00_NETGEAR,2,$(patsubst jffs2-%,jffs2,$(1)))
-       $(call Image/Build/Chk,$(1),wnr834b_v2,U12H081T00_NETGEAR,2,$(patsubst jffs2-%,jffs2,$(1)))
-       $(call Image/Build/CyberTAN,$(1),wrt54g3g,W54F,2.20.1,$(patsubst jffs2-%,jffs2,$(1)))
-       $(call Image/Build/CyberTAN,$(1),wrt54g3g-em,W3GN,2.20.1,$(patsubst jffs2-%,jffs2,$(1)))
-       $(call Image/Build/CyberTAN,$(1),wrt54g,W54G,4.71.1,$(patsubst jffs2-%,jffs2,$(1)))
-       $(call Image/Build/CyberTAN,$(1),wrt54gs_v4,W54s,1.09.1,$(patsubst jffs2-%,jffs2,$(1)))
-       $(call Image/Build/CyberTAN,$(1),wrt150n,N150,1.51.3,$(patsubst jffs2-%,jffs2,$(1)))
-       $(call Image/Build/CyberTAN,$(1),wrt160n_v1,N150,1.50.1,$(patsubst jffs2-%,jffs2,$(1)))
-       $(call Image/Build/CyberTAN,$(1),wrt300n_v1,EWCB,1.03.6,$(patsubst jffs2-%,jffs2,$(1)))
        $(call Image/Build/dwl3150,$(1),$(patsubst jffs2-%,jffs2,$(1)))
        $(call Image/Build/Edi,$(1),ps1208mfg,$(patsubst jffs2-%,jffs2,$(1)))
        $(call Image/Build/Huawei,$(1),e970,$(1))
@@ -170,48 +227,73 @@ define Image/Build/legacy/squashfs
        $(call Image/Build/legacy/devices-with-128k-blocks,$(1))
 endef
 
-#################################################
-# Subtarget mips74k
-#################################################
-
-define Image/Build/mips74k/devices-with-64k-blocks
-       $(call Image/Build/Chk,$(1),wndr3400_v1,U12H155T00_NETGEAR,2,$(patsubst jffs2-%,jffs2,$(1)))
-       $(call Image/Build/Chk,$(1),wndr3400_v2,U12H187T00_NETGEAR,2,$(patsubst jffs2-%,jffs2,$(1)))
-       $(call Image/Build/Chk,$(1),wndr3700_v3,U12H194T00_NETGEAR,2,$(patsubst jffs2-%,jffs2,$(1)))
-       $(call Image/Build/Chk,$(1),wndr4000,U12H181T00_NETGEAR,2,$(patsubst jffs2-%,jffs2,$(1)))
-       $(call Image/Build/Chk,$(1),wnr2000v2,U12H114T00_NETGEAR,2,$(patsubst jffs2-%,jffs2,$(1)))
-       $(call Image/Build/Chk,$(1),wnr3500L,U12H136T99_NETGEAR,2,$(patsubst jffs2-%,jffs2,$(1)))
-       $(call Image/Build/Chk,$(1),wnr3500v2,U12H127T00_NETGEAR,2,$(patsubst jffs2-%,jffs2,$(1)))
-       $(call Image/Build/CyberTAN,$(1),wrt160n_v3,N150,3.0.3,$(patsubst jffs2-%,jffs2,$(1)))
-       $(call Image/Build/CyberTAN,$(1),wrt310n_v2,310N,2.0.1,$(patsubst jffs2-%,jffs2,$(1)))
-       $(call Image/Build/CyberTAN,$(1),wrt320n_v1,320N,1.0.5,$(patsubst jffs2-%,jffs2,$(1)))
-       $(call Image/Build/CyberTAN,$(1),e900_v1,E900,1.0.4,$(patsubst jffs2-%,jffs2,$(1)))
-       $(call Image/Build/CyberTAN,$(1),e1000_v1_v2,E100,1.1.2,$(patsubst jffs2-%,jffs2,$(1)))
-       $(call Image/Build/CyberTAN,$(1),e1200_v1,E120,1.0.3,$(patsubst jffs2-%,jffs2,$(1)))
-       $(call Image/Build/CyberTAN,$(1),e1200_v2,E122,1.0.4,$(patsubst jffs2-%,jffs2,$(1)))
-       $(call Image/Build/CyberTAN,$(1),e1500_v1,E150,1.0.5,$(patsubst jffs2-%,jffs2,$(1)))
-       $(call Image/Build/CyberTAN,$(1),e1550_v1,1550,1.0.3,$(patsubst jffs2-%,jffs2,$(1)))
-       $(call Image/Build/CyberTAN,$(1),e2000_v1,32XN,1.0.4,$(patsubst jffs2-%,jffs2,$(1)))
-       $(call Image/Build/CyberTAN,$(1),e2500_v1_v2,E25X,1.0.7,$(patsubst jffs2-%,jffs2,$(1)))
-       $(call Image/Build/CyberTAN,$(1),e3200_v1,3200,1.0.1,$(patsubst jffs2-%,jffs2,$(1)))
-       $(call Image/Build/CyberTAN,$(1),e4200_v1,4200,1.0.5,$(patsubst jffs2-%,jffs2,$(1)))
+define Device/linksys-wrt54gs
+       $(Device/linksys)
+       FILESYSTEMS := $(FS_128K)
+       DEVICE_ID := W54S
+       VERSION := 4.80.1
 endef
 
-# $(1): filesystem type.
-define Image/Build/mips74k/jffs2-64k
-       $(call Image/Build/mips74k/devices-with-64k-blocks,$(1))
+define Device/linksys-wrtsl54gs
+       $(Device/linksys)
+       FILESYSTEMS := $(FS_128K)
+       DEVICE_ID := W54U
+       VERSION := 2.08.1
 endef
 
-# $(1): filesystem type.
-define Image/Build/mips74k/jffs2-128k
-       $(call Image/Build/mips74k/devices-with-128k-blocks,$(1))
-endef
+ifeq ($(SUBTARGET),legacy)
+  TARGET_DEVICES += \
+       linksys-wrt54gs \
+       linksys-wrtsl54gs
 
-# $(1): filesystem type.
-define Image/Build/mips74k/squashfs
-       $(call Image/Build/mips74k/devices-with-64k-blocks,$(1))
-       $(call Image/Build/mips74k/devices-with-128k-blocks,$(1))
-endef
+  $(eval $(call LinksysDevice,wrt54g3g,W54F,2.20.1))
+  $(eval $(call LinksysDevice,wrt54g3g-em,W3GN,2.20.1))
+  $(eval $(call LinksysDevice,wrt54g,W54G,4.71.1))
+  $(eval $(call LinksysDevice,wrt54gs-v4,W54s,1.09.1))
+  $(eval $(call LinksysDevice,wrt150n,N150,1.51.3))
+  $(eval $(call LinksysDevice,wrt160n-v1,N150,1.50.1))
+  $(eval $(call LinksysDevice,wrt300n-v1,EWCB,1.03.6))
+  $(eval $(call NetgearDevice,wgr614-v8,U12H072T00_NETGEAR,2))
+  $(eval $(call NetgearDevice,wndr3300-v1,U12H093T00_NETGEAR,2))
+  $(eval $(call NetgearDevice,wnr834b-v2,U12H081T00_NETGEAR,2))
+endif
+
+#################################################
+# Subtarget mips74k
+#################################################
+
+ifeq ($(SUBTARGET),mips74k)
+  $(eval $(call LinksysDevice,wrt160n-v3,N150,3.0.3))
+  $(eval $(call LinksysDevice,wrt310n-v2,310N,2.0.1))
+  $(eval $(call LinksysDevice,wrt320n-v1,320N,1.0.5))
+  $(eval $(call LinksysDevice,e900-v1,E900,1.0.4))
+  $(eval $(call LinksysDevice,e1000-v1-v2-v2.1,E100,1.1.3))
+  $(eval $(call LinksysDevice,e1200-v1,E120,1.0.3))
+  $(eval $(call LinksysDevice,e1200-v2-new,E122,1.0.4))
+  $(eval $(call LinksysDevice,e1500-v1,E150,1.0.5))
+  $(eval $(call LinksysDevice,e1550-v1,1550,1.0.3))
+  $(eval $(call LinksysDevice,e2000-v1,32XN,1.0.4))
+  $(eval $(call LinksysDevice,e2500-v1,E25X,1.0.7))
+  $(eval $(call LinksysDevice,e2500-v2,E25X,2.0.0))
+  $(eval $(call LinksysDevice,e2500-v2.1,25RU,2.1.0))
+  $(eval $(call LinksysDevice,e2500-v3,25V3,3.0.0))
+  $(eval $(call LinksysDevice,e3200-v1,3200,1.0.1))
+  $(eval $(call LinksysDevice,e4200-v1,4200,1.0.5))
+  $(eval $(call NetgearDevice,wgr614-v10_north-america,U12H139T01_NETGEAR,2))
+  $(eval $(call NetgearDevice,wgr614-v10_other-regions,U12H139T01_NETGEAR,1))
+  $(eval $(call NetgearDevice,wndr3400-v1,U12H155T00_NETGEAR,2))
+  $(eval $(call NetgearDevice,wndr3400-v2,U12H187T00_NETGEAR,2))
+  $(eval $(call NetgearDevice,wndr3400-v3,U12H208T00_NETGEAR,1))
+  $(eval $(call NetgearDevice,wndr3700-v3,U12H194T00_NETGEAR,2))
+  $(eval $(call NetgearDevice,wndr4000,U12H181T00_NETGEAR,2))
+  $(eval $(call NetgearDevice,wnr1000-v3,U12H139T00_NETGEAR,2))
+  $(eval $(call NetgearDevice,wnr2000v2,U12H114T00_NETGEAR,2))
+  $(eval $(call NetgearDevice,wnr3000rp,U12H163T01_NETGEAR,1))
+  $(eval $(call NetgearDevice,wnr3500l-v1-north-america,U12H136T99_NETGEAR,2))
+  $(eval $(call NetgearDevice,wnr3500l-v1-other-regions,U12H136T99_NETGEAR,1))
+  $(eval $(call NetgearDevice,wnr3500l-v2,U12H172T00_NETGEAR,1))
+  $(eval $(call NetgearDevice,wnr3500-v2,U12H127T00_NETGEAR,2))
+endif
 
 #################################################
 # Shared BuildImage defines
@@ -219,6 +301,7 @@ endef
 
 define Image/Build/Initramfs
        $(STAGING_DIR_HOST)/bin/trx -o $(BIN_DIR)/$(IMG_PREFIX)-initramfs.trx -f $(KDIR)/loader.gz -f $(KDIR)/vmlinux-initramfs.lzma
+       $(STAGING_DIR_HOST)/bin/trx -o $(BIN_DIR)/$(IMG_PREFIX)-initramfs-noloader-nodictionary.trx -f $(KDIR)/vmlinux-initramfs-nodictionary.lzma
 endef
 
 # $(1): filesystem type.
@@ -226,6 +309,9 @@ define Image/Build
        $(STAGING_DIR_HOST)/bin/trx -o $(BIN_DIR)/$(IMG_PREFIX)-$(1).trx \
                -f $(KDIR)/loader.gz -f $(KDIR)/vmlinux.lzma \
                $(call trxalign/$(1),$(1))
+       $(STAGING_DIR_HOST)/bin/trx -o $(BIN_DIR)/$(IMG_PREFIX)-$(1)-noloader-nodictionary.trx \
+               -f $(KDIR)/vmlinux-nodictionary.lzma \
+               $(call trxalign/$(1),$(1))
        $(STAGING_DIR_HOST)/bin/trx -o $(BIN_DIR)/$(IMG_PREFIX)-$(1)-gz.trx \
                -f $(KDIR)/vmlinux.gz \
                $(call trxalign/$(1),$(1))
OpenWrt Source Repository