summaryrefslogtreecommitdiff
path: root/src/arch/x86
diff options
context:
space:
mode:
authorKyösti Mälkki <kyosti.malkki@gmail.com>2018-12-23 07:13:16 +0200
committerKyösti Mälkki <kyosti.malkki@gmail.com>2019-11-21 19:42:43 +0000
commit79ca4b55c5034e459e33bcce51456ea2a0420cf1 (patch)
treeea4778569a2657a116b541316ce6464eff3f2083 /src/arch/x86
parent35a047c4e5bce26bf355320ed61681bc07fefae9 (diff)
downloadcoreboot-79ca4b55c5034e459e33bcce51456ea2a0420cf1.tar.xz
arch/x86: Remove copy_and_run()
Nothing but a wrapper for run_ramstage() with an ugly name. Change-Id: Ie443a27cf18f829496ddadcc19c4ebec6a0b5a59 Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/30389 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Diffstat (limited to 'src/arch/x86')
-rw-r--r--src/arch/x86/Makefile.inc2
-rw-r--r--src/arch/x86/cbfs_and_run.c20
-rw-r--r--src/arch/x86/include/arch/stages.h4
3 files changed, 0 insertions, 26 deletions
diff --git a/src/arch/x86/Makefile.inc b/src/arch/x86/Makefile.inc
index cc094d111f..737f254d6b 100644
--- a/src/arch/x86/Makefile.inc
+++ b/src/arch/x86/Makefile.inc
@@ -225,7 +225,6 @@ romstage-$(CONFIG_HAVE_ACPI_RESUME) += acpi_s3.c
# environment.
romstage-$(CONFIG_C_ENVIRONMENT_BOOTBLOCK) += gdt_init.S
romstage-y += cbmem.c
-romstage-y += cbfs_and_run.c
romstage-$(CONFIG_IDT_IN_EVERY_STAGE) += exception.c
romstage-$(CONFIG_IDT_IN_EVERY_STAGE) += idt.S
romstage-y += memmove.c
@@ -259,7 +258,6 @@ postcar-generic-ccopts += -D__POSTCAR__
postcar-$(CONFIG_HAVE_ACPI_RESUME) += acpi_s3.c
postcar-y += gdt_init.S
-postcar-y += cbfs_and_run.c
postcar-$(CONFIG_IDT_IN_EVERY_STAGE) += exception.c
postcar-$(CONFIG_IDT_IN_EVERY_STAGE) += idt.S
postcar-y += exit_car.S
diff --git a/src/arch/x86/cbfs_and_run.c b/src/arch/x86/cbfs_and_run.c
deleted file mode 100644
index 5ca2c896e5..0000000000
--- a/src/arch/x86/cbfs_and_run.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * 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.
- */
-
-#include <arch/stages.h>
-#include <program_loading.h>
-
-asmlinkage void copy_and_run(void)
-{
- run_ramstage();
-}
diff --git a/src/arch/x86/include/arch/stages.h b/src/arch/x86/include/arch/stages.h
index 3ef3cae148..0726cac1b1 100644
--- a/src/arch/x86/include/arch/stages.h
+++ b/src/arch/x86/include/arch/stages.h
@@ -14,8 +14,4 @@
#ifndef __ARCH_STAGES_H
#define __ARCH_STAGES_H
-#include <arch/cpu.h>
-
-asmlinkage void copy_and_run(void);
-
#endif