GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
This commit is contained in:
Uwe Hermann 2008-03-31 15:17:39 +00:00
parent 71f846c137
commit c16d24e73a
4 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
payloads/libpayload/Config.in
View File

@ -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

2
payloads/libpayload/drivers/Makefile.inc
View File

@ -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

16
payloads/libpayload/drivers/cmos.c
View File

@ -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);

18
payloads/libpayload/include/libpayload.h
View File

@ -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);