coreboot-gerrit April 2015

coreboot-gerrit@coreboot.org

1 participants
3044 discussions

Patch merged into coreboot/master: 424d79b storm: fix CBFS definitions
by gerrit＠coreboot.org 07 Apr '15

07 Apr '15

the following patch was just integrated into master: commit 424d79b02900011eaa851306f71d2e76b13b4740 Author: Vadim Bendebury <vbendeb(a)chromium.org> Date: Fri Oct 10 13:35:01 2014 -0700 storm: fix CBFS definitions It's been a while since SBL blob size was reduced. As CBFS area by definition includes the bootblock, storm configuration needs to be updated to address the changes in layout. Incidentally, it looks like CBFS_SIZE configuration setting is not used on ARM platforms, this will have to be addressed separately. BRANCH=storm BUG=chromium:422501 TEST=storm firmware does not report the failure to find payload anymore Original-Change-Id: I37abf76a9d8884b3431633f57f64896c3a5fb135 Original-Signed-off-by: Vadim Bendebury <vbendeb(a)chromium.org> Original-Reviewed-on: https://chromium-review.googlesource.com/222898 Original-Reviewed-by: Aaron Durbin <adurbin(a)chromium.org> (cherry picked from commit b104d5c1c328b8bd9c6f926ed4fe3e4948860fbc) Signed-off-by: Aaron Durbin <adurbin(a)chromium.org> Change-Id: I2800bf4ac6383c5ceb47330f07efaaf64e5d80d9 Reviewed-on: http://review.coreboot.org/9372 Tested-by: build bot (Jenkins) Reviewed-by: Patrick Georgi <pgeorgi(a)google.com> Reviewed-by: Paul Menzel <paulepanter(a)users.sourceforge.net> See http://review.coreboot.org/9372 for details. -gerrit

1 0

Patch merged into coreboot/master: 4282ffe armv4: correct ARMV4 VERSTAGE guard
by gerrit＠coreboot.org 07 Apr '15

07 Apr '15

the following patch was just integrated into master: commit 4282ffe684eb6cacef94b3ac87d5b081303bca2e Author: Aaron Durbin <adurbin(a)chromium.org> Date: Tue Apr 7 14:15:45 2015 -0500 armv4: correct ARMV4 VERSTAGE guard I overlooked the macro name change from the Kconfig option. 'ARM' and 'V4' should not be separated by a '_'. Change-Id: I8bf0d851e6fd5b5cfc0aa29af2246540c8cb1399 Signed-off-by: Aaron Durbin <adurbin(a)chromium.org> Reviewed-on: http://review.coreboot.org/9371 Tested-by: build bot (Jenkins) Reviewed-by: Patrick Georgi <pgeorgi(a)google.com> Reviewed-by: Paul Menzel <paulepanter(a)users.sourceforge.net> See http://review.coreboot.org/9371 for details. -gerrit

1 0

Patch merged into coreboot/master: 04de971 rmodules: fix linking
by gerrit＠coreboot.org 07 Apr '15

07 Apr '15

the following patch was just integrated into master: commit 04de97113ac6ea6ddbb014906b30d03499974841 Author: Aaron Durbin <adurbin(a)chromium.org> Date: Tue Apr 7 15:44:52 2015 -0500 rmodules: fix linking In commit ec5e5e0d the rmodules linking flags were dropped. This resulted in relocations being removed from the ELF file. The relocation information is quite valuable when needing to perform relocations at runtime. Change-Id: I699477eb023fc6132e03699992dcf81a311d2d48 Signed-off-by: Aaron Durbin <adurbin(a)chromium.org> Reviewed-on: http://review.coreboot.org/9374 Reviewed-by: Stefan Reinauer <stefan.reinauer(a)coreboot.org> Tested-by: build bot (Jenkins) See http://review.coreboot.org/9374 for details. -gerrit

1 0

Patch set updated for coreboot: 2389b54 rmodules: fix linking
by Stefan Reinauer 07 Apr '15

07 Apr '15

Stefan Reinauer (stefan.reinauer(a)coreboot.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/9374 -gerrit commit 2389b5479bd862900d271459dbfd3bec3594ea4b Author: Aaron Durbin <adurbin(a)chromium.org> Date: Tue Apr 7 15:44:52 2015 -0500 rmodules: fix linking In commit ec5e5e0d the rmodules linking flags were dropped. This resulted in relocations being removed from the ELF file. The relocation information is quite valuable when needing to perform relocations at runtime. Change-Id: I699477eb023fc6132e03699992dcf81a311d2d48 Signed-off-by: Aaron Durbin <adurbin(a)chromium.org> --- src/lib/Makefile.inc | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/lib/Makefile.inc b/src/lib/Makefile.inc index f5b2afa..e01d347 100644 --- a/src/lib/Makefile.inc +++ b/src/lib/Makefile.inc @@ -135,8 +135,7 @@ ifeq ($(CONFIG_RELOCATABLE_MODULES),y) ramstage-y += rmodule.c romstage-$(CONFIG_RELOCATABLE_RAMSTAGE) += rmodule.c -RMODULE_LDSCRIPT := $(src)/lib/rmodule.ld -RMODULE_LDFLAGS := -nostartfiles --gc-sections --emit-relocs -z defs -Bsymbolic -T $(RMODULE_LDSCRIPT) +RMODULE_LDFLAGS := -nostartfiles --gc-sections --emit-relocs -z defs -Bsymbolic # rmodule_link_rules is a function that should be called with: # (1) the object name to link @@ -147,7 +146,7 @@ RMODULE_LDFLAGS := -nostartfiles --gc-sections --emit-relocs -z defs -Bsymbolic # rmdoule is named $(1).rmod define rmodule_link $(strip $(1)): $(strip $(2)) $$(COMPILER_RT_rmodules_$(4)) $(obj)/lib/rmodule.rmodules_$(4).ld | $$(RMODTOOL) - $$(LD_rmodules_$(4)) --gc-sections -static -T $(obj)/lib/rmodule.rmodules_$(4).ld --defsym=__heap_size=$(strip $(3)) -o $$@ --start-group $(filter-out %.ld,$(2)) --end-group + $$(LD_rmodules_$(4)) $(RMODULE_LDFLAGS) -T $(obj)/lib/rmodule.rmodules_$(4).ld --defsym=__heap_size=$(strip $(3)) -o $$@ --start-group $(filter-out %.ld,$(2)) --end-group $$(NM_rmodules_$(4)) -n $$@ > $$(basename $$(a)).map $(strip $(1)).rmod: $(strip $(1))

1 0

New patch to review for coreboot: af28a2c rmodules: fix linking
by Aaron Durbin 07 Apr '15

07 Apr '15

Aaron Durbin (adurbin(a)google.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/9374 -gerrit commit af28a2c4fbceb4ac8d6e28a26023e9be5d5ead25 Author: Aaron Durbin <adurbin(a)chromium.org> Date: Tue Apr 7 15:44:52 2015 -0500 rmodules: fix linking In commit ec5e5e0d the rmdoules linking flags were dropped. This resulted in relocations being removed from the ELF file. The relocation information is quite valuable when needing to perform relocations at runtime. Change-Id: I699477eb023fc6132e03699992dcf81a311d2d48 Signed-off-by: Aaron Durbin <adurbin(a)chromium.org> --- src/lib/Makefile.inc | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/lib/Makefile.inc b/src/lib/Makefile.inc index f5b2afa..e01d347 100644 --- a/src/lib/Makefile.inc +++ b/src/lib/Makefile.inc @@ -135,8 +135,7 @@ ifeq ($(CONFIG_RELOCATABLE_MODULES),y) ramstage-y += rmodule.c romstage-$(CONFIG_RELOCATABLE_RAMSTAGE) += rmodule.c -RMODULE_LDSCRIPT := $(src)/lib/rmodule.ld -RMODULE_LDFLAGS := -nostartfiles --gc-sections --emit-relocs -z defs -Bsymbolic -T $(RMODULE_LDSCRIPT) +RMODULE_LDFLAGS := -nostartfiles --gc-sections --emit-relocs -z defs -Bsymbolic # rmodule_link_rules is a function that should be called with: # (1) the object name to link @@ -147,7 +146,7 @@ RMODULE_LDFLAGS := -nostartfiles --gc-sections --emit-relocs -z defs -Bsymbolic # rmdoule is named $(1).rmod define rmodule_link $(strip $(1)): $(strip $(2)) $$(COMPILER_RT_rmodules_$(4)) $(obj)/lib/rmodule.rmodules_$(4).ld | $$(RMODTOOL) - $$(LD_rmodules_$(4)) --gc-sections -static -T $(obj)/lib/rmodule.rmodules_$(4).ld --defsym=__heap_size=$(strip $(3)) -o $$@ --start-group $(filter-out %.ld,$(2)) --end-group + $$(LD_rmodules_$(4)) $(RMODULE_LDFLAGS) -T $(obj)/lib/rmodule.rmodules_$(4).ld --defsym=__heap_size=$(strip $(3)) -o $$@ --start-group $(filter-out %.ld,$(2)) --end-group $$(NM_rmodules_$(4)) -n $$@ > $$(basename $$(a)).map $(strip $(1)).rmod: $(strip $(1))

1 0

Patch set updated for coreboot: 319534b storm: use correct location for SBL blobs
by Stefan Reinauer 07 Apr '15

07 Apr '15

Stefan Reinauer (stefan.reinauer(a)coreboot.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/7998 -gerrit commit 319534bb460d6075541a7dd54f8debd2bc8ded12 Author: Vadim Bendebury <vbendeb(a)chromium.org> Date: Tue Apr 22 18:48:33 2014 -0700 storm: use correct location for SBL blobs The coreboot ebuild will take care of placing the blob at the default location when emerging. CQ-DEPEND=CL:196414 BUG=chrome-os-partner:28059 TEST=manual 'emerge-storm coreboot' succeeds again Original-Change-Id: I82c9350eb70f231a0c76b63261518096dbad926c Original-Signed-off-by: Vadim Bendebury <vbendeb(a)chromium.org> Original-Reviewed-on: https://chromium-review.googlesource.com/196406 Original-Reviewed-by: Stefan Reinauer <reinauer(a)chromium.org> (cherry picked from commit dfc52febbf7d76279abd5d2703a9f9f9a6fcc92c) Signed-off-by: Marc Jones <marc.jones(a)se-eng.com> Change-Id: Iffdb14a114999b61967387b00461d602635c82d8 --- src/soc/qualcomm/ipq806x/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/soc/qualcomm/ipq806x/Kconfig b/src/soc/qualcomm/ipq806x/Kconfig index 9e6a053..2a1e5e6 100644 --- a/src/soc/qualcomm/ipq806x/Kconfig +++ b/src/soc/qualcomm/ipq806x/Kconfig @@ -41,7 +41,7 @@ config MBN_ENCAPSULATION config SBL_BLOB depends on USE_BLOBS string "file name of the Qualcomm SBL blob" - default "3rdparty/cpu/qualcomm/ipq8064/sbls.bin" + default "3rdparty/cpu/qualcomm/ipq806x/sbls.bin" help The path and filename of the binary blob containing ipq806x early initialization code, as supplied by the

1 0

Patch merged into coreboot/master: 8e44261 tegra132: Provide weak implementation of usb_setup_utmip in funitcfg.c
by gerrit＠coreboot.org 07 Apr '15

07 Apr '15

the following patch was just integrated into master: commit 8e44261b0801e88f12f052490b47013636fbd866 Author: Furquan Shaikh <furquan(a)google.com> Date: Sat Oct 4 17:27:55 2014 -0700 tegra132: Provide weak implementation of usb_setup_utmip in funitcfg.c Provide a weak implemenation of usb_setup_utmip function for those stages that do not include usb.c. BUG=chrome-os-partner:32684 BRANCH=None TEST=Compiles successfully Change-Id: Ia659b7f64e6c3e23053837337ccd267d4c179fba Signed-off-by: Patrick Georgi <pgeorgi(a)chromium.org> Original-Commit-Id: 49487e5af4471bff708d8939492af15fb5cb9e64 Original-Change-Id: Ib235cf039a17204ef7e06d545a3c86b75aff5b4c Original-Signed-off-by: Furquan Shaikh <furquan(a)google.com> Original-Reviewed-on: https://chromium-review.googlesource.com/221575 Original-Tested-by: Furquan Shaikh <furquan(a)chromium.org> Original-Reviewed-by: Aaron Durbin <adurbin(a)chromium.org> Original-Commit-Queue: Furquan Shaikh <furquan(a)chromium.org> Reviewed-on: http://review.coreboot.org/9325 Tested-by: build bot (Jenkins) Reviewed-by: Paul Menzel <paulepanter(a)users.sourceforge.net> Reviewed-by: Furquan Shaikh <furquan(a)google.com> See http://review.coreboot.org/9325 for details. -gerrit

1 0

New patch to review for coreboot: 3dd3c3e cbfs: Enforce media->map() result checking, improve error messages
by Aaron Durbin 07 Apr '15

07 Apr '15

Aaron Durbin (adurbin(a)google.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/9373 -gerrit commit 3dd3c3e7f18b1b21db06d8570572f03ae2659699 Author: Julius Werner <jwerner(a)chromium.org> Date: Fri Oct 10 14:11:11 2014 -0700 cbfs: Enforce media->map() result checking, improve error messages If you try to boot a VBOOT2_VERIFY_FIRMWARE with less than 4K CBFS cache right now, your system will try and fail to validate the FMAP signature at (u8 *)0xFFFFFFFF and go into recovery mode. This patch avoids the memcmp() to potentially invalid memory, and also adds an error message to cbfs_simple_buffer_map() to make it explicit that we ran out of CBFS cache space. BUG=None TEST=Booted on Veyron_Pinky with reduced CBFS cache, saw the message. Original-Change-Id: Ic5773b4e0b36dc621513f58fc9bd29c17afbf1b7 Original-Signed-off-by: Julius Werner <jwerner(a)chromium.org> Original-Reviewed-on: https://chromium-review.googlesource.com/222899 Original-Reviewed-by: Aaron Durbin <adurbin(a)chromium.org> (cherry picked from commit 0ed3c0c2b63be0d32e8162faf892e41cef1f1f23) Signed-off-by: Aaron Durbin <adurbin(a)chromium.org> Change-Id: I20ccac83bff4a377caca6327d0e21032efff44c1 --- src/lib/cbfs.c | 5 ++++- src/vendorcode/google/chromeos/fmap.c | 3 ++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/lib/cbfs.c b/src/lib/cbfs.c index fc6e887..84638da 100644 --- a/src/lib/cbfs.c +++ b/src/lib/cbfs.c @@ -175,8 +175,11 @@ void *cbfs_simple_buffer_map(struct cbfs_simple_buffer *buffer, "allocated=%zd, size=%zd, last_allocate=%zd\n", offset, count, buffer->allocated, buffer->size, buffer->last_allocate); - if (buffer->allocated + count > buffer->size) + if (buffer->allocated + count > buffer->size) { + ERROR("simple_buffer: no room to map %zd bytes from %#zx\n", + count, offset); return CBFS_MEDIA_INVALID_MAP_ADDRESS; + } if (media->read(media, address, offset, count) != count) { ERROR("simple_buffer: fail to read %zd bytes from 0x%zx\n", count, offset); diff --git a/src/vendorcode/google/chromeos/fmap.c b/src/vendorcode/google/chromeos/fmap.c index a8425c0..7c1f626 100644 --- a/src/vendorcode/google/chromeos/fmap.c +++ b/src/vendorcode/google/chromeos/fmap.c @@ -51,7 +51,8 @@ const struct fmap *fmap_find(void) media->close(media); #endif - if (memcmp(fmap, FMAP_SIGNATURE, sizeof(FMAP_SIGNATURE)-1)) { + if (fmap == CBFS_MEDIA_INVALID_MAP_ADDRESS || + memcmp(fmap, FMAP_SIGNATURE, sizeof(FMAP_SIGNATURE) - 1)) { printk(BIOS_DEBUG, "No FMAP found at %p.\n", fmap); return NULL; }

1 0

New patch to review for coreboot: 5c16e26 storm: fix CBFS definitions
by Aaron Durbin 07 Apr '15

07 Apr '15

Aaron Durbin (adurbin(a)google.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/9372 -gerrit commit 5c16e26e5901d5559b1d15a21d95bef2e0f4f6ac Author: Vadim Bendebury <vbendeb(a)chromium.org> Date: Fri Oct 10 13:35:01 2014 -0700 storm: fix CBFS definitions It's been a while since SBL blob size was reduced. As CBFS area by definition includes the bootblock, storm configuration needs to be updated to address the changes in layout. Incidentally, it looks like CBFS_SIZE configuration setting is not used on ARM platforms, this will have to be addressed separately. BRANCH=storm BUG=chromium:422501 TEST=storm firmware does not report the failure to find payload anymore Original-Change-Id: I37abf76a9d8884b3431633f57f64896c3a5fb135 Original-Signed-off-by: Vadim Bendebury <vbendeb(a)chromium.org> Original-Reviewed-on: https://chromium-review.googlesource.com/222898 Original-Reviewed-by: Aaron Durbin <adurbin(a)chromium.org> (cherry picked from commit b104d5c1c328b8bd9c6f926ed4fe3e4948860fbc) Signed-off-by: Aaron Durbin <adurbin(a)chromium.org> Change-Id: I2800bf4ac6383c5ceb47330f07efaaf64e5d80d9 --- src/soc/qualcomm/ipq806x/Kconfig | 4 ++-- src/soc/qualcomm/ipq806x/memlayout.ld | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/soc/qualcomm/ipq806x/Kconfig b/src/soc/qualcomm/ipq806x/Kconfig index 9e6a053..8cc7233 100644 --- a/src/soc/qualcomm/ipq806x/Kconfig +++ b/src/soc/qualcomm/ipq806x/Kconfig @@ -27,11 +27,11 @@ config BOOTBLOCK_ROM_OFFSET config CBFS_HEADER_ROM_OFFSET hex "offset of master CBFS header in ROM" - default 0x228000 + default 0x1b4000 config CBFS_ROM_OFFSET hex "offset of CBFS data in ROM" - default 0x228080 + default 0x1b4080 config MBN_ENCAPSULATION depends on USE_BLOBS diff --git a/src/soc/qualcomm/ipq806x/memlayout.ld b/src/soc/qualcomm/ipq806x/memlayout.ld index 3059603..de1b129 100644 --- a/src/soc/qualcomm/ipq806x/memlayout.ld +++ b/src/soc/qualcomm/ipq806x/memlayout.ld @@ -29,7 +29,7 @@ SECTIONS TTB(0x2A05C000, 48K) DRAM_START(0x40000000) - CBFS_CACHE(0x405CC000, 192K) + CBFS_CACHE(0x405C0000, 240K) STACK(0x405FC000, 16K) /* TODO: "256K bytes left for TZBSP"... what does that mean? */ BOOTBLOCK(0x40600000, 32K)

1 0

New patch to review for coreboot: f25dfd9 armv4: correct ARMV4 VERSTAGE guard
by Aaron Durbin 07 Apr '15

07 Apr '15

Aaron Durbin (adurbin(a)google.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/9371 -gerrit commit f25dfd999b6f35231b55617e16f6302aca7ccee4 Author: Aaron Durbin <adurbin(a)chromium.org> Date: Tue Apr 7 14:15:45 2015 -0500 armv4: correct ARMV4 VERSTAGE guard I overlooked the macro name change from the Kconfig option. 'ARM' and 'V4' should not be separated by a '_'. Change-Id: I8bf0d851e6fd5b5cfc0aa29af2246540c8cb1399 Signed-off-by: Aaron Durbin <adurbin(a)chromium.org> --- src/arch/arm/armv4/Makefile.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/arch/arm/armv4/Makefile.inc b/src/arch/arm/armv4/Makefile.inc index 8557451..5f12a6a 100644 --- a/src/arch/arm/armv4/Makefile.inc +++ b/src/arch/arm/armv4/Makefile.inc @@ -44,12 +44,12 @@ endif # CONFIG_ARCH_BOOTBLOCK_ARMV4 ## Verstage ################################################################################ -ifeq ($(CONFIG_ARCH_VERSTAGE_ARM_V4),y) +ifeq ($(CONFIG_ARCH_VERSTAGE_ARMV4),y) verstage-c-ccopts += $(armv4_flags) verstage-S-ccopts += $(armv4_flags) verstage-y += cache.c -endif # CONFIG_ARCH_VERSTAGE_ARM_V4 +endif # CONFIG_ARCH_VERSTAGE_ARMV4 ############################################################################### # romstage

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

coreboot-gerrit April 2015