X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=target%2Flinux%2Fbrcm47xx%2Fimage%2FMakefile;h=b9cdbf43932c84644b044eecb1e333ccc972c7d9;hb=63b525dd6b209af5554a2d053efd4b3ce6f60c9c;hp=aeeb1479861d8be692d6712f30529167ca0514e7;hpb=ee76a07fbf05e17062b800cfc831d04ea39df572;p=oweals%2Fopenwrt.git

diff --git a/target/linux/brcm47xx/image/Makefile b/target/linux/brcm47xx/image/Makefile
index aeeb147986..b9cdbf4393 100644
--- a/target/linux/brcm47xx/image/Makefile
+++ b/target/linux/brcm47xx/image/Makefile
@@ -34,30 +34,6 @@ endif
 	$(call prepare_generic_squashfs,$(KDIR)/fs_mark)
 endef
 
-# $(1): filesystem type.
-# $(2): device model (used for output file).
-# $(3): pattern (device specific magic).
-# $(4): version.
-# $(5): simplified filesystem type (without block size).
-define Image/Build/CyberTAN
-	$(STAGING_DIR_HOST)/bin/addpattern -4 -p $(3) -v v$(4) -i $(BIN_DIR)/$(IMG_PREFIX)-$(1).trx -o $(BIN_DIR)/$(IMG_PREFIX)-$(2)-$(5).bin $(if $(6),-s $(6))
-endef
-define Image/Build/CyberTAN2
-	$(STAGING_DIR_HOST)/bin/addpattern -4 -p $(3) -v v$(4) -i $(BIN_DIR)/$(IMG_PREFIX)-$(2)-$(5).noheader.bin -o $(BIN_DIR)/$(IMG_PREFIX)-$(2)-$(5).bin $(if $(6),-s $(6))
-endef
-define Image/Build/CyberTANHead
-	$(STAGING_DIR_HOST)/bin/addpattern -5 -p $(3) -v v$(4) -i /dev/null -o $(KDIR)/$(IMG_PREFIX)-$(2)-header.bin $(if $(6),-s $(6))
-endef
-
-# $(1): filesystem type.
-# $(2): device model (used for output file).
-# $(3): board_id (device specific magic).
-# $(4): region.
-# $(5): simplified filesystem type (without block size).
-define Image/Build/Chk
-	$(STAGING_DIR_HOST)/bin/mkchkimg -o $(BIN_DIR)/$(IMG_PREFIX)-$(2)-$(5).chk -k $(BIN_DIR)/$(IMG_PREFIX)-$(1).trx -b $(3) -r $(4)
-endef
-
 define trxalign/jffs2-128k
 -a 0x20000 -f $(KDIR)/root.$(1)
 endef
@@ -68,18 +44,6 @@ define trxalign/squashfs
 -a 1024 -f $(KDIR)/root.$(1) $(if $(2),-f $(2)) -a 0x10000 -A $(KDIR)/fs_mark
 endef
 
-define Image/Build/trxV2
-	$(call Image/Build/CyberTANHead,$(1),$(2),$(3),$(4),$(5),$(if $(6),$(6)))
-	$(STAGING_DIR_HOST)/bin/trx \
-		-m 33554432 \
-		-2 \
-		-o $(BIN_DIR)/$(IMG_PREFIX)-$(2)-$(5).noheader.bin \
-		-f $(KDIR)/loader.gz \
-		-f $(KDIR)/vmlinux.lzma \
-		$(call trxalign/$(1),$(1),$(KDIR)/$(IMG_PREFIX)-$(2)-header.bin)
-	$(call Image/Build/CyberTAN2,$(1),$(2),$(3),$(4),$(5),$(if $(6),$(6)))
-endef
-
 #################################################
 # Images
 #################################################
@@ -89,15 +53,26 @@ define Build/trx-with-loader
 		-m 33554432 \
 		-o $@ \
 		-f $(KDIR)/loader.gz \
-		-f $(word 1,$^) \
+		-f $(IMAGE_KERNEL) \
 		$(call trxalign/$(FILESYSTEM),$(FILESYSTEM))
 endef
 
+define Build/trx-v2-with-loader
+	$(STAGING_DIR_HOST)/bin/trx \
+		-2 \
+		-m 33554432 \
+		-o $@.new \
+		-f $(KDIR)/loader.gz \
+		-f $(KDIR)/vmlinux.lzma \
+		$(call trxalign/$(FILESYSTEM),$(FILESYSTEM),$@)
+	mv $@.new $@
+endef
+
 define Build/trx-without-loader
 	$(STAGING_DIR_HOST)/bin/trx \
 		-m 33554432 \
 		-o $@ \
-		-f $(word 1,$^) \
+		-f $(IMAGE_KERNEL) \
 		$(call trxalign/$(FILESYSTEM),$(FILESYSTEM))
 endef
 
@@ -119,10 +94,14 @@ define Build/huawei-bin
 endef
 
 define Build/linksys-bin
-	$(STAGING_DIR_HOST)/bin/addpattern -4 -p $(DEVICE_ID) -v v$(VERSION) -i $@ -o $@.new
+	$(STAGING_DIR_HOST)/bin/addpattern -4 -p $(DEVICE_ID) -v v$(VERSION) $(if $(SERIAL),-s $(SERIAL)) -i $@ -o $@.new
 	mv $@.new $@
 endef
 
+define Build/linksys-pattern-partition
+	$(STAGING_DIR_HOST)/bin/addpattern -5 -p $(DEVICE_ID) -v v$(VERSION) $(if $(SERIAL),-s $(SERIAL)) -i /dev/null -o $@
+endef
+
 define Build/motorola-bin
 	$(STAGING_DIR_HOST)/bin/motorola-bin -$(MOTOROLA_DEVICE) $@ $@.new
 	mv $@.new $@
@@ -148,7 +127,7 @@ endef
 #################################################
 
 DEVICE_VARS += PRODUCTID
-DEVICE_VARS += DEVICE_ID VERSION
+DEVICE_VARS += DEVICE_ID VERSION SERIAL
 DEVICE_VARS += NETGEAR_BOARD_ID NETGEAR_REGION
 DEVICE_VARS += MOTOROLA_DEVICE
 DEVICE_VARS += BIN_TAIL
@@ -162,6 +141,19 @@ define Device/Default
 	IMAGE/trx := trx-with-loader
 endef
 
+define Device/standard
+endef
+
+define Device/standard-noloader-gz
+	KERNEL_NAME = vmlinux.gz
+	IMAGE/trx := trx-without-loader
+endef
+
+define Device/standard-noloader-nodictionarylzma
+	KERNEL_NAME = vmlinux-nodictionary.lzma
+	IMAGE/trx := trx-without-loader
+endef
+
 define Device/asus
 	IMAGES := trx
 	IMAGE/trx := trx-with-loader | asus-trx
@@ -230,27 +222,14 @@ ifeq ($(SUBTARGET),generic)
   # BCMA SoC with SSB WiFi
   $(eval $(call LinksysDevice,wrt610n-v2,610N,2.0.0))
   $(eval $(call LinksysDevice,e3000-v1,61XN,1.0.3))
+
+  TARGET_DEVICES += standard
 endif
 
 #################################################
 # Subtarget legacy
 #################################################
 
-# $(1): filesystem type.
-define Image/Build/legacy/devices-with-128k-blocks
-	$(call Image/Build/trxV2,$(1),wrt54g3gv2-vf,3G2V,3.00.24,$(patsubst jffs2-%,jffs2,$(1)),6)
-endef
-
-# $(1): filesystem type.
-define Image/Build/legacy/jffs2-128k
-	$(call Image/Build/legacy/devices-with-128k-blocks,$(1))
-endef
-
-# $(1): filesystem type.
-define Image/Build/legacy/squashfs
-	$(call Image/Build/legacy/devices-with-128k-blocks,$(1))
-endef
-
 define Device/dlink-dwl-3150
 	IMAGES := bin
 	IMAGE/bin := trx-with-loader | tailed-bin
@@ -268,6 +247,16 @@ define Device/huawei-e970
 	IMAGE/bin := trx-without-loader | huawei-bin
 endef
 
+define Device/linksys-wrt54g3gv2-vf
+	FILESYSTEMS := $(FS_128K)
+	IMAGES := noheader.bin bin
+	IMAGE/noheader.bin := linksys-pattern-partition | trx-v2-with-loader
+	IMAGE/bin := linksys-pattern-partition | trx-v2-with-loader | linksys-bin
+	DEVICE_ID := 3G2V
+	VERSION := 3.00.24
+	SERIAL := 6
+endef
+
 define Device/linksys-wrt54gs
 	$(Device/linksys)
 	FILESYSTEMS := $(FS_128K)
@@ -298,6 +287,7 @@ ifeq ($(SUBTARGET),legacy)
 	dlink-dwl-3150 \
 	edimax-ps1208-mfg \
 	huawei-e970 \
+	linksys-wrt54g3gv2-vf \
 	linksys-wrt54gs \
 	linksys-wrtsl54gs \
 	netgear-wgt634u \
@@ -325,6 +315,8 @@ ifeq ($(SUBTARGET),legacy)
   $(eval $(call NetgearDevice,wgr614-v8,U12H072T00_NETGEAR,2))
   $(eval $(call NetgearDevice,wndr3300-v1,U12H093T00_NETGEAR,2))
   $(eval $(call NetgearDevice,wnr834b-v2,U12H081T00_NETGEAR,2))
+
+  TARGET_DEVICES += standard standard-noloader-gz
 endif
 
 #################################################
@@ -373,6 +365,7 @@ ifeq ($(SUBTARGET),mips74k)
   $(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,wndr3400-vcna,U12H155T01_NETGEAR,2))
   $(eval $(call NetgearDevice,wndr4000,U12H181T00_NETGEAR,2))
   $(eval $(call NetgearDevice,wnr1000-v3,U12H139T00_NETGEAR,2))
   $(eval $(call NetgearDevice,wnr2000v2,U12H114T00_NETGEAR,2))
@@ -380,7 +373,11 @@ ifeq ($(SUBTARGET),mips74k)
   $(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,wnr3500u,U12H136T00_NETGEAR,2))
   $(eval $(call NetgearDevice,wnr3500-v2,U12H127T00_NETGEAR,2))
+#  $(eval $(call NetgearDevice,wnr3500-v2-vc,U12H127T70_NETGEAR,2))
+
+  TARGET_DEVICES += standard standard-noloader-nodictionarylzma
 endif
 
 #################################################
@@ -401,26 +398,7 @@ endef
 
 # $(1): filesystem type.
 define Image/Build
-	$(STAGING_DIR_HOST)/bin/trx \
-		-m 33554432 \
-		-o $(BIN_DIR)/$(IMG_PREFIX)-$(1).trx \
-		-f $(KDIR)/loader.gz -f $(KDIR)/vmlinux.lzma \
-		$(call trxalign/$(1),$(1))
-	$(STAGING_DIR_HOST)/bin/trx \
-		-m 33554432 \
-		-o $(BIN_DIR)/$(IMG_PREFIX)-$(1)-noloader-nodictionary.trx \
-		-f $(KDIR)/vmlinux-nodictionary.lzma \
-		$(call trxalign/$(1),$(1))
-	$(STAGING_DIR_HOST)/bin/trx \
-		-m 33554432 \
-		-o $(BIN_DIR)/$(IMG_PREFIX)-$(1)-gz.trx \
-		-f $(KDIR)/vmlinux.gz \
-		$(call trxalign/$(1),$(1))
-	$(call Image/Build/$(SUBTARGET)/$(1),$(1))
-#	$(call Image/Build/Chk,$(1),wgr614_v9,U12H094T00_NETGEAR,2,$(patsubst jffs2-%,jffs2,$(1)))
-#	$(call Image/Build/Chk,$(1),wndr3400_vcna,U12H155T01_NETGEAR,2,$(patsubst jffs2-%,jffs2,$(1)))
-#	$(call Image/Build/Chk,$(1),wnr3500U,U12H136T00_NETGEAR,2,$(patsubst jffs2-%,jffs2,$(1)))
-#	$(call Image/Build/Chk,$(1),wnr3500v2_VC,U12H127T70_NETGEAR,2,$(patsubst jffs2-%,jffs2,$(1)))
+	# TODO: Move it to Device/*
 ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),)
 	$(call Image/Build/Initramfs)
 endif