diff options
| author | Stefan Reinauer <stepan@coresystems.de> | 2009-06-30 15:23:20 +0000 |
|---|---|---|
| committer | Stefan Reinauer <stepan@openbios.org> | 2009-06-30 15:23:20 +0000 |
| commit | 775c04e53743150dbd47ef85986b681ab5522618 (patch) | |
| tree | b0b41d10f21a2ef626846a3054a8ffc5c1b997d7 | |
| parent | 0867062412dd4bfe5a556e5f3fd85ba5b682d79b (diff) | |
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
| -rw-r--r-- | util/getpir/pirq_routing.h | 6 | ||||
| -rw-r--r-- | util/nvramtool/lbtable.c | 4 | ||||
| -rw-r--r-- | util/nvramtool/nvramtool.8 | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/util/getpir/pirq_routing.h b/util/getpir/pirq_routing.h index ef6fbeed0d..ba69fb7c8d 100644 --- 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 f730314769..166fdc0370 100644 --- 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 985d1a6fae..2b9ff496ba 100644 --- 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'" |