diff options
| author | Max Krummenacher <max.krummenacher@toradex.com> | 2017-03-23 19:22:39 +0100 |
|---|---|---|
| committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2017-03-30 10:12:28 +0200 |
| commit | 78c138fb573e95333d612a9481cc7b4c1a8c176f (patch) | |
| tree | 28a88783f0b4e4bb461851b5ca47b209461aa10b | |
| parent | b173fdcd3cd8581cdc9c350099ddb02fb60e3258 (diff) | |
common: apalis/colibri imx6: spl: add config to silence console output
This adds a Kconfig SPL_SILENCE_CONSOLE which allows to suppress any
console output which in the normal program flow is printed in the SPL.
Error messages and the likes will still be printed.
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
| -rw-r--r-- | board/toradex/apalis_imx6/apalis_imx6.c | 4 | ||||
| -rw-r--r-- | board/toradex/colibri_imx6/colibri_imx6.c | 9 | ||||
| -rw-r--r-- | board/toradex/common/Kconfig | 9 | ||||
| -rw-r--r-- | common/spl/spl.c | 4 |
4 files changed, 26 insertions, 0 deletions
diff --git a/board/toradex/apalis_imx6/apalis_imx6.c b/board/toradex/apalis_imx6/apalis_imx6.c index 93e777d6ce..bb5f2bcb18 100644 --- a/board/toradex/apalis_imx6/apalis_imx6.c +++ b/board/toradex/apalis_imx6/apalis_imx6.c @@ -1235,13 +1235,17 @@ static void spl_dram_init(void) switch (get_cpu_temp_grade(&minc, &maxc)) { case TEMP_COMMERCIAL: case TEMP_EXTCOMMERCIAL: +#ifndef CONFIG_SPL_SILENT_CONSOLE puts("Commercial temperature grade DDR3 timings.\n"); +#endif ddr_init(mx6_com_dcd_table, ARRAY_SIZE(mx6_com_dcd_table)); break; case TEMP_INDUSTRIAL: case TEMP_AUTOMOTIVE: default: +#ifndef CONFIG_SPL_SILENT_CONSOLE puts("Industrial temperature grade DDR3 timings.\n"); +#endif ddr_init(mx6_it_dcd_table, ARRAY_SIZE(mx6_it_dcd_table)); break; }; diff --git a/board/toradex/colibri_imx6/colibri_imx6.c b/board/toradex/colibri_imx6/colibri_imx6.c index 1fa0bf6252..8bf4046e7d 100644 --- a/board/toradex/colibri_imx6/colibri_imx6.c +++ b/board/toradex/colibri_imx6/colibri_imx6.c @@ -1062,10 +1062,14 @@ static void spl_dram_init(void) case TEMP_COMMERCIAL: case TEMP_EXTCOMMERCIAL: if (is_cpu_type(MXC_CPU_MX6DL)) { +#ifndef CONFIG_SPL_SILENT_CONSOLE puts("Commercial temperature grade DDR3 timings, 64bit bus width.\n"); +#endif ddr_init(mx6dl_dcd_table, ARRAY_SIZE(mx6dl_dcd_table)); } else { +#ifndef CONFIG_SPL_SILENT_CONSOLE puts("Commercial temperature grade DDR3 timings, 32bit bus width.\n"); +#endif ddr_init(mx6s_dcd_table, ARRAY_SIZE(mx6s_dcd_table)); } break; @@ -1073,9 +1077,14 @@ static void spl_dram_init(void) case TEMP_AUTOMOTIVE: default: if (is_cpu_type(MXC_CPU_MX6DL)) { +#ifndef CONFIG_SPL_SILENT_CONSOLE + puts("Industrial temperature grade DDR3 timings, 64bit bus width.\n"); +#endif ddr_init(mx6dl_dcd_table, ARRAY_SIZE(mx6dl_dcd_table)); } else { +#ifndef CONFIG_SPL_SILENT_CONSOLE puts("Industrial temperature grade DDR3 timings, 32bit bus width.\n"); +#endif ddr_init(mx6s_dcd_table, ARRAY_SIZE(mx6s_dcd_table)); } break; diff --git a/board/toradex/common/Kconfig b/board/toradex/common/Kconfig index 562c39f326..c2988d2f15 100644 --- a/board/toradex/common/Kconfig +++ b/board/toradex/common/Kconfig @@ -75,3 +75,12 @@ config IMX_GETSPLVER help Add a command to parse the SPL version from its mass storage location which can compare the found version against a given string. + +config SPL_SILENT_CONSOLE + bool "Support a silent console in SPL" + depends on SPL && (TARGET_COLIBRI_IMX6 || TARGET_APALIS_IMX6) + default y if SILENT_CONSOLE + help + This option will silence all messages printed to the console during + normal program flow on Apalis/Colibri iMX6. Error messages or + warnings are not affected. diff --git a/common/spl/spl.c b/common/spl/spl.c index 8d07321784..0e50137cdf 100644 --- a/common/spl/spl.c +++ b/common/spl/spl.c @@ -331,6 +331,7 @@ struct boot_device_name boot_name_table[] = { static void announce_boot_device(u32 boot_device) { +#ifndef CONFIG_SPL_SILENT_CONSOLE int i; puts("Trying to boot from "); @@ -348,6 +349,7 @@ static void announce_boot_device(u32 boot_device) } printf("%s\n", boot_name_table[i].name); +#endif } #else static inline void announce_boot_device(u32 boot_device) { } @@ -473,11 +475,13 @@ void preloader_console_init(void) gd->have_console = 1; +#ifndef CONFIG_SPL_SILENT_CONSOLE puts("\nU-Boot SPL " PLAIN_VERSION " (" U_BOOT_DATE " - " \ U_BOOT_TIME ")\n"); #ifdef CONFIG_SPL_DISPLAY_PRINT spl_display_print(); #endif +#endif } /** |