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

cpu/intel/car: Enable use of C_ENVIRONMENT_BOOTBLOCK 

Add common C entry points that hook to platform-specific
bootblock code.

Change-Id: I8eac974864f255811e8708997a8014a45a5c09ee
Signed-off-by: Arthur Heymans <arthur@aheymans.xyz>
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/30494
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Arthur Heymans 2018-06-05 11:19:22 +02:00 committed by Kyösti Mälkki
parent c641f7ed9f
commit d3d82e09fc
3 changed files with 73 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/cpu/intel/car/bootblock.c Normal file
View File

@ -0,0 +1,36 @@
/*
* This file is part of the coreboot project.
*
* 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.
*/
#include <bootblock_common.h>
#include <cpu/intel/car/bootblock.h>
asmlinkage void bootblock_c_entry_bist(uint64_t base_timestamp, uint32_t bist)
{
/* Call lib/bootblock.c main */
bootblock_main_with_timestamp(base_timestamp, NULL, 0);
}
void __weak bootblock_early_northbridge_init(void) { }
void __weak bootblock_early_southbridge_init(void) { }
void __weak bootblock_early_cpu_init(void) { }
void bootblock_soc_early_init(void)
{
bootblock_early_northbridge_init();
bootblock_early_southbridge_init();
bootblock_early_cpu_init();
}
void bootblock_soc_init(void)
{
}

21
src/cpu/intel/car/bootblock.h Normal file
View File

@ -0,0 +1,21 @@
/*
* This file is part of the coreboot project.
*
* 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.
*/
#ifndef _CPU_INTEL_CAR_BOOTBLOCK_H
#define _CPU_INTEL_CAR_BOOTBLOCK_H
void bootblock_early_cpu_init(void);
void bootblock_early_northbridge_init(void);
void bootblock_early_southbridge_init(void);
#endif

16
src/cpu/intel/car/romstage.c
View File

@ -53,6 +53,7 @@ static void romstage_main(unsigned long bist)
platform_enter_postcar();
}
#if !IS_ENABLED(CONFIG_C_ENVIRONMENT_BOOTBLOCK)
/* This wrapper enables easy transition towards C_ENVIRONMENT_BOOTBLOCK,
* keeping changes in cache_as_ram.S easy to manage.
*/
@ -60,3 +61,18 @@ asmlinkage void bootblock_c_entry_bist(uint64_t base_timestamp, uint32_t bist)
{
romstage_main(bist);
}
#endif
/* We don't carry BIST from bootblock in a good location to read from.
* Any error should have been reported in bootblock already.
*/
#define NO_BIST 0
asmlinkage void car_stage_entry(void)
{
/* Assumes the hardware was set up during the bootblock */
console_init();
romstage_main(NO_BIST);
}