From 80e914ffd59ea011b1d4ba1c1a1a1421dc2c6ecc Mon Sep 17 00:00:00 2001 From: Myles Watson Date: Tue, 1 Jun 2010 19:25:31 +0000 Subject: [PATCH] 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 Acked-by: Myles Watson git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5603 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- src/Kconfig | 12 ++++++++---- src/arch/i386/boot/pirq_routing.c | 10 +++++----- src/mainboard/lippert/spacerunner-lx/romstage.c | 2 +- 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/src/Kconfig b/src/Kconfig index 85ffab0cf5..3e8e6dbcfa 100644 --- a/src/Kconfig +++ b/src/Kconfig @@ -139,10 +139,6 @@ config HEAP_SIZE hex default 0x4000 -config DEBUG - bool - default n - config USE_PRINTK_IN_CAR bool default n @@ -520,6 +516,13 @@ config DEBUG_RAM_SETUP 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 bool "Output verbose SMBus debug messages" default n @@ -528,6 +531,7 @@ config DEBUG_SMBUS || NORTHBRIDGE_VIA_CX700 \ || NORTHBRIDGE_AMD_AMDK8 \ || NORTHBRIDGE_AMD_AMDFAM10 \ + || BOARD_LIPPERT_SPACERUNNER_LX \ || SOUTHBRIDGE_VIA_VT8231) help This option enables additional SMBus (and SPD) debug messages. diff --git a/src/arch/i386/boot/pirq_routing.c b/src/arch/i386/boot/pirq_routing.c index 4873f6d751..1956f2115f 100644 --- a/src/arch/i386/boot/pirq_routing.c +++ b/src/arch/i386/boot/pirq_routing.c @@ -3,7 +3,7 @@ #include #include -#if CONFIG_DEBUG +#if CONFIG_DEBUG_PIRQ static void check_pirq_routing_table(struct irq_routing_table *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"); 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), rt->size ); @@ -51,7 +51,7 @@ static void check_pirq_routing_table(struct irq_routing_table *rt) */ if (sum) { printk(BIOS_WARNING, "Checksum error in Interrupt Routing Table " - "could not be fixed.\n"); + "could not be fixed.\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_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++) { if (*(rt_curr + i) != *(rt_orig + i)) { 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); memcpy((void *)addr, &intel_irq_routing_table, intel_irq_routing_table.size); printk(BIOS_INFO, "done.\n"); -#if CONFIG_DEBUG +#if CONFIG_DEBUG_PIRQ verify_copy_pirq_routing_table(addr); #endif pirq_routing_irqs(addr); diff --git a/src/mainboard/lippert/spacerunner-lx/romstage.c b/src/mainboard/lippert/spacerunner-lx/romstage.c index acf6fdcd69..b9b0e4f048 100644 --- a/src/mainboard/lippert/spacerunner-lx/romstage.c +++ b/src/mainboard/lippert/spacerunner-lx/romstage.c @@ -84,7 +84,7 @@ static inline int spd_read_byte(unsigned int device, unsigned int address) if (device != DIMM0) return 0xFF; /* No DIMM1, don't even try. */ -#if CONFIG_DEBUG +#if CONFIG_DEBUG_SMBUS if (address >= sizeof(spdbytes) || spdbytes[address] == 0xFF) { print_err("ERROR: spd_read_byte(DIMM0, 0x"); print_err_hex8(address);