diff mbox series

[OpenWrt-Devel] ramips: rt305x: Disable image generation for small devices

Message ID 1551447642-31393-1-git-send-email-ynezz@true.cz
State Not Applicable
Headers show
Series [OpenWrt-Devel] ramips: rt305x: Disable image generation for small devices | expand

Commit Message

Petr Štetiar March 1, 2019, 1:40 p.m. UTC 
It was reported in FS#2110 that there are currently no images being
generated for rt305x as a result of a build breakage due to image
generation.

I've found out, that plenty of the devices have fallen of a cliff
already due to the small flash, so this patch disables image generation
for those devices.

Signed-off-by: Petr Štetiar <ynezz@true.cz>
---
 target/linux/ramips/image/rt305x.mk | 53 ++++++++++++++++++++++++++++---------
 1 file changed, 40 insertions(+), 13 deletions(-)

Comments

Petr Štetiar March 3, 2019, 12:46 a.m. UTC | #1 
Petr Štetiar <ynezz@true.cz> [2019-03-01 14:40:42]:

> It was reported in FS#2110 that there are currently no images being
> generated for rt305x as a result of a build breakage due to image
> generation.
> 
> I've found out, that plenty of the devices have fallen of a cliff
> already due to the small flash, so this patch disables image generation
> for those devices.

I just looked at this again now, and I've found out, that there are snapshot
images available for those devices, so I've tried to build again with
config.seed from snapshots and indeed, I was able to build them as well - it
seems I was simply missing `CONFIG_TARGET_PER_DEVICE_ROOTFS=y` in my local
config, so the produced images were quite bigger.

So this patch is wrong as it is, since it would disable image generation for
release builds which is what we want, but also for snapshots which isn't
wanted.

I'm wondering what would be the proper way of fixing this.  Should we add
config option like `CONFIG_TARGET_BUILD_IMAGE_MIN_SIZE=3900k` which would
allow us to filter out (using check-size?) devices in TARGET_DEVICES with
IMAGE_SIZE below this defined treshold?

-- ynezz
diff mbox series

Patch

diff --git a/target/linux/ramips/image/rt305x.mk b/target/linux/ramips/image/rt305x.mk
index 163726e..18ab730 100644
--- a/target/linux/ramips/image/rt305x.mk
+++ b/target/linux/ramips/image/rt305x.mk
@@ -40,6 +40,7 @@  TARGET_DEVICES += 3g150b
 define Device/3g300m
   DTS := 3G300M
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
+  IMAGES :=
   UIMAGE_NAME := 3G150M_SPI Kernel Image
   DEVICE_TITLE := Tenda 3G300M
   DEVICE_PACKAGES := kmod-usb-core kmod-usb-dwc2 kmod-usb-ledtrig-usbport
@@ -49,6 +50,7 @@  TARGET_DEVICES += 3g300m
 define Device/3g-6200n
   DTS := 3G-6200N
   IMAGE_SIZE := 3648k
+  IMAGES :=
   IMAGE/sysupgrade.bin := append-kernel | append-rootfs | \
 	edimax-header -s CSYS -m 3G62 -f 0x50000 -S 0x01100000 | pad-rootfs | \
 	append-metadata | check-size $$$$(IMAGE_SIZE)
@@ -58,6 +60,7 @@  TARGET_DEVICES += 3g-6200n
 
 define Device/3g-6200nl
   DTS := 3G-6200NL
+  IMAGES :=
   IMAGE_SIZE := 3648k
   IMAGE/sysupgrade.bin := append-kernel | append-rootfs | \
 	edimax-header -s CSYS -m 3G62 -f 0x50000 -S 0x01100000 | pad-rootfs | \
@@ -69,7 +72,7 @@  TARGET_DEVICES += 3g-6200nl
 define Device/a5-v11
   DTS := A5-V11
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
-  IMAGES += factory.bin
+  IMAGES :=
   IMAGE/factory.bin := \
 	$$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | poray-header -B A5-V11 -F 4M
   DEVICE_TITLE := A5-V11
@@ -80,6 +83,7 @@  TARGET_DEVICES += a5-v11
 define Device/air3gii
   DTS := AIR3GII
   BLOCKSIZE := 64k
+  IMAGES :=
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
   DEVICE_TITLE := AirLive Air3GII
 endef
@@ -87,6 +91,7 @@  TARGET_DEVICES += air3gii
 
 define Device/all0256n-4M
   DTS := ALL0256N-4M
+  IMAGES :=
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
   DEVICE_TITLE := Allnet ALL0256N (4MB)
   DEVICE_PACKAGES := rssileds
@@ -145,6 +150,7 @@  TARGET_DEVICES += atp-52b
 
 define Device/awm002-evb-4M
   DTS := AWM002-EVB-4M
+  IMAGES :=
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
   DEVICE_TITLE := AsiaRF AWM002-EVB (4M)
   DEVICE_PACKAGES := kmod-usb-core kmod-usb-ohci kmod-usb2 \
@@ -193,6 +199,7 @@  TARGET_DEVICES += carambola
 define Device/d105
   DTS := D105
   BLOCKSIZE := 64k
+  IMAGES :=
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
   DEVICE_TITLE := Huawei D105
 endef
@@ -212,6 +219,7 @@  TARGET_DEVICES += dap-1350
 
 define Device/dcs-930
   DTS := DCS-930
+  IMAGES :=
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
   DEVICE_TITLE := D-Link DCS-930
   DEVICE_PACKAGES := kmod-video-core kmod-video-uvc kmod-sound-core kmod-usb-audio kmod-usb-core kmod-usb-dwc2
@@ -220,6 +228,7 @@  TARGET_DEVICES += dcs-930
 
 define Device/dcs-930l-b1
   DTS := DCS-930L-B1
+  IMAGES :=
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
   DEVICE_TITLE := D-Link DCS-930L B1
   DEVICE_PACKAGES := kmod-video-core kmod-video-uvc kmod-sound-core kmod-usb-audio kmod-usb-core kmod-usb-ohci kmod-usb2
@@ -228,8 +237,8 @@  TARGET_DEVICES += dcs-930l-b1
 
 define Device/dir-300-b1
   DTS := DIR-300-B1
+  IMAGES :=
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
-  IMAGES += factory.bin
   IMAGE/factory.bin := \
 	$$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | wrg-header wrgn23_dlwbr_dir300b
   DEVICE_TITLE := D-Link DIR-300 B1
@@ -254,7 +263,7 @@  define Device/dir-600-b1
   DTS := DIR-600-B1
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
   SUPPORTED_DEVICES := dir-600-b1 dir-600-b2
-  IMAGES += factory.bin
+  IMAGES :=
   IMAGE/factory.bin := \
 	$$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | wrg-header wrgn23_dlwbr_dir600b
   DEVICE_TITLE := D-Link DIR-600 B1/B2
@@ -275,8 +284,8 @@  TARGET_DEVICES += dir-610-a1
 
 define Device/dir-615-d
   DTS := DIR-615-D
+  IMAGES :=
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
-  IMAGES += factory.bin
   IMAGE/factory.bin := \
 	$$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | wrg-header wrgn23_dlwbr_dir615d
   DEVICE_TITLE := D-Link DIR-615 D
@@ -327,6 +336,7 @@  TARGET_DEVICES += dwr-512-b
 define Device/esr-9753
   DTS := ESR-9753
   BLOCKSIZE := 64k
+  IMAGES :=
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
   DEVICE_TITLE := EnGenius ESR-9753
 endef
@@ -404,7 +414,7 @@  TARGET_DEVICES += ip2202
 define Device/jhr-n805r
   DTS := JHR-N805R
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
-  IMAGES += factory.bin
+  IMAGES :=
   IMAGE/factory.bin := \
 	$$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | jcg-header 29.24
   DEVICE_TITLE := JCG JHR-N805R
@@ -414,7 +424,7 @@  TARGET_DEVICES += jhr-n805r
 define Device/jhr-n825r
   DTS := JHR-N825R
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
-  IMAGES += factory.bin
+  IMAGES :=
   IMAGE/factory.bin := \
 	$$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | jcg-header 23.24
   DEVICE_TITLE := JCG JHR-N825R
@@ -424,7 +434,7 @@  TARGET_DEVICES += jhr-n825r
 define Device/jhr-n926r
   DTS := JHR-N926R
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
-  IMAGES += factory.bin
+  IMAGES :=
   IMAGE/factory.bin := \
 	$$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | jcg-header 25.24
   DEVICE_TITLE := JCG JHR-N926R
@@ -444,7 +454,7 @@  TARGET_DEVICES += m2m
 define Device/m3
   DTS := M3
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
-  IMAGES += factory.bin
+  IMAGES :=
   IMAGE/factory.bin := \
 	$$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | poray-header -B M3 -F 4M
   DEVICE_TITLE := Poray M3
@@ -456,7 +466,7 @@  TARGET_DEVICES += m3
 define Device/m4-4M
   DTS := M4-4M
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
-  IMAGES += factory.bin
+  IMAGES :=
   IMAGE/factory.bin := \
 	$$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | poray-header -B M4 -F 4M
   DEVICE_TITLE := Poray M4 (4MB)
@@ -520,6 +530,7 @@  TARGET_DEVICES += mr-102n
 define Device/mzk-dp150n
   DTS := MZK-DP150N
   BLOCKSIZE := 64k
+  IMAGES :=
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
   DEVICE_TITLE := Planex MZK-DP150N
   DEVICE_PACKAGES := kmod-spi-dev
@@ -529,7 +540,7 @@  TARGET_DEVICES += mzk-dp150n
 define Device/mzk-w300nh2
   DTS := MZK-W300NH2
   IMAGE_SIZE := 3648k
-  IMAGES += factory.bin
+  IMAGES :=
   IMAGE/factory.bin := $$(sysupgrade_bin) | \
 	edimax-header -s CSYS -m RN52 -f 0x50000 -S 0xc0000
   DEVICE_TITLE := Planex MZK-W300NH2
@@ -545,6 +556,7 @@  TARGET_DEVICES += mzk-wdpr
 define Device/nbg-419n
   DTS := NBG-419N
   BLOCKSIZE := 64k
+  IMAGES :=
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
   DEVICE_TITLE := ZyXEL NBG-419N
 endef
@@ -585,6 +597,7 @@  TARGET_DEVICES += nixcore-x1-16M
 
 define Device/nw718
   DTS := NW718
+  IMAGES :=
   IMAGE_SIZE := 3712k
   UIMAGE_NAME:= ARA1B4NCRNW718;1
   DEVICE_TITLE := Netcore NW718
@@ -593,6 +606,7 @@  TARGET_DEVICES += nw718
 
 define Device/psr-680w
   DTS := PSR-680W
+  IMAGES :=
   BLOCKSIZE := 64k
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
   DEVICE_TITLE := Petatel PSR-680W Wireless 3G Router
@@ -608,6 +622,7 @@  TARGET_DEVICES += pwh2004
 
 define Device/px-4885-4M
   DTS := PX-4885-4M
+  IMAGES :=
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
   DEVICE_TITLE := 7Links PX-4885 (4M)
   DEVICE_PACKAGES := kmod-usb-core kmod-usb-dwc2 kmod-usb2 kmod-usb-ohci \
@@ -652,6 +667,7 @@  TARGET_DEVICES += rt-g32-b1
 define Device/rt-n10-plus
   DTS := RT-N10-PLUS
   BLOCKSIZE := 64k
+  IMAGES :=
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
   DEVICE_TITLE := Asus RT-N10+
 endef
@@ -674,6 +690,7 @@  TARGET_DEVICES += rut5xx
 define Device/sl-r7205
   DTS := SL-R7205
   BLOCKSIZE := 64k
+  IMAGES :=
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
   DEVICE_TITLE := Skyline SL-R7205 Wireless 3G Router
 endef
@@ -682,6 +699,7 @@  TARGET_DEVICES += sl-r7205
 define Device/tew-638apb-v2
   DTS := TEW-638APB-V2
   BLOCKSIZE := 64k
+  IMAGES :=
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
   IMAGE/sysupgrade.bin := $$(sysupgrade_bin) | umedia-header 0x026382 | \
         append-metadata | check-size $$$$(IMAGE_SIZE)
@@ -698,6 +716,7 @@  TARGET_DEVICES += tew-714tru
 define Device/ur-326n4g
   DTS := UR-326N4G
   BLOCKSIZE := 64k
+  IMAGES :=
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
   DEVICE_TITLE := UPVEL UR-326N4G
   DEVICE_PACKAGES := kmod-usb-core kmod-usb-dwc2 kmod-usb-ledtrig-usbport
@@ -714,6 +733,7 @@  TARGET_DEVICES += ur-336un
 define Device/v22rw-2x2
   DTS := V22RW-2X2
   BLOCKSIZE := 64k
+  IMAGES :=
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
   DEVICE_TITLE := Ralink AP-RT3052-V22RW-2X2
 endef
@@ -743,6 +763,7 @@  TARGET_DEVICES += vocore-16M
 
 define Device/w150m
   DTS := W150M
+  IMAGES :=
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
   UIMAGE_NAME:= W150M Kernel Image
   DEVICE_TITLE := Tenda W150M
@@ -751,6 +772,7 @@  TARGET_DEVICES += w150m
 
 define Device/w306r-v20
   DTS := W306R_V20
+  IMAGES :=
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
   UIMAGE_NAME:= linkn Kernel Image
   DEVICE_TITLE := Tenda W306R V2.0
@@ -766,6 +788,7 @@  TARGET_DEVICES += w502u
 define Device/wcr-150gn
   DTS := WCR150GN
   BLOCKSIZE := 64k
+  IMAGES :=
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
   DEVICE_TITLE := Sparklan WCR-150GN
 endef
@@ -776,7 +799,7 @@  define Device/whr-g300n
   BLOCKSIZE := 64k
   IMAGE_SIZE := 3801088
   DEVICE_TITLE := Buffalo WHR-G300N
-  IMAGES += tftp.bin
+  IMAGES :=
   IMAGE/tftp.bin := $$(sysupgrade_bin) | \
     check-size $$$$(IMAGE_SIZE) | buffalo-tftp-header
 endef
@@ -817,6 +840,7 @@  define Device/wl-351
   DTS := WL-351
   BLOCKSIZE := 64k
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
+  IMAGES :=
   DEVICE_TITLE := Sitecom WL-351 v1
   DEVICE_PACKAGES := kmod-switch-rtl8366rb kmod-swconfig swconfig
 endef
@@ -825,7 +849,7 @@  TARGET_DEVICES += wl-351
 define Device/wnce2001
   DTS := WNCE2001
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
-  IMAGES += factory.bin factory-NA.bin
+  IMAGES :=
   IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \
 	dap-header -s RT3052-AP-WNCE2001-3 -r WW -v 1.0.0.99
   IMAGE/factory-NA.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \
@@ -836,6 +860,7 @@  TARGET_DEVICES += wnce2001
 
 define Device/wr512-3gn-4M
   DTS := WR512-3GN-4M
+  IMAGES :=
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
   DEVICE_TITLE := WR512-3GN (4M)
 endef
@@ -856,7 +881,7 @@  TARGET_DEVICES += wr6202
 define Device/wt1520-4M
   DTS := WT1520-4M
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
-  IMAGES += factory.bin
+  IMAGES :=
   IMAGE/factory.bin := \
 	$$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | poray-header -B WT1520 -F 4M
   DEVICE_TITLE := Nexx WT1520 (4MB)
@@ -896,6 +921,7 @@  TARGET_DEVICES += x8
 define Device/xdxrn502j
   DTS := XDXRN502J
   BLOCKSIZE := 64k
+  IMAGES :=
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
   DEVICE_TITLE := XDX RN502J
 endef
@@ -904,6 +930,7 @@  TARGET_DEVICES += xdxrn502j
 define Device/kn
   DTS := kn
   BLOCKSIZE := 64k
+  IMAGES :=
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
   DEVICE_TITLE := ZyXEL Keenetic
   DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb-ehci kmod-usb-ledtrig-usbport