Commit 712fbcf3 authored by Stephen Warren's avatar Stephen Warren Committed by Wolfgang Denk

checkpatch whitespace cleanups

This avoids the following checkpatch warning in later patches:

ERROR: "(foo*)" should be "(foo *)"
ERROR: space required before the open brace '{'
ERROR: space prohibited before that close parenthesis ')'
ERROR: spaces required around that '||' (ctx:WxV)
WARNING: space prohibited between function name and open parenthesis '('
WARNING: line over 80 characters

This fixes all the white-space warnings/errors in my subsequent patch,
and within this current patch. A number of other checkpatch warnings
and errors are still present in this patch itself, but are beyond simple
whitespace fixes, so are not solved by this patch.

v2: New patch
Signed-off-by: default avatarStephen Warren <swarren@nvidia.com>
Tested-by: default avatarSimon Glass <sjg@chromium.org>
Tested-by: default avatarSimon Glass <sjg@chromium.org>
parent 83c484d7
This diff is collapsed.
......@@ -62,7 +62,7 @@ do_imgextract(cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[])
uint unc_len = CONFIG_SYS_XIMG_LEN;
uint8_t comp;
verify = getenv_yesno ("verify");
verify = getenv_yesno("verify");
if (argc > 1) {
addr = simple_strtoul(argv[1], NULL, 16);
......@@ -77,33 +77,33 @@ do_imgextract(cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[])
dest = simple_strtoul(argv[3], NULL, 16);
}
switch (genimg_get_format ((void *)addr)) {
switch (genimg_get_format((void *)addr)) {
case IMAGE_FORMAT_LEGACY:
printf("## Copying part %d from legacy image "
"at %08lx ...\n", part, addr);
hdr = (image_header_t *)addr;
if (!image_check_magic (hdr)) {
if (!image_check_magic(hdr)) {
printf("Bad Magic Number\n");
return 1;
}
if (!image_check_hcrc (hdr)) {
if (!image_check_hcrc(hdr)) {
printf("Bad Header Checksum\n");
return 1;
}
#ifdef DEBUG
image_print_contents (hdr);
image_print_contents(hdr);
#endif
if (!image_check_type (hdr, IH_TYPE_MULTI)) {
if (!image_check_type(hdr, IH_TYPE_MULTI)) {
printf("Wrong Image Type for %s command\n",
cmdtp->name);
return 1;
}
comp = image_get_comp (hdr);
comp = image_get_comp(hdr);
if ((comp != IH_COMP_NONE) && (argc < 4)) {
printf("Must specify load address for %s command "
"with compressed image\n",
......@@ -113,25 +113,25 @@ do_imgextract(cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[])
if (verify) {
printf(" Verifying Checksum ... ");
if (!image_check_dcrc (hdr)) {
if (!image_check_dcrc(hdr)) {
printf("Bad Data CRC\n");
return 1;
}
printf("OK\n");
}
count = image_multi_count (hdr);
count = image_multi_count(hdr);
if (part >= count) {
printf("Bad Image Part\n");
return 1;
}
image_multi_getimg (hdr, part, &data, &len);
image_multi_getimg(hdr, part, &data, &len);
break;
#if defined(CONFIG_FIT)
case IMAGE_FORMAT_FIT:
if (uname == NULL) {
puts ("No FIT subimage unit name\n");
puts("No FIT subimage unit name\n");
return 1;
}
......@@ -139,19 +139,19 @@ do_imgextract(cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[])
"at %08lx ...\n", uname, addr);
fit_hdr = (const void *)addr;
if (!fit_check_format (fit_hdr)) {
puts ("Bad FIT image format\n");
if (!fit_check_format(fit_hdr)) {
puts("Bad FIT image format\n");
return 1;
}
/* get subimage node offset */
noffset = fit_image_get_node (fit_hdr, uname);
noffset = fit_image_get_node(fit_hdr, uname);
if (noffset < 0) {
printf ("Can't find '%s' FIT subimage\n", uname);
printf("Can't find '%s' FIT subimage\n", uname);
return 1;
}
if (fit_image_check_comp (fit_hdr, noffset, IH_COMP_NONE)
if (fit_image_check_comp(fit_hdr, noffset, IH_COMP_NONE)
&& (argc < 4)) {
printf("Must specify load address for %s command "
"with compressed image\n",
......@@ -161,21 +161,21 @@ do_imgextract(cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[])
/* verify integrity */
if (verify) {
if (!fit_image_check_hashes (fit_hdr, noffset)) {
puts ("Bad Data Hash\n");
if (!fit_image_check_hashes(fit_hdr, noffset)) {
puts("Bad Data Hash\n");
return 1;
}
}
/* get subimage data address and length */
if (fit_image_get_data (fit_hdr, noffset,
if (fit_image_get_data(fit_hdr, noffset,
&fit_data, &fit_len)) {
puts ("Could not find script subimage data\n");
puts("Could not find script subimage data\n");
return 1;
}
if (fit_image_get_comp (fit_hdr, noffset, &comp)) {
puts ("Could not find script subimage "
if (fit_image_get_comp(fit_hdr, noffset, &comp)) {
puts("Could not find script subimage "
"compression type\n");
return 1;
}
......@@ -185,7 +185,7 @@ do_imgextract(cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[])
break;
#endif
default:
puts ("Invalid image type for imxtract\n");
puts("Invalid image type for imxtract\n");
return 1;
}
......@@ -199,28 +199,28 @@ do_imgextract(cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[])
void *to = (void *) dest;
void *from = (void *)data;
printf (" Loading part %d ... ", part);
printf(" Loading part %d ... ", part);
while (l > 0) {
tail = (l > CHUNKSZ) ? CHUNKSZ : l;
WATCHDOG_RESET();
memmove (to, from, tail);
memmove(to, from, tail);
to += tail;
from += tail;
l -= tail;
}
}
#else /* !(CONFIG_HW_WATCHDOG || CONFIG_WATCHDOG) */
printf (" Loading part %d ... ", part);
memmove ((char *) dest, (char *)data, len);
printf(" Loading part %d ... ", part);
memmove((char *) dest, (char *)data, len);
#endif /* CONFIG_HW_WATCHDOG || CONFIG_WATCHDOG */
break;
#ifdef CONFIG_GZIP
case IH_COMP_GZIP:
printf (" Uncompressing part %d ... ", part);
if (gunzip ((void *) dest, unc_len,
(uchar *) data, &len) != 0) {
puts ("GUNZIP ERROR - image not loaded\n");
printf(" Uncompressing part %d ... ", part);
if (gunzip((void *) dest, unc_len,
(uchar *) data, &len) != 0) {
puts("GUNZIP ERROR - image not loaded\n");
return 1;
}
break;
......@@ -230,19 +230,19 @@ do_imgextract(cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[])
{
int i;
printf (" Uncompressing part %d ... ", part);
printf(" Uncompressing part %d ... ", part);
/*
* If we've got less than 4 MB of malloc()
* space, use slower decompression algorithm
* which requires at most 2300 KB of memory.
*/
i = BZ2_bzBuffToBuffDecompress(
(char*)ntohl(hdr->ih_load),
(char *)ntohl(hdr->ih_load),
&unc_len, (char *)data, len,
CONFIG_SYS_MALLOC_LEN < (4096 * 1024),
0);
if (i != BZ_OK) {
printf ("BUNZIP2 ERROR %d - "
printf("BUNZIP2 ERROR %d - "
"image not loaded\n", i);
return 1;
}
......@@ -250,10 +250,10 @@ do_imgextract(cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[])
break;
#endif /* CONFIG_BZIP2 */
default:
printf ("Unimplemented compression type %d\n", comp);
printf("Unimplemented compression type %d\n", comp);
return 1;
}
puts ("OK\n");
puts("OK\n");
}
sprintf(pbuf, "%8lx", data);
......
This diff is collapsed.
......@@ -23,45 +23,47 @@
DECLARE_GLOBAL_DATA_PTR;
#if defined(CONFIG_MPC8260) || defined(CONFIG_440EP) || defined(CONFIG_440GR)
void lynxkdi_boot (image_header_t *hdr)
void lynxkdi_boot(image_header_t *hdr)
{
void (*lynxkdi)(void) = (void(*)(void))image_get_ep (hdr);
void (*lynxkdi)(void) = (void(*)(void))image_get_ep(hdr);
lynxos_bootparms_t *parms = (lynxos_bootparms_t *)0x0020;
bd_t *kbd;
u32 *psz = (u32 *)(image_get_load (hdr) + 0x0204);
u32 *psz = (u32 *)(image_get_load(hdr) + 0x0204);
memset (parms, 0, sizeof(*parms));
memset(parms, 0, sizeof(*parms));
kbd = gd->bd;
parms->clock_ref = kbd->bi_busfreq;
parms->dramsz = kbd->bi_memsize;
eth_getenv_enetaddr("ethaddr", parms->ethaddr);
mtspr (SPRN_SPRG2, 0x0020);
mtspr(SPRN_SPRG2, 0x0020);
/* Do a simple check for Bluecat so we can pass the
* kernel command line parameters.
*/
if (le32_to_cpu (*psz) == image_get_data_size (hdr)) { /* FIXME: NOT SURE HERE ! */
/* FIXME: NOT SURE HERE ! */
if (le32_to_cpu(*psz) == image_get_data_size(hdr)) {
char *args;
char *cmdline = (char *)(image_get_load (hdr) + 0x020c);
char *cmdline = (char *)(image_get_load(hdr) + 0x020c);
int len;
printf ("Booting Bluecat KDI ...\n");
udelay (200*1000); /* Allow serial port to flush */
if ((args = getenv ("bootargs")) == NULL)
printf("Booting Bluecat KDI ...\n");
udelay(200*1000); /* Allow serial port to flush */
if ((args = getenv("bootargs")) == NULL)
args = "";
/* Prepend the cmdline */
len = strlen (args);
if (len && (len + strlen (cmdline) + 2 < (0x0400 - 0x020c))) {
memmove (cmdline + strlen (args) + 1, cmdline, strlen (cmdline));
strcpy (cmdline, args);
len = strlen(args);
if (len && (len + strlen(cmdline) + 2 < (0x0400 - 0x020c))) {
memmove(cmdline + strlen(args) + 1, cmdline,
strlen(cmdline));
strcpy(cmdline, args);
cmdline[len] = ' ';
}
}
else {
printf ("Booting LynxOS KDI ...\n");
printf("Booting LynxOS KDI ...\n");
}
lynxkdi ();
lynxkdi();
}
#else
#error "Lynx KDI support not implemented for configured CPU"
......
This diff is collapsed.
......@@ -33,7 +33,7 @@
static image_header_t header;
static int image_check_image_types (uint8_t type)
static int image_check_image_types(uint8_t type)
{
if ((type > IH_TYPE_INVALID) && (type < IH_TYPE_FLATDT))
return EXIT_SUCCESS;
......@@ -41,14 +41,14 @@ static int image_check_image_types (uint8_t type)
return EXIT_FAILURE;
}
static int image_check_params (struct mkimage_params *params)
static int image_check_params(struct mkimage_params *params)
{
return ((params->dflag && (params->fflag || params->lflag)) ||
(params->fflag && (params->dflag || params->lflag)) ||
(params->lflag && (params->dflag || params->fflag)));
}
static int image_verify_header (unsigned char *ptr, int image_size,
static int image_verify_header(unsigned char *ptr, int image_size,
struct mkimage_params *params)
{
uint32_t len;
......@@ -62,10 +62,10 @@ static int image_verify_header (unsigned char *ptr, int image_size,
* checksum field for checking - this can't be done
* on the PROT_READ mapped data.
*/
memcpy (hdr, ptr, sizeof(image_header_t));
memcpy(hdr, ptr, sizeof(image_header_t));
if (be32_to_cpu(hdr->ih_magic) != IH_MAGIC) {
fprintf (stderr,
fprintf(stderr,
"%s: Bad Magic Number: \"%s\" is no valid image\n",
params->cmdname, params->imagefile);
return -FDT_ERR_BADMAGIC;
......@@ -77,8 +77,8 @@ static int image_verify_header (unsigned char *ptr, int image_size,
checksum = be32_to_cpu(hdr->ih_hcrc);
hdr->ih_hcrc = cpu_to_be32(0); /* clear for re-calculation */
if (crc32 (0, data, len) != checksum) {
fprintf (stderr,
if (crc32(0, data, len) != checksum) {
fprintf(stderr,
"%s: ERROR: \"%s\" has bad header checksum!\n",
params->cmdname, params->imagefile);
return -FDT_ERR_BADSTATE;
......@@ -88,8 +88,8 @@ static int image_verify_header (unsigned char *ptr, int image_size,
len = image_size - sizeof(image_header_t) ;
checksum = be32_to_cpu(hdr->ih_dcrc);
if (crc32 (0, data, len) != checksum) {
fprintf (stderr,
if (crc32(0, data, len) != checksum) {
fprintf(stderr,
"%s: ERROR: \"%s\" has corrupted data!\n",
params->cmdname, params->imagefile);
return -FDT_ERR_BADSTRUCTURE;
......@@ -97,36 +97,36 @@ static int image_verify_header (unsigned char *ptr, int image_size,
return 0;
}
static void image_set_header (void *ptr, struct stat *sbuf, int ifd,
static void image_set_header(void *ptr, struct stat *sbuf, int ifd,
struct mkimage_params *params)
{
uint32_t checksum;
image_header_t * hdr = (image_header_t *)ptr;
checksum = crc32 (0,
checksum = crc32(0,
(const unsigned char *)(ptr +
sizeof(image_header_t)),
sbuf->st_size - sizeof(image_header_t));
/* Build new header */
image_set_magic (hdr, IH_MAGIC);
image_set_time (hdr, sbuf->st_mtime);
image_set_size (hdr, sbuf->st_size - sizeof(image_header_t));
image_set_load (hdr, params->addr);
image_set_ep (hdr, params->ep);
image_set_dcrc (hdr, checksum);
image_set_os (hdr, params->os);
image_set_arch (hdr, params->arch);
image_set_type (hdr, params->type);
image_set_comp (hdr, params->comp);
image_set_name (hdr, params->imagename);
checksum = crc32 (0, (const unsigned char *)hdr,
image_set_magic(hdr, IH_MAGIC);
image_set_time(hdr, sbuf->st_mtime);
image_set_size(hdr, sbuf->st_size - sizeof(image_header_t));
image_set_load(hdr, params->addr);
image_set_ep(hdr, params->ep);
image_set_dcrc(hdr, checksum);
image_set_os(hdr, params->os);
image_set_arch(hdr, params->arch);
image_set_type(hdr, params->type);
image_set_comp(hdr, params->comp);
image_set_name(hdr, params->imagename);
checksum = crc32(0, (const unsigned char *)hdr,
sizeof(image_header_t));
image_set_hcrc (hdr, checksum);
image_set_hcrc(hdr, checksum);
}
/*
......@@ -143,7 +143,7 @@ static struct image_type_params defimage_params = {
.check_params = image_check_params,
};
void init_default_image_type (void)
void init_default_image_type(void)
{
mkimage_register (&defimage_params);
mkimage_register(&defimage_params);
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment