diff options
Diffstat (limited to 'resources')
10 files changed, 4 insertions, 2292 deletions
diff --git a/resources/libreboot/patch/unused/r500/0001-mainboards-lenovo-Copy-X200-board-to-R500-for-future.patch b/resources/libreboot/patch/unused/r500/0001-mainboards-lenovo-Copy-X200-board-to-R500-for-future.patch deleted file mode 100644 index e628adb4..00000000 --- a/resources/libreboot/patch/unused/r500/0001-mainboards-lenovo-Copy-X200-board-to-R500-for-future.patch +++ /dev/null @@ -1,1941 +0,0 @@ -From 81ae1f94aa00121cedd839540c5d7839a485d61e Mon Sep 17 00:00:00 2001 -From: Francis Rowe <info@gluglug.org.uk> -Date: Wed, 5 Aug 2015 00:49:12 +0100 -Subject: [PATCH 1/7] mainboards/lenovo: Copy X200 board to R500 for future - expansion - -Change-Id: I45633be3d8548c211360c2ffc3ad4e5f10a6df0f -Signed-off-by: Francis Rowe <info@gluglug.org.uk> ---- - src/mainboard/lenovo/r500/Kconfig | 51 ++++++ - src/mainboard/lenovo/r500/Kconfig.name | 2 + - src/mainboard/lenovo/r500/Makefile.inc | 21 +++ - src/mainboard/lenovo/r500/acpi/dock.asl | 72 ++++++++ - src/mainboard/lenovo/r500/acpi/ec.asl | 1 + - src/mainboard/lenovo/r500/acpi/gm45_pci_irqs.asl | 84 +++++++++ - src/mainboard/lenovo/r500/acpi/gpe.asl | 28 +++ - src/mainboard/lenovo/r500/acpi/ich9_pci_irqs.asl | 108 +++++++++++ - src/mainboard/lenovo/r500/acpi/platform.asl | 205 +++++++++++++++++++++ - src/mainboard/lenovo/r500/acpi/superio.asl | 0 - src/mainboard/lenovo/r500/acpi_tables.c | 71 ++++++++ - src/mainboard/lenovo/r500/board_info.txt | 6 + - src/mainboard/lenovo/r500/cmos.default | 16 ++ - src/mainboard/lenovo/r500/cmos.layout | 144 +++++++++++++++ - src/mainboard/lenovo/r500/cstates.c | 41 +++++ - src/mainboard/lenovo/r500/devicetree.cb | 222 +++++++++++++++++++++++ - src/mainboard/lenovo/r500/dock.c | 64 +++++++ - src/mainboard/lenovo/r500/dock.h | 26 +++ - src/mainboard/lenovo/r500/dsdt.asl | 58 ++++++ - src/mainboard/lenovo/r500/fadt.c | 157 ++++++++++++++++ - src/mainboard/lenovo/r500/hda_verb.c | 51 ++++++ - src/mainboard/lenovo/r500/mainboard.c | 49 +++++ - src/mainboard/lenovo/r500/mptable.c | 1 + - src/mainboard/lenovo/r500/romstage.c | 203 +++++++++++++++++++++ - src/mainboard/lenovo/r500/smihandler.c | 49 +++++ - 25 files changed, 1730 insertions(+) - create mode 100644 src/mainboard/lenovo/r500/Kconfig - create mode 100644 src/mainboard/lenovo/r500/Kconfig.name - create mode 100644 src/mainboard/lenovo/r500/Makefile.inc - create mode 100644 src/mainboard/lenovo/r500/acpi/dock.asl - create mode 100644 src/mainboard/lenovo/r500/acpi/ec.asl - create mode 100644 src/mainboard/lenovo/r500/acpi/gm45_pci_irqs.asl - create mode 100644 src/mainboard/lenovo/r500/acpi/gpe.asl - create mode 100644 src/mainboard/lenovo/r500/acpi/ich9_pci_irqs.asl - create mode 100644 src/mainboard/lenovo/r500/acpi/platform.asl - create mode 100644 src/mainboard/lenovo/r500/acpi/superio.asl - create mode 100644 src/mainboard/lenovo/r500/acpi_tables.c - create mode 100644 src/mainboard/lenovo/r500/board_info.txt - create mode 100644 src/mainboard/lenovo/r500/cmos.default - create mode 100644 src/mainboard/lenovo/r500/cmos.layout - create mode 100644 src/mainboard/lenovo/r500/cstates.c - create mode 100644 src/mainboard/lenovo/r500/devicetree.cb - create mode 100644 src/mainboard/lenovo/r500/dock.c - create mode 100644 src/mainboard/lenovo/r500/dock.h - create mode 100644 src/mainboard/lenovo/r500/dsdt.asl - create mode 100644 src/mainboard/lenovo/r500/fadt.c - create mode 100644 src/mainboard/lenovo/r500/hda_verb.c - create mode 100644 src/mainboard/lenovo/r500/mainboard.c - create mode 100644 src/mainboard/lenovo/r500/mptable.c - create mode 100644 src/mainboard/lenovo/r500/romstage.c - create mode 100644 src/mainboard/lenovo/r500/smihandler.c - -diff --git a/src/mainboard/lenovo/r500/Kconfig b/src/mainboard/lenovo/r500/Kconfig -new file mode 100644 -index 0000000..7bae12d ---- /dev/null -+++ b/src/mainboard/lenovo/r500/Kconfig -@@ -0,0 +1,51 @@ -+if BOARD_LENOVO_X200 -+ -+config BOARD_SPECIFIC_OPTIONS # dummy -+ def_bool y -+ select SYSTEM_TYPE_LAPTOP -+ select CPU_INTEL_SOCKET_BGA956 -+ select NORTHBRIDGE_INTEL_GM45 -+ select SOUTHBRIDGE_INTEL_I82801IX -+ select EC_LENOVO_PMH7 -+ select EC_LENOVO_H8 -+ select NO_UART_ON_SUPERIO -+ select DRIVERS_ICS_954309 -+ select BOARD_ROMSIZE_KB_8192 -+ select DRIVERS_GENERIC_IOAPIC -+ select HAVE_MP_TABLE -+ select HAVE_ACPI_TABLES -+ select EC_ACPI -+ select HAVE_OPTION_TABLE -+ select HAVE_CMOS_DEFAULT -+ select HAVE_ACPI_RESUME -+ select MAINBOARD_HAS_NATIVE_VGA_INIT -+ select MAINBOARD_HAS_NATIVE_VGA_INIT_TEXTMODECFG -+ select INTEL_INT15 -+ select SUPERIO_NSC_PC87382 -+ select DRIVERS_LENOVO_WACOM -+ -+config MAINBOARD_DIR -+ string -+ default lenovo/x200 -+ -+config MAINBOARD_PART_NUMBER -+ string -+ default "ThinkPad X200" -+ -+config MMCONF_BASE_ADDRESS -+ hex -+ default 0xf0000000 -+ -+config USBDEBUG_HCD_INDEX -+ int -+ default 2 -+ -+config MAX_CPUS -+ int -+ default 2 -+ -+config CBFS_SIZE -+ hex -+ default 0x200000 -+ -+endif # BOARD_LENOVO_X200 -diff --git a/src/mainboard/lenovo/r500/Kconfig.name b/src/mainboard/lenovo/r500/Kconfig.name -new file mode 100644 -index 0000000..8e1dd43 ---- /dev/null -+++ b/src/mainboard/lenovo/r500/Kconfig.name -@@ -0,0 +1,2 @@ -+config BOARD_LENOVO_X200 -+ bool "ThinkPad X200 / X200t" -diff --git a/src/mainboard/lenovo/r500/Makefile.inc b/src/mainboard/lenovo/r500/Makefile.inc -new file mode 100644 -index 0000000..b2e5c2a ---- /dev/null -+++ b/src/mainboard/lenovo/r500/Makefile.inc -@@ -0,0 +1,21 @@ -+## -+## This file is part of the coreboot project. -+## -+## Copyright (C) 2012 secunet Security Networks AG -+## -+## This program is free software; you can redistribute it and/or modify -+## it under the terms of the GNU General Public License as published by -+## the Free Software Foundation; version 2 of the License. -+## -+## This program is distributed in the hope that it will be useful, -+## but WITHOUT ANY WARRANTY; without even the implied warranty of -+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+## GNU General Public License for more details. -+## -+## You should have received a copy of the GNU General Public License -+## along with this program; if not, write to the Free Software -+## Foundation, Inc. -+## -+ -+ramstage-y += dock.c -+ramstage-y += cstates.c -diff --git a/src/mainboard/lenovo/r500/acpi/dock.asl b/src/mainboard/lenovo/r500/acpi/dock.asl -new file mode 100644 -index 0000000..f817acf ---- /dev/null -+++ b/src/mainboard/lenovo/r500/acpi/dock.asl -@@ -0,0 +1,72 @@ -+/* -+ * This file is part of the coreboot project. -+ * -+ * Copyright (c) 2011 Sven Schnelle <svens@stackframe.org> -+ * -+ * This program is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU General Public License as -+ * published by the Free Software Foundation; version 2 of -+ * the License. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc. -+ */ -+ -+Scope (\_SB) -+{ -+ Device(DOCK) -+ { -+ Name(_HID, "ACPI0003") -+ Name(_UID, 0x00) -+ Name(_PCL, Package() { \_SB } ) -+ -+ Method(_DCK, 1, NotSerialized) -+ { -+ if (Arg0) { -+ /* connect dock */ -+ Store (1, \GP28) -+ Store (1, \_SB.PCI0.LPCB.EC.DKR1) -+ } else { -+ /* disconnect dock */ -+ Store (0, \GP28) -+ Store (0, \_SB.PCI0.LPCB.EC.DKR1) -+ } -+ Xor(Arg0, \_SB.PCI0.LPCB.EC.DKR1, Local0) -+ Return (Local0) -+ } -+ -+ Method(_STA, 0, NotSerialized) -+ { -+ Return (\_SB.PCI0.LPCB.EC.DKR1) -+ } -+ } -+} -+ -+Scope(\_SB.PCI0.LPCB.EC) -+{ -+ Method(_Q18, 0, NotSerialized) -+ { -+ Notify(\_SB.DOCK, 3) -+ } -+ -+ Method(_Q45, 0, NotSerialized) -+ { -+ Notify(\_SB.DOCK, 3) -+ } -+ -+ Method(_Q58, 0, NotSerialized) -+ { -+ Notify(\_SB.DOCK, 0) -+ } -+ -+ Method(_Q37, 0, NotSerialized) -+ { -+ Notify(\_SB.DOCK, 0) -+ } -+} -diff --git a/src/mainboard/lenovo/r500/acpi/ec.asl b/src/mainboard/lenovo/r500/acpi/ec.asl -new file mode 100644 -index 0000000..c3569e8 ---- /dev/null -+++ b/src/mainboard/lenovo/r500/acpi/ec.asl -@@ -0,0 +1 @@ -+#include <ec/lenovo/h8/acpi/ec.asl> -diff --git a/src/mainboard/lenovo/r500/acpi/gm45_pci_irqs.asl b/src/mainboard/lenovo/r500/acpi/gm45_pci_irqs.asl -new file mode 100644 -index 0000000..93b4525 ---- /dev/null -+++ b/src/mainboard/lenovo/r500/acpi/gm45_pci_irqs.asl -@@ -0,0 +1,84 @@ -+/* -+ * This file is part of the coreboot project. -+ * -+ * Copyright (C) 2007-2009 coresystems GmbH -+ * -+ * This program is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU General Public License as -+ * published by the Free Software Foundation; version 2 of -+ * the License. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc. -+ */ -+ -+/* This is board specific information: IRQ routing for the -+ * gm45 -+ */ -+ -+ -+// PCI Interrupt Routing -+Method(_PRT) -+{ -+ If (PICM) { -+ Return (Package() { -+ // PCIe Graphics 0:1.0 -+ Package() { 0x0001ffff, 0, 0, 16 }, -+ // Onboard graphics (IGD) 0:2.0 -+ Package() { 0x0002ffff, 0, 0, 16 }, -+ // USB and EHCI 0:1a.x -+ Package() { 0x001affff, 0, 0, 16 }, -+ Package() { 0x001affff, 1, 0, 17 }, -+ Package() { 0x001affff, 2, 0, 18 }, -+ // High Definition Audio 0:1b.0 -+ Package() { 0x001bffff, 0, 0, 16 }, -+ // PCIe Root Ports 0:1c.x -+ Package() { 0x001cffff, 0, 0, 16 }, -+ // USB and EHCI 0:1d.x -+ Package() { 0x001dffff, 0, 0, 16 }, -+ Package() { 0x001dffff, 1, 0, 17 }, -+ Package() { 0x001dffff, 2, 0, 18 }, -+ // FIXME -+ // CardBus/IEEE1394 0:1e.2, 0:1e.3 -+ // Package() { 0x001effff, 0, 0, 22 }, -+ // Package() { 0x001effff, 1, 0, 20 }, -+ // LPC device 0:1f.0 -+ Package() { 0x001fffff, 0, 0, 16 }, -+ Package() { 0x001fffff, 1, 0, 17 }, -+ Package() { 0x001fffff, 2, 0, 18 } -+ }) -+ } Else { -+ Return (Package() { -+ // PCIe Graphics 0:1.0 -+ Package() { 0x0001ffff, 0, \_SB.PCI0.LPCB.LNKA, 0 }, -+ // Onboard graphics (IGD) 0:2.0 -+ Package() { 0x0002ffff, 0, \_SB.PCI0.LPCB.LNKA, 0 }, -+ // USB and EHCI 0:1a.x -+ Package() { 0x001affff, 0, \_SB.PCI0.LPCB.LNKA, 0 }, -+ Package() { 0x001affff, 1, \_SB.PCI0.LPCB.LNKB, 0 }, -+ Package() { 0x001affff, 2, \_SB.PCI0.LPCB.LNKC, 0 }, -+ // High Definition Audio 0:1b.0 -+ Package() { 0x001bffff, 0, \_SB.PCI0.LPCB.LNKA, 0 }, -+ // PCIe Root Ports 0:1c.x -+ Package() { 0x001cffff, 0, \_SB.PCI0.LPCB.LNKA, 0 }, -+ // USB and EHCI 0:1d.x -+ Package() { 0x001dffff, 0, \_SB.PCI0.LPCB.LNKA, 0 }, -+ Package() { 0x001dffff, 1, \_SB.PCI0.LPCB.LNKB, 0 }, -+ Package() { 0x001dffff, 2, \_SB.PCI0.LPCB.LNKC, 0 }, -+ // FIXME -+ // CardBus/IEEE1394 0:1e.2, 0:1e.3 -+ // Package() { 0x001effff, 0, \_SB.PCI0.LPCB.LNKG, 0 }, -+ // Package() { 0x001effff, 1, \_SB.PCI0.LPCB.LNKE, 0 }, -+ // LPC device 0:1f.0 -+ Package() { 0x001fffff, 0, \_SB.PCI0.LPCB.LNKA, 0 }, -+ Package() { 0x001fffff, 1, \_SB.PCI0.LPCB.LNKB, 0 }, -+ Package() { 0x001fffff, 2, \_SB.PCI0.LPCB.LNKC, 0 } -+ }) -+ } -+} -diff --git a/src/mainboard/lenovo/r500/acpi/gpe.asl b/src/mainboard/lenovo/r500/acpi/gpe.asl -new file mode 100644 -index 0000000..e1c806f ---- /dev/null -+++ b/src/mainboard/lenovo/r500/acpi/gpe.asl -@@ -0,0 +1,28 @@ -+/* -+ * This file is part of the coreboot project. -+ * -+ * Copyright (c) 2011 Sven Schnelle <svens@stackframe.org> -+ * -+ * This program is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU General Public License as -+ * published by the Free Software Foundation; version 2 of -+ * the License. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc. -+ */ -+ -+Scope (\_GPE) -+{ -+ Method(_L18, 0, NotSerialized) -+ { -+ /* Read EC register to clear wake status */ -+ Store(\_SB.PCI0.LPCB.EC.WAKE, Local0) -+ } -+} -diff --git a/src/mainboard/lenovo/r500/acpi/ich9_pci_irqs.asl b/src/mainboard/lenovo/r500/acpi/ich9_pci_irqs.asl -new file mode 100644 -index 0000000..3ef5d3b ---- /dev/null -+++ b/src/mainboard/lenovo/r500/acpi/ich9_pci_irqs.asl -@@ -0,0 +1,108 @@ -+/* -+ * This file is part of the coreboot project. -+ * -+ * Copyright (C) 2007-2009 coresystems GmbH -+ * -+ * This program is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU General Public License as -+ * published by the Free Software Foundation; version 2 of -+ * the License. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc. -+ */ -+ -+/* This is board specific information: IRQ routing for the -+ * 0:1e.0 PCI bridge of the ICH9 -+ */ -+ -+/* TODO: which slots are actually relevant? */ -+If (PICM) { -+ Return (Package() { -+ // PCI Slot 1 routes ABCD -+ Package() { 0x0000ffff, 0, 0, 16}, -+ Package() { 0x0000ffff, 1, 0, 17}, -+ Package() { 0x0000ffff, 2, 0, 18}, -+ Package() { 0x0000ffff, 3, 0, 19}, -+ -+ // PCI Slot 2 routes BCDA -+ Package() { 0x0001ffff, 0, 0, 17}, -+ Package() { 0x0001ffff, 1, 0, 18}, -+ Package() { 0x0001ffff, 2, 0, 19}, -+ Package() { 0x0001ffff, 3, 0, 16}, -+ -+ // PCI Slot 3 routes CDAB -+ Package() { 0x0002ffff, 0, 0, 18}, -+ Package() { 0x0002ffff, 1, 0, 19}, -+ Package() { 0x0002ffff, 2, 0, 16}, -+ Package() { 0x0002ffff, 3, 0, 17}, -+ -+ // PCI Slot 4 routes ABCD -+ Package() { 0x0003ffff, 0, 0, 16}, -+ Package() { 0x0003ffff, 1, 0, 17}, -+ Package() { 0x0003ffff, 2, 0, 18}, -+ Package() { 0x0003ffff, 3, 0, 19}, -+ -+ // PCI Slot 5 routes ABCD -+ Package() { 0x0004ffff, 0, 0, 16}, -+ Package() { 0x0004ffff, 1, 0, 17}, -+ Package() { 0x0004ffff, 2, 0, 18}, -+ Package() { 0x0004ffff, 3, 0, 19}, -+ -+ // PCI Slot 6 routes BCDA -+ Package() { 0x0005ffff, 0, 0, 17}, -+ Package() { 0x0005ffff, 1, 0, 18}, -+ Package() { 0x0005ffff, 2, 0, 19}, -+ Package() { 0x0005ffff, 3, 0, 16}, -+ -+ // FIXME: what's this supposed to mean? (adopted from ich7) -+ //Package() { 0x0008ffff, 0, 0, 20}, -+ }) -+} Else { -+ Return (Package() { -+ // PCI Slot 1 routes ABCD -+ Package() { 0x0000ffff, 0, \_SB.PCI0.LPCB.LNKA, 0}, -+ Package() { 0x0000ffff, 1, \_SB.PCI0.LPCB.LNKB, 0}, -+ Package() { 0x0000ffff, 2, \_SB.PCI0.LPCB.LNKC, 0}, -+ Package() { 0x0000ffff, 3, \_SB.PCI0.LPCB.LNKD, 0}, -+ -+ // PCI Slot 2 routes BCDA -+ Package() { 0x0001ffff, 0, \_SB.PCI0.LPCB.LNKB, 0}, -+ Package() { 0x0001ffff, 1, \_SB.PCI0.LPCB.LNKC, 0}, -+ Package() { 0x0001ffff, 2, \_SB.PCI0.LPCB.LNKD, 0}, -+ Package() { 0x0001ffff, 3, \_SB.PCI0.LPCB.LNKA, 0}, -+ -+ // PCI Slot 3 routes CDAB -+ Package() { 0x0002ffff, 0, \_SB.PCI0.LPCB.LNKC, 0}, -+ Package() { 0x0002ffff, 1, \_SB.PCI0.LPCB.LNKD, 0}, -+ Package() { 0x0002ffff, 2, \_SB.PCI0.LPCB.LNKA, 0}, -+ Package() { 0x0002ffff, 3, \_SB.PCI0.LPCB.LNKB, 0}, -+ -+ // PCI Slot 4 routes ABCD -+ Package() { 0x0003ffff, 0, \_SB.PCI0.LPCB.LNKA, 0}, -+ Package() { 0x0003ffff, 1, \_SB.PCI0.LPCB.LNKB, 0}, -+ Package() { 0x0003ffff, 2, \_SB.PCI0.LPCB.LNKC, 0}, -+ Package() { 0x0003ffff, 3, \_SB.PCI0.LPCB.LNKD, 0}, -+ -+ // PCI Slot 5 routes ABCD -+ Package() { 0x0004ffff, 0, \_SB.PCI0.LPCB.LNKA, 0}, -+ Package() { 0x0004ffff, 1, \_SB.PCI0.LPCB.LNKB, 0}, -+ Package() { 0x0004ffff, 2, \_SB.PCI0.LPCB.LNKC, 0}, -+ Package() { 0x0004ffff, 3, \_SB.PCI0.LPCB.LNKD, 0}, -+ -+ // PCI Slot 6 routes BCDA -+ Package() { 0x0005ffff, 0, \_SB.PCI0.LPCB.LNKB, 0}, -+ Package() { 0x0005ffff, 1, \_SB.PCI0.LPCB.LNKC, 0}, -+ Package() { 0x0005ffff, 2, \_SB.PCI0.LPCB.LNKD, 0}, -+ Package() { 0x0005ffff, 3, \_SB.PCI0.LPCB.LNKA, 0}, -+ -+ // FIXME -+ // Package() { 0x0008ffff, 0, \_SB.PCI0.LPCB.LNKE, 0}, -+ }) -+} -diff --git a/src/mainboard/lenovo/r500/acpi/platform.asl b/src/mainboard/lenovo/r500/acpi/platform.asl -new file mode 100644 -index 0000000..d5cb076 ---- /dev/null -+++ b/src/mainboard/lenovo/r500/acpi/platform.asl -@@ -0,0 +1,205 @@ -+/* -+ * This file is part of the coreboot project. -+ * -+ * Copyright (C) 2007-2009 coresystems GmbH -+ * -+ * This program is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU General Public License as -+ * published by the Free Software Foundation; version 2 of -+ * the License. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc. -+ */ -+ -+/* These come from the dynamically created CPU SSDT */ -+External(PDC0) -+External(PDC1) -+ -+/* The APM port can be used for generating software SMIs */ -+ -+OperationRegion (APMP, SystemIO, 0xb2, 2) -+Field (APMP, ByteAcc, NoLock, Preserve) -+{ -+ APMC, 8, // APM command -+ APMS, 8 // APM status -+} -+ -+/* Port 80 POST */ -+ -+OperationRegion (POST, SystemIO, 0x80, 1) -+Field (POST, ByteAcc, Lock, Preserve) -+{ -+ DBG0, 8 -+} -+ -+/* SMI I/O Trap */ -+Method(TRAP, 1, Serialized) -+{ -+ Store (Arg0, SMIF) // SMI Function -+ Store (0, TRP0) // Generate trap -+ Return (SMIF) // Return value of SMI handler -+} -+ -+/* The _PIC method is called by the OS to choose between interrupt -+ * routing via the i8259 interrupt controller or the APIC. -+ * -+ * _PIC is called with a parameter of 0 for i8259 configuration and -+ * with a parameter of 1 for Local Apic/IOAPIC configuration. -+ */ -+ -+Method(_PIC, 1) -+{ -+ // Remember the OS' IRQ routing choice. -+ Store(Arg0, PICM) -+} -+ -+/* The _PTS method (Prepare To Sleep) is called before the OS is -+ * entering a sleep state. The sleep state number is passed in Arg0 -+ */ -+ -+Method(_PTS,1) -+{ -+ // Call a trap so SMI can prepare for Sleep as well. -+ // TRAP(0x55) -+ \_SB.PCI0.LPCB.EC.RADI(0) -+} -+ -+/* The _WAK method is called on system wakeup */ -+ -+Method(_WAK,1) -+{ -+ // CPU specific part -+ -+ // Notify PCI Express slots in case a card -+ // was inserted while a sleep state was active. -+ -+ // Are we going to S3? -+ If (LEqual(Arg0, 3)) { -+ // .. -+ } -+ -+ // Are we going to S4? -+ If (LEqual(Arg0, 4)) { -+ // .. -+ } -+ -+ // TODO: Windows XP SP2 P-State restore -+ -+ // TODO: Return Arg0 as second value if S-Arg0 was entered -+ // before. -+ -+ Return(Package(){0,0}) -+} -+ -+// Power notification -+ -+External (\_PR_.CP00, DeviceObj) -+External (\_PR_.CP01, DeviceObj) -+ -+Method (PNOT) -+{ -+ If (MPEN) { -+ If(And(PDC0, 0x08)) { -+ Notify (\_PR_.CP00, 0x80) // _PPC -+ -+ If (And(PDC0, 0x10)) { -+ Sleep(100) -+ Notify(\_PR_.CP00, 0x81) // _CST -+ } -+ } -+ -+ If(And(PDC1, 0x08)) { -+ Notify (\_PR_.CP01, 0x80) // _PPC -+ If (And(PDC1, 0x10)) { -+ Sleep(100) -+ Notify(\_PR_.CP01, 0x81) // _CST -+ } -+ } -+ -+ } Else { // UP -+ Notify (\_PR_.CP00, 0x80) -+ Sleep(0x64) -+ Notify(\_PR_.CP00, 0x81) -+ } -+ -+} -+ -+/* System Bus */ -+ -+Scope(\_SB) -+{ -+ /* This method is placed on the top level, so we can make sure it's the -+ * first executed _INI method. -+ */ -+ Method(_INI, 0) -+ { -+ /* The DTS data in NVS is probably not up to date. -+ * Update temperature values and make sure AP thermal -+ * interrupts can happen -+ */ -+ -+ // TRAP(71) // TODO -+ -+ /* Determine the Operating System and save the value in OSYS. -+ * We have to do this in order to be able to work around -+ * certain windows bugs. -+ * -+ * OSYS value | Operating System -+ * -----------+------------------ -+ * 2000 | Windows 2000 -+ * 2001 | Windows XP(+SP1) -+ * 2002 | Windows XP SP2 -+ * 2006 | Windows Vista -+ * ???? | Windows 7 -+ */ -+ -+ /* Let's assume we're running at least Windows 2000 */ -+ Store (2000, OSYS) -+ -+ If (CondRefOf(_OSI, Local0)) { -+ /* Linux answers _OSI with "True" for a couple of -+ * Windows version queries. But unlike Windows it -+ * needs a Video repost, so let's determine whether -+ * we're running Linux. -+ */ -+ -+ If (_OSI("Linux")) { -+ Store (1, LINX) -+ } -+ -+ If (_OSI("Windows 2001")) { -+ Store (2001, OSYS) -+ } -+ -+ If (_OSI("Windows 2001 SP1")) { -+ Store (2001, OSYS) -+ } -+ -+ If (_OSI("Windows 2001 SP2")) { -+ Store (2002, OSYS) -+ } -+ -+ If (_OSI("Windows 2006")) { -+ Store (2006, OSYS) -+ } -+ } -+ -+ /* And the OS workarounds start right after we know what we're -+ * running: Windows XP SP1 needs to have C-State coordination -+ * enabled in SMM. -+ */ -+ If (LAnd(LEqual(OSYS, 2001), MPEN)) { -+ // TRAP(61) // TODO -+ } -+ -+ /* SMM power state and C4-on-C3 settings need to be updated */ -+ // TRAP(43) // TODO -+ } -+} -diff --git a/src/mainboard/lenovo/r500/acpi/superio.asl b/src/mainboard/lenovo/r500/acpi/superio.asl -new file mode 100644 -index 0000000..e69de29 -diff --git a/src/mainboard/lenovo/r500/acpi_tables.c b/src/mainboard/lenovo/r500/acpi_tables.c -new file mode 100644 -index 0000000..fa69e7a ---- /dev/null -+++ b/src/mainboard/lenovo/r500/acpi_tables.c -@@ -0,0 +1,71 @@ -+/* -+ * This file is part of the coreboot project. -+ * -+ * Copyright (C) 2007-2009 coresystems GmbH -+ * -+ * This program is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU General Public License as -+ * published by the Free Software Foundation; version 2 of -+ * the License. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc. -+ */ -+ -+#include <string.h> -+#include <console/console.h> -+#include <arch/io.h> -+#include <arch/ioapic.h> -+#include <arch/acpi.h> -+#include <arch/acpigen.h> -+#include <arch/smp/mpspec.h> -+#include <device/device.h> -+#include <device/pci.h> -+#include <device/pci_ids.h> -+ -+#include "southbridge/intel/i82801ix/nvs.h" -+void acpi_create_gnvs(global_nvs_t *gnvs) -+{ -+ memset((void *)gnvs, 0, sizeof(*gnvs)); -+ gnvs->apic = 1; -+ gnvs->mpen = 1; /* Enable Multi Processing */ -+ -+ /* Enable both COM ports */ -+ gnvs->cmap = 0x01; -+ gnvs->cmbp = 0x01; -+ -+} -+ -+unsigned long acpi_fill_madt(unsigned long current) -+{ -+ /* Local APICs */ -+ current = acpi_create_madt_lapics(current); -+ -+ /* IOAPIC */ -+ current += acpi_create_madt_ioapic((acpi_madt_ioapic_t *) current, -+ 2, IO_APIC_ADDR, 0); -+ -+ /* LAPIC_NMI */ -+ current += acpi_create_madt_lapic_nmi((acpi_madt_lapic_nmi_t *) -+ current, 0, -+ MP_IRQ_POLARITY_HIGH | -+ MP_IRQ_TRIGGER_EDGE, 0x01); -+ current += acpi_create_madt_lapic_nmi((acpi_madt_lapic_nmi_t *) -+ current, 1, MP_IRQ_POLARITY_HIGH | -+ MP_IRQ_TRIGGER_EDGE, 0x01); -+ -+ /* INT_SRC_OVR */ -+ current += acpi_create_madt_irqoverride((acpi_madt_irqoverride_t *) -+ current, 0, 0, 2, MP_IRQ_POLARITY_HIGH | MP_IRQ_TRIGGER_EDGE); -+ current += acpi_create_madt_irqoverride((acpi_madt_irqoverride_t *) -+ current, 0, 9, 9, MP_IRQ_POLARITY_HIGH | MP_IRQ_TRIGGER_LEVEL); -+ -+ -+ return current; -+} -diff --git a/src/mainboard/lenovo/r500/board_info.txt b/src/mainboard/lenovo/r500/board_info.txt -new file mode 100644 -index 0000000..a78a21b ---- /dev/null -+++ b/src/mainboard/lenovo/r500/board_info.txt -@@ -0,0 +1,6 @@ -+Category: laptop -+ROM package: SOIC-16 -+ROM protocol: SPI -+ROM socketed: n -+Flashrom support: n -+Release year: 2008 -diff --git a/src/mainboard/lenovo/r500/cmos.default b/src/mainboard/lenovo/r500/cmos.default -new file mode 100644 -index 0000000..67b8920 ---- /dev/null -+++ b/src/mainboard/lenovo/r500/cmos.default -@@ -0,0 +1,16 @@ -+boot_option=Fallback -+last_boot=Fallback -+baud_rate=115200 -+debug_level=Spew -+power_on_after_fail=Disable -+volume=0x3 -+first_battery=Primary -+bluetooth=Enable -+wwan=Enable -+wlan=Enable -+trackpoint=Enable -+fn_ctrl_swap=Disable -+sticky_fn=Disable -+power_management_beeps=Enable -+low_battery_beep=Enable -+sata_mode=AHCI -diff --git a/src/mainboard/lenovo/r500/cmos.layout b/src/mainboard/lenovo/r500/cmos.layout -new file mode 100644 -index 0000000..39ced9b ---- /dev/null -+++ b/src/mainboard/lenovo/r500/cmos.layout -@@ -0,0 +1,144 @@ -+# -+# This file is part of the coreboot project. -+# -+# Copyright (C) 2007-2008 coresystems GmbH -+# 2012 secunet Security Networks AG -+# -+# This program is free software; you can redistribute it and/or -+# modify it under the terms of the GNU General Public License as -+# published by the Free Software Foundation; version 2 of -+# the License. -+# -+# This program is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+# GNU General Public License for more details. -+# -+# You should have received a copy of the GNU General Public License -+# along with this program; if not, write to the Free Software -+# Foundation, Inc. -+# -+ -+# ----------------------------------------------------------------- -+entries -+ -+# ----------------------------------------------------------------- -+# Status Register A -+# ----------------------------------------------------------------- -+# Status Register B -+# ----------------------------------------------------------------- -+# Status Register C -+#96 4 r 0 status_c_rsvd -+#100 1 r 0 uf_flag -+#101 1 r 0 af_flag -+#102 1 r 0 pf_flag -+#103 1 r 0 irqf_flag -+# ----------------------------------------------------------------- -+# Status Register D -+#104 7 r 0 status_d_rsvd -+#111 1 r 0 valid_cmos_ram -+# ----------------------------------------------------------------- -+# Diagnostic Status Register -+#112 8 r 0 diag_rsvd1 -+ -+# ----------------------------------------------------------------- -+0 120 r 0 reserved_memory -+#120 240 r 0 unused -+ -+# ----------------------------------------------------------------- -+# RTC_BOOT_BYTE (coreboot hardcoded) -+384 1 e 4 boot_option -+385 1 e 4 last_boot -+388 4 r 0 reboot_bits -+#390 2 r 0 unused? -+ -+# ----------------------------------------------------------------- -+# coreboot config options: console -+392 3 e 5 baud_rate -+395 4 e 6 debug_level -+#399 1 r 0 unused -+ -+# coreboot config options: EC -+400 8 h 0 volume -+ -+# coreboot config options: southbridge -+408 1 e 10 sata_mode -+409 2 e 7 power_on_after_fail -+ -+# coreboot config options: EC -+411 1 e 9 first_battery -+412 1 e 1 bluetooth -+413 1 e 1 wwan -+414 1 e 1 wlan -+415 1 e 1 trackpoint -+416 1 e 1 fn_ctrl_swap -+417 1 e 1 sticky_fn -+ -+# coreboot config options: bootloader -+418 512 s 0 boot_devices -+930 8 h 0 boot_default -+ -+938 1 e 1 power_management_beeps -+939 1 e 1 low_battery_beep -+940 1 e 1 uwb -+ -+# coreboot config options: northbridge -+941 3 e 11 gfx_uma_size -+ -+#944 2 r 0 unused -+ -+# coreboot config options: check sums -+984 16 h 0 check_sum -+#1000 24 r 0 unused -+ -+# ram initialization internal data -+1024 128 r 0 read_training_results -+ -+# ----------------------------------------------------------------- -+ -+enumerations -+ -+#ID value text -+1 0 Disable -+1 1 Enable -+2 0 Enable -+2 1 Disable -+4 0 Fallback -+4 1 Normal -+5 0 115200 -+5 1 57600 -+5 2 38400 -+5 3 19200 -+5 4 9600 -+5 5 4800 -+5 6 2400 -+5 7 1200 -+6 1 Emergency -+6 2 Alert -+6 3 Critical -+6 4 Error -+6 5 Warning -+6 6 Notice -+6 7 Info -+6 8 Debug -+6 9 Spew -+7 0 Disable -+7 1 Enable -+7 2 Keep -+8 0 No -+8 1 Yes -+9 0 Secondary -+9 1 Primary -+10 0 AHCI -+10 1 Compatible -+11 0 32M -+11 1 48M -+11 2 64M -+11 3 128M -+11 5 96M -+11 6 160M -+ -+# ----------------------------------------------------------------- -+checksums -+ -+checksum 392 983 984 -diff --git a/src/mainboard/lenovo/r500/cstates.c b/src/mainboard/lenovo/r500/cstates.c -new file mode 100644 -index 0000000..1062308 ---- /dev/null -+++ b/src/mainboard/lenovo/r500/cstates.c -@@ -0,0 +1,41 @@ -+/* -+ * This file is part of the coreboot project. -+ * -+ * Copyright (C) 2012 secunet Security Networks AG -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; version 2 of the License. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc. -+ */ -+ -+#include <arch/acpigen.h> -+#include <device/device.h> /* fix for i82801ix.h */ -+#include <southbridge/intel/i82801ix/i82801ix.h> -+ -+static acpi_cstate_t cst_entries[] = { -+ { -+ /* acpi C1 / cpu C1 */ -+ 1, 0x01, 1000, -+ { ACPI_ADDRESS_SPACE_FIXED, 1, 2, { 1 }, 0, 0 } -+ }, -+ { -+ /* acpi C2 / cpu C2 */ -+ 2, 0x01, 500, -+ { ACPI_ADDRESS_SPACE_FIXED, 1, 2, { 1 }, 0x10, 0 } -+ }, -+}; -+ -+int get_cst_entries(acpi_cstate_t **entries) -+{ -+ *entries = cst_entries; -+ return ARRAY_SIZE(cst_entries); -+} -diff --git a/src/mainboard/lenovo/r500/devicetree.cb b/src/mainboard/lenovo/r500/devicetree.cb -new file mode 100644 -index 0000000..cb4a021 ---- /dev/null -+++ b/src/mainboard/lenovo/r500/devicetree.cb -@@ -0,0 +1,222 @@ -+chip northbridge/intel/gm45 -+ # IGD Displays -+ register "gfx.ndid" = "3" -+ register "gfx.did" = "{ 0x80000100, 0x80000240, 0x80000410, 0x80000410, 0x00000005 }" -+ -+ register "gfx.use_spread_spectrum_clock" = "1" -+ register "gfx.lvds_dual_channel" = "0" -+ register "gfx.link_frequency_270_mhz" = "1" -+ register "gfx.lvds_num_lanes" = "4" -+ -+ device cpu_cluster 0 on -+ chip cpu/intel/socket_BGA956 -+ device lapic 0 on end -+ end -+ chip cpu/intel/model_1067x -+ # Magic APIC ID to locate this chip -+ device lapic 0xACAC off end -+ -+ # Enable Super LFM -+ register "slfm" = "1" -+ -+ # Enable C5, C6 -+ register "c5" = "1" -+ register "c6" = "1" -+ end -+ end -+ -+ device domain 0 on -+ device pci 00.0 on -+ subsystemid 0x17aa 0x20e0 -+ end # host bridge -+ device pci 02.0 on # VGA -+ subsystemid 0x17aa 0x20e4 -+ ioapic_irq 2 INTA 0x10 -+ end -+ device pci 02.1 on -+ subsystemid 0x17aa 0x20e4 -+ end # Display -+ device pci 03.0 on -+ subsystemid 0x17aa 0x20e6 -+ end # ME -+ device pci 03.1 off end # ME -+ device pci 03.2 off end # ME -+ device pci 03.3 off end # ME -+ chip southbridge/intel/i82801ix -+ register "pirqa_routing" = "0x0b" -+ register "pirqb_routing" = "0x0b" -+ register "pirqc_routing" = "0x0b" -+ register "pirqd_routing" = "0x0b" -+ register "pirqe_routing" = "0x80" -+ register "pirqf_routing" = "0x80" -+ register "pirqg_routing" = "0x80" -+ register "pirqh_routing" = "0x80" -+ -+ register "gpi8_routing" = "2" -+ register "gpe0_en" = "0x01000000" -+ register "gpi1_routing" = "2" -+ -+ # Set AHCI mode, enable ports 1 and 2. -+ register "sata_port_map" = "0x03" -+ register "sata_clock_request" = "0" -+ register "sata_traffic_monitor" = "0" -+ -+ # Set c-state support -+ register "c4onc3_enable" = "0" -+ register "c5_enable" = "1" -+ register "c6_enable" = "1" -+ -+ # Set thermal throttling to 75%. -+ register "throttle_duty" = "THTL_75_0" -+ -+ # Enable PCIe ports 1,2,4 as slots (Mini * PCIe). -+ register "pcie_slot_implemented" = "0xb" -+ # Set power limits to 10 * 10^0 watts. -+ # Maybe we should set less for Mini PCIe. -+ register "pcie_power_limits" = "{ { 10, 0 }, { 10, 0 }, { 0, 0 }, { 10, 0 }, { 0, 0 }, { 0, 0 } }" -+ register "pcie_hotplug_map" = "{ 0, 0, 0, 1, 0, 0, 0, 0 }" -+ -+ chip drivers/generic/ioapic -+ register "have_isa_interrupts" = "1" -+ register "irq_on_fsb" = "1" -+ register "enable_virtual_wire" = "1" -+ register "base" = "(void *)0xfec00000" -+ device ioapic 2 on end -+ end -+ -+ device pci 19.0 on end # LAN -+ device pci 1a.0 on # UHCI -+ subsystemid 0x17aa 0x20f0 -+ ioapic_irq 2 INTA 0x10 -+ end -+ device pci 1a.1 on # UHCI -+ subsystemid 0x17aa 0x20f0 -+ ioapic_irq 2 INTB 0x11 -+ end -+ device pci 1a.2 on # UHCI -+ subsystemid 0x17aa 0x20f0 -+ ioapic_irq 2 INTC 0x12 -+ end -+ device pci 1a.7 on # EHCI -+ subsystemid 0x17aa 0x20f1 -+ ioapic_irq 2 INTC 0x12 -+ end -+ device pci 1b.0 on # HD Audio -+ subsystemid 0x17aa 0x20f2 -+ ioapic_irq 2 INTA 0x10 -+ end -+ device pci 1c.0 on # PCIe Port #1 -+ subsystemid 0x17aa 0x20f3 # WWAN -+ ioapic_irq 2 INTA 0x10 -+ end -+ device pci 1c.1 on -+ subsystemid 0x17aa 0x20f3 # WLAN -+ end # PCIe Port #2 -+ device pci 1c.2 on -+ subsystemid 0x17aa 0x20f3 # UWB -+ end # PCIe Port #3 -+ device pci 1c.3 on -+ subsystemid 0x17aa 0x20f3 # Expresscard -+ end # PCIe Port #4 -+ device pci 1c.4 off end # PCIe Port #5 -+ device pci 1c.5 off end # PCIe Port #6 -+ device pci 1d.0 on # UHCI -+ subsystemid 0x17aa 0x20f0 -+ ioapic_irq 2 INTA 0x10 -+ end -+ device pci 1d.1 on # UHCI -+ subsystemid 0x17aa 0x20f0 -+ ioapic_irq 2 INTB 0x11 -+ end -+ device pci 1d.2 on # UHCI -+ subsystemid 0x17aa 0x20f0 -+ ioapic_irq 2 INTC 0x12 -+ end -+ device pci 1d.7 on # EHCI -+ subsystemid 0x17aa 0x20f1 -+ ioapic_irq 2 INTA 0x10 -+ end -+ device pci 1e.0 on # PCI -+ subsystemid 0x17aa 0x20f4 -+ end -+ device pci 1f.0 on # LPC bridge -+ subsystemid 0x17aa 0x20f5 -+ chip ec/lenovo/pmh7 -+ device pnp ff.1 on # dummy -+ end -+ register "backlight_enable" = "0x01" -+ register "dock_event_enable" = "0x01" -+ end -+ -+ chip ec/lenovo/h8 -+ device pnp ff.2 on # dummy -+ io 0x60 = 0x62 -+ io 0x62 = 0x66 -+ io 0x64 = 0x1600 -+ io 0x66 = 0x1604 -+ end -+ -+ register "config0" = "0xa6" -+ register "config1" = "0x04" -+ register "config2" = "0xa0" -+ register "config3" = "0x01" -+ -+ register "beepmask0" = "0xfe" -+ register "beepmask1" = "0x96" -+ register "has_power_management_beeps" = "1" -+ register "has_uwb" = "1" -+ -+ register "event2_enable" = "0xff" -+ register "event3_enable" = "0xff" -+ register "event4_enable" = "0xf4" -+ register "event5_enable" = "0x3c" -+ register "event6_enable" = "0x80" -+ register "event7_enable" = "0x01" -+ register "event8_enable" = "0x01" -+ register "event9_enable" = "0xff" -+ register "eventa_enable" = "0xff" -+ register "eventb_enable" = "0xff" -+ register "eventc_enable" = "0xff" -+ register "eventd_enable" = "0xff" -+ end -+ -+ chip superio/nsc/pc87382 -+ device pnp 164e.3 on # Digitizer -+ io 0x60 = 0x200 -+ irq 0x29 = 0xb0 -+ irq 0x70 = 0x5 -+ irq 0xf0 = 0x82 -+ end -+ # IR, not connected -+ device pnp 164e.2 off end -+ # GPIO, not connected -+ device pnp 164e.7 off end -+ # DLPC, not connected -+ device pnp 164e.19 off end -+ end -+ -+ end -+ device pci 1f.2 on # SATA/IDE 1 -+ subsystemid 0x17aa 0x20f8 -+ ioapic_irq 2 INTB 0x11 -+ end -+ device pci 1f.3 on # SMBus -+ subsystemid 0x17aa 0x20f9 -+ ioapic_irq 2 INTC 0x12 -+ # eeprom, 8 virtual devices, same chip -+ chip drivers/i2c/at24rf08c -+ device i2c 54 on end -+ device i2c 55 on end -+ device i2c 56 on end -+ device i2c 57 on end -+ device i2c 5c on end -+ device i2c 5d on end -+ device i2c 5e on end -+ device i2c 5f on end -+ end -+ end -+ device pci 1f.5 off end # SATA/IDE 2 -+ device pci 1f.6 off end # Thermal -+ end -+ end -+end -diff --git a/src/mainboard/lenovo/r500/dock.c b/src/mainboard/lenovo/r500/dock.c -new file mode 100644 -index 0000000..63d4563 ---- /dev/null -+++ b/src/mainboard/lenovo/r500/dock.c -@@ -0,0 +1,64 @@ -+/* -+ * This file is part of the coreboot project. -+ * -+ * Copyright (C) 2011 Sven Schnelle <svens@stackframe.org> -+ * Copyright (C) 2013 Vladimir Serbinenko <phcoder@gmail.com> -+ * -+ * This program is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU General Public License as -+ * published by the Free Software Foundation; version 2 of -+ * the License. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc. -+ */ -+ -+#define __SIMPLE_DEVICE__ -+#include <console/console.h> -+#include <arch/io.h> -+#include <device/device.h> -+#include <device/pci.h> -+#include <delay.h> -+#include "dock.h" -+#include "southbridge/intel/i82801ix/i82801ix.h" -+#include "ec/lenovo/h8/h8.h" -+#include <ec/acpi/ec.h> -+ -+#define LPC_DEV PCI_DEV(0, 0x1f, 0) -+ -+void h8_mainboard_init_dock (void) -+{ -+ if (dock_present()) { -+ printk(BIOS_DEBUG, "dock is connected\n"); -+ dock_connect(); -+ } else -+ printk(BIOS_DEBUG, "dock is not connected\n"); -+} -+ -+void dock_connect(void) -+{ -+ u16 gpiobase = pci_read_config16(LPC_DEV, D31F0_GPIO_BASE) & 0xfffc; -+ ec_set_bit(0x02, 0); -+ outl(inl(gpiobase + 0x0c) | (1 << 28), gpiobase + 0x0c); -+} -+ -+void dock_disconnect(void) -+{ -+ u16 gpiobase = pci_read_config16(LPC_DEV, D31F0_GPIO_BASE) & 0xfffc; -+ ec_clr_bit(0x02, 0); -+ outl(inl(gpiobase + 0x0c) & ~(1 << 28), gpiobase + 0x0c); -+} -+ -+int dock_present(void) -+{ -+ u16 gpiobase = pci_read_config16(LPC_DEV, D31F0_GPIO_BASE) & 0xfffc; -+ u8 st = inb(gpiobase + 0x0c); -+ -+ return ((st >> 2) & 7) != 7; -+} -diff --git a/src/mainboard/lenovo/r500/dock.h b/src/mainboard/lenovo/r500/dock.h -new file mode 100644 -index 0000000..a5029e1 ---- /dev/null -+++ b/src/mainboard/lenovo/r500/dock.h -@@ -0,0 +1,26 @@ -+/* -+ * This file is part of the coreboot project. -+ * -+ * Copyright (C) 2011 Sven Schnelle <svens@stackframe.org> -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; version 2 of the License. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc. -+ */ -+ -+#ifndef THINKPAD_X200_DOCK_H -+#define THINKPAD_X200_DOCK_H -+ -+extern void dock_connect(void); -+extern void dock_disconnect(void); -+extern int dock_present(void); -+#endif -diff --git a/src/mainboard/lenovo/r500/dsdt.asl b/src/mainboard/lenovo/r500/dsdt.asl -new file mode 100644 -index 0000000..5545c94 ---- /dev/null -+++ b/src/mainboard/lenovo/r500/dsdt.asl -@@ -0,0 +1,58 @@ -+/* -+ * This file is part of the coreboot project. -+ * -+ * Copyright (C) 2007-2009 coresystems GmbH -+ * -+ * This program is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU General Public License as -+ * published by the Free Software Foundation; version 2 of -+ * the License. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc. -+ */ -+ -+#define THINKPAD_EC_GPE 17 -+#define BRIGHTNESS_UP \_SB.PCI0.GFX0.INCB -+#define BRIGHTNESS_DOWN \_SB.PCI0.GFX0.DECB -+#define ACPI_VIDEO_DEVICE \_SB.PCI0.GFX0 -+#define DISPLAY_DEVICE_2_IS_LCD_SCREEN 1 -+ -+DefinitionBlock( -+ "dsdt.aml", -+ "DSDT", -+ 0x03, // DSDT revision: ACPI v3.0 -+ "COREv4", // OEM id -+ "COREBOOT", // OEM table id -+ 0x20090419 // OEM revision -+) -+{ -+ // Some generic macros -+ #include "acpi/platform.asl" -+ -+ // global NVS and variables -+ #include <southbridge/intel/i82801ix/acpi/globalnvs.asl> -+ -+ // General Purpose Events -+ #include "acpi/gpe.asl" -+ -+ Scope (\_SB) { -+ Device (PCI0) -+ { -+ #include <northbridge/intel/gm45/acpi/gm45.asl> -+ #include <southbridge/intel/i82801ix/acpi/ich9.asl> -+ } -+ } -+ -+ /* Chipset specific sleep states */ -+ #include <southbridge/intel/i82801ix/acpi/sleepstates.asl> -+ -+ /* Dock support code */ -+ #include "acpi/dock.asl" -+} -diff --git a/src/mainboard/lenovo/r500/fadt.c b/src/mainboard/lenovo/r500/fadt.c -new file mode 100644 -index 0000000..3833d26 ---- /dev/null -+++ b/src/mainboard/lenovo/r500/fadt.c -@@ -0,0 +1,157 @@ -+/* -+ * This file is part of the coreboot project. -+ * -+ * Copyright (C) 2007-2008 coresystems GmbH -+ * -+ * This program is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU General Public License as -+ * published by the Free Software Foundation; version 2 of -+ * the License. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc. -+ */ -+ -+#include <string.h> -+#include <device/pci.h> -+#include <arch/acpi.h> -+#include <cpu/x86/smm.h> -+ -+void acpi_create_fadt(acpi_fadt_t * fadt, acpi_facs_t * facs, void *dsdt) -+{ -+ acpi_header_t *header = &(fadt->header); -+ u16 pmbase = pci_read_config16(dev_find_slot(0, PCI_DEVFN(0x1f,0)), 0x40) & 0xfffe; -+ -+ memset((void *) fadt, 0, sizeof(acpi_fadt_t)); -+ memcpy(header->signature, "FACP", 4); -+ header->length = sizeof(acpi_fadt_t); -+ header->revision = 3; -+ memcpy(header->oem_id, OEM_ID, 6); -+ memcpy(header->oem_table_id, ACPI_TABLE_CREATOR, 8); -+ memcpy(header->asl_compiler_id, ASLC, 4); -+ header->asl_compiler_revision = 0; -+ -+ fadt->firmware_ctrl = (unsigned long) facs; -+ fadt->dsdt = (unsigned long) dsdt; -+ fadt->model = 0x00; -+ fadt->preferred_pm_profile = PM_MOBILE; -+ fadt->sci_int = 0x9; -+ fadt->smi_cmd = APM_CNT; -+ fadt->acpi_enable = APM_CNT_ACPI_ENABLE; -+ fadt->acpi_disable = APM_CNT_ACPI_DISABLE; -+ fadt->s4bios_req = 0x0; -+ fadt->pstate_cnt = APM_CNT_PST_CONTROL; -+ -+ fadt->pm1a_evt_blk = pmbase; -+ fadt->pm1b_evt_blk = 0x0; -+ fadt->pm1a_cnt_blk = pmbase + 0x4; -+ fadt->pm1b_cnt_blk = 0x0; -+ fadt->pm2_cnt_blk = pmbase + 0x50; -+ fadt->pm_tmr_blk = pmbase + 0x8; -+ fadt->gpe0_blk = pmbase + 0x20; -+ fadt->gpe1_blk = 0; -+ -+ fadt->pm1_evt_len = 4; -+ fadt->pm1_cnt_len = 2; /* Upper word is reserved and -+ Linux complains about 32 bit. */ -+ fadt->pm2_cnt_len = 1; -+ fadt->pm_tmr_len = 4; -+ fadt->gpe0_blk_len = 16; -+ fadt->gpe1_blk_len = 0; -+ fadt->gpe1_base = 0; -+ fadt->cst_cnt = APM_CNT_CST_CONTROL; -+ fadt->p_lvl2_lat = 1; -+ fadt->p_lvl3_lat = 0x39; -+ fadt->flush_size = 0; -+ fadt->flush_stride = 0; -+ fadt->duty_offset = 1; -+ fadt->duty_width = 3; -+ fadt->day_alrm = 0xd; -+ fadt->mon_alrm = 0x00; -+ fadt->century = 0x32; -+ fadt->iapc_boot_arch = 0x00; -+ fadt->flags = ACPI_FADT_WBINVD | ACPI_FADT_C1_SUPPORTED | -+ ACPI_FADT_SLEEP_BUTTON | ACPI_FADT_S4_RTC_WAKE | -+ ACPI_FADT_DOCKING_SUPPORTED | ACPI_FADT_RESET_REGISTER | -+ ACPI_FADT_PLATFORM_CLOCK; -+ -+ fadt->reset_reg.space_id = ACPI_ADDRESS_SPACE_IO; -+ fadt->reset_reg.bit_width = 8; -+ fadt->reset_reg.bit_offset = 0; -+ fadt->reset_reg.resv = 0; -+ fadt->reset_reg.addrl = 0xcf9; -+ fadt->reset_reg.addrh = 0; -+ fadt->reset_value = 0x06; -+ -+ fadt->x_firmware_ctl_l = 0; /* Set X_FIRMWARE_CTRL only if FACS is */ -+ fadt->x_firmware_ctl_h = 0; /* above 4GB. If X_FIRMWARE_CTRL is set, */ -+ /* then FIRMWARE_CTRL must be zero. */ -+ fadt->x_dsdt_l = (unsigned long)dsdt; -+ fadt->x_dsdt_h = 0; -+ -+ fadt->x_pm1a_evt_blk.space_id = 1; -+ fadt->x_pm1a_evt_blk.bit_width = 32; -+ fadt->x_pm1a_evt_blk.bit_offset = 0; -+ fadt->x_pm1a_evt_blk.resv = 0; -+ fadt->x_pm1a_evt_blk.addrl = pmbase; -+ fadt->x_pm1a_evt_blk.addrh = 0x0; -+ -+ fadt->x_pm1b_evt_blk.space_id = 0; -+ fadt->x_pm1b_evt_blk.bit_width = 0; -+ fadt->x_pm1b_evt_blk.bit_offset = 0; -+ fadt->x_pm1b_evt_blk.resv = 0; -+ fadt->x_pm1b_evt_blk.addrl = 0x0; -+ fadt->x_pm1b_evt_blk.addrh = 0x0; -+ -+ fadt->x_pm1a_cnt_blk.space_id = 1; -+ fadt->x_pm1a_cnt_blk.bit_width = 16; /* Upper word is reserved and -+ Linux complains about 32 bit. */ -+ fadt->x_pm1a_cnt_blk.bit_offset = 0; -+ fadt->x_pm1a_cnt_blk.resv = 0; -+ fadt->x_pm1a_cnt_blk.addrl = pmbase + 0x4; -+ fadt->x_pm1a_cnt_blk.addrh = 0x0; -+ -+ fadt->x_pm1b_cnt_blk.space_id = 0; -+ fadt->x_pm1b_cnt_blk.bit_width = 0; -+ fadt->x_pm1b_cnt_blk.bit_offset = 0; -+ fadt->x_pm1b_cnt_blk.resv = 0; -+ fadt->x_pm1b_cnt_blk.addrl = 0x0; -+ fadt->x_pm1b_cnt_blk.addrh = 0x0; -+ -+ fadt->x_pm2_cnt_blk.space_id = 1; -+ fadt->x_pm2_cnt_blk.bit_width = 8; -+ fadt->x_pm2_cnt_blk.bit_offset = 0; -+ fadt->x_pm2_cnt_blk.resv = 0; -+ fadt->x_pm2_cnt_blk.addrl = pmbase + 0x50; -+ fadt->x_pm2_cnt_blk.addrh = 0x0; -+ -+ fadt->x_pm_tmr_blk.space_id = 1; -+ fadt->x_pm_tmr_blk.bit_width = 32; -+ fadt->x_pm_tmr_blk.bit_offset = 0; -+ fadt->x_pm_tmr_blk.resv = 0; -+ fadt->x_pm_tmr_blk.addrl = pmbase + 0x8; -+ fadt->x_pm_tmr_blk.addrh = 0x0; -+ -+ fadt->x_gpe0_blk.space_id = 1; -+ fadt->x_gpe0_blk.bit_width = 128; -+ fadt->x_gpe0_blk.bit_offset = 0; -+ fadt->x_gpe0_blk.resv = 0; -+ fadt->x_gpe0_blk.addrl = pmbase + 0x20; -+ fadt->x_gpe0_blk.addrh = 0x0; -+ -+ fadt->x_gpe1_blk.space_id = 0; -+ fadt->x_gpe1_blk.bit_width = 0; -+ fadt->x_gpe1_blk.bit_offset = 0; -+ fadt->x_gpe1_blk.resv = 0; -+ fadt->x_gpe1_blk.addrl = 0x0; -+ fadt->x_gpe1_blk.addrh = 0x0; -+ -+ header->checksum = -+ acpi_checksum((void *) fadt, header->length); -+} -diff --git a/src/mainboard/lenovo/r500/hda_verb.c b/src/mainboard/lenovo/r500/hda_verb.c -new file mode 100644 -index 0000000..beb637f ---- /dev/null -+++ b/src/mainboard/lenovo/r500/hda_verb.c -@@ -0,0 +1,51 @@ -+/* -+ * This file is part of the coreboot project. -+ * -+ * Copyright (C) 2007-2009 coresystems GmbH -+ * 2012 secunet Security Networks AG -+ * -+ * This program is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU General Public License as -+ * published by the Free Software Foundation; version 2 of the License. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc. -+ */ -+ -+#include <device/azalia_device.h> -+ -+const u32 cim_verb_data[] = { -+ /* coreboot specific header */ -+ 0x14f15051, // Conexant CX20561 (Hermosa) -+ 0x17aa20ff, // Subsystem ID -+ 0x00000008, // Number of entries -+ -+ /* Pin Widget Verb Table */ -+ -+ AZALIA_PIN_CFG(0, 0x16, 0x042140f0), -+ AZALIA_PIN_CFG(0, 0x17, 0x61a190f0), -+ AZALIA_PIN_CFG(0, 0x18, 0x04a190f0), -+ AZALIA_PIN_CFG(0, 0x19, 0x612140f0), -+ AZALIA_PIN_CFG(0, 0x1a, 0x901701f0), -+ AZALIA_PIN_CFG(0, 0x1b, 0x40f001f0), -+ AZALIA_PIN_CFG(0, 0x1c, 0x40f001f0), -+ AZALIA_PIN_CFG(0, 0x1d, 0x90a601f0) -+}; -+ -+const u32 pc_beep_verbs[] = { -+ 0x00170500, /* power up codec */ -+ 0x01470500, /* power up speakers */ -+ 0x01470100, /* select lout1 (input 0x0) for speakers */ -+ 0x01470740, /* enable speakers output */ -+ 0x00b37517, /* unmute beep (mixer's input 0x5), set amp 0dB */ -+ 0x00c37100, /* unmute mixer in lout1 (lout1 input 0x1) */ -+ 0x00c3b015, /* set lout1 output volume -15dB */ -+ 0x0143b000, /* unmute speakers */ -+}; -+AZALIA_ARRAY_SIZES; -diff --git a/src/mainboard/lenovo/r500/mainboard.c b/src/mainboard/lenovo/r500/mainboard.c -new file mode 100644 -index 0000000..d91e225 ---- /dev/null -+++ b/src/mainboard/lenovo/r500/mainboard.c -@@ -0,0 +1,49 @@ -+/* -+ * This file is part of the coreboot project. -+ * -+ * Copyright (C) 2012 secunet Security Networks AG -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; version 2 of the License. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc. -+ */ -+ -+#include <stdint.h> -+#include <stdlib.h> -+#include <arch/io.h> -+#include <device/device.h> -+#include <console/console.h> -+#include <drivers/intel/gma/int15.h> -+#include <pc80/keyboard.h> -+#include <ec/acpi/ec.h> -+#include <smbios.h> -+#include <string.h> -+#include <ec/lenovo/pmh7/pmh7.h> -+#include <ec/acpi/ec.h> -+#include <ec/lenovo/h8/h8.h> -+#include "drivers/lenovo/lenovo.h" -+ -+static void fill_ssdt(device_t device) -+{ -+ drivers_lenovo_serial_ports_ssdt_generate("\\_SB.PCI0.LPCB", 0); -+} -+ -+static void mainboard_enable(device_t dev) -+{ -+ install_intel_vga_int15_handler(GMA_INT15_ACTIVE_LFP_INT_LVDS, GMA_INT15_PANEL_FIT_CENTERING, GMA_INT15_BOOT_DISPLAY_DEFAULT, 2); -+ -+ dev->ops->acpi_fill_ssdt_generator = fill_ssdt; -+} -+ -+struct chip_operations mainboard_ops = { -+ .enable_dev = mainboard_enable, -+}; -diff --git a/src/mainboard/lenovo/r500/mptable.c b/src/mainboard/lenovo/r500/mptable.c -new file mode 100644 -index 0000000..f1839f0 ---- /dev/null -+++ b/src/mainboard/lenovo/r500/mptable.c -@@ -0,0 +1 @@ -+/* dummy file */ -diff --git a/src/mainboard/lenovo/r500/romstage.c b/src/mainboard/lenovo/r500/romstage.c -new file mode 100644 -index 0000000..455dd35 ---- /dev/null -+++ b/src/mainboard/lenovo/r500/romstage.c -@@ -0,0 +1,203 @@ -+/* -+ * This file is part of the coreboot project. -+ * -+ * Copyright (C) 2012 secunet Security Networks AG -+ * -+ * This program is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU General Public License as -+ * published by the Free Software Foundation; version 2 of -+ * the License. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc. -+ */ -+ -+// __PRE_RAM__ means: use "unsigned" for device, not a struct. -+ -+#include <stdint.h> -+#include <string.h> -+#include <arch/io.h> -+#include <cpu/x86/lapic.h> -+#include <cpu/x86/msr.h> -+#include <cpu/x86/tsc.h> -+#include <cbmem.h> -+#include <lib.h> -+#include <pc80/mc146818rtc.h> -+#include <console/console.h> -+#include <southbridge/intel/i82801ix/i82801ix.h> -+#include <northbridge/intel/gm45/gm45.h> -+#include <cpu/intel/romstage.h> -+ -+#define LPC_DEV PCI_DEV(0, 0x1f, 0) -+#define MCH_DEV PCI_DEV(0, 0, 0) -+ -+static void default_southbridge_gpio_setup(void) -+{ -+ outl(0x197e23fe, DEFAULT_GPIOBASE + GP_IO_USE_SEL); -+ outl(0xe1a66dfe, DEFAULT_GPIOBASE + GP_IO_SEL); -+ outl(0xe3faef3f, DEFAULT_GPIOBASE + GP_LVL); -+ -+ /* Disable blink [31:0]. */ -+ outl(0x00000000, DEFAULT_GPIOBASE + GPO_BLINK); -+ /* Set input inversion [31:0]. */ -+ outl(0x00000102, DEFAULT_GPIOBASE + GPI_INV); -+ -+ /* Enable GPIOs [60:32]. */ -+ outl(0x030306f6, DEFAULT_GPIOBASE + GP_IO_USE_SEL2); -+ /* Set input/output mode [60:32] (0 == out, 1 == in). */ -+ outl(0x1f55f9f1, DEFAULT_GPIOBASE + GP_IO_SEL2); -+ /* Set gpio levels [60:32]. */ -+ outl(0x1dffff53, DEFAULT_GPIOBASE + GP_LVL2); -+} -+ -+static void early_lpc_setup(void) -+{ -+ /* Set up SuperIO LPC forwards */ -+ -+ /* Configure serial IRQs.*/ -+ pci_write_config8(LPC_DEV, D31F0_SERIRQ_CNTL, 0xd0); -+ /* Map COMa on 0x3f8, COMb on 0x2f8. */ -+ pci_write_config16(LPC_DEV, D31F0_LPC_IODEC, 0x0010); -+ pci_write_config16(LPC_DEV, D31F0_LPC_EN, 0x3f0f); -+ pci_write_config32(LPC_DEV, D31F0_GEN1_DEC, 0x7c1601); -+ pci_write_config32(LPC_DEV, D31F0_GEN2_DEC, 0xc15e1); -+ pci_write_config32(LPC_DEV, D31F0_GEN3_DEC, 0x1c1681); -+} -+ -+void main(unsigned long bist) -+{ -+ sysinfo_t sysinfo; -+ int s3resume = 0; -+ int cbmem_initted; -+ u16 reg16; -+ -+ /* basic northbridge setup, including MMCONF BAR */ -+ gm45_early_init(); -+ -+ if (bist == 0) -+ enable_lapic(); -+ -+ /* First, run everything needed for console output. */ -+ i82801ix_early_init(); -+ early_lpc_setup(); -+ console_init(); -+ printk(BIOS_DEBUG, "running main(bist = %lu)\n", bist); -+ -+ reg16 = pci_read_config16(LPC_DEV, D31F0_GEN_PMCON_3); -+ pci_write_config16(LPC_DEV, D31F0_GEN_PMCON_3, reg16); -+ if ((MCHBAR16(SSKPD_MCHBAR) == 0xCAFE) && !(reg16 & (1 << 9))) { -+ printk(BIOS_DEBUG, "soft reset detected, rebooting properly\n"); -+ gm45_early_reset(); -+ } -+ -+ default_southbridge_gpio_setup(); -+ -+ /* ASPM related setting, set early by original BIOS. */ -+ DMIBAR16(0x204) &= ~(3 << 10); -+ -+ /* Check for S3 resume. */ -+ const u32 pm1_cnt = inl(DEFAULT_PMBASE + 0x04); -+ if (((pm1_cnt >> 10) & 7) == 5) { -+#if CONFIG_HAVE_ACPI_RESUME -+ printk(BIOS_DEBUG, "Resume from S3 detected.\n"); -+ s3resume = 1; -+ /* Clear SLP_TYPE. This will break stage2 but -+ * we care for that when we get there. -+ */ -+ outl(pm1_cnt & ~(7 << 10), DEFAULT_PMBASE + 0x04); -+#else -+ printk(BIOS_DEBUG, "Resume from S3 detected, but disabled.\n"); -+#endif -+ } -+ -+ /* RAM initialization */ -+ enter_raminit_or_reset(); -+ memset(&sysinfo, 0, sizeof(sysinfo)); -+ sysinfo.spd_map[0] = 0x50; -+ sysinfo.spd_map[2] = 0x51; -+ sysinfo.enable_igd = 1; -+ sysinfo.enable_peg = 0; -+ get_gmch_info(&sysinfo); -+ raminit(&sysinfo, s3resume); -+ -+ const u32 deven = pci_read_config32(MCH_DEV, D0F0_DEVEN); -+ /* Disable D4F0 (unknown signal controller). */ -+ pci_write_config32(MCH_DEV, D0F0_DEVEN, deven & ~0x4000); -+ -+ init_pm(&sysinfo, 0); -+ -+ i82801ix_dmi_setup(); -+ gm45_late_init(sysinfo.stepping); -+ i82801ix_dmi_poll_vc1(); -+ -+ MCHBAR16(SSKPD_MCHBAR) = 0xCAFE; -+ /* Enable ethernet. */ -+ RCBA32(0x3414) &= ~0x20; -+ -+ RCBA32(0x0238) = 0x00543210; -+ RCBA32(0x0240) = 0x009c0b02; -+ RCBA32(0x0244) = 0x00a20b1a; -+ RCBA32(0x0248) = 0x005402cb; -+ RCBA32(0x0254) = 0x00470966; -+ RCBA32(0x0258) = 0x00470473; -+ RCBA32(0x0260) = 0x00e90825; -+ RCBA32(0x0278) = 0x00bc0efb; -+ RCBA32(0x027c) = 0x00c00f0b; -+ RCBA32(0x0280) = 0x00670000; -+ RCBA32(0x0284) = 0x006d0000; -+ RCBA32(0x0288) = 0x00600b4e; -+ RCBA32(0x1e10) = 0x00020800; -+ RCBA32(0x1e18) = 0x36ea00a0; -+ RCBA32(0x1e80) = 0x000c0801; -+ RCBA32(0x1e84) = 0x000200f0; -+ RCBA32(0x2028) = 0x04c8f95e; -+ RCBA32(0x202c) = 0x055c095e; -+ RCBA32(0x204c) = 0x001ffc00; -+ RCBA32(0x2050) = 0x00100fff; -+ RCBA32(0x2090) = 0x37000000; -+ RCBA32(0x20b0) = 0x0c000000; -+ RCBA32(0x20d0) = 0x09000000; -+ RCBA32(0x20f0) = 0x05000000; -+ RCBA32(0x3400) = 0x0000001c; -+ RCBA32(0x3410) = 0x00100461; -+ RCBA32(0x3414) = 0x00000000; -+ RCBA32(0x341c) = 0xbf4f001f; -+ RCBA32(0x3420) = 0x00000000; -+ RCBA32(0x3430) = 0x00000001; -+ -+ init_iommu(); -+ -+ /* FIXME: make a proper SMBUS mux support. */ -+ outl(inl(DEFAULT_GPIOBASE + 0x38) & ~0x400, DEFAULT_GPIOBASE + 0x38); -+ -+ cbmem_initted = !cbmem_recovery(s3resume); -+#if CONFIG_HAVE_ACPI_RESUME -+ /* If there is no high memory area, we didn't boot before, so -+ * this is not a resume. In that case we just create the cbmem toc. -+ */ -+ if (s3resume && cbmem_initted) { -+ void *resume_backup_memory = cbmem_find(CBMEM_ID_RESUME); -+ -+ /* copy 1MB - 64K to high tables ram_base to prevent memory corruption -+ * through stage 2. We could keep stuff like stack and heap in high tables -+ * memory completely, but that's a wonderful clean up task for another -+ * day. -+ */ -+ if (resume_backup_memory) -+ memcpy(resume_backup_memory, (void *)CONFIG_RAMBASE, HIGH_MEMORY_SAVE); -+ -+ /* Magic for S3 resume */ -+ pci_write_config32(PCI_DEV(0, 0, 0), D0F0_SKPD, SKPAD_ACPI_S3_MAGIC); -+ } else { -+ /* Magic for S3 resume */ -+ pci_write_config32(PCI_DEV(0, 0, 0), D0F0_SKPD, SKPAD_NORMAL_BOOT_MAGIC); -+ } -+#endif -+ printk(BIOS_SPEW, "exit main()\n"); -+} -diff --git a/src/mainboard/lenovo/r500/smihandler.c b/src/mainboard/lenovo/r500/smihandler.c -new file mode 100644 -index 0000000..622b31a ---- /dev/null -+++ b/src/mainboard/lenovo/r500/smihandler.c -@@ -0,0 +1,49 @@ -+/* -+ * This file is part of the coreboot project. -+ * -+ * Copyright (C) 2008-2009 coresystems GmbH -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; version 2 of the License. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc. -+ */ -+ -+#include <arch/io.h> -+#include <console/console.h> -+#include <cpu/x86/smm.h> -+#include <southbridge/intel/i82801ix/nvs.h> -+#include <southbridge/intel/i82801ix/i82801ix.h> -+#include <ec/acpi/ec.h> -+ -+void mainboard_smi_gpi(u32 gpi_sts) -+{ -+ if (gpi_sts & (1 << 1)) { -+ printk(BIOS_DEBUG, "EC/SMI\n"); -+ /* TODO */ -+ } -+} -+ -+int mainboard_smi_apmc(u8 apmc) -+{ -+ switch (apmc) { -+ case APM_CNT_ACPI_ENABLE: -+ send_ec_command(0x05); /* Set_SMI_Disable */ -+ send_ec_command(0xaa); /* Set_ACPI_Enable */ -+ break; -+ -+ case APM_CNT_ACPI_DISABLE: -+ send_ec_command(0x04); /* Set_SMI_Enable */ -+ send_ec_command(0xab); /* Set_ACPI_Disable */ -+ break; -+ } -+ return 0; -+} --- -1.9.1 - diff --git a/resources/libreboot/patch/unused/r500/0002-mainboards-lenovo-r500-Remove-X200-specific-code.patch b/resources/libreboot/patch/unused/r500/0002-mainboards-lenovo-r500-Remove-X200-specific-code.patch deleted file mode 100644 index f0ab7343..00000000 --- a/resources/libreboot/patch/unused/r500/0002-mainboards-lenovo-r500-Remove-X200-specific-code.patch +++ /dev/null @@ -1,107 +0,0 @@ -From 8674a3090ef843905c779b92e55a3951bbb5add8 Mon Sep 17 00:00:00 2001 -From: Francis Rowe <info@gluglug.org.uk> -Date: Wed, 5 Aug 2015 00:59:29 +0100 -Subject: [PATCH 2/7] mainboards/lenovo/r500: Remove X200-specific code - -Change-Id: Ib5a7217f95b75c38e318972bb742547a534c064b -Signed-off-by: Francis Rowe <info@gluglug.org.uk> ---- - src/mainboard/lenovo/r500/Kconfig | 9 ++++----- - src/mainboard/lenovo/r500/Kconfig.name | 4 ++-- - src/mainboard/lenovo/r500/devicetree.cb | 7 +------ - src/mainboard/lenovo/r500/dock.h | 4 ++-- - src/mainboard/lenovo/r500/mainboard.c | 2 +- - 5 files changed, 10 insertions(+), 16 deletions(-) - -diff --git a/src/mainboard/lenovo/r500/Kconfig b/src/mainboard/lenovo/r500/Kconfig -index 7bae12d..d08e5f5 100644 ---- a/src/mainboard/lenovo/r500/Kconfig -+++ b/src/mainboard/lenovo/r500/Kconfig -@@ -1,4 +1,4 @@ --if BOARD_LENOVO_X200 -+if BOARD_LENOVO_R500 - - config BOARD_SPECIFIC_OPTIONS # dummy - def_bool y -@@ -22,15 +22,14 @@ config BOARD_SPECIFIC_OPTIONS # dummy - select MAINBOARD_HAS_NATIVE_VGA_INIT_TEXTMODECFG - select INTEL_INT15 - select SUPERIO_NSC_PC87382 -- select DRIVERS_LENOVO_WACOM - - config MAINBOARD_DIR - string -- default lenovo/x200 -+ default lenovo/r500 - - config MAINBOARD_PART_NUMBER - string -- default "ThinkPad X200" -+ default "ThinkPad R500" - - config MMCONF_BASE_ADDRESS - hex -@@ -48,4 +47,4 @@ config CBFS_SIZE - hex - default 0x200000 - --endif # BOARD_LENOVO_X200 -+endif # BOARD_LENOVO_R500 -diff --git a/src/mainboard/lenovo/r500/Kconfig.name b/src/mainboard/lenovo/r500/Kconfig.name -index 8e1dd43..558b9b0 100644 ---- a/src/mainboard/lenovo/r500/Kconfig.name -+++ b/src/mainboard/lenovo/r500/Kconfig.name -@@ -1,2 +1,2 @@ --config BOARD_LENOVO_X200 -- bool "ThinkPad X200 / X200t" -+config BOARD_LENOVO_R500 -+ bool "ThinkPad R500" -diff --git a/src/mainboard/lenovo/r500/devicetree.cb b/src/mainboard/lenovo/r500/devicetree.cb -index cb4a021..c3fffe8 100644 ---- a/src/mainboard/lenovo/r500/devicetree.cb -+++ b/src/mainboard/lenovo/r500/devicetree.cb -@@ -181,12 +181,7 @@ chip northbridge/intel/gm45 - end - - chip superio/nsc/pc87382 -- device pnp 164e.3 on # Digitizer -- io 0x60 = 0x200 -- irq 0x29 = 0xb0 -- irq 0x70 = 0x5 -- irq 0xf0 = 0x82 -- end -+ device pnp 164e.3 off end - # IR, not connected - device pnp 164e.2 off end - # GPIO, not connected -diff --git a/src/mainboard/lenovo/r500/dock.h b/src/mainboard/lenovo/r500/dock.h -index a5029e1..a9a90da 100644 ---- a/src/mainboard/lenovo/r500/dock.h -+++ b/src/mainboard/lenovo/r500/dock.h -@@ -17,8 +17,8 @@ - * Foundation, Inc. - */ - --#ifndef THINKPAD_X200_DOCK_H --#define THINKPAD_X200_DOCK_H -+#ifndef THINKPAD_R500_DOCK_H -+#define THINKPAD_R500_DOCK_H - - extern void dock_connect(void); - extern void dock_disconnect(void); -diff --git a/src/mainboard/lenovo/r500/mainboard.c b/src/mainboard/lenovo/r500/mainboard.c -index d91e225..1bfbf48 100644 ---- a/src/mainboard/lenovo/r500/mainboard.c -+++ b/src/mainboard/lenovo/r500/mainboard.c -@@ -34,7 +34,7 @@ - - static void fill_ssdt(device_t device) - { -- drivers_lenovo_serial_ports_ssdt_generate("\\_SB.PCI0.LPCB", 0); -+ /* Nothing to see here. Move along. */ - } - - static void mainboard_enable(device_t dev) --- -1.9.1 - diff --git a/resources/libreboot/patch/unused/r500/0003-mainboard-lenovo-r500-Fix-HDA-verbs-to-match-hardwar.patch b/resources/libreboot/patch/unused/r500/0003-mainboard-lenovo-r500-Fix-HDA-verbs-to-match-hardwar.patch deleted file mode 100644 index 5caaa124..00000000 --- a/resources/libreboot/patch/unused/r500/0003-mainboard-lenovo-r500-Fix-HDA-verbs-to-match-hardwar.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 9d8e96dd8421f19dc38cf0ca4d92b35e63e5e88e Mon Sep 17 00:00:00 2001 -From: Francis Rowe <info@gluglug.org.uk> -Date: Wed, 5 Aug 2015 01:42:44 +0100 -Subject: [PATCH 3/7] mainboard/lenovo/r500: Fix HDA verbs to match hardware - layout - -Change-Id: I2b69399b9677845b55d4c68d4ac6f276a11a1cf6 -Signed-off-by: Francis Rowe <info@gluglug.org.uk> ---- - src/mainboard/lenovo/r500/hda_verb.c | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/src/mainboard/lenovo/r500/hda_verb.c b/src/mainboard/lenovo/r500/hda_verb.c -index beb637f..088185e 100644 ---- a/src/mainboard/lenovo/r500/hda_verb.c -+++ b/src/mainboard/lenovo/r500/hda_verb.c -@@ -23,19 +23,19 @@ - const u32 cim_verb_data[] = { - /* coreboot specific header */ - 0x14f15051, // Conexant CX20561 (Hermosa) -- 0x17aa20ff, // Subsystem ID -+ 0x17aa20fd, // Subsystem ID - 0x00000008, // Number of entries - - /* Pin Widget Verb Table */ - -- AZALIA_PIN_CFG(0, 0x16, 0x042140f0), -+ AZALIA_PIN_CFG(0, 0x16, 0x022140f0), - AZALIA_PIN_CFG(0, 0x17, 0x61a190f0), -- AZALIA_PIN_CFG(0, 0x18, 0x04a190f0), -- AZALIA_PIN_CFG(0, 0x19, 0x612140f0), -+ AZALIA_PIN_CFG(0, 0x18, 0x02a190f0), -+ AZALIA_PIN_CFG(0, 0x19, 0x40f000f0), - AZALIA_PIN_CFG(0, 0x1a, 0x901701f0), - AZALIA_PIN_CFG(0, 0x1b, 0x40f001f0), - AZALIA_PIN_CFG(0, 0x1c, 0x40f001f0), -- AZALIA_PIN_CFG(0, 0x1d, 0x90a601f0) -+ AZALIA_PIN_CFG(0, 0x1d, 0x90a701f0) - }; - - const u32 pc_beep_verbs[] = { --- -1.9.1 - diff --git a/resources/libreboot/patch/unused/r500/0004-mainboard-lenovo-r500-use-4MiB-ROM-size-by-default.patch b/resources/libreboot/patch/unused/r500/0004-mainboard-lenovo-r500-use-4MiB-ROM-size-by-default.patch deleted file mode 100644 index badc7f5b..00000000 --- a/resources/libreboot/patch/unused/r500/0004-mainboard-lenovo-r500-use-4MiB-ROM-size-by-default.patch +++ /dev/null @@ -1,30 +0,0 @@ -From ac39ee38d292b713b040cd51cc590470ae9c39ca Mon Sep 17 00:00:00 2001 -From: Francis Rowe <info@gluglug.org.uk> -Date: Wed, 5 Aug 2015 02:25:47 +0100 -Subject: [PATCH 4/7] mainboard/lenovo/r500: use 4MiB ROM size by default - -These systems come with 4MiB chips (SOIC-8), by default, so it -makes more sense to use this size. - -Change-Id: I9d8a7dd7b619d7d3af2f725f914d0ee79fcc6d50 -Signed-off-by: Francis Rowe <info@gluglug.org.uk> ---- - src/mainboard/lenovo/r500/Kconfig | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/mainboard/lenovo/r500/Kconfig b/src/mainboard/lenovo/r500/Kconfig -index d08e5f5..67915f9 100644 ---- a/src/mainboard/lenovo/r500/Kconfig -+++ b/src/mainboard/lenovo/r500/Kconfig -@@ -10,7 +10,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy - select EC_LENOVO_H8 - select NO_UART_ON_SUPERIO - select DRIVERS_ICS_954309 -- select BOARD_ROMSIZE_KB_8192 -+ select BOARD_ROMSIZE_KB_4096 - select DRIVERS_GENERIC_IOAPIC - select HAVE_MP_TABLE - select HAVE_ACPI_TABLES --- -1.9.1 - diff --git a/resources/libreboot/patch/unused/r500/0005-mainboard-lenovo-r500-Say-SOIC-8-in-board_info.txt-n.patch b/resources/libreboot/patch/unused/r500/0005-mainboard-lenovo-r500-Say-SOIC-8-in-board_info.txt-n.patch deleted file mode 100644 index 8074f29c..00000000 --- a/resources/libreboot/patch/unused/r500/0005-mainboard-lenovo-r500-Say-SOIC-8-in-board_info.txt-n.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 3655dbe9bf476336e783b54be9d1d9388da8277e Mon Sep 17 00:00:00 2001 -From: Francis Rowe <info@gluglug.org.uk> -Date: Wed, 5 Aug 2015 02:27:11 +0100 -Subject: [PATCH 5/7] mainboard/lenovo/r500: Say SOIC-8 in board_info.txt (not - SOIC-16) - -These systems all use SOIC-8 flash chips, not SOIC-16 - -Change-Id: Ic1c53a22acbce6154f5ebfcc4746aaf6c124b492 -Signed-off-by: Francis Rowe <info@gluglug.org.uk> ---- - src/mainboard/lenovo/r500/board_info.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/mainboard/lenovo/r500/board_info.txt b/src/mainboard/lenovo/r500/board_info.txt -index a78a21b..91a6188 100644 ---- a/src/mainboard/lenovo/r500/board_info.txt -+++ b/src/mainboard/lenovo/r500/board_info.txt -@@ -1,5 +1,5 @@ - Category: laptop --ROM package: SOIC-16 -+ROM package: SOIC-8 - ROM protocol: SPI - ROM socketed: n - Flashrom support: n --- -1.9.1 - diff --git a/resources/libreboot/patch/unused/r500/0006-mainboard-lenovo-r500-use-correct-GPIO-values.patch b/resources/libreboot/patch/unused/r500/0006-mainboard-lenovo-r500-use-correct-GPIO-values.patch deleted file mode 100644 index f856509c..00000000 --- a/resources/libreboot/patch/unused/r500/0006-mainboard-lenovo-r500-use-correct-GPIO-values.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 0197ee58d0ead0ffdaea74022c17c60d2d14ac27 Mon Sep 17 00:00:00 2001 -From: Francis Rowe <info@gluglug.org.uk> -Date: Wed, 5 Aug 2015 19:53:59 +0100 -Subject: [PATCH 6/7] mainboard/lenovo/r500: use correct GPIO values - -Change-Id: I2f1e8515cf27769cd90d59b8edc6d6caff855eaa -Signed-off-by: Francis Rowe <info@gluglug.org.uk> ---- - src/mainboard/lenovo/r500/romstage.c | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/src/mainboard/lenovo/r500/romstage.c b/src/mainboard/lenovo/r500/romstage.c -index 455dd35..c29d661 100644 ---- a/src/mainboard/lenovo/r500/romstage.c -+++ b/src/mainboard/lenovo/r500/romstage.c -@@ -39,9 +39,9 @@ - - static void default_southbridge_gpio_setup(void) - { -- outl(0x197e23fe, DEFAULT_GPIOBASE + GP_IO_USE_SEL); -- outl(0xe1a66dfe, DEFAULT_GPIOBASE + GP_IO_SEL); -- outl(0xe3faef3f, DEFAULT_GPIOBASE + GP_LVL); -+ outl(0x197e33fe, DEFAULT_GPIOBASE + GP_IO_USE_SEL); -+ outl(0xe0ea6dfe, DEFAULT_GPIOBASE + GP_IO_SEL); -+ outl(0xe3feef3b, DEFAULT_GPIOBASE + GP_LVL); - - /* Disable blink [31:0]. */ - outl(0x00000000, DEFAULT_GPIOBASE + GPO_BLINK); -@@ -53,7 +53,7 @@ static void default_southbridge_gpio_setup(void) - /* Set input/output mode [60:32] (0 == out, 1 == in). */ - outl(0x1f55f9f1, DEFAULT_GPIOBASE + GP_IO_SEL2); - /* Set gpio levels [60:32]. */ -- outl(0x1dffff53, DEFAULT_GPIOBASE + GP_LVL2); -+ outl(0x1dfefb53, DEFAULT_GPIOBASE + GP_LVL2); - } - - static void early_lpc_setup(void) --- -1.9.1 - diff --git a/resources/libreboot/patch/unused/r500/0007-mainboard-lenovo-r500-romstage.c-use-correct-RCBA-va.patch b/resources/libreboot/patch/unused/r500/0007-mainboard-lenovo-r500-romstage.c-use-correct-RCBA-va.patch deleted file mode 100644 index be6575c0..00000000 --- a/resources/libreboot/patch/unused/r500/0007-mainboard-lenovo-r500-romstage.c-use-correct-RCBA-va.patch +++ /dev/null @@ -1,71 +0,0 @@ -From 5d8a06db8ac4a3abaff79f75fd41987db6c4c675 Mon Sep 17 00:00:00 2001 -From: Francis Rowe <info@gluglug.org.uk> -Date: Wed, 5 Aug 2015 20:21:47 +0100 -Subject: [PATCH 7/7] mainboard/lenovo/r500 romstage.c: use correct RCBA values - -Change-Id: I928fd59426f4716d00add1b0c73ade1952aaaeac -Signed-off-by: Francis Rowe <info@gluglug.org.uk> ---- - src/mainboard/lenovo/r500/romstage.c | 42 ++++++++++++++++++------------------ - 1 file changed, 21 insertions(+), 21 deletions(-) - -diff --git a/src/mainboard/lenovo/r500/romstage.c b/src/mainboard/lenovo/r500/romstage.c -index c29d661..937dfbc 100644 ---- a/src/mainboard/lenovo/r500/romstage.c -+++ b/src/mainboard/lenovo/r500/romstage.c -@@ -141,31 +141,31 @@ void main(unsigned long bist) - RCBA32(0x3414) &= ~0x20; - - RCBA32(0x0238) = 0x00543210; -- RCBA32(0x0240) = 0x009c0b02; -- RCBA32(0x0244) = 0x00a20b1a; -- RCBA32(0x0248) = 0x005402cb; -- RCBA32(0x0254) = 0x00470966; -- RCBA32(0x0258) = 0x00470473; -- RCBA32(0x0260) = 0x00e90825; -- RCBA32(0x0278) = 0x00bc0efb; -- RCBA32(0x027c) = 0x00c00f0b; -- RCBA32(0x0280) = 0x00670000; -- RCBA32(0x0284) = 0x006d0000; -- RCBA32(0x0288) = 0x00600b4e; -+ RCBA32(0x0240) = 0x00380d2b; -+ RCBA32(0x0244) = 0x003e0d43; -+ RCBA32(0x0248) = 0x002c0839; -+ RCBA32(0x0254) = 0x00330c70; -+ RCBA32(0x0258) = 0x00330f19; -+ RCBA32(0x0260) = 0x00d105bb; -+ RCBA32(0x0278) = 0x00bc084a; -+ RCBA32(0x027c) = 0x00c0085a; -+ RCBA32(0x0280) = 0x007e0000; -+ RCBA32(0x0284) = 0x00840000; -+ RCBA32(0x0288) = 0x00f30d7c; - RCBA32(0x1e10) = 0x00020800; -- RCBA32(0x1e18) = 0x36ea00a0; -+ RCBA32(0x1e18) = 0x01fb0063; - RCBA32(0x1e80) = 0x000c0801; - RCBA32(0x1e84) = 0x000200f0; -- RCBA32(0x2028) = 0x04c8f95e; -- RCBA32(0x202c) = 0x055c095e; -- RCBA32(0x204c) = 0x001ffc00; -- RCBA32(0x2050) = 0x00100fff; -- RCBA32(0x2090) = 0x37000000; -- RCBA32(0x20b0) = 0x0c000000; -- RCBA32(0x20d0) = 0x09000000; -- RCBA32(0x20f0) = 0x05000000; -+ RCBA32(0x2028) = 0x04c8ffbb; -+ RCBA32(0x202c) = 0x09a10fbb; -+ RCBA32(0x204c) = 0x00890000; -+ RCBA32(0x2050) = 0x008f0000; -+ RCBA32(0x2090) = 0x08000000; -+ RCBA32(0x20b0) = 0x3f000000; -+ RCBA32(0x20d0) = 0x01000000; -+ RCBA32(0x20f0) = 0x03000000; - RCBA32(0x3400) = 0x0000001c; -- RCBA32(0x3410) = 0x00100461; -+ RCBA32(0x3410) = 0x00250461; - RCBA32(0x3414) = 0x00000000; - RCBA32(0x341c) = 0xbf4f001f; - RCBA32(0x3420) = 0x00000000; --- -1.9.1 - diff --git a/resources/libreboot/patch/unused/r500/README b/resources/libreboot/patch/unused/r500/README deleted file mode 100644 index 6054a161..00000000 --- a/resources/libreboot/patch/unused/r500/README +++ /dev/null @@ -1,7 +0,0 @@ -applies on top of coreboot commit fb82ebe9065e2160e662aee490d749ac31388fa6 - -These are the R500 patches, but not all of them (not all are yet written). -Remaining issues on R500 are documented in libreboot. The port will be completed later. -These patches aren't actually used yet in libreboot, and will be rebased. - - diff --git a/resources/scripts/helpers/build/roms/withgrub b/resources/scripts/helpers/build/roms/withgrub index 3ef295a9..f3d29462 100755 --- a/resources/scripts/helpers/build/roms/withgrub +++ b/resources/scripts/helpers/build/roms/withgrub @@ -91,27 +91,11 @@ do fi done -# TEMPORARY HACK: copy t400* to r500* -# (until proper R500 support is added) -if [ -d "bin/grub/" ]; then - cd "bin/grub/" - for board in "t400" - do - for romsize in "4m" "8m" - do - if [ -d "${board}_${romsize}b/" ]; then - cp -R "${board}_${romsize}b/" "r500_${romsize}b/" - fi - done - done - cd ../../ -fi - # Build the deblobbed descriptor+gbe regions for GM45/ICH9M targets. # Then put them in the ROM images. if [ -d "bin/grub/" ]; then cd "bin/grub/" - for board in "x200" "r400" "r500" "t400" "t500" + for board in "x200" "r400" "t400" "t500" do for romsize in "4m" "8m" do @@ -124,11 +108,7 @@ if [ -d "bin/grub/" ]; then fi for rom in *.rom do - if [ "${board}" = "r500" ]; then - dd if="ich9fdnogbe_${romsize}.bin" of="${rom}" bs=1 count=4k conv=notrunc - else - dd if="ich9fdgbe_${romsize}.bin" of="${rom}" bs=1 count=12k conv=notrunc - fi + dd if="ich9fdgbe_${romsize}.bin" of="${rom}" bs=1 count=12k conv=notrunc done rm -f "ich9fd"*.bin "mk"*.[ch] cd "../" diff --git a/resources/scripts/helpers/build/roms/withgrub_helper b/resources/scripts/helpers/build/roms/withgrub_helper index 16e861e1..efed9bde 100755 --- a/resources/scripts/helpers/build/roms/withgrub_helper +++ b/resources/scripts/helpers/build/roms/withgrub_helper @@ -88,7 +88,7 @@ fi for romtype in txtmode vesafb do - if [ "${boardtarget}" = "x200_8mb" ] || [ "${boardtarget}" = "x200_4mb" ] || [ "${boardtarget}" = "r400_8mb" ] || [ "${boardtarget}" = "r400_4mb" ] || [ "${boardtarget}" = "r500_8mb" ] || [ "${boardtarget}" = "r500_4mb" ] || [ "${boardtarget}" = "t400_8mb" ] || [ "${boardtarget}" = "t400_4mb" ] || [ "${boardtarget}" = "t500_8mb" ] || [ "${boardtarget}" = "t500_4mb" ] + if [ "${boardtarget}" = "x200_8mb" ] || [ "${boardtarget}" = "x200_4mb" ] || [ "${boardtarget}" = "r400_8mb" ] || [ "${boardtarget}" = "r400_4mb" ] || [ "${boardtarget}" = "t400_8mb" ] || [ "${boardtarget}" = "t400_4mb" ] || [ "${boardtarget}" = "t500_8mb" ] || [ "${boardtarget}" = "t500_4mb" ] then if [ "${romtype}" = "txtmode" ] then @@ -118,7 +118,7 @@ do # Add the background image if [ "$romtype" = "vesafb" ] then - if [ "$1" = "macbook21" ] || [ "$1" = "x200_4mb" ] || [ "$1" = "x200_8mb" ] || [ "$1" = "r400_4mb" ] || [ "$1" = "r400_8mb" ] || [ "$1" = "r500_4mb" ] || [ "$1" = "r500_8mb" ] || [ "$1" = "t400_4mb" ] || [ "$1" = "t400_8mb" ] || [ "$1" = "t500_4mb" ] || [ "$1" = "t500_8mb" ] + if [ "$1" = "macbook21" ] || [ "$1" = "x200_4mb" ] || [ "$1" = "x200_8mb" ] || [ "$1" = "r400_4mb" ] || [ "$1" = "r400_8mb" ] || [ "$1" = "t400_4mb" ] || [ "$1" = "t400_8mb" ] || [ "$1" = "t500_4mb" ] || [ "$1" = "t500_8mb" ] then ./util/cbfstool/cbfstool "${boardtarget}_${romtype}.rom" add -f ../../../resources/grub/background/background1280x800.png -n background.png -t raw else |