summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
Diffstat (limited to 'tools')
-rw-r--r--tools/Makefile2
-rw-r--r--tools/aisimage.c2
-rw-r--r--tools/aisimage.h2
-rw-r--r--tools/bddb/defs.php2
-rw-r--r--tools/buildman/README1
-rw-r--r--tools/env/fw_env.h2
-rw-r--r--tools/env/fw_env_main.c2
-rw-r--r--tools/imls/Makefile2
-rw-r--r--tools/imximage.c2
-rw-r--r--tools/imximage.h2
-rw-r--r--tools/kernel-doc/docproc.c52
-rwxr-xr-xtools/kernel-doc/kernel-doc2
-rw-r--r--tools/omapimage.c2
-rw-r--r--tools/omapimage.h2
-rw-r--r--tools/pblimage.h2
-rwxr-xr-xtools/reformat.py2
-rw-r--r--tools/ublimage.c2
-rw-r--r--tools/ublimage.h2
-rw-r--r--tools/ubsha1.c8
-rw-r--r--tools/updater/flash_hw.c2
20 files changed, 47 insertions, 48 deletions
diff --git a/tools/Makefile b/tools/Makefile
index c36cde2007..ca76f947e5 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -162,7 +162,7 @@ HOSTCPPFLAGS = -include $(SRCTREE)/include/libfdt_env.h \
-idirafter $(SRCTREE)/include \
-idirafter $(OBJTREE)/include2 \
-idirafter $(OBJTREE)/include \
- -I $(SRCTREE)/lib/libfdt \
+ -I $(SRCTREE)/lib/libfdt \
-I $(SRCTREE)/tools \
-DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE) \
-DUSE_HOSTCC \
diff --git a/tools/aisimage.c b/tools/aisimage.c
index 980bf2e1a7..04fb649899 100644
--- a/tools/aisimage.c
+++ b/tools/aisimage.c
@@ -2,7 +2,7 @@
* (C) Copyright 2011
* Stefano Babic, DENX Software Engineering, sbabic@denx.de.
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0+
*/
#include "mkimage.h"
diff --git a/tools/aisimage.h b/tools/aisimage.h
index 1f092dbc7e..e1aa3ef703 100644
--- a/tools/aisimage.h
+++ b/tools/aisimage.h
@@ -2,7 +2,7 @@
* (C) Copyright 2011
* Stefano Babic, DENX Software Engineering, sbabic@denx.de.
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _AISIMAGE_H_
diff --git a/tools/bddb/defs.php b/tools/bddb/defs.php
index b7518e3f79..0b50602823 100644
--- a/tools/bddb/defs.php
+++ b/tools/bddb/defs.php
@@ -178,7 +178,7 @@
function enum_to_index($name, $vals) {
$index = array_search($GLOBALS[$name], $vals);
if ($vals[0] != '')
- $index++;
+ $index++;
return $index;
}
diff --git a/tools/buildman/README b/tools/buildman/README
index f63f278673..090b653116 100644
--- a/tools/buildman/README
+++ b/tools/buildman/README
@@ -677,7 +677,6 @@ the build speed by building all commits for a board instead of the other
way around.
-
Simon Glass
sjg@chromium.org
Halloween 2012
diff --git a/tools/env/fw_env.h b/tools/env/fw_env.h
index 6208293790..aff471ba19 100644
--- a/tools/env/fw_env.h
+++ b/tools/env/fw_env.h
@@ -2,7 +2,7 @@
* (C) Copyright 2002-2008
* Wolfgang Denk, DENX Software Engineering, wd@denx.de.
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0+
*/
/* Pull in the current config to define the default environment */
diff --git a/tools/env/fw_env_main.c b/tools/env/fw_env_main.c
index 5f42df3889..2b85d78864 100644
--- a/tools/env/fw_env_main.c
+++ b/tools/env/fw_env_main.c
@@ -2,7 +2,7 @@
* (C) Copyright 2000-2008
* Wolfgang Denk, DENX Software Engineering, wd@denx.de.
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0+
*/
/*
diff --git a/tools/imls/Makefile b/tools/imls/Makefile
index 1be1edb16a..e371983275 100644
--- a/tools/imls/Makefile
+++ b/tools/imls/Makefile
@@ -39,7 +39,7 @@ LIBFDT_OBJS := $(addprefix $(obj),$(LIBFDT_OBJ_FILES-y))
HOSTCPPFLAGS = -idirafter $(SRCTREE)/include \
-idirafter $(OBJTREE)/include2 \
-idirafter $(OBJTREE)/include \
- -I $(SRCTREE)/lib/libfdt \
+ -I $(SRCTREE)/lib/libfdt \
-I $(SRCTREE)/tools \
-DUSE_HOSTCC -D__KERNEL_STRICT_NAMES
diff --git a/tools/imximage.c b/tools/imximage.c
index 32e4efe423..511e3f2038 100644
--- a/tools/imximage.c
+++ b/tools/imximage.c
@@ -6,7 +6,7 @@
* Marvell Semiconductor <www.marvell.com>
* Written-by: Prafulla Wadaskar <prafulla@marvell.com>
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0+
*/
#include "mkimage.h"
diff --git a/tools/imximage.h b/tools/imximage.h
index efe6a88d9e..01f861e7a5 100644
--- a/tools/imximage.h
+++ b/tools/imximage.h
@@ -2,7 +2,7 @@
* (C) Copyright 2009
* Stefano Babic, DENX Software Engineering, sbabic@denx.de.
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _IMXIMAGE_H_
diff --git a/tools/kernel-doc/docproc.c b/tools/kernel-doc/docproc.c
index d4fc42e4cc..a9b49c59a0 100644
--- a/tools/kernel-doc/docproc.c
+++ b/tools/kernel-doc/docproc.c
@@ -153,7 +153,7 @@ int symfilecnt = 0;
static void add_new_symbol(struct symfile *sym, char * symname)
{
sym->symbollist =
- realloc(sym->symbollist, (sym->symbolcnt + 1) * sizeof(char *));
+ realloc(sym->symbollist, (sym->symbolcnt + 1) * sizeof(char *));
sym->symbollist[sym->symbolcnt++].name = strdup(symname);
}
@@ -214,7 +214,7 @@ static void find_export_symbols(char * filename)
char *p;
char *e;
if (((p = strstr(line, "EXPORT_SYMBOL_GPL")) != NULL) ||
- ((p = strstr(line, "EXPORT_SYMBOL")) != NULL)) {
+ ((p = strstr(line, "EXPORT_SYMBOL")) != NULL)) {
/* Skip EXPORT_SYMBOL{_GPL} */
while (isalnum(*p) || *p == '_')
p++;
@@ -290,24 +290,24 @@ static void extfunc(char * filename) { docfunctions(filename, FUNCTION); }
static void singfunc(char * filename, char * line)
{
char *vec[200]; /* Enough for specific functions */
- int i, idx = 0;
- int startofsym = 1;
+ int i, idx = 0;
+ int startofsym = 1;
vec[idx++] = KERNELDOC;
vec[idx++] = DOCBOOK;
- /* Split line up in individual parameters preceded by FUNCTION */
- for (i=0; line[i]; i++) {
- if (isspace(line[i])) {
- line[i] = '\0';
- startofsym = 1;
- continue;
- }
- if (startofsym) {
- startofsym = 0;
- vec[idx++] = FUNCTION;
- vec[idx++] = &line[i];
- }
- }
+ /* Split line up in individual parameters preceded by FUNCTION */
+ for (i=0; line[i]; i++) {
+ if (isspace(line[i])) {
+ line[i] = '\0';
+ startofsym = 1;
+ continue;
+ }
+ if (startofsym) {
+ startofsym = 0;
+ vec[idx++] = FUNCTION;
+ vec[idx++] = &line[i];
+ }
+ }
for (i = 0; i < idx; i++) {
if (strcmp(vec[i], FUNCTION))
continue;
@@ -456,14 +456,14 @@ static void parse_file(FILE *infile)
break;
case 'D':
while (*s && !isspace(*s)) s++;
- *s = '\0';
- symbolsonly(line+2);
- break;
+ *s = '\0';
+ symbolsonly(line+2);
+ break;
case 'F':
/* filename */
while (*s && !isspace(*s)) s++;
*s++ = '\0';
- /* function names */
+ /* function names */
while (isspace(*s))
s++;
singlefunctions(line +2, s);
@@ -511,11 +511,11 @@ int main(int argc, char *argv[])
}
/* Open file, exit on error */
infile = fopen(argv[2], "r");
- if (infile == NULL) {
- fprintf(stderr, "docproc: ");
- perror(argv[2]);
- exit(2);
- }
+ if (infile == NULL) {
+ fprintf(stderr, "docproc: ");
+ perror(argv[2]);
+ exit(2);
+ }
if (strcmp("doc", argv[1]) == 0) {
/* Need to do this in two passes.
diff --git a/tools/kernel-doc/kernel-doc b/tools/kernel-doc/kernel-doc
index 6347418904..cbbf34c27c 100755
--- a/tools/kernel-doc/kernel-doc
+++ b/tools/kernel-doc/kernel-doc
@@ -432,7 +432,7 @@ sub dump_doc_section {
my $contents = join "\n", @_;
if ($no_doc_sections) {
- return;
+ return;
}
if (($function_only == 0) ||
diff --git a/tools/omapimage.c b/tools/omapimage.c
index 00853dd741..8774a7e3ac 100644
--- a/tools/omapimage.c
+++ b/tools/omapimage.c
@@ -11,7 +11,7 @@
* Marvell Semiconductor <www.marvell.com>
* Written-by: Prafulla Wadaskar <prafulla@marvell.com>
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0+
*/
#include "mkimage.h"
diff --git a/tools/omapimage.h b/tools/omapimage.h
index 058013498b..45d14eaf9c 100644
--- a/tools/omapimage.h
+++ b/tools/omapimage.h
@@ -4,7 +4,7 @@
* Author John Rigby <john.rigby@linaro.org>
* Based on TI's signGP.c
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _OMAPIMAGE_H_
diff --git a/tools/pblimage.h b/tools/pblimage.h
index a0f1fc53ab..12bece50a7 100644
--- a/tools/pblimage.h
+++ b/tools/pblimage.h
@@ -1,7 +1,7 @@
/*
* Copyright 2012 Freescale Semiconductor, Inc.
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef PBLIMAGE_H
diff --git a/tools/reformat.py b/tools/reformat.py
index 7e038905c2..61306d0235 100755
--- a/tools/reformat.py
+++ b/tools/reformat.py
@@ -49,7 +49,7 @@ try:
["ignore-case","default","split="])
except getopt.GetoptError as err:
print str(err) # will print something like "option -a not recognized"
- sys.exit(2)
+ sys.exit(2)
for o, a in opts:
if o in ("-s", "--split"):
diff --git a/tools/ublimage.c b/tools/ublimage.c
index b4ef7f080e..aafe248758 100644
--- a/tools/ublimage.c
+++ b/tools/ublimage.c
@@ -10,7 +10,7 @@
* Marvell Semiconductor <www.marvell.com>
* Written-by: Prafulla Wadaskar <prafulla@marvell.com>
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0+
*/
#include "mkimage.h"
diff --git a/tools/ublimage.h b/tools/ublimage.h
index b7318e9535..32cc5822ca 100644
--- a/tools/ublimage.h
+++ b/tools/ublimage.h
@@ -6,7 +6,7 @@
* (C) Copyright 2009
* Stefano Babic, DENX Software Engineering, sbabic@denx.de.
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _UBLIMAGE_H_
diff --git a/tools/ubsha1.c b/tools/ubsha1.c
index c003f9ad19..1041588d0b 100644
--- a/tools/ubsha1.c
+++ b/tools/ubsha1.c
@@ -63,10 +63,10 @@ int main (int argc, char **argv)
sha1_csum ((unsigned char *) data, len, (unsigned char *)output);
printf ("U-Boot sum:\n");
- for (i = 0; i < 20 ; i++) {
- printf ("%02X ", output[i]);
- }
- printf ("\n");
+ for (i = 0; i < 20 ; i++) {
+ printf ("%02X ", output[i]);
+ }
+ printf ("\n");
/* overwrite the sum in the bin file, with the actual */
lseek (ifd, SHA1_SUM_POS, SEEK_END);
if (write (ifd, output, SHA1_SUM_LEN) != SHA1_SUM_LEN) {
diff --git a/tools/updater/flash_hw.c b/tools/updater/flash_hw.c
index 254493345d..54a910b178 100644
--- a/tools/updater/flash_hw.c
+++ b/tools/updater/flash_hw.c
@@ -5,7 +5,7 @@
* (C) Copyright 2002
* Wolfgang Denk, DENX Software Engineering, wd@denx.de.
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0+
*/
#include <common.h>
View Lorry Controller Status