diff options
| author | Tom Rini <trini@konsulko.com> | 2017-10-12 13:36:37 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-10-12 13:36:37 -0400 |
| commit | e11d2fff73b5c0e04027b55020a0a56d9dc72aa4 (patch) | |
| tree | 506fe0f032e17fbe0854de7a64478b66e10a5379 /arch/arm/mach-imx/cpu.c | |
| parent | 1b22c5ba496ffc9b0702919d58c410ed1527ab63 (diff) | |
| parent | 0a333602df9fd9dcd6f58c8c098b29a3bd1dffcc (diff) | |
Merge git://www.denx.de/git/u-boot-imx
Diffstat (limited to 'arch/arm/mach-imx/cpu.c')
| -rw-r--r-- | arch/arm/mach-imx/cpu.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-imx/cpu.c b/arch/arm/mach-imx/cpu.c index 1017eb84f9..18205dc984 100644 --- a/arch/arm/mach-imx/cpu.c +++ b/arch/arm/mach-imx/cpu.c @@ -25,7 +25,7 @@ #include <fsl_esdhc.h> #endif -#if defined(CONFIG_DISPLAY_CPUINFO) +#if defined(CONFIG_DISPLAY_CPUINFO) && !defined(CONFIG_SPL_BUILD) static u32 reset_cause = -1; static char *get_reset_cause(void) @@ -132,7 +132,7 @@ unsigned imx_ddr_size(void) } #endif -#if defined(CONFIG_DISPLAY_CPUINFO) +#if defined(CONFIG_DISPLAY_CPUINFO) && !defined(CONFIG_SPL_BUILD) const char *get_imx_type(u32 imxtype) { |