From 6e5c86ff7da757687772fc9b1fc3ee41a613684c Mon Sep 17 00:00:00 2001 From: Gabe Black Date: Mon, 10 Jun 2013 20:49:15 -0400 Subject: [PATCH] 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 Reviewed-on: http://review.coreboot.org/3432 Tested-by: build bot (Jenkins) Reviewed-by: Ronald G. Minnich --- 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 7dcdf0f77a..9279c6947b 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"