mx5: fix get_reset_cause

commit d9f43c8f5c1d7ed27c99a06be85a4bb64b2c73fb sets get_reset_cause() as static, but this conflicts with mx5 where its prototype is in sys_proto.h. Drop it from sys_proto.h and drop print_cpuinfo from mx53_loco, factorizing the call for this board. Signed-off-by: Stefano Babic <sbabic@denx.de> CC: Jason Liu <jason.hui@linaro.org>

mx5: fix get_reset_cause
commit d9f43c8f5c1d7ed27c99a06be85a4bb64b2c73fb sets get_reset_cause() as static, but this conflicts with mx5 where its prototype is in sys_proto.h. Drop it from sys_proto.h and drop print_cpuinfo from mx53_loco, factorizing the call for this board. Signed-off-by: Stefano Babic <sbabic@denx.de> CC: Jason Liu <jason.hui@linaro.org>
Stefano Babic · Eric Lee · Eric Lee · Eric Lee · Eric Lee · Eric Lee
1 parent b16c37e46c
Showing 3 changed files with 2 additions and 17 deletions Side-by-side Diff
arch/arm/include/asm/arch-mx5/sys_proto.h
board/freescale/mx53loco/mx53loco.c
include/configs/mx53loco.h
@@ -24,7 +24,6 @@
 int fecmxc_initialize(bd_t *bis);
 u32 get_ahb_clk(void);
 u32 get_periph_clk(void);
-char *get_reset_cause(void);
  
 #endif
@@ -366,22 +366,6 @@
 	return 0;
 }
  
-#if defined(CONFIG_DISPLAY_CPUINFO)
-int print_cpuinfo(void)
-{
-	u32 cpurev;
-
-	cpurev = get_cpu_rev();
-	printf("CPU:   Freescale i.MX%x family rev%d.%d at %d MHz\n",
-		(cpurev & 0xFF000) >> 12,
-		(cpurev & 0x000F0) >> 4,
-		(cpurev & 0x0000F) >> 0,
-		mxc_get_clock(MXC_ARM_CLK) / 1000000);
-	printf("Reset cause: %s\n", get_reset_cause());
-	return 0;
-}
-#endif
-
 /*
  * Do not overwrite the console
  * Use always serial for U-Boot console
@@ -24,6 +24,8 @@
  
 #define CONFIG_SYS_GENERIC_BOARD
  
+#define CONFIG_DISPLAY_CPUINFO
+
 /* Size of malloc() pool */
 #define CONFIG_SYS_MALLOC_LEN		(10 * 1024 * 1024)
...	...	@@ -24,7 +24,6 @@
24	24	int fecmxc_initialize(bd_t *bis);
25	25	u32 get_ahb_clk(void);
26	26	u32 get_periph_clk(void);
27		-char *get_reset_cause(void);
28	27
29	28	#endif
...	...	@@ -366,22 +366,6 @@
366	366	return 0;
367	367	}
368	368
369		-#if defined(CONFIG_DISPLAY_CPUINFO)
370		-int print_cpuinfo(void)
371		-{
372		- u32 cpurev;
373		-
374		- cpurev = get_cpu_rev();
375		- printf("CPU: Freescale i.MX%x family rev%d.%d at %d MHz\n",
376		- (cpurev & 0xFF000) >> 12,
377		- (cpurev & 0x000F0) >> 4,
378		- (cpurev & 0x0000F) >> 0,
379		- mxc_get_clock(MXC_ARM_CLK) / 1000000);
380		- printf("Reset cause: %s\n", get_reset_cause());
381		- return 0;
382		-}
383		-#endif
384		-
385	369	/*
386	370	* Do not overwrite the console
387	371	* Use always serial for U-Boot console
...	...	@@ -24,6 +24,8 @@
24	24
25	25	#define CONFIG_SYS_GENERIC_BOARD
26	26
	27	+#define CONFIG_DISPLAY_CPUINFO
	28	+
27	29	/* Size of malloc() pool */
28	30	#define CONFIG_SYS_MALLOC_LEN (10 * 1024 * 1024)
29	31