[source] ramips: don't set the same max image size twice
LEDE Commits
lede-commits at lists.infradead.org
Fri Sep 9 03:34:57 PDT 2016
mkresin pushed a commit to source.git, branch master:
https://git.lede-project.org/05ab2323ffa4c630934e3d0b27a2516b26c1c161
commit 05ab2323ffa4c630934e3d0b27a2516b26c1c161
Author: Mathias Kresin <dev at kresin.me>
AuthorDate: Sun Sep 4 10:04:20 2016 +0200
ramips: don't set the same max image size twice
The ralink_default_fw_size_8M is already set for the default device.
Signed-off-by: Mathias Kresin <dev at kresin.me>
---
target/linux/ramips/image/mt7620.mk | 20 --------------------
target/linux/ramips/image/mt7628.mk | 2 --
target/linux/ramips/image/rt305x.mk | 28 ----------------------------
3 files changed, 50 deletions(-)
diff --git a/target/linux/ramips/image/mt7620.mk b/target/linux/ramips/image/mt7620.mk
index ccf67a1..8e742a9 100644
--- a/target/linux/ramips/image/mt7620.mk
+++ b/target/linux/ramips/image/mt7620.mk
@@ -85,7 +85,6 @@ TARGET_DEVICES += wt3020-4M
define Device/wt3020-8M
DTS := WT3020-8M
- IMAGE_SIZE := $(ralink_default_fw_size_8M)
IMAGES += factory.bin
IMAGE/factory.bin := $$(IMAGE/sysupgrade.bin) | poray-header -B WT3020 -F 8M
DEVICE_TITLE := Nexx WT3020 (8MB)
@@ -162,49 +161,42 @@ TARGET_DEVICES += microwrt
define Device/mt7620a
DTS := MT7620a
- IMAGE_SIZE := $(ralink_default_fw_size_8M)
DEVICE_TITLE := MediaTek MT7620a EVB
endef
TARGET_DEVICES += mt7620a
define Device/mt7620a_mt7610e
DTS := MT7620a_MT7610e
- IMAGE_SIZE := $(ralink_default_fw_size_8M)
DEVICE_TITLE := MediaTek MT7620a + MT7610e EVB
endef
TARGET_DEVICES += mt7620a_mt7610e
define Device/mt7620a_mt7530
DTS := MT7620a_MT7530
- IMAGE_SIZE := $(ralink_default_fw_size_8M)
DEVICE_TITLE := MediaTek MT7620a + MT7530 EVB
endef
TARGET_DEVICES += mt7620a_mt7530
define Device/mt7620a_v22sg
DTS := MT7620a_V22SG
- IMAGE_SIZE := $(ralink_default_fw_size_8M)
DEVICE_TITLE := MediaTek MT7620a V22SG
endef
TARGET_DEVICES += mt7620a_v22sg
define Device/rp-n53
DTS := RP-N53
- IMAGE_SIZE := $(ralink_default_fw_size_8M)
DEVICE_TITLE := Asus RP-N53
endef
TARGET_DEVICES += rp-n53
define Device/cf-wr800n
DTS := CF-WR800N
- IMAGE_SIZE := $(ralink_default_fw_size_8M)
DEVICE_TITLE := Comfast CF-WR800N
endef
TARGET_DEVICES += cf-wr800n
define Device/cs-qr10
DTS := CS-QR10
- IMAGE_SIZE := $(ralink_default_fw_size_8M)
DEVICE_TITLE := Planex CS-QR10
DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci kmod-i2c-core kmod-i2c-ralink kmod-sound-core kmod-sound-mtk kmod-sdhci-mt7620
endef
@@ -212,14 +204,12 @@ TARGET_DEVICES += cs-qr10
define Device/db-wrt01
DTS := DB-WRT01
- IMAGE_SIZE := $(ralink_default_fw_size_8M)
DEVICE_TITLE := Planex DB-WRT01
endef
TARGET_DEVICES += db-wrt01
define Device/mzk-750dhp
DTS := MZK-750DHP
- IMAGE_SIZE := $(ralink_default_fw_size_8M)
DEVICE_TITLE := Planex MZK-750DHP
DEVICE_PACKAGES := kmod-mt76
endef
@@ -227,14 +217,12 @@ TARGET_DEVICES += mzk-750dhp
define Device/mzk-ex300np
DTS := MZK-EX300NP
- IMAGE_SIZE := $(ralink_default_fw_size_8M)
DEVICE_TITLE := Planex MZK-EX300NP
endef
TARGET_DEVICES += mzk-ex300np
define Device/mzk-ex750np
DTS := MZK-EX750NP
- IMAGE_SIZE := $(ralink_default_fw_size_8M)
DEVICE_TITLE := Planex MZK-EX750NP
DEVICE_PACKAGES := kmod-mt76
endef
@@ -273,7 +261,6 @@ TARGET_DEVICES += oy-0001
define Device/psg1208
DTS := PSG1208
- IMAGE_SIZE := $(ralink_default_fw_size_8M)
DEVICE_TITLE := Phicomm PSG1208
DEVICE_PACKAGES := kmod-mt76
endef
@@ -309,14 +296,12 @@ TARGET_DEVICES += mlwg2
define Device/wmr-300
DTS := WMR-300
- IMAGE_SIZE := $(ralink_default_fw_size_8M)
DEVICE_TITLE := Buffalo WMR-300
endef
TARGET_DEVICES += wmr-300
define Device/rt-n14u
DTS := RT-N14U
- IMAGE_SIZE := $(ralink_default_fw_size_8M)
DEVICE_TITLE := Asus RT-N14u
endef
TARGET_DEVICES += rt-n14u
@@ -362,7 +347,6 @@ TARGET_DEVICES += gl-mt750
define Device/zte-q7
DTS := ZTE-Q7
- IMAGE_SIZE := $(ralink_default_fw_size_8M)
DEVICE_TITLE := ZTE Q7
endef
TARGET_DEVICES += zte-q7
@@ -376,7 +360,6 @@ TARGET_DEVICES += youku-yk1
define Device/zbt-ape522ii
DTS := ZBT-APE522II
- IMAGE_SIZE := $(ralink_default_fw_size_8M)
DEVICE_TITLE := Zbtlink ZBT-APE522II
DEVICE_PACKAGES := kmod-mt76
endef
@@ -384,7 +367,6 @@ TARGET_DEVICES += zbt-ape522ii
define Device/zbt-wa05
DTS := ZBT-WA05
- IMAGE_SIZE := $(ralink_default_fw_size_8M)
DEVICE_TITLE := Zbtlink ZBT-WA05
endef
TARGET_DEVICES += zbt-wa05
@@ -399,14 +381,12 @@ TARGET_DEVICES += zbt-we826
define Device/zbt-wr8305rt
DTS := ZBT-WR8305RT
- IMAGE_SIZE := $(ralink_default_fw_size_8M)
DEVICE_TITLE := Zbtlink ZBT-WR8305RT
endef
TARGET_DEVICES += zbt-wr8305rt
define Device/tiny-ac
DTS := TINY-AC
- IMAGE_SIZE := $(ralink_default_fw_size_8M)
DEVICE_TITLE := Dovado Tiny AC
DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci
endef
diff --git a/target/linux/ramips/image/mt7628.mk b/target/linux/ramips/image/mt7628.mk
index 0647acf..bd7d5bf 100644
--- a/target/linux/ramips/image/mt7628.mk
+++ b/target/linux/ramips/image/mt7628.mk
@@ -28,7 +28,6 @@ TARGET_DEVICES += wrtnode2p
define Device/duzun-dm06
DTS := DUZUN-DM06
- IMAGE_SIZE := $(ralink_default_fw_size_8M)
DEVICE_TITLE := DuZun DM06
DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci kmod-ledtrig-usbdev
endef
@@ -36,7 +35,6 @@ TARGET_DEVICES += duzun-dm06
define Device/mac1200r-v2
DTS := MAC1200RV2
- IMAGE_SIZE := $(ralink_default_fw_size_8M)
DEVICE_TITLE := Mercury MAC1200R v2.0
endef
TARGET_DEVICES += mac1200r-v2
diff --git a/target/linux/ramips/image/rt305x.mk b/target/linux/ramips/image/rt305x.mk
index 8525db1..ede2728 100644
--- a/target/linux/ramips/image/rt305x.mk
+++ b/target/linux/ramips/image/rt305x.mk
@@ -115,7 +115,6 @@ TARGET_DEVICES += air3gii
define Device/awm003-evb
DTS := AWM003-EVB
- IMAGE_SIZE := $(ralink_default_fw_size_8M)
DEVICE_TITLE := AsiaRF AWM003 EVB
endef
TARGET_DEVICES += awm003-evb
@@ -131,7 +130,6 @@ TARGET_DEVICES += awmapn2403
define Device/bc2
DTS := BC2
- IMAGE_SIZE := $(ralink_default_fw_size_8M)
DEVICE_TITLE := NexAira BC2
endef
TARGET_DEVICES += bc2
@@ -139,7 +137,6 @@ TARGET_DEVICES += bc2
define Device/carambola
DTS := CARAMBOLA
- IMAGE_SIZE := $(ralink_default_fw_size_8M)
DEVICE_TITLE := 8devices Carambola
DEVICE_PACKAGES :=
endef
@@ -156,7 +153,6 @@ TARGET_DEVICES += d105
define Device/dir-620-a1
DTS := DIR-620-A1
- IMAGE_SIZE := $(ralink_default_fw_size_8M)
DEVICE_TITLE := D-Link DIR-620 A1
endef
TARGET_DEVICES += dir-620-a1
@@ -164,7 +160,6 @@ TARGET_DEVICES += dir-620-a1
define Device/dir-620-d1
DTS := DIR-620-D1
- IMAGE_SIZE := $(ralink_default_fw_size_8M)
DEVICE_TITLE := D-Link DIR-620 D1
endef
TARGET_DEVICES += dir-620-d1
@@ -180,7 +175,6 @@ TARGET_DEVICES += esr-9753
define Device/hw550-3g
DTS := HW550-3G
- IMAGE_SIZE := $(ralink_default_fw_size_8M)
DEVICE_TITLE := Aztech HW550-3G
DEVICE_PACKAGES := kmod-usb-core kmod-usb-dwc2 kmod-ledtrig-usbdev
endef
@@ -189,7 +183,6 @@ TARGET_DEVICES += hw550-3g
define Device/rt-n13u
DTS := RT-N13U
- IMAGE_SIZE := $(ralink_default_fw_size_8M)
DEVICE_TITLE := Asus RT-N13U
DEVICE_PACKAGES := kmod-leds-gpio kmod-rt2800-pci wpad-mini kmod-usb-dwc2
endef
@@ -198,7 +191,6 @@ TARGET_DEVICES += rt-n13u
define Device/freestation5
DTS := FREESTATION5
- IMAGE_SIZE := $(ralink_default_fw_size_8M)
DEVICE_TITLE := ARC Wireless FreeStation
DEVICE_PACKAGES := kmod-usb-dwc2 kmod-rt2500-usb kmod-rt2800-usb kmod-rt2x00-usb
endef
@@ -207,7 +199,6 @@ TARGET_DEVICES += freestation5
define Device/ip2202
DTS := IP2202
- IMAGE_SIZE := $(ralink_default_fw_size_8M)
DEVICE_TITLE := Poray IP2202
endef
TARGET_DEVICES += ip2202
@@ -215,7 +206,6 @@ TARGET_DEVICES += ip2202
define Device/ht-tm02
DTS := HT-TM02
- IMAGE_SIZE := $(ralink_default_fw_size_8M)
DEVICE_TITLE := HooToo HT-TM02
DEVICE_PACKAGES := kmod-usb-core kmod-usb-ohci kmod-usb2 kmod-ledtrig-usbdev
endef
@@ -224,7 +214,6 @@ TARGET_DEVICES += ht-tm02
define Device/mofi3500-3gn
DTS := MOFI3500-3GN
- IMAGE_SIZE := $(ralink_default_fw_size_8M)
DEVICE_TITLE := MoFi Network MOFI3500-3GN
endef
TARGET_DEVICES += mofi3500-3gn
@@ -242,7 +231,6 @@ TARGET_DEVICES += 3g150b
define Device/mr-102n
DTS := MR-102N
- IMAGE_SIZE := $(ralink_default_fw_size_8M)
DEVICE_TITLE := AXIMCom MR-102N
endef
TARGET_DEVICES += mr-102n
@@ -260,7 +248,6 @@ TARGET_DEVICES += mpr-a1
define Device/mpr-a2
DTS := MPRA2
- IMAGE_SIZE := $(ralink_default_fw_size_8M)
UIMAGE_NAME:= Linux Kernel Image
DEVICE_TITLE := HAME MPR-A2
DEVICE_PACKAGES := kmod-usb-core kmod-usb-ohci kmod-usb2 kmod-ledtrig-netdev
@@ -278,7 +265,6 @@ TARGET_DEVICES += dir-300-b7
define Device/dir-320-b1
DTS := DIR-320-B1
- IMAGE_SIZE := $(ralink_default_fw_size_8M)
DEVICE_TITLE := D-Link DIR-320 B1
endef
TARGET_DEVICES += dir-320-b1
@@ -294,7 +280,6 @@ TARGET_DEVICES += nbg-419n
define Device/mzk-wdpr
DTS := MZK-WDPR
- IMAGE_SIZE := $(ralink_default_fw_size_8M)
DEVICE_TITLE := Planex MZK-WDPR
endef
TARGET_DEVICES += mzk-wdpr
@@ -302,7 +287,6 @@ TARGET_DEVICES += mzk-wdpr
define Device/ncs601W
DTS := NCS601W
- IMAGE_SIZE := $(ralink_default_fw_size_8M)
DEVICE_TITLE := Wansview NCS601W
DEVICE_PACKAGES := kmod-video-core kmod-video-uvc \
kmod-usb-core kmod-usb-ohci
@@ -312,7 +296,6 @@ TARGET_DEVICES += ncs601W
define Device/m2m
DTS := M2M
- IMAGE_SIZE := $(ralink_default_fw_size_8M)
UIMAGE_NAME:= Linux Kernel Image
DEVICE_TITLE := Intenso Memory 2 Move
DEVICE_PACKAGES := kmod-ledtrig-netdev kmod-ledtrig-timer \
@@ -324,7 +307,6 @@ TARGET_DEVICES += m2m
define Device/miniembplug
DTS := MINIEMBPLUG
- IMAGE_SIZE := $(ralink_default_fw_size_8M)
DEVICE_TITLE := Omnima MiniEMBPlug
endef
TARGET_DEVICES += miniembplug
@@ -332,7 +314,6 @@ TARGET_DEVICES += miniembplug
define Device/miniembwifi
DTS := MINIEMBWIFI
- IMAGE_SIZE := $(ralink_default_fw_size_8M)
DEVICE_TITLE := Omnima MiniEMBWiFi
endef
TARGET_DEVICES += miniembwifi
@@ -348,7 +329,6 @@ TARGET_DEVICES += psr-680w
define Device/pwh2004
DTS := PWH2004
- IMAGE_SIZE := $(ralink_default_fw_size_8M)
DEVICE_TITLE := Prolink PWH2004
DEVICE_PACKAGES :=
endef
@@ -357,7 +337,6 @@ TARGET_DEVICES += pwh2004
define Device/rt5350f-olinuxino
DTS := RT5350F-OLINUXINO
- IMAGE_SIZE := $(ralink_default_fw_size_8M)
DEVICE_TITLE := RT5350F-OLinuXino
DEVICE_PACKAGES := kmod-usb-core kmod-usb-ohci kmod-usb2 \
kmod-i2c-core kmod-i2c-ralink \
@@ -368,7 +347,6 @@ TARGET_DEVICES += rt5350f-olinuxino
define Device/rt5350f-olinuxino-evb
DTS := RT5350F-OLINUXINO-EVB
- IMAGE_SIZE := $(ralink_default_fw_size_8M)
DEVICE_TITLE := RT5350F-OLinuXino-EVB
DEVICE_PACKAGES := kmod-usb-core kmod-usb-ohci kmod-usb2 \
kmod-i2c-core kmod-i2c-ralink \
@@ -395,7 +373,6 @@ TARGET_DEVICES += rt-n10-plus
define Device/rut5xx
DTS := RUT5XX
- IMAGE_SIZE := $(ralink_default_fw_size_8M)
DEVICE_TITLE := Teltonika RUT5XX
endef
TARGET_DEVICES += rut5xx
@@ -410,7 +387,6 @@ TARGET_DEVICES += sl-r7205
define Device/tew-714tru
DTS := TEW-714TRU
- IMAGE_SIZE := $(ralink_default_fw_size_8M)
DEVICE_TITLE := TRENDnet TEW-714TRU
endef
TARGET_DEVICES += tew-714tru
@@ -425,7 +401,6 @@ TARGET_DEVICES += v22rw-2x2
define Device/w502u
DTS := W502U
- IMAGE_SIZE := $(ralink_default_fw_size_8M)
DEVICE_TITLE := ALFA Networks W502U
endef
TARGET_DEVICES += w502u
@@ -450,7 +425,6 @@ TARGET_DEVICES += mzk-dp150n
define Device/wizard-8800
DTS := WIZARD8800
- IMAGE_SIZE := $(ralink_default_fw_size_8M)
UIMAGE_NAME:= Linux Kernel Image
DEVICE_TITLE := EasyAcc WIZARD 8800
endef
@@ -502,7 +476,6 @@ TARGET_DEVICES += ur-326n4g
define Device/ur-336un
DTS := UR-336UN
- IMAGE_SIZE := $(ralink_default_fw_size_8M)
DEVICE_TITLE := UPVEL UR-336UN
DEVICE_PACKAGES := kmod-usb-core kmod-usb-dwc2 kmod-ledtrig-usbdev
endef
@@ -511,7 +484,6 @@ TARGET_DEVICES += ur-336un
define Device/wr6202
DTS := WR6202
- IMAGE_SIZE := $(ralink_default_fw_size_8M)
DEVICE_TITLE := AWB WR6202
endef
TARGET_DEVICES += wr6202
More information about the lede-commits
mailing list