Merge branch 'master' of git://git.denx.de/u-boot-mips

* 'master' of git://git.denx.de/u-boot-mips:
  MIPS: board.c: move extern declarations to u-boot-mips.h
  MIPS: bootm_qemu_mips.c: make checkpatch.pl clean
  MIPS: bootm.c: make checkpatch.pl clean

Signed-off-by: Wolfgang Denk <wd@denx.de>

arch/mips/include/asm/u-boot-mips.h

@@ -0,0 +1,11 @@
+/*
+ * This file is released under the terms of GPL v2 and any later version.
+ * See the file COPYING in the root directory of the source tree for details.
+ *
+ * Copyright (C) 2003 Wolfgang Denk, DENX Software Engineering, wd@denx.de
+ */
+
+extern ulong uboot_end_data;
+extern ulong uboot_end;
+
+extern int incaip_set_cpuclk(void);

arch/mips/lib/board.c

@@ -38,13 +38,6 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
-extern int timer_init(void);
-
-extern int incaip_set_cpuclk(void);
-
-extern ulong uboot_end_data;
-extern ulong uboot_end;
-
 ulong monitor_flash_len;
 
 static char *failed = "*** failed ***\n";

arch/mips/lib/bootm.c

@@ -43,7 +43,8 @@ static int	linux_env_idx;
 static void linux_params_init(ulong start, char *commandline);
 static void linux_env_set(char *env_name, char *env_val);
 
-int do_bootm_linux(int flag, int argc, char * const argv[], bootm_headers_t *images)
+int do_bootm_linux(int flag, int argc, char * const argv[],
+			bootm_headers_t *images)
 {
 	void (*theKernel) (int, char **, char **, int *);
 	char *commandline = getenv("bootargs");
@@ -70,7 +71,8 @@ int do_bootm_linux(int flag, int argc, char * const argv[], bootm_headers_t *ima
 	debug("## Giving linux memsize in bytes, %lu\n", (ulong)gd->ram_size);
 #else
 	sprintf(env_buf, "%lu", (ulong)(gd->ram_size >> 20));
-	debug ("## Giving linux memsize in MB, %lu\n", (ulong)(gd->ram_size >> 20));
+	debug("## Giving linux memsize in MB, %lu\n",
+		(ulong)(gd->ram_size >> 20));
 #endif /* CONFIG_MEMSIZE_IN_BYTES */
 
 	linux_env_set("memsize", env_buf);
@@ -88,19 +90,18 @@ int do_bootm_linux(int flag, int argc, char * const argv[], bootm_headers_t *ima
 	linux_env_set("flash_size", env_buf);
 
 	cp = getenv("ethaddr");
-	if (cp != NULL) {
+	if (cp)
 		linux_env_set("ethaddr", cp);
-	}
 
 	cp = getenv("eth1addr");
-	if (cp != NULL) {
+	if (cp)
 		linux_env_set("eth1addr", cp);
-	}
 
 	/* we assume that the kernel is in place */
 	printf("\nStarting kernel ...\n\n");
 
 	theKernel(linux_argc, linux_argv, linux_env, 0);
+
 	/* does not return */
 	return 1;
 }
@@ -120,20 +121,19 @@ static void linux_params_init (ulong start, char *line)
 		quote = strchr(line, '"');
 		next = strchr(line, ' ');
 
-		while (next != NULL && quote != NULL && quote < next) {
+		while (next && quote && quote < next) {
 			/* we found a left quote before the next blank
 			 * now we have to find the matching right quote
 			 */
 			next = strchr(quote + 1, '"');
-			if (next != NULL) {
+			if (next) {
 				quote = strchr(next + 1, '"');
 				next = strchr(next + 1, ' ');
 			}
 		}
 
-		if (next == NULL) {
+		if (!next)
 			next = line + strlen(line);
-		}
 
 		linux_argv[linux_argc] = argp;
 		memcpy(argp, line, next - line);

arch/mips/lib/bootm_qemu_mips.c

@@ -29,7 +29,8 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
-int do_bootm_linux(int flag, int argc, char * const argv[], bootm_headers_t *images)
+int do_bootm_linux(int flag, int argc, char * const argv[],
+			bootm_headers_t *images)
 {
 	void (*theKernel) (int, char **, char **, int *);
 	char *bootargs = getenv("bootargs");
@@ -71,6 +72,7 @@ int do_bootm_linux(int flag, int argc, char * const argv[], bootm_headers_t *ima
 	printf("\nStarting kernel ...\n\n");
 
 	theKernel(0, NULL, NULL, 0);
+
 	/* does not return */
 	return 1;
 }

include/common.h

@@ -355,6 +355,9 @@ int setenv_addr(const char *varname, const void *addr);
 # include <asm/mach-types.h>
 # include <asm/u-boot-nds32.h>
 #endif /* CONFIG_NDS32 */
+#ifdef CONFIG_MIPS
+# include <asm/u-boot-mips.h>
+#endif /* CONFIG_MIPS */
 
 #ifdef CONFIG_AUTO_COMPLETE
 int env_complete(char *var, int maxv, char *cmdv[], int maxsz, char *buf);