diff options
| author | Tom Rini <trini@konsulko.com> | 2023-12-21 16:10:00 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2023-12-21 16:10:00 -0500 |
| commit | 7c4647b8fb448ac658a9bc726681ad9e75e6b9e8 (patch) | |
| tree | 5ecb1a3c90c2fc5c16176914748ad207005772a3 /arch/m68k | |
| parent | ced928b1994b6dd8d133797f506c0991b0e6196d (diff) | |
| parent | d37086a95f4b2c39f9ecfe602b792df8ab3bd8f9 (diff) | |
| download | u-boot-7c4647b8fb448ac658a9bc726681ad9e75e6b9e8.zip u-boot-7c4647b8fb448ac658a9bc726681ad9e75e6b9e8.tar.gz u-boot-7c4647b8fb448ac658a9bc726681ad9e75e6b9e8.tar.bz2 | |
Merge patch series "Complete decoupling of bootm logic from commands"WIP/21Dec2023-next
Simon Glass <sjg@chromium.org> says:
This series continues refactoring the bootm code to allow it to be used
with CONFIG_COMMAND disabled. The OS-handling code is refactored and
a new bootm_run() function is created to run through the bootm stages.
This completes the work.
A booti_go() function is created also, in case it proves useful, but at
last for now standard boot does not use this.
This is cmdd (part d of CMDLINE refactoring)
It depends on dm/bootstda-working
which depends on dm/cmdc-working
Diffstat (limited to 'arch/m68k')
| -rw-r--r-- | arch/m68k/lib/bootm.c | 5 | ||||
| -rw-r--r-- | arch/m68k/lib/traps.c | 7 |
2 files changed, 10 insertions, 2 deletions
diff --git a/arch/m68k/lib/bootm.c b/arch/m68k/lib/bootm.c index 79d8b34..f2d02e4 100644 --- a/arch/m68k/lib/bootm.c +++ b/arch/m68k/lib/bootm.c @@ -4,6 +4,7 @@ * Wolfgang Denk, DENX Software Engineering, wd@denx.de. */ +#include <bootm.h> #include <bootstage.h> #include <command.h> #include <env.h> @@ -34,9 +35,9 @@ void arch_lmb_reserve(struct lmb *lmb) arch_lmb_reserve_generic(lmb, get_sp(), gd->ram_top, 1024); } -int do_bootm_linux(int flag, int argc, char *const argv[], - struct bootm_headers *images) +int do_bootm_linux(int flag, struct bootm_info *bmi) { + struct bootm_headers *images = bmi->images; int ret; struct bd_info *kbd; void (*kernel) (struct bd_info *, ulong, ulong, ulong, ulong); diff --git a/arch/m68k/lib/traps.c b/arch/m68k/lib/traps.c index 2a025c5..e09f36f 100644 --- a/arch/m68k/lib/traps.c +++ b/arch/m68k/lib/traps.c @@ -8,6 +8,7 @@ */ #include <config.h> +#include <cpu_func.h> #include <init.h> #include <watchdog.h> #include <command.h> @@ -66,3 +67,9 @@ int arch_initr_trap(void) return 0; } + +void reset_cpu(void) +{ + /* TODO: Refactor all the do_reset calls to be reset_cpu() instead */ + do_reset(NULL, 0, 0, NULL); +} |