|
@@ -337,13 +337,16 @@ static int setup_dest_addr(void)
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
|
-#if defined(CONFIG_LOGBUFFER) && !defined(CONFIG_ALT_LB_ADDR)
|
|
|
+#if defined(CONFIG_LOGBUFFER)
|
|
|
static int reserve_logbuffer(void)
|
|
|
{
|
|
|
+#ifndef CONFIG_ALT_LB_ADDR
|
|
|
/* reserve kernel log buffer */
|
|
|
gd->relocaddr -= LOGBUFF_RESERVE;
|
|
|
debug("Reserving %dk for kernel logbuffer at %08lx\n", LOGBUFF_LEN,
|
|
|
gd->relocaddr);
|
|
|
+#endif
|
|
|
+
|
|
|
return 0;
|
|
|
}
|
|
|
#endif
|
|
@@ -887,7 +890,7 @@ static const init_fnc_t init_sequence_f[] = {
|
|
|
* - board info struct
|
|
|
*/
|
|
|
setup_dest_addr,
|
|
|
-#if defined(CONFIG_LOGBUFFER) && !defined(CONFIG_ALT_LB_ADDR)
|
|
|
+#if defined(CONFIG_LOGBUFFER)
|
|
|
reserve_logbuffer,
|
|
|
#endif
|
|
|
#ifdef CONFIG_PRAM
|