[coreboot-gerrit] New patch to review for coreboot: b6e847a tegra124: Call into the mainboard bootblock init if one exists.

[Isaac Christensen (isaac.christensen@se-eng.com)]

Isaac Christensen (isaac.christensen at se-eng.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/6864

-gerrit

commit b6e847a7a21276e01c2317c12e6a33b9072c2bf5
Author: Gabe Black <gabeblack at google.com>
Date:   Thu Oct 10 02:18:39 2013 -0700

    tegra124: Call into the mainboard bootblock init if one exists.
    
    We should seperate out the mainboard specific parts of the bootblock so that
    they can be customized as necessary.
    
    Old-Change-Id: Ia633a68521725f6e88341608ccdbedc4f1ce8223
    Signed-off-by: Gabe Black <gabeblack at google.com>
    Reviewed-on: https://chromium-review.googlesource.com/172581
    Reviewed-by: Ronald Minnich <rminnich at chromium.org>
    Reviewed-by: Julius Werner <jwerner at chromium.org>
    Tested-by: Gabe Black <gabeblack at chromium.org>
    Commit-Queue: Gabe Black <gabeblack at chromium.org>
    (cherry picked from commit 3a0cd48a0d1a9ce6b32ed614cd81fb81f5f82aec)
    
    nyan: Add a mainboard specific bootblock.
    
    We need somewhere to put mainboard specific bootblock initialization.
    
    Old-Change-Id: Ief409baff5ae67871879291c7ff0533f19ea6e56
    Signed-off-by: Gabe Black <gabeblack at google.com>
    Reviewed-on: https://chromium-review.googlesource.com/172582
    Reviewed-by: Ronald Minnich <rminnich at chromium.org>
    Reviewed-by: Julius Werner <jwerner at chromium.org>
    Tested-by: Gabe Black <gabeblack at chromium.org>
    Commit-Queue: Gabe Black <gabeblack at chromium.org>
    (cherry picked from commit a83d065d660a26fe71ed79879c25f84a1b669f69)
    
    Squashed two commits for a nyan specific bootblock.
    
    Change-Id: I25808a19ffa744e439e677ac329a9c68b03bd7e7
    Signed-off-by: Isaac Christensen <isaac.christensen at se-eng.com>
---
 src/mainboard/google/nyan/Kconfig      |  1 +
 src/mainboard/google/nyan/Makefile.inc |  2 ++
 src/mainboard/google/nyan/bootblock.c  | 24 ++++++++++++++++++++++++
 src/soc/nvidia/tegra124/bootblock.c    |  3 +++
 4 files changed, 30 insertions(+)

diff --git a/src/mainboard/google/nyan/Kconfig b/src/mainboard/google/nyan/Kconfig
index 5ac58d3..3c066ac 100644
--- a/src/mainboard/google/nyan/Kconfig
+++ b/src/mainboard/google/nyan/Kconfig
@@ -22,6 +22,7 @@ if BOARD_GOOGLE_NYAN
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select SOC_NVIDIA_TEGRA124
+	select MAINBOARD_HAS_BOOTBLOCK_INIT
 	select BOARD_ROMSIZE_KB_1024
 
 config MAINBOARD_DIR
diff --git a/src/mainboard/google/nyan/Makefile.inc b/src/mainboard/google/nyan/Makefile.inc
index 3cf7dd2..2dfd2a3 100644
--- a/src/mainboard/google/nyan/Makefile.inc
+++ b/src/mainboard/google/nyan/Makefile.inc
@@ -27,6 +27,8 @@ $(obj)/generated/bct.cfg:
 
 subdirs-y += bct
 
+bootblock-y += bootblock.c
+
 romstage-y += romstage.c
 
 ramstage-y += mainboard.c
diff --git a/src/mainboard/google/nyan/bootblock.c b/src/mainboard/google/nyan/bootblock.c
new file mode 100644
index 0000000..f0753d4
--- /dev/null
+++ b/src/mainboard/google/nyan/bootblock.c
@@ -0,0 +1,24 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * Copyright 2013 Google Inc.
+ *
+ * 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
+ */
+
+#include <bootblock_common.h>
+
+void bootblock_mainboard_init(void)
+{
+}
diff --git a/src/soc/nvidia/tegra124/bootblock.c b/src/soc/nvidia/tegra124/bootblock.c
index 07c9b16..cc246c3 100644
--- a/src/soc/nvidia/tegra124/bootblock.c
+++ b/src/soc/nvidia/tegra124/bootblock.c
@@ -18,6 +18,7 @@
  */
 
 #include <arch/hlt.h>
+#include <bootblock_common.h>
 #include <cbfs.h>
 #include <console/console.h>
 
@@ -42,6 +43,8 @@ void main(void)
 	if (CONFIG_BOOTBLOCK_CONSOLE)
 		console_init();
 
+	bootblock_mainboard_init();
+
 	entry = cbfs_load_stage(CBFS_DEFAULT_MEDIA, "fallback/romstage");
 
 	hlt();