From 5378a296f4192de137c8350b2436eadee4d45a7b Mon Sep 17 00:00:00 2001
From: Eric Norum <WENorum@lbl.gov>
Date: Wed, 13 Oct 2004 00:03:09 +0000
Subject: [PATCH] Add driver for Motorola MC146818A time-of-day clock. Use
 above driver in i386/pc386 BSP.

---
 c/src/lib/libbsp/i386/pc386/clock/Makefile.am | 5 +++--
 c/src/libchip/rtc/Makefile.am                 | 5 +++--
 c/src/libchip/rtc/rtc.h                       | 4 +++-
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/c/src/lib/libbsp/i386/pc386/clock/Makefile.am b/c/src/lib/libbsp/i386/pc386/clock/Makefile.am
index a03e7ef3e6..c5504d9775 100644
--- a/c/src/lib/libbsp/i386/pc386/clock/Makefile.am
+++ b/c/src/lib/libbsp/i386/pc386/clock/Makefile.am
@@ -2,10 +2,11 @@
 ## $Id$
 ##
 
+VPATH = @srcdir@:@srcdir@/../../shared/tod:@srcdir@/../../../shared
 
 PGM = $(ARCH)/clock.rel
 
-C_FILES = ckinit.c rtc.c
+C_FILES = ckinit.c todcfg.c tod.c
 clock_rel_OBJECTS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
 
 include $(top_srcdir)/../../../../../../automake/compile.am
@@ -25,6 +26,6 @@ all-local: $(ARCH) $(clock_rel_OBJECTS) $(PGM)
 
 .PRECIOUS: $(PGM)
 
-EXTRA_DIST = ckinit.c rtc.c
+EXTRA_DIST = 
 
 include $(top_srcdir)/../../../../../../automake/local.am
diff --git a/c/src/libchip/rtc/Makefile.am b/c/src/libchip/rtc/Makefile.am
index 368bf4c7d3..e537280e97 100644
--- a/c/src/libchip/rtc/Makefile.am
+++ b/c/src/libchip/rtc/Makefile.am
@@ -10,11 +10,12 @@ LIB = $(ARCH)/$(LIBNAME).a
 
 C_FILES = rtcprobe.c icm7170.c icm7170_reg.c icm7170_reg2.c icm7170_reg4.c \
     icm7170_reg8.c m48t08.c m48t08_reg.c m48t08_reg2.c m48t08_reg4.c \
-    m48t08_reg8.c
+    m48t08_reg8.c \
+    mc146818a.c mc146818a_ioreg.c
 
 OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
 
-include_libchip_HEADERS = rtc.h icm7170.h m48t08.h
+include_libchip_HEADERS = rtc.h icm7170.h m48t08.h mc146818a.h
 
 include $(top_srcdir)/../../../automake/compile.am
 include $(top_srcdir)/../../../automake/lib.am
diff --git a/c/src/libchip/rtc/rtc.h b/c/src/libchip/rtc/rtc.h
index 1f302712fc..f661076ace 100644
--- a/c/src/libchip/rtc/rtc.h
+++ b/c/src/libchip/rtc/rtc.h
@@ -32,7 +32,9 @@ typedef struct _rtc_fns {
 typedef enum {
   RTC_M48T08,                  /* SGS-Thomsom M48T08 or M48T18 */
   RTC_ICM7170,                 /* Harris ICM-7170 */
-  RTC_CUSTOM                   /* BSP specific driver */
+  RTC_CUSTOM,                  /* BSP specific driver */
+  RTC_MC146818A                /* Motorola MC146818A */
+
 } rtc_devs;
 
 /*