]> git.baikalelectronics.ru Git - uboot.git/commitdiff
microblaze: spl: wrap spl_start_uboot() in SPL_OS_BOOT ifdefs
authorOvidiu Panait <ovpanait@gmail.com>
Wed, 25 Jan 2023 16:41:55 +0000 (18:41 +0200)
committerMichal Simek <michal.simek@amd.com>
Fri, 27 Jan 2023 07:38:34 +0000 (08:38 +0100)
Make spl_start_uboot() available only if CONFIG_SPL_OS_BOOT is enabled,
since it is only used for falcon mode.

Signed-off-by: Ovidiu Panait <ovpanait@gmail.com>
Link: https://lore.kernel.org/r/20230125164157.1638680-1-ovpanait@gmail.com
Signed-off-by: Michal Simek <michal.simek@amd.com>
arch/microblaze/cpu/spl.c

index cea6d56f16f880639373a7a9447ff16b0d8ae99d..b9ff9c3702279832b2bfe3475a4679676e9d4455 100644 (file)
@@ -41,17 +41,15 @@ void __noreturn jump_to_image_linux(struct spl_image_info *spl_image)
 
        image_entry(NULL, 0, (ulong)spl_image->arg);
 }
-#endif /* CONFIG_SPL_OS_BOOT */
 
 int spl_start_uboot(void)
 {
-#ifdef CONFIG_SPL_OS_BOOT
        if (boot_linux)
                return 0;
-#endif
 
        return 1;
 }
+#endif /* CONFIG_SPL_OS_BOOT */
 
 int do_reset(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
 {