| Message ID | 20200408172522.18941-6-marek.behun@nic.cz |
|---|---|
| State | Accepted |
| Commit | c64ac3b3185aeb3846297ad7391fc6df8ecd73bf |
| Headers | show |
| Series | MVEBU ARM64 improvments + another Turris Mox patch | expand |
On 08.04.20 19:25, Marek Beh?n wrote: > Use the new a3700_fdt_fix_pcie_regions function in turris_mox.c so that > MOX boards with 4 GB RAM are fully supported. > > Signed-off-by: Marek Beh?n <marek.behun at nic.cz> Reviewed-by: Stefan Roese <sr at denx.de> Thanks, Stefan > --- > board/CZ.NIC/turris_mox/turris_mox.c | 11 +++++++++++ > 1 file changed, 11 insertions(+) > > diff --git a/board/CZ.NIC/turris_mox/turris_mox.c b/board/CZ.NIC/turris_mox/turris_mox.c > index 8e4c023103..470ea32f9c 100644 > --- a/board/CZ.NIC/turris_mox/turris_mox.c > +++ b/board/CZ.NIC/turris_mox/turris_mox.c > @@ -4,6 +4,7 @@ > */ > > #include <common.h> > +#include <asm/arch/cpu.h> > #include <asm/arch/soc.h> > #include <asm/io.h> > #include <asm/gpio.h> > @@ -104,6 +105,11 @@ int board_fix_fdt(void *blob) > return 0; > } > > + if (a3700_fdt_fix_pcie_regions(blob) < 0) { > + printf("Cannot fix PCIe regions in U-Boot's device tree!\n"); > + return 0; > + } > + > return 0; > } > #endif > @@ -708,6 +714,11 @@ int ft_board_setup(void *blob, bd_t *bd) > res = fdt_setprop_string(blob, node, "status", "okay"); > if (res < 0) > return res; > + > + /* Fix PCIe regions for devices with 4 GB RAM */ > + res = a3700_fdt_fix_pcie_regions(blob); > + if (res < 0) > + return res; > } > > /* > Viele Gr??e, Stefan
diff --git a/board/CZ.NIC/turris_mox/turris_mox.c b/board/CZ.NIC/turris_mox/turris_mox.c index 8e4c023103..470ea32f9c 100644 --- a/board/CZ.NIC/turris_mox/turris_mox.c +++ b/board/CZ.NIC/turris_mox/turris_mox.c @@ -4,6 +4,7 @@ */ #include <common.h> +#include <asm/arch/cpu.h> #include <asm/arch/soc.h> #include <asm/io.h> #include <asm/gpio.h> @@ -104,6 +105,11 @@ int board_fix_fdt(void *blob) return 0; } + if (a3700_fdt_fix_pcie_regions(blob) < 0) { + printf("Cannot fix PCIe regions in U-Boot's device tree!\n"); + return 0; + } + return 0; } #endif @@ -708,6 +714,11 @@ int ft_board_setup(void *blob, bd_t *bd) res = fdt_setprop_string(blob, node, "status", "okay"); if (res < 0) return res; + + /* Fix PCIe regions for devices with 4 GB RAM */ + res = a3700_fdt_fix_pcie_regions(blob); + if (res < 0) + return res; } /*
Use the new a3700_fdt_fix_pcie_regions function in turris_mox.c so that MOX boards with 4 GB RAM are fully supported. Signed-off-by: Marek Beh?n <marek.behun at nic.cz> --- board/CZ.NIC/turris_mox/turris_mox.c | 11 +++++++++++ 1 file changed, 11 insertions(+)