Kyösti Mälkki has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/38197 )
Change subject: [WIP] drivers/pc80/rtc: Drop ARCH_X86 guard in header ......................................................................
[WIP] drivers/pc80/rtc: Drop ARCH_X86 guard in header
Change-Id: I03c25ad5d9864406e1a021e39a5736ac72c8825a Signed-off-by: Kyösti Mälkki kyosti.malkki@gmail.com --- M src/drivers/elog/boot_count.c M src/drivers/elog/elog.c M src/include/pc80/mc146818rtc.h M src/lib/bootblock.c 4 files changed, 13 insertions(+), 13 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/97/38197/1
diff --git a/src/drivers/elog/boot_count.c b/src/drivers/elog/boot_count.c index a6efb01..6823a93 100644 --- a/src/drivers/elog/boot_count.c +++ b/src/drivers/elog/boot_count.c @@ -13,7 +13,6 @@
#include <console/console.h> #include <ip_checksum.h> -#include <pc80/mc146818rtc.h> #include <stddef.h> #include <stdint.h> #include <elog.h> diff --git a/src/drivers/elog/elog.c b/src/drivers/elog/elog.c index 11cbfba..7f6c75b 100644 --- a/src/drivers/elog/elog.c +++ b/src/drivers/elog/elog.c @@ -17,9 +17,6 @@ #include <bootstate.h> #include <cbmem.h> #include <console/console.h> -#if CONFIG(ARCH_X86) -#include <pc80/mc146818rtc.h> -#endif #include <bcd.h> #include <boot_device.h> #include <commonlib/region.h> diff --git a/src/include/pc80/mc146818rtc.h b/src/include/pc80/mc146818rtc.h index 8cc2ed4..f6359f1 100644 --- a/src/include/pc80/mc146818rtc.h +++ b/src/include/pc80/mc146818rtc.h @@ -1,14 +1,23 @@ +/* + * 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 PC80_MC146818RTC_H #define PC80_MC146818RTC_H
-#if CONFIG(ARCH_X86) - #include <arch/io.h> #include <types.h>
-#ifndef RTC_BASE_PORT #define RTC_BASE_PORT 0x70 -#endif
#define RTC_PORT(x) (RTC_BASE_PORT + (x))
@@ -181,8 +190,4 @@ int cmos_checksum_valid(int range_start, int range_end, int cks_loc); void cmos_set_checksum(int range_start, int range_end, int cks_loc);
-#endif /* CONFIG_ARCH_X86 */ - -void cmos_post_init(void); - #endif /* PC80_MC146818RTC_H */ diff --git a/src/lib/bootblock.c b/src/lib/bootblock.c index 386f4e3..166b3fe 100644 --- a/src/lib/bootblock.c +++ b/src/lib/bootblock.c @@ -19,7 +19,6 @@ #include <console/console.h> #include <delay.h> #include <option.h> -#include <pc80/mc146818rtc.h> #include <program_loading.h> #include <symbols.h> #include <timestamp.h>