GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

intel/quark: Remove extra steps on entry to romstage 

Change-Id: I9297d5b4f7c8ed703fb8772739531cdd7d5ca5f0
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/34965
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Arthur Heymans <arthur@aheymans.xyz>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
This commit is contained in:
Kyösti Mälkki 2019-08-18 09:00:04 +03:00
parent 792098c45e
commit 67a26c9dcd
4 changed files with 1 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/soc/intel/quark/include/soc/romstage.h
View File

@ -25,7 +25,6 @@
#include <soc/car.h> #include <soc/car.h>
#include <soc/reg_access.h> #include <soc/reg_access.h>
asmlinkage void car_stage_c_entry(void);
void clear_smi_and_wake_events(void); void clear_smi_and_wake_events(void);
void disable_rom_shadow(void); void disable_rom_shadow(void);
void *locate_rmu_file(size_t *rmu_file_len); void *locate_rmu_file(size_t *rmu_file_len);

1
src/soc/intel/quark/romstage/Makefile.inc
View File

@ -14,7 +14,6 @@
# #
romstage-y += car.c romstage-y += car.c
romstage-y += car_stage_entry.S
ifeq ($(CONFIG_PLATFORM_USES_FSP2_0),y) ifeq ($(CONFIG_PLATFORM_USES_FSP2_0),y)
romstage-$(CONFIG_DISPLAY_UPD_DATA) += debug.c romstage-$(CONFIG_DISPLAY_UPD_DATA) += debug.c
romstage-$(CONFIG_PLATFORM_USES_FSP2_0) += fsp2_0.c romstage-$(CONFIG_PLATFORM_USES_FSP2_0) += fsp2_0.c

72
src/soc/intel/quark/romstage/car_stage_entry.S
View File

@ -1,72 +0,0 @@
/*
* This file is part of the coreboot project.
*
* Copyright (C) 2000,2007 Ronald G. Minnich <rminnich@gmail.com>
* Copyright (C) 2007-2008 coresystems GmbH
* Copyright (C) 2013-2014 Sage Electronic Engineering, LLC.
* Copyright (C) 2015-2016 Intel Corporation
*
* 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.
*
* Replacement for cache_as_ram.inc when using the C environment boot block.
*/
#include <rules.h>
#include <soc/sd.h>
.section ".text"
.global car_stage_entry
car_stage_entry:
/* Enter the C code */
call car_stage_c_entry
/* The code should never reach this point */
movb $0x69, %ah
jmp .Lhlt
#----------------------------------------------------------------------------
#
# Procedure: .Lhlt
#
# Input: ah - Upper 8-bits of POST code
# al - Lower 8-bits of POST code
#
# Description:
# Infinite loop displaying alternating POST code values
#
#----------------------------------------------------------------------------
#define FLASH_DELAY 0x1000 /* I/O delay between post codes on failure */
#define POST_DELAY 0x50
.Lhlt:
xchg %al, %ah
mov $POST_DELAY, %dh
#if CONFIG(POST_IO)
outb %al, $CONFIG_POST_IO_PORT
#else
post_code(POST_DEAD_CODE)
#endif
.flash_setup:
movl $FLASH_DELAY, %ecx
.flash_delay:
outb %al, $0xED
loop .flash_delay
#if CONFIG(ENABLE_DEBUG_LED)
movl $SD_HOST_CTRL, %ebx
movb 0(%ebx), %dl
xorb $1, %dl
movb %dl, 0(%ebx)
#endif /* CONFIG_ENABLE_DEBUG_LED */
decb %dh
jnz .flash_setup
jmp .Lhlt

2
src/soc/intel/quark/romstage/fsp2_0.c
View File

@ -30,7 +30,7 @@
static struct postcar_frame early_mtrrs; static struct postcar_frame early_mtrrs;
asmlinkage void car_stage_c_entry(void) asmlinkage void car_stage_entry(void)
{ {
bool s3wake; bool s3wake;