Paul Menzel (paulepanter(a)users.sourceforge.net) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/7093
-gerrit
commit c27d6aeaab392973aeae85bce5e0ce698c62f008
Author: Paul Menzel <paulepanter(a)users.sourceforge.net>
Date: Fri Oct 17 13:46:12 2014 +0200
util/cbmem: Fix CBMEM TOC printing
Since commit c0199078 (cbmem utility: Find actual CBMEM area) [1], at least on
the Lenovo X201, X230 and X60, printing the CBMEM table of contents did
not work. It still worked on the ASRock E350M1 though.
$ sudo /src/coreboot/util/cbmem/cbmem -l --verbose # Lenovo X60t
Looking for coreboot table at 0
Mapping 1MB of physical memory at 0x0.
Found!
coreboot table entry 0x11
Found forwarding entry.
Unmapping 1MB of virtual memory at 0xb74dc000.
Looking for coreboot table at 7f6c4000
Mapping 1MB of physical memory at 0x7f6c4000.
Found!
coreboot table entry 0xc8
coreboot table entry 0x01
Found memory map.
coreboot table entry 0x03
coreboot table entry 0x04
coreboot table entry 0x05
coreboot table entry 0x06
coreboot table entry 0x07
coreboot table entry 0x08
coreboot table entry 0x09
coreboot table entry 0x0a
coreboot table entry 0x16
Found timestamp table.
cbmem_addr = 7f7dd000
coreboot table entry 0x17
Found cbmem console.
cbmem_addr = 7f7de000
Unmapping 1MB of virtual memory at 0xb74dc000.
No coreboot CBMEM area found!
The address of the boot info record has to be used for checking, that reading
takes place in the bounds of the boot info record.
$ sudo ~/src/coreboot/util/cbmem/cbmem -l # Lenovo X60
CBMEM table of contents:
ID START LENGTH
[…]
Big thanks to David and Stefan for their help.
[1] http://review.coreboot.org/2117
Change-Id: I1eb09a6445d9ea17e1e16b6866dece74315d3c73
Found-by: Kyösti Mälkki <kyosti.malkki(a)gmail.com>
Signed-off-by: Paul Menzel <paulepanter(a)users.sourceforge.net>
---
util/cbmem/cbmem.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/util/cbmem/cbmem.c b/util/cbmem/cbmem.c
index cee3818..91fa8e1 100644
--- a/util/cbmem/cbmem.c
+++ b/util/cbmem/cbmem.c
@@ -220,7 +220,7 @@ static int parse_cbtable(u64 address)
debug(" Found memory map.\n");
struct lb_memory *memory =
(struct lb_memory *)lbr_p;
- while ((char *)&memory->map[i] < ((char *)lbtable
+ while ((char *)&memory->map[i] < ((char *)lbr_p
+ lbr_p->size)) {
if (memory->map[i].type == LB_MEM_TABLE) {
debug(" LB_MEM_TABLE found.\n");
Paul Menzel (paulepanter(a)users.sourceforge.net) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/7092
-gerrit
commit 5e04ac6949bab7627fdc14d814d0f2882e790391
Author: Paul Menzel <paulepanter(a)users.sourceforge.net>
Date: Fri Oct 17 13:17:00 2014 +0200
boot/coreboot_tables.h: Use `it is` instead of `it easy` in comment
Change-Id: I5c8a689a4923175fff1f38847b7cfbbaeeb0ea22
Signed-off-by: Paul Menzel <paulepanter(a)users.sourceforge.net>
---
src/include/boot/coreboot_tables.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/include/boot/coreboot_tables.h b/src/include/boot/coreboot_tables.h
index db3c508..19fc10c 100644
--- a/src/include/boot/coreboot_tables.h
+++ b/src/include/boot/coreboot_tables.h
@@ -77,7 +77,7 @@ struct lb_header
/* Every entry in the boot environment list will correspond to a boot
* info record. Encoding both type and size. The type is obviously
* so you can tell what it is. The size allows you to skip that
- * boot environment record if you don't know what it easy. This allows
+ * boot environment record if you don't know what it is. This allows
* forward compatibility with records not yet defined.
*/
struct lb_record {
Paul Menzel (paulepanter(a)users.sourceforge.net) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/7091
-gerrit
commit 69dc384c7873ff82226154247f1dc8b4beae1081
Author: Paul Menzel <paulepanter(a)users.sourceforge.net>
Date: Fri Oct 17 12:54:13 2014 +0200
util/cbmem/cbmem: Move comment to right place
Originally the utility cbmem was just used for reading out the time
stamps and was later extented. Move the comment to the right place
again.
Change-Id: Ief1d7aef38a4b439e3e224e6e6c65f7aa57f821f
Signed-off-by: Paul Menzel <paulepanter(a)users.sourceforge.net>
---
util/cbmem/cbmem.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/util/cbmem/cbmem.c b/util/cbmem/cbmem.c
index 4dcfe91..cee3818 100644
--- a/util/cbmem/cbmem.c
+++ b/util/cbmem/cbmem.c
@@ -212,7 +212,6 @@ static int parse_cbtable(u64 address)
debug("Found!\n");
for (j = 0; j < lbh->table_bytes; j += lbr_p->size) {
- /* look for the timestamp table */
lbr_p = (struct lb_record*) ((char *)lbtable + j);
debug(" coreboot table entry 0x%02x\n", lbr_p->tag);
switch (lbr_p->tag) {
@@ -232,6 +231,7 @@ static int parse_cbtable(u64 address)
}
continue;
}
+ /* look for the timestamp table */
case LB_TAG_TIMESTAMPS: {
debug(" Found timestamp table.\n");
timestamps = parse_cbmem_ref((struct lb_cbmem_ref *) lbr_p);
Stefan Reinauer (stefan.reinauer(a)coreboot.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/7090
-gerrit
commit c69f324b37cedaec2dc78dc57dc2a58c9cf08da9
Author: Stefan Reinauer <stefan.reinauer(a)coreboot.org>
Date: Fri Oct 17 13:28:15 2014 +0200
Kconfig: move SMBIOS related options to SMBIOS table option
Change-Id: I74943d0248f49796b9d31d6ed827c69f8cea13a5
Signed-off-by: Stefan Reinauer <stefan.reinauer(a)coreboot.org>
---
src/Kconfig | 28 ++++++++++++++++++++++++++++
src/mainboard/Kconfig | 28 ----------------------------
2 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/src/Kconfig b/src/Kconfig
index ab471d2..5fe7b76 100644
--- a/src/Kconfig
+++ b/src/Kconfig
@@ -507,6 +507,34 @@ config GENERATE_SMBIOS_TABLES
If unsure, say Y.
+config MAINBOARD_SERIAL_NUMBER
+ string "SMBIOS Serial Number"
+ depends on GENERATE_SMBIOS_TABLES
+ default "123456789"
+ help
+ The Serial Number to store in SMBIOS structures.
+
+config MAINBOARD_VERSION
+ string "SMBIOS Version Number"
+ depends on GENERATE_SMBIOS_TABLES
+ default "1.0"
+ help
+ The Version Number to store in SMBIOS structures.
+
+config MAINBOARD_SMBIOS_MANUFACTURER
+ string "SMBIOS Manufacturer"
+ depends on GENERATE_SMBIOS_TABLES
+ default MAINBOARD_VENDOR
+ help
+ Override the default Manufacturer stored in SMBIOS structures.
+
+config MAINBOARD_SMBIOS_PRODUCT_NAME
+ string "SMBIOS Product name"
+ depends on GENERATE_SMBIOS_TABLES
+ default MAINBOARD_PART_NUMBER
+ help
+ Override the default Product name stored in SMBIOS structures.
+
endmenu
menu "Payload"
diff --git a/src/mainboard/Kconfig b/src/mainboard/Kconfig
index f761b7a..29b439c 100644
--- a/src/mainboard/Kconfig
+++ b/src/mainboard/Kconfig
@@ -359,32 +359,4 @@ config ENABLE_POWER_BUTTON
def_bool y if !POWER_BUTTON_IS_OPTIONAL && POWER_BUTTON_FORCE_ENABLE
def_bool n if !POWER_BUTTON_IS_OPTIONAL && POWER_BUTTON_FORCE_DISABLE
-config MAINBOARD_SERIAL_NUMBER
- string "SMBIOS Serial Number"
- depends on GENERATE_SMBIOS_TABLES
- default "123456789"
- help
- The Serial Number to store in SMBIOS structures.
-
-config MAINBOARD_VERSION
- string "SMBIOS Version Number"
- depends on GENERATE_SMBIOS_TABLES
- default "1.0"
- help
- The Version Number to store in SMBIOS structures.
-
-config MAINBOARD_SMBIOS_MANUFACTURER
- string "SMBIOS Manufacturer"
- depends on GENERATE_SMBIOS_TABLES
- default MAINBOARD_VENDOR
- help
- Override the default Manufacturer stored in SMBIOS structures.
-
-config MAINBOARD_SMBIOS_PRODUCT_NAME
- string "SMBIOS Product name"
- depends on GENERATE_SMBIOS_TABLES
- default MAINBOARD_PART_NUMBER
- help
- Override the default Product name stored in SMBIOS structures.
-
endmenu
Vladimir Serbinenko (phcoder(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/7084
-gerrit
commit f04118c92bf89c34bec2457a7591f72cee62685a
Author: Vladimir Serbinenko <phcoder(a)gmail.com>
Date: Wed Oct 15 22:58:10 2014 +0200
macbook21: Kill empty Makefile.inc
Change-Id: I2d946b9d757cc6158ff7f8927a81d7bf03a2e062
Signed-off-by: Vladimir Serbinenko <phcoder(a)gmail.com>
---
src/mainboard/apple/macbook21/Makefile.inc | 19 -------------------
1 file changed, 19 deletions(-)
diff --git a/src/mainboard/apple/macbook21/Makefile.inc b/src/mainboard/apple/macbook21/Makefile.inc
deleted file mode 100644
index 1ba662e..0000000
--- a/src/mainboard/apple/macbook21/Makefile.inc
+++ /dev/null
@@ -1,19 +0,0 @@
-##
-## 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-##
-
Vladimir Serbinenko (phcoder(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/7083
-gerrit
commit 32f7881f9c7276913783576324a183928dc0db84
Author: Vladimir Serbinenko <phcoder(a)gmail.com>
Date: Wed Oct 15 22:56:12 2014 +0200
macbook21: Kill empty smi.h
Change-Id: I387bb6154fe432ef2fc5f92faca69e67d7a6370a
Signed-off-by: Vladimir Serbinenko <phcoder(a)gmail.com>
---
src/mainboard/apple/macbook21/acpi/video.asl | 2 --
src/mainboard/apple/macbook21/smi.h | 23 -----------------------
src/mainboard/apple/macbook21/smihandler.c | 1 -
3 files changed, 26 deletions(-)
diff --git a/src/mainboard/apple/macbook21/acpi/video.asl b/src/mainboard/apple/macbook21/acpi/video.asl
index 50a0947..c2f9dfb 100644
--- a/src/mainboard/apple/macbook21/acpi/video.asl
+++ b/src/mainboard/apple/macbook21/acpi/video.asl
@@ -19,8 +19,6 @@
* MA 02110-1301 USA
*/
-#include "smi.h"
-
Device (DSPC)
{
Name (_ADR, 0x00020001)
diff --git a/src/mainboard/apple/macbook21/smi.h b/src/mainboard/apple/macbook21/smi.h
deleted file mode 100644
index 92186bf..0000000
--- a/src/mainboard/apple/macbook21/smi.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * 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
- */
-
-#ifndef MAINBOARD_APPLE_MACBOOK21_SMI_H
-#define MAINBOARD_APPLE_MACBOOK21_SMI_H
-
-#endif
diff --git a/src/mainboard/apple/macbook21/smihandler.c b/src/mainboard/apple/macbook21/smihandler.c
index 0b3d615..ab039dd 100644
--- a/src/mainboard/apple/macbook21/smihandler.c
+++ b/src/mainboard/apple/macbook21/smihandler.c
@@ -26,7 +26,6 @@
#include "southbridge/intel/i82801gx/i82801gx.h"
#include <pc80/mc146818rtc.h>
#include <delay.h>
-#include "smi.h"
/* The southbridge SMI handler checks whether gnvs has a
* valid pointer before calling the trap handler