Patchwork move ck804 to tiny bootblock

login
register
about
Submitter Jonathan A. Kollasch
Date 2010-10-26 15:36:27
Message ID <20101026153627.GE1425@tarantulon.kollasch.net>
Download mbox | patch
Permalink /patch/2169/
State Accepted
Commit r5991
Headers show

Comments

Jonathan A. Kollasch - 2010-10-26 15:36:27
Convert all ck804-based boards to tiny bootblock.

Signed-off-by: Jonathan Kollasch <jakllsch@kollasch.net>
---
Patrick Georgi - 2010-10-26 16:05:14
Am 26.10.2010 17:36, schrieb Jonathan A. Kollasch:
> Convert all ck804-based boards to tiny bootblock.
> 
> Signed-off-by: Jonathan Kollasch <jakllsch@kollasch.net>
Acked-by: Patrick Georgi <patrick.georgi@coresystems.de>
Jonathan A. Kollasch - 2010-10-27 20:27:38
On Tue, Oct 26, 2010 at 06:05:14PM +0200, Patrick Georgi wrote:
> Am 26.10.2010 17:36, schrieb Jonathan A. Kollasch:
> > Convert all ck804-based boards to tiny bootblock.
> > 
> > Signed-off-by: Jonathan Kollasch <jakllsch@kollasch.net>
> Acked-by: Patrick Georgi <patrick.georgi@coresystems.de>
> 

r5991.

Patch

Index: src/southbridge/nvidia/ck804/Kconfig
===================================================================
--- src/southbridge/nvidia/ck804/Kconfig	(revision 5989)
+++ src/southbridge/nvidia/ck804/Kconfig	(working copy)
@@ -3,7 +3,12 @@ 
 	select HAVE_HARD_RESET
 	select HAVE_USBDEBUG
 	select IOAPIC
+	select TINY_BOOTBLOCK
 
+config BOOTBLOCK_SOUTHBRIDGE_INIT
+	string  
+	default "southbridge/nvidia/ck804/bootblock.c" if SOUTHBRIDGE_NVIDIA_CK804
+
 config ID_SECTION_OFFSET
 	hex
 	default 0x80 if SOUTHBRIDGE_NVIDIA_CK804
Index: src/southbridge/nvidia/ck804/bootblock.c
===================================================================
--- src/southbridge/nvidia/ck804/bootblock.c	(revision 0)
+++ src/southbridge/nvidia/ck804/bootblock.c	(revision 0)
@@ -0,0 +1,28 @@ 
+/*
+ * This file is part of the coreboot project.
+ *
+ * Copyright (C) 2010 Jonathan Kollasch <jakllsch@kollasch.net>
+ *
+ * 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 <arch/io.h>
+#include <arch/romcc_io.h>
+
+#include "southbridge/nvidia/ck804/ck804_enable_rom.c"
+
+static void bootblock_southbridge_init(void)
+{
+	ck804_enable_rom();
+}
Index: src/mainboard/tyan/s2891/romstage.c
===================================================================
--- src/mainboard/tyan/s2891/romstage.c	(revision 5989)
+++ src/mainboard/tyan/s2891/romstage.c	(working copy)
@@ -69,7 +69,6 @@ 
 
 #include "cpu/amd/model_fxx/init_cpus.c"
 
-#include "southbridge/nvidia/ck804/ck804_enable_rom.c"
 #include "northbridge/amd/amdk8/early_ht.c"
 
 static void sio_setup(void)
@@ -122,9 +121,6 @@ 
 		enumerate_ht_chain();
 
 		sio_setup();
-
-		/* Setup the ck804 */
-		ck804_enable_rom();
 	}
 
 	if (bist == 0) {
Index: src/mainboard/tyan/s2892/romstage.c
===================================================================
--- src/mainboard/tyan/s2892/romstage.c	(revision 5989)
+++ src/mainboard/tyan/s2892/romstage.c	(working copy)
@@ -75,7 +75,6 @@ 
 
 #include "cpu/amd/model_fxx/init_cpus.c"
 
-#include "southbridge/nvidia/ck804/ck804_enable_rom.c"
 #include "northbridge/amd/amdk8/early_ht.c"
 
 static void sio_setup(void)
@@ -116,9 +115,6 @@ 
 		enumerate_ht_chain();
 
 		sio_setup();
-
-		/* Setup the ck804 */
-		ck804_enable_rom();
 	}
 
 	if (bist == 0) {
Index: src/mainboard/tyan/s2895/romstage.c
===================================================================
--- src/mainboard/tyan/s2895/romstage.c	(revision 5989)
+++ src/mainboard/tyan/s2895/romstage.c	(working copy)
@@ -89,7 +89,6 @@ 
 
 #include "cpu/amd/model_fxx/init_cpus.c"
 
-#include "southbridge/nvidia/ck804/ck804_enable_rom.c"
 #include "northbridge/amd/amdk8/early_ht.c"
 
 static void sio_setup(void)
@@ -140,9 +139,6 @@ 
 		enumerate_ht_chain();
 
 		sio_setup();
-
-		/* Setup the ck804 */
-		ck804_enable_rom();
 	}
 
 	if (bist == 0) {
Index: src/mainboard/msi/ms7135/romstage.c
===================================================================
--- src/mainboard/msi/ms7135/romstage.c	(revision 5989)
+++ src/mainboard/msi/ms7135/romstage.c	(working copy)
@@ -85,7 +85,6 @@ 
 #include "cpu/amd/car/post_cache_as_ram.c"
 #include "cpu/amd/model_fxx/init_cpus.c"
 
-#include "southbridge/nvidia/ck804/ck804_enable_rom.c"
 #include "northbridge/amd/amdk8/early_ht.c"
 
 static void sio_setup(void)
@@ -126,9 +125,6 @@ 
 		enumerate_ht_chain();
 
 		sio_setup();
-
-		/* Setup the ck804 */
-		ck804_enable_rom();
 	}
 
 	if (bist == 0) {
Index: src/mainboard/sunw/ultra40/romstage.c
===================================================================
--- src/mainboard/sunw/ultra40/romstage.c	(revision 5989)
+++ src/mainboard/sunw/ultra40/romstage.c	(working copy)
@@ -97,7 +97,6 @@ 
 
 #include "cpu/amd/model_fxx/init_cpus.c"
 
-#include "southbridge/nvidia/ck804/ck804_enable_rom.c"
 #include "northbridge/amd/amdk8/early_ht.c"
 
 static void sio_setup(void)
@@ -147,9 +146,6 @@ 
 		enumerate_ht_chain();
 
 		sio_setup();
-
-		/* Setup the ck804 */
-		ck804_enable_rom();
         }
 
         if (bist == 0) {
Index: src/mainboard/asus/a8n_e/romstage.c
===================================================================
--- src/mainboard/asus/a8n_e/romstage.c	(revision 5989)
+++ src/mainboard/asus/a8n_e/romstage.c	(working copy)
@@ -79,7 +79,6 @@ 
 #include "cpu/amd/car/post_cache_as_ram.c"
 #include "cpu/amd/model_fxx/init_cpus.c"
 
-#include "southbridge/nvidia/ck804/ck804_enable_rom.c"
 #include "northbridge/amd/amdk8/early_ht.c"
 
 static void sio_setup(void)
@@ -119,9 +118,6 @@ 
 		enumerate_ht_chain();
 
 		sio_setup();
-
-		/* Setup the ck804 */
-		ck804_enable_rom();
 	}
 
 	if (bist == 0)