From 853263b963b4cacb4f7fa3a7f2c68dcbd094f1d7 Mon Sep 17 00:00:00 2001 From: Stefan Reinauer Date: Fri, 9 Apr 2010 10:43:49 +0000 Subject: copy_and_run.c is not needed twice, and it is used on non-car too. So move it to src/arch/i386/lib/cbfs_and_run.c Signed-off-by: Stefan Reinauer Acked-by: Stefan Reinauer git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5387 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- src/cpu/amd/car/copy_and_run.c | 32 ------------------------ src/cpu/intel/model_106cx/cache_as_ram_disable.c | 2 +- src/cpu/intel/model_6ex/cache_as_ram_disable.c | 2 +- src/cpu/intel/model_6fx/cache_as_ram_disable.c | 2 +- src/cpu/x86/car/copy_and_run.c | 30 ---------------------- 5 files changed, 3 insertions(+), 65 deletions(-) delete mode 100644 src/cpu/amd/car/copy_and_run.c delete mode 100644 src/cpu/x86/car/copy_and_run.c (limited to 'src/cpu') diff --git a/src/cpu/amd/car/copy_and_run.c b/src/cpu/amd/car/copy_and_run.c deleted file mode 100644 index 0d9317db77..0000000000 --- a/src/cpu/amd/car/copy_and_run.c +++ /dev/null @@ -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 diff --git a/src/cpu/intel/model_106cx/cache_as_ram_disable.c b/src/cpu/intel/model_106cx/cache_as_ram_disable.c index 40269ba5b3..c6363e62dc 100644 --- a/src/cpu/intel/model_106cx/cache_as_ram_disable.c +++ b/src/cpu/intel/model_106cx/cache_as_ram_disable.c @@ -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); diff --git a/src/cpu/intel/model_6ex/cache_as_ram_disable.c b/src/cpu/intel/model_6ex/cache_as_ram_disable.c index c21dd68e8d..29e726a272 100644 --- a/src/cpu/intel/model_6ex/cache_as_ram_disable.c +++ b/src/cpu/intel/model_6ex/cache_as_ram_disable.c @@ -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); diff --git a/src/cpu/intel/model_6fx/cache_as_ram_disable.c b/src/cpu/intel/model_6fx/cache_as_ram_disable.c index fc9a13b307..e085efa170 100644 --- a/src/cpu/intel/model_6fx/cache_as_ram_disable.c +++ b/src/cpu/intel/model_6fx/cache_as_ram_disable.c @@ -19,7 +19,7 @@ * MA 02110-1301 USA */ -#include "cpu/x86/car/copy_and_run.c" + void real_main(unsigned long bist); diff --git a/src/cpu/x86/car/copy_and_run.c b/src/cpu/x86/car/copy_and_run.c deleted file mode 100644 index 005df98c79..0000000000 --- a/src/cpu/x86/car/copy_and_run.c +++ /dev/null @@ -1,30 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright (C) 2009-2010 coresystems GmbH - * Written by Patrick Georgi - * 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); -} -- cgit v1.2.3