[coreboot-gerrit] New patch to review for coreboot: 3e0de8f am335x: Revert how the header load size is calculated to an earlier method.

Gabe Black (gabeblack@chromium.org) gerrit at coreboot.org
Tue Jun 11 03:02:28 CEST 2013


Gabe Black (gabeblack at chromium.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/3432

-gerrit

commit 3e0de8f81f5d412f6967b97750438f0238139137
Author: Gabe Black <gabeblack at chromium.org>
Date:   Mon Jun 10 20:49:15 2013 -0400

    am335x: Revert how the header load size is calculated to an earlier method.
    
    The current method will treat hex values as 0 and would calculate the wrong
    size. This change switches back to an earlier method which used shell syntax
    to add the offset and size.
    
    Change-Id: I9fb2d9b323f113cc56a5ad2e38b47d2d22084f08
    Signed-off-by: Gabe Black <gabeblack at chromium.org>
---
 src/cpu/ti/am335x/Makefile.inc | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/cpu/ti/am335x/Makefile.inc b/src/cpu/ti/am335x/Makefile.inc
index 7dcdf0f..9279c69 100644
--- a/src/cpu/ti/am335x/Makefile.inc
+++ b/src/cpu/ti/am335x/Makefile.inc
@@ -17,7 +17,10 @@ real-target: $(obj)/MLO
 
 header_ld = $(src)/cpu/ti/am335x/header.ld
 
-get_header_size=$(shell $(CBFSTOOL) $(1) print | grep $(2) | awk '{print $$2 + $$4}')
+get_header_size= \
+	$(eval omap_header_info=$(shell $(CBFSTOOL) $(1) print | grep $(2))) \
+	$(shell echo $$(($(word 2,$(omap_header_info)) + \
+			 $(word 4,$(omap_header_info)))))
 
 $(obj)/omap-header.bin: $$(omap-header-objs) $$(header_ld) $(obj)/coreboot.rom
 	@printf "    CC         $(subst $(obj)/,,$(@))\n"



More information about the coreboot-gerrit mailing list