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/arm/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/arm/lib/bootm.c')
-rw-r--r-- | arch/arm/lib/bootm.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/arch/arm/lib/bootm.c b/arch/arm/lib/bootm.c index 2df98d3e01b..1206e306db6 100644 --- a/arch/arm/lib/bootm.c +++ b/arch/arm/lib/bootm.c @@ -124,7 +124,7 @@ static void announce_and_cleanup(int fake) cleanup_before_linux(); } -static void setup_start_tag (bd_t *bd) +static void setup_start_tag (struct bd_info *bd) { params = (struct tag *)bd->bi_boot_params; @@ -138,7 +138,7 @@ static void setup_start_tag (bd_t *bd) params = tag_next (params); } -static void setup_memory_tags(bd_t *bd) +static void setup_memory_tags(struct bd_info *bd) { int i; @@ -153,7 +153,7 @@ static void setup_memory_tags(bd_t *bd) } } -static void setup_commandline_tag(bd_t *bd, char *commandline) +static void setup_commandline_tag(struct bd_info *bd, char *commandline) { char *p; @@ -178,7 +178,8 @@ static void setup_commandline_tag(bd_t *bd, char *commandline) params = tag_next (params); } -static void setup_initrd_tag(bd_t *bd, ulong initrd_start, ulong initrd_end) +static void setup_initrd_tag(struct bd_info *bd, ulong initrd_start, + ulong initrd_end) { /* an ATAG_INITRD node tells the kernel where the compressed * ramdisk can be found. ATAG_RDIMG is a better name, actually. @@ -217,7 +218,7 @@ static void setup_revision_tag(struct tag **in_params) params = tag_next (params); } -static void setup_end_tag(bd_t *bd) +static void setup_end_tag(struct bd_info *bd) { params->hdr.tag = ATAG_NONE; params->hdr.size = 0; |