diff options
| author | Stefano Babic <sbabic@denx.de> | 2015-03-02 10:12:13 +0100 |
|---|---|---|
| committer | Stefano Babic <sbabic@denx.de> | 2015-03-05 10:29:27 +0100 |
| commit | 32df39c741788e8637cffe6633d73594b26d70fb (patch) | |
| tree | ab0fe4181871aacdebe88ea7c28622b6d41f18ef | |
| parent | b16c37e46c1993b7d789aa7a1840250369d6944c (diff) | |
| download | talos-obmc-uboot-32df39c741788e8637cffe6633d73594b26d70fb.tar.gz talos-obmc-uboot-32df39c741788e8637cffe6633d73594b26d70fb.zip | |
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>
| -rw-r--r-- | arch/arm/include/asm/arch-mx5/sys_proto.h | 1 | ||||
| -rw-r--r-- | board/freescale/mx53loco/mx53loco.c | 16 | ||||
| -rw-r--r-- | include/configs/mx53loco.h | 2 |
3 files changed, 2 insertions, 17 deletions
diff --git a/arch/arm/include/asm/arch-mx5/sys_proto.h b/arch/arm/include/asm/arch-mx5/sys_proto.h index ac7705b3b0..b06c77f65c 100644 --- a/arch/arm/include/asm/arch-mx5/sys_proto.h +++ b/arch/arm/include/asm/arch-mx5/sys_proto.h @@ -24,6 +24,5 @@ void set_chipselect_size(int const); int fecmxc_initialize(bd_t *bis); u32 get_ahb_clk(void); u32 get_periph_clk(void); -char *get_reset_cause(void); #endif diff --git a/board/freescale/mx53loco/mx53loco.c b/board/freescale/mx53loco/mx53loco.c index efcf4b390d..9ece6ecd8b 100644 --- a/board/freescale/mx53loco/mx53loco.c +++ b/board/freescale/mx53loco/mx53loco.c @@ -366,22 +366,6 @@ int board_early_init_f(void) 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 diff --git a/include/configs/mx53loco.h b/include/configs/mx53loco.h index 42bc3c869f..8d8b93cca5 100644 --- a/include/configs/mx53loco.h +++ b/include/configs/mx53loco.h @@ -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) |
