Re-integrate "USE_OPTION_TABLE" code.

Signed-off-by: Edwin Beasant <edwin_beasant@virtensys.com>
Signed-off-by: Myles Watson <mylesgw@gmail.com>
Acked-by: Myles Watson <mylesgw@gmail.com>


git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5653 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
This commit is contained in:
Edwin Beasant
2010-07-06 21:05:04 +00:00
committed by Myles Watson
parent 8376831eaf
commit eb50c7d922
224 changed files with 223 additions and 508 deletions

View File

@@ -29,7 +29,7 @@
#include <version.h>
#include <device/device.h>
#include <stdlib.h>
#if (CONFIG_HAVE_OPTION_TABLE == 1)
#if (CONFIG_USE_OPTION_TABLE == 1)
#include <option_table.h>
#endif
@@ -188,7 +188,7 @@ static struct lb_mainboard *lb_mainboard(struct lb_header *header)
return mainboard;
}
#if (CONFIG_HAVE_OPTION_TABLE == 1)
#if (CONFIG_USE_OPTION_TABLE == 1)
static struct cmos_checksum *lb_cmos_checksum(struct lb_header *header)
{
struct lb_record *rec;
@@ -535,7 +535,7 @@ unsigned long write_coreboot_table(
rom_table_end &= ~0xffff;
printk(BIOS_DEBUG, "0x%08lx \n", rom_table_end);
#if (CONFIG_HAVE_OPTION_TABLE == 1)
#if (CONFIG_USE_OPTION_TABLE == 1)
{
struct lb_record *rec_dest = lb_new_record(head);
/* Copy the option config table, it's already a lb_record... */

View File

@@ -2,7 +2,7 @@
#include <arch/io.h>
#include "arch/romcc_io.h"
#include "pc80/mc146818rtc_early.c"
#include <pc80/mc146818rtc.h>
static void main(unsigned long bist)
{