summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarian Balakowicz <m8@semihalf.com>2008-05-07 09:03:53 +0200
committerWolfgang Denk <wd@denx.de>2008-05-10 00:11:25 +0200
commit273c37d843d5b581090378016cd12dd9c586907b (patch)
treed51af0894e661ad80729e41bb8905dbb7cf8b937
parentbc11756daff89a3de09ca80adac962b88cf06e6e (diff)
downloadu-boot-imx-273c37d843d5b581090378016cd12dd9c586907b.zip
u-boot-imx-273c37d843d5b581090378016cd12dd9c586907b.tar.gz
u-boot-imx-273c37d843d5b581090378016cd12dd9c586907b.tar.bz2
Fix build errors when CONFIG_LOGBUFFER and CONFIG_FIT are enabled
Recent modifcations to LOGBUFFER handling code were incorrecly introduced to fit_check_kernel() routine during "Merge branch 'new-image' of git://www.denx.de/git/u-boot-testing", commit 27f33e9f45ef7f9685cbdc65066a1828e85dde4f. This patch cleans up this merge issue. Signed-off-by: Marian Balakowicz <m8@semihalf.com>
-rw-r--r--common/cmd_bootm.c11
-rw-r--r--common/image.c4
2 files changed, 0 insertions, 15 deletions
diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c
index 44f6b9f..0d67132 100644
--- a/common/cmd_bootm.c
+++ b/common/cmd_bootm.c
@@ -433,17 +433,6 @@ static int fit_check_kernel (const void *fit, int os_noffset, int verify)
}
show_boot_progress (105);
-#ifdef CONFIG_LOGBUFFER
-#ifndef CONFIG_ALT_LB_ADDR
- kbd=gd->bd;
- /* Prevent initrd from overwriting logbuffer */
- if (initrd_high < (kbd->bi_memsize-LOGBUFF_LEN-LOGBUFF_OVERHEAD))
- initrd_high = kbd->bi_memsize-LOGBUFF_LEN-LOGBUFF_OVERHEAD;
- debug ("## Logbuffer at 0x%08lX ", kbd->bi_memsize-LOGBUFF_LEN);
-#else
- debug ("## Logbuffer at 0x%08lX ", CONFIG_ALT_LB_ADDR);
-#endif
-#endif
if (!fit_image_check_target_arch (fit, os_noffset)) {
puts ("Unsupported Architecture\n");
show_boot_progress (-105);
diff --git a/common/image.c b/common/image.c
index 051d298..f4070fb 100644
--- a/common/image.c
+++ b/common/image.c
@@ -36,10 +36,6 @@
#include <dataflash.h>
#endif
-#ifdef CONFIG_LOGBUFFER
-#include <logbuff.h>
-#endif
-
#if defined(CONFIG_TIMESTAMP) || defined(CONFIG_CMD_DATE)
#include <rtc.h>
#endif