From b51be8ebcb4ac5605c03f409d5999601bc6244f5 Mon Sep 17 00:00:00 2001 From: Marek Vasut Date: Sat, 13 Jul 2024 15:19:34 +0200 Subject: [PATCH] tools: Remove duplicate newlines Drop all duplicate newlines. No functional change. Signed-off-by: Marek Vasut --- tools/env/fw_env.h | 2 -- tools/envcrc.c | 1 - tools/fdtgrep.c | 1 - tools/gdb/remote.c | 2 -- tools/imagetool.h | 1 - tools/img2srec.c | 9 --------- tools/imx8mimage.c | 1 - tools/imximage.c | 2 -- tools/kwbimage.c | 1 - tools/mxsimage.c | 1 - 10 files changed, 21 deletions(-) diff --git a/tools/env/fw_env.h b/tools/env/fw_env.h index 78c803c944..060eea542c 100644 --- a/tools/env/fw_env.h +++ b/tools/env/fw_env.h @@ -94,7 +94,6 @@ int fw_env_set(int argc, char *argv[], struct env_opts *opts); */ int fw_parse_script(char *fname, struct env_opts *opts); - /** * fw_env_open() - read enviroment from flash into RAM cache * @@ -151,7 +150,6 @@ int fw_env_flush(struct env_opts *opts); */ int fw_env_close(struct env_opts *opts); - /** * fw_env_version - return the current version of the library * diff --git a/tools/envcrc.c b/tools/envcrc.c index 550f31038b..0905180036 100644 --- a/tools/envcrc.c +++ b/tools/envcrc.c @@ -48,7 +48,6 @@ #define ENV_SIZE (CONFIG_ENV_SIZE - ENV_HEADER_SIZE) - #ifdef ENV_IS_EMBEDDED # include extern unsigned int env_size; diff --git a/tools/fdtgrep.c b/tools/fdtgrep.c index f1ff1946bd..037176bc9e 100644 --- a/tools/fdtgrep.c +++ b/tools/fdtgrep.c @@ -102,7 +102,6 @@ static void print_ansi_colour(FILE *fout, int col) fprintf(fout, "\033[1;%dm", col + 30); } - /** * value_add() - Add a new value to our list of things to grep for * diff --git a/tools/gdb/remote.c b/tools/gdb/remote.c index 3cd0421351..f17bb06fb4 100644 --- a/tools/gdb/remote.c +++ b/tools/gdb/remote.c @@ -45,7 +45,6 @@ extern "C" { #endif #endif /* alloca not defined. */ - #include "serial.h" #include "error.h" #include "remote.h" @@ -313,7 +312,6 @@ static int remote_binary_checked; ? (REGISTER_BYTES * 2 + 32) \ : 400) - /* This variable sets the number of bytes to be written to the target in a single packet. Normally PBUFSIZ is satisfactory, but some targets need smaller values (perhaps because the receiving end diff --git a/tools/imagetool.h b/tools/imagetool.h index a766aa2ae9..57be608210 100644 --- a/tools/imagetool.h +++ b/tools/imagetool.h @@ -256,7 +256,6 @@ time_t imagetool_get_source_date( * for ex. default_image.c, fit_image.c */ - void pbl_load_uboot(int fd, struct image_tool_params *mparams); int zynqmpbif_copy_image(int fd, struct image_tool_params *mparams); int imx8image_copy_image(int fd, struct image_tool_params *mparams); diff --git a/tools/img2srec.c b/tools/img2srec.c index 75efd76e0e..5a6d3259f3 100644 --- a/tools/img2srec.c +++ b/tools/img2srec.c @@ -109,7 +109,6 @@ static char* ExtractDecimal (uint32_t* value, char* getPtr) return getPtr; } /* ExtractDecimal */ - static void ExtractNumber (uint32_t* value, char* getPtr) { bool neg = false; @@ -129,7 +128,6 @@ static void ExtractNumber (uint32_t* value, char* getPtr) if (neg) *value = -(*value); } /* ExtractNumber */ - static uint8_t* ExtractWord(uint16_t* value, uint8_t* buffer) { uint16_t x; @@ -139,7 +137,6 @@ static uint8_t* ExtractWord(uint16_t* value, uint8_t* buffer) return buffer; } /* ExtractWord */ - static uint8_t* ExtractLong(uint32_t* value, uint8_t* buffer) { uint32_t x; @@ -151,14 +148,12 @@ static uint8_t* ExtractLong(uint32_t* value, uint8_t* buffer) return buffer; } /* ExtractLong */ - static uint8_t* ExtractBlock(uint16_t count, uint8_t* data, uint8_t* buffer) { while (count--) *data++ = *buffer++; return buffer; } /* ExtractBlock */ - static char* WriteHex(char* pa, uint8_t value, uint16_t* pCheckSum) { uint16_t temp; @@ -173,7 +168,6 @@ static char* WriteHex(char* pa, uint8_t value, uint16_t* pCheckSum) return pa; } - static char* BuildSRecord(char* pa, uint16_t sType, uint32_t addr, const uint8_t* data, int nCount) { @@ -223,7 +217,6 @@ static char* BuildSRecord(char* pa, uint16_t sType, uint32_t addr, return pa; } - static void ConvertELF(char* fileName, uint32_t loadOffset) { FILE* file; @@ -240,7 +233,6 @@ static void ConvertELF(char* fileName, uint32_t loadOffset) char srecLine[128]; char *hdr_name; - /* open file */ if ((file = fopen(fileName,"rb")) == NULL) { fprintf (stderr, "Can't open %s: %s\n", fileName, strerror(errno)); @@ -348,7 +340,6 @@ static void ConvertELF(char* fileName, uint32_t loadOffset) fclose(file); } /* ConvertELF */ - /************************************************************************* | MAIN |*************************************************************************/ diff --git a/tools/imx8mimage.c b/tools/imx8mimage.c index 939f829a9f..d60d293e64 100644 --- a/tools/imx8mimage.c +++ b/tools/imx8mimage.c @@ -5,7 +5,6 @@ * Peng Fan */ - #include "imagetool.h" #include #include "imximage.h" diff --git a/tools/imximage.c b/tools/imximage.c index 2df4c7dd49..467d9f27d2 100644 --- a/tools/imximage.c +++ b/tools/imximage.c @@ -793,7 +793,6 @@ static uint32_t parse_cfg_file(struct imx_header *imxhdr, char *name) return dcd_len; } - static int imximage_check_image_types(uint8_t type) { if (type == IH_TYPE_IMXIMAGE) @@ -1057,7 +1056,6 @@ static int imximage_generate(struct image_tool_params *params, return pad_len; } - /* * imximage parameters */ diff --git a/tools/kwbimage.c b/tools/kwbimage.c index 4dce495ff0..d1cbced28f 100644 --- a/tools/kwbimage.c +++ b/tools/kwbimage.c @@ -804,7 +804,6 @@ static int kwb_sign_and_verify(RSA *key, void *data, int datasz, return 0; } - static int kwb_dump_fuse_cmds_38x(FILE *out, struct secure_hdr_v1 *sec_hdr) { struct hash_v1 kak_pub_hash; diff --git a/tools/mxsimage.c b/tools/mxsimage.c index ead61d0cd6..42df0698ca 100644 --- a/tools/mxsimage.c +++ b/tools/mxsimage.c @@ -2058,7 +2058,6 @@ static int sb_verify_image_end(struct sb_image_ctx *ictx, return ret; } - static int sb_build_tree_from_img(struct sb_image_ctx *ictx) { long filesize; -- 2.39.5