Patch set updated for coreboot: 7ddbe1a armv7: add a wrapper for romstage's main() for ARM ISA

[Hung-Te Lin]

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

-gerrit

commit 7ddbe1a17bfdeacb0f9f43f7af9d28a19b897d8a
Author: David Hendricks 
Date:   Thu Jan 17 22:26:36 2013 -0800

armv7: add a wrapper for romstage's main() for ARM ISA

This adds a wrapper around main() in romstage which is compiled using
    -marm. This assumes that the bootblock branches to romstage in ARM
    mode.

(credit to Gabe Black for writing the patch, I'm just uploading it)

Change-Id: I4fdb8d2c6c2c0a7178bcb9154c378ddce0567309
    Signed-off-by: David Hendricks 
    Signed-off-by: Gabe Black 
---
 src/arch/armv7/Makefile.inc          | 13 ++++++++++---
 src/arch/armv7/romstage_main.c       | 26 ++++++++++++++++++++++++++
 src/mainboard/google/snow/romstage.c |  3 ++-
 3 files changed, 38 insertions(+), 4 deletions(-)

diff --git a/src/arch/armv7/Makefile.inc b/src/arch/armv7/Makefile.inc
index 9a3e95f..ff264c5 100644
--- a/src/arch/armv7/Makefile.inc
+++ b/src/arch/armv7/Makefile.inc
@@ -245,13 +245,20 @@ endif
 ################################################################################
 # Build the romstage

+romstage_main_c = $(src)/arch/armv7/romstage_main.c
+romstage_main_o = $(obj)/arch/armv7/romstage_main.o
+
+$(romstage_main_o): $(romstage_main_c)
+	@printf "    CC         $(subst $(obj)/,,$(@))\n"
+	$(CC) -nostdlib -nostartfiles -static -c -o $@ $< -marm
+
 # FIXME(dhendrix): added debug printfs
-$(objcbfs)/romstage.debug: $$(romstage-objs) $(objgenerated)/romstage.ld
+$(objcbfs)/romstage.debug: $$(romstage-objs) $(romstage_main_o) $(objgenerated)/romstage.ld
    @printf "    LINK       $(subst $(obj)/,,$(@))\n"
 ifeq ($(CONFIG_COMPILER_LLVM_CLANG),y)
-	$(LD) -nostdlib -nostartfiles -static -o $@ -L$(obj) $(romstage-objs) -T $(objgenerated)/romstage.ld
+	$(LD) -nostdlib -nostartfiles -static -o $@ -L$(obj) $(romstage-objs) $(romstage_main_o) -T $(objgenerated)/romstage.ld
 else
-	$(CC) -nostdlib -nostartfiles -static -o $@ -L$(obj) -T $(objgenerated)/romstage.ld -Wl,--start-group $(romstage-objs) $(LIBGCC_FILE_NAME) -Wl,--end-group
+	$(CC) -nostdlib -nostartfiles -static -o $@ -L$(obj) -T $(objgenerated)/romstage.ld -Wl,--start-group $(romstage-objs) $(romstage_main_o) $(LIBGCC_FILE_NAME) -Wl,--end-group
 endif

$(objgenerated)/romstage.ld: $$(ldscripts) $(obj)/ldoptions
diff --git a/src/arch/armv7/romstage_main.c b/src/arch/armv7/romstage_main.c
new file mode 100644
index 0000000..8025c80
--- /dev/null
+++ b/src/arch/armv7/romstage_main.c
@@ -0,0 +1,26 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * Copyright (C) 2012 The ChromiumOS Authors.  All rights reserved.
+ *
+ * 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
+ */
+
+void romstage_main(void);
+
+void main(void) __attribute__((section(".text.startup")));
+void main(void)
+{
+	romstage_main();
+}
diff --git a/src/mainboard/google/snow/romstage.c b/src/mainboard/google/snow/romstage.c
index 859c69e..5577011 100644
--- a/src/mainboard/google/snow/romstage.c
+++ b/src/mainboard/google/snow/romstage.c
@@ -42,7 +42,8 @@ static void mmu_setup(void)
    dram_bank_mmu_setup(CONFIG_SYS_SDRAM_BASE, CONFIG_DRAM_SIZE_MB * 1024);
 }

-void main(void)
+void romstage_main(void);
+void romstage_main(void) 
 {
 //	volatile unsigned long *pshold = (unsigned long *)0x1004330c;
 //	i2c_init(CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE);