From 802b2b772d252942be6b33ef7f93323ab90a4c21 Mon Sep 17 00:00:00 2001 From: Tushar Behera Date: Tue, 4 Jun 2013 09:49:10 +0530 Subject: [PATCH] --- yaml --- r: 376847 b: refs/heads/master c: 437d8ac510b90610da814ae25a7b79aaf3b4910f h: refs/heads/master i: 376845: c5030f379e35ff8dabab7ac530e630231907dfff 376843: f23f7cc2306254dc189bf76ef75237b72b0bc5e1 376839: df93a91a10b39aa350a1d53e030727f4836cd512 376831: 2085f68627b39d9dd213de99e6bc2b2015ecea4e v: v3 --- [refs] | 2 +- trunk/arch/arm/plat-samsung/include/plat/uncompress.h | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 123c9e3f9a8a..e4b9a12c351f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0b6825585bb9a896cd10adfdaf6c3724c419311c +refs/heads/master: 437d8ac510b90610da814ae25a7b79aaf3b4910f diff --git a/trunk/arch/arm/plat-samsung/include/plat/uncompress.h b/trunk/arch/arm/plat-samsung/include/plat/uncompress.h index 438b24846e7f..02b66d723d1a 100644 --- a/trunk/arch/arm/plat-samsung/include/plat/uncompress.h +++ b/trunk/arch/arm/plat-samsung/include/plat/uncompress.h @@ -66,6 +66,9 @@ uart_rd(unsigned int reg) static void putc(int ch) { + if (!config_enabled(CONFIG_DEBUG_LL)) + return; + if (uart_rd(S3C2410_UFCON) & S3C2410_UFCON_FIFOMODE) { int level; @@ -118,7 +121,12 @@ static void arch_decomp_error(const char *x) #ifdef CONFIG_S3C_BOOT_UART_FORCE_FIFO static inline void arch_enable_uart_fifo(void) { - u32 fifocon = uart_rd(S3C2410_UFCON); + u32 fifocon; + + if (!config_enabled(CONFIG_DEBUG_LL)) + return; + + fifocon = uart_rd(S3C2410_UFCON); if (!(fifocon & S3C2410_UFCON_FIFOMODE)) { fifocon |= S3C2410_UFCON_RESETBOTH;