summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2017-04-10 12:07:29 (GMT)
committerTom Rini <trini@konsulko.com>2017-04-10 12:07:29 (GMT)
commit01cce5fdd098add2b8aa570468cb35fca5d778fe (patch)
tree279174c700f36ef4c8a38b30e8c39be8b32e80e6 /include
parente391b1e64b0bd65709a28a4764afe4f32d408243 (diff)
parentca0d29e4f06095fd39f3125aef8f427aa1728ee5 (diff)
downloadu-boot-01cce5fdd098add2b8aa570468cb35fca5d778fe.tar.xz
Merge git://git.denx.de/u-boot-x86
Diffstat (limited to 'include')
-rw-r--r--include/configs/x86-common.h1
-rw-r--r--include/rtc.h20
2 files changed, 20 insertions, 1 deletions
diff --git a/include/configs/x86-common.h b/include/configs/x86-common.h
index f7796cf..d69e609 100644
--- a/include/configs/x86-common.h
+++ b/include/configs/x86-common.h
@@ -16,7 +16,6 @@
* (easy to change)
*/
#define CONFIG_SHOW_BOOT_PROGRESS
-#define CONFIG_ZBOOT_32
#define CONFIG_PHYSMEM
#define CONFIG_DISPLAY_BOARDINFO_LATE
#define CONFIG_LAST_STAGE_INIT
diff --git a/include/rtc.h b/include/rtc.h
index 69fe8d4..49142b6 100644
--- a/include/rtc.h
+++ b/include/rtc.h
@@ -128,6 +128,26 @@ int rtc_read8(struct udevice *dev, unsigned int reg);
int rtc_write8(struct udevice *dev, unsigned int reg, int val);
/**
+ * rtc_read16() - Read a 16-bit value from the RTC
+ *
+ * @dev: Device to read from
+ * @reg: Offset to start reading from
+ * @valuep: Place to put the value that is read
+ * @return 0 if OK, -ve on error
+ */
+int rtc_read16(struct udevice *dev, unsigned int reg, u16 *valuep);
+
+/**
+ * rtc_write16() - Write a 16-bit value to the RTC
+ *
+ * @dev: Device to write to
+ * @reg: Register to start writing to
+ * @value: Value to write
+ * @return 0 if OK, -ve on error
+ */
+int rtc_write16(struct udevice *dev, unsigned int reg, u16 value);
+
+/**
* rtc_read32() - Read a 32-bit value from the RTC
*
* @dev: Device to read from