From 56a684a2ee52b765fc69ec8c922c3da9d8ab7430 Mon Sep 17 00:00:00 2001 From: Stefan Reinauer Date: Wed, 7 Apr 2010 15:40:26 +0000 Subject: - copy_and_run() gets the same calling convention on AMD and on all the others. - some vx800 Kconfig fixes - remove warnings... Signed-off-by: Stefan Reinauer Acked-by: Stefan Reinauer git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5372 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- src/cpu/amd/car/copy_and_run.c | 27 ++++++++++++++++++++------- src/cpu/amd/car/post_cache_as_ram.c | 2 +- 2 files changed, 21 insertions(+), 8 deletions(-) (limited to 'src/cpu/amd/car') diff --git a/src/cpu/amd/car/copy_and_run.c b/src/cpu/amd/car/copy_and_run.c index a6d5fe1314..fbe3adef84 100644 --- a/src/cpu/amd/car/copy_and_run.c +++ b/src/cpu/amd/car/copy_and_run.c @@ -1,17 +1,30 @@ -/* by yhlu 6.2005 - moved from nrv2v.c and some lines from crt0.S - 2006/05/02 - stepan: move nrv2b to an extra file. -*/ +/* + * This file is part of the coreboot project. + * + * Copyright (C) 2009-2010 coresystems GmbH + * + * 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 cbfs_and_run_core(const char *filename, unsigned ebp); -static void copy_and_run(void) +static void copy_and_run(unsigned cpu_reset) { - cbfs_and_run_core(CONFIG_CBFS_PREFIX "/coreboot_ram", 0); + cbfs_and_run_core(CONFIG_CBFS_PREFIX "/coreboot_ram", cpu_reset); } #if CONFIG_AP_CODE_IN_CAR == 1 - static void copy_and_run_ap_code_in_car(unsigned ret_addr) { cbfs_and_run_core(CONFIG_CBFS_PREFIX "/coreboot_ap", ret_addr); diff --git a/src/cpu/amd/car/post_cache_as_ram.c b/src/cpu/amd/car/post_cache_as_ram.c index b8a7285b89..ee89a55588 100644 --- a/src/cpu/amd/car/post_cache_as_ram.c +++ b/src/cpu/amd/car/post_cache_as_ram.c @@ -112,7 +112,7 @@ static void post_cache_as_ram(void) // wait_all_core0_mem_trained(sysinfox); // moved to lapic_init_cpus.c #endif /*copy and execute coreboot_ram */ - copy_and_run(); + copy_and_run(0); /* We will not return */ print_debug("should not be here -\n"); -- cgit v1.2.3