[PATCH v2 1/3] microblaze: spl: wrap spl_start_uboot() in SPL_OS_BOOT ifdefs

[PATCH v2 1/3] microblaze: spl: wrap spl_start_uboot() in SPL_OS_BOOT ifdefs

[Ovidiu Panait]

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>
---

Changes in v2:
New patch.

 arch/microblaze/cpu/spl.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/arch/microblaze/cpu/spl.c b/arch/microblaze/cpu/spl.c
index cea6d56f16..b9ff9c3702 100644
--- a/arch/microblaze/cpu/spl.c
+++ b/arch/microblaze/cpu/spl.c
@@ -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[])
 {
-- 
2.25.1

[PATCH v2 2/3] microblaze: spl: drop boot_linux

[Ovidiu Panait]

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(-)

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 */
 
-- 
2.25.1

[PATCH v2 3/3] microblaze: spl: disable falcon mode by default

[Ovidiu Panait]

Drop falcon mode configs from microblaze-generic_defconfig, so that a
defconfig build will still boot into u-boot proper.

Signed-off-by: Ovidiu Panait <ovpanait@gmail.com>
---

Changes in v2:
New patch.

 configs/microblaze-generic_defconfig | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/configs/microblaze-generic_defconfig b/configs/microblaze-generic_defconfig
index be34941805..438540fbe4 100644
--- a/configs/microblaze-generic_defconfig
+++ b/configs/microblaze-generic_defconfig
@@ -33,9 +33,6 @@ CONFIG_SPL_SYS_MALLOC_SIMPLE=y
 # CONFIG_SPL_SHARES_INIT_SP_ADDR is not set
 CONFIG_SPL_STACK=0x100000
 CONFIG_SPL_NOR_SUPPORT=y
-CONFIG_SPL_OS_BOOT=y
-CONFIG_SYS_SPL_ARGS_ADDR=0x2a000000
-CONFIG_SYS_OS_BASE=0x2c060000
 CONFIG_SYS_MAXARGS=15
 CONFIG_SYS_CBSIZE=512
 CONFIG_SYS_PBSIZE=544
-- 
2.25.1

Re: [PATCH v2 1/3] microblaze: spl: wrap spl_start_uboot() in SPL_OS_BOOT ifdefs

[Michal Simek]

On 1/25/23 17:41, Ovidiu Panait wrote:
> 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>
> ---
> 
> Changes in v2:
> New patch.
> 
>   arch/microblaze/cpu/spl.c | 4 +---
>   1 file changed, 1 insertion(+), 3 deletions(-)
> 
> diff --git a/arch/microblaze/cpu/spl.c b/arch/microblaze/cpu/spl.c
> index cea6d56f16..b9ff9c3702 100644
> --- a/arch/microblaze/cpu/spl.c
> +++ b/arch/microblaze/cpu/spl.c
> @@ -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[])
>   {

Applied all.
M