[v2] r4766 - in trunk/coreboot-v2: src/mainboard/kontron/kt690 targets/kontron/kt690

Author: myles
Date: 2009-10-13 19:56:11 +0200 (Tue, 13 Oct 2009)
New Revision: 4766

Modified:
   trunk/coreboot-v2/src/mainboard/kontron/kt690/Options.lb
   trunk/coreboot-v2/src/mainboard/kontron/kt690/acpi_tables.c
   trunk/coreboot-v2/targets/kontron/kt690/Config-abuild.lb
Log:
Fix kontron/kt690 build.

Signed-off-by: Myles Watson 
Acked-by: Myles Watson

Modified: trunk/coreboot-v2/src/mainboard/kontron/kt690/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/kontron/kt690/Options.lb	2009-10-13 16:56:58 UTC (rev 4765)
+++ trunk/coreboot-v2/src/mainboard/kontron/kt690/Options.lb	2009-10-13 17:56:11 UTC (rev 4766)
@@ -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_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_GFXUMA=1
 default CONFIG_HAVE_MAINBOARD_RESOURCES=1

-### End Options.lb
-#
-# CBFS
-#
-#
-default CONFIG_CBFS=1
 end

Modified: trunk/coreboot-v2/src/mainboard/kontron/kt690/acpi_tables.c
===================================================================
--- trunk/coreboot-v2/src/mainboard/kontron/kt690/acpi_tables.c	2009-10-13 16:56:58 UTC (rev 4765)
+++ trunk/coreboot-v2/src/mainboard/kontron/kt690/acpi_tables.c	2009-10-13 17:56:11 UTC (rev 4766)
@@ -123,7 +123,7 @@

}

-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());

Modified: trunk/coreboot-v2/targets/kontron/kt690/Config-abuild.lb
===================================================================
--- trunk/coreboot-v2/targets/kontron/kt690/Config-abuild.lb	2009-10-13 16:56:58 UTC (rev 4765)
+++ trunk/coreboot-v2/targets/kontron/kt690/Config-abuild.lb	2009-10-13 17:56:11 UTC (rev 4766)
@@ -28,4 +28,4 @@
 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