[coreboot] [commit] r5694 - in trunk/src/arch/i386: . init

[repository service]

Author: stepan
Date: Sat Aug 14 19:31:49 2010
New Revision: 5694
URL: https://tracker.coreboot.org/trac/coreboot/changeset/5694

Log:
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 at coresystems.de>
Acked-by: Stefan Reinauer <stepan at coresystems.de>

Added:
   trunk/src/arch/i386/init/prologue.inc
      - copied unchanged from r5692, trunk/src/arch/i386/init/crt0_prologue.inc
Deleted:
   trunk/src/arch/i386/init/bootblock_prologue.c
   trunk/src/arch/i386/init/crt0_prologue.inc
Modified:
   trunk/src/arch/i386/Makefile.bootblock.inc
   trunk/src/arch/i386/Makefile.inc

Modified: trunk/src/arch/i386/Makefile.bootblock.inc
==============================================================================
--- trunk/src/arch/i386/Makefile.bootblock.inc	Sat Aug 14 19:27:27 2010	(r5693)
+++ trunk/src/arch/i386/Makefile.bootblock.inc	Sat Aug 14 19:31:49 2010	(r5694)
@@ -29,7 +29,7 @@
 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

Modified: trunk/src/arch/i386/Makefile.inc
==============================================================================
--- trunk/src/arch/i386/Makefile.inc	Sat Aug 14 19:27:27 2010	(r5693)
+++ trunk/src/arch/i386/Makefile.inc	Sat Aug 14 19:31:49 2010	(r5694)
@@ -113,7 +113,7 @@
 #######################################################################
 # 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)

Copied: trunk/src/arch/i386/init/prologue.inc (from r5692, trunk/src/arch/i386/init/crt0_prologue.inc)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/src/arch/i386/init/prologue.inc	Sat Aug 14 19:31:49 2010	(r5694, copy of r5692, trunk/src/arch/i386/init/crt0_prologue.inc)
@@ -0,0 +1,29 @@
+/*
+ * 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>
+#include <cpu/x86/stack.h>
+
+.section ".rom.data", "a", @progbits
+.section ".rom.text", "ax", @progbits
+
+/* This is the entry code. The code in the .reset section jumps here. */
+
+	post_code(0x01)
+