summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwdenk <wdenk>2003-07-15 21:50:34 +0000
committerwdenk <wdenk>2003-07-15 21:50:34 +0000
commit667122af2d5079589de47855948ce4a3f716cb87 (patch)
treee82d3291cc18584ad354b6a75610fc854f5d2a0a
parent2960b65addd7dcfdc4a4852ca2f557482b58dd22 (diff)
downloadtalos-obmc-uboot-667122af2d5079589de47855948ce4a3f716cb87.tar.gz
talos-obmc-uboot-667122af2d5079589de47855948ce4a3f716cb87.zip
Avoid unnecessary call to post_word_load();
make logbuf compile without POST
-rw-r--r--common/cmd_log.c2
-rw-r--r--include/asm-ppc/global_data.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/common/cmd_log.c b/common/cmd_log.c
index 8a7860e776..8780da5e29 100644
--- a/common/cmd_log.c
+++ b/common/cmd_log.c
@@ -93,7 +93,7 @@ void logbuff_init_ptrs (void)
}
#else
/* No post routines, so we do our own checking */
- if (post_word_load () != LOGBUFF_MAGIC) {
+ if (post_word != LOGBUFF_MAGIC) {
logged_chars = log_size = log_start = 0;
post_word_store (LOGBUFF_MAGIC);
*ext_tag = LOGBUFF_MAGIC;
diff --git a/include/asm-ppc/global_data.h b/include/asm-ppc/global_data.h
index 19c7fd8c02..e3aa25d75a 100644
--- a/include/asm-ppc/global_data.h
+++ b/include/asm-ppc/global_data.h
@@ -70,7 +70,7 @@ typedef struct global_data {
#if defined(CONFIG_LCD) || defined(CONFIG_VIDEO)
unsigned long fb_base; /* Base address of framebuffer memory */
#endif
-#ifdef CONFIG_POST
+#if defined(CONFIG_POST) || defined(CONFIG_LOGBUFFER)
unsigned long post_log_word; /* Record POST activities */
unsigned long post_init_f_time; /* When post_init_f started */
#endif
OpenPOWER on IntegriCloud