Linux v5.8-rc1 adds partitions to the flash@0 node, which now overlap
with the partitions we define and resulting in errors:
ERROR: m25p0.barebox: New partition m25p0.barebox conflicts
with m25p0.at91bootstrap
ERROR: m25p0.barebox-environment: New partition
m25p0.barebox-environment conflicts with m25p0.bootloader
We don't want to reuse those partitions as their name may and probably
will change (they have leading zeroes in the unit address).
We could use the &{/path/to/partition} syntax, but that might be broken
soon as well, as the nodes aren't inside a partitions node with a
"fixed-partitions" compatible.
The busses also don't align with the yaml schema and might be renamed.
Nuke the full flash@0 node and supply ours and avoid these problems.
The offsets of the partitions have been adjusted to coincide with the
upstream offsets for second stage bootloader and environment.
Signed-off-by: Ahmad Fatoum <ahmad@xxxxxx>
---
Hello Sascha,
The brekage doesn't seem to end..
if possible please reorder before v5.8-rc1 dts/ sync.
---
arch/arm/dts/at91-sama5d27_som1_ek.dts | 28 +++++++++++++++++---------
1 file changed, 19 insertions(+), 9 deletions(-)
diff --git a/arch/arm/dts/at91-sama5d27_som1_ek.dts b/arch/arm/dts/at91-sama5d27_som1_ek.dts
index befee89ad78a..97a326dd2b26 100644
--- a/arch/arm/dts/at91-sama5d27_som1_ek.dts
+++ b/arch/arm/dts/at91-sama5d27_som1_ek.dts
@@ -31,18 +31,28 @@
};
&qspi1 {
+ /delete-node/ flash@0;
+
flash@0 {
- #address-cells = <1>;
- #size-cells = <1>;
+ compatible = "jedec,spi-nor";
+ reg = <0>;
+ spi-max-frequency = <80000000>;
+ m25p,fast-read;
- partition@0 {
- label = "barebox";
- reg = <0x0 0x80000>;
- };
+ partitions {
+ compatible = "fixed-partitions";
+ #address-cells = <1>;
+ #size-cells = <1>;
+
+ barebox@40000 {
+ label = "barebox";
+ reg = <0x40000 0xc0000>;
+ };
- barebox_env: partition@80000 {
- label = "barebox-environment";
- reg = <0x80000 0x80000>;
+ barebox_env: barebox-env@100000 {
+ label = "barebox-environment";
+ reg = <0x100000 0x40000>;
+ };
};
};
};
--
2.27.0
_______________________________________________
barebox mailing list
barebox@xxxxxxxxxxxxxxxxxxx
http://lists.infradead.org/mailman/listinfo/barebox
