Author: jakllsch Date: Tue Oct 26 18:10:20 2010 New Revision: 5991 URL: https://tracker.coreboot.org/trac/coreboot/changeset/5991
Log: Convert all ck804-based boards to tiny bootblock.
Signed-off-by: Jonathan Kollasch jakllsch@kollasch.net Acked-by: Patrick Georgi patrick.georgi@coresystems.de
Added: trunk/src/southbridge/nvidia/ck804/bootblock.c Modified: trunk/src/mainboard/asus/a8n_e/romstage.c trunk/src/mainboard/msi/ms7135/romstage.c trunk/src/mainboard/sunw/ultra40/romstage.c trunk/src/mainboard/tyan/s2891/romstage.c trunk/src/mainboard/tyan/s2892/romstage.c trunk/src/mainboard/tyan/s2895/romstage.c trunk/src/southbridge/nvidia/ck804/Kconfig
Modified: trunk/src/mainboard/asus/a8n_e/romstage.c ============================================================================== --- trunk/src/mainboard/asus/a8n_e/romstage.c Tue Oct 26 17:51:57 2010 (r5990) +++ trunk/src/mainboard/asus/a8n_e/romstage.c Tue Oct 26 18:10:20 2010 (r5991) @@ -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)
Modified: trunk/src/mainboard/msi/ms7135/romstage.c ============================================================================== --- trunk/src/mainboard/msi/ms7135/romstage.c Tue Oct 26 17:51:57 2010 (r5990) +++ trunk/src/mainboard/msi/ms7135/romstage.c Tue Oct 26 18:10:20 2010 (r5991) @@ -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) {
Modified: trunk/src/mainboard/sunw/ultra40/romstage.c ============================================================================== --- trunk/src/mainboard/sunw/ultra40/romstage.c Tue Oct 26 17:51:57 2010 (r5990) +++ trunk/src/mainboard/sunw/ultra40/romstage.c Tue Oct 26 18:10:20 2010 (r5991) @@ -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) {
Modified: trunk/src/mainboard/tyan/s2891/romstage.c ============================================================================== --- trunk/src/mainboard/tyan/s2891/romstage.c Tue Oct 26 17:51:57 2010 (r5990) +++ trunk/src/mainboard/tyan/s2891/romstage.c Tue Oct 26 18:10:20 2010 (r5991) @@ -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) {
Modified: trunk/src/mainboard/tyan/s2892/romstage.c ============================================================================== --- trunk/src/mainboard/tyan/s2892/romstage.c Tue Oct 26 17:51:57 2010 (r5990) +++ trunk/src/mainboard/tyan/s2892/romstage.c Tue Oct 26 18:10:20 2010 (r5991) @@ -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) {
Modified: trunk/src/mainboard/tyan/s2895/romstage.c ============================================================================== --- trunk/src/mainboard/tyan/s2895/romstage.c Tue Oct 26 17:51:57 2010 (r5990) +++ trunk/src/mainboard/tyan/s2895/romstage.c Tue Oct 26 18:10:20 2010 (r5991) @@ -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) {
Modified: trunk/src/southbridge/nvidia/ck804/Kconfig ============================================================================== --- trunk/src/southbridge/nvidia/ck804/Kconfig Tue Oct 26 17:51:57 2010 (r5990) +++ trunk/src/southbridge/nvidia/ck804/Kconfig Tue Oct 26 18:10:20 2010 (r5991) @@ -3,6 +3,11 @@ 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
Added: trunk/src/southbridge/nvidia/ck804/bootblock.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/src/southbridge/nvidia/ck804/bootblock.c Tue Oct 26 18:10:20 2010 (r5991) @@ -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(); +}