aboutsummaryrefslogtreecommitdiff
path: root/src/arch
diff options
context:
space:
mode:
authorGreg Watson <jarrah@users.sourceforge.net>2004-03-23 17:41:15 +0000
committerGreg Watson <jarrah@users.sourceforge.net>2004-03-23 17:41:15 +0000
commit9f46132e9627d24f3ad76619cf3340006a4012fb (patch)
treecf6c6a62fe7127cdb616dbe5db03e6ffe2fffd09 /src/arch
parent4f8311ae58ee66ce7ba774bf95894612d92f748d (diff)
tighten up option exporting
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@1468 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'src/arch')
-rw-r--r--src/arch/i386/boot/pirq_routing.c4
-rw-r--r--src/arch/i386/include/arch/pirq_routing.h4
2 files changed, 5 insertions, 3 deletions
diff --git a/src/arch/i386/boot/pirq_routing.c b/src/arch/i386/boot/pirq_routing.c
index 6c7f640ca3..bb0f66b280 100644
--- a/src/arch/i386/boot/pirq_routing.c
+++ b/src/arch/i386/boot/pirq_routing.c
@@ -2,7 +2,7 @@
#include <arch/pirq_routing.h>
#include <string.h>
-#if DEBUG==1
+#if (DEBUG==1 && HAVE_PIRQ_TABLE==1)
void check_pirq_routing_table(void)
{
const uint8_t *addr;
@@ -84,6 +84,7 @@ int verify_copy_pirq_routing_table(unsigned long addr)
#define verify_copy_pirq_routing_table(addr)
#endif
+#if HAVE_PIRQ_TABLE==1
unsigned long copy_pirq_routing_table(unsigned long addr)
{
/* Align the table to be 16 byte aligned. */
@@ -97,3 +98,4 @@ unsigned long copy_pirq_routing_table(unsigned long addr)
verify_copy_pirq_routing_table(addr);
return addr + intel_irq_routing_table.size;
}
+#endif
diff --git a/src/arch/i386/include/arch/pirq_routing.h b/src/arch/i386/include/arch/pirq_routing.h
index 215c4e58c8..9f7059f27c 100644
--- a/src/arch/i386/include/arch/pirq_routing.h
+++ b/src/arch/i386/include/arch/pirq_routing.h
@@ -39,13 +39,13 @@ struct irq_routing_table {
extern const struct irq_routing_table intel_irq_routing_table;
-#if defined(DEBUG) && defined(HAVE_PIRQ_TABLE)
+#if (DEBUG==1 && HAVE_PIRQ_TABLE==1)
void check_pirq_routing_table(void);
#else
#define check_pirq_routing_table() do {} while(0)
#endif
-#if defined(HAVE_PIRQ_TABLE)
+#if HAVE_PIRQ_TABLE==1
unsigned long copy_pirq_routing_table(unsigned long start);
#else
#define copy_pirq_routing_table(start) (start)