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

drivers/pc80/rtc: Clean up some headers

Browse source 
Change-Id: I5b3f1da6581dd80264aaa9618227ac64e1966e8d
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/38180
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Kyösti Mälkki 2020-01-04 22:07:37 +02:00
parent 1a9b7b50c7
commit a581166820
3 changed files with 6 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/arch/x86/bootblock_normal.c
View file

@ -12,7 +12,7 @@
*/ */
#include <cbfs.h> #include <cbfs.h>
#include <pc80/mc146818rtc.h> #include <fallback.h>
#include <program_loading.h> #include <program_loading.h>
#include <stddef.h> #include <stddef.h>
#include <string.h> #include <string.h>

7
src/include/fallback.h
View file

@ -1,13 +1,8 @@
#ifndef FALLBACK_H #ifndef FALLBACK_H
#define FALLBACK_H #define FALLBACK_H
#if !defined(__ASSEMBLER__)
void boot_successful(void); void boot_successful(void);
void set_boot_successful(void); void set_boot_successful(void);
int do_normal_boot(void);
#endif /* __ASSEMBLER__ */
#define RTC_BOOT_BYTE 48
#endif /* FALLBACK_H */ #endif /* FALLBACK_H */

8
src/include/pc80/mc146818rtc.h
View file

@ -25,8 +25,6 @@
**********************************************************************/ **********************************************************************/
#define RTC_FREQ_SELECT RTC_REG_A #define RTC_FREQ_SELECT RTC_REG_A
#define RTC_BOOT_NORMAL 0x1
/* update-in-progress - set to "1" 244 microsecs before RTC goes off the bus, /* update-in-progress - set to "1" 244 microsecs before RTC goes off the bus,
* reset after update (may take 1.984ms @ 32768Hz RefClock) is complete, * reset after update (may take 1.984ms @ 32768Hz RefClock) is complete,
* totaling to a max high interval of 2.228 ms. * totaling to a max high interval of 2.228 ms.
@ -103,6 +101,10 @@
#define PC_CKS_RANGE_END 45 #define PC_CKS_RANGE_END 45
#define PC_CKS_LOC 46 #define PC_CKS_LOC 46
/* Tracking of fallback/normal boot. */
#define RTC_BOOT_BYTE 48
#define RTC_BOOT_NORMAL 0x1
static inline unsigned char cmos_read(unsigned char addr) static inline unsigned char cmos_read(unsigned char addr)
{ {
int offs = 0; int offs = 0;
@ -179,8 +181,6 @@ int cmos_chksum_valid(void);
enum cb_err set_option(const char *name, void *val); enum cb_err set_option(const char *name, void *val);
enum cb_err get_option(void *dest, const char *name); enum cb_err get_option(void *dest, const char *name);
int do_normal_boot(void);
#if CONFIG(CMOS_POST) #if CONFIG(CMOS_POST)
#if CONFIG(USE_OPTION_TABLE) #if CONFIG(USE_OPTION_TABLE)
# include "option_table.h" # include "option_table.h"