diff options
| author | Uwe Hermann <uwe@hermann-uwe.de> | 2010-11-10 00:14:32 +0000 |
|---|---|---|
| committer | Uwe Hermann <uwe@hermann-uwe.de> | 2010-11-10 00:14:32 +0000 |
| commit | a953f371ddc0cebf2b3b9d1eebeb857e0567c709 (patch) | |
| tree | c2c95f65cd963b7c5eeaa9cf93f8eaa5056854d8 /src/lib | |
| parent | f228a6cf93f662c3d178198aa9f8ff4d129227b3 (diff) | |
Debugging facility improvements.
- Hook up malloc() debug code via CONFIG_DEBUG_MALLOC. Only show it in
menuconfig if at least DEBUG or SPEW are selected as loglevel, as this
code does additional printk(BIOS_DEBUG, ...) calls which would otherwise
not be visible anyway.
- Similarly, make DEBUG_CAR and REALMODE_DEBUG only visible if thr DEBUG or
SPEW loglevel is selected.
- Get rid of a custom "debug" macro, use printk() as usual.
Signed-off-by: Uwe Hermann <uwe@hermann-uwe.de>
Acked-by: Peter Stuge <peter@stuge.se>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@6054 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/cbmem.c | 17 | ||||
| -rw-r--r-- | src/lib/malloc.c | 7 |
2 files changed, 11 insertions, 13 deletions
diff --git a/src/lib/cbmem.c b/src/lib/cbmem.c index 7e3e20123a..5490a1fef6 100644 --- a/src/lib/cbmem.c +++ b/src/lib/cbmem.c @@ -22,12 +22,6 @@ #include <cbmem.h> #include <console/console.h> -#if 1 -#define debug(x...) printk(BIOS_DEBUG, x) -#else -#define debug(x...) -#endif - // The CBMEM TOC reserves 512 bytes to keep // the other entries somewhat aligned. // Increase if MAX_CBMEM_ENTRIES exceeds 21 @@ -68,10 +62,11 @@ void cbmem_init(u64 baseaddr, u64 size) bss_cbmem_toc = cbmem_toc; #endif - debug("Initializing CBMEM area to 0x%llx (%lld bytes)\n", baseaddr, size); + printk(BIOS_DEBUG, "Initializing CBMEM area to 0x%llx (%lld bytes)\n", + baseaddr, size); if (size < (64 * 1024)) { - debug("Increase CBMEM size!!\n"); + printk(BIOS_DEBUG, "Increase CBMEM size!\n"); for (;;) ; } @@ -90,7 +85,9 @@ int cbmem_reinit(u64 baseaddr) struct cbmem_entry *cbmem_toc; cbmem_toc = (struct cbmem_entry *)(unsigned long)baseaddr; - debug("Re-Initializing CBMEM area to 0x%lx\n", (unsigned long)baseaddr); + printk(BIOS_DEBUG, "Re-Initializing CBMEM area to 0x%lx\n", + (unsigned long)baseaddr); + #ifndef __PRE_RAM__ bss_cbmem_toc = cbmem_toc; #endif @@ -135,7 +132,7 @@ void *cbmem_add(u32 id, u64 size) return NULL; } - debug("Adding CBMEM entry as no. %d\n", i); + printk(BIOS_DEBUG, "Adding CBMEM entry as no. %d\n", i); cbmem_toc[i] = (struct cbmem_entry) { .magic = CBMEM_MAGIC, diff --git a/src/lib/malloc.c b/src/lib/malloc.c index 2ed23ad795..ac038ecd44 100644 --- a/src/lib/malloc.c +++ b/src/lib/malloc.c @@ -1,11 +1,12 @@ #include <stdlib.h> #include <console/console.h> -#if 0 -#define MALLOCDBG(x) -#else +#if CONFIG_DEBUG_MALLOC #define MALLOCDBG(x...) printk(BIOS_SPEW, x) +#else +#define MALLOCDBG(x) #endif + extern unsigned char _heap, _eheap; static void *free_mem_ptr = &_heap; /* Start of heap */ static void *free_mem_end_ptr = &_eheap; /* End of heap */ |