aboutsummaryrefslogtreecommitdiffstats
path: root/target
diff options
context:
space:
mode:
authorRafał Miłecki <zajec5@gmail.com>2016-03-08 18:33:22 +0000
committerRafał Miłecki <zajec5@gmail.com>2016-03-08 18:33:22 +0000
commit0d3da888d233c38423eed857c62fdcb8820af94a (patch)
tree9d5dd4fcf70b8c2b2c7a8ea4f456ac4cc3fccef5 /target
parent5e2930a888433d80d36ee2cfba47bede086b1333 (diff)
downloadupstream-0d3da888d233c38423eed857c62fdcb8820af94a.tar.gz
upstream-0d3da888d233c38423eed857c62fdcb8820af94a.tar.bz2
upstream-0d3da888d233c38423eed857c62fdcb8820af94a.zip
brcm47xx: image: switch rest of 64k block devices to the new building system
Signed-off-by: Rafał Miłecki <zajec5@gmail.com> SVN-Revision: 48972
Diffstat (limited to 'target')
-rw-r--r--target/linux/brcm47xx/image/Makefile73
1 files changed, 45 insertions, 28 deletions
diff --git a/target/linux/brcm47xx/image/Makefile b/target/linux/brcm47xx/image/Makefile
index 1f19d867a5..731bef349b 100644
--- a/target/linux/brcm47xx/image/Makefile
+++ b/target/linux/brcm47xx/image/Makefile
@@ -54,20 +54,6 @@ 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
-define Image/Build/USR
- $(STAGING_DIR_HOST)/bin/trx2usr $(BIN_DIR)/$(IMG_PREFIX)-$(1).trx $(BIN_DIR)/$(IMG_PREFIX)-$(2)-$(3).bin
-endef
-
-define Image/Build/Edi
- $(STAGING_DIR_HOST)/bin/trx2edips $(BIN_DIR)/$(IMG_PREFIX)-$(1).trx $(BIN_DIR)/$(IMG_PREFIX)-$(2)-$(3).bin
-endef
-
-define Image/Build/Huawei
- dd if=/dev/zero of=$(BIN_DIR)/$(IMG_PREFIX)-$(2)-$(3)-gz.bin bs=92 count=1
- echo -ne 'HDR0\x08\x00\x00\x00' >> $(BIN_DIR)/$(IMG_PREFIX)-$(2)-$(3)-gz.bin
- cat $(BIN_DIR)/$(IMG_PREFIX)-$(1)-gz.trx >> $(BIN_DIR)/$(IMG_PREFIX)-$(2)-$(3)-gz.bin
-endef
-
# $(1): filesystem type.
# $(2): device model (used for output file).
# $(3): board_id (device specific magic).
@@ -112,11 +98,31 @@ define Build/trx-with-loader
$(call trxalign/$(FILESYSTEM),$(FILESYSTEM))
endef
+define Build/trx-without-loader
+ $(STAGING_DIR_HOST)/bin/trx \
+ -m 33554432 \
+ -o $@ \
+ -f $(word 1,$^) \
+ $(call trxalign/$(FILESYSTEM),$(FILESYSTEM))
+endef
+
define Build/asus-trx
$(STAGING_DIR_HOST)/bin/asustrx -p "$(PRODUCTID)" -i $@ -o $@.new
mv $@.new $@
endef
+define Build/edimax-bin
+ $(STAGING_DIR_HOST)/bin/trx2edips $@ $@.new
+ mv $@.new $@
+endef
+
+define Build/huawei-bin
+ dd if=/dev/zero of=$@.new bs=92 count=1
+ echo -ne 'HDR0\x08\x00\x00\x00' >> $@.new
+ cat $@ >> $@.new
+ mv $@.new $@
+endef
+
define Build/linksys-bin
$(STAGING_DIR_HOST)/bin/addpattern -4 -p $(DEVICE_ID) -v v$(VERSION) -i $@ -o $@.new
mv $@.new $@
@@ -131,6 +137,11 @@ define Build/tailed-bin
echo $(BIN_TAIL) >> $@
endef
+define Build/usrobotics-bin
+ $(STAGING_DIR_HOST)/bin/trx2usr $@ $@.new
+ mv $@.new $@
+endef
+
#################################################
# Devices
#################################################
@@ -231,25 +242,12 @@ define Image/Build/legacy/devices-with-128k-blocks
endef
# $(1): filesystem type.
-define Image/Build/legacy/devices-with-64k-blocks
- $(call Image/Build/Edi,$(1),ps1208mfg,$(patsubst jffs2-%,jffs2,$(1)))
- $(call Image/Build/Huawei,$(1),e970,$(1))
- $(call Image/Build/USR,$(1),usr5461,$(1))
-endef
-
-# $(1): filesystem type.
-define Image/Build/legacy/jffs2-64k
- $(call Image/Build/legacy/devices-with-64k-blocks,$(1))
-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-64k-blocks,$(1))
$(call Image/Build/legacy/devices-with-128k-blocks,$(1))
endef
@@ -259,6 +257,17 @@ define Device/dlink-dwl-3150
BIN_TAIL := BCM-5352-2050-0000000-01
endef
+define Device/edimax-ps1208-mfg
+ IMAGES := bin
+ IMAGE/bin := trx-with-loader | edimax-bin
+endef
+
+define Device/huawei-e970
+ KERNEL_NAME = vmlinux.gz
+ IMAGES := bin
+ IMAGE/bin := trx-without-loader | huawei-bin
+endef
+
define Device/linksys-wrt54gs
$(Device/linksys)
FILESYSTEMS := $(FS_128K)
@@ -273,11 +282,19 @@ define Device/linksys-wrtsl54gs
VERSION := 2.08.1
endef
+define Device/usrobotics-usr5461
+ IMAGES := bin
+ IMAGE/bin := trx-with-loader | usrobotics-bin
+endef
+
ifeq ($(SUBTARGET),legacy)
TARGET_DEVICES += \
dlink-dwl-3150 \
+ edimax-ps1208-mfg \
+ huawei-e970 \
linksys-wrt54gs \
- linksys-wrtsl54gs
+ linksys-wrtsl54gs \
+ usrobotics-usr5461
$(eval $(call AsusDevice,wl-300g,WL300g ))
$(eval $(call AsusDevice,wl-320gp,WL320gP ))