Paul Menzel (paulepanter(a)users.sourceforge.net) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/5388
-gerrit
commit 5a9569fac395ca3be760f169b95b843155215769
Author: Paul Menzel <paulepanter(a)users.sourceforge.net>
Date: Sun Mar 16 00:15:57 2014 +0100
util/cbfstool: Use `%zu` instead of `%ld` for size_t arguments
cbfstool fails to built under 32-bit platforms since commit
aa2f739a cbfs: fix issues with word size and endianness.
due to the use of '%ld' format specifier on size_t, which on these
platforms is only 32-bit.
No error is seen though, when cbfstool is built, when building a coreboot
image, where it is put in `build/cbfstool`.
Use the length modifier `z` for size_t arguments, and cast to size_t where
appropriate.
Change-Id: Id84a20fbf237376a31f7e4816bd139463800c977
Signed-off-by: Paul Menzel <paulepanter(a)users.sourceforge.net>
---
util/cbfstool/cbfs-mkstage.c | 4 ++--
util/cbfstool/elfheaders.c | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/util/cbfstool/cbfs-mkstage.c b/util/cbfstool/cbfs-mkstage.c
index 6aa3746..2a92c9f 100644
--- a/util/cbfstool/cbfs-mkstage.c
+++ b/util/cbfstool/cbfs-mkstage.c
@@ -132,8 +132,8 @@ int parse_elf_to_stage(const struct buffer *input, struct buffer *output,
continue;
if (input->size < (phdr[i].p_offset + phdr[i].p_filesz)){
ERROR("Underflow copying out the segment."
- "File has %ld bytes left, segment end is %ld\n",
- input->size, phdr[i].p_offset + phdr[i].p_filesz);
+ "File has %zu bytes left, segment end is %zu\n",
+ input->size, (size_t)(phdr[i].p_offset + phdr[i].p_filesz));
return -1;
}
memcpy(buffer + (l_start - data_start),
diff --git a/util/cbfstool/elfheaders.c b/util/cbfstool/elfheaders.c
index d217aac..5b5cf94 100644
--- a/util/cbfstool/elfheaders.c
+++ b/util/cbfstool/elfheaders.c
@@ -147,7 +147,7 @@ check_size(const struct buffer *b, size_t offset, size_t size, const char *desc)
if (offset >= buffer_size(b) || (offset + size) > buffer_size(b)) {
ERROR("The file is not large enough for the '%s'. "
- "%ld bytes @ offset %zu, input %zu bytes.\n",
+ "%zu bytes @ offset %zu, input %zu bytes.\n",
desc, size, offset, buffer_size(b));
return -1;
}
Damien Zammit (damien(a)zamaudio.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/5868
-gerrit
commit 6354d8a99bc9be8caed8615ab139fb20bb70ccda
Author: Damien Zammit <damien(a)zamaudio.com>
Date: Sun May 25 20:42:29 2014 +1000
i945: Fix regression in graphics base address.
Need to test on x60 hardware.
Compile with vgarom in place but disable running the rom.
Native init should work, and then Linux should detect the LVDS
display due to VBT existance.
If this works, need to insert fake VBT table and retest without vgarom.
Change-Id: Ibff12f0ac007edab9a69e5f83a2df6d83d47b252
Signed-off-by: Damien Zammit <damien(a)zamaudio.com>
---
src/mainboard/lenovo/x60/devicetree.cb | 4 ++--
src/northbridge/intel/i945/gma.c | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/mainboard/lenovo/x60/devicetree.cb b/src/mainboard/lenovo/x60/devicetree.cb
index 416c1f8..bb1b5b4 100644
--- a/src/mainboard/lenovo/x60/devicetree.cb
+++ b/src/mainboard/lenovo/x60/devicetree.cb
@@ -24,8 +24,8 @@ chip northbridge/intel/i945
register "gpu_hotplug" = "0x00000220"
register "gpu_lvds_use_spread_spectrum_clock" = "1"
- register "gpu_lvds_is_dual_channel" = "0"
- register "gpu_backlight" = "0x1280128"
+ register "gpu_lvds_is_dual_channel" = "1"
+ register "gpu_backlight" = "0x879F879E"
device cpu_cluster 0 on
chip cpu/intel/socket_mFCPGA478
diff --git a/src/northbridge/intel/i945/gma.c b/src/northbridge/intel/i945/gma.c
index 8dd1250..fb100d6 100644
--- a/src/northbridge/intel/i945/gma.c
+++ b/src/northbridge/intel/i945/gma.c
@@ -413,7 +413,7 @@ static void gma_func0_init(struct device *dev)
pci_read_config32(dev, 0x1c)
);
- intel_gma_init(conf, pci_read_config32(dev, 0x5c) & ~0xf,
+ intel_gma_init(conf, uma_memory_base+256*KiB,
iobase, mmiobase, graphics_base);
#endif
Paul Menzel (paulepanter(a)users.sourceforge.net) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/5867
-gerrit
commit eb0698be57e836356db5602c467eae55280a809b
Author: Paul Menzel <paulepanter(a)users.sourceforge.net>
Date: Sun May 25 12:20:51 2014 +0200
util/board_status/board_status.sh: Save ROM contents in `cbfs.txt`
The ROM content (CBFS content) captured with
cbfstool build/coreboot.rom print
is useful for two reasons.
1. With the used configuration for the build in `.config`, it can be
compared how the size for romstage and ramstage change over time. To
make that reproducible the used toolchain should also be stored
somewhere in the future.
2. With the CBFS content the time stamps can be better interpreted.
For example, the size of the payload file is needed to interpret the
time stamp for loading the payload.
Change-Id: If77ca6412b1710e560f405f9a48df613c1819d36
Signed-off-by: Paul Menzel <paulepanter(a)users.sourceforge.net>
---
util/board_status/board_status.sh | 1 +
1 file changed, 1 insertion(+)
diff --git a/util/board_status/board_status.sh b/util/board_status/board_status.sh
index 3cff231..51868c8 100755
--- a/util/board_status/board_status.sh
+++ b/util/board_status/board_status.sh
@@ -145,6 +145,7 @@ tmpdir=$(mktemp -d)
cbfstool_cmd="util/cbfstool/cbfstool"
test_cmd $LOCAL "$cbfstool_cmd"
$cbfstool_cmd build/coreboot.rom extract -n config -f ${tmpdir}/config.txt
+$cbfstool_cmd build/coreboot.rom print > ${tmpdir}/cbfs.txt
mainboard_dir="$(grep CONFIG_MAINBOARD_DIR ${tmpdir}/config.txt | awk -F '"' '{ print $2 }')"
vendor=$(echo "$mainboard_dir" | awk -F '/' '{ print $1 }')
mainboard=$(echo "$mainboard_dir" | awk -F '/' '{ print $2 }')