Message ID | 20190329123445.5164-5-marcel@ziswiler.com |
---|---|
State | Superseded |
Delegated to: | Stefano Babic |
Headers | show |
Series | colibri-imx6ull device tree enablement and driver model conversion | expand |
Reviewed-by: Igor Opaniuk <igor.opaniuk@toradex.com> On Fri, Mar 29, 2019 at 1:36 PM Marcel Ziswiler <marcel@ziswiler.com> wrote: > > From: Stefan Agner <stefan.agner@toradex.com> > > Currently $loadaddr and $fdt_addr_r point to the same address. This > might be not ideal for some distro boot scripts which make use of > $loadaddr after loading the device tree. > > Make sure the two variables point to two different addresses. Moving > $loadaddr is not entirly trivial since it is defined in mx6_common.h. > Move $fdt_addr_r and $ramdisk_addr_r by 1MiB, which should be enough > for scripts. > > Signed-off-by: Stefan Agner <stefan.agner@toradex.com> > Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> > > --- > > include/configs/apalis_imx6.h | 4 ++-- > include/configs/colibri-imx6ull.h | 4 ++-- > include/configs/colibri_imx6.h | 4 ++-- > 3 files changed, 6 insertions(+), 6 deletions(-) > > diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h > index 95dd6f9362..02ca8bf361 100644 > --- a/include/configs/apalis_imx6.h > +++ b/include/configs/apalis_imx6.h > @@ -139,12 +139,12 @@ > > #define MEM_LAYOUT_ENV_SETTINGS \ > "bootm_size=0x20000000\0" \ > - "fdt_addr_r=0x12000000\0" \ > + "fdt_addr_r=0x12100000\0" \ > "fdt_high=0xffffffff\0" \ > "initrd_high=0xffffffff\0" \ > "kernel_addr_r=0x11000000\0" \ > "pxefile_addr_r=0x17100000\0" \ > - "ramdisk_addr_r=0x12100000\0" \ > + "ramdisk_addr_r=0x12200000\0" \ > "scriptaddr=0x17000000\0" > > #define NFS_BOOTCMD \ > diff --git a/include/configs/colibri-imx6ull.h b/include/configs/colibri-imx6ull.h > index 7cf550cf9e..31248b14a1 100644 > --- a/include/configs/colibri-imx6ull.h > +++ b/include/configs/colibri-imx6ull.h > @@ -48,12 +48,12 @@ > > #define MEM_LAYOUT_ENV_SETTINGS \ > "bootm_size=0x10000000\0" \ > - "fdt_addr_r=0x82000000\0" \ > + "fdt_addr_r=0x82100000\0" \ > "fdt_high=0xffffffff\0" \ > "initrd_high=0xffffffff\0" \ > "kernel_addr_r=0x81000000\0" \ > "pxefile_addr_r=0x87100000\0" \ > - "ramdisk_addr_r=0x82100000\0" \ > + "ramdisk_addr_r=0x82200000\0" \ > "scriptaddr=0x87000000\0" > > #define NFS_BOOTCMD \ > diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h > index d2f8a58e80..3b94078f82 100644 > --- a/include/configs/colibri_imx6.h > +++ b/include/configs/colibri_imx6.h > @@ -129,12 +129,12 @@ > > #define MEM_LAYOUT_ENV_SETTINGS \ > "bootm_size=0x10000000\0" \ > - "fdt_addr_r=0x12000000\0" \ > + "fdt_addr_r=0x12100000\0" \ > "fdt_high=0xffffffff\0" \ > "initrd_high=0xffffffff\0" \ > "kernel_addr_r=0x11000000\0" \ > "pxefile_addr_r=0x17100000\0" \ > - "ramdisk_addr_r=0x12100000\0" \ > + "ramdisk_addr_r=0x12200000\0" \ > "scriptaddr=0x17000000\0" > > #define NFS_BOOTCMD \ > -- > 2.20.1 > > _______________________________________________ > U-Boot mailing list > U-Boot@lists.denx.de > https://lists.denx.de/listinfo/u-boot
diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h index 95dd6f9362..02ca8bf361 100644 --- a/include/configs/apalis_imx6.h +++ b/include/configs/apalis_imx6.h @@ -139,12 +139,12 @@ #define MEM_LAYOUT_ENV_SETTINGS \ "bootm_size=0x20000000\0" \ - "fdt_addr_r=0x12000000\0" \ + "fdt_addr_r=0x12100000\0" \ "fdt_high=0xffffffff\0" \ "initrd_high=0xffffffff\0" \ "kernel_addr_r=0x11000000\0" \ "pxefile_addr_r=0x17100000\0" \ - "ramdisk_addr_r=0x12100000\0" \ + "ramdisk_addr_r=0x12200000\0" \ "scriptaddr=0x17000000\0" #define NFS_BOOTCMD \ diff --git a/include/configs/colibri-imx6ull.h b/include/configs/colibri-imx6ull.h index 7cf550cf9e..31248b14a1 100644 --- a/include/configs/colibri-imx6ull.h +++ b/include/configs/colibri-imx6ull.h @@ -48,12 +48,12 @@ #define MEM_LAYOUT_ENV_SETTINGS \ "bootm_size=0x10000000\0" \ - "fdt_addr_r=0x82000000\0" \ + "fdt_addr_r=0x82100000\0" \ "fdt_high=0xffffffff\0" \ "initrd_high=0xffffffff\0" \ "kernel_addr_r=0x81000000\0" \ "pxefile_addr_r=0x87100000\0" \ - "ramdisk_addr_r=0x82100000\0" \ + "ramdisk_addr_r=0x82200000\0" \ "scriptaddr=0x87000000\0" #define NFS_BOOTCMD \ diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h index d2f8a58e80..3b94078f82 100644 --- a/include/configs/colibri_imx6.h +++ b/include/configs/colibri_imx6.h @@ -129,12 +129,12 @@ #define MEM_LAYOUT_ENV_SETTINGS \ "bootm_size=0x10000000\0" \ - "fdt_addr_r=0x12000000\0" \ + "fdt_addr_r=0x12100000\0" \ "fdt_high=0xffffffff\0" \ "initrd_high=0xffffffff\0" \ "kernel_addr_r=0x11000000\0" \ "pxefile_addr_r=0x17100000\0" \ - "ramdisk_addr_r=0x12100000\0" \ + "ramdisk_addr_r=0x12200000\0" \ "scriptaddr=0x17000000\0" #define NFS_BOOTCMD \