Merge branch 'pu/build-warnings'

arch/arm/configs/at91sam9n12ek_defconfig

@@ -6,7 +6,6 @@ CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS=y
 CONFIG_PBL_IMAGE=y
 CONFIG_MMU=y
 CONFIG_TEXT_BASE=0x26f00000
-CONFIG_BAREBOX_MAX_IMAGE_SIZE=0x40000
 CONFIG_EXPERIMENTAL=y
 CONFIG_MALLOC_TLSF=y
 CONFIG_PROMPT="9G20-EK:"

arch/arm/configs/eukrea_cpuimx51_defconfig

@@ -50,7 +50,6 @@ CONFIG_NET_DHCP=y
 CONFIG_NET_NFS=y
 CONFIG_NET_PING=y
 CONFIG_CMD_TFTP=y
-CONFIG_FS_TFTP=y
 CONFIG_NET_NETCONSOLE=y
 CONFIG_NET_RESOLV=y
 CONFIG_DRIVER_NET_FEC_IMX=y

arch/arm/configs/pcm027_defconfig

@@ -57,5 +57,4 @@ CONFIG_DRIVER_NET_SMC91111=y
 CONFIG_DRIVER_CFI=y
 CONFIG_VIDEO=y
 CONFIG_DRIVER_VIDEO_PXA=y
-CONFIG_FS_TFTP=y
 CONFIG_LZO_DECOMPRESS=y

arch/arm/mach-bcm2835/core.c

@@ -97,5 +97,7 @@ void __noreturn reset_cpu (unsigned long addr)
 	rstc |= PM_RSTC_WRCFG_FULL_RESET;
 	writel(PM_PASSWORD | RESET_TIMEOUT, PM_WDOG);
 	writel(PM_PASSWORD | rstc, PM_RSTC);
+
+	while (1);
 }
 EXPORT_SYMBOL(reset_cpu);

pbl/string.c

@@ -5,6 +5,7 @@
  */
 
 #include <linux/types.h>
+#include <linux/string.h>
 
 void *memcpy(void *__dest, __const void *__src, size_t __n)
 {
@@ -103,7 +104,7 @@ void *memchr(const void *s, int c, size_t count)
 	return NULL;
 }
 
-char *strchr(const char *s, int c)
+char *_strchr(const char *s, int c)
 {
 	while (*s != (char)c)
 		if (*s++ == '\0')
@@ -111,8 +112,6 @@ char *strchr(const char *s, int c)
 	return (char *)s;
 }
 
-#undef memset
-
 void *memset(void *s, int c, size_t count)
 {
 	char *xs = s;
@@ -120,8 +119,3 @@ void *memset(void *s, int c, size_t count)
 		*xs++ = c;
 	return s;
 }
-
-void __memzero(void *s, size_t count)
-{
-	memset(s, 0, count);
-}