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
This commit is contained in:
		
				
					committed by
					
						 Stefan Reinauer
						Stefan Reinauer
					
				
			
			
				
	
			
			
			
						parent
						
							a6f0e1291c
						
					
				
				
					commit
					8ccbe05091
				
			| @@ -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 | ||||
|   | ||||
| @@ -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) | ||||
|   | ||||
| @@ -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) | ||||
|  | ||||
		Reference in New Issue
	
	Block a user