ramips: remove ralink_default_fw_size_xxx variables

There are frequent examples of the ralink_default_fw_size_xxx
variables being used to "roughly" set flash size without caring
about the actual size of the firmware partition.

To discourage this behavior, this patch removes the variables and
just sets IMAGE_SIZE by its numeric value for each target.

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>

1 files changed, 43 insertions, 43 deletions

diff --git a/target/linux/ramips/image/mt7620.mk b/target/linux/ramips/image/mt7620.mk
index 01fa00afd7..83e915d479 100644
--- a/target/linux/ramips/image/mt7620.mk
+++ b/target/linux/ramips/image/mt7620.mk
@@ -86,7 +86,7 @@ endef
 
 define Device/asus_rp-n53
   MTK_SOC := mt7620a
-  IMAGE_SIZE := $(ralink_default_fw_size_8M)
+  IMAGE_SIZE := 7872k
   DEVICE_VENDOR := Asus
   DEVICE_MODEL := RP-N53
   DEVICE_PACKAGES := kmod-rt2800-pci
@@ -96,7 +96,7 @@ TARGET_DEVICES += asus_rp-n53
 
 define Device/asus_rt-ac51u
   MTK_SOC := mt7620a
-  IMAGE_SIZE := $(ralink_default_fw_size_16M)
+  IMAGE_SIZE := 16064k
   DEVICE_VENDOR := Asus
   DEVICE_MODEL := RT-AC51U
   DEVICE_PACKAGES := kmod-mt76x0e kmod-usb2 kmod-usb-ohci kmod-usb-ledtrig-usbport
@@ -106,7 +106,7 @@ TARGET_DEVICES += asus_rt-ac51u
 
 define Device/asus_rt-n12p
   MTK_SOC := mt7620n
-  IMAGE_SIZE := $(ralink_default_fw_size_16M)
+  IMAGE_SIZE := 16064k
   DEVICE_VENDOR := Asus
   DEVICE_MODEL := RT-N11P/RT-N12+/RT-N12Eb1
   SUPPORTED_DEVICES += rt-n12p
@@ -115,7 +115,7 @@ TARGET_DEVICES += asus_rt-n12p
 
 define Device/asus_rt-n14u
   MTK_SOC := mt7620n
-  IMAGE_SIZE := $(ralink_default_fw_size_16M)
+  IMAGE_SIZE := 16064k
   DEVICE_VENDOR := Asus
   DEVICE_MODEL := RT-N14u
   DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci
@@ -134,7 +134,7 @@ TARGET_DEVICES += bdcom_wap2100-sk
 
 define Device/buffalo_whr-1166d
   MTK_SOC := mt7620a
-  IMAGE_SIZE := $(ralink_default_fw_size_16M)
+  IMAGE_SIZE := 16064k
   DEVICE_VENDOR := Buffalo
   DEVICE_MODEL := WHR-1166D
   DEVICE_PACKAGES := kmod-mt76x2
@@ -144,7 +144,7 @@ TARGET_DEVICES += buffalo_whr-1166d
 
 define Device/buffalo_whr-300hp2
   MTK_SOC := mt7620a
-  IMAGE_SIZE := $(ralink_default_fw_size_8M)
+  IMAGE_SIZE := 7872k
   DEVICE_VENDOR := Buffalo
   DEVICE_MODEL := WHR-300HP2
   SUPPORTED_DEVICES += whr-300hp2
@@ -153,7 +153,7 @@ TARGET_DEVICES += buffalo_whr-300hp2
 
 define Device/buffalo_whr-600d
   MTK_SOC := mt7620a
-  IMAGE_SIZE := $(ralink_default_fw_size_8M)
+  IMAGE_SIZE := 7872k
   DEVICE_VENDOR := Buffalo
   DEVICE_MODEL := WHR-600D
   DEVICE_PACKAGES := kmod-rt2800-pci
@@ -163,7 +163,7 @@ TARGET_DEVICES += buffalo_whr-600d
 
 define Device/buffalo_wmr-300
   MTK_SOC := mt7620n
-  IMAGE_SIZE := $(ralink_default_fw_size_8M)
+  IMAGE_SIZE := 7872k
   DEVICE_VENDOR := Buffalo
   DEVICE_MODEL := WMR-300
   SUPPORTED_DEVICES += wmr-300
@@ -172,7 +172,7 @@ TARGET_DEVICES += buffalo_wmr-300
 
 define Device/comfast_cf-wr800n
   MTK_SOC := mt7620n
-  IMAGE_SIZE := $(ralink_default_fw_size_8M)
+  IMAGE_SIZE := 7872k
   DEVICE_VENDOR := Comfast
   DEVICE_MODEL := CF-WR800N
   SUPPORTED_DEVICES += cf-wr800n
@@ -298,7 +298,7 @@ TARGET_DEVICES += dlink_dwr-922-e2
 
 define Device/dovado_tiny-ac
   MTK_SOC := mt7620a
-  IMAGE_SIZE := $(ralink_default_fw_size_8M)
+  IMAGE_SIZE := 7872k
   DEVICE_VENDOR := Dovado
   DEVICE_MODEL := Tiny AC
   DEVICE_PACKAGES := kmod-mt76x0e kmod-usb2 kmod-usb-ohci
@@ -444,7 +444,7 @@ TARGET_DEVICES += hiwifi_hc5861
 
 define Device/hnet_c108
   MTK_SOC := mt7620a
-  IMAGE_SIZE := $(ralink_default_fw_size_16M)
+  IMAGE_SIZE := 16064k
   DEVICE_VENDOR := HNET
   DEVICE_MODEL := C108
   DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci kmod-sdhci-mt7620
@@ -533,7 +533,7 @@ TARGET_DEVICES += lava_lr-25g001
 
 define Device/lenovo_newifi-y1
   MTK_SOC := mt7620a
-  IMAGE_SIZE := $(ralink_default_fw_size_16M)
+  IMAGE_SIZE := 16064k
   DEVICE_VENDOR := Lenovo
   DEVICE_MODEL := Y1
   DEVICE_PACKAGES := kmod-mt76x2 kmod-usb2 kmod-usb-ohci
@@ -543,7 +543,7 @@ TARGET_DEVICES += lenovo_newifi-y1
 
 define Device/lenovo_newifi-y1s
   MTK_SOC := mt7620a
-  IMAGE_SIZE := $(ralink_default_fw_size_16M)
+  IMAGE_SIZE := 16064k
   DEVICE_VENDOR := Lenovo
   DEVICE_MODEL := Y1S
   DEVICE_PACKAGES := kmod-mt76x2 kmod-usb2 kmod-usb-ohci
@@ -553,7 +553,7 @@ TARGET_DEVICES += lenovo_newifi-y1s
 
 define Device/linksys_e1700
   MTK_SOC := mt7620a
-  IMAGE_SIZE := $(ralink_default_fw_size_8M)
+  IMAGE_SIZE := 7872k
   IMAGES += factory.bin
   IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \
 	umedia-header 0x013326
@@ -578,7 +578,7 @@ define Device/netgear_ex2700
   NETGEAR_HW_ID := 29764623+4+0+32+2x2+0
   NETGEAR_BOARD_ID := EX2700
   BLOCKSIZE := 4k
-  IMAGE_SIZE := $(ralink_default_fw_size_4M)
+  IMAGE_SIZE := 3776k
   IMAGES += factory.bin
   KERNEL := $(KERNEL_DTB) | uImage lzma | pad-offset 64k 64 | append-uImage-fakehdr filesystem
   IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \
@@ -605,7 +605,7 @@ TARGET_DEVICES += netgear_ex3700
 
 define Device/netgear_wn3000rp-v3
   MTK_SOC := mt7620a
-  IMAGE_SIZE := $(ralink_default_fw_size_8M)
+  IMAGE_SIZE := 7872k
   NETGEAR_HW_ID := 29764836+8+0+32+2x2+0
   NETGEAR_BOARD_ID := WN3000RPv3
   BLOCKSIZE := 4k
@@ -623,7 +623,7 @@ TARGET_DEVICES += netgear_wn3000rp-v3
 define Device/nexx_wt3020-4m
   MTK_SOC := mt7620n
   BLOCKSIZE := 4k
-  IMAGE_SIZE := $(ralink_default_fw_size_4M)
+  IMAGE_SIZE := 3776k
   IMAGES += factory.bin
   IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \
 	poray-header -B WT3020 -F 4M
@@ -636,7 +636,7 @@ TARGET_DEVICES += nexx_wt3020-4m
 
 define Device/nexx_wt3020-8m
   MTK_SOC := mt7620n
-  IMAGE_SIZE := $(ralink_default_fw_size_8M)
+  IMAGE_SIZE := 7872k
   IMAGES += factory.bin
   IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \
 	poray-header -B WT3020 -F 8M
@@ -650,7 +650,7 @@ TARGET_DEVICES += nexx_wt3020-8m
 
 define Device/ohyeah_oy-0001
   MTK_SOC := mt7620a
-  IMAGE_SIZE := $(ralink_default_fw_size_16M)
+  IMAGE_SIZE := 16064k
   DEVICE_VENDOR := Oh Yeah
   DEVICE_MODEL := OY-0001
   DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci
@@ -669,7 +669,7 @@ TARGET_DEVICES += phicomm_k2g
 
 define Device/phicomm_psg1208
   MTK_SOC := mt7620a
-  IMAGE_SIZE := $(ralink_default_fw_size_8M)
+  IMAGE_SIZE := 7872k
   DEVICE_VENDOR := Phicomm
   DEVICE_MODEL := PSG1208
   DEVICE_PACKAGES := kmod-mt76x2
@@ -679,7 +679,7 @@ TARGET_DEVICES += phicomm_psg1208
 
 define Device/phicomm_psg1218a
   MTK_SOC := mt7620a
-  IMAGE_SIZE := $(ralink_default_fw_size_8M)
+  IMAGE_SIZE := 7872k
   DEVICE_VENDOR := Phicomm
   DEVICE_MODEL := PSG1218
   DEVICE_VARIANT:= Ax
@@ -690,7 +690,7 @@ TARGET_DEVICES += phicomm_psg1218a
 
 define Device/phicomm_psg1218b
   MTK_SOC := mt7620a
-  IMAGE_SIZE := $(ralink_default_fw_size_8M)
+  IMAGE_SIZE := 7872k
   DEVICE_VENDOR := Phicomm
   DEVICE_MODEL := PSG1218
   DEVICE_VARIANT := Bx
@@ -701,7 +701,7 @@ TARGET_DEVICES += phicomm_psg1218b
 
 define Device/planex_cs-qr10
   MTK_SOC := mt7620a
-  IMAGE_SIZE := $(ralink_default_fw_size_8M)
+  IMAGE_SIZE := 7872k
   DEVICE_VENDOR := Planex
   DEVICE_MODEL := CS-QR10
   DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci \
@@ -713,7 +713,7 @@ TARGET_DEVICES += planex_cs-qr10
 
 define Device/planex_db-wrt01
   MTK_SOC := mt7620a
-  IMAGE_SIZE := $(ralink_default_fw_size_8M)
+  IMAGE_SIZE := 7872k
   DEVICE_VENDOR := Planex
   DEVICE_MODEL := DB-WRT01
   SUPPORTED_DEVICES += db-wrt01
@@ -722,7 +722,7 @@ TARGET_DEVICES += planex_db-wrt01
 
 define Device/planex_mzk-750dhp
   MTK_SOC := mt7620a
-  IMAGE_SIZE := $(ralink_default_fw_size_8M)
+  IMAGE_SIZE := 7872k
   DEVICE_VENDOR := Planex
   DEVICE_MODEL := MZK-750DHP
   DEVICE_PACKAGES := kmod-mt76x0e
@@ -751,7 +751,7 @@ TARGET_DEVICES += planex_mzk-ex750np
 
 define Device/ralink_mt7620a-evb
   MTK_SOC := mt7620a
-  IMAGE_SIZE := $(ralink_default_fw_size_8M)
+  IMAGE_SIZE := 7872k
   DEVICE_VENDOR := MediaTek
   DEVICE_MODEL := MT7620a EVB
 endef
@@ -759,7 +759,7 @@ TARGET_DEVICES += ralink_mt7620a-evb
 
 define Device/ralink_mt7620a-mt7530-evb
   MTK_SOC := mt7620a
-  IMAGE_SIZE := $(ralink_default_fw_size_8M)
+  IMAGE_SIZE := 7872k
   DEVICE_VENDOR := MediaTek
   DEVICE_MODEL := MT7620a + MT7530 EVB
   SUPPORTED_DEVICES += mt7620a_mt7530
@@ -768,7 +768,7 @@ TARGET_DEVICES += ralink_mt7620a-mt7530-evb
 
 define Device/ralink_mt7620a-mt7610e-evb
   MTK_SOC := mt7620a
-  IMAGE_SIZE := $(ralink_default_fw_size_8M)
+  IMAGE_SIZE := 7872k
   DEVICE_VENDOR := MediaTek
   DEVICE_MODEL := MT7620a + MT7610e EVB
   DEVICE_PACKAGES := kmod-mt76x0e
@@ -787,7 +787,7 @@ TARGET_DEVICES += ralink_mt7620a-v22sg-evb
 
 define Device/ravpower_wd03
   MTK_SOC := mt7620n
-  IMAGE_SIZE := $(ralink_default_fw_size_8M)
+  IMAGE_SIZE := 7872k
   DEVICE_VENDOR := Ravpower
   DEVICE_MODEL := WD03
   DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci
@@ -796,7 +796,7 @@ TARGET_DEVICES += ravpower_wd03
 
 define Device/sanlinking_d240
   MTK_SOC := mt7620a
-  IMAGE_SIZE := $(ralink_default_fw_size_16M)
+  IMAGE_SIZE := 16064k
   DEVICE_VENDOR := Sanlinking Technologies
   DEVICE_MODEL := D240
   DEVICE_PACKAGES := kmod-mt76x2 kmod-usb2 kmod-usb-ohci kmod-sdhci-mt7620
@@ -875,7 +875,7 @@ TARGET_DEVICES += tplink_archer-c50-v1
 
 define Device/tplink_archer-mr200
   $(Device/Archer)
-  IMAGE_SIZE := $(ralink_default_fw_size_8M)
+  IMAGE_SIZE := 7872k
   TPLINK_FLASHLAYOUT := 8MLmtk
   TPLINK_HWID := 0xd7500001
   TPLINK_HWREV := 0x4a
@@ -887,7 +887,7 @@ TARGET_DEVICES += tplink_archer-mr200
 
 define Device/vonets_var11n-300
   MTK_SOC := mt7620n
-  IMAGE_SIZE := $(ralink_default_fw_size_4M)
+  IMAGE_SIZE := 3776k
   BLOCKSIZE := 4k
   DEVICE_VENDOR := Vonets
   DEVICE_MODEL := VAR11N-300
@@ -896,7 +896,7 @@ TARGET_DEVICES += vonets_var11n-300
 
 define Device/wrtnode_wrtnode
   MTK_SOC := mt7620n
-  IMAGE_SIZE := $(ralink_default_fw_size_16M)
+  IMAGE_SIZE := 16064k
   DEVICE_VENDOR := WRTNode
   DEVICE_MODEL := WRTNode
   DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci
@@ -916,7 +916,7 @@ TARGET_DEVICES += xiaomi_miwifi-mini
 
 define Device/youku_yk1
   MTK_SOC := mt7620a
-  IMAGE_SIZE := $(ralink_default_fw_size_32M)
+  IMAGE_SIZE := 32448k
   DEVICE_VENDOR := YOUKU
   DEVICE_MODEL := YK1
   DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci kmod-sdhci-mt7620 kmod-usb-ledtrig-usbport
@@ -926,7 +926,7 @@ TARGET_DEVICES += youku_yk1
 
 define Device/yukai_bocco
   MTK_SOC := mt7620a
-  IMAGE_SIZE := $(ralink_default_fw_size_8M)
+  IMAGE_SIZE := 7872k
   DEVICE_VENDOR := YUKAI Engineering
   DEVICE_MODEL := BOCCO
   DEVICE_PACKAGES := kmod-sound-core kmod-sound-mt7620 kmod-i2c-ralink
@@ -936,7 +936,7 @@ TARGET_DEVICES += yukai_bocco
 
 define Device/zbtlink_we1026-5g-16m
   MTK_SOC := mt7620a
-  IMAGE_SIZE := $(ralink_default_fw_size_16M)
+  IMAGE_SIZE := 16064k
   DEVICE_VENDOR := Zbtlink
   DEVICE_MODEL := ZBT-WE1026-5G
   DEVICE_VARIANT := 16M
@@ -986,7 +986,7 @@ TARGET_DEVICES += zbtlink_zbt-we2026
 
 define Device/zbtlink_zbt-we826-16m
   MTK_SOC := mt7620a
-  IMAGE_SIZE := $(ralink_default_fw_size_16M)
+  IMAGE_SIZE := 16064k
   DEVICE_VENDOR := Zbtlink
   DEVICE_MODEL := ZBT-WE826
   DEVICE_VARIANT := 16M
@@ -997,7 +997,7 @@ TARGET_DEVICES += zbtlink_zbt-we826-16m
 
 define Device/zbtlink_zbt-we826-32m
   MTK_SOC := mt7620a
-  IMAGE_SIZE := $(ralink_default_fw_size_32M)
+  IMAGE_SIZE := 32448k
   DEVICE_VENDOR := Zbtlink
   DEVICE_MODEL := ZBT-WE826
   DEVICE_VARIANT := 32M
@@ -1018,7 +1018,7 @@ TARGET_DEVICES += zbtlink_zbt-we826-e
 
 define Device/zbtlink_zbt-wr8305rt
   MTK_SOC := mt7620n
-  IMAGE_SIZE := $(ralink_default_fw_size_8M)
+  IMAGE_SIZE := 7872k
   DEVICE_VENDOR := Zbtlink
   DEVICE_MODEL := ZBT-WR8305RT
   DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci
@@ -1028,7 +1028,7 @@ TARGET_DEVICES += zbtlink_zbt-wr8305rt
 
 define Device/zte_q7
   MTK_SOC := mt7620a
-  IMAGE_SIZE := $(ralink_default_fw_size_8M)
+  IMAGE_SIZE := 7872k
   DEVICE_VENDOR := ZTE
   DEVICE_MODEL := Q7
   DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci
@@ -1038,7 +1038,7 @@ TARGET_DEVICES += zte_q7
 
 define Device/zyxel_keenetic-omni
   MTK_SOC := mt7620n
-  IMAGE_SIZE := $(ralink_default_fw_size_8M)
+  IMAGE_SIZE := 7872k
   DEVICE_VENDOR := ZyXEL
   DEVICE_MODEL := Keenetic Omni
   DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci kmod-usb-ledtrig-usbport
@@ -1051,7 +1051,7 @@ TARGET_DEVICES += zyxel_keenetic-omni
 
 define Device/zyxel_keenetic-omni-ii
   MTK_SOC := mt7620n
-  IMAGE_SIZE := $(ralink_default_fw_size_8M)
+  IMAGE_SIZE := 7872k
   DEVICE_VENDOR := ZyXEL
   DEVICE_MODEL := Keenetic Omni II
   DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci kmod-usb-ledtrig-usbport
@@ -1064,7 +1064,7 @@ TARGET_DEVICES += zyxel_keenetic-omni-ii
 
 define Device/zyxel_keenetic-viva
   MTK_SOC := mt7620a
-  IMAGE_SIZE := $(ralink_default_fw_size_16M)
+  IMAGE_SIZE := 16064k
   DEVICE_VENDOR := ZyXEL
   DEVICE_MODEL := Keenetic Viva
   DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci kmod-usb-ledtrig-usbport kmod-switch-rtl8366-smi kmod-switch-rtl8367b