Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ARM: dts: aspeed: Grow u-boot partition 64MiB OpenBMC flash layout

Aspeed AST2600 u-boot requires 600KiB+ flash space. Sharing the same
openbmc-flash-layout-64.dtsi requires to resize the flash partition.

The updated flash layout as follows:
- u-boot: 896 KiB
- u-boot-env: 128 KiB
- kernel: 9MiB
- rofs: 32 MiB
- rwfs: 22 MiB

Signed-off-by: Troy Lee <troy_lee@aspeedtech.com>
Reviewed-by: Joel Stanley <joel@jms.id.au>
Link: https://lore.kernel.org/r/20210316085932.2601-1-troy_lee@aspeedtech.com
Signed-off-by: Joel Stanley <joel@jms.id.au>

authored by

Troy Lee and committed by
Joel Stanley
8dec60e7 959ff7f6

+10 -40
+1 -31
arch/arm/boot/dts/aspeed-ast2600-evb.dts
··· 163 163 m25p,fast-read; 164 164 label = "bmc"; 165 165 spi-max-frequency = <50000000>; 166 - 167 - partitions { 168 - compatible = "fixed-partitions"; 169 - #address-cells = <1>; 170 - #size-cells = <1>; 171 - 172 - u-boot@0 { 173 - reg = <0x0 0xe0000>; // 896KB 174 - label = "u-boot"; 175 - }; 176 - 177 - u-boot-env@e0000 { 178 - reg = <0xe0000 0x20000>; // 128KB 179 - label = "u-boot-env"; 180 - }; 181 - 182 - kernel@100000 { 183 - reg = <0x100000 0x900000>; // 9MB 184 - label = "kernel"; 185 - }; 186 - 187 - rofs@a00000 { 188 - reg = <0xa00000 0x2000000>; // 32MB 189 - label = "rofs"; 190 - }; 191 - 192 - rwfs@6000000 { 193 - reg = <0x2a00000 0x1600000>; // 22MB 194 - label = "rwfs"; 195 - }; 196 - }; 166 + #include "openbmc-flash-layout-64.dtsi" 197 167 }; 198 168 }; 199 169
+9 -9
arch/arm/boot/dts/openbmc-flash-layout-64.dtsi
··· 9 9 #size-cells = <1>; 10 10 11 11 u-boot@0 { 12 - reg = <0x0 0x60000>; // 384KB 12 + reg = <0x0 0xe0000>; // 896KB 13 13 label = "u-boot"; 14 14 }; 15 15 16 - u-boot-env@60000 { 17 - reg = <0x60000 0x20000>; // 128KB 16 + u-boot-env@e0000 { 17 + reg = <0xe0000 0x20000>; // 128KB 18 18 label = "u-boot-env"; 19 19 }; 20 20 21 - kernel@80000 { 22 - reg = <0x80000 0x500000>; // 5MB 21 + kernel@100000 { 22 + reg = <0x100000 0x900000>; // 9MB 23 23 label = "kernel"; 24 24 }; 25 25 26 - rofs@580000 { 27 - reg = <0x580000 0x2a80000>; // 42.5MB 26 + rofs@a00000 { 27 + reg = <0xa00000 0x2000000>; // 32MB 28 28 label = "rofs"; 29 29 }; 30 30 31 - rwfs@3000000 { 32 - reg = <0x3000000 0x1000000>; // 16MB 31 + rwfs@6000000 { 32 + reg = <0x2a00000 0x1600000>; // 22MB 33 33 label = "rwfs"; 34 34 }; 35 35 };