Denis Carikli (GNUtoo(a)no-log.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/3585
-gerrit
commit 4ca75e4462f0176913581946bbe10d52c99e779e
Author: Denis 'GNUtoo' Carikli <GNUtoo(a)no-log.org>
Date: Mon Jul 1 08:39:51 2013 +0200
Makefile: remove $(obj)/config.h before a build.
This is in order to fix config.h leaking to the next build
when using CONFIG_UPDATE_IMAGE.
Change-Id: I345c2359876918eba1019f25d86d1392f4ee85e1
Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo(a)no-log.org>
---
Makefile | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index dec32e5..fbe68fa 100644
--- a/Makefile
+++ b/Makefile
@@ -82,7 +82,10 @@ HOSTCXXFLAGS := -g
DOXYGEN := doxygen
DOXYGEN_OUTPUT_DIR := doxygen
-all: real-all
+all: clean-config real-all
+
+clean-config:
+ rm -f $(obj)/config.h
# This include must come _before_ the pattern rules below!
# Order _does_ matter for pattern rules.
Peter Stuge (peter(a)stuge.se) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/3620
-gerrit
commit 1bb390712c0a9695825b40e2779dd4eaa42e5d5e
Author: Peter Stuge <peter(a)stuge.se>
Date: Sat Jul 6 20:10:36 2013 +0200
lenovo/x60: Add "IBM ThinkPad Embedded Controller" SMBIOS OEM String
The Linux thinkpad_acpi.c kernel driver looks for this string in the
DMI tables in order to determine that it is running on an actual
ThinkPad.
This commit in itself does not seem to be sufficient to allow the
module to load, but it is one of several things required.
Change-Id: Ief5f28d2e27bf959cb579c4c8eea9eecc9a89a7c
Signed-off-by: Peter Stuge <peter(a)stuge.se>
---
src/mainboard/lenovo/x60/mainboard.c | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
diff --git a/src/mainboard/lenovo/x60/mainboard.c b/src/mainboard/lenovo/x60/mainboard.c
index b344ccb..f4c5a34 100644
--- a/src/mainboard/lenovo/x60/mainboard.c
+++ b/src/mainboard/lenovo/x60/mainboard.c
@@ -36,6 +36,7 @@
#include <pc80/mc146818rtc.h>
#include "dock.h"
#include <arch/x86/include/arch/acpigen.h>
+#include <smbios.h>
#include <x86emu/x86emu.h>
#define PANEL INT15_5F35_CL_DISPLAY_DEFAULT
@@ -133,9 +134,24 @@ static void mainboard_init(device_t dev)
}
}
+static int mainboard_smbios_data(device_t dev, int *handle, unsigned long *current)
+{
+ int len;
+ char tpec[] = "IBM ThinkPad Embedded Controller -[ ]-";
+ const char *oem_strings[] = {
+ tpec,
+ };
+
+ h8_build_id_and_function_spec_version(tpec + 35, 17);
+ len = smbios_write_type11(current, (*handle)++, oem_strings, ARRAY_SIZE(oem_strings));
+
+ return len;
+}
+
static void mainboard_enable(device_t dev)
{
dev->ops->init = mainboard_init;
+ dev->ops->get_smbios_data = mainboard_smbios_data;
}
struct chip_operations mainboard_ops = {
Peter Stuge (peter(a)stuge.se) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/3619
-gerrit
commit 267f4afad530247835e0c604756311de98e06758
Author: Peter Stuge <peter(a)stuge.se>
Date: Sat Jul 6 20:05:13 2013 +0200
lenovo/x60: Move mainboard_enable() code into a mainboard_init()
mainboard_enable() is now modeled after google/parrot where the
function just sets the root device/mainboard dev->ops->init to
a mainboard_init() function, which is invoked to initialize the
actual device.
Change-Id: Iaf9187532a1e432b991260201b95dda85cc312c5
Signed-off-by: Peter Stuge <peter(a)stuge.se>
---
src/mainboard/lenovo/x60/mainboard.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/src/mainboard/lenovo/x60/mainboard.c b/src/mainboard/lenovo/x60/mainboard.c
index d2d0733..b344ccb 100644
--- a/src/mainboard/lenovo/x60/mainboard.c
+++ b/src/mainboard/lenovo/x60/mainboard.c
@@ -85,7 +85,7 @@ int get_cst_entries(acpi_cstate_t **entries)
return ARRAY_SIZE(cst_entries);
}
-static void mainboard_enable(device_t dev)
+static void mainboard_init(device_t dev)
{
device_t dev0, idedev, sdhci_dev;
@@ -133,6 +133,11 @@ static void mainboard_enable(device_t dev)
}
}
+static void mainboard_enable(device_t dev)
+{
+ dev->ops->init = mainboard_init;
+}
+
struct chip_operations mainboard_ops = {
.enable_dev = mainboard_enable,
};
Christoph Grenz (christophg+cb(a)grenz-bonn.de) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/2942
-gerrit
commit c25869764dd514d4b969e31804b6bc6173e56ee6
Author: Christoph Grenz <christophg+cb(a)grenz-bonn.de>
Date: Sat Jul 6 17:09:39 2013 +0200
w83627hf/acpi: Make `AddressMax` a multiple of `AddressAlignment`
The parallel port of the W83627HF can be configured on any port
between 0x100 and 0xFFC with 4 byte alignment for traditional modes
and 8 byte alignment for EPP mode. As the ACPI specification says
that the maximum acceptable starting address has to be a multiple
of the alignment granularity, correct the maximum starting address
from 0xFFC to 0xFF8.
Change-Id: I272e09d091149791f2867b1d06e4fc27bc1bb2cd
Signed-off-by: Christoph Grenz <christophg+cb(a)grenz-bonn.de>
---
src/superio/winbond/w83627hf/acpi/superio.asl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/superio/winbond/w83627hf/acpi/superio.asl b/src/superio/winbond/w83627hf/acpi/superio.asl
index 427d63c..8531339 100644
--- a/src/superio/winbond/w83627hf/acpi/superio.asl
+++ b/src/superio/winbond/w83627hf/acpi/superio.asl
@@ -555,7 +555,7 @@ Device(SIO) {
/* Any configurable address (EPP mode) */
StartDependentFn (2,0)
{
- IO (Decode16, 0x0100, 0x0FFC, 0x08, 0x08)
+ IO (Decode16, 0x0100, 0x0FF8, 0x08, 0x08)
IRQNoFlags () {3,4,5,7,9,10,11,12}
}
/* Any configurable address (No EPP mode) */
Christoph Grenz (christophg+cb(a)grenz-bonn.de) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/3602
-gerrit
commit 8918caf86d13c17286056e0dff1cc6a8aa2ec9a1
Author: Christoph Grenz <christophg+cb(a)grenz-bonn.de>
Date: Thu Jul 4 02:51:42 2013 +0200
w83627hf/acpi: Fix endianess error in floppy drive enumeration code
The enumeration results are stored as five DWORDs in one 20 byte buffer.
Bytes 3, 7, 11 and 15 were used to set the lowest bit of each DWORD.
ACPI uses little endian, so 1, 4, 8 and 12 are the correct indices.
Change-Id: I793225cb1bb62fd148ecfa1e61e02f5d7be62cdb
Signed-off-by: Christoph Grenz <christophg+cb(a)grenz-bonn.de>
---
src/superio/winbond/w83627hf/acpi/superio.asl | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/superio/winbond/w83627hf/acpi/superio.asl b/src/superio/winbond/w83627hf/acpi/superio.asl
index 03f72f7..05b570b 100644
--- a/src/superio/winbond/w83627hf/acpi/superio.asl
+++ b/src/superio/winbond/w83627hf/acpi/superio.asl
@@ -356,10 +356,10 @@ Device(SIO) {
SIFR, 8
}
- CreateByteField (_FDE, 3, FD1)
- CreateByteField (_FDE, 7, FD2)
- CreateByteField (_FDE, 11, FD3)
- CreateByteField (_FDE, 15, FD4)
+ CreateByteField (_FDE, 1, FD1)
+ CreateByteField (_FDE, 4, FD2)
+ CreateByteField (_FDE, 8, FD3)
+ CreateByteField (_FDE, 12, FD4)
Store(One, ACT1)
Store(0, SELE)