[v2] r4382 - in trunk/util: getpir nvramtool

Author: stepan
Date: 2009-06-30 17:23:20 +0200 (Tue, 30 Jun 2009)
New Revision: 4382

Modified:
   trunk/util/getpir/pirq_routing.h
   trunk/util/nvramtool/lbtable.c
   trunk/util/nvramtool/nvramtool.8
Log:
commit svn:externals for last commit (what a pain) (1/2)
Signed-off-by: Stefan Reinauer 
Acked-by: Ronald G. Minnich

Modified: trunk/util/getpir/pirq_routing.h
===================================================================
--- trunk/util/getpir/pirq_routing.h	2009-06-30 15:17:49 UTC (rev 4381)
+++ trunk/util/getpir/pirq_routing.h	2009-06-30 15:23:20 UTC (rev 4382)
@@ -16,8 +16,8 @@
    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 @@

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

Modified: trunk/util/nvramtool/lbtable.c
===================================================================
--- trunk/util/nvramtool/lbtable.c	2009-06-30 15:17:49 UTC (rev 4381)
+++ trunk/util/nvramtool/lbtable.c	2009-06-30 15:23:20 UTC (rev 4382)
@@ -143,7 +143,7 @@
 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 @@
     { 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);
     }

Modified: trunk/util/nvramtool/nvramtool.8
===================================================================
--- trunk/util/nvramtool/nvramtool.8	2009-06-30 15:17:49 UTC (rev 4381)
+++ trunk/util/nvramtool/nvramtool.8	2009-06-30 15:23:20 UTC (rev 4382)
@@ -192,7 +192,7 @@
 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'"