[OpenWrt-Devel] ipq40xx: convert IMAGE_SIZE/KERNEL_SIZE/BLOCKSIZE to kiB
diff mbox series

Message ID 20191030184417.21897-1-freifunk@adrianschmutzler.de
State Accepted
Delegated to: John Crispin
Headers show
Series
  • [OpenWrt-Devel] ipq40xx: convert IMAGE_SIZE/KERNEL_SIZE/BLOCKSIZE to kiB
Related show

Commit Message

Adrian Schmutzler Oct. 30, 2019, 6:44 p.m. UTC
This cosmetical patch converts IMAGE_SIZE, KERNEL_SIZE and
BLOCKSIZE definitions to kilobytes, as this is consistent and
easier to read/type.

An exception was made for asus_rt-ac58u, where the IMAGE_SIZE of
20439364 cannot be divided by 1024 (and also does not seem to
match anything in DTS).

Build-tested for all devices.

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
---
 target/linux/ipq40xx/image/Makefile | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

Patch
diff mbox series

diff --git a/target/linux/ipq40xx/image/Makefile b/target/linux/ipq40xx/image/Makefile
index ed46bca649..8dd960bc1c 100644
--- a/target/linux/ipq40xx/image/Makefile
+++ b/target/linux/ipq40xx/image/Makefile
@@ -124,7 +124,7 @@  define Device/avm_fritzbox-4040
 	DEVICE_MODEL := FRITZ!Box 4040
 	DEVICE_DTS := qcom-ipq4018-fritz4040
 	BOARD_NAME := fritz4040
-	IMAGE_SIZE := 29753344
+	IMAGE_SIZE := 29056k
 	UBOOT_PATH := $(STAGING_DIR_IMAGE)/uboot-fritz4040.bin
 	UBOOT_PARTITION_SIZE := 524288
 	IMAGES = eva.bin sysupgrade.bin
@@ -209,7 +209,7 @@  define Device/engenius_ens620ext
 	FW_VER := 3.1.2
 	FW_VER_NEW := 3.5.6
 	CW_VER := 1.8.99
-	IMAGE_SIZE := 21823488
+	IMAGE_SIZE := 21312k
 	KERNEL_SIZE := 5120k
 	FILESYSTEMS := squashfs
 	IMAGES := sysupgrade.bin factory_30.bin factory_35.bin
@@ -260,8 +260,8 @@  define Device/linksys_ea6350v3
 	DEVICE_DTS := qcom-ipq4018-ea6350v3
 	BLOCKSIZE := 128k
 	PAGESIZE := 2048
-	KERNEL_SIZE := 3145728
-	IMAGE_SIZE := 38797312
+	KERNEL_SIZE := 3072k
+	IMAGE_SIZE := 37888k
 	UBINIZE_OPTS := -E 5
 	IMAGES := factory.bin sysupgrade.bin
 	IMAGE/factory.bin := append-kernel | append-uImage-fakehdr filesystem | pad-to $$$${KERNEL_SIZE} | append-ubi | linksys-image type=EA6350v3
@@ -290,7 +290,7 @@  define Device/meraki_mr33
 	DEVICE_VENDOR := Cisco Meraki
 	DEVICE_MODEL := MR33
 	DEVICE_DTS := qcom-ipq4029-mr33
-	BLOCKSIZE := 131072
+	BLOCKSIZE := 128k
 	PAGESIZE := 2048
 	IMAGES = sysupgrade.bin
 	DEVICE_PACKAGES := -swconfig ath10k-firmware-qca9887-ct