summaryrefslogtreecommitdiff
path: root/src/mainboard
diff options
context:
space:
mode:
authorDavid Hendricks <dhendrix@chromium.org>2013-01-31 17:05:50 -0800
committerRonald G. Minnich <rminnich@gmail.com>2013-02-01 03:25:30 +0100
commit50c0a50ac6a3fa54ed1286e8b76f933701b6d053 (patch)
tree7db0043dc830d9c522639b7bb3b98c2529dcdc88 /src/mainboard
parent79e36d90608a929c33b655c6fb6376f33f332e6f (diff)
armv7: unify stage hand-off routines
This replaces the current stage-specific exit/entry functions with generic versions. Now all stages compile with stage_entry(), which is placed at .text.stage_entry.armv7, and stage_exit(). Snow's ramstage files are also updated to avoid build breakage. Change-Id: I953a2c4b8121bd4b66c3362557997a9ca3aa53b0 Signed-off-by: David Hendricks <dhendrix@chromium.org> Reviewed-on: http://review.coreboot.org/2254 Reviewed-by: Ronald G. Minnich <rminnich@gmail.com> Tested-by: build bot (Jenkins)
Diffstat (limited to 'src/mainboard')
-rw-r--r--src/mainboard/google/snow/Makefile.inc1
-rw-r--r--src/mainboard/google/snow/mainboard.c2
-rw-r--r--src/mainboard/google/snow/ramstage.c32
3 files changed, 34 insertions, 1 deletions
diff --git a/src/mainboard/google/snow/Makefile.inc b/src/mainboard/google/snow/Makefile.inc
index 26378dbbbe..a43bcbcc16 100644
--- a/src/mainboard/google/snow/Makefile.inc
+++ b/src/mainboard/google/snow/Makefile.inc
@@ -28,6 +28,7 @@ romstage-y += romstage.c
romstage-y += smdk5250_spl.c
ramstage-y += smdk5250_spl.c
#ramstage-y += mainboard.c
+ramstage-y += ramstage.c
# romstage-$(CONFIG_CHROMEOS) += chromeos.c
diff --git a/src/mainboard/google/snow/mainboard.c b/src/mainboard/google/snow/mainboard.c
index 00b3e93f00..f11f1fa395 100644
--- a/src/mainboard/google/snow/mainboard.c
+++ b/src/mainboard/google/snow/mainboard.c
@@ -18,6 +18,7 @@
*/
#include <device/device.h>
+#include <console/console.h>
// mainboard_enable is executed as first thing after
// enumerate_buses().
@@ -31,4 +32,3 @@ struct chip_operations mainboard_ops = {
.name = "Samsung/Google ARM ChromeBook",
.enable_dev = mainboard_enable,
};
-
diff --git a/src/mainboard/google/snow/ramstage.c b/src/mainboard/google/snow/ramstage.c
new file mode 100644
index 0000000000..50050d37a5
--- /dev/null
+++ b/src/mainboard/google/snow/ramstage.c
@@ -0,0 +1,32 @@
+/*
+ * Copyright (C) 2013 The ChromeOS Authors
+ *
+ * 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., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ */
+
+#include <console/console.h>
+
+void main(void)
+{
+// volatile unsigned long *pshold = (unsigned long *)0x1004330c;
+// *pshold &= ~0x100; /* shut down */
+
+ /* FIXME: console_init() seems to cause things to die... Maybe
+ we need to reset our stack pointer? */
+// console_init();
+ printk(BIOS_INFO, "hello from ramstage\n");
+ while (1);
+}