[coreboot-gerrit] Patch set updated for coreboot: a259dad Revert arm cbfs removal from b6b1077ee

[Alexander Couzens (lynxis@fe80.eu)]

Alexander Couzens (lynxis at fe80.eu) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/7191

-gerrit

commit a259dad377c83b86837104e5e70cf380b25c3578
Author: Alexander Couzens <lynxis at fe80.eu>
Date:   Sat Oct 25 02:17:53 2014 +0200

    Revert arm cbfs removal from b6b1077ee
    
    This fixes the build for a10/cubieboard
    
    Change-Id: Ib393a4f10381e83bce7ed5fe8378d30e12411263
    Signed-off-by: Alexander Couzens <lynxis at fe80.eu>
---
 src/arch/arm/armv7/bootblock.S | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/arch/arm/armv7/bootblock.S b/src/arch/arm/armv7/bootblock.S
index a8d0973..1488049 100644
--- a/src/arch/arm/armv7/bootblock.S
+++ b/src/arch/arm/armv7/bootblock.S
@@ -33,6 +33,17 @@
 
 .section ".start", "a", %progbits
 ENTRY(_start)
+  b	reset
+	.balignl 16,0xdeadbeef
+
+_cbfs_master_header:
+	/* The CBFS master header is inserted by cbfstool at the first
+	 * aligned offset after the above anchor string is found.
+	 * Hence, we leave some space for it.
+	 */
+	.skip 128			@ Assumes 64-byte alignment
+
+reset:
 	/*
 	 * Set the cpu to System mode with IRQ and FIQ disabled. Prefetch/Data
 	 * aborts may happen early and crash before the abort handlers are