From 863bcbff3bd26bd7776322a669556deaa01b23db Mon Sep 17 00:00:00 2001 From: "Ronald G. Minnich" Date: Fri, 14 Nov 2008 17:14:16 +0000 Subject: [PATCH] Two remaining issues: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit /home/rminnich/coreboot-v3/build/coreboot.initram_partiallylinked.o: section .data.rel.ro.local: dual_channel_slew_group_lookup.3242 single_channel_slew_group_lookup.3243 and /home/rminnich/coreboot-v3/southbridge/intel/i82801gx/smbus.c:34: error: conflicting types for ‘smbus_read_byte’ include/device/smbus.h:56: error: previous declaration of ‘smbus_read_byte’ was here we are working these. The second is much harder than it seems. It concerns whether we put i2c devices (i.e. DRAM spd SEEPROMS) in the dts. Signed-off-by: Ronald G. Minnich Acked-by: Ronald G. Minnich git-svn-id: svn://coreboot.org/repository/coreboot-v3@1026 f3766cd6-281f-0410-b1cd-43a5c92072e9 --- mainboard/kontron/986lcd-m/cmos.layout | 2 +- mainboard/kontron/986lcd-m/initram.c | 1 + mainboard/kontron/986lcd-m/mainboard.h | 11 +++++++++++ southbridge/intel/i82801gx/lpc.c | 10 ++++++---- southbridge/intel/i82801gx/pci.c | 1 + 5 files changed, 20 insertions(+), 5 deletions(-) diff --git a/mainboard/kontron/986lcd-m/cmos.layout b/mainboard/kontron/986lcd-m/cmos.layout index ba42513c9c..bf4ba64a94 100644 --- a/mainboard/kontron/986lcd-m/cmos.layout +++ b/mainboard/kontron/986lcd-m/cmos.layout @@ -129,6 +129,6 @@ enumerations # ----------------------------------------------------------------- checksums -checksum 392 983 984 +#checksum 392 983 984 diff --git a/mainboard/kontron/986lcd-m/initram.c b/mainboard/kontron/986lcd-m/initram.c index a1623e5663..f47898d1fe 100644 --- a/mainboard/kontron/986lcd-m/initram.c +++ b/mainboard/kontron/986lcd-m/initram.c @@ -212,4 +212,5 @@ int main(void) } #endif MCHBAR16(SSKPD) = 0xCAFE; + return 0; } diff --git a/mainboard/kontron/986lcd-m/mainboard.h b/mainboard/kontron/986lcd-m/mainboard.h index e6b347a308..a13da94b7d 100644 --- a/mainboard/kontron/986lcd-m/mainboard.h +++ b/mainboard/kontron/986lcd-m/mainboard.h @@ -20,3 +20,14 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ + +#define CHANNEL_XOR_RANDOMIZATION 0 +#define ENABLE_ACPI_MODE_IN_COREBOOT 1 + +/* never defined in v2 */ +#define MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID 0 +#define MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID 0 + +/* nowhere else to go yet */ +#define TEST_SMM_FLASH_LOCKDOWN 0 +#define MAINBOARD_POWER_ON_AFTER_POWER_FAIL 1 \ No newline at end of file diff --git a/southbridge/intel/i82801gx/lpc.c b/southbridge/intel/i82801gx/lpc.c index 246b485248..54ec795a0d 100644 --- a/southbridge/intel/i82801gx/lpc.c +++ b/southbridge/intel/i82801gx/lpc.c @@ -28,6 +28,8 @@ #include #include #include +#include +#include #include "i82801gx.h" #include "../../../northbridge/intel/i945/ich7.h" @@ -159,10 +161,10 @@ static void i82801gx_power_options(struct device * dev) nmi_option = NMI_OFF; get_option(&nmi_option, "nmi"); if (nmi_option) { - printk_info ("NMI sources enabled.\n"); + printk(BIOS_INFO, "NMI sources enabled.\n"); reg8 &= ~(1 << 7); /* Set NMI. */ } else { - printk_info ("NMI sources disabled.\n"); + printk(BIOS_INFO, "NMI sources disabled.\n"); reg8 |= ( 1 << 7); /* Can't mask NMI from PCI-E and NMI_NOW */ } outb(reg8, 0x70); @@ -181,7 +183,6 @@ static void i82801gx_power_options(struct device * dev) void i82801gx_rtc_init(struct device *dev) { u8 reg8; - u32 reg32; int rtc_failed; reg8 = pci_read_config8(dev, GEN_PMCON_3); @@ -218,8 +219,9 @@ static void enable_hpet(struct device *dev) static void i82801gx_lock_smm(struct device *dev) { void smm_lock(void); +#if TEST_SMM_FLASH_LOCKDOWN u8 reg8; - +#endif #if ENABLE_ACPI_MODE_IN_COREBOOT printk(BIOS_DEBUG, "Enabling ACPI via APMC:\n"); outb(0xe1, 0xb2); // Enable ACPI mode diff --git a/southbridge/intel/i82801gx/pci.c b/southbridge/intel/i82801gx/pci.c index 7c27f16d75..b0f9f7e36c 100644 --- a/southbridge/intel/i82801gx/pci.c +++ b/southbridge/intel/i82801gx/pci.c @@ -27,6 +27,7 @@ #include #include #include +#include static void pci_init(struct device *dev) {