Patrick Georgi (pgeorgi(a)google.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/12473
-gerrit
commit f5ce0234085f1ab7950726a015881d45eeaaf4b9
Author: Patrick Georgi <pgeorgi(a)chromium.org>
Date: Thu Nov 19 09:53:04 2015 +0100
build system: don't let a broken .xcompile linger in the tree
If the xcompile script fails (with an error message), we should delete
the generated file so that later builds try to regenerate the file and
re-report the problem if it still persists.
Change-Id: I70ec37ca8ccb8ed3d8d0da48b326f5e0d722f314
Signed-off-by: Patrick Georgi <pgeorgi(a)chromium.org>
---
Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index 107f3c8..1c6fede 100644
--- a/Makefile
+++ b/Makefile
@@ -32,7 +32,7 @@
# in addition to the dependency below, create the file if it doesn't exist
# to silence stupid warnings about a file that would be generated anyway.
-$(if $(wildcard .xcompile),,$(eval $(shell util/xcompile/xcompile $(XGCCPATH) > .xcompile)))
+$(if $(wildcard .xcompile),,$(eval $(shell util/xcompile/xcompile $(XGCCPATH) > .xcompile || rm -f .xcompile)))
.xcompile: util/xcompile/xcompile
$< $(XGCCPATH) > $@.tmp
Martin Roth (martinroth(a)google.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/12472
-gerrit
commit 3b2e3a1bb75b7ee99494a6dcb68ba02ab912c3a2
Author: Martin Roth <martinroth(a)google.com>
Date: Wed Nov 18 20:32:21 2015 -0700
[Not for submission] test whitespace linter on jenkins
Change-Id: I8295e149d0e3027eb432e7a08ee9d82da135155d
Signed-off-by: Martin Roth <martinroth(a)google.com>
---
Makefile.inc | 2 +-
src/arch/x86/Makefile.inc | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Makefile.inc b/Makefile.inc
index b85a2cb..705fb5c 100644
--- a/Makefile.inc
+++ b/Makefile.inc
@@ -15,7 +15,7 @@
GIT:=$(shell [ -d "$(top)/.git" ] && command -v git)
-#######################################################################
+#######################################################################
# misleadingly named, this is the coreboot version
export KERNELVERSION := $(strip $(if $(GIT),\
$(shell git describe --dirty --always || git describe),\
diff --git a/src/arch/x86/Makefile.inc b/src/arch/x86/Makefile.inc
index 03dba34..6b0a893 100644
--- a/src/arch/x86/Makefile.inc
+++ b/src/arch/x86/Makefile.inc
@@ -16,7 +16,7 @@
## GNU General Public License for more details.
##
-################################################################################
+################################################################################
# i386 specific tools
NVRAMTOOL:=$(objutil)/nvramtool/nvramtool
Martin Roth (martinroth(a)google.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/12472
-gerrit
commit 0d63241b3c236534d6c01f07e1e50850e69145eb
Author: Martin Roth <martinroth(a)google.com>
Date: Wed Nov 18 20:32:21 2015 -0700
[Not for submission] test whitespace linter on jenkins
Change-Id: I8295e149d0e3027eb432e7a08ee9d82da135155d
Signed-off-by: Martin Roth <martinroth(a)google.com>
---
Makefile.inc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile.inc b/Makefile.inc
index b85a2cb..705fb5c 100644
--- a/Makefile.inc
+++ b/Makefile.inc
@@ -15,7 +15,7 @@
GIT:=$(shell [ -d "$(top)/.git" ] && command -v git)
-#######################################################################
+#######################################################################
# misleadingly named, this is the coreboot version
export KERNELVERSION := $(strip $(if $(GIT),\
$(shell git describe --dirty --always || git describe),\
Martin Roth (martinroth(a)google.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/12471
-gerrit
commit 00aaeb80dee4bbfd33840fa091915b96f3f4333a
Author: Martin Roth <martinroth(a)google.com>
Date: Wed Nov 18 20:23:02 2015 -0700
device/device.c: remove warning for missing apic read resources
We have had the "APIC: 00 missing read_resources" messages
for many years. It's obviously not an error, and also doesn't
cause boot failures. Therefore, remove the message.
Change-Id: I7f99c5950a3457df04e7ef6edb456b70dba9680c
Signed-off-by: Martin Roth <martinroth(a)google.com>
---
src/device/device.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/device/device.c b/src/device/device.c
index 55a5dfd..e23c9de 100644
--- a/src/device/device.c
+++ b/src/device/device.c
@@ -222,8 +222,9 @@ static void read_resources(struct bus *bus)
continue;
if (!curdev->ops || !curdev->ops->read_resources) {
- printk(BIOS_ERR, "%s missing read_resources\n",
- dev_path(curdev));
+ if (curdev->path.type != DEVICE_PATH_APIC)
+ printk(BIOS_ERR, "%s missing read_resources\n",
+ dev_path(curdev));
continue;
}
post_log_path(curdev);
the following patch was just integrated into master:
commit 362dbea2c9674bb50ddf2da306f477e7ae091134
Author: Zheng Bao <fishbaozi(a)gmail.com>
Date: Tue Nov 17 23:36:47 2015 +0800
fletcher: Remove fletcher.
The function fletcher is moved to amdfwtool.
Change-Id: I39eb05a184d8878a96f8de46caf4b5c6c433dc3a
Signed-off-by: Zheng Bao <fishbaozi(a)gmail.com>
Reviewed-on: http://review.coreboot.org/12455
Tested-by: build bot (Jenkins)
Reviewed-by: Martin Roth <martinroth(a)google.com>
See http://review.coreboot.org/12455 for details.
-gerrit
the following patch was just integrated into master:
commit c64f21c02e187fc00654f568dcf13d09147f7fb0
Author: Zheng Bao <fishbaozi(a)gmail.com>
Date: Tue Nov 17 22:58:55 2015 +0800
AMD Hudson: Use amdfwtool to integrate firmwares.
Change-Id: Ie17a744b6ef4e5405b3dfcecc1deb6462220ec60
Signed-off-by: Zheng Bao <fishbaozi(a)gmail.com>
Reviewed-on: http://review.coreboot.org/12435
Tested-by: build bot (Jenkins)
Reviewed-by: Martin Roth <martinroth(a)google.com>
See http://review.coreboot.org/12435 for details.
-gerrit
the following patch was just integrated into master:
commit 9c7ff7bc154ff66d2c86e83c349d59a145bfbedd
Author: Zheng Bao <fishbaozi(a)gmail.com>
Date: Tue Nov 17 22:57:39 2015 +0800
amdfwtool: Add amdfwtool to combine AMD firmwares
Combine all needed AMD firmware into one single firmware, which going to
be added as one single CBFS module.
Change-Id: Ib044098c1837592b8f7e9c6a7da4ba3a32117e25
Signed-off-by: Zheng Bao <fishbaozi(a)gmail.com>
Reviewed-on: http://review.coreboot.org/12419
Tested-by: build bot (Jenkins)
Reviewed-by: Stefan Reinauer <stefan.reinauer(a)coreboot.org>
See http://review.coreboot.org/12419 for details.
-gerrit
Aaron Durbin (adurbin(a)chromium.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/10572
-gerrit
commit 144489c2982727ab27023bd5f2338576ce1e22de
Author: Aaron Durbin <adurbin(a)chromium.org>
Date: Wed Jun 17 16:22:00 2015 +0200
util/cbmem: Fix out of bounds access
Building cbmem with ASan
$ CC=gcc-5 CFLAGS="-O1 -g -fsanitize=address -fno-omit-frame-pointer" LDFLAGS="-fsanitize=address" make
it sometimes finds a heap-buffer-overflow, while dumping the CBMEM
console.
$ sudo ./cbmem -c
=================================================================
==11208==ERROR: AddressSanitizer: heap-buffer-overflow on address 0xb5d5782b at pc 0x0804a4d7 bp 0xbfe23bc8 sp 0xbfe23bbc
WRITE of size 1 at 0xb5d5782b thread T0
#0 0x804a4d6 in dump_console /home/joey/src/coreboot/util/cbmem/cbmem.c:553
#1 0x804a4d6 in main /home/joey/src/coreboot/util/cbmem/cbmem.c:1134
#2 0xb70a3a62 in __libc_start_main (/lib/i386-linux-gnu/i686/cmov/libc.so.6+0x19a62)
#3 0x8048cf0 (/home/joey/src/coreboot/util/cbmem/cbmem+0x8048cf0)
0xb5d5782b is located 50 bytes to the right of 131065-byte region [0xb5d37800,0xb5d577f9)
allocated by thread T0 here:
#0 0xb72c64ce in __interceptor_malloc (/usr/lib/i386-linux-gnu/libasan.so.2+0x924ce)
#1 0x804a407 in dump_console /home/joey/src/coreboot/util/cbmem/cbmem.c:542
#2 0x804a407 in main /home/joey/src/coreboot/util/cbmem/cbmem.c:1134
#3 0xb70a3a62 in __libc_start_main (/lib/i386-linux-gnu/i686/cmov/libc.so.6+0x19a62)
SUMMARY: AddressSanitizer: heap-buffer-overflow /home/joey/src/coreboot/util/cbmem/cbmem.c:553 dump_console
Shadow bytes around the buggy address:
0x36baaeb0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
0x36baaec0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
0x36baaed0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
0x36baaee0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
0x36baaef0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 01
=>0x36baaf00: fa fa fa fa fa[fa]fa fa fa fa fa fa fa fa fa fa
0x36baaf10: fa fa fa fa fa fa fa fa fa fa fa fa fa fa fa fa
0x36baaf20: fa fa fa fa fa fa fa fa fa fa fa fa fa fa fa fa
0x36baaf30: fa fa fa fa fa fa fa fa fa fa fa fa fa fa fa fa
0x36baaf40: fa fa fa fa fa fa fa fa fa fa fa fa fa fa fa fa
0x36baaf50: fa fa fa fa fa fa fa fa fa fa fa fa fa fa fa fa
Shadow byte legend (one shadow byte represents 8 application bytes):
Addressable: 00
Partially addressable: 01 02 03 04 05 06 07
Heap left redzone: fa
Heap right redzone: fb
Freed heap region: fd
Stack left redzone: f1
Stack mid redzone: f2
Stack right redzone: f3
Stack partial redzone: f4
Stack after return: f5
Stack use after scope: f8
Global redzone: f9
Global init order: f6
Poisoned by user: f7
Container overflow: fc
Array cookie: ac
Intra object redzone: bb
ASan internal: fe
==11208==ABORTING
Fix up commit 06b13a37 (cbmem: Terminate the cbmem console at the cursor
position.) by reverting setting the cursor to 0.
Change-Id: Id614a8e0f1a202671dd091f825d826a17176bfcc
Signed-off-by: Aaron Durbin <adurbin(a)chromium.org>
Signed-off-by: Paul Menzel <paulepanter(a)users.sourceforge.net>
---
util/cbmem/cbmem.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/util/cbmem/cbmem.c b/util/cbmem/cbmem.c
index 3c7f49b..d8c6145 100644
--- a/util/cbmem/cbmem.c
+++ b/util/cbmem/cbmem.c
@@ -685,7 +685,7 @@ static void dump_console(void)
*/
if (size > cursor)
size = cursor;
- console_c = malloc(size + 1);
+ console_c = calloc(1, size + 1);
unmap_memory();
if (!console_c) {
fprintf(stderr, "Not enough memory for console.\n");
@@ -695,8 +695,6 @@ static void dump_console(void)
console_p = map_memory_size((unsigned long)console.cbmem_addr,
size + sizeof(size) + sizeof(cursor), 1);
memcpy(console_c, console_p + 8, size);
- console_c[size] = 0;
- console_c[cursor] = 0;
printf("%s\n", console_c);
if (size < cursor)
Zheng Bao (zheng.bao(a)amd.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/11672
-gerrit
commit a0220831cdcdf70a7e6ad48be508f7beefdbf3a9
Author: zbao <fishbaozi(a)gmail.com>
Date: Wed Sep 16 13:27:22 2015 -0700
cbfstool: Add header file for ntohl & htonl on Apple
On Apple OS X, the ntohl and htonl need including header,
#include <arpa/inet.h>
Please refer the manpage for these command on OS X,
https://developer.apple.com/library/mac/documentation/Darwin/Reference/ManP…
Change-Id: Ia942c58f34637c18222fbf985b93c48abf63c5b8
Signed-off-by: Zheng Bao <zheng.bao(a)amd.com>
Signed-off-by: Zheng Bao <fishbaozi(a)gmail.com>
---
util/cbfstool/swab.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/util/cbfstool/swab.h b/util/cbfstool/swab.h
index 22ae8b4..a45a767 100644
--- a/util/cbfstool/swab.h
+++ b/util/cbfstool/swab.h
@@ -18,7 +18,7 @@
#if !defined(__APPLE__) && !defined(__NetBSD__)
#define ntohl(x) (is_big_endian() ? (uint32_t)(x) : swab32(x))
#define htonl(x) (is_big_endian() ? (uint32_t)(x) : swab32(x))
-#elif defined(__NetBSD__)
+#else
#include <arpa/inet.h>
#endif
#define ntohll(x) (is_big_endian() ? (uint64_t)(x) : swab64(x))