sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

copy_and_run.c is not needed twice, and it is used on non-car too.

Browse Source 
So move it to src/arch/i386/lib/cbfs_and_run.c

Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>



git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5387 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
This commit is contained in:
Stefan Reinauer
2010-04-09 10:43:49 +00:00
committed by Stefan Reinauer
parent 10b29d8cfe
commit 853263b963
58 changed files with 73 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/cpu/amd/car/copy_and_run.c
View File

@@ -1,32 +0,0 @@
/*
* 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 __attribute__((regparm(0))) copy_and_run(unsigned cpu_reset)
{
cbfs_and_run_core(CONFIG_CBFS_PREFIX "/coreboot_ram", cpu_reset);
}
#if CONFIG_AP_CODE_IN_CAR == 1
static void __attribute__((regparm(0))) copy_and_run_ap_code_in_car(unsigned ret_addr)
{
cbfs_and_run_core(CONFIG_CBFS_PREFIX "/coreboot_ap", ret_addr);
}
#endif

2
src/cpu/intel/model_106cx/cache_as_ram_disable.c
View File

@@ -17,7 +17,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "cpu/x86/car/copy_and_run.c"
/* called from assembler code */
void stage1_main(unsigned long bist);

2
src/cpu/intel/model_6ex/cache_as_ram_disable.c
View File

@@ -19,7 +19,7 @@
* MA 02110-1301 USA
*/
#include "cpu/x86/car/copy_and_run.c"
/* called from assembler code */
void stage1_main(unsigned long bist);

2
src/cpu/intel/model_6fx/cache_as_ram_disable.c
View File

@@ -19,7 +19,7 @@
* MA 02110-1301 USA
*/
#include "cpu/x86/car/copy_and_run.c"
void real_main(unsigned long bist);

30
src/cpu/x86/car/copy_and_run.c
View File

@@ -1,30 +0,0 @@
/*
* This file is part of the coreboot project.
*
* Copyright (C) 2009-2010 coresystems GmbH
* Written by Patrick Georgi <patrick.georgi@coresystems.de>
* for 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 __attribute__((regparm(0))) copy_and_run(unsigned cpu_reset)
{
if (cpu_reset == 1) cpu_reset = -1;
else cpu_reset = 0;
cbfs_and_run_core(CONFIG_CBFS_PREFIX "/coreboot_ram", cpu_reset);
}