coreboot March 2011

coreboot@coreboot.org

71 participants
210 discussions

[commit] r6445 - trunk/src/mainboard/lenovo/x60
by repository service 14 Mar '11

14 Mar '11

Author: svens Date: Mon Mar 14 15:26:41 2011 New Revision: 6445 URL: https://tracker.coreboot.org/trac/coreboot/changeset/6445 Log: X60: fix typo in dsdt.asl Signed-off-by: Sven Schnelle <svens(a)stackframe.org> Acked-by: Sven Schnelle <svens(a)stackframe.org> Modified: trunk/src/mainboard/lenovo/x60/dsdt.asl Modified: trunk/src/mainboard/lenovo/x60/dsdt.asl ============================================================================== --- trunk/src/mainboard/lenovo/x60/dsdt.asl Mon Mar 14 14:42:08 2011 (r6444) +++ trunk/src/mainboard/lenovo/x60/dsdt.asl Mon Mar 14 15:26:41 2011 (r6445) @@ -43,7 +43,7 @@ // Thermal Zone #include "acpi/thermal.asl" // System status indicators - #include "acpi/systemstatus.asl + #include "acpi/systemstatus.asl" Scope (\_SB) { Device (PCI0) {

1 0

build service results for r6444
by repository service 14 Mar '11

14 Mar '11

Dear coreboot readers! This is the automatic build system of coreboot. The developer "svens" checked in revision 6444 to the coreboot repository. This caused the following changes: Change Log: X60: Add _PRW/_PSW methods to LID/SLPB objects This patch adds the required methods for enabling/disabling the LID and SLPB objects as wake source. On Thinkpads, the Fn key can (and is by the Vendor BIOS) programmed as Wake source, so let's do it the same way. Signed-off-by: Sven Schnelle <svens(a)stackframe.org> Acked-by: Peter Stuge <peter(a)stuge.se> Build Log: Compilation of lenovo:x60 has been broken See the error log at http://qa.coreboot.org/log_buildbrd.php?revision=6444&device=x60&vendor=len… If something broke during this checkin please be a pain in svens's neck until the issue is fixed. If this issue is not fixed within 24h the revision should be backed out. Best regards, coreboot automatic build system

1 0

[commit] r6444 - in trunk/src/mainboard/lenovo/x60: . acpi
by repository service 14 Mar '11

14 Mar '11

Author: svens Date: Mon Mar 14 14:42:08 2011 New Revision: 6444 URL: https://tracker.coreboot.org/trac/coreboot/changeset/6444 Log: X60: Add _PRW/_PSW methods to LID/SLPB objects This patch adds the required methods for enabling/disabling the LID and SLPB objects as wake source. On Thinkpads, the Fn key can (and is by the Vendor BIOS) programmed as Wake source, so let's do it the same way. Signed-off-by: Sven Schnelle <svens(a)stackframe.org> Acked-by: Peter Stuge <peter(a)stuge.se> Added: trunk/src/mainboard/lenovo/x60/acpi/systemstatus.asl Modified: trunk/src/mainboard/lenovo/x60/acpi/lid.asl trunk/src/mainboard/lenovo/x60/acpi/sleepbutton.asl trunk/src/mainboard/lenovo/x60/dsdt.asl Modified: trunk/src/mainboard/lenovo/x60/acpi/lid.asl ============================================================================== --- trunk/src/mainboard/lenovo/x60/acpi/lid.asl Mon Mar 14 10:08:27 2011 (r6443) +++ trunk/src/mainboard/lenovo/x60/acpi/lid.asl Mon Mar 14 14:42:08 2011 (r6444) @@ -21,9 +21,12 @@ Field(ERAM, ByteAcc, NoLock, Preserve) { + Offset (0x32), + , 2, + WKLD, 1, Offset (0x46), - , 2, - LIDS , 1 + , 2, + LIDS, 1 } Device(LID) @@ -34,4 +37,18 @@ { return (LIDS) } + + Method(_PRW, 0, NotSerialized) + { + Return (Package() { 0x18, 0x03 }) + } + + Method(_PSW, 1, NotSerialized) + { + if (Arg0) { + Store(1, WKLD) + } else { + Store(0, WKLD) + } + } } Modified: trunk/src/mainboard/lenovo/x60/acpi/sleepbutton.asl ============================================================================== --- trunk/src/mainboard/lenovo/x60/acpi/sleepbutton.asl Mon Mar 14 10:08:27 2011 (r6443) +++ trunk/src/mainboard/lenovo/x60/acpi/sleepbutton.asl Mon Mar 14 14:42:08 2011 (r6444) @@ -19,7 +19,31 @@ * MA 02110-1301 USA */ +Field(ERAM, ByteAcc, NoLock, Preserve) +{ + Offset (0x32), + , 4, + WKFN, 1, + Offset(0x83), + FNKY, 8 +} + Device(SLPB) { Name (_HID, EisaId ("PNP0C0E")) + Method(_PRW, 0, NotSerialized) + { + Return (Package() { 0x18, 0x03 }) + } + + Method(_PSW, 1, NotSerialized) + { + if (Arg0) { + Store(6, FNKY) /* Fn key acts as wake button */ + Store(1, WKFN) + } else { + Store(0, FNKY) /* Fn key normal operation */ + Store(0, WKFN) + } + } } Added: trunk/src/mainboard/lenovo/x60/acpi/systemstatus.asl ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/src/mainboard/lenovo/x60/acpi/systemstatus.asl Mon Mar 14 14:42:08 2011 (r6444) @@ -0,0 +1,66 @@ +/* + * This file is part of the coreboot project. + * + * Copyright (c) 2011 Sven Schnelle <svens(a)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., 51 Franklin St, Fifth Floor, Boston, + * MA 02110-1301 USA + */ + + +Scope (\_SI) +{ + Method(_SST, 1, NotSerialized) + { + If (LEqual (Arg0, 0)) { + /* Indicator off */ + + /* power LED off */ + \_SB.PCI0.LPC.EC.LED(0x00) + /* suspend LED off */ + \_SB.PCI0.LPC.EC.LED(0x07) + } + + If (LEqual (Arg0, 1)) { + /* working state */ + + /* power LED on */ + \_SB.PCI0.LPC.EC.LED(0x80) + /* suspend LED off */ + \_SB.PCI0.LPC.EC.LED(0x07) + } + + If (LEqual (Arg0, 2)) { + /* waking state */ + + /* power LED om */ + \_SB.PCI0.LPC.EC.LED(0x80) + /* suspend LED blinking */ + \_SB.PCI0.LPC.EC.LED(0xc7) + } + + If (LEqual (Arg0, 3)) { + /* sleep state */ + + /* power LED off */ + \_SB.PCI0.LPC.EC.LED(0x00) + /* suspend LED on */ + \_SB.PCI0.LPC.EC.LED(0x87) + } + + + + } +} Modified: trunk/src/mainboard/lenovo/x60/dsdt.asl ============================================================================== --- trunk/src/mainboard/lenovo/x60/dsdt.asl Mon Mar 14 10:08:27 2011 (r6443) +++ trunk/src/mainboard/lenovo/x60/dsdt.asl Mon Mar 14 14:42:08 2011 (r6444) @@ -42,7 +42,8 @@ // Thermal Zone #include "acpi/thermal.asl" - + // System status indicators + #include "acpi/systemstatus.asl Scope (\_SB) { Device (PCI0) {

1 0

[PATCH] X60: Add _PRW/_PSW methods to LID/SLPB objects
by Sven Schnelle 14 Mar '11

14 Mar '11

This patch adds the required methods for enabling/disabling the LID and SLPB objects as wake source. On Thinkpads, the Fn key can (and is by the Vendor BIOS) programmed as Wake source, so let's do it the same way. Signed-off-by: Sven Schnelle <svens(a)stackframe.org> --- src/mainboard/lenovo/x60/acpi/lid.asl | 21 +++++++++++++++++++-- src/mainboard/lenovo/x60/acpi/sleepbutton.asl | 24 ++++++++++++++++++++++++ 2 files changed, 43 insertions(+), 2 deletions(-) diff --git a/src/mainboard/lenovo/x60/acpi/lid.asl b/src/mainboard/lenovo/x60/acpi/lid.asl index 2c92ee6..2dfa8d1 100644 --- a/src/mainboard/lenovo/x60/acpi/lid.asl +++ b/src/mainboard/lenovo/x60/acpi/lid.asl @@ -21,9 +21,12 @@ Field(ERAM, ByteAcc, NoLock, Preserve) { + Offset (0x32), + , 2, + WKLD, 1, Offset (0x46), - , 2, - LIDS , 1 + , 2, + LIDS, 1 } Device(LID) @@ -34,4 +37,18 @@ Device(LID) { return (LIDS) } + + Method(_PRW, 0, NotSerialized) + { + Return (Package() { 0x18, 0x03 }) + } + + Method(_PSW, 1, NotSerialized) + { + if (Arg0) { + Store(1, WKLD) + } else { + Store(0, WKLD) + } + } } diff --git a/src/mainboard/lenovo/x60/acpi/sleepbutton.asl b/src/mainboard/lenovo/x60/acpi/sleepbutton.asl index c339158..09e88aa 100644 --- a/src/mainboard/lenovo/x60/acpi/sleepbutton.asl +++ b/src/mainboard/lenovo/x60/acpi/sleepbutton.asl @@ -19,7 +19,31 @@ * MA 02110-1301 USA */ +Field(ERAM, ByteAcc, NoLock, Preserve) +{ + Offset (0x32), + , 4, + WKFN, 1, + Offset(0x83), + FNKY, 8 +} + Device(SLPB) { Name (_HID, EisaId ("PNP0C0E")) + Method(_PRW, 0, NotSerialized) + { + Return (Package() { 0x18, 0x03 }) + } + + Method(_PSW, 1, NotSerialized) + { + if (Arg0) { + Store(6, FNKY) /* Fn key acts as wake button */ + Store(1, WKFN) + } else { + Store(0, FNKY) /* Fn key normal operation */ + Store(0, WKFN) + } + } } -- 1.7.4.1

2 1

[commit] r6443 - trunk/util/msrtool
by repository service 14 Mar '11

14 Mar '11

Author: stuge Date: Mon Mar 14 10:08:27 2011 New Revision: 6443 URL: https://tracker.coreboot.org/trac/coreboot/changeset/6443 Log: msrtool: Update to use DirectHW on Mac OS X http://www.coreboot.org/DirectHW Signed-off-by: Stefan Reinauer <stefan.reinauer(a)coreboot.org> Acked-by: Peter Stuge <peter(a)stuge.se> Modified: trunk/util/msrtool/configure trunk/util/msrtool/darwin.c trunk/util/msrtool/msrtool.c trunk/util/msrtool/msrtool.h Modified: trunk/util/msrtool/configure ============================================================================== --- trunk/util/msrtool/configure Mon Mar 14 09:18:27 2011 (r6442) +++ trunk/util/msrtool/configure Mon Mar 14 10:08:27 2011 (r6443) @@ -155,7 +155,7 @@ rm -f .config.c exit 1 } -LDFLAGS=`trylink "libpci (from pciutils)" "${pc_LDFLAGS}" "-lpci -lz" "-L/usr/local/lib -lpci -lz" "-framework DirectIO -lpci -lz"` || { +LDFLAGS=`trylink "libpci (from pciutils)" "${pc_LDFLAGS}" "-lpci -lz" "-L/usr/local/lib -lpci -lz" "-framework DirectHW -lpci -lz"` || { rm -f .config.c .config.o exit 1 } Modified: trunk/util/msrtool/darwin.c ============================================================================== --- trunk/util/msrtool/darwin.c Mon Mar 14 09:18:27 2011 (r6442) +++ trunk/util/msrtool/darwin.c Mon Mar 14 10:08:27 2011 (r6443) @@ -26,8 +26,8 @@ #include "msrtool.h" -/* This Darwin support requires DirectIO, which is available at - * http://www.coresystems.de/en/directio +/* This Darwin support requires DirectHW, which is available at + * http://www.coreboot.org/DirectHW */ int darwin_probe(const struct sysdef *system) Modified: trunk/util/msrtool/msrtool.c ============================================================================== --- trunk/util/msrtool/msrtool.c Mon Mar 14 09:18:27 2011 (r6442) +++ trunk/util/msrtool/msrtool.c Mon Mar 14 10:08:27 2011 (r6443) @@ -49,7 +49,7 @@ static struct sysdef allsystems[] = { { "linux", "Linux with /dev/cpu/*/msr", linux_probe, linux_open, linux_close, linux_rdmsr }, - { "darwin", "OS X with DirectIO", darwin_probe, darwin_open, darwin_close, darwin_rdmsr }, + { "darwin", "Mac OS X with DirectHW", darwin_probe, darwin_open, darwin_close, darwin_rdmsr }, { "freebsd", "FreeBSD with /dev/cpuctl*", freebsd_probe, freebsd_open, freebsd_close, freebsd_rdmsr }, { SYSTEM_EOT } }; Modified: trunk/util/msrtool/msrtool.h ============================================================================== --- trunk/util/msrtool/msrtool.h Mon Mar 14 09:18:27 2011 (r6442) +++ trunk/util/msrtool/msrtool.h Mon Mar 14 10:08:27 2011 (r6443) @@ -24,9 +24,9 @@ #include <stdio.h> #include <stdint.h> #if (defined(__MACH__) && defined(__APPLE__)) -/* DirectIO is available here: http://www.coresystems.de/en/directio */ +/* DirectHW is available here: http://www.coreboot.org/DirectHW */ #define __DARWIN__ -#include <DirectIO/darwinio.h> +#include <DirectHW/DirectHW.h> #endif #if defined(__FreeBSD__) #include <sys/ioctl.h>

1 0

[commit] r6442 - trunk/src/ec/acpi
by repository service 14 Mar '11

14 Mar '11

Author: svens Date: Mon Mar 14 09:18:27 2011 New Revision: 6442 URL: https://tracker.coreboot.org/trac/coreboot/changeset/6442 Log: ec/acpi: make ACPI register pair configurable Signed-off-by: Sven Schnelle <svens(a)stackframe.org> Acked-by: Stefan Reinauer <stefan.reinauer(a)coreboot.org> Modified: trunk/src/ec/acpi/ec.c trunk/src/ec/acpi/ec.h Modified: trunk/src/ec/acpi/ec.c ============================================================================== --- trunk/src/ec/acpi/ec.c Mon Mar 14 09:18:17 2011 (r6441) +++ trunk/src/ec/acpi/ec.c Mon Mar 14 09:18:27 2011 (r6442) @@ -25,12 +25,15 @@ #include <delay.h> #include "ec.h" +static int ec_cmd_reg = EC_SC; +static int ec_data_reg = EC_DATA; + int send_ec_command(u8 command) { int timeout; timeout = 0x7ff; - while ((inb(EC_SC) & EC_IBF) && --timeout) { + while ((inb(ec_cmd_reg) & EC_IBF) && --timeout) { udelay(10); if ((timeout & 0xff) == 0) printk(BIOS_SPEW, "."); @@ -41,7 +44,7 @@ // return -1; } - outb(command, EC_SC); + outb(command, ec_cmd_reg); return 0; } @@ -50,7 +53,7 @@ int timeout; timeout = 0x7ff; - while ((inb(EC_SC) & EC_IBF) && --timeout) { // wait for IBF = 0 + while ((inb(ec_cmd_reg) & EC_IBF) && --timeout) { // wait for IBF = 0 udelay(10); if ((timeout & 0xff) == 0) printk(BIOS_SPEW, "."); @@ -61,14 +64,14 @@ // return -1; } - outb(data, EC_DATA); + outb(data, ec_data_reg); return 0; } int send_ec_data_nowait(u8 data) { - outb(data, EC_DATA); + outb(data, ec_data_reg); return 0; } @@ -80,7 +83,7 @@ timeout = 0x7fff; while (--timeout) { // Wait for OBF = 1 - if (inb(EC_SC) & EC_OBF) { + if (inb(ec_cmd_reg) & EC_OBF) { break; } udelay(10); @@ -92,7 +95,7 @@ // return -1; } - data = inb(EC_DATA); + data = inb(ec_data_reg); printk(BIOS_DEBUG, "recv_ec_data: 0x%02x\n", data); return data; @@ -123,6 +126,12 @@ ec_write(addr, ec_read(addr) & ~(1 << bit)); } +void ec_set_ports(u16 cmd_reg, u16 data_reg) +{ + ec_cmd_reg = cmd_reg; + ec_data_reg = data_reg; +} + struct chip_operations ec_acpi_ops = { CHIP_NAME("ACPI Embedded Controller") }; Modified: trunk/src/ec/acpi/ec.h ============================================================================== --- trunk/src/ec/acpi/ec.h Mon Mar 14 09:18:17 2011 (r6441) +++ trunk/src/ec/acpi/ec.h Mon Mar 14 09:18:27 2011 (r6442) @@ -46,6 +46,7 @@ int ec_write(u8 addr, u8 data); void ec_set_bit(u8 addr, u8 bit); void ec_clr_bit(u8 addr, u8 bit); +void ec_set_ports(u16 cmd_reg, u16 data_reg); #endif

1 0

[commit] r6441 - trunk/src/ec/acpi
by repository service 14 Mar '11

14 Mar '11

Author: svens Date: Mon Mar 14 09:18:17 2011 New Revision: 6441 URL: https://tracker.coreboot.org/trac/coreboot/changeset/6441 Log: ACPI EC: add ec_set_bit() / ec_clr_bit() Signed-off-by: Sven Schnelle <svens(a)stackframe.org> Acked-by: Sven Schnelle <svens(a)stackframe.org> Modified: trunk/src/ec/acpi/ec.c trunk/src/ec/acpi/ec.h Modified: trunk/src/ec/acpi/ec.c ============================================================================== --- trunk/src/ec/acpi/ec.c Thu Mar 10 08:52:02 2011 (r6440) +++ trunk/src/ec/acpi/ec.c Mon Mar 14 09:18:17 2011 (r6441) @@ -113,6 +113,16 @@ return send_ec_data(data); } +void ec_set_bit(u8 addr, u8 bit) +{ + ec_write(addr, ec_read(addr) | (1 << bit)); +} + +void ec_clr_bit(u8 addr, u8 bit) +{ + ec_write(addr, ec_read(addr) & ~(1 << bit)); +} + struct chip_operations ec_acpi_ops = { CHIP_NAME("ACPI Embedded Controller") }; Modified: trunk/src/ec/acpi/ec.h ============================================================================== --- trunk/src/ec/acpi/ec.h Thu Mar 10 08:52:02 2011 (r6440) +++ trunk/src/ec/acpi/ec.h Mon Mar 14 09:18:17 2011 (r6441) @@ -44,6 +44,8 @@ u8 recv_ec_data(void); u8 ec_read(u8 addr); int ec_write(u8 addr, u8 data); +void ec_set_bit(u8 addr, u8 bit); +void ec_clr_bit(u8 addr, u8 bit); #endif

1 0

[DirectHW] [commit] r3 - trunk/macosx/patches
by repository service 14 Mar '11

14 Mar '11

Author: stepan Date: Mon Mar 14 03:46:17 2011 New Revision: 3 URL: https://tracker.coreboot.org/trac/directhw/changeset/3 Log: Add proper Signed-off-by and patch descriptions Signed-off-by: Stefan Reinauer <stefan.reinauer(a)coreboot.org> Modified: trunk/macosx/patches/dmidecode-2.11.diff trunk/macosx/patches/flashrom-r1280.diff trunk/macosx/patches/inteltool-r6440.diff trunk/macosx/patches/msrtool-r6440.diff trunk/macosx/patches/nvramtool-r6440.diff trunk/macosx/patches/pciutils-3.1.7.diff trunk/macosx/patches/superiotool-r6440.diff Modified: trunk/macosx/patches/dmidecode-2.11.diff ============================================================================== --- trunk/macosx/patches/dmidecode-2.11.diff Mon Mar 14 03:41:03 2011 (r2) +++ trunk/macosx/patches/dmidecode-2.11.diff Mon Mar 14 03:46:17 2011 (r3) @@ -1,3 +1,8 @@ +Port dmidecode package to Mac OS X using DirectHW: +http://www.coreboot.org/DirectHW + +Signed-off-by: Stefan Reinauer <stefan.reinauer(a)coreboot.org> + Index: dmidecode-2.11/biosdecode.c =================================================================== --- dmidecode-2.11/biosdecode.c Modified: trunk/macosx/patches/flashrom-r1280.diff ============================================================================== --- trunk/macosx/patches/flashrom-r1280.diff Mon Mar 14 03:41:03 2011 (r2) +++ trunk/macosx/patches/flashrom-r1280.diff Mon Mar 14 03:46:17 2011 (r3) @@ -1,3 +1,8 @@ +Update port of flashrom package to Mac OS X using DirectHW: +http://www.coreboot.org/DirectHW + +Signed-off-by: Stefan Reinauer <stefan.reinauer(a)coreboot.org> + Index: flashrom-r1280/hwaccess.h =================================================================== --- flashrom-r1280/hwaccess.h Modified: trunk/macosx/patches/inteltool-r6440.diff ============================================================================== --- trunk/macosx/patches/inteltool-r6440.diff Mon Mar 14 03:41:03 2011 (r2) +++ trunk/macosx/patches/inteltool-r6440.diff Mon Mar 14 03:46:17 2011 (r3) @@ -1,3 +1,8 @@ +Update port of inteltool to Mac OS X using DirectHW: +http://www.coreboot.org/DirectHW + +Signed-off-by: Stefan Reinauer <stefan.reinauer(a)coreboot.org> + Index: inteltool-r6440/inteltool.h =================================================================== --- inteltool-r6440/inteltool.h Modified: trunk/macosx/patches/msrtool-r6440.diff ============================================================================== --- trunk/macosx/patches/msrtool-r6440.diff Mon Mar 14 03:41:03 2011 (r2) +++ trunk/macosx/patches/msrtool-r6440.diff Mon Mar 14 03:46:17 2011 (r3) @@ -1,3 +1,8 @@ +Update port of msrtool to Mac OS X using DirectHW: +http://www.coreboot.org/DirectHW + +Signed-off-by: Stefan Reinauer <stefan.reinauer(a)coreboot.org> + Index: msrtool-r6440/msrtool.c =================================================================== --- msrtool-r6440/msrtool.c Modified: trunk/macosx/patches/nvramtool-r6440.diff ============================================================================== --- trunk/macosx/patches/nvramtool-r6440.diff Mon Mar 14 03:41:03 2011 (r2) +++ trunk/macosx/patches/nvramtool-r6440.diff Mon Mar 14 03:46:17 2011 (r3) @@ -1,3 +1,8 @@ +Update port of nvramtool to Mac OS X using DirectHW: +http://www.coreboot.org/DirectHW + +Signed-off-by: Stefan Reinauer <stefan.reinauer(a)coreboot.org> + Index: nvramtool-r6440/accessors/cmos-hw-unix.c =================================================================== --- nvramtool-r6440/accessors/cmos-hw-unix.c Modified: trunk/macosx/patches/pciutils-3.1.7.diff ============================================================================== --- trunk/macosx/patches/pciutils-3.1.7.diff Mon Mar 14 03:41:03 2011 (r2) +++ trunk/macosx/patches/pciutils-3.1.7.diff Mon Mar 14 03:46:17 2011 (r3) @@ -1,3 +1,8 @@ +Port pciutils to Mac OS X using DirectHW: +http://www.coreboot.org/DirectHW + +Signed-off-by: Stefan Reinauer <stefan.reinauer(a)coreboot.org> + Index: pciutils-3.1.7/osx/Welcome.rtf =================================================================== --- pciutils-3.1.7/osx/Welcome.rtf Modified: trunk/macosx/patches/superiotool-r6440.diff ============================================================================== --- trunk/macosx/patches/superiotool-r6440.diff Mon Mar 14 03:41:03 2011 (r2) +++ trunk/macosx/patches/superiotool-r6440.diff Mon Mar 14 03:46:17 2011 (r3) @@ -1,3 +1,8 @@ +Update port of superiotool to Mac OS X using DirectHW: +http://www.coreboot.org/DirectHW + +Signed-off-by: Stefan Reinauer <stefan.reinauer(a)coreboot.org> + Index: superiotool-r6440/superiotool.h =================================================================== --- superiotool-r6440/superiotool.h

1 0

[DirectHW] [commit] r2 - trunk/macosx/patches
by repository service 14 Mar '11

14 Mar '11

Author: stepan Date: Mon Mar 14 03:41:03 2011 New Revision: 2 URL: https://tracker.coreboot.org/trac/directhw/changeset/2 Log: new upstream patch for dmidecode 2.11 Signed-off-by: Stefan Reinauer <stefan.reinauer(a)coreboot.org> Added: trunk/macosx/patches/dmidecode-2.11.diff Deleted: trunk/macosx/patches/dmidecode-2.9.diff Added: trunk/macosx/patches/dmidecode-2.11.diff ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/macosx/patches/dmidecode-2.11.diff Mon Mar 14 03:41:03 2011 (r2) @@ -0,0 +1,207 @@ +Index: dmidecode-2.11/biosdecode.c +=================================================================== +--- dmidecode-2.11/biosdecode.c ++++ dmidecode-2.11/biosdecode.c +@@ -560,9 +560,15 @@ + static int parse_command_line(int argc, char * const argv[]) + { + int option; ++#ifndef __APPLE__ + const char *optstring = "d:hV"; ++#else ++ const char *optstring = "hV"; ++#endif + struct option longopts[] = { ++#ifndef __APPLE__ + { "dev-mem", required_argument, NULL, 'd' }, ++#endif + { "help", no_argument, NULL, 'h' }, + { "version", no_argument, NULL, 'V' }, + { 0, 0, 0, 0 } +@@ -571,9 +577,11 @@ + while ((option = getopt_long(argc, argv, optstring, longopts, NULL)) != -1) + switch (option) + { ++#ifndef __APPLE__ + case 'd': + opt.devmem = optarg; + break; ++#endif + case 'h': + opt.flags |= FLAG_HELP; + break; +@@ -592,7 +600,9 @@ + static const char *help = + "Usage: biosdecode [OPTIONS]\n" + "Options are:\n" ++#ifndef __APPLE__ + " -d, --dev-mem FILE Read memory from device FILE (default: " DEFAULT_MEM_DEV ")\n" ++#endif + " -h, --help Display this help text and exit\n" + " -V, --version Display the version and exit\n"; + +Index: dmidecode-2.11/config.h +=================================================================== +--- dmidecode-2.11/config.h ++++ dmidecode-2.11/config.h +@@ -12,9 +12,13 @@ + #ifdef __sun + #define DEFAULT_MEM_DEV "/dev/xsvc" + #else ++#ifdef __APPLE__ ++#define DEFAULT_MEM_DEV "DirectHW" ++#else + #define DEFAULT_MEM_DEV "/dev/mem" + #endif + #endif ++#endif + + /* Use mmap or not */ + #ifndef __BEOS__ +Index: dmidecode-2.11/vpdopt.c +=================================================================== +--- dmidecode-2.11/vpdopt.c ++++ dmidecode-2.11/vpdopt.c +@@ -92,9 +92,15 @@ + int parse_command_line(int argc, char * const argv[]) + { + int option; ++#ifndef __APPLE__ + const char *optstring = "d:hs:uV"; ++#else ++ const char *optstring = "hs:uV"; ++#endif + struct option longopts[] = { ++#ifndef __APPLE__ + { "dev-mem", required_argument, NULL, 'd' }, ++#endif + { "help", no_argument, NULL, 'h' }, + { "string", required_argument, NULL, 's' }, + { "dump", no_argument, NULL, 'u' }, +@@ -105,9 +111,11 @@ + while ((option = getopt_long(argc, argv, optstring, longopts, NULL)) != -1) + switch (option) + { ++#ifndef __APPLE__ + case 'd': + opt.devmem = optarg; + break; ++#endif + case 'h': + opt.flags |= FLAG_HELP; + break; +@@ -147,7 +155,9 @@ + static const char *help = + "Usage: vpddecode [OPTIONS]\n" + "Options are:\n" ++#ifndef __APPLE__ + " -d, --dev-mem FILE Read memory from device FILE (default: " DEFAULT_MEM_DEV ")\n" ++#endif + " -h, --help Display this help text and exit\n" + " -s, --string KEYWORD Only display the value of the given VPD string\n" + " -u, --dump Do not decode the VPD records\n" +Index: dmidecode-2.11/util.c +=================================================================== +--- dmidecode-2.11/util.c ++++ dmidecode-2.11/util.c +@@ -47,6 +47,10 @@ + #include "types.h" + #include "util.h" + ++#ifdef __APPLE__ ++#include <DirectHW/DirectHW.h> ++#endif ++ + static int myread(int fd, u8 *buf, size_t count, const char *prefix) + { + ssize_t r = 1; +@@ -95,6 +99,7 @@ + void *mem_chunk(size_t base, size_t len, const char *devmem) + { + void *p; ++#ifndef __APPLE__ + int fd; + #ifdef USE_MMAP + size_t mmoffset; +@@ -158,7 +163,23 @@ + out: + if (close(fd) == -1) + perror(devmem); ++#else ++ void *v; ++ iopl(3); ++ if((v=map_physical(base, len))==NULL) ++ { ++ perror("map_physical"); ++ return NULL; ++ } + ++ if((p=malloc(len))==NULL) ++ { ++ perror("malloc"); ++ return NULL; ++ } ++ memcpy(p, v, len); ++ unmap_physical(v, len); ++#endif + return p; + } + +Index: dmidecode-2.11/ownership.c +=================================================================== +--- dmidecode-2.11/ownership.c ++++ dmidecode-2.11/ownership.c +@@ -114,9 +114,15 @@ + static int parse_command_line(int argc, char * const argv[]) + { + int option; ++#ifndef __APPLE__ + const char *optstring = "d:hV"; ++#else ++ const char *optstring = "hV"; ++#endif + struct option longopts[] = { ++#ifndef __APPLE__ + { "dev-mem", required_argument, NULL, 'd' }, ++#endif + { "help", no_argument, NULL, 'h' }, + { "version", no_argument, NULL, 'V' }, + { 0, 0, 0, 0 } +@@ -125,9 +131,11 @@ + while ((option = getopt_long(argc, argv, optstring, longopts, NULL)) != -1) + switch (option) + { ++#ifndef __APPLE__ + case 'd': + opt.devmem = optarg; + break; ++#endif + case 'h': + opt.flags |= FLAG_HELP; + break; +@@ -146,7 +154,9 @@ + static const char *help = + "Usage: ownership [OPTIONS]\n" + "Options are:\n" ++#ifndef __APPLE__ + " -d, --dev-mem FILE Read memory from device FILE (default: " DEFAULT_MEM_DEV ")\n" ++#endif + " -h, --help Display this help text and exit\n" + " -V, --version Display the version and exit\n"; + +Index: dmidecode-2.11/Makefile +=================================================================== +--- dmidecode-2.11/Makefile ++++ dmidecode-2.11/Makefile +@@ -25,6 +25,11 @@ + # Pass linker flags here + LDFLAGS = + ++OS_ARCH = $(shell uname) ++ifeq ($(OS_ARCH), Darwin) ++LDFLAGS += -framework IOKit -framework DirectHW ++endif ++ + DESTDIR = + prefix = /usr/local + sbindir = $(prefix)/sbin

1 0

[PATCH 1/3] ACPI EC: add ec_set_bit() / ec_clr_bit()
by Sven Schnelle 13 Mar '11

13 Mar '11

Signed-off-by: Sven Schnelle <svens(a)stackframe.org> --- src/ec/acpi/ec.c | 10 ++++++++++ src/ec/acpi/ec.h | 2 ++ 2 files changed, 12 insertions(+), 0 deletions(-) diff --git a/src/ec/acpi/ec.c b/src/ec/acpi/ec.c index 7a01b7e..e353260 100644 --- a/src/ec/acpi/ec.c +++ b/src/ec/acpi/ec.c @@ -113,6 +113,16 @@ int ec_write(u8 addr, u8 data) return send_ec_data(data); } +void ec_set_bit(u8 addr, u8 bit) +{ + ec_write(addr, ec_read(addr) | (1 << bit)); +} + +void ec_clr_bit(u8 addr, u8 bit) +{ + ec_write(addr, ec_read(addr) & ~(1 << bit)); +} + struct chip_operations ec_acpi_ops = { CHIP_NAME("ACPI Embedded Controller") }; diff --git a/src/ec/acpi/ec.h b/src/ec/acpi/ec.h index 77ee637..cabbfea 100644 --- a/src/ec/acpi/ec.h +++ b/src/ec/acpi/ec.h @@ -44,6 +44,8 @@ int send_ec_data_nowait(u8 data); u8 recv_ec_data(void); u8 ec_read(u8 addr); int ec_write(u8 addr, u8 data); +void ec_set_bit(u8 addr, u8 bit); +void ec_clr_bit(u8 addr, u8 bit); #endif -- 1.7.4.1

2 10

← Newer
1
...
9
10
11
12
13
14
15
...
21
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

coreboot March 2011