From da79b2f25e5352a8e09b96ecef56df009f03c0b5 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Tue, 6 Sep 2022 20:26:51 -0600 Subject: [PATCH] treewide: Drop image_info_t typedef This is not needed and we should avoid typedefs. Use the struct instead. Signed-off-by: Simon Glass --- boot/bootm.c | 2 +- include/image.h | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/boot/bootm.c b/boot/bootm.c index 2b0dc0b36b..2e41d78372 100644 --- a/boot/bootm.c +++ b/boot/bootm.c @@ -399,7 +399,7 @@ static int handle_decomp_error(int comp_type, size_t uncomp_size, #ifndef USE_HOSTCC static int bootm_load_os(struct bootm_headers *images, int boot_progress) { - image_info_t os = images->os; + struct image_info os = images->os; ulong load = os.load; ulong load_end; ulong blob_start = os.start; diff --git a/include/image.h b/include/image.h index b337478c29..b58550fd64 100644 --- a/include/image.h +++ b/include/image.h @@ -278,13 +278,13 @@ typedef struct image_header { uint8_t ih_name[IH_NMLEN]; /* Image Name */ } image_header_t; -typedef struct image_info { +struct image_info { ulong start, end; /* start/end of blob */ ulong image_start, image_len; /* start of image within blob, len of image */ ulong load; /* load addr for the image */ uint8_t comp, type, os; /* compression, type of image, os type */ uint8_t arch; /* CPU architecture */ -} image_info_t; +}; /* * Legacy and FIT format headers used by do_bootm() and do_bootm_() @@ -324,7 +324,7 @@ struct bootm_headers { int fit_noffset_setup;/* x86 setup subimage node offset */ #ifndef USE_HOSTCC - image_info_t os; /* os image info */ + struct image_info os; /* os image info */ ulong ep; /* entry point of OS */ ulong rd_start, rd_end;/* ramdisk start/end */ -- 2.39.5