diff options
Diffstat (limited to 'payloads/libpayload/drivers')
| -rw-r--r-- | payloads/libpayload/drivers/options.c | 2 | ||||
| -rw-r--r-- | payloads/libpayload/drivers/video/corebootfb.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/payloads/libpayload/drivers/options.c b/payloads/libpayload/drivers/options.c index a01f977620..d15d81be57 100644 --- a/payloads/libpayload/drivers/options.c +++ b/payloads/libpayload/drivers/options.c @@ -54,7 +54,7 @@ struct nvram_accessor *use_mem = &(struct nvram_accessor) { struct cb_cmos_option_table *get_system_option_table(void) { - return phys_to_virt(lib_sysinfo.option_table); + return lib_sysinfo.option_table; } int options_checksum_valid(const struct nvram_accessor *nvram) diff --git a/payloads/libpayload/drivers/video/corebootfb.c b/payloads/libpayload/drivers/video/corebootfb.c index 0fb1740785..5672d1f375 100644 --- a/payloads/libpayload/drivers/video/corebootfb.c +++ b/payloads/libpayload/drivers/video/corebootfb.c @@ -63,11 +63,11 @@ static const u32 vga_colors[] = { }; /* Addresses for the various components */ -static unsigned long fbinfo; +static struct cb_framebuffer *fbinfo; static unsigned long fbaddr; static unsigned long chars; -#define FI ((struct cb_framebuffer *) phys_to_virt(fbinfo)) +#define FI (fbinfo) #define FB ((unsigned char *) phys_to_virt(fbaddr)) #define CHARS ((unsigned short *) phys_to_virt(chars)) @@ -233,7 +233,7 @@ static int corebootfb_init(void) if (lib_sysinfo.framebuffer == NULL) return -1; - fbinfo = (unsigned long)lib_sysinfo.framebuffer; + fbinfo = lib_sysinfo.framebuffer; fbaddr = FI->physical_address; |