sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Port cmos.default handling to C environment bootblock

Browse Source 
Gather related code in the new file drivers/pc80/rtc/mc146818rtc_boot.c,
call sanitize_cmos() from C environment bootblock.

Change-Id: Ia5c64de208a5986299c0508d0e11eeb8473deef1
Signed-off-by: Nico Huber <nico.huber@secunet.com>
Reviewed-on: https://review.coreboot.org/20768
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
This commit is contained in:
Nico Huber
2017-07-25 16:11:36 +02:00
committed by Nico Huber
parent a81f321924
commit 5ce0fe1176
8 changed files with 91 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/arch/x86/bootblock_normal.c
View File

@@ -32,9 +32,8 @@ static void main(unsigned long bist)
if (boot_cpu()) {
bootblock_mainboard_init();
#if IS_ENABLED(CONFIG_USE_OPTION_TABLE)
sanitize_cmos();
#endif
boot_mode = do_normal_boot();
} else {

3
src/arch/x86/bootblock_simple.c
View File

@@ -13,6 +13,7 @@
#include <smp/node.h>
#include <arch/bootblock_romcc.h>
#include <pc80/mc146818rtc.h>
#include <halt.h>
static void main(unsigned long bist)
@@ -20,9 +21,7 @@ static void main(unsigned long bist)
if (boot_cpu()) {
bootblock_mainboard_init();
#if IS_ENABLED(CONFIG_USE_OPTION_TABLE)
sanitize_cmos();
#endif
#if IS_ENABLED(CONFIG_CMOS_POST)
cmos_post_init();
#endif

20
src/arch/x86/include/arch/bootblock_romcc.h
View File

@@ -11,9 +11,7 @@
* GNU General Public License for more details.
*/
#include <arch/cbfs.h>
#include <cpu/x86/lapic/boot_cpu.c>
#include <pc80/mc146818rtc.h>
#ifdef CONFIG_BOOTBLOCK_RESETS
#include CONFIG_BOOTBLOCK_RESETS
@@ -45,21 +43,3 @@ static void bootblock_mainboard_init(void)
#endif
}
#endif
#if IS_ENABLED(CONFIG_USE_OPTION_TABLE)
static void sanitize_cmos(void)
{
if (cmos_error() || !cmos_chksum_valid()
|| IS_ENABLED(CONFIG_STATIC_OPTION_TABLE)) {
unsigned char *cmos_default =
(unsigned char *)walkcbfs("cmos.default");
if (cmos_default) {
int i;
cmos_disable_rtc();
for (i = 14; i < 128; i++)
cmos_write_inner(cmos_default[i], i);
cmos_enable_rtc();
}
}
}
#endif