| Message ID | 20230125164157.1638680-2-ovpanait@gmail.com |
|---|---|
| State | Accepted |
| Commit | 8e2378e559a2792c5d730e6a65bec964b56b5c33 |
| Delegated to: | Michal Simek |
| Headers | show |
| Series | [v2,1/3] microblaze: spl: wrap spl_start_uboot() in SPL_OS_BOOT ifdefs | expand |
diff --git a/arch/microblaze/cpu/spl.c b/arch/microblaze/cpu/spl.c index b9ff9c3702..eaa095ba99 100644 --- a/arch/microblaze/cpu/spl.c +++ b/arch/microblaze/cpu/spl.c @@ -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 */
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> --- Changes in v2: New patch. arch/microblaze/cpu/spl.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-)