summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMyles Watson <mylesgw@gmail.com>2009-10-13 17:56:11 +0000
committerMyles Watson <mylesgw@gmail.com>2009-10-13 17:56:11 +0000
commit6bbe74c639b5b088f0631387c29b12452f8152c1 (patch)
tree1dea97ce84ad50b6ef30370319c53baa6e8ee5c0
parent7d3649a605cf5d535039f1932224cdeafc49f73b (diff)
Fix kontron/kt690 build.
Signed-off-by: Myles Watson <mylesgw@gmail.com> Acked-by: Myles Watson <mylesgw@gmail.com> git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4766 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
-rw-r--r--src/mainboard/kontron/kt690/Options.lb9
-rw-r--r--src/mainboard/kontron/kt690/acpi_tables.c2
-rw-r--r--targets/kontron/kt690/Config-abuild.lb2
3 files changed, 2 insertions, 11 deletions
diff --git a/src/mainboard/kontron/kt690/Options.lb b/src/mainboard/kontron/kt690/Options.lb
index 43f68a9f50..1ca2dfb906 100644
--- a/src/mainboard/kontron/kt690/Options.lb
+++ b/src/mainboard/kontron/kt690/Options.lb
@@ -21,7 +21,6 @@
##
uses CONFIG_HAVE_MP_TABLE
-uses CONFIG_CBFS
uses CONFIG_HAVE_PIRQ_TABLE
uses CONFIG_HAVE_ACPI_TABLES
uses CONFIG_HAVE_ACPI_RESUME
@@ -42,9 +41,7 @@ uses CONFIG_ROM_IMAGE_SIZE
uses CONFIG_ROM_SECTION_SIZE
uses CONFIG_ROM_SECTION_OFFSET
uses CONFIG_ROM_PAYLOAD
-uses CONFIG_ROM_PAYLOAD_START
uses CONFIG_COMPRESSED_PAYLOAD_LZMA
-uses CONFIG_PAYLOAD_SIZE
uses CONFIG_ROMBASE
uses CONFIG_XIP_ROM_SIZE
uses CONFIG_XIP_ROM_BASE
@@ -301,10 +298,4 @@ default CONFIG_VIDEO_MB=1
default CONFIG_GFXUMA=1
default CONFIG_HAVE_MAINBOARD_RESOURCES=1
-### End Options.lb
-#
-# CBFS
-#
-#
-default CONFIG_CBFS=1
end
diff --git a/src/mainboard/kontron/kt690/acpi_tables.c b/src/mainboard/kontron/kt690/acpi_tables.c
index c61f97b98e..00a7c02769 100644
--- a/src/mainboard/kontron/kt690/acpi_tables.c
+++ b/src/mainboard/kontron/kt690/acpi_tables.c
@@ -123,7 +123,7 @@ void update_ssdtx(void *ssdtx, int i)
}
-unsigned long acpi_fill_ssdt_generator(unsigned long current, char *oem_table_id) {
+unsigned long acpi_fill_ssdt_generator(unsigned long current, const char *oem_table_id) {
k8acpi_write_vars();
amd_model_fxx_generate_powernow(pm_base + 8, 6, 1);
return (unsigned long) (acpigen_get_current());
diff --git a/targets/kontron/kt690/Config-abuild.lb b/targets/kontron/kt690/Config-abuild.lb
index 423e905858..77f35aa89c 100644
--- a/targets/kontron/kt690/Config-abuild.lb
+++ b/targets/kontron/kt690/Config-abuild.lb
@@ -28,4 +28,4 @@ romimage "fallback"
end
buildrom ./coreboot.rom CONFIG_ROM_SIZE "normal" "fallback"
-pci_rom ../../../misc/KT690/pci1002,791f.rom vendor_id=0x1002 device_id=0x791f
+#pci_rom ../../../misc/KT690/pci1002,791f.rom vendor_id=0x1002 device_id=0x791f