commit svn:externals for last commit (what a pain) (1/2)

Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Ronald G. Minnich <rminnich@gmail.com>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4382 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

diff --git a/util/getpir/pirq_routing.h b/util/getpir/pirq_routing.h
index ef6fbeed0d4e113fde078b5be05381ca9445e334..ba69fb7c8d6f106ae7d2d1b029677c17355def96 100644 (file)
--- a/util/getpir/pirq_routing.h
+++ b/util/getpir/pirq_routing.h
@@ -16,8 +16,8 @@ struct irq_info {
        uint8_t rfu;
 } __attribute__((packed));
 
-#if defined(IRQ_SLOT_COUNT)
-#define IRQ_SLOTS_COUNT IRQ_SLOT_COUNT
+#if defined(CONFIG_IRQ_SLOT_COUNT)
+#define IRQ_SLOTS_COUNT CONFIG_IRQ_SLOT_COUNT
 #elif (__GNUC__ < 3)
 #define IRQ_SLOTS_COUNT 1
 #else
@@ -39,7 +39,7 @@ struct irq_routing_table {
 
 extern const struct irq_routing_table intel_irq_routing_table;
 
-#if HAVE_PIRQ_TABLE==1
+#if CONFIG_HAVE_PIRQ_TABLE==1
 unsigned long copy_pirq_routing_table(unsigned long start);
 unsigned long write_pirq_routing_table(unsigned long start);
 #else

diff --git a/util/nvramtool/lbtable.c b/util/nvramtool/lbtable.c
index f730314769bbe62fd7227bca1ed7a9121ca37309..166fdc0370d79c3a70d1f89ce5a8d66d5a3a6d8d 100644 (file)
--- a/util/nvramtool/lbtable.c
+++ b/util/nvramtool/lbtable.c
@@ -143,7 +143,7 @@ static const char generic_nofound_msg[] =
 static const char nofound_msg_cmos_opt_table[] =
 "%s: Item %s not found in coreboot table.  Apparently, the "
 "coreboot installed on this system was built without specifying "
-"HAVE_OPTION_TABLE.\n";
+"CONFIG_HAVE_OPTION_TABLE.\n";
 
 static const char nofound_msg_option_checksum[] =
 "%s: Item %s not found in coreboot table. Apparently, you are "
@@ -350,7 +350,7 @@ void get_layout_from_cmos_table (void)
     { fprintf(stderr,
               "%s: CMOS option table not found in coreboot table.  "
               "Apparently, the coreboot installed on this system was "
-              "built without specifying HAVE_OPTION_TABLE.\n",
+              "built without specifying CONFIG_HAVE_OPTION_TABLE.\n",
               prog_name);
       exit(1);
     }

diff --git a/util/nvramtool/nvramtool.8 b/util/nvramtool/nvramtool.8
index 985d1a6fae6323a5fca31b34b0e3201b2db6608f..2b9ff496badd5e29c9527a4ca3cbade43b3fd669 100644 (file)
--- a/util/nvramtool/nvramtool.8
+++ b/util/nvramtool/nvramtool.8
@@ -192,7 +192,7 @@ follows the format of the
 files provided by coreboot.
 
 If the coreboot installed on your system was built without specifying
-.B "HAVE_OPTION_TABLE,"
+.B "CONFIG_HAVE_OPTION_TABLE,"
 then the coreboot table will not contain a CMOS option table.  In this case,
 the
 .B "'-y LAYOUT_FILE'"