Kyösti Mälkki has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/38180 )
Change subject: drivers/pc80/rtc: Clean up some headers ......................................................................
drivers/pc80/rtc: Clean up some headers
Change-Id: I5b3f1da6581dd80264aaa9618227ac64e1966e8d Signed-off-by: Kyösti Mälkki kyosti.malkki@gmail.com --- M src/arch/x86/bootblock_normal.c M src/include/fallback.h M src/include/pc80/mc146818rtc.h 3 files changed, 6 insertions(+), 11 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/80/38180/1
diff --git a/src/arch/x86/bootblock_normal.c b/src/arch/x86/bootblock_normal.c index 8001ed0..b6b31af 100644 --- a/src/arch/x86/bootblock_normal.c +++ b/src/arch/x86/bootblock_normal.c @@ -12,7 +12,7 @@ */
#include <cbfs.h> -#include <pc80/mc146818rtc.h> +#include <fallback.h> #include <program_loading.h> #include <stddef.h> #include <string.h> diff --git a/src/include/fallback.h b/src/include/fallback.h index 3a7225e..1cf183f 100644 --- a/src/include/fallback.h +++ b/src/include/fallback.h @@ -1,13 +1,8 @@ #ifndef FALLBACK_H #define FALLBACK_H
-#if !defined(__ASSEMBLER__) - void boot_successful(void); void set_boot_successful(void); - -#endif /* __ASSEMBLER__ */ - -#define RTC_BOOT_BYTE 48 +int do_normal_boot(void);
#endif /* FALLBACK_H */ diff --git a/src/include/pc80/mc146818rtc.h b/src/include/pc80/mc146818rtc.h index aadfae22..88c9cc2 100644 --- a/src/include/pc80/mc146818rtc.h +++ b/src/include/pc80/mc146818rtc.h @@ -25,8 +25,6 @@ **********************************************************************/ #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, * reset after update (may take 1.984ms @ 32768Hz RefClock) is complete, * totaling to a max high interval of 2.228 ms. @@ -103,6 +101,10 @@ #define PC_CKS_RANGE_END 45 #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) { int offs = 0; @@ -179,8 +181,6 @@ enum cb_err set_option(const char *name, void *val); enum cb_err get_option(void *dest, const char *name);
-int do_normal_boot(void); - #if CONFIG(CMOS_POST) #if CONFIG(USE_OPTION_TABLE) # include "option_table.h"
Paul Menzel has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/38180 )
Change subject: drivers/pc80/rtc: Clean up some headers ......................................................................
Patch Set 1: Code-Review+1
Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/38180 )
Change subject: drivers/pc80/rtc: Clean up some headers ......................................................................
Patch Set 2: Code-Review+2
Kyösti Mälkki has submitted this change. ( https://review.coreboot.org/c/coreboot/+/38180 )
Change subject: drivers/pc80/rtc: Clean up some headers ......................................................................
drivers/pc80/rtc: Clean up some headers
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 --- M src/arch/x86/bootblock_normal.c M src/include/fallback.h M src/include/pc80/mc146818rtc.h 3 files changed, 6 insertions(+), 11 deletions(-)
Approvals: build bot (Jenkins): Verified Paul Menzel: Looks good to me, but someone else must approve Angel Pons: Looks good to me, approved
diff --git a/src/arch/x86/bootblock_normal.c b/src/arch/x86/bootblock_normal.c index 8001ed0..b6b31af 100644 --- a/src/arch/x86/bootblock_normal.c +++ b/src/arch/x86/bootblock_normal.c @@ -12,7 +12,7 @@ */
#include <cbfs.h> -#include <pc80/mc146818rtc.h> +#include <fallback.h> #include <program_loading.h> #include <stddef.h> #include <string.h> diff --git a/src/include/fallback.h b/src/include/fallback.h index 3a7225e..1cf183f 100644 --- a/src/include/fallback.h +++ b/src/include/fallback.h @@ -1,13 +1,8 @@ #ifndef FALLBACK_H #define FALLBACK_H
-#if !defined(__ASSEMBLER__) - void boot_successful(void); void set_boot_successful(void); - -#endif /* __ASSEMBLER__ */ - -#define RTC_BOOT_BYTE 48 +int do_normal_boot(void);
#endif /* FALLBACK_H */ diff --git a/src/include/pc80/mc146818rtc.h b/src/include/pc80/mc146818rtc.h index e2f4494..3063226 100644 --- a/src/include/pc80/mc146818rtc.h +++ b/src/include/pc80/mc146818rtc.h @@ -25,8 +25,6 @@ **********************************************************************/ #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, * reset after update (may take 1.984ms @ 32768Hz RefClock) is complete, * totaling to a max high interval of 2.228 ms. @@ -103,6 +101,10 @@ #define PC_CKS_RANGE_END 45 #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) { int offs = 0; @@ -179,8 +181,6 @@ enum cb_err set_option(const char *name, void *val); enum cb_err get_option(void *dest, const char *name);
-int do_normal_boot(void); - #if CONFIG(CMOS_POST) #if CONFIG(USE_OPTION_TABLE) # include "option_table.h"
-
Angel Pons (Code Review) -
Kyösti Mälkki (Code Review)
-
Paul Menzel (Code Review)