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 27f33e9f45
.
This patch cleans up this merge issue.
Signed-off-by: Marian Balakowicz <m8@semihalf.com>
This commit is contained in:
parent
bc11756daf
commit
273c37d843
|
@ -433,17 +433,6 @@ static int fit_check_kernel (const void *fit, int os_noffset, int verify)
|
||||||
}
|
}
|
||||||
show_boot_progress (105);
|
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)) {
|
if (!fit_image_check_target_arch (fit, os_noffset)) {
|
||||||
puts ("Unsupported Architecture\n");
|
puts ("Unsupported Architecture\n");
|
||||||
show_boot_progress (-105);
|
show_boot_progress (-105);
|
||||||
|
|
|
@ -36,10 +36,6 @@
|
||||||
#include <dataflash.h>
|
#include <dataflash.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef CONFIG_LOGBUFFER
|
|
||||||
#include <logbuff.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if defined(CONFIG_TIMESTAMP) || defined(CONFIG_CMD_DATE)
|
#if defined(CONFIG_TIMESTAMP) || defined(CONFIG_CMD_DATE)
|
||||||
#include <rtc.h>
|
#include <rtc.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in New Issue