diff options
| author | Heinrich Schuchardt <heinrich.schuchardt@canonical.com> | 2024-01-11 09:03:43 +0100 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2024-04-12 08:53:31 -0600 |
| commit | 04fc470cf826cc2fc9a589ce68870b39415f9d12 (patch) | |
| tree | 8c6db0072d01a46285c21e8b62cd6606852409fc | |
| parent | 233c31d7baecd6fdb3e287683019205af02aa221 (diff) | |
| download | u-boot-04fc470cf826cc2fc9a589ce68870b39415f9d12.zip u-boot-04fc470cf826cc2fc9a589ce68870b39415f9d12.tar.gz u-boot-04fc470cf826cc2fc9a589ce68870b39415f9d12.tar.bz2 | |
sandbox: move sandbox specifics to booti_setup()
Instead of checking a configuration setting in booti_start() adjust the
sandbox implementation of booti_setup().
Write a console message when trying to run the booti command on the sandbox
indicating that it is not supported.
Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
| -rw-r--r-- | arch/sandbox/lib/bootm.c | 4 | ||||
| -rw-r--r-- | cmd/booti.c | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/arch/sandbox/lib/bootm.c b/arch/sandbox/lib/bootm.c index 8dbcd9f..44ba8b5 100644 --- a/arch/sandbox/lib/bootm.c +++ b/arch/sandbox/lib/bootm.c @@ -85,5 +85,7 @@ int do_bootm_linux(int flag, struct bootm_info *bmi) int booti_setup(ulong image, ulong *relocated_addr, ulong *size, bool force_reloc) { - return 0; + log_err("Booting is not supported on the sandbox.\n"); + + return 1; } diff --git a/cmd/booti.c b/cmd/booti.c index 898df0f..b9637b3 100644 --- a/cmd/booti.c +++ b/cmd/booti.c @@ -74,7 +74,7 @@ static int booti_start(struct bootm_info *bmi) unmap_sysmem((void *)ld); ret = booti_setup(ld, &relocated_addr, &image_size, false); - if (ret || IS_ENABLED(CONFIG_SANDBOX)) + if (ret) return 1; /* Handle BOOTM_STATE_LOADOS */ |