diff mbox series

xilinx: common: Fix boot script address

Message ID 5dc590fbc134e96437b195bc18a45f5caa18535c.1617691957.git.michal.simek@xilinx.com
State Accepted
Commit 25484d907039148807e9b1c4924c816f59a13929
Delegated to: Michal Simek
Headers show
Series xilinx: common: Fix boot script address | expand

Commit Message

Michal Simek April 6, 2021, 6:52 a.m. UTC 
From: T Karthik Reddy <t.karthik.reddy@xilinx.com>

Currently u-boot supports addresses upto 39-bits only. If anybody
wants to use addresses of more than 39-bits in Linux they will have
a separate memory node in DT. In such cases they will have multiple
memory nodes.
Currently u-boot selects and runs on lower memory bank region.
But bootscript is being loaded on dram bank 0, where dram bank 0 will
point to 1st memory node in DT. If first memory node is mentioned as
higher ddr(>39-bits address) then u-boot cannot load the bootscript.
So fix this issue by setting bootscript address within the lower memory
bank region.

Signed-off-by: T Karthik Reddy <t.karthik.reddy@xilinx.com>
Signed-off-by: Ashok Reddy Soma <ashok.reddy.soma@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
---

 board/xilinx/common/board.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

Comments

Michal Simek April 23, 2021, 6:46 a.m. UTC | #1 
út 6. 4. 2021 v 8:52 odesílatel Michal Simek <michal.simek@xilinx.com> napsal:
>
> From: T Karthik Reddy <t.karthik.reddy@xilinx.com>
>
> Currently u-boot supports addresses upto 39-bits only. If anybody
> wants to use addresses of more than 39-bits in Linux they will have
> a separate memory node in DT. In such cases they will have multiple
> memory nodes.
> Currently u-boot selects and runs on lower memory bank region.
> But bootscript is being loaded on dram bank 0, where dram bank 0 will
> point to 1st memory node in DT. If first memory node is mentioned as
> higher ddr(>39-bits address) then u-boot cannot load the bootscript.
> So fix this issue by setting bootscript address within the lower memory
> bank region.
>
> Signed-off-by: T Karthik Reddy <t.karthik.reddy@xilinx.com>
> Signed-off-by: Ashok Reddy Soma <ashok.reddy.soma@xilinx.com>
> Signed-off-by: Michal Simek <michal.simek@xilinx.com>
> ---
>
>  board/xilinx/common/board.c | 6 ++----
>  1 file changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/board/xilinx/common/board.c b/board/xilinx/common/board.c
> index 475628b92549..92b61d83ca47 100644
> --- a/board/xilinx/common/board.c
> +++ b/board/xilinx/common/board.c
> @@ -378,14 +378,12 @@ int board_late_init_xilinx(void)
>         int i, id, macid = 0;
>         struct xilinx_board_description *desc;
>         phys_size_t bootm_size = gd->ram_size;
> -       struct bd_info *bd = gd->bd;
>
> -       if (!CONFIG_IS_ENABLED(MICROBLAZE) && bd->bi_dram[0].start) {
> +       if (!CONFIG_IS_ENABLED(MICROBLAZE)) {
>                 ulong scriptaddr;
>
>                 scriptaddr = env_get_hex("scriptaddr", 0);
> -               ret |= env_set_hex("scriptaddr",
> -                                  bd->bi_dram[0].start + scriptaddr);
> +               ret |= env_set_hex("scriptaddr", gd->ram_base + scriptaddr);
>         }
>
>         if (CONFIG_IS_ENABLED(ARCH_ZYNQ) || CONFIG_IS_ENABLED(MICROBLAZE))
> --
> 2.31.0
>

Applied.
M
diff mbox series

Patch

diff --git a/board/xilinx/common/board.c b/board/xilinx/common/board.c
index 475628b92549..92b61d83ca47 100644
--- a/board/xilinx/common/board.c
+++ b/board/xilinx/common/board.c
@@ -378,14 +378,12 @@  int board_late_init_xilinx(void)
 	int i, id, macid = 0;
 	struct xilinx_board_description *desc;
 	phys_size_t bootm_size = gd->ram_size;
-	struct bd_info *bd = gd->bd;
 
-	if (!CONFIG_IS_ENABLED(MICROBLAZE) && bd->bi_dram[0].start) {
+	if (!CONFIG_IS_ENABLED(MICROBLAZE)) {
 		ulong scriptaddr;
 
 		scriptaddr = env_get_hex("scriptaddr", 0);
-		ret |= env_set_hex("scriptaddr",
-				   bd->bi_dram[0].start + scriptaddr);
+		ret |= env_set_hex("scriptaddr", gd->ram_base + scriptaddr);
 	}
 
 	if (CONFIG_IS_ENABLED(ARCH_ZYNQ) || CONFIG_IS_ENABLED(MICROBLAZE))