Make spl_start_uboot() available only if CONFIG_SPL_OS_BOOT is enabled
and drop boot_linux, as the variable is not assigned anywhere.
Also, disable CONFIG_SPL_OS_BOOT in defconfig so that a
microblaze-generic_defconfig build will still boot into u-boot proper, as
it does currently.
Signed-off-by: Ovidiu Panait <ovpan...@gmail.com>
---
arch/microblaze/cpu/spl.c | 11 ++---------
common/spl/Kconfig | 2 ++
configs/microblaze-generic_defconfig | 3 ---
3 files changed, 4 insertions(+), 12 deletions(-)
diff --git a/arch/microblaze/cpu/spl.c b/arch/microblaze/cpu/spl.c
index cea6d56f16..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;
@@ -41,17 +39,12 @@ 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;
+ return 0;
}
+#endif /* CONFIG_SPL_OS_BOOT */
int do_reset(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
{
diff --git a/common/spl/Kconfig b/common/spl/Kconfig
index 3c2af453ab..de6d8c3a18 100644
--- a/common/spl/Kconfig
+++ b/common/spl/Kconfig
@@ -1081,6 +1081,7 @@ config SYS_SPL_ARGS_ADDR
hex "Address in memory to load 'args' file for Falcon Mode to"
depends on SPL_OS_BOOT
default 0x88000000 if ARCH_OMAP2PLUS
+ default 0x2a000000 if MICROBLAZE
help
Address in memory where the 'args' file, typically a device tree
will be loaded in to memory.
@@ -1092,6 +1093,7 @@ config SYS_NAND_SPL_KERNEL_OFFS
config SYS_OS_BASE
hex "addr, where OS is found"
depends on SPL_OS_BOOT && SPL_NOR_SUPPORT
+ default 0x2c060000 if MICROBLAZE
help
Specify the address, where the OS image is found, which
gets booted.
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
