GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Ensure that config options hidden by r6054 have defaults, and fix MALLOCDBG() 

Signed-off-by: Peter Stuge <peter@stuge.se>
Acked-by: Peter Stuge <peter@stuge.se>


git-svn-id: svn://svn.coreboot.org/coreboot/trunk@6055 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
This commit is contained in:
Peter Stuge 2010-11-10 02:00:32 +00:00
parent a953f371dd
commit 5015f79857
2 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/Kconfig
View File

@ -502,15 +502,20 @@ config DEBUG_RAM_SETUP
config HAVE_DEBUG_CAR config HAVE_DEBUG_CAR
def_bool n def_bool n
config DEBUG_CAR
def_bool n
depends on HAVE_DEBUG_CAR
if DEFAULT_CONSOLE_LOGLEVEL_7 || DEFAULT_CONSOLE_LOGLEVEL_8
# Only visible if debug level is DEBUG (7) or SPEW (8) as it does additional # Only visible if debug level is DEBUG (7) or SPEW (8) as it does additional
# printk(BIOS_DEBUG, ...) calls. # printk(BIOS_DEBUG, ...) calls.
config DEBUG_CAR config DEBUG_CAR
bool "Output verbose Cache-as-RAM debug messages" bool "Output verbose Cache-as-RAM debug messages"
default n default n
depends on HAVE_DEBUG_CAR && \ depends on HAVE_DEBUG_CAR
(DEFAULT_CONSOLE_LOGLEVEL_7 || DEFAULT_CONSOLE_LOGLEVEL_8)
help help
This option enables additional CAR related debug messages. This option enables additional CAR related debug messages.
endif
config DEBUG_PIRQ config DEBUG_PIRQ
bool "Check PIRQ table consistency" bool "Check PIRQ table consistency"
@ -556,32 +561,41 @@ config DEBUG_SMM_RELOCATION
If unsure, say N. If unsure, say N.
config DEBUG_MALLOC
def_bool n
# Only visible if debug level is DEBUG (7) or SPEW (8) as it does additional # Only visible if debug level is DEBUG (7) or SPEW (8) as it does additional
# printk(BIOS_DEBUG, ...) calls. # printk(BIOS_DEBUG, ...) calls.
if DEFAULT_CONSOLE_LOGLEVEL_7 || DEFAULT_CONSOLE_LOGLEVEL_8
config DEBUG_MALLOC config DEBUG_MALLOC
bool "Output verbose malloc debug messages" bool "Output verbose malloc debug messages"
default n default n
depends on DEFAULT_CONSOLE_LOGLEVEL_7 || DEFAULT_CONSOLE_LOGLEVEL_8
help help
This option enables additional malloc related debug messages. This option enables additional malloc related debug messages.
Note: This option will increase the size of the coreboot image. Note: This option will increase the size of the coreboot image.
If unsure, say N. If unsure, say N.
endif
config REALMODE_DEBUG
def_bool n
depends on PCI_OPTION_ROM_RUN_REALMODE
if DEFAULT_CONSOLE_LOGLEVEL_7 || DEFAULT_CONSOLE_LOGLEVEL_8
# Only visible if debug level is DEBUG (7) or SPEW (8) as it does additional # Only visible if debug level is DEBUG (7) or SPEW (8) as it does additional
# printk(BIOS_DEBUG, ...) calls. # printk(BIOS_DEBUG, ...) calls.
config REALMODE_DEBUG config REALMODE_DEBUG
bool "Enable debug messages for option ROM execution" bool "Enable debug messages for option ROM execution"
default n default n
depends on PCI_OPTION_ROM_RUN_REALMODE && \ depends on PCI_OPTION_ROM_RUN_REALMODE
(DEFAULT_CONSOLE_LOGLEVEL_7 || DEFAULT_CONSOLE_LOGLEVEL_8)
help help
This option enables additional x86emu related debug messages. This option enables additional x86emu related debug messages.
Note: This option will increase the time to emulate a ROM. Note: This option will increase the time to emulate a ROM.
If unsure, say N. If unsure, say N.
endif
config X86EMU_DEBUG config X86EMU_DEBUG
bool "Output verbose x86emu debug messages" bool "Output verbose x86emu debug messages"

2
src/lib/malloc.c
View File

@ -4,7 +4,7 @@
#if CONFIG_DEBUG_MALLOC #if CONFIG_DEBUG_MALLOC
#define MALLOCDBG(x...) printk(BIOS_SPEW, x) #define MALLOCDBG(x...) printk(BIOS_SPEW, x)
#else #else
#define MALLOCDBG(x) #define MALLOCDBG(x...)
#endif #endif
extern unsigned char _heap, _eheap; extern unsigned char _heap, _eheap;