Patch set updated for coreboot: ce69d63 build system: rename mips/bootblock.inc to mips/bootblock.S

[Patrick Georgi]

Patrick Georgi ([e-mail]) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/9108

-gerrit

commit ce69d63ca1dd271e481701c56e9203f4fe52f449
Author: Patrick Georgi 
Date:   Fri Mar 27 14:03:22 2015 +0100

build system: rename mips/bootblock.inc to mips/bootblock.S

This is inspired by the commit listed below, but rewritten to match
    upstream, and split in smaller pieces to keep intent clear.

Change-Id: I192fa50989b586fd8e967d4c22db56ac9de7a30e
    Signed-off-by: Patrick Georgi 
    Based-On-Change-Id: I50af7dacf616e0f8ff4c43f4acc679089ad7022b
    Based-On-Signed-off-by: Julius Werner 
    Based-On-Reviewed-on: https://chromium-review.googlesource.com/219170
---
 src/arch/mips/Makefile.inc  |  2 +-
 src/arch/mips/bootblock.S   | 44 ++++++++++++++++++++++++++++++++++++++++++++
 src/arch/mips/bootblock.inc | 44 --------------------------------------------
 3 files changed, 45 insertions(+), 45 deletions(-)

diff --git a/src/arch/mips/Makefile.inc b/src/arch/mips/Makefile.inc
index 956f2d5..42c3007 100644
--- a/src/arch/mips/Makefile.inc
+++ b/src/arch/mips/Makefile.inc
@@ -44,7 +44,7 @@ bootblock-y += ../../lib/memset.c

bootblock_lds = $(src)/arch/mips/bootblock.ld

-bootblock_inc += $(src)/arch/mips/bootblock.inc
+bootblock_inc += $(src)/arch/mips/bootblock.S
 bootblock_inc += $(objgenerated)/bootblock.inc

# Much of the assembly code is generated by the compiler, and may contain
diff --git a/src/arch/mips/bootblock.S b/src/arch/mips/bootblock.S
new file mode 100644
index 0000000..dbde803
--- /dev/null
+++ b/src/arch/mips/bootblock.S
@@ -0,0 +1,44 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * Copyright (C) 2014 Imagination Technologies
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+.set	noreorder	/* Prevent assembler from "optimizing" this code. */
+
+.section ".start", "ax", %progbits
+.globl _start
+_start:
+	/* Set the stack pointer */
+	li	$sp, CONFIG_BOOTBLOCK_STACK_TOP
+
+	/*
+	 * Initialise the stack to a known value, used later to check for
+	 * overflow.
+	 */
+	li	$t0, CONFIG_BOOTBLOCK_STACK_BOTTOM
+	addi	$t1, $sp, -4
+	li	$t2, 0xdeadbeef
+1:	sw	$t2, 0($t0)
+	bne	$t0, $t1, 1b
+	addi	$t0, $t0, 4
+
+	/* Run main */
+	b	main
+
+	/* Should never return from main. */
+2:
+	b	2b
diff --git a/src/arch/mips/bootblock.inc b/src/arch/mips/bootblock.inc
deleted file mode 100644
index dbde803..0000000
--- a/src/arch/mips/bootblock.inc
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2014 Imagination Technologies
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-.set	noreorder	/* Prevent assembler from "optimizing" this code. */
-
-.section ".start", "ax", %progbits
-.globl _start
-_start:
-	/* Set the stack pointer */
-	li	$sp, CONFIG_BOOTBLOCK_STACK_TOP
-
-	/*
-	 * Initialise the stack to a known value, used later to check for
-	 * overflow.
-	 */
-	li	$t0, CONFIG_BOOTBLOCK_STACK_BOTTOM
-	addi	$t1, $sp, -4
-	li	$t2, 0xdeadbeef
-1:	sw	$t2, 0($t0)
-	bne	$t0, $t1, 1b
-	addi	$t0, $t0, 4
-
-	/* Run main */
-	b	main
-
-	/* Should never return from main. */
-2:
-	b	2b