copy_and_run: drop boot_complete parameter
Since this parameter is not used anymore, drop it from all calls to copy_and_run() Change-Id: Ifba25aff4b448c1511e26313fe35007335aa7f7a Signed-off-by: Stefan Reinauer <reinauer@google.com> Reviewed-on: http://review.coreboot.org/3213 Tested-by: build bot (Jenkins) Reviewed-by: Ronald G. Minnich <rminnich@gmail.com>
This commit is contained in:
		
				
					committed by
					
						 Ronald G. Minnich
						Ronald G. Minnich
					
				
			
			
				
	
			
			
			
						parent
						
							2a3c10677f
						
					
				
				
					commit
					648d16679c
				
			| @@ -22,6 +22,5 @@ | ||||
|  | ||||
| #include <arch/cpu.h> | ||||
|  | ||||
| void asmlinkage copy_and_run(unsigned cpu_reset); | ||||
| void asmlinkage copy_and_run_ap_code_in_car(unsigned ret_addr); | ||||
| void asmlinkage copy_and_run(void); | ||||
| #endif | ||||
|   | ||||
| @@ -7,17 +7,12 @@ | ||||
|  */ | ||||
| #include <cpu/x86/post_code.h> | ||||
|  | ||||
| 	/* clear boot_complete flag */ | ||||
| 	xorl	%ebp, %ebp | ||||
| __main: | ||||
| 	post_code(POST_PREPARE_RAMSTAGE) | ||||
| 	cld			/* clear direction flag */ | ||||
|  | ||||
| 	movl	%ebp, %esi | ||||
|  | ||||
| 	movl $ROMSTAGE_STACK, %esp | ||||
| 	movl	%esp, %ebp | ||||
| 	pushl %esi | ||||
| 	call copy_and_run | ||||
|  | ||||
| .Lhlt: | ||||
|   | ||||
| @@ -77,7 +77,6 @@ _start: | ||||
| #if CONFIG_GDB_WAIT | ||||
| 	call gdb_stub_breakpoint | ||||
| #endif | ||||
| 	/* The boot_complete flag has already been pushed */ | ||||
| 	call	hardwaremain | ||||
| 	/* NOTREACHED */ | ||||
| .Lhlt: | ||||
|   | ||||
| @@ -22,7 +22,7 @@ | ||||
| #include <arch/stages.h> | ||||
| #include <timestamp.h> | ||||
|  | ||||
| static void cbfs_and_run_core(const char *filename, unsigned ebp) | ||||
| static void cbfs_and_run_core(const char *filename) | ||||
| { | ||||
| 	u8 *dst; | ||||
|  | ||||
| @@ -35,19 +35,14 @@ static void cbfs_and_run_core(const char *filename, unsigned ebp) | ||||
| 	timestamp_add_now(TS_END_COPYRAM); | ||||
| 	print_debug("Jumping to image.\n"); | ||||
| 	__asm__ volatile ( | ||||
| 		"movl %%eax, %%ebp\n" | ||||
| 		"jmp  *%%edi\n" | ||||
| 		:: "a"(ebp), "D"(dst) | ||||
| 		:: "D"(dst) | ||||
| 	); | ||||
| } | ||||
|  | ||||
| void asmlinkage copy_and_run(unsigned cpu_reset) | ||||
| void asmlinkage copy_and_run(void) | ||||
| { | ||||
| 	// FIXME fix input parameters instead normalizing them here. | ||||
| 	if (cpu_reset == 1) cpu_reset = -1; | ||||
| 	else cpu_reset = 0; | ||||
|  | ||||
| 	cbfs_and_run_core(CONFIG_CBFS_PREFIX "/coreboot_ram", cpu_reset); | ||||
| 	cbfs_and_run_core(CONFIG_CBFS_PREFIX "/coreboot_ram"); | ||||
| } | ||||
|  | ||||
| #if CONFIG_AP_CODE_IN_CAR | ||||
|   | ||||
| @@ -20,8 +20,6 @@ | ||||
| static void skip_romstage(void) | ||||
| { | ||||
| 	asm volatile ( | ||||
| 		"/* set the boot_complete flag */\n" | ||||
| 		"movl	$0xffffffff, %%ebp\n" | ||||
| 		"jmp	__main\n" | ||||
| 	); | ||||
| } | ||||
|   | ||||
		Reference in New Issue
	
	Block a user