From c16d24e73a52858fa165371fa339a37c1adac403 Mon Sep 17 00:00:00 2001 From: Uwe Hermann Date: Mon, 31 Mar 2008 15:17:39 +0000 Subject: Due to popular demand, rename "CMOS" to "NVRAM" (trivial). Signed-off-by: Uwe Hermann Acked-by: Uwe Hermann git-svn-id: svn://svn.coreboot.org/coreboot/trunk@3199 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- payloads/libpayload/drivers/Makefile.inc | 2 +- payloads/libpayload/drivers/cmos.c | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) (limited to 'payloads/libpayload/drivers') diff --git a/payloads/libpayload/drivers/Makefile.inc b/payloads/libpayload/drivers/Makefile.inc index 08e7150037..fd348408aa 100644 --- a/payloads/libpayload/drivers/Makefile.inc +++ b/payloads/libpayload/drivers/Makefile.inc @@ -31,4 +31,4 @@ TARGETS-$(CONFIG_SERIAL_CONSOLE) += drivers/serial.o TARGETS-$(CONFIG_VGA_CONSOLE) += drivers/vga.o TARGETS-$(CONFIG_PC_KEYBOARD) += drivers/keyboard.o -TARGETS-$(CONFIG_CMOS) += drivers/cmos.o +TARGETS-$(CONFIG_NVRAM) += drivers/cmos.o diff --git a/payloads/libpayload/drivers/cmos.c b/payloads/libpayload/drivers/cmos.c index c8cd605a0a..3789c09b3c 100644 --- a/payloads/libpayload/drivers/cmos.c +++ b/payloads/libpayload/drivers/cmos.c @@ -45,24 +45,24 @@ #define RTC_PORT 0x70 /** - * Read a byte from the specified CMOS address. + * Read a byte from the specified NVRAM address. * - * @param addr The CMOS address to read a byte from. - * @return The byte at the given CMOS address. + * @param addr The NVRAM address to read a byte from. + * @return The byte at the given NVRAM address. */ -u8 cmos_read(u8 addr) +u8 nvram_read(u8 addr) { outb(addr, RTC_PORT); return inb(RTC_PORT + 1); } /** - * Write a byte to the specified CMOS address. + * Write a byte to the specified NVRAM address. * - * @param val The byte to write to CMOS. - * @param addr The CMOS address to write to. + * @param val The byte to write to NVRAM. + * @param addr The NVRAM address to write to. */ -void cmos_write(u8 val, u8 addr) +void nvram_write(u8 val, u8 addr) { outb(addr, RTC_PORT); outb(val, RTC_PORT + 1); -- cgit v1.2.3