Due to popular demand, rename "CMOS" to "NVRAM" (trivial).

Signed-off-by: Uwe Hermann <uwe@hermann-uwe.de>
Acked-by: Uwe Hermann <uwe@hermann-uwe.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@3199 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

diff --git a/payloads/libpayload/Config.in b/payloads/libpayload/Config.in
index dca9e1e4ffac5a49509fbecb271e2d5e94c33cd8..5690ac956a8110af63a3f4a9fd30bb9e98f8dbb1 100644 (file)
--- a/payloads/libpayload/Config.in
+++ b/payloads/libpayload/Config.in
@@ -68,8 +68,8 @@ config PC_KEYBOARD
        depends VGA_CONSOLE
        default y
 
-config CMOS
-       bool "Support for reading/writing CMOS bytes"
+config NVRAM
+       bool "Support for reading/writing NVRAM bytes"
        default y
 
 endmenu

diff --git a/payloads/libpayload/drivers/Makefile.inc b/payloads/libpayload/drivers/Makefile.inc
index 08e71500377ab06b207bef2c59ee388de1bf4893..fd348408aace477b15d9762426a8246edd219e92 100644 (file)
--- 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 c8cd605a0a0c734746bc907af4e7c52d975765c5..3789c09b3c6685ea982188d2dfccbb5acad0666e 100644 (file)
--- 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);

diff --git a/payloads/libpayload/include/libpayload.h b/payloads/libpayload/include/libpayload.h
index 6d80004a98749f2784ba77216b305e99fb02a6e1..8f1c12e4df337ba419e8d63cfc43cd7edd2c8033 100644 (file)
--- a/payloads/libpayload/include/libpayload.h
+++ b/payloads/libpayload/include/libpayload.h
@@ -41,17 +41,17 @@
 #define MAX(a,b) ((a) > (b) ? (a) : (b))
 #define ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[0]))
 
-/* Some CMOS byte definitions */
-#define CMOS_RTC_SECONDS        0
-#define CMOS_RTC_MINUTES        2
-#define CMOS_RTC_HOURS          4
-#define CMOS_RTC_DAY            7
-#define CMOS_RTC_MONTH          8
-#define CMOS_RTC_YEAR           9
+/* Some NVRAM byte definitions */
+#define NVRAM_RTC_SECONDS        0
+#define NVRAM_RTC_MINUTES        2
+#define NVRAM_RTC_HOURS          4
+#define NVRAM_RTC_DAY            7
+#define NVRAM_RTC_MONTH          8
+#define NVRAM_RTC_YEAR           9
 
 /* drivers/cmos.c */
-u8 cmos_read(u8 addr);
-void cmos_write(u8 val, u8 addr);
+u8 nvram_read(u8 addr);
+void nvram_write(u8 val, u8 addr);
 
 /* drivers/keyboard.c */
 int keyboard_havechar(void);