diff options
Diffstat (limited to 'common')
| -rw-r--r-- | common/Makefile | 1 | ||||
| -rw-r--r-- | common/cmd_ide.c | 6 | ||||
| -rw-r--r-- | common/cmd_log.c | 2 |
3 files changed, 2 insertions, 7 deletions
diff --git a/common/Makefile b/common/Makefile index ae795e0d5..1b672ad96 100644 --- a/common/Makefile +++ b/common/Makefile @@ -187,6 +187,7 @@ COBJS-$(CONFIG_USB_KEYBOARD) += usb_kbd.o endif COBJS-y += console.o +COBJS-y += dlmalloc.o COBJS-y += memsize.o COBJS-y += stdio.o diff --git a/common/cmd_ide.c b/common/cmd_ide.c index 74e6504b2..1fc03777e 100644 --- a/common/cmd_ide.c +++ b/common/cmd_ide.c @@ -46,12 +46,6 @@ #include <mpc5xxx.h> #endif -#ifdef CONFIG_ORION5X -#include <asm/arch/orion5x.h> -#elif defined CONFIG_KIRKWOOD -#include <asm/arch/kirkwood.h> -#endif - #include <ide.h> #include <ata.h> diff --git a/common/cmd_log.c b/common/cmd_log.c index 0e89357e5..249614f34 100644 --- a/common/cmd_log.c +++ b/common/cmd_log.c @@ -68,7 +68,7 @@ static char *lbuf; unsigned long __logbuffer_base(void) { - return CONFIG_SYS_SDRAM_BASE + gd->bd->bi_memsize - LOGBUFF_LEN; + return CONFIG_SYS_SDRAM_BASE + gd->ram_size - LOGBUFF_LEN; } unsigned long logbuffer_base (void) __attribute__((weak, alias("__logbuffer_base"))); |