[OpenWrt-Devel] [PATCH 1/3] ath79: tidy up and fix IMAGE_SIZE for Ubiquiti devices

[John Crispin]

On 06/08/2019 15:10, Adrian Schmutzler wrote:
> This addresses IMAGE_SIZE inconsistencies in generic_ubnt.mk by:
> 
> 1. (cosmetical) Move IMAGE_SIZE out of top definition ("ubnt"),
>     since despite two all subdefinition have different values.
> 2. (change) Fix IMAGE_SIZE for ubnt-xm and ubnt-bz (7552k->7488k).
> 3. (cosmetical) Move IMAGE_SIZE of ubnt-wa devices to parent node
>     since all have same size (it is defined in parent DTSI ...).
> 
> Signed-off-by: Adrian Schmutzler <freifunk at adrianschmutzler.de>

series no longer applies I am afraid, could you rebase/send them please ?
	John

> ---
>   target/linux/ath79/image/generic-ubnt.mk | 9 ++++-----
>   1 file changed, 4 insertions(+), 5 deletions(-)
> 
> diff --git a/target/linux/ath79/image/generic-ubnt.mk b/target/linux/ath79/image/generic-ubnt.mk
> index 6db083861f..0dfde6915d 100644
> --- a/target/linux/ath79/image/generic-ubnt.mk
> +++ b/target/linux/ath79/image/generic-ubnt.mk
> @@ -36,7 +36,6 @@ endef
>   define Device/ubnt
>     DEVICE_VENDOR := Ubiquiti
>     DEVICE_PACKAGES := kmod-usb-core kmod-usb2
> -  IMAGE_SIZE := 7552k
>     UBNT_BOARD := XM
>     UBNT_VERSION := 6.0.0
>     IMAGES += factory.bin
> @@ -47,6 +46,7 @@ endef
>   define Device/ubnt-xm
>     $(Device/ubnt)
>     DEVICE_PACKAGES += kmod-usb-ohci rssileds
> +  IMAGE_SIZE := 7448k
>     UBNT_TYPE := XM
>     UBNT_CHIP := ar7240
>     ATH_SOC := ar7241
> @@ -55,6 +55,7 @@ endef
>   
>   define Device/ubnt-bz
>     $(Device/ubnt)
> +  IMAGE_SIZE := 7448k
>     UBNT_TYPE := BZ
>     UBNT_CHIP := ar7240
>     ATH_SOC := ar7241
> @@ -62,6 +63,7 @@ endef
>   
>   define Device/ubnt-wa
>     $(Device/ubnt)
> +  IMAGE_SIZE := 15744k
>     UBNT_TYPE := WA
>     UBNT_CHIP := ar934x
>     UBNT_BOARD := WA
> @@ -71,6 +73,7 @@ endef
>   
>   define Device/ubnt-xw
>     $(Device/ubnt)
> +  IMAGE_SIZE := 7552k
>     UBNT_TYPE := XW
>     UBNT_CHIP := ar934x
>     UBNT_BOARD := XM
> @@ -128,7 +131,6 @@ define Device/ubnt_lap-120
>     DEVICE_MODEL := LiteAP ac
>     DEVICE_VARIANT := LAP-120
>     DEVICE_PACKAGES += kmod-ath10k-ct ath10k-firmware-qca988x-ct
> -  IMAGE_SIZE := 15744k
>     IMAGE/factory.bin := $$(IMAGE/sysupgrade.bin) | mkubntimage-split
>   endef
>   TARGET_DEVICES += ubnt_lap-120
> @@ -137,7 +139,6 @@ define Device/ubnt_nanobeam-ac
>     $(Device/ubnt-wa)
>     DEVICE_MODEL := NanoBeam AC
>     DEVICE_PACKAGES += kmod-ath10k-ct ath10k-firmware-qca988x-ct
> -  IMAGE_SIZE := 15744k
>     IMAGE/factory.bin := $$(IMAGE/sysupgrade.bin) | mkubntimage-split
>   endef
>   TARGET_DEVICES += ubnt_nanobeam-ac
> @@ -146,7 +147,6 @@ define Device/ubnt_nanostation-ac
>     $(Device/ubnt-wa)
>     DEVICE_MODEL := Nanostation AC
>     DEVICE_PACKAGES += kmod-ath10k-ct ath10k-firmware-qca988x-ct
> -  IMAGE_SIZE := 15744k
>     IMAGE/factory.bin := $$(IMAGE/sysupgrade.bin) | mkubntimage-split
>   endef
>   TARGET_DEVICES += ubnt_nanostation-ac
> @@ -155,7 +155,6 @@ define Device/ubnt_nanostation-ac-loco
>     $(Device/ubnt-wa)
>     DEVICE_MODEL := Nanostation AC loco
>     DEVICE_PACKAGES += kmod-ath10k-ct ath10k-firmware-qca988x-ct
> -  IMAGE_SIZE := 15744k
>     IMAGE/factory.bin := $$(IMAGE/sysupgrade.bin) | mkubntimage-split
>   endef
>   TARGET_DEVICES += ubnt_nanostation-ac-loco
> 


_______________________________________________
openwrt-devel mailing list
openwrt-devel at lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel