summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/config/Options.lb11
-rw-r--r--targets/momentum/apache/Config.lb28
-rwxr-xr-xutil/compareboard/compareboard3
3 files changed, 3 insertions, 39 deletions
diff --git a/src/config/Options.lb b/src/config/Options.lb
index 2ed9b47f39..613111a3a2 100644
--- a/src/config/Options.lb
+++ b/src/config/Options.lb
@@ -264,12 +264,6 @@ define CONFIG_RESET
export always
comment "Hardware reset vector address"
end
-define CONFIG_EXCEPTION_VECTORS
- default {CONFIG_ROMBASE+0x100}
- format "0x%x"
- export always
- comment "Address of exception vector table"
-end
define CONFIG_STACK_SIZE
default 0x2000
format "0x%x"
@@ -845,11 +839,6 @@ define CONFIG_UDELAY_LAPIC
export used
comment "Implement udelay with the x86 Local APIC"
end
-define CONFIG_FAKE_SPDROM
- default 0
- export always
- comment "Use this to fake spd rom values"
-end
define CONFIG_GENERATE_ACPI_TABLES
default 0
diff --git a/targets/momentum/apache/Config.lb b/targets/momentum/apache/Config.lb
deleted file mode 100644
index b1d74d5f9a..0000000000
--- a/targets/momentum/apache/Config.lb
+++ /dev/null
@@ -1,28 +0,0 @@
-# Config file for the Momentum Apache dual 970 board
-# This will make a target directory of ./apache
-
-target apache
-
-mainboard momentum/apache
-
-# Apache Demo Board
-romimage "fallback"
- ## Base of ROM
- option CONFIG_ROMBASE=0xfff00000
-
- ## Apache reset vector
- option CONFIG_RESET=CONFIG_ROMBASE+0x100
-
- ## Exception vectors (other than reset vector)
- option CONFIG_EXCEPTION_VECTORS=CONFIG_RESET+0x100
-
- ## Start of coreboot in the boot rom
- ## = CONFIG_RESET + exeception vector table size
- option CONFIG_ROMSTART=CONFIG_RESET+0x3100
-
- ## Coreboot C code runs at this location in RAM
- option CONFIG_RAMBASE=0x00100000
- option CONFIG_RAMSTART=0x00100000
-end
-
-buildrom ./coreboot.rom CONFIG_ROM_SIZE "fallback"
diff --git a/util/compareboard/compareboard b/util/compareboard/compareboard
index d8f7c02e68..09cd32987d 100755
--- a/util/compareboard/compareboard
+++ b/util/compareboard/compareboard
@@ -84,6 +84,9 @@ sed \
-e "/^CONFIG_STACK_SIZE / d" \
-e "/^CONFIG_GDB_STUB / d" \
-e "/^CONFIG_VIDEO_MB / d" \
+ -e "/^CONFIG_EXPERT / d" \
+ -e "/^CONFIG_VGA_BIOS / d" \
+ -e "/^CONFIG_WARNINGS_ARE_ERRORS / d" \
$A/new > $A/new.filtered
normalize $A/old.filtered > $A/old.normalized