diff options
| author | Tom Rini <trini@konsulko.com> | 2020-07-17 16:08:54 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-07-17 16:08:54 -0400 |
| commit | 1c4b5038afcc7cdb1064713f65571da05aa0de0e (patch) | |
| tree | bbb554b1128dc15453a91fc50408446da2e0ddd2 /arch/m68k/lib/bootm.c | |
| parent | 7c3cc6f106ed1ca13b0ff6eea9f8e1473240aef3 (diff) | |
| parent | 21fc5a16855602b2fd4b39e40679f854101a0fa3 (diff) | |
Merge branch '2020-07-17-misc-fixes'
A large number of assorted fixes, including but not limited to:
- Correct fixdep and CONFIG_IS_ENABLED(...)
- lz4 on big endian
- Assorted LMB hardening
- Remove bd_t typedef
Diffstat (limited to 'arch/m68k/lib/bootm.c')
| -rw-r--r-- | arch/m68k/lib/bootm.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/m68k/lib/bootm.c b/arch/m68k/lib/bootm.c index aa17929b9ea..320451144fd 100644 --- a/arch/m68k/lib/bootm.c +++ b/arch/m68k/lib/bootm.c @@ -27,7 +27,7 @@ DECLARE_GLOBAL_DATA_PTR; #define LINUX_MAX_ARGS 256 static ulong get_sp (void); -static void set_clocks_in_mhz (bd_t *kbd); +static void set_clocks_in_mhz (struct bd_info *kbd); void arch_lmb_reserve(struct lmb *lmb) { @@ -54,8 +54,8 @@ int do_bootm_linux(int flag, int argc, char *const argv[], bootm_headers_t *images) { int ret; - bd_t *kbd; - void (*kernel) (bd_t *, ulong, ulong, ulong, ulong); + struct bd_info *kbd; + void (*kernel) (struct bd_info *, ulong, ulong, ulong, ulong); struct lmb *lmb = &images->lmb; /* @@ -79,7 +79,7 @@ int do_bootm_linux(int flag, int argc, char *const argv[], if (ret) goto error; - kernel = (void (*)(bd_t *, ulong, ulong, ulong, ulong))images->ep; + kernel = (void (*)(struct bd_info *, ulong, ulong, ulong, ulong))images->ep; debug("## Transferring control to Linux (at address %08lx) ...\n", (ulong) kernel); @@ -112,7 +112,7 @@ static ulong get_sp (void) return sp; } -static void set_clocks_in_mhz (bd_t *kbd) +static void set_clocks_in_mhz (struct bd_info *kbd) { char *s; |