[coreboot-gerrit] New patch to review for coreboot: 077e4af armv7-m: add bootblock entry point

[Patrick Georgi (pgeorgi@google.com)]

Patrick Georgi (pgeorgi at google.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/9382

-gerrit

commit 077e4af3e741e9b1c49ab4e893f32b2a430ab122
Author: Daisuke Nojiri <dnojiri at chromium.org>
Date:   Thu Oct 23 11:51:18 2014 -0700

    armv7-m: add bootblock entry point
    
    this adds an entry point jumping to main for the bootblock.
    
    BUG=None
    BRANCH=ToT
    TEST=Built coreboot for cosmos
    Signed-off-by: Daisuke Nojiri <dnojiri at chromium.org>
    
    Change-Id: I1c9ea6ba63a1058e09613d969fe00308260037be
    Signed-off-by: Patrick Georgi <pgeorgi at chromium.org>
    Original-Commit-Id: 662d0083f25008b55b9bc5fbce9e30e6b80c2c65
    Original-Change-Id: I74f2f5e3b3961ab54a7913e6b3a3ab0e6fd813a3
    Original-Reviewed-on: https://chromium-review.googlesource.com/225205
    Original-Commit-Queue: Daisuke Nojiri <dnojiri at chromium.org>
    Original-Tested-by: Daisuke Nojiri <dnojiri at chromium.org>
    Original-Reviewed-by: Vadim Bendebury <vbendeb at chromium.org>
---
 src/arch/arm/armv7/Makefile.inc  |  3 ++-
 src/arch/arm/armv7/bootblock_m.S | 35 +++++++++++++++++++++++++++++++++++
 2 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/src/arch/arm/armv7/Makefile.inc b/src/arch/arm/armv7/Makefile.inc
index 951118a..5917216 100644
--- a/src/arch/arm/armv7/Makefile.inc
+++ b/src/arch/arm/armv7/Makefile.inc
@@ -51,9 +51,10 @@ bootblock-c-ccopts += $(armv7-m_flags)
 bootblock-S-ccopts += $(armv7-m_asm_flags)
 
 ifneq ($(CONFIG_ARM_BOOTBLOCK_CUSTOM),y)
+bootblock-y += bootblock_m.S
 bootblock-y += bootblock_simple.c
-bootblock-y += exception_m.c
 endif
+bootblock-y += exception_m.c
 
 endif # CONFIG_ARCH_BOOTBLOCK_ARMV7
 
diff --git a/src/arch/arm/armv7/bootblock_m.S b/src/arch/arm/armv7/bootblock_m.S
new file mode 100644
index 0000000..0a29a0b
--- /dev/null
+++ b/src/arch/arm/armv7/bootblock_m.S
@@ -0,0 +1,35 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * Copyright 2014 Google Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ */
+
+#include <arch/asm.h>
+
+ENTRY(_start)
+	bl	main
+ENDPROC(_start)