Author: rmilecki
Date: 2016-03-11 09:54:03 +0100 (Fri, 11 Mar 2016)
New Revision: 48998

Modified:
   branches/chaos_calmer/target/linux/brcm47xx/image/Makefile
Log:
brcm47xx: image: switch D-Link DWL-3150 to the new building system

Signed-off-by: Rafa{U+0142} Mi{U+0142}ecki <[email protected]>

Backport of r48970

Modified: branches/chaos_calmer/target/linux/brcm47xx/image/Makefile
===================================================================
--- branches/chaos_calmer/target/linux/brcm47xx/image/Makefile  2016-03-10 
21:19:58 UTC (rev 48997)
+++ branches/chaos_calmer/target/linux/brcm47xx/image/Makefile  2016-03-11 
08:54:03 UTC (rev 48998)
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006-2012 OpenWrt.org
+# Copyright (C) 2006-2016 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -39,11 +39,6 @@
        cat $(BIN_DIR)/$(IMG_PREFIX)-$(1).trx >> 
$(BIN_DIR)/$(IMG_PREFIX)-wgt634u-$(2).bin
 endef
 
-define Image/Build/dwl3150
-       cp $(BIN_DIR)/$(IMG_PREFIX)-$(1).trx 
$(BIN_DIR)/$(IMG_PREFIX)-dwl3150-$(2).bin
-       echo "BCM-5352-2050-0000000-01" >> 
$(BIN_DIR)/$(IMG_PREFIX)-dwl3150-$(2).bin
-endef
-
 # $(1): filesystem type.
 # $(2): device model (used for output file).
 # $(3): pattern (device specific magic).
@@ -135,6 +130,10 @@
        mv [email protected] $@
 endef
 
+define Build/tailed-bin
+       echo $(BIN_TAIL) >> $@
+endef
+
 #################################################
 # Devices
 #################################################
@@ -142,6 +141,7 @@
 DEVICE_VARS += PRODUCTID
 DEVICE_VARS += DEVICE_ID VERSION
 DEVICE_VARS += BOARD_ID REGION
+DEVICE_VARS += BIN_TAIL
 
 define Device/Default
        KERNEL := kernel-bin
@@ -221,7 +221,6 @@
 
 # $(1): filesystem type.
 define Image/Build/legacy/devices-with-64k-blocks
-       $(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))
        $(call Image/Build/Motorola,$(1),wa840g,2,$(patsubst 
jffs2-%,jffs2,$(1)))
@@ -246,6 +245,12 @@
        $(call Image/Build/legacy/devices-with-128k-blocks,$(1))
 endef
 
+define Device/dlink-dwl-3150
+       IMAGES := bin
+       IMAGE/bin := trx-with-loader | tailed-bin
+       BIN_TAIL := BCM-5352-2050-0000000-01
+endef
+
 define Device/linksys-wrt54gs
        $(Device/linksys)
        FILESYSTEMS := $(FS_128K)
@@ -262,6 +267,7 @@
 
 ifeq ($(SUBTARGET),legacy)
   TARGET_DEVICES += \
+       dlink-dwl-3150 \
        linksys-wrt54gs \
        linksys-wrtsl54gs
 
_______________________________________________
openwrt-commits mailing list
[email protected]
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits

Reply via email to