CONFIG_DEBUG is too generic. Remove it and replace it with CONFIG_DEBUG_SMBUS

and CONFIG_DEBUG_PIRQ.

Fix a couple of typos.

Signed-off-by: Myles Watson <mylesgw@gmail.com>
Acked-by: Myles Watson <mylesgw@gmail.com>


git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5603 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
This commit is contained in:
Myles Watson
2010-06-01 19:25:31 +00:00
parent 94de72b919
commit 80e914ffd5
3 changed files with 14 additions and 10 deletions

View File

@ -139,10 +139,6 @@ config HEAP_SIZE
hex hex
default 0x4000 default 0x4000
config DEBUG
bool
default n
config USE_PRINTK_IN_CAR config USE_PRINTK_IN_CAR
bool bool
default n default n
@ -520,6 +516,13 @@ config DEBUG_RAM_SETUP
If unsure, say N. If unsure, say N.
config DEBUG_PIRQ
bool "Check PIRQ table consistency"
default n
depends on GENERATE_PIRQ_TABLE
help
If unsure, say N.
config DEBUG_SMBUS config DEBUG_SMBUS
bool "Output verbose SMBus debug messages" bool "Output verbose SMBus debug messages"
default n default n
@ -528,6 +531,7 @@ config DEBUG_SMBUS
|| NORTHBRIDGE_VIA_CX700 \ || NORTHBRIDGE_VIA_CX700 \
|| NORTHBRIDGE_AMD_AMDK8 \ || NORTHBRIDGE_AMD_AMDK8 \
|| NORTHBRIDGE_AMD_AMDFAM10 \ || NORTHBRIDGE_AMD_AMDFAM10 \
|| BOARD_LIPPERT_SPACERUNNER_LX \
|| SOUTHBRIDGE_VIA_VT8231) || SOUTHBRIDGE_VIA_VT8231)
help help
This option enables additional SMBus (and SPD) debug messages. This option enables additional SMBus (and SPD) debug messages.

View File

@ -3,7 +3,7 @@
#include <string.h> #include <string.h>
#include <device/pci.h> #include <device/pci.h>
#if CONFIG_DEBUG #if CONFIG_DEBUG_PIRQ
static void check_pirq_routing_table(struct irq_routing_table *rt) static void check_pirq_routing_table(struct irq_routing_table *rt)
{ {
uint8_t *addr = (uint8_t *)rt; uint8_t *addr = (uint8_t *)rt;
@ -13,7 +13,7 @@ static void check_pirq_routing_table(struct irq_routing_table *rt)
printk(BIOS_INFO, "Checking Interrupt Routing Table consistency...\n"); printk(BIOS_INFO, "Checking Interrupt Routing Table consistency...\n");
if (sizeof(struct irq_routing_table) != rt->size) { if (sizeof(struct irq_routing_table) != rt->size) {
printk(BIOS_WARNING, "Inconsistent Interrupt Routing Table size (0x%x/0x%x).\n", printk(BIOS_WARNING, "Inconsistent Interrupt Routing Table size (0x%lx/0x%x).\n",
sizeof(struct irq_routing_table), sizeof(struct irq_routing_table),
rt->size rt->size
); );
@ -51,7 +51,7 @@ static void check_pirq_routing_table(struct irq_routing_table *rt)
*/ */
if (sum) { if (sum) {
printk(BIOS_WARNING, "Checksum error in Interrupt Routing Table " printk(BIOS_WARNING, "Checksum error in Interrupt Routing Table "
"could not be fixed.\n"); "could not be fixed.\n");
} }
printk(BIOS_INFO, "done.\n"); printk(BIOS_INFO, "done.\n");
@ -64,7 +64,7 @@ static int verify_copy_pirq_routing_table(unsigned long addr)
rt_curr = (uint8_t*)addr; rt_curr = (uint8_t*)addr;
rt_orig = (uint8_t*)&intel_irq_routing_table; rt_orig = (uint8_t*)&intel_irq_routing_table;
printk(BIOS_INFO, "Verifing copy of Interrupt Routing Table at 0x%08x... ", addr); printk(BIOS_INFO, "Verifying copy of Interrupt Routing Table at 0x%08x... ", addr);
for (i = 0; i < intel_irq_routing_table.size; i++) { for (i = 0; i < intel_irq_routing_table.size; i++) {
if (*(rt_curr + i) != *(rt_orig + i)) { if (*(rt_curr + i) != *(rt_orig + i)) {
printk(BIOS_INFO, "failed\n"); printk(BIOS_INFO, "failed\n");
@ -89,7 +89,7 @@ unsigned long copy_pirq_routing_table(unsigned long addr)
printk(BIOS_INFO, "Copying Interrupt Routing Table to 0x%08lx... ", addr); printk(BIOS_INFO, "Copying Interrupt Routing Table to 0x%08lx... ", addr);
memcpy((void *)addr, &intel_irq_routing_table, intel_irq_routing_table.size); memcpy((void *)addr, &intel_irq_routing_table, intel_irq_routing_table.size);
printk(BIOS_INFO, "done.\n"); printk(BIOS_INFO, "done.\n");
#if CONFIG_DEBUG #if CONFIG_DEBUG_PIRQ
verify_copy_pirq_routing_table(addr); verify_copy_pirq_routing_table(addr);
#endif #endif
pirq_routing_irqs(addr); pirq_routing_irqs(addr);

View File

@ -84,7 +84,7 @@ static inline int spd_read_byte(unsigned int device, unsigned int address)
if (device != DIMM0) if (device != DIMM0)
return 0xFF; /* No DIMM1, don't even try. */ return 0xFF; /* No DIMM1, don't even try. */
#if CONFIG_DEBUG #if CONFIG_DEBUG_SMBUS
if (address >= sizeof(spdbytes) || spdbytes[address] == 0xFF) { if (address >= sizeof(spdbytes) || spdbytes[address] == 0xFF) {
print_err("ERROR: spd_read_byte(DIMM0, 0x"); print_err("ERROR: spd_read_byte(DIMM0, 0x");
print_err_hex8(address); print_err_hex8(address);