]> git.baikalelectronics.ru Git - uboot.git/commitdiff
microblaze: spl: drop boot_linux
authorOvidiu Panait <ovpanait@gmail.com>
Wed, 25 Jan 2023 16:41:56 +0000 (18:41 +0200)
committerMichal Simek <michal.simek@amd.com>
Fri, 27 Jan 2023 07:38:34 +0000 (08:38 +0100)
Drop boot_linux variable as it is not assigned anywhere. Now that there is
no variable controlling linux boot in spl_start_uboot(), make this
function always return false when falcon mode is enabled.

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

index b9ff9c3702279832b2bfe3475a4679676e9d4455..eaa095ba99faed825b6be122852b3776d887a325 100644 (file)
@@ -14,8 +14,6 @@
 #include <asm/u-boot.h>
 #include <linux/stringify.h>
 
-bool boot_linux;
-
 void board_boot_order(u32 *spl_boot_list)
 {
        spl_boot_list[0] = BOOT_DEVICE_NOR;
@@ -44,10 +42,7 @@ void __noreturn jump_to_image_linux(struct spl_image_info *spl_image)
 
 int spl_start_uboot(void)
 {
-       if (boot_linux)
-               return 0;
-
-       return 1;
+       return 0;
 }
 #endif /* CONFIG_SPL_OS_BOOT */