Merge branch 'for-next/warnings'

106 files changed, 140 insertions, 284 deletions

diff --git a/arch/arm/boards/animeo_ip/lowlevel.c b/arch/arm/boards/animeo_ip/lowlevel.c
index b16ef31bf0..25352672d7 100644
--- a/arch/arm/boards/animeo_ip/lowlevel.c
+++ b/arch/arm/boards/animeo_ip/lowlevel.c
@@ -14,7 +14,7 @@
 #include <mach/at91sam9260.h>
 #include <mach/hardware.h>
 
-void __naked __bare_init barebox_arm_reset_vector(void)
+void __naked __bare_init barebox_arm_reset_vector(uint32_t r0, uint32_t r1, uint32_t r2)
 {
 	arm_cpu_lowlevel_init();
 
diff --git a/arch/arm/boards/archosg9/lowlevel.c b/arch/arm/boards/archosg9/lowlevel.c
index c76d04b905..2a93428462 100644
--- a/arch/arm/boards/archosg9/lowlevel.c
+++ b/arch/arm/boards/archosg9/lowlevel.c
@@ -66,9 +66,9 @@ static noinline void archosg9_init_lowlevel(void)
 	omap4_ddr_init(&ddr_regs_400_mhz_2cs, &core);
 }
 
-void __naked __bare_init barebox_arm_reset_vector(uint32_t *data)
+void __naked __bare_init barebox_arm_reset_vector(uint32_t r0, uint32_t r1, uint32_t r2)
 {
-	omap4_save_bootinfo(data);
+	omap4_save_bootinfo((void *)r0);
 
 	arm_cpu_lowlevel_init();
 
diff --git a/arch/arm/boards/at91rm9200ek/lowlevel.c b/arch/arm/boards/at91rm9200ek/lowlevel.c
index a5c9058552..030c3dbf04 100644
--- a/arch/arm/boards/at91rm9200ek/lowlevel.c
+++ b/arch/arm/boards/at91rm9200ek/lowlevel.c
@@ -21,7 +21,7 @@ void static inline access_sdram(void)
 	writel(0x00000000, AT91_CHIPSELECT_1);
 }
 
-void __naked __bare_init barebox_arm_reset_vector(void)
+void __naked __bare_init barebox_arm_reset_vector(uint32_t r0, uint32_t r1, uint32_t r2)
 {
 	u32 r;
 	int i;
diff --git a/arch/arm/boards/at91sam9260ek/lowlevel.c b/arch/arm/boards/at91sam9260ek/lowlevel.c
index b16ef31bf0..25352672d7 100644
--- a/arch/arm/boards/at91sam9260ek/lowlevel.c
+++ b/arch/arm/boards/at91sam9260ek/lowlevel.c
@@ -14,7 +14,7 @@
 #include <mach/at91sam9260.h>
 #include <mach/hardware.h>
 
-void __naked __bare_init barebox_arm_reset_vector(void)
+void __naked __bare_init barebox_arm_reset_vector(uint32_t r0, uint32_t r1, uint32_t r2)
 {
 	arm_cpu_lowlevel_init();
 
diff --git a/arch/arm/boards/at91sam9261ek/lowlevel_init.c b/arch/arm/boards/at91sam9261ek/lowlevel_init.c
index 33aa9430dc..0d7f6d6590 100644
--- a/arch/arm/boards/at91sam9261ek/lowlevel_init.c
+++ b/arch/arm/boards/at91sam9261ek/lowlevel_init.c
@@ -117,7 +117,7 @@ static void __bare_init at91sam9261ek_init(void)
 	                  NULL);
 }
 
-void __naked __bare_init barebox_arm_reset_vector(void)
+void __naked __bare_init barebox_arm_reset_vector(uint32_t r0, uint32_t r1, uint32_t r2)
 {
 	arm_cpu_lowlevel_init();
 
diff --git a/arch/arm/boards/at91sam9m10g45ek/lowlevel.c b/arch/arm/boards/at91sam9m10g45ek/lowlevel.c
index 478ff11e1d..1d83cdf0bf 100644
--- a/arch/arm/boards/at91sam9m10g45ek/lowlevel.c
+++ b/arch/arm/boards/at91sam9m10g45ek/lowlevel.c
@@ -13,7 +13,7 @@
 #include <mach/hardware.h>
 #include <mach/at91sam9_ddrsdr.h>
 
-void __naked __bare_init barebox_arm_reset_vector(void)
+void __naked __bare_init barebox_arm_reset_vector(uint32_t r0, uint32_t r1, uint32_t r2)
 {
 	arm_cpu_lowlevel_init();
 
diff --git a/arch/arm/boards/at91sam9m10ihd/lowlevel.c b/arch/arm/boards/at91sam9m10ihd/lowlevel.c
index d5940b987a..4ccbb93557 100644
--- a/arch/arm/boards/at91sam9m10ihd/lowlevel.c
+++ b/arch/arm/boards/at91sam9m10ihd/lowlevel.c
@@ -14,7 +14,7 @@
 #include <mach/at91sam9g45.h>
 #include <mach/hardware.h>
 
-void __naked __bare_init barebox_arm_reset_vector(void)
+void __naked __bare_init barebox_arm_reset_vector(uint32_t r0, uint32_t r1, uint32_t r2)
 {
 	arm_cpu_lowlevel_init();
 
diff --git a/arch/arm/boards/at91sam9n12ek/lowlevel.c b/arch/arm/boards/at91sam9n12ek/lowlevel.c
index 47079336e6..f57e439b9e 100644
--- a/arch/arm/boards/at91sam9n12ek/lowlevel.c
+++ b/arch/arm/boards/at91sam9n12ek/lowlevel.c
@@ -13,7 +13,7 @@
 #include <mach/at91sam9_ddrsdr.h>
 #include <mach/hardware.h>
 
-void __naked __bare_init barebox_arm_reset_vector(void)
+void __naked __bare_init barebox_arm_reset_vector(uint32_t r0, uint32_t r1, uint32_t r2)
 {
 	arm_cpu_lowlevel_init();
 
diff --git a/arch/arm/boards/avnet-zedboard/lowlevel.c b/arch/arm/boards/avnet-zedboard/lowlevel.c
index 7770bcb7cf..cf3c4ebd0c 100644
--- a/arch/arm/boards/avnet-zedboard/lowlevel.c
+++ b/arch/arm/boards/avnet-zedboard/lowlevel.c
@@ -27,7 +27,7 @@
 #define PLL_DDR_LOCK	(1 << 1)
 #define PLL_IO_LOCK	(1 << 2)
 
-void __naked barebox_arm_reset_vector(void)
+void __naked barebox_arm_reset_vector(uint32_t r0, uint32_t r1, uint32_t r2)
 {
 	/* open sesame */
 	writel(0x0000DF0D, ZYNQ_SLCR_UNLOCK);
diff --git a/arch/arm/boards/canon-a1100/lowlevel.c b/arch/arm/boards/canon-a1100/lowlevel.c
index 5f4297ea4c..744ce59eaa 100644
--- a/arch/arm/boards/canon-a1100/lowlevel.c
+++ b/arch/arm/boards/canon-a1100/lowlevel.c
@@ -3,7 +3,7 @@
 #include <asm/barebox-arm-head.h>
 #include <asm/barebox-arm.h>
 
-void __naked barebox_arm_reset_vector(void)
+void __naked barebox_arm_reset_vector(uint32_t r0, uint32_t r1, uint32_t r2)
 {
 	arm_cpu_lowlevel_init();
 
diff --git a/arch/arm/boards/chumby_falconwing/lowlevel.c b/arch/arm/boards/chumby_falconwing/lowlevel.c
index bfc76cc7d4..50bacc620f 100644
--- a/arch/arm/boards/chumby_falconwing/lowlevel.c
+++ b/arch/arm/boards/chumby_falconwing/lowlevel.c
@@ -4,7 +4,7 @@
 #include <asm/barebox-arm.h>
 #include <mach/imx23-regs.h>
 
-void __naked barebox_arm_reset_vector(void)
+void __naked barebox_arm_reset_vector(uint32_t r0, uint32_t r1, uint32_t r2)
 {
 	arm_cpu_lowlevel_init();
 	barebox_arm_entry(IMX_MEMORY_BASE, SZ_64M, NULL);
diff --git a/arch/arm/boards/clep7212/lowlevel.c b/arch/arm/boards/clep7212/lowlevel.c
index ac715065f1..231329025b 100644
--- a/arch/arm/boards/clep7212/lowlevel.c
+++ b/arch/arm/boards/clep7212/lowlevel.c
@@ -20,7 +20,7 @@
 # define CLPS711X_CPU_PLL_MULT	40
 #endif
 
-void __naked __bare_init barebox_arm_reset_vector(void)
+void __naked __bare_init barebox_arm_reset_vector(uint32_t r0, uint32_t r1, uint32_t r2)
 {
 	arm_cpu_lowlevel_init();
 
diff --git a/arch/arm/boards/crystalfontz-cfa10036/hwdetect.c b/arch/arm/boards/crystalfontz-cfa10036/hwdetect.c
index c94cb355e2..e4ccbdb2a3 100644
--- a/arch/arm/boards/crystalfontz-cfa10036/hwdetect.c
+++ b/arch/arm/boards/crystalfontz-cfa10036/hwdetect.c
@@ -26,6 +26,8 @@
 
 #include <asm/armlinux.h>
 
+#include "hwdetect.h"
+
 enum board_type {
 	BOARD_ID_CFA10036 = 0,
 	BOARD_ID_CFA10037 = 1,
diff --git a/arch/arm/boards/crystalfontz-cfa10036/lowlevel.c b/arch/arm/boards/crystalfontz-cfa10036/lowlevel.c
index 3c7248ef65..50dbcdc150 100644
--- a/arch/arm/boards/crystalfontz-cfa10036/lowlevel.c
+++ b/arch/arm/boards/crystalfontz-cfa10036/lowlevel.c
@@ -4,7 +4,7 @@
 #include <asm/barebox-arm.h>
 #include <mach/imx28-regs.h>
 
-void __naked barebox_arm_reset_vector(void)
+void __naked barebox_arm_reset_vector(uint32_t r0, uint32_t r1, uint32_t r2d)
 {
 	arm_cpu_lowlevel_init();
 	barebox_arm_entry(IMX_MEMORY_BASE, SZ_128M, NULL);
diff --git a/arch/arm/boards/dss11/lowlevel.c b/arch/arm/boards/dss11/lowlevel.c
index b16ef31bf0..25352672d7 100644
--- a/arch/arm/boards/dss11/lowlevel.c
+++ b/arch/arm/boards/dss11/lowlevel.c
@@ -14,7 +14,7 @@
 #include <mach/at91sam9260.h>
 #include <mach/hardware.h>
 
-void __naked __bare_init barebox_arm_reset_vector(void)
+void __naked __bare_init barebox_arm_reset_vector(uint32_t r0, uint32_t r1, uint32_t r2)
 {
 	arm_cpu_lowlevel_init();
 
diff --git a/arch/arm/boards/eukrea_cpuimx25/lowlevel.c b/arch/arm/boards/eukrea_cpuimx25/lowlevel.c
index 7ae8a18e06..555dd44445 100644
--- a/arch/arm/boards/eukrea_cpuimx25/lowlevel.c
+++ b/arch/arm/boards/eukrea_cpuimx25/lowlevel.c
@@ -30,7 +30,7 @@
 #include <asm-generic/memory_layout.h>
 #include <asm/system.h>
 
-void __bare_init __naked barebox_arm_reset_vector(void)
+void __bare_init __naked barebox_arm_reset_vector(uint32_t r0, uint32_t r1, uint32_t r2)
 {
 	uint32_t r;
 	register uint32_t loops = 0x20000;
diff --git a/arch/arm/boards/eukrea_cpuimx35/lowlevel.c b/arch/arm/boards/eukrea_cpuimx35/lowlevel.c
index aca77a7fbf..be78b48bd0 100644
--- a/arch/arm/boards/eukrea_cpuimx35/lowlevel.c
+++ b/arch/arm/boards/eukrea_cpuimx35/lowlevel.c
@@ -30,7 +30,7 @@
 #include <asm-generic/memory_layout.h>
 #include <asm/system.h>
 
-void __bare_init __naked barebox_arm_reset_vector(void)
+void __bare_init __naked barebox_arm_reset_vector(uint32_t r0, uint32_t r1, uint32_t r2)
 {
 	uint32_t r, s;
 	unsigned long ccm_base = MX35_CCM_BASE_ADDR;
diff --git a/arch/arm/boards/eukrea_cpuimx51/lowlevel.c b/arch/arm/boards/eukrea_cpuimx51/lowlevel.c
index ad89076329..e09f58e29c 100644
--- a/arch/arm/boards/eukrea_cpuimx51/lowlevel.c
+++ b/arch/arm/boards/eukrea_cpuimx51/lowlevel.c
@@ -3,7 +3,7 @@
 #include <mach/generic.h>
 #include <asm/barebox-arm-head.h>
 
-void __naked barebox_arm_reset_vector(void)
+void __naked barebox_arm_reset_vector(uint32_t r0, uint32_t r1, uint32_t r2)
 {
 	imx5_cpu_lowlevel_init();
 	arm_setup_stack(0x20000000 - 16);
diff --git a/arch/arm/boards/freescale-mx23-evk/lowlevel.c b/arch/arm/boards/freescale-mx23-evk/lowlevel.c
index b260f3a7fa..13c7435cd6 100644
--- a/arch/arm/boards/freescale-mx23-evk/lowlevel.c
+++ b/arch/arm/boards/freescale-mx23-evk/lowlevel.c
@@ -4,7 +4,7 @@
 #include <asm/barebox-arm.h>
 #include <mach/imx23-regs.h>
 
-void __naked barebox_arm_reset_vector(void)
+void __naked barebox_arm_reset_vector(uint32_t r0, uint32_t r1, uint32_t r2)
 {
 	arm_cpu_lowlevel_init();
 	barebox_arm_entry(IMX_MEMORY_BASE, SZ_32M, NULL);
diff --git a/arch/arm/boards/freescale-mx53-smd/lowlevel.c b/arch/arm/boards/freescale-mx53-smd/lowlevel.c
index 88c461da73..c929d274f2 100644
--- a/arch/arm/boards/freescale-mx53-smd/lowlevel.c
+++ b/arch/arm/boards/freescale-mx53-smd/lowlevel.c
@@ -4,7 +4,7 @@
 #include <mach/generic.h>
 #include <asm/barebox-arm-head.h>
 
-void __naked barebox_arm_reset_vector(void)
+void __naked barebox_arm_reset_vector(uint32_t r0, uint32_t r1, uint32_t r2)
 {
 	imx5_cpu_lowlevel_init();
 	arm_setup_stack(MX53_IRAM_BASE_ADDR + MX53_IRAM_SIZE - 8);
diff --git a/arch/arm/boards/friendlyarm-mini6410/lowlevel.c b/arch/arm/boards/friendlyarm-mini6410/lowlevel.c
index 665c31b324..ccbdd13795 100644
--- a/arch/arm/boards/friendlyarm-mini6410/lowlevel.c
+++ b/arch/arm/boards/friendlyarm-mini6410/lowlevel.c
@@ -4,7 +4,7 @@
 #include <asm/barebox-arm-head.h>
 #include <mach/s3c-iomap.h>
 
-void __naked barebox_arm_reset_vector(void)
+void __naked barebox_arm_reset_vector(uint32_t r0, uint32_t r1, uint32_t r2)
 {
 	arm_cpu_lowlevel_init();
 	barebox_arm_entry(S3C_SDRAM_BASE, SZ_128M, NULL);
diff --git a/arch/arm/boards/friendlyarm-tiny210/lowlevel.c b/arch/arm/boards/friendlyarm-tiny210/lowlevel.c
index 4b9ba87d70..17a7cf1591 100644
--- a/arch/arm/boards/friendlyarm-tiny210/lowlevel.c
+++ b/arch/arm/boards/friendlyarm-tiny210/lowlevel.c
@@ -53,7 +53,8 @@ static inline void __bare_init debug_led(int led, bool state)
 #define ADDR_V210_SDMMC_BASE	0xD0037488
 #define ADDR_CopySDMMCtoMem	0xD0037F98
 
-int __bare_init s5p_irom_load_mmc(void *dest, uint32_t start_block, uint16_t block_count)
+static int __bare_init s5p_irom_load_mmc(void *dest, uint32_t start_block,
+					 uint16_t block_count)
 {
 	typedef uint32_t (*func_t) (int32_t, uint32_t, uint16_t, uint32_t*, int8_t);
 	uint32_t chbase = readl(ADDR_V210_SDMMC_BASE);
@@ -78,7 +79,7 @@ static __bare_init bool load_stage2(void *dest, size_t size)
 	return s5p_irom_load_mmc(dest, 1, (size+ 511) / 512);
 }
 
-void __bare_init barebox_arm_reset_vector(void)
+void __bare_init barebox_arm_reset_vector(uint32_t r0, uint32_t r1, uint32_t r2)
 {
 	arm_cpu_lowlevel_init();
 
diff --git a/arch/arm/boards/friendlyarm-tiny6410/lowlevel.c b/arch/arm/boards/friendlyarm-tiny6410/lowlevel.c
index 665c31b324..ccbdd13795 100644
--- a/arch/arm/boards/friendlyarm-tiny6410/lowlevel.c
+++ b/arch/arm/boards/friendlyarm-tiny6410/lowlevel.c
@@ -4,7 +4,7 @@
 #include <asm/barebox-arm-head.h>
 #include <mach/s3c-iomap.h>
 
-void __naked barebox_arm_reset_vector(void)
+void __naked barebox_arm_reset_vector(uint32_t r0, uint32_t r1, uint32_t r2)
 {
 	arm_cpu_lowlevel_init();
 	barebox_arm_entry(S3C_SDRAM_BASE, SZ_128M, NULL);
diff --git a/arch/arm/boards/friendlyarm-tiny6410/tiny6410.c b/arch/arm/boards/friendlyarm-tiny6410/tiny6410.c
index e066a43dbe..39179c83d8 100644
--- a/arch/arm/boards/friendlyarm-tiny6410/tiny6410.c
+++ b/arch/arm/boards/friendlyarm-tiny6410/tiny6410.c
@@ -21,6 +21,8 @@
 #include <mach/s3c-generic.h>
 #include <mach/iomux.h>
 
+#include "tiny6410.h"
+
 static const unsigned tiny6410_pin_usage[] = {
 	/* UART0 */
 	GPA2_GPIO | GPIO_IN | ENABLE_PU, /* CTS not connected */
diff --git a/arch/arm/boards/guf-cupid/lowlevel.c b/arch/arm/boards/guf-cupid/lowlevel.c
index 66d76ae795..e84ae2c415 100644
--- a/arch/arm/boards/guf-cupid/lowlevel.c
+++ b/arch/arm/boards/guf-cupid/lowlevel.c
@@ -158,9 +158,8 @@ static void __bare_init noinline setup_sdram(u32 memsize, u32 mode, u32 sdram_ad
 #define UNALIGNED_ACCESS_ENABLE
 #define LOW_INT_LATENCY_ENABLE
 
-void __bare_init __naked barebox_arm_reset_vector(void)
+void __bare_init __naked barebox_arm_reset_vector(uint32_t r0, uint32_t r1, uint32_t r2)
 {
-	u32 r0, r1;
 	void *iomuxc_base = (void *)MX35_IOMUXC_BASE_ADDR;
 	int i;
 
diff --git a/arch/arm/boards/guf-neso/lowlevel.c b/arch/arm/boards/guf-neso/lowlevel.c
index 98512a976c..6c22784599 100644
--- a/arch/arm/boards/guf-neso/lowlevel.c
+++ b/arch/arm/boards/guf-neso/lowlevel.c
@@ -32,7 +32,7 @@
 
 #define ESDCTL0_VAL (ESDCTL0_SDE | ESDCTL0_ROW13 | ESDCTL0_COL10)
 
-void __bare_init __naked barebox_arm_reset_vector(void)
+void __bare_init __naked barebox_arm_reset_vector(uint32_t r0, uint32_t r1, uint32_t r2)
 {
 	uint32_t r;
 	int i;
diff --git a/arch/arm/boards/haba-knx/lowlevel.c b/arch/arm/boards/haba-knx/lowlevel.c
index b16ef31bf0..25352672d7 100644
--- a/arch/arm/boards/haba-knx/lowlevel.c
+++ b/arch/arm/boards/haba-knx/lowlevel.c
@@ -14,7 +14,7 @@
 #include <mach/at91sam9260.h>
 #include <mach/hardware.h>
 
-void __naked __bare_init barebox_arm_reset_vector(void)
+void __naked __bare_init barebox_arm_reset_vector(uint32_t r0, uint32_t r1, uint32_t r2)
 {
 	arm_cpu_lowlevel_init();
 
diff --git a/arch/arm/boards/highbank/lowlevel.c b/arch/arm/boards/highbank/lowlevel.c
index 83f4c7ad15..6363ec96df 100644
--- a/arch/arm/boards/highbank/lowlevel.c
+++ b/arch/arm/boards/highbank/lowlevel.c
@@ -10,7 +10,7 @@
 #include <asm/barebox-arm.h>
 #include <asm/system_info.h>
 
-void __naked barebox_arm_reset_vector(void)
+void __naked barebox_arm_reset_vector(uint32_t r0, uint32_t r1, uint32_t r2)
 {
 	arm_cpu_lowlevel_init();
 	barebox_arm_entry(0x00000000, SZ_512M, NULL);
diff --git a/arch/arm/boards/imx233-olinuxino/lowlevel.c b/arch/arm/boards/imx233-olinuxino/lowlevel.c
index 5f36c17e52..07a2a0e293 100644
--- a/arch/arm/boards/imx233-olinuxino/lowlevel.c
+++ b/arch/arm/boards/imx233-olinuxino/lowlevel.c
@@ -115,7 +115,7 @@ static const uint32_t pad_setup[] = {
 
 
 /* Fine-tune the DRAM configuration. */
-void imx23_olinuxino_adjust_memory_params(uint32_t *dram_vals)
+static void imx23_olinuxino_adjust_memory_params(uint32_t *dram_vals)
 {
 	/* Enable Auto Precharge. */
 	dram_vals[3] |= 1 << 8;
diff --git a/arch/arm/boards/karo-tx51/lowlevel.c b/arch/arm/boards/karo-tx51/lowlevel.c
index ad89076329..e09f58e29c 100644
--- a/arch/arm/boards/karo-tx51/lowlevel.c
+++ b/arch/arm/boards/karo-tx51/lowlevel.c
@@ -3,7 +3,7 @@
 #include <mach/generic.h>
 #include <asm/barebox-arm-head.h>
 
-void __naked barebox_arm_reset_vector(void)
+void __naked barebox_arm_reset_vector(uint32_t r0, uint32_t r1, uint32_t r2)
 {
 	imx5_cpu_lowlevel_init();
 	arm_setup_stack(0x20000000 - 16);
diff --git a/arch/arm/boards/kindle3/kindle3.c b/arch/arm/boards/kindle3/kindle3.c
index 95ae49cb08..1d966ff55a 100644
--- a/arch/arm/boards/kindle3/kindle3.c
+++ b/arch/arm/boards/kindle3/kindle3.c
@@ -86,7 +86,7 @@ BAREBOX_MAGICVAR_NAMED(global_atags_revision16, global.board.revision16,
 /* The Kindle3 Kernel expects two custom ATAGs, ATAG_REVISION16 describing
  * the board and ATAG_SERIAL16 to identify the individual device.
  */
-struct tag *kindle3_append_atags(struct tag *params)
+static struct tag *kindle3_append_atags(struct tag *params)
 {
 	params = setup_16char_tag(params, ATAG_SERIAL16,
 				get_env_16char_tag("global.board.serial16"));
diff --git a/arch/arm/boards/kindle3/lowlevel.c b/arch/arm/boards/kindle3/lowlevel.c
index 58e6318f65..689767f8d6 100644
--- a/arch/arm/boards/kindle3/lowlevel.c
+++ b/arch/arm/boards/kindle3/lowlevel.c
@@ -31,7 +31,7 @@
 #include <asm-generic/memory_layout.h>
 #include <asm/system.h>
 
-void __bare_init __naked barebox_arm_reset_vector(void)
+void __bare_init __naked barebox_arm_reset_vector(uint32_t r0, uint32_t r1, uint32_t r2)
 {
 	uint32_t r, s;
 	unsigned long ccm_base = MX35_CCM_BASE_ADDR;
diff --git a/arch/arm/boards/lubbock/lowlevel.c b/arch/arm/boards/lubbock/lowlevel.c
index 1c52b3e36b..abf9e7a98a 100644
--- a/arch/arm/boards/lubbock/lowlevel.c
+++ b/arch/arm/boards/lubbock/lowlevel.c
@@ -169,7 +169,7 @@ static inline void pxa2xx_dram_init(void)
 	}
 }
 
-void __bare_init __naked barebox_arm_reset_vector(void)
+void __bare_init __naked barebox_arm_reset_vector(uint32_t r0, uint32_t r1, uint32_t r2)
 {
 	unsigned long pssr = PSPR;
 	unsigned long pc = get_pc();
diff --git a/arch/arm/boards/mainstone/lowlevel.c b/arch/arm/boards/mainstone/lowlevel.c
index 89839415d4..31f9d76513 100644
--- a/arch/arm/boards/mainstone/lowlevel.c
+++ b/arch/arm/boards/mainstone/lowlevel.c
@@ -241,7 +241,7 @@ static inline void pxa2xx_dram_init(void)
 	}
 }
 
-void __bare_init __naked barebox_arm_reset_vector(void)
+void __bare_init __naked barebox_arm_reset_vector(uint32_t r0, uint32_t r1, uint32_t r2)
 {
 	unsigned long pssr = PSPR;
 	unsigned long pc = get_pc();
diff --git a/arch/arm/boards/mioa701/lowlevel.c b/arch/arm/boards/mioa701/lowlevel.c
index bfb8bad1cc..ee0546ea63 100644
--- a/arch/arm/boards/mioa701/lowlevel.c
+++ b/arch/arm/boards/mioa701/lowlevel.c
@@ -3,7 +3,7 @@
 #include <asm/barebox-arm-head.h>
 #include <asm/barebox-arm.h>
 
-void __naked barebox_arm_reset_vector(void)
+void __naked barebox_arm_reset_vector(uint32_t r0, uint32_t r1, uint32_t r2)
 {
 	arm_cpu_lowlevel_init();
 	barebox_arm_entry(0xa0000000, SZ_64M, NULL);
diff --git a/arch/arm/boards/module-mb7707/lowlevel.c b/arch/arm/boards/module-mb7707/lowlevel.c
index 0258be6e4b..055e432c1c 100644
--- a/arch/arm/boards/module-mb7707/lowlevel.c
+++ b/arch/arm/boards/module-mb7707/lowlevel.c
@@ -26,7 +26,7 @@
 #define MB7707_SRAM_BASE 0x40000000
 #define MB7707_SRAM_SIZE SZ_128M
 
-void __naked __bare_init barebox_arm_reset_vector(void)
+void __naked __bare_init barebox_arm_reset_vector(uint32_t r0, uint32_t r1, uint32_t r2)
 {
 	arm_cpu_lowlevel_init();
 
diff --git a/arch/arm/boards/mx31moboard/lowlevel.c b/arch/arm/boards/mx31moboard/lowlevel.c
index 02b7ab3c7a..c93f76265c 100644
--- a/arch/arm/boards/mx31moboard/lowlevel.c
+++ b/arch/arm/boards/mx31moboard/lowlevel.c
@@ -102,7 +102,7 @@ static noinline __noreturn void mx31moboard_startup(void)
 
 }
 
-void __bare_init __naked barebox_arm_reset_vector(void)
+void __bare_init __naked barebox_arm_reset_vector(uint32_t r0, uint32_t r1, uint32_t r2)
 {
 	arm_cpu_lowlevel_init();
 
diff --git a/arch/arm/boards/nhk8815/lowlevel.c b/arch/arm/boards/nhk8815/lowlevel.c
index 33a785fee0..a9ccf1fff5 100644
--- a/arch/arm/boards/nhk8815/lowlevel.c
+++ b/arch/arm/boards/nhk8815/lowlevel.c
@@ -3,7 +3,7 @@
 #include <asm/barebox-arm-head.h>
 #include <asm/barebox-arm.h>
 
-void __naked barebox_arm_reset_vector(void)
+void __naked barebox_arm_reset_vector(uint32_t r0, uint32_t r1, uint32_t r2)
 {
 	arm_cpu_lowlevel_init();
 	barebox_arm_entry(0x0, SZ_64M, NULL);
diff --git a/arch/arm/boards/omap343xdsp/lowlevel.c b/arch/arm/boards/omap343xdsp/lowlevel.c
index 318bb9aeb1..fb99ea9278 100644
--- a/arch/arm/boards/omap343xdsp/lowlevel.c
+++ b/arch/arm/boards/omap343xdsp/lowlevel.c
@@ -548,9 +548,9 @@ static int sdp343x_board_init(void)
 	return 0;
 }
 
-void __naked __bare_init barebox_arm_reset_vector(uint32_t *data)
+void __naked __bare_init barebox_arm_reset_vector(uint32_t r0, uint32_t r1, uint32_t r2)
 {
-	omap3_save_bootinfo(data);
+	omap3_save_bootinfo((void *)r0);
 
 	arm_cpu_lowlevel_init();
 
diff --git a/arch/arm/boards/omap3evm/lowlevel.c b/arch/arm/boards/omap3evm/lowlevel.c
index d8a1b9f61d..e06ece2560 100644
--- a/arch/arm/boards/omap3evm/lowlevel.c
+++ b/arch/arm/boards/omap3evm/lowlevel.c
@@ -161,9 +161,9 @@ static int omap3_evm_board_init(void)
 	return 0;
 }
 
-void __naked __bare_init barebox_arm_reset_vector(uint32_t *data)
+void __naked __bare_init barebox_arm_reset_vector(uint32_t r0, uint32_t r1, uint32_t r2)
 {
-	omap3_save_bootinfo(data);
+	omap3_save_bootinfo((void *)r0);
 
 	arm_cpu_lowlevel_init();
 
diff --git a/arch/arm/boards/panda/lowlevel.c b/arch/arm/boards/panda/lowlevel.c
index 005485ba45..006fb627dd 100644
--- a/arch/arm/boards/panda/lowlevel.c
+++ b/arch/arm/boards/panda/lowlevel.c
@@ -79,9 +79,9 @@ static void noinline panda_init_lowlevel(void)
 		omap4460_scale_vcores(TPS62361_VSEL0_GPIO, 1210);
 }
 
-void __bare_init __naked barebox_arm_reset_vector(uint32_t *data)
+void __bare_init __naked barebox_arm_reset_vector(uint32_t r0, uint32_t r1, uint32_t r2)
 {
-	omap4_save_bootinfo(data);
+	omap4_save_bootinfo((void *)r0);
 
 	arm_cpu_lowlevel_init();
 
diff --git a/arch/arm/boards/phytec-phycard-imx27/lowlevel.c b/arch/arm/boards/phytec-phycard-imx27/lowlevel.c
index 1e96c0893f..09994e4492 100644
--- a/arch/arm/boards/phytec-phycard-imx27/lowlevel.c
+++ b/arch/arm/boards/phytec-phycard-imx27/lowlevel.c
@@ -77,7 +77,7 @@ static void sdram_init(int sdram)
 			MX27_ESDCTL_BASE_ADDR + IMX_ESDCTL0);
 }
 
-void __bare_init __naked phytec_phycard_imx27_common_init(void *fdt, int sdram)
+static void __bare_init __naked phytec_phycard_imx27_common_init(void *fdt, int sdram)
 {
 	unsigned long r;
 
diff --git a/arch/arm/boards/phytec-phycard-omap3/lowlevel.c b/arch/arm/boards/phytec-phycard-omap3/lowlevel.c
index 27b56b1e0c..54d8eaaddf 100644
--- a/arch/arm/boards/phytec-phycard-omap3/lowlevel.c
+++ b/arch/arm/boards/phytec-phycard-omap3/lowlevel.c
@@ -48,7 +48,7 @@ struct sdrc_config {
 /*********************************************************************
  * init_sdram_ddr() - Init DDR controller.
  *********************************************************************/
-void init_sdram_ddr(void)
+static void init_sdram_ddr(void)
 {
 	/* reset sdrc controller */
 	writel(SOFTRESET, OMAP3_SDRC_REG(SYSCONFIG));
@@ -67,7 +67,7 @@ void init_sdram_ddr(void)
 /*********************************************************************
  * config_sdram_ddr() - Init DDR on dev board.
  *********************************************************************/
-void config_sdram_ddr(u8 cs, u8 cfg)
+static void config_sdram_ddr(u8 cs, u8 cfg)
 {
 
 	writel(sdrc_config[cfg].mcfg, OMAP3_SDRC_REG(MCFG_0) + (0x30 * cs));
@@ -252,9 +252,9 @@ static int pcaal1_board_init(void)
 	return 0;
 }
 
-void __bare_init __naked barebox_arm_reset_vector(uint32_t *data)
+void __bare_init __naked barebox_arm_reset_vector(uint32_t r0, uint32_t r1, uint32_t r2)
 {
-	omap3_save_bootinfo(data);
+	omap3_save_bootinfo((void *)r0);
 
 	arm_cpu_lowlevel_init();
 
diff --git a/arch/arm/boards/phytec-phycard-omap4/lowlevel.c b/arch/arm/boards/phytec-phycard-omap4/lowlevel.c
index 170ca6896b..c49c4ca841 100644
--- a/arch/arm/boards/phytec-phycard-omap4/lowlevel.c
+++ b/arch/arm/boards/phytec-phycard-omap4/lowlevel.c
@@ -89,9 +89,9 @@ static noinline void pcaaxl2_init_lowlevel(void)
 	sr32(0x4A30a110, 2, 2, 0x3);  /* enable clocks */
 }
 
-void __bare_init __naked barebox_arm_reset_vector(uint32_t *data)
+void __bare_init __naked barebox_arm_reset_vector(uint32_t r0, uint32_t r1, uint32_t r2)
 {
-	omap4_save_bootinfo(data);
+	omap4_save_bootinfo((void *)r0);
 
 	arm_cpu_lowlevel_init();
 
diff --git a/arch/arm/boards/phytec-phycore-imx31/lowlevel.c b/arch/arm/boards/phytec-phycore-imx31/lowlevel.c
index a3ba1c05dd..19296e5dac 100644
--- a/arch/arm/boards/phytec-phycore-imx31/lowlevel.c
+++ b/arch/arm/boards/phytec-phycore-imx31/lowlevel.c
@@ -31,7 +31,7 @@
 
 #define ESDCTL0_VAL (ESDCTL0_SDE | ESDCTL0_ROW13 | ESDCTL0_COL10)
 
-void __bare_init __naked barebox_arm_reset_vector(void)
+void __bare_init __naked barebox_arm_reset_vector(uint32_t r0, uint32_t r1, uint32_t r2)
 {
 	uint32_t r;
 	volatile int v;
diff --git a/arch/arm/boards/phytec-phycore-imx35/lowlevel.c b/arch/arm/boards/phytec-phycore-imx35/lowlevel.c
index 5e2f335efa..6bfa0acce3 100644
--- a/arch/arm/boards/phytec-phycore-imx35/lowlevel.c
+++ b/arch/arm/boards/phytec-phycore-imx35/lowlevel.c
@@ -35,7 +35,7 @@
 #define CCM_PDR0_399	0x00011000
 #define CCM_PDR0_532	0x00001000
 
-void __bare_init __naked barebox_arm_reset_vector(void)
+void __bare_init __naked barebox_arm_reset_vector(uint32_t r0, uint32_t r1, uint32_t r2)
 {
 	uint32_t r, s;
 	unsigned long ccm_base = MX35_CCM_BASE_ADDR;
diff --git a/arch/arm/boards/phytec-phycore-omap4460/lowlevel.c b/arch/arm/boards/phytec-phycore-omap4460/lowlevel.c
index 02297adb95..6511dae9d4 100644
--- a/arch/arm/boards/phytec-phycore-omap4460/lowlevel.c
+++ b/arch/arm/boards/phytec-phycore-omap4460/lowlevel.c
@@ -139,9 +139,9 @@ static void noinline pcm049_init_lowlevel(void)
 	sr32(OMAP44XX_SCRM_ALTCLKSRC, 2, 2, 0x3);  /* enable clocks */
 }
 
-void __bare_init __naked barebox_arm_reset_vector(uint32_t *data)
+void __bare_init __naked barebox_arm_reset_vector(uint32_t r0, uint32_t r1, uint32_t r2)
 {
-	omap4_save_bootinfo(data);
+	omap4_save_bootinfo((void *)r0);
 
 	arm_cpu_lowlevel_init();
 
diff --git a/arch/arm/boards/pm9261/lowlevel_init.c b/arch/arm/boards/pm9261/lowlevel_init.c
index 0ab34b0db6..7127d39943 100644
--- a/arch/arm/boards/pm9261/lowlevel_init.c
+++ b/arch/arm/boards/pm9261/lowlevel_init.c
@@ -111,7 +111,7 @@ static void __bare_init pm9261_init(void)
 	                  NULL);
 }
 
-void __naked __bare_init barebox_arm_reset_vector(void)
+void __naked __bare_init barebox_arm_reset_vector(uint32_t r0, uint32_t r1, uint32_t r2)
 {
 	arm_cpu_lowlevel_init();
 
diff --git a/arch/arm/boards/pm9263/lowlevel_init.c b/arch/arm/boards/pm9263/lowlevel_init.c
index 32850b2981..daeb183831 100644
--- a/arch/arm/boards/pm9263/lowlevel_init.c
+++ b/arch/arm/boards/pm9263/lowlevel_init.c
@@ -132,7 +132,7 @@ static void __bare_init pm9263_board_init(void)
 	                  NULL);
 }
 
-void __naked __bare_init barebox_arm_reset_vector(void)
+void __naked __bare_init barebox_arm_reset_vector(uint32_t r0, uint32_t r1, uint32_t r2)
 {
 	arm_cpu_lowlevel_init();
 
diff --git a/arch/arm/boards/pm9g45/lowlevel.c b/arch/arm/boards/pm9g45/lowlevel.c
index 67454bde26..12cf950685 100644
--- a/arch/arm/boards/pm9g45/lowlevel.c
+++ b/arch/arm/boards/pm9g45/lowlevel.c
@@ -13,7 +13,7 @@
 #include <mach/at91sam9_ddrsdr.h>
 #include <mach/hardware.h>
 
-void __naked __bare_init barebox_arm_reset_vector(void)
+void __naked __bare_init barebox_arm_reset_vector(uint32_t r0, uint32_t r1, uint32_t r2)
 {
 	arm_cpu_lowlevel_init();
 
diff --git a/arch/arm/boards/qemu-virt64/lowlevel.c b/arch/arm/boards/qemu-virt64/lowlevel.c
index a60c4b0426..629e2e9f6e 100644
--- a/arch/arm/boards/qemu-virt64/lowlevel.c
+++ b/arch/arm/boards/qemu-virt64/lowlevel.c
@@ -10,7 +10,7 @@
 #include <asm/barebox-arm.h>
 #include <asm/system_info.h>
 
-void barebox_arm_reset_vector(void)
+void barebox_arm_reset_vector(uint32_t r0, uint32_t r1, uint32_t r2)
 {
 	arm_cpu_lowlevel_init();
 	arm_setup_stack(0x40000000 + SZ_2G - SZ_16K);
diff --git a/arch/arm/boards/qil-a926x/lowlevel.c b/arch/arm/boards/qil-a926x/lowlevel.c
index b16ef31bf0..25352672d7 100644
--- a/arch/arm/boards/qil-a926x/lowlevel.c
+++ b/arch/arm/boards/qil-a926x/lowlevel.c
@@ -14,7 +14,7 @@
 #include <mach/at91sam9260.h>
 #include <mach/hardware.h>
 
-void __naked __bare_init barebox_arm_reset_vector(void)
+void __naked __bare_init barebox_arm_reset_vector(uint32_t r0, uint32_t r1, uint32_t r2)
 {
 	arm_cpu_lowlevel_init();
 
diff --git a/arch/arm/boards/sama5d3_xplained/lowlevel.c b/arch/arm/boards/sama5d3_xplained/lowlevel.c
index b791f2a03c..0e25270142 100644
--- a/arch/arm/boards/sama5d3_xplained/lowlevel.c
+++ b/arch/arm/boards/sama5d3_xplained/lowlevel.c
@@ -13,7 +13,7 @@
 #include <mach/at91sam9_ddrsdr.h>
 #include <mach/hardware.h>
 
-void __naked __bare_init barebox_arm_reset_vector(void)
+void __naked __bare_init barebox_arm_reset_vector(uint32_t r0, uint32_t r1, uint32_t r2)
 {
 	arm_cpu_lowlevel_init();
 
diff --git a/arch/arm/boards/sama5d3xek/lowlevel.c b/arch/arm/boards/sama5d3xek/lowlevel.c
index b791f2a03c..0e25270142 100644
--- a/arch/arm/boards/sama5d3xek/lowlevel.c
+++ b/arch/arm/boards/sama5d3xek/lowlevel.c
@@ -13,7 +13,7 @@
 #include <mach/at91sam9_ddrsdr.h>
 #include <mach/hardware.h>
 
-void __naked __bare_init barebox_arm_reset_vector(void)
+void __naked __bare_init barebox_arm_reset_vector(uint32_t r0, uint32_t r1, uint32_t r2)
 {
 	arm_cpu_lowlevel_init();
 
diff --git a/arch/arm/boards/sama5d4_xplained/lowlevel.c b/arch/arm/boards/sama5d4_xplained/lowlevel.c
index b791f2a03c..0e25270142 100644
--- a/arch/arm/boards/sama5d4_xplained/lowlevel.c
+++ b/arch/arm/boards/sama5d4_xplained/lowlevel.c
@@ -13,7 +13,7 @@
 #include <mach/at91sam9_ddrsdr.h>
 #include <mach/hardware.h>
 
-void __naked __bare_init barebox_arm_reset_vector(void)
+void __naked __bare_init barebox_arm_reset_vector(uint32_t r0, uint32_t r1, uint32_t r2)
 {
 	arm_cpu_lowlevel_init();
 
diff --git a/arch/arm/boards/sama5d4ek/lowlevel.c b/arch/arm/boards/sama5d4ek/lowlevel.c
index b791f2a03c..0e25270142 100644
--- a/arch/arm/boards/sama5d4ek/lowlevel.c
+++ b/arch/arm/boards/sama5d4ek/lowlevel.c
@@ -13,7 +13,7 @@
 #include <mach/at91sam9_ddrsdr.h>
 #include <mach/hardware.h>
 
-void __naked __bare_init barebox_arm_reset_vector(void)
+void __naked __bare_init barebox_arm_reset_vector(uint32_t r0, uint32_t r1, uint32_t r2)
 {
 	arm_cpu_lowlevel_init();
 
diff --git a/arch/arm/boards/telit-evk-pro3/lowlevel.c b/arch/arm/boards/telit-evk-pro3/lowlevel.c
index b16ef31bf0..25352672d7 100644
--- a/arch/arm/boards/telit-evk-pro3/lowlevel.c
+++ b/arch/arm/boards/telit-evk-pro3/lowlevel.c
@@ -14,7 +14,7 @@
 #include <mach/at91sam9260.h>
 #include <mach/hardware.h>
 
-void __naked __bare_init barebox_arm_reset_vector(void)
+void __naked __bare_init barebox_arm_reset_vector(uint32_t r0, uint32_t r1, uint32_t r2)
 {
 	arm_cpu_lowlevel_init();
 
diff --git a/arch/arm/boards/tny-a926x/tny_a9260_lowlevel.c b/arch/arm/boards/tny-a926x/tny_a9260_lowlevel.c
index b16ef31bf0..25352672d7 100644
--- a/arch/arm/boards/tny-a926x/tny_a9260_lowlevel.c
+++ b/arch/arm/boards/tny-a926x/tny_a9260_lowlevel.c
@@ -14,7 +14,7 @@
 #include <mach/at91sam9260.h>
 #include <mach/hardware.h>
 
-void __naked __bare_init barebox_arm_reset_vector(void)
+void __naked __bare_init barebox_arm_reset_vector(uint32_t r0, uint32_t r1, uint32_t r2)
 {
 	arm_cpu_lowlevel_init();
 
diff --git a/arch/arm/boards/tny-a926x/tny_a9263_lowlevel.c b/arch/arm/boards/tny-a926x/tny_a9263_lowlevel.c
index 8566d27a0a..868df9d6c8 100644
--- a/arch/arm/boards/tny-a926x/tny_a9263_lowlevel.c
+++ b/arch/arm/boards/tny-a926x/tny_a9263_lowlevel.c
@@ -118,7 +118,7 @@ static void __bare_init tny_a9263_init(void)
 	                  NULL);
 }
 
-void __naked __bare_init barebox_arm_reset_vector(void)
+void __naked __bare_init barebox_arm_reset_vector(uint32_t r0, uint32_t r1, uint32_t r2)
 {
 	arm_cpu_lowlevel_init();
 
diff --git a/arch/arm/boards/usb-a926x/usb_a9260_lowlevel.c b/arch/arm/boards/usb-a926x/usb_a9260_lowlevel.c
index b16ef31bf0..25352672d7 100644
--- a/arch/arm/boards/usb-a926x/usb_a9260_lowlevel.c
+++ b/arch/arm/boards/usb-a926x/usb_a9260_lowlevel.c
@@ -14,7 +14,7 @@
 #include <mach/at91sam9260.h>
 #include <mach/hardware.h>
 
-void __naked __bare_init barebox_arm_reset_vector(void)
+void __naked __bare_init barebox_arm_reset_vector(uint32_t r0, uint32_t r1, uint32_t r2)
 {
 	arm_cpu_lowlevel_init();
 
diff --git a/arch/arm/boards/usb-a926x/usb_a9263_lowlevel.c b/arch/arm/boards/usb-a926x/usb_a9263_lowlevel.c
index a7dd2b2ada..b362fcf7d4 100644
--- a/arch/arm/boards/usb-a926x/usb_a9263_lowlevel.c
+++ b/arch/arm/boards/usb-a926x/usb_a9263_lowlevel.c
@@ -122,7 +122,7 @@ static void __bare_init usb_a9263_init(void)
 	                  NULL);
 }
 
-void __naked __bare_init barebox_arm_reset_vector(void)
+void __naked __bare_init barebox_arm_reset_vector(uint32_t r0, uint32_t r1, uint32_t r2)
 {
 	arm_cpu_lowlevel_init();
 
diff --git a/arch/arm/boards/versatile/lowlevel.c b/arch/arm/boards/versatile/lowlevel.c
index 33a785fee0..a9ccf1fff5 100644
--- a/arch/arm/boards/versatile/lowlevel.c
+++ b/arch/arm/boards/versatile/lowlevel.c
@@ -3,7 +3,7 @@
 #include <asm/barebox-arm-head.h>
 #include <asm/barebox-arm.h>
 
-void __naked barebox_arm_reset_vector(void)
+void __naked barebox_arm_reset_vector(uint32_t r0, uint32_t r1, uint32_t r2)
 {
 	arm_cpu_lowlevel_init();
 	barebox_arm_entry(0x0, SZ_64M, NULL);
diff --git a/arch/arm/boards/virt2real/lowlevel.c b/arch/arm/boards/virt2real/lowlevel.c
index 8ec3d04fef..264ebee893 100644
--- a/arch/arm/boards/virt2real/lowlevel.c
+++ b/arch/arm/boards/virt2real/lowlevel.c
@@ -26,7 +26,7 @@
 #define VIRT2REAL_SRAM_BASE 0x82000000
 #define VIRT2REAL_SRAM_SIZE SZ_16M
 
-void __naked __bare_init barebox_arm_reset_vector(void)
+void __naked __bare_init barebox_arm_reset_vector(uint32_t r0, uint32_t r1, uint32_t r2)
 {
 	arm_cpu_lowlevel_init();
 
diff --git a/arch/arm/boards/zylonite/lowlevel.c b/arch/arm/boards/zylonite/lowlevel.c
index 9f1aa6641c..5b95d879fa 100644
--- a/arch/arm/boards/zylonite/lowlevel.c
+++ b/arch/arm/boards/zylonite/lowlevel.c
@@ -3,7 +3,7 @@
 #include <asm/barebox-arm-head.h>
 #include <asm/barebox-arm.h>
 
-void __naked barebox_arm_reset_vector(void)
+void __naked barebox_arm_reset_vector(uint32_t r0, uint32_t r1, uint32_t r2)
 {
 	arm_cpu_lowlevel_init();
 	barebox_arm_entry(0x80000000, SZ_64M, NULL);
diff --git a/arch/arm/crypto/sha1_glue.c b/arch/arm/crypto/sha1_glue.c
index cc032f6af2..6a0e482aaa 100644
--- a/arch/arm/crypto/sha1_glue.c
+++ b/arch/arm/crypto/sha1_glue.c
@@ -63,7 +63,7 @@ static int __sha1_update(struct sha1_state *sctx, const u8 *data,
 }
 
 
-int sha1_update_arm(struct digest *desc, const void *data,
+static int sha1_update_arm(struct digest *desc, const void *data,
 			     unsigned long len)
 {
 	struct sha1_state *sctx = digest_ctx(desc);
@@ -79,8 +79,6 @@ int sha1_update_arm(struct digest *desc, const void *data,
 	res = __sha1_update(sctx, data, len, partial);
 	return res;
 }
-EXPORT_SYMBOL_GPL(sha1_update_arm);
-
 
 /* Add padding and return the message digest. */
 static int sha1_final(struct digest *desc, u8 *out)
diff --git a/arch/arm/crypto/sha256_glue.c b/arch/arm/crypto/sha256_glue.c
index d8a72a2cb9..2bb7122aab 100644
--- a/arch/arm/crypto/sha256_glue.c
+++ b/arch/arm/crypto/sha256_glue.c
@@ -26,7 +26,7 @@ void sha256_block_data_order(u32 *digest, const void *data,
 				      unsigned int num_blks);
 
 
-int sha256_init(struct digest *desc)
+static int sha256_init(struct digest *desc)
 {
 	struct sha256_state *sctx = digest_ctx(desc);
 
@@ -43,7 +43,7 @@ int sha256_init(struct digest *desc)
 	return 0;
 }
 
-int sha224_init(struct digest *desc)
+static int sha224_init(struct digest *desc)
 {
 	struct sha256_state *sctx = digest_ctx(desc);
 
@@ -60,7 +60,7 @@ int sha224_init(struct digest *desc)
 	return 0;
 }
 
-int __sha256_update(struct digest *desc, const u8 *data, unsigned int len,
+static int __sha256_update(struct digest *desc, const u8 *data, unsigned int len,
 		    unsigned int partial)
 {
 	struct sha256_state *sctx = digest_ctx(desc);
@@ -86,7 +86,7 @@ int __sha256_update(struct digest *desc, const u8 *data, unsigned int len,
 	return 0;
 }
 
-int sha256_update(struct digest *desc, const void *data,
+static int sha256_update(struct digest *desc, const void *data,
 			     unsigned long len)
 {
 	struct sha256_state *sctx = digest_ctx(desc);
@@ -150,24 +150,6 @@ static int sha224_final(struct digest *desc, u8 *out)
 	return 0;
 }
 
-int sha256_export(struct digest *desc, void *out)
-{
-	struct sha256_state *sctx = digest_ctx(desc);
-
-	memcpy(out, sctx, sizeof(*sctx));
-
-	return 0;
-}
-
-int sha256_import(struct digest *desc, const void *in)
-{
-	struct sha256_state *sctx = digest_ctx(desc);
-
-	memcpy(sctx, in, sizeof(*sctx));
-
-	return 0;
-}
-
 static struct digest_algo sha224 = {
 	.base = {
 		.name		=	"sha224",
diff --git a/arch/arm/crypto/sha256_glue.h b/arch/arm/crypto/sha256_glue.h
deleted file mode 100644
index 0312f4ffe8..0000000000
--- a/arch/arm/crypto/sha256_glue.h
+++ /dev/null
@@ -1,23 +0,0 @@
-#ifndef _CRYPTO_SHA256_GLUE_H
-#define _CRYPTO_SHA256_GLUE_H
-
-#include <linux/crypto.h>
-#include <crypto/sha.h>
-
-extern struct shash_alg sha256_neon_algs[2];
-
-extern int sha256_init(struct shash_desc *desc);
-
-extern int sha224_init(struct shash_desc *desc);
-
-extern int __sha256_update(struct shash_desc *desc, const u8 *data,
-			   unsigned int len, unsigned int partial);
-
-extern int sha256_update(struct shash_desc *desc, const u8 *data,
-			 unsigned int len);
-
-extern int sha256_export(struct shash_desc *desc, void *out);
-
-extern int sha256_import(struct shash_desc *desc, const void *in);
-
-#endif /* _CRYPTO_SHA256_GLUE_H */
diff --git a/arch/arm/include/asm/barebox-arm-head.h b/arch/arm/include/asm/barebox-arm-head.h
index 4d0da6c491..5c6205c815 100644
--- a/arch/arm/include/asm/barebox-arm-head.h
+++ b/arch/arm/include/asm/barebox-arm-head.h
@@ -7,6 +7,7 @@
 
 void arm_cpu_lowlevel_init(void);
 void cortex_a7_lowlevel_init(void);
+void barebox_arm_reset_vector(uint32_t r0, uint32_t r1, uint32_t r2);
 
 /*
  * 32 bytes at this offset is reserved in the barebox head for board/SoC
diff --git a/arch/arm/lib32/semihosting.c b/arch/arm/lib32/semihosting.c
index a7351961dc..9fc3b6b62c 100644
--- a/arch/arm/lib32/semihosting.c
+++ b/arch/arm/lib32/semihosting.c
@@ -21,6 +21,7 @@
 #include <common.h>
 #include <command.h>
 #include <fcntl.h>
+#include <asm/semihosting.h>
 
 #ifndef O_BINARY
 #define O_BINARY	0
@@ -153,7 +154,7 @@ int semihosting_isatty(int fd)
 }
 EXPORT_SYMBOL(semihosting_isatty);
 
-int semihosting_seek(int fd, off_t pos)
+int semihosting_seek(int fd, loff_t pos)
 {
 	struct __packed {
 		uint32_t fd;
diff --git a/arch/arm/mach-clps711x/devices.c b/arch/arm/mach-clps711x/devices.c
index 69574317bd..8eacc70018 100644
--- a/arch/arm/mach-clps711x/devices.c
+++ b/arch/arm/mach-clps711x/devices.c
@@ -15,6 +15,7 @@
 #include <asm/memory.h>
 
 #include <mach/clps711x.h>
+#include <mach/devices.h>
 
 static int clps711x_mem_init(void)
 {
diff --git a/arch/arm/mach-ep93xx/gpio.c b/arch/arm/mach-ep93xx/gpio.c
index 0c87152032..20477f83e6 100644
--- a/arch/arm/mach-ep93xx/gpio.c
+++ b/arch/arm/mach-ep93xx/gpio.c
@@ -18,6 +18,7 @@
 #include <errno.h>
 #include <init.h>
 #include <io.h>
+#include <gpio.h>
 #include <mach/ep93xx-regs.h>
 
 #define EP93XX_GPIO_NUM_PORTS	8
diff --git a/arch/arm/mach-ep93xx/led.c b/arch/arm/mach-ep93xx/led.c
index a415bce0d7..47e24cd6ed 100644
--- a/arch/arm/mach-ep93xx/led.c
+++ b/arch/arm/mach-ep93xx/led.c
@@ -20,6 +20,8 @@
 #include <io.h>
 #include <mach/ep93xx-regs.h>
 
+#include "led.h"
+
 #define GREEN_LED_POS		0x01
 #define RED_LED_POS		0x02
 
diff --git a/arch/arm/mach-highbank/reset.c b/arch/arm/mach-highbank/reset.c
index b60f34452e..d73a0a76a5 100644
--- a/arch/arm/mach-highbank/reset.c
+++ b/arch/arm/mach-highbank/reset.c
@@ -21,7 +21,7 @@ static void __noreturn highbank_restart_soc(struct restart_handler *rst)
 	hang();
 }
 
-void __noreturn highbank_poweroff(struct poweroff_handler *handler)
+static void __noreturn highbank_poweroff(struct poweroff_handler *handler)
 {
 	shutdown_barebox();
 
diff --git a/arch/arm/mach-imx/cpu_init.c b/arch/arm/mach-imx/cpu_init.c
index 7a980cf912..aa6e050e94 100644
--- a/arch/arm/mach-imx/cpu_init.c
+++ b/arch/arm/mach-imx/cpu_init.c
@@ -12,6 +12,7 @@
  * GNU General Public License for more details.
  */
 
+#include <common.h>
 #include <asm/barebox-arm-head.h>
 #include <asm/errata.h>
 #include <linux/types.h>
diff --git a/arch/arm/mach-imx/external-nand-boot.c b/arch/arm/mach-imx/external-nand-boot.c
index 745a129b23..c4d61aa786 100644
--- a/arch/arm/mach-imx/external-nand-boot.c
+++ b/arch/arm/mach-imx/external-nand-boot.c
@@ -134,8 +134,8 @@ static noinline void __bare_init imx_nandboot_get_page(void *regs, int v1,
 	imx_nandboot_send_page(regs, v1, NFC_OUTPUT, pagesize_2k);
 }
 
-void __bare_init imx_nand_load_image(void *dest, int v1, int size, void __iomem *base,
-		int pagesize_2k)
+static void __bare_init imx_nand_load_image(void *dest, int v1, int size,
+					    void __iomem *base, int pagesize_2k)
 {
 	u32 tmp, page, block, blocksize, pagesize, badblocks;
 	int bbt = 0;
@@ -239,44 +239,30 @@ void __bare_init imx_nand_load_image(void *dest, int v1, int size, void __iomem
 	}
 }
 
-void BARE_INIT_FUNCTION(imx21_nand_load_image)(void *dest, int size,
-                void __iomem *base, int pagesize_2k)
-{
-        imx_nand_load_image(dest, 1, size, base, pagesize_2k);
-}
-
-void BARE_INIT_FUNCTION(imx25_nand_load_image)(void *dest, int size,
+static void BARE_INIT_FUNCTION(imx25_nand_load_image)(void *dest, int size,
                 void __iomem *base, int pagesize_2k)
 {
         imx_nand_load_image(dest, 0, size, base, pagesize_2k);
 }
 
-void BARE_INIT_FUNCTION(imx27_nand_load_image)(void *dest, int size,
+static void BARE_INIT_FUNCTION(imx27_nand_load_image)(void *dest, int size,
                 void __iomem *base, int pagesize_2k)
 {
         imx_nand_load_image(dest, 1, size, base, pagesize_2k);
 }
 
-void BARE_INIT_FUNCTION(imx31_nand_load_image)(void *dest, int size,
+static void BARE_INIT_FUNCTION(imx31_nand_load_image)(void *dest, int size,
                 void __iomem *base, int pagesize_2k)
 {
         imx_nand_load_image(dest, 1, size, base, pagesize_2k);
 }
 
-void BARE_INIT_FUNCTION(imx35_nand_load_image)(void *dest, int size,
+static void BARE_INIT_FUNCTION(imx35_nand_load_image)(void *dest, int size,
                 void __iomem *base, int pagesize_2k)
 {
         imx_nand_load_image(dest, 0, size, base, pagesize_2k);
 }
 
-static inline int imx21_pagesize_2k(void)
-{
-	if (readl(MX21_SYSCTRL_BASE_ADDR + 0x14) & (1 << 5))
-		return 1;
-	else
-		return 0;
-}
-
 static inline int imx25_pagesize_2k(void)
 {
 	if (readl(MX25_CCM_BASE_ADDR + MX25_CCM_RCSR) & (1 << 8))
@@ -318,7 +304,7 @@ static inline int imx35_pagesize_2k(void)
 
 #define DEFINE_EXTERNAL_NAND_ENTRY(soc)					\
 									\
-void __noreturn BARE_INIT_FUNCTION(imx##soc##_boot_nand_external_cont)  \
+static void __noreturn BARE_INIT_FUNCTION(imx##soc##_boot_nand_external_cont)  \
 			(void *boarddata)				\
 {									\
 	unsigned long nfc_base = MX##soc##_NFC_BASE_ADDR;		\
@@ -389,9 +375,6 @@ void __noreturn BARE_INIT_FUNCTION(imx##soc##_barebox_boot_nand_external) \
 	fn((void *)boarddata);						\
 }
 
-#ifdef BROKEN
-DEFINE_EXTERNAL_NAND_ENTRY(21)
-#endif
 DEFINE_EXTERNAL_NAND_ENTRY(25)
 DEFINE_EXTERNAL_NAND_ENTRY(27)
 DEFINE_EXTERNAL_NAND_ENTRY(31)
diff --git a/arch/arm/mach-mvebu/common.c b/arch/arm/mach-mvebu/common.c
index 83aeb41ae2..6b4fa8b889 100644
--- a/arch/arm/mach-mvebu/common.c
+++ b/arch/arm/mach-mvebu/common.c
@@ -25,6 +25,7 @@
 #include <mach/socid.h>
 #include <asm/barebox-arm.h>
 #include <asm/memory.h>
+#include <mach/lowlevel.h>
 
 /*
  * The different SoC headers containing register definitions (mach/dove-regs.h,
diff --git a/arch/arm/mach-mvebu/include/mach/bbu.h b/arch/arm/mach-mvebu/include/mach/bbu.h
index a06db2b144..f23c3269c0 100644
--- a/arch/arm/mach-mvebu/include/mach/bbu.h
+++ b/arch/arm/mach-mvebu/include/mach/bbu.h
@@ -3,7 +3,7 @@ int mvebu_bbu_flash_register_handler(const char *name,
 				     char *devicefile, int version,
 				     bool isdefault);
 #else
-int mvebu_bbu_flash_register_handler(const char *name,
+static inline int mvebu_bbu_flash_register_handler(const char *name,
                                      char *devicefile, int version,
                                      bool isdefault)
 {
diff --git a/arch/arm/mach-mxs/mem-init.c b/arch/arm/mach-mxs/mem-init.c
index 568db81302..44785c2bfc 100644
--- a/arch/arm/mach-mxs/mem-init.c
+++ b/arch/arm/mach-mxs/mem-init.c
@@ -30,8 +30,8 @@
 #define	MXS_BLOCK_SFTRST	(1 << 31)
 #define	MXS_BLOCK_CLKGATE	(1 << 30)
 
-int mxs_early_wait_mask_set(struct mxs_register_32 *reg, uint32_t mask, unsigned
-								int timeout)
+static int mxs_early_wait_mask_set(struct mxs_register_32 *reg, uint32_t mask,
+				   unsigned int timeout)
 {
 	while (--timeout) {
 		if ((readl(&reg->reg) & mask) == mask)
@@ -42,8 +42,8 @@ int mxs_early_wait_mask_set(struct mxs_register_32 *reg, uint32_t mask, unsigned
 	return !timeout;
 }
 
-int mxs_early_wait_mask_clr(struct mxs_register_32 *reg, uint32_t mask, unsigned
-								int timeout)
+static int mxs_early_wait_mask_clr(struct mxs_register_32 *reg, uint32_t mask,
+				   unsigned int timeout)
 {
 	while (--timeout) {
 		if ((readl(&reg->reg) & mask) == 0)
@@ -54,7 +54,7 @@ int mxs_early_wait_mask_clr(struct mxs_register_32 *reg, uint32_t mask, unsigned
 	return !timeout;
 }
 
-int mxs_early_reset_block(struct mxs_register_32 *reg)
+static int mxs_early_reset_block(struct mxs_register_32 *reg)
 {
 	/* Clear SFTRST */
 	writel(MXS_BLOCK_SFTRST, &reg->reg_clr);
diff --git a/arch/arm/mach-mxs/power.c b/arch/arm/mach-mxs/power.c
index 74c5479f3e..6febf5dbaa 100644
--- a/arch/arm/mach-mxs/power.c
+++ b/arch/arm/mach-mxs/power.c
@@ -14,6 +14,7 @@
 #include <stmp-device.h>
 #include <errno.h>
 #include <mach/imx-regs.h>
+#include <mach/power.h>
 
 #define POWER_CTRL			(IMX_POWER_BASE + 0x0)
 #define POWER_CTRL_CLKGATE		0x40000000
diff --git a/arch/arm/mach-mxs/usb-imx23.c b/arch/arm/mach-mxs/usb-imx23.c
index e626396f9d..d9a54b66f8 100644
--- a/arch/arm/mach-mxs/usb-imx23.c
+++ b/arch/arm/mach-mxs/usb-imx23.c
@@ -17,6 +17,7 @@
 #include <io.h>
 #include <mach/imx23-regs.h>
 #include <mach/power.h>
+#include <mach/usb.h>
 
 #define USBPHY_PWD			(IMX_USBPHY_BASE + 0x0)
 
diff --git a/arch/arm/mach-mxs/usb-imx28.c b/arch/arm/mach-mxs/usb-imx28.c
index a87d4f6cbc..a4e1bdb280 100644
--- a/arch/arm/mach-mxs/usb-imx28.c
+++ b/arch/arm/mach-mxs/usb-imx28.c
@@ -18,6 +18,7 @@
 #include <io.h>
 #include <errno.h>
 #include <mach/imx28-regs.h>
+#include <mach/usb.h>
 
 #define POWER_CTRL			(IMX_POWER_BASE + 0x0)
 #define POWER_CTRL_CLKGATE		0x40000000
diff --git a/arch/arm/mach-netx/clocksource.c b/arch/arm/mach-netx/clocksource.c
index 263547242e..1eb977d3c9 100644
--- a/arch/arm/mach-netx/clocksource.c
+++ b/arch/arm/mach-netx/clocksource.c
@@ -23,7 +23,7 @@
 #include <clock.h>
 #include <mach/netx-regs.h>
 
-uint64_t netx_clocksource_read(void)
+static uint64_t netx_clocksource_read(void)
 {
 	return GPIO_REG(GPIO_COUNTER_CURRENT(0));
 }
diff --git a/arch/arm/mach-netx/generic.c b/arch/arm/mach-netx/generic.c
index 6c3b953d1f..450226d2cc 100644
--- a/arch/arm/mach-netx/generic.c
+++ b/arch/arm/mach-netx/generic.c
@@ -20,6 +20,7 @@
 #include <io.h>
 #include <restart.h>
 #include <mach/netx-regs.h>
+#include <mach/netx-xc.h>
 #include "eth_firmware.h"
 
 struct fw_header {
@@ -115,7 +116,7 @@ int loadxc(int xcno)
 	return 0;
 }
 
-int do_loadxc(int argc, char *argv[])
+static int do_loadxc(int argc, char *argv[])
 {
 	int xcno;
 
diff --git a/arch/arm/mach-nomadik/8815.c b/arch/arm/mach-nomadik/8815.c
index dc1bcd2bcd..9f9c0342b4 100644
--- a/arch/arm/mach-nomadik/8815.c
+++ b/arch/arm/mach-nomadik/8815.c
@@ -18,6 +18,7 @@
 #include <init.h>
 #include <linux/clkdev.h>
 #include <mach/hardware.h>
+#include <mach/board.h>
 #include <asm/armlinux.h>
 #include <generated/mach-types.h>
 #include <linux/amba/bus.h>
diff --git a/arch/arm/mach-omap/omap4_twl6030_mmc.c b/arch/arm/mach-omap/omap4_twl6030_mmc.c
index 155add6ea1..67a9a5d6b5 100644
--- a/arch/arm/mach-omap/omap4_twl6030_mmc.c
+++ b/arch/arm/mach-omap/omap4_twl6030_mmc.c
@@ -17,6 +17,7 @@
 #include <io.h>
 
 #include <mfd/twl6030.h>
+#include <mach/omap4_twl6030_mmc.h>
 
 /* MMC voltage */
 #define OMAP4_CONTROL_PBIASLITE			0x4A100600
diff --git a/arch/arm/mach-pxa/clocksource.c b/arch/arm/mach-pxa/clocksource.c
index c941f154d4..5a890acb3c 100644
--- a/arch/arm/mach-pxa/clocksource.c
+++ b/arch/arm/mach-pxa/clocksource.c
@@ -22,7 +22,7 @@
 
 #define OSCR	0x40A00010
 
-uint64_t pxa_clocksource_read(void)
+static uint64_t pxa_clocksource_read(void)
 {
 	return readl(OSCR);
 }
diff --git a/arch/arm/mach-pxa/common.c b/arch/arm/mach-pxa/common.c
index c0281d69ef..f2648f4687 100644
--- a/arch/arm/mach-pxa/common.c
+++ b/arch/arm/mach-pxa/common.c
@@ -29,8 +29,6 @@
 #define OWER_WME	(1 << 0)	/* Watch-dog Match Enable */
 #define OSSR_M3		(1 << 3)	/* Match status channel 3 */
 
-extern void pxa_clear_reset_source(void);
-
 static void __noreturn pxa_restart_soc(struct restart_handler *rst)
 {
 	/* Clear last reset source */
diff --git a/arch/arm/mach-pxa/gpio.c b/arch/arm/mach-pxa/gpio.c
index 7dd6ac0648..ebda6bbe2a 100644
--- a/arch/arm/mach-pxa/gpio.c
+++ b/arch/arm/mach-pxa/gpio.c
@@ -12,6 +12,7 @@
 
 #include <common.h>
 #include <errno.h>
+#include <gpio.h>
 
 #include <mach/gpio.h>
 #include <asm/io.h>
diff --git a/arch/arm/mach-pxa/include/mach/hardware.h b/arch/arm/mach-pxa/include/mach/hardware.h
index 902d11ddfc..d968a11880 100644
--- a/arch/arm/mach-pxa/include/mach/hardware.h
+++ b/arch/arm/mach-pxa/include/mach/hardware.h
@@ -46,6 +46,10 @@
 
 #ifdef __ASSEMBLY__
 #define __REG(x) (x)
+#else
+
+void pxa_clear_reset_source(void);
+
 #endif
 
 #endif	/* !__MACH_HARDWARE_H */
diff --git a/arch/arm/mach-samsung/clocks-s3c64xx.c b/arch/arm/mach-samsung/clocks-s3c64xx.c
index cf7d0716fe..3c13f52d2e 100644
--- a/arch/arm/mach-samsung/clocks-s3c64xx.c
+++ b/arch/arm/mach-samsung/clocks-s3c64xx.c
@@ -322,7 +322,7 @@ void s3c_set_hsmmc_clk(int id, int src, unsigned div)
 	writel(readl(S3C_SCLK_GATE) | S3C_SCLK_GATE_MMC(id), S3C_SCLK_GATE);
 }
 
-int s3c64xx_dump_clocks(void)
+static int s3c64xx_dump_clocks(void)
 {
 	printf("refclk:  %7d kHz\n", S3C64XX_CLOCK_REFERENCE / 1000);
 	printf("apll:    %7d kHz\n", s3c_get_apllclk() / 1000);
diff --git a/arch/arm/mach-samsung/clocks-s5pcxx.c b/arch/arm/mach-samsung/clocks-s5pcxx.c
index 1f4790bc07..4a1574bd89 100644
--- a/arch/arm/mach-samsung/clocks-s5pcxx.c
+++ b/arch/arm/mach-samsung/clocks-s5pcxx.c
@@ -38,7 +38,7 @@ uint32_t s3c_get_mpllclk(void)
 	return m * ((S5PCXX_CLOCK_REFERENCE) / (p << s));
 }
 
-uint32_t s3c_get_apllclk(void)
+static uint32_t s3c_get_apllclk(void)
 {
 	uint32_t m, p, s;
 	uint32_t reg = readl(S5P_xPLL_CON + S5P_APLL);
@@ -84,7 +84,7 @@ unsigned s3c_get_uart_clk(unsigned src) {
 	return (src & 1) ? s3c_get_uart_clk_uclk1() : s3c_get_pclk();
 }
 
-int s5pcxx_dump_clocks(void)
+static int s5pcxx_dump_clocks(void)
 {
 	printf("refclk:  %7d kHz\n", S5PCXX_CLOCK_REFERENCE / 1000);
 	printf("apll:    %7d kHz\n", s3c_get_apllclk() / 1000);
diff --git a/common/bootchooser.c b/common/bootchooser.c
index c47c734c9c..c08db03eba 100644
--- a/common/bootchooser.c
+++ b/common/bootchooser.c
@@ -630,7 +630,7 @@ void bootchooser_info(struct bootchooser *bc)
  *
  * Return: The next target
  */
-struct bootchooser_target *bootchooser_get_target(struct bootchooser *bc)
+static struct bootchooser_target *bootchooser_get_target(struct bootchooser *bc)
 {
 	struct bootchooser_target *target;
 
diff --git a/crypto/keystore.c b/crypto/keystore.c
index f2b25ca6c9..1ce6332979 100644
--- a/crypto/keystore.c
+++ b/crypto/keystore.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <linux/kernel.h>
 #include <linux/list.h>
+#include <crypto/keystore.h>
 
 static LIST_HEAD(keystore_list);
 
diff --git a/drivers/bus/mvebu-mbus.c b/drivers/bus/mvebu-mbus.c
index 965a221d3b..4b7edb53ed 100644
--- a/drivers/bus/mvebu-mbus.c
+++ b/drivers/bus/mvebu-mbus.c
@@ -436,7 +436,7 @@ orion5x_4win_mbus_data __maybe_unused = {
 };
 
 static const struct mvebu_mbus_soc_data
-orion5x_2win_mbus_data__maybe_unused = {
+orion5x_2win_mbus_data __maybe_unused = {
 	.num_wins            = 8,
 	.num_remappable_wins = 2,
 	.win_cfg_offset      = orion5x_mbus_win_offset,
diff --git a/drivers/clk/mvebu/common.c b/drivers/clk/mvebu/common.c
index f6f118f0db..609e63697c 100644
--- a/drivers/clk/mvebu/common.c
+++ b/drivers/clk/mvebu/common.c
@@ -42,7 +42,7 @@ static struct of_device_id mvebu_coreclk_ids[] = {
 	{ }
 };
 
-int mvebu_coreclk_probe(struct device_d *dev)
+static int mvebu_coreclk_probe(struct device_d *dev)
 {
 	struct resource *iores;
 	struct device_node *np = dev->device_node;
@@ -155,7 +155,7 @@ static struct of_device_id mvebu_clk_gating_ids[] = {
 	{ }
 };
 
-int mvebu_clk_gating_probe(struct device_d *dev)
+static int mvebu_clk_gating_probe(struct device_d *dev)
 {
 	struct resource *iores;
 	struct device_node *np = dev->device_node;
diff --git a/drivers/clk/mxs/clk-imx23.c b/drivers/clk/mxs/clk-imx23.c
index e28dae12f1..526efc52be 100644
--- a/drivers/clk/mxs/clk-imx23.c
+++ b/drivers/clk/mxs/clk-imx23.c
@@ -61,7 +61,7 @@ enum imx23_clk {
 
 static struct clk *clks[clk_max];
 
-int __init mx23_clocks_init(void __iomem *regs)
+static int __init mx23_clocks_init(void __iomem *regs)
 {
 	clks[ref_xtal] = mxs_clk_fixed("ref_xtal", 24000000);
 	clks[pll] = mxs_clk_pll("pll", "ref_xtal", PLLCTRL0, 16, 480000000);
diff --git a/drivers/clk/mxs/clk-imx28.c b/drivers/clk/mxs/clk-imx28.c
index dd17a74d79..12bc9dd977 100644
--- a/drivers/clk/mxs/clk-imx28.c
+++ b/drivers/clk/mxs/clk-imx28.c
@@ -74,7 +74,7 @@ enum imx28_clk {
 
 static struct clk *clks[clk_max];
 
-int __init mx28_clocks_init(void __iomem *regs)
+static int __init mx28_clocks_init(void __iomem *regs)
 {
 	clks[ref_xtal] = clk_fixed("ref_xtal", 24000000);
 	clks[pll0] = mxs_clk_pll("pll0", "ref_xtal", PLL0CTRL0, 17, 480000000);
diff --git a/drivers/clocksource/mvebu.c b/drivers/clocksource/mvebu.c
index 59bbc4be22..b55d72a343 100644
--- a/drivers/clocksource/mvebu.c
+++ b/drivers/clocksource/mvebu.c
@@ -43,7 +43,7 @@
 
 static __iomem void *timer_base;
 
-uint64_t mvebu_clocksource_read(void)
+static uint64_t mvebu_clocksource_read(void)
 {
 	return 0 - __raw_readl(timer_base + TIMER0_VAL_OFF);
 }
diff --git a/drivers/mfd/lp3972.c b/drivers/mfd/lp3972.c
index 3ae9d1ac64..ca736710b2 100644
--- a/drivers/mfd/lp3972.c
+++ b/drivers/mfd/lp3972.c
@@ -20,6 +20,7 @@
 #include <driver.h>
 #include <xfuncs.h>
 #include <errno.h>
+#include <mfd/lp3972.h>
 
 #include <i2c/i2c.h>
 
diff --git a/drivers/net/mvneta.c b/drivers/net/mvneta.c
index 7aa54a292d..359c70c927 100644
--- a/drivers/net/mvneta.c
+++ b/drivers/net/mvneta.c
@@ -580,7 +580,7 @@ static void mvneta_init_rx_ring(struct mvneta_port *priv)
 	priv->curr_rxdesc = 0;
 }
 
-void mvneta_setup_tx_rx(struct mvneta_port *priv)
+static void mvneta_setup_tx_rx(struct mvneta_port *priv)
 {
 	u32 val;
 
diff --git a/drivers/usb/otg/twl4030.c b/drivers/usb/otg/twl4030.c
index fd5f593dc6..3668870b9e 100644
--- a/drivers/usb/otg/twl4030.c
+++ b/drivers/usb/otg/twl4030.c
@@ -64,7 +64,7 @@ static int twl4030_usb_read(u8 address)
 	return ret;
 }
 
-void twl4030_power_init(void)
+static void twl4030_power_init(void)
 {
 	unsigned char byte;
 	struct twl4030 *twl4030 = twl4030_get();
diff --git a/drivers/w1/slaves/w1_ds2431.c b/drivers/w1/slaves/w1_ds2431.c
index 6446f4ba05..ab2ceffa42 100644
--- a/drivers/w1/slaves/w1_ds2431.c
+++ b/drivers/w1/slaves/w1_ds2431.c
@@ -60,7 +60,7 @@ static inline size_t ds2431_fix_count(loff_t off, size_t count, size_t size)
  *
  * count must not exceed W1_F2D_READ_MAXLEN.
  */
-int ds2431_readblock(struct w1_device *dev, int off, int count, char *buf)
+static int ds2431_readblock(struct w1_device *dev, int off, int count, char *buf)
 {
 	struct w1_bus *bus = dev->bus;
 	u8 wrbuf[3];
diff --git a/fs/bpkfs.c b/fs/bpkfs.c
index 90d3a6bf1b..8fc4df65de 100644
--- a/fs/bpkfs.c
+++ b/fs/bpkfs.c
@@ -25,7 +25,7 @@ static bool bpkfs_is_crc_file(struct bpkfs_handle_data *d)
 	return d->type & (1 << 31);
 }
 
-const char* bpkfs_type_to_str(uint32_t type)
+static const char* bpkfs_type_to_str(uint32_t type)
 {
 	switch (type) {
 	case BPKFS_TYPE_BL:
diff --git a/fs/squashfs/namei.c b/fs/squashfs/namei.c
index baf1e8b646..62a07d2467 100644
--- a/fs/squashfs/namei.c
+++ b/fs/squashfs/namei.c
@@ -238,114 +238,6 @@ failed:
 	return ERR_PTR(err);
 }
 
-int squashfs_lookup_next(struct inode *dir, char *root_name,
-				 char *cur_name)
-{
-	const unsigned char *name = root_name;
-	int len = strlen(root_name);
-	struct squashfs_sb_info *msblk = dir->i_sb->s_fs_info;
-	struct squashfs_dir_header dirh;
-	struct squashfs_dir_entry *dire;
-	u64 block = squashfs_i(dir)->start + msblk->directory_table;
-	int offset = squashfs_i(dir)->offset;
-	int err, length;
-	unsigned int dir_count, size;
-	int name_found = 0, real_name_found = 0;
-
-	TRACE("Entered squashfs_lookup_next [%llx:%x]\n", block, offset);
-
-	dire = kmalloc(sizeof(*dire) + SQUASHFS_NAME_LEN + 1, GFP_KERNEL);
-	if (dire == NULL) {
-		ERROR("Failed to allocate squashfs_dir_entry\n");
-		return -ENOMEM;
-	}
-
-	if (len > SQUASHFS_NAME_LEN) {
-		err = -ENAMETOOLONG;
-		goto failed;
-	}
-
-	length = get_dir_index_using_name(dir->i_sb, &block, &offset,
-				squashfs_i(dir)->dir_idx_start,
-				squashfs_i(dir)->dir_idx_offset,
-				squashfs_i(dir)->dir_idx_cnt, name, len);
-
-	while (length < i_size_read(dir)) {
-		/*
-		 * Read directory header.
-		 */
-		err = squashfs_read_metadata(dir->i_sb, &dirh, &block,
-				&offset, sizeof(dirh));
-		if (err < 0)
-			goto read_failure;
-
-		length += sizeof(dirh);
-
-		dir_count = le32_to_cpu(dirh.count) + 1;
-
-		if (dir_count > SQUASHFS_DIR_COUNT)
-			goto data_error;
-
-		while (dir_count--) {
-			/*
-			 * Read directory entry.
-			 */
-			err = squashfs_read_metadata(dir->i_sb, dire, &block,
-					&offset, sizeof(*dire));
-			if (err < 0)
-				goto read_failure;
-
-			size = le16_to_cpu(dire->size) + 1;
-
-			/* size should never be larger than SQUASHFS_NAME_LEN */
-			if (size > SQUASHFS_NAME_LEN)
-				goto data_error;
-
-			err = squashfs_read_metadata(dir->i_sb, dire->name,
-					&block, &offset, size);
-			if (err < 0)
-				goto read_failure;
-
-			length += sizeof(*dire) + size;
-			dire->name[size] = '\0';
-
-			if (cur_name[0] == '/')
-				name_found = 1;
-
-			if (!strcmp(cur_name, name))
-				name_found = 1;
-
-			if (cur_name[0] != '/'
-			    && strlen(cur_name) == size
-			    && !strncmp(cur_name, dire->name, size)) {
-				name_found = 1;
-				continue;
-			}
-
-			if (name_found) {
-				sprintf(cur_name, "%s", dire->name);
-				real_name_found = 1;
-				goto exit_lookup;
-			}
-		}
-	}
-
-exit_lookup:
-	kfree(dire);
-	return real_name_found ? 0 : 1;
-
-data_error:
-	err = -EIO;
-
-read_failure:
-	ERROR("Unable to read directory block [%llx:%x]\n",
-		squashfs_i(dir)->start + msblk->directory_table,
-		squashfs_i(dir)->offset);
-failed:
-	kfree(dire);
-	return 1;
-}
-
 const struct inode_operations squashfs_dir_inode_ops = {
 	.lookup = squashfs_lookup,
 };
diff --git a/fs/uimagefs.c b/fs/uimagefs.c
index e5ada82da8..72641c58b5 100644
--- a/fs/uimagefs.c
+++ b/fs/uimagefs.c
@@ -25,7 +25,7 @@ static bool uimagefs_is_data_file(struct uimagefs_handle_data *d)
 	return d->type == UIMAGEFS_DATA;
 }
 
-const char* uimagefs_type_to_str(enum uimagefs_type type)
+static const char* uimagefs_type_to_str(enum uimagefs_type type)
 {
 	switch (type) {
 	case UIMAGEFS_DATA:
diff --git a/include/mfd/twl-core.h b/include/mfd/twl-core.h
index 88d29f019b..35920bd3e0 100644
--- a/include/mfd/twl-core.h
+++ b/include/mfd/twl-core.h
@@ -23,8 +23,9 @@ struct twlcore {
 
 extern struct cdev_operations twl_fops;
 
-extern int twlcore_reg_read(struct twlcore *twlcore, u16 reg, u8 *val);
-extern int twlcore_reg_write(struct twlcore *twlcore, u16 reg, u8 val);
-extern int twlcore_set_bits(struct twlcore *twlcore, u16 reg, u8 mask, u8 val);
+int twlcore_reg_read(struct twlcore *twlcore, u16 reg, u8 *val);
+int twlcore_reg_write(struct twlcore *twlcore, u16 reg, u8 val);
+int twlcore_set_bits(struct twlcore *twlcore, u16 reg, u8 mask, u8 val);
+struct twlcore *twlcore_get(void);
 
 #endif /* __MFD_TWLCORE_H__ */