]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
board: xilinx: Remove conditional check for Microblaze
authorPadmarao Begari <padmarao.begari@amd.com>
Fri, 13 Sep 2024 09:32:31 +0000 (15:02 +0530)
committerMichal Simek <michal.simek@amd.com>
Fri, 20 Sep 2024 13:31:19 +0000 (15:31 +0200)
U-Boot is not picking boot.scr script address from device tree
rather it's using default address for Microblaze platform,
and it's picking for other platforms. Remove conditional check
for Microblaze platform, so that u-boot pick up boot.scr script
address for all platforms from device tree.

Signed-off-by: Padmarao Begari <padmarao.begari@amd.com>
Link: https://lore.kernel.org/r/20240913093231.2343528-1-padmarao.begari@amd.com
Signed-off-by: Michal Simek <michal.simek@amd.com>
board/xilinx/common/board.c

index 1c100d61589f34ab1df431c18c2d15be3f2d7af2..5e5eb49ddf352a01f6bae409ad33609af775ba35 100644 (file)
@@ -425,28 +425,25 @@ int board_late_init_xilinx(void)
        struct xilinx_board_description *desc;
        phys_size_t bootm_size = gd->ram_top - gd->ram_base;
        u64 bootscr_flash_offset, bootscr_flash_size;
-
-       if (!IS_ENABLED(CONFIG_MICROBLAZE)) {
-               ulong 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);
+       ulong 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 + 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 (!ofnode_read_bootscript_flash(&bootscr_flash_offset,