]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
xilinx: board: Add support to pick bootscr address from DT
authorAlgapally Santosh Sagar <santoshsagar.algapally@amd.com>
Thu, 31 Aug 2023 06:59:06 +0000 (08:59 +0200)
committerMichal Simek <michal.simek@amd.com>
Thu, 21 Sep 2023 11:20:11 +0000 (13:20 +0200)
The bootscript is expected at a default address specific to each
platform.
When high speed memory like Programmable Logic Double Data Rate RAM
(PL DDR RAM) or Higher Bandwidth Memory RAM (HBM) is used the boot.scr
may be loaded at a different offset. The offset needs to be set through
setenv. Due to the default values in some cases the boot.scr is falling
in between the kernel partition.

The bootscript address or the bootscript offset is fetched directly from
the DT and updated in the environment making it easier for automated
flows.

Signed-off-by: Algapally Santosh Sagar <santoshsagar.algapally@amd.com>
Signed-off-by: Michal Simek <michal.simek@amd.com>
Link: https://lore.kernel.org/r/fac7020b31e1f150b021d666f0d588579ea671ad.1693465140.git.michal.simek@amd.com
board/xilinx/common/board.c

index 2caeb32470ff6d970d6136065e838cfb9271d89b..720dcd040f07daa7da968a6f96fb963102356202 100644 (file)
@@ -414,9 +414,25 @@ int board_late_init_xilinx(void)
 
        if (!IS_ENABLED(CONFIG_MICROBLAZE)) {
                ulong scriptaddr;
-
-               scriptaddr = env_get_hex("scriptaddr", 0);
-               ret |= env_set_hex("scriptaddr", gd->ram_base + scriptaddr);
+               u64 bootscr_address;
+               u64 bootscr_offset;
+
+               /* Fetch bootscr_address/bootscr_offset from DT and update */
+               if (!ofnode_read_bootscript_address(&bootscr_address,
+                                                   &bootscr_offset)) {
+                       if (bootscr_offset)
+                               ret |= env_set_hex("scriptaddr",
+                                                  gd->ram_base +
+                                                  bootscr_offset);
+                       else
+                               ret |= env_set_hex("scriptaddr",
+                                                  bootscr_address);
+               } else {
+                       /* Update scriptaddr(bootscr offset) from env */
+                       scriptaddr = env_get_hex("scriptaddr", 0);
+                       ret |= env_set_hex("scriptaddr",
+                                          gd->ram_base + scriptaddr);
+               }
        }
 
        if (IS_ENABLED(CONFIG_ARCH_ZYNQ) || IS_ENABLED(CONFIG_MICROBLAZE))