diff options
| -rw-r--r-- | util/flashrom/Makefile | 2 | ||||
| -rw-r--r-- | util/flashrom/cbtable.c (renamed from util/flashrom/lbtable.c) | 2 | ||||
| -rw-r--r-- | util/flashrom/coreboot_tables.h (renamed from util/flashrom/linuxbios_tables.h) | 0 | ||||
| -rw-r--r-- | util/lxbios/Makefile | 2 | ||||
| -rw-r--r-- | util/lxbios/coreboot_tables.h (renamed from util/lxbios/linuxbios_tables.h) | 3 | ||||
| -rw-r--r-- | util/lxbios/layout.h | 2 | ||||
| -rw-r--r-- | util/lxbios/layout_file.h | 2 | ||||
| -rw-r--r-- | util/lxbios/lbtable.c | 2 | ||||
| -rw-r--r-- | util/mptable/mptable.c | 8 |
9 files changed, 11 insertions, 12 deletions
diff --git a/util/flashrom/Makefile b/util/flashrom/Makefile index 067590ae55..4b2fbbd161 100644 --- a/util/flashrom/Makefile +++ b/util/flashrom/Makefile @@ -23,7 +23,7 @@ endif OBJS = chipset_enable.o board_enable.o udelay.o jedec.o sst28sf040.o \ am29f040b.o mx29f002.o sst39sf020.o m29f400bt.o w49f002u.o \ 82802ab.o msys_doc.o pm49fl004.o sst49lf040.o sst49lfxxxc.o \ - sst_fwhub.o layout.o lbtable.o flashchips.o flashrom.o \ + sst_fwhub.o layout.o cbtable.o flashchips.o flashrom.o \ sharplhf00l04.o w29ee011.o spi.o all: pciutils dep $(PROGRAM) diff --git a/util/flashrom/lbtable.c b/util/flashrom/cbtable.c index 1cca964c22..cc3a73c329 100644 --- a/util/flashrom/lbtable.c +++ b/util/flashrom/cbtable.c @@ -31,7 +31,7 @@ #include <errno.h> #include <sys/mman.h> #include "flash.h" -#include "linuxbios_tables.h" +#include "coreboot_tables.h" char *lb_part = NULL, *lb_vendor = NULL; diff --git a/util/flashrom/linuxbios_tables.h b/util/flashrom/coreboot_tables.h index c4c2d4d17e..c4c2d4d17e 100644 --- a/util/flashrom/linuxbios_tables.h +++ b/util/flashrom/coreboot_tables.h diff --git a/util/lxbios/Makefile b/util/lxbios/Makefile index 6d2022aa0d..a7d9c1c74a 100644 --- a/util/lxbios/Makefile +++ b/util/lxbios/Makefile @@ -7,7 +7,7 @@ LDFLAGS = OBJS = common.o compute_ip_checksum.o hexdump.o cmos_lowlevel.o \ reg_expr.o layout.o layout_file.o lbtable.o cmos_ops.o input_file.o \ opts.o lxbios.o -HEADERS = common.h ip_checksum.h linuxbios_tables.h hexdump.h \ +HEADERS = common.h ip_checksum.h coreboot_tables.h hexdump.h \ cmos_lowlevel.h reg_expr.h layout.h layout_file.h lbtable.h \ cmos_ops.h input_file.h opts.h diff --git a/util/lxbios/linuxbios_tables.h b/util/lxbios/coreboot_tables.h index f7271f3b99..7c912be0f7 100644 --- a/util/lxbios/linuxbios_tables.h +++ b/util/lxbios/coreboot_tables.h @@ -1,6 +1,5 @@ /*****************************************************************************\ - * linuxbios_tables.h - * $Id: linuxbios_tables.h,v 1.1.1.1 2005/12/02 22:35:19 dsp_llnl Exp $ + * coreboot_tables.h \*****************************************************************************/ #ifndef COREBOOT_TABLES_H diff --git a/util/lxbios/layout.h b/util/lxbios/layout.h index 15e009df5f..4575f75995 100644 --- a/util/lxbios/layout.h +++ b/util/lxbios/layout.h @@ -33,7 +33,7 @@ #define LXBIOS_LAYOUT_H #include "common.h" -#include "linuxbios_tables.h" +#include "coreboot_tables.h" #define LAYOUT_ENTRY_OVERLAP (LAYOUT_RESULT_START + 0) #define LAYOUT_ENTRY_BAD_LENGTH (LAYOUT_RESULT_START + 1) diff --git a/util/lxbios/layout_file.h b/util/lxbios/layout_file.h index a313fa3ce7..69148d740e 100644 --- a/util/lxbios/layout_file.h +++ b/util/lxbios/layout_file.h @@ -33,7 +33,7 @@ #define LXBIOS_LAYOUT_FILE_H #include "common.h" -#include "linuxbios_tables.h" +#include "coreboot_tables.h" void set_layout_filename (const char filename[]); void get_layout_from_file (void); diff --git a/util/lxbios/lbtable.c b/util/lxbios/lbtable.c index 1b479751f3..46a9b3d7b5 100644 --- a/util/lxbios/lbtable.c +++ b/util/lxbios/lbtable.c @@ -32,7 +32,7 @@ #include <sys/mman.h> #include "common.h" -#include "linuxbios_tables.h" +#include "coreboot_tables.h" #include "ip_checksum.h" #include "lbtable.h" #include "layout.h" diff --git a/util/mptable/mptable.c b/util/mptable/mptable.c index 4355d7116f..9c6b4f3127 100644 --- a/util/mptable/mptable.c +++ b/util/mptable/mptable.c @@ -83,7 +83,7 @@ static const char rcsid[] = #define MAXPNSTR 132 -#define LINUXBIOS_MP_TABLE 0 +#define COREBOOT_MP_TABLE 0 enum busTypes { CBUS = 1, @@ -299,7 +299,7 @@ int dmesg = 0; int grope = 0; int verbose = 0; int noisy = 0; -/* preamble to the mptable. This is fixed for all linuxbioses */ +/* preamble to the mptable. This is fixed for all coreboots */ char *preamble[] = { "#include <arch/smp/mpspec.h>", @@ -422,7 +422,7 @@ main( int argc, char *argv[] ) if (verbose) puts( SEP_LINE2 ); printf( "/* generatred by MPTable, version %d.%d.%d*/\n", VMAJOR, VMINOR, VDELTA ); - printf("/* as modified by RGM for LinuxBIOS */\n"); + printf("/* as modified by RGM for coreboot */\n"); write_code(preamble); /* Ron hates getopt() */ @@ -536,7 +536,7 @@ apic_probe( vm_offset_t* paddr, int* where ) target = 0; segment = 0; if ( verbose ) - printf( " searching for LinuxBIOS MP table @ 0x%08x (%dK)\n", + printf( " searching for coreboot MP table @ 0x%08x (%dK)\n", target, segment ); seekEntry( target ); readEntry( buffer, ONE_KBYTE ); |