| Message ID | 20dd23821118999c6fec2bad52ea446d1a66fefb.1683034376.git.michal.simek@amd.com |
|---|---|
| State | Accepted |
| Commit | 5ac5794afb3699047a4f58f20627df5ac7ba594c |
| Headers | show |
| Series | arm64: zynqmp: Misc zynqmp changes | expand |
On 5/2/23 15:35, Michal Simek wrote: > From: Amit Kumar Mahapatra <amit.kumar-mahapatra@xilinx.com> > > Update MTD partitions of Kria device trees to allocate 128KB of QSPI > memory for secure OS. Increased "SHA256" partition size & changed > starting address of "User" partition to accommodate the new partition > "Secure OS Storage" > > Signed-off-by: Amit Kumar Mahapatra <amit.kumar-mahapatra@xilinx.com> > Signed-off-by: Michal Simek <michal.simek@amd.com> > --- > > arch/arm64/boot/dts/xilinx/zynqmp-sm-k26-revA.dts | 12 ++++++++---- > 1 file changed, 8 insertions(+), 4 deletions(-) > > diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-sm-k26-revA.dts b/arch/arm64/boot/dts/xilinx/zynqmp-sm-k26-revA.dts > index d3c6a9feb114..5fbc2fbd2638 100644 > --- a/arch/arm64/boot/dts/xilinx/zynqmp-sm-k26-revA.dts > +++ b/arch/arm64/boot/dts/xilinx/zynqmp-sm-k26-revA.dts > @@ -83,7 +83,7 @@ &uart1 { /* MIO36/MIO37 */ > > &qspi { /* MIO 0-5 - U143 */ > status = "okay"; > - flash@0 { /* MT25QU512A */ > + spi_flash: flash@0 { /* MT25QU512A */ > compatible = "mt25qu512a", "jedec,spi-nor"; /* 64MB */ > #address-cells = <1>; > #size-cells = <1>; > @@ -161,13 +161,17 @@ partition@2220000 { > }; > partition@2240000 { > label = "SHA256"; > - reg = <0x2240000 0x10000>; /* 256B but 64KB sector */ > + reg = <0x2240000 0x40000>; /* 256B but 256KB sector */ > read-only; > lock; > }; > - partition@2250000 { > + partition@2280000 { > + label = "Secure OS Storage"; > + reg = <0x2280000 0x20000>; /* 128KB */ > + }; > + partition@22A0000 { > label = "User"; > - reg = <0x2250000 0x1db0000>; /* 29.5 MB */ > + reg = <0x22A0000 0x1d60000>; /* 29.375 MB */ > }; > }; > }; Applied. M
diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-sm-k26-revA.dts b/arch/arm64/boot/dts/xilinx/zynqmp-sm-k26-revA.dts index d3c6a9feb114..5fbc2fbd2638 100644 --- a/arch/arm64/boot/dts/xilinx/zynqmp-sm-k26-revA.dts +++ b/arch/arm64/boot/dts/xilinx/zynqmp-sm-k26-revA.dts @@ -83,7 +83,7 @@ &uart1 { /* MIO36/MIO37 */ &qspi { /* MIO 0-5 - U143 */ status = "okay"; - flash@0 { /* MT25QU512A */ + spi_flash: flash@0 { /* MT25QU512A */ compatible = "mt25qu512a", "jedec,spi-nor"; /* 64MB */ #address-cells = <1>; #size-cells = <1>; @@ -161,13 +161,17 @@ partition@2220000 { }; partition@2240000 { label = "SHA256"; - reg = <0x2240000 0x10000>; /* 256B but 64KB sector */ + reg = <0x2240000 0x40000>; /* 256B but 256KB sector */ read-only; lock; }; - partition@2250000 { + partition@2280000 { + label = "Secure OS Storage"; + reg = <0x2280000 0x20000>; /* 128KB */ + }; + partition@22A0000 { label = "User"; - reg = <0x2250000 0x1db0000>; /* 29.5 MB */ + reg = <0x22A0000 0x1d60000>; /* 29.375 MB */ }; }; };