summaryrefslogtreecommitdiff
path: root/src/arch
diff options
context:
space:
mode:
authorStefan Reinauer <stepan@coresystems.de>2010-08-14 17:31:49 +0000
committerStefan Reinauer <stepan@openbios.org>2010-08-14 17:31:49 +0000
commit8ccbe0509189fe5f801c52745e04f0e8a2470aef (patch)
treee47c41ca99c371ce582aa8fef8fa2e789647a6a5 /src/arch
parenta6f0e1291cd06eb1c226a74d3ee80fcd95079f49 (diff)
downloadcoreboot-8ccbe0509189fe5f801c52745e04f0e8a2470aef.tar.xz
bootblock_prologue.c (not a .c file!) and i386/init/crt0_prologue.inc were
pretty much 1:1 the same file (despite an include and a typo) so drop one instance of it. We only have one prologue.inc for the romstage code now. Signed-off-by: Stefan Reinauer <stepan@coresystems.de> Acked-by: Stefan Reinauer <stepan@coresystems.de> git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5694 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'src/arch')
-rw-r--r--src/arch/i386/Makefile.bootblock.inc2
-rw-r--r--src/arch/i386/Makefile.inc2
-rw-r--r--src/arch/i386/init/bootblock_prologue.c28
-rw-r--r--src/arch/i386/init/prologue.inc (renamed from src/arch/i386/init/crt0_prologue.inc)0
4 files changed, 2 insertions, 30 deletions
diff --git a/src/arch/i386/Makefile.bootblock.inc b/src/arch/i386/Makefile.bootblock.inc
index 9359c46471..9fb78c57b7 100644
--- a/src/arch/i386/Makefile.bootblock.inc
+++ b/src/arch/i386/Makefile.bootblock.inc
@@ -29,7 +29,7 @@ bootblock_lds += $(src)/cpu/x86/16bit/reset16.lds
bootblock_lds += $(src)/arch/i386/lib/id.lds
bootblock_lds += $(chipset_bootblock_lds)
-bootblock_inc = $(src)/arch/i386/init/bootblock_prologue.c
+bootblock_inc = $(src)/arch/i386/init/prologue.inc
bootblock_inc += $(src)/cpu/x86/16bit/entry16.inc
bootblock_inc += $(src)/cpu/x86/16bit/reset16.inc
bootblock_inc += $(src)/cpu/x86/32bit/entry32.inc
diff --git a/src/arch/i386/Makefile.inc b/src/arch/i386/Makefile.inc
index fe0be9be69..76b4bbffc3 100644
--- a/src/arch/i386/Makefile.inc
+++ b/src/arch/i386/Makefile.inc
@@ -113,7 +113,7 @@ endif
#######################################################################
# done
-crt0s = $(src)/arch/i386/init/crt0_prologue.inc
+crt0s = $(src)/arch/i386/init/prologue.inc
ldscripts =
ldscripts += $(src)/arch/i386/init/ldscript_fallback_cbfs.lb
ifeq ($(CONFIG_BIG_BOOTBLOCK),y)
diff --git a/src/arch/i386/init/bootblock_prologue.c b/src/arch/i386/init/bootblock_prologue.c
deleted file mode 100644
index 25da7b769f..0000000000
--- a/src/arch/i386/init/bootblock_prologue.c
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2002 Eric Biederman
- *
- * 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 <cpu/x86/post_code.h>
-
-.section ".rom.data", "a", @progbits
-.section ".rom.text", "ax", @progbits
-
-/* This is the entry codde. The code in the .reset section jumps here. */
-
- post_code(0x01)
-
diff --git a/src/arch/i386/init/crt0_prologue.inc b/src/arch/i386/init/prologue.inc
index 8947f20de3..8947f20de3 100644
--- a/src/arch/i386/init/crt0_prologue.inc
+++ b/src/arch/i386/init/prologue.inc