[PATCH 2/3] ramips: combine USW-Flex dual firmware-partitions
In order to maximize the available space on USW-Flex boards using a
dual-image partition layout, combine the two OS partitions into a single
partition.
This allows users to access more usable space for additional packages.
Don't limit the usable image size to the size of a single OS partition.
The initial installation has to be done with an older version of OpenWrt
in case the generated image exceeds the space of a single kernel
partition in the future.
Signed-off-by: David Bauer
---
target/linux/ramips/dts/mt7621_ubnt_usw-flex.dts | 8 ++--
target/linux/ramips/image/mt7621.mk | 2 +-
2 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/target/linux/ramips/dts/mt7621_ubnt_usw-flex.dts
b/target/linux/ramips/dts/mt7621_ubnt_usw-flex.dts
index e148242387..ff328bd858 100644
--- a/target/linux/ramips/dts/mt7621_ubnt_usw-flex.dts
+++ b/target/linux/ramips/dts/mt7621_ubnt_usw-flex.dts
@@ -164,14 +164,10 @@
};
partition@1a {
+ /* Combine kernel0 / kernel1 */
compatible = "denx,fit";
label = "firmware";
- reg = <0x1a 0x73>;
- };
-
- partition@8d {
- label = "kernel1";
- reg = <0x8d 0x73>;
+ reg = <0x1a 0xe6>;
};
};
};
diff --git a/target/linux/ramips/image/mt7621.mk
b/target/linux/ramips/image/mt7621.mk
index 75022f9708..36f39ece0a 100644
--- a/target/linux/ramips/image/mt7621.mk
+++ b/target/linux/ramips/image/mt7621.mk
@@ -2101,7 +2101,7 @@ define Device/ubnt_usw-flex
DEVICE_DTS_CONFIG := config@1
DEVICE_DTS_LOADADDR := 0x8700
KERNEL := kernel-bin | lzma | fit lzma $$(KDIR)/image-$$(firstword
$$(DEVICE_DTS)).dtb
- IMAGE_SIZE := 7360k
+ IMAGE_SIZE := 14720k
endef
TARGET_DEVICES += ubnt_usw-flex
--
2.35.1
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[PATCH 3/3] ath79: combine UniFi AC dual firmware-partitions
In order to maximize the available space on UniFi AC boards using a
dual-image partition layout, combine the two OS partitions into a single
partition.
This allows users to access more usable space for additional packages.
Don't limit the usable image size to the size of a single OS partition.
The initial installation has to be done with an older version of OpenWrt
in case the generated image exceeds the space of a single kernel
partition in the future.
Signed-off-by: David Bauer
---
target/linux/ath79/dts/qca9563_ubnt_unifiac.dtsi | 9 ++---
target/linux/ath79/image/generic-ubnt.mk | 2 +-
2 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/target/linux/ath79/dts/qca9563_ubnt_unifiac.dtsi
b/target/linux/ath79/dts/qca9563_ubnt_unifiac.dtsi
index 2e407c3486..6704ec983b 100644
--- a/target/linux/ath79/dts/qca9563_ubnt_unifiac.dtsi
+++ b/target/linux/ath79/dts/qca9563_ubnt_unifiac.dtsi
@@ -69,17 +69,12 @@
};
partition@7 {
+ /* Combine kernel0 & kernel1 */
label = "firmware";
- reg = <0x07 0x79>;
+ reg = <0x07 0xf2>;
compatible = "denx,uimage";
};
- partition@80 {
- label = "kernel1";
- reg = <0x80 0x79>;
- read-only;
- };
-
partition@f9 {
label = "bs";
reg = <0xf9 0x02>;
diff --git a/target/linux/ath79/image/generic-ubnt.mk
b/target/linux/ath79/image/generic-ubnt.mk
index bed043c3a7..8eeaa8de3e 100644
--- a/target/linux/ath79/image/generic-ubnt.mk
+++ b/target/linux/ath79/image/generic-ubnt.mk
@@ -229,7 +229,7 @@ TARGET_DEVICES += ubnt_unifi-ap-lr
define Device/ubnt_unifiac
DEVICE_VENDOR := Ubiquiti
SOC := qca9563
- IMAGE_SIZE := 7744k
+ IMAGE_SIZE := 15488k
DEVICE_PACKAGES := kmod-ath10k-ct ath10k-firmware-qca988x-ct
endef
--
2.35.1
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[PATCH 1/3] ath79: combine OCEDO dual firmware-partitions
In order to maximize the available space on OCEDO boards using a
dual-image partition layout, combine the two OS partitions into a single
partition.
This allows users to access more usable space for additional packages.
Don't limit the usable image size to the size of a single OS partition.
The initial installation has to be done with an older version of OpenWrt
in case the generated image exceeds the space of a single OS
partition in the future.
Signed-off-by: David Bauer
---
target/linux/ath79/dts/ar9344_ocedo_raccoon.dts | 9 ++---
target/linux/ath79/dts/qca9558_ocedo_koala.dts | 9 ++---
target/linux/ath79/dts/qca9558_ocedo_ursus.dts | 9 ++---
target/linux/ath79/image/generic.mk | 6 +++---
4 files changed, 9 insertions(+), 24 deletions(-)
diff --git a/target/linux/ath79/dts/ar9344_ocedo_raccoon.dts
b/target/linux/ath79/dts/ar9344_ocedo_raccoon.dts
index 8678315a44..11205413f4 100644
--- a/target/linux/ath79/dts/ar9344_ocedo_raccoon.dts
+++ b/target/linux/ath79/dts/ar9344_ocedo_raccoon.dts
@@ -91,15 +91,10 @@
};
partition@5 {
+ /* Dual-Flash layout combined */
compatible = "denx,uimage";
label = "firmware";
- reg = <0x05 0x74>;
- };
-
- partition@79 {
- label = "vendor";
- reg = <0x79 0x74>;
- read-only;
+ reg = <0x05 0xe8>;
};
partition@ed {
diff --git a/target/linux/ath79/dts/qca9558_ocedo_koala.dts
b/target/linux/ath79/dts/qca9558_ocedo_koala.dts
index 8441e5c9a3..85fd43699e 100644
--- a/target/linux/ath79/dts/qca9558_ocedo_koala.dts
+++ b/target/linux/ath79/dts/qca9558_ocedo_koala.dts
@@ -84,15 +84,10 @@
};
partition@5 {
+ /* Dual-Flash layout combined */
compatible = "denx,uimage";
label = "firmware";
- reg = <0x05 0x74>;
- };
-
- partition@79 {
- label = "vendor";
- reg = <0x79 0x74>;
- read-only;
+ reg = <0x05 0xe8>;
};
partition@ed {
diff --git a/target/linux/ath79/dts/qca9558_ocedo_ursus.dts
b/target/linux/ath79/dts/qca9558_ocedo_ursus.dts
index e99059df04..be958d19a0 100644
--- a/target/linux/ath79/dts/qca9558_ocedo_ursus.dts
+++ b/target/linux/ath79/dts/qca9558_ocedo_ursus.dts
@@ -55,15 +55,10 @@
};
partition@5 {
+ /* Dual-Flash layout combined */
compatible = "denx,uimage";
label = "firmware";
- reg = <0x05 0x74>;
- };
-
- partition@79 {
- label = "vendor";
- reg = <0x79 0x74>;
- read-only;
+ reg = <0x05 0xe8>;
};
partition@ed {
diff --git a/target/linux/ath79/image/generic.mk
b/target/linux/ath79/image/generic.mk
index b2e1d70403..7b237b0b6c 100644
--- a/target/linux/ath79/image/generic.mk
+++ b/target/linux/ath79/image/generic.mk
@@ -1884,7 +1884,7 @@ define Device/ocedo_koala
DEVICE_MODEL := Koala
DEVICE_PACKAGES := kmod-ath10k-ct ath10k-firmware-qca988x-ct
SUPPORTED_DEVICES += koala
- IMAGE_SIZE := 7424k
+ IMAGE_SIZE := 14848k
endef
TARGET_DEVICES += ocedo_koala
@@ -1892,7 +1892,7 @@ define Device/ocedo_raccoon
SOC := ar9344
DEVICE_VENDOR := Ocedo
DEVICE_MODEL := Raccoon
- IMAGE_SIZE := 7424k
+ IMAGE_SIZE := 14848k
endef
TARGET_DEVICES += ocedo_raccoon
@@ -1901,7 +1901,7 @@ define Device/ocedo_ursus
DEVICE_VENDOR := Ocedo
DEVICE_MODEL := Ursus
DEVICE_PACKAGES := kmod-ath10k-ct ath10k-firmware-qca988x-ct
- IMAGE_SIZE := 7424k
+ IMAGE_SIZE := 14848k
endef
TARGET_DEVICES += ocedo_ursus
--
2.35.1
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
