| Message ID | 20231109223435.706053-2-igor.opaniuk@foundries.io |
|---|---|
| State | Accepted |
| Commit | 66a3618b9afc564ca073446a50cd6a139b741f51 |
| Delegated to: | Tom Rini |
| Headers | show |
| Series | [v1,1/2] poplar: use random mac address | expand |
On Thu, Nov 9, 2023 at 4:34 PM Igor Opaniuk <igor.opaniuk@foundries.io> wrote: > > Adjust mem layout, providing more space for linux kernel image. > > This fixes the problem: > ERROR: FDT image overlaps OS image (OS=0x30000000..0x32580000) > > Signed-off-by: Igor Opaniuk <igor.opaniuk@foundries.io> > --- Reviewed-by: Sam Protsenko <semen.protsenko@linaro.org> > > include/configs/poplar.h | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/include/configs/poplar.h b/include/configs/poplar.h > index 6e8adf9187..629b335f5d 100644 > --- a/include/configs/poplar.h > +++ b/include/configs/poplar.h > @@ -37,11 +37,11 @@ > "env_mmc_blknum=0xf80\0" \ > "env_mmc_nblks=0x80\0" \ > "kernel_addr_r=0x30000000\0" \ > - "pxefile_addr_r=0x32000000\0" \ > - "scriptaddr=0x32000000\0" \ > - "fdt_addr_r=0x32200000\0" \ > + "pxefile_addr_r=0x33000000\0" \ > + "scriptaddr=0x33000000\0" \ > + "fdt_addr_r=0x33200000\0" \ > "fdtfile=hisilicon/hi3798cv200-poplar.dtb\0" \ > - "ramdisk_addr_r=0x32400000\0" \ > + "ramdisk_addr_r=0x33400000\0" \ > BOOTENV > > #endif /* _POPLAR_H_ */ > -- > 2.34.1 >
On Thu, Nov 09, 2023 at 11:34:35PM +0100, Igor Opaniuk wrote: > Adjust mem layout, providing more space for linux kernel image. > > This fixes the problem: > ERROR: FDT image overlaps OS image (OS=0x30000000..0x32580000) > > Signed-off-by: Igor Opaniuk <igor.opaniuk@foundries.io> > Reviewed-by: Sam Protsenko <semen.protsenko@linaro.org> Applied to u-boot/next, thanks!
diff --git a/include/configs/poplar.h b/include/configs/poplar.h index 6e8adf9187..629b335f5d 100644 --- a/include/configs/poplar.h +++ b/include/configs/poplar.h @@ -37,11 +37,11 @@ "env_mmc_blknum=0xf80\0" \ "env_mmc_nblks=0x80\0" \ "kernel_addr_r=0x30000000\0" \ - "pxefile_addr_r=0x32000000\0" \ - "scriptaddr=0x32000000\0" \ - "fdt_addr_r=0x32200000\0" \ + "pxefile_addr_r=0x33000000\0" \ + "scriptaddr=0x33000000\0" \ + "fdt_addr_r=0x33200000\0" \ "fdtfile=hisilicon/hi3798cv200-poplar.dtb\0" \ - "ramdisk_addr_r=0x32400000\0" \ + "ramdisk_addr_r=0x33400000\0" \ BOOTENV #endif /* _POPLAR_H_ */
Adjust mem layout, providing more space for linux kernel image. This fixes the problem: ERROR: FDT image overlaps OS image (OS=0x30000000..0x32580000) Signed-off-by: Igor Opaniuk <igor.opaniuk@foundries.io> --- include/configs/poplar.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)