From f0bf4b5c2abd9a226dd681d88132e8d66f8ba92a Mon Sep 17 00:00:00 2001 From: Patrick Georgi Date: Fri, 21 Jan 2011 12:45:37 +0000 Subject: [PATCH] Make YABEL warnings-are-errors safe Signed-off-by: Patrick Georgi Acked-by: Patrick Georgi git-svn-id: svn://svn.coreboot.org/coreboot/trunk@6290 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- src/devices/oprom/yabel/biosemu.c | 4 ++-- src/devices/oprom/yabel/vbe.c | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/devices/oprom/yabel/biosemu.c b/src/devices/oprom/yabel/biosemu.c index 3a8eea62ed..f1f19c46be 100644 --- a/src/devices/oprom/yabel/biosemu.c +++ b/src/devices/oprom/yabel/biosemu.c @@ -132,7 +132,7 @@ biosemu(u8 *biosmem, u32 biosmem_size, struct device * dev, unsigned long rom_ad // copy expansion ROM image to segment OPTION_ROM_CODE_SEGMENT // NOTE: this sometimes fails, some bytes are 0x00... so we compare // after copying and do some retries... - u8 *mem_img = OPTION_ROM_CODE_SEGMENT << 4; + u8 *mem_img = (u8*)(OPTION_ROM_CODE_SEGMENT << 4); u8 copy_count = 0; u8 cmp_result = 0; do { @@ -155,7 +155,7 @@ biosemu(u8 *biosmem, u32 biosmem_size, struct device * dev, unsigned long rom_ad break; } clr_ci(); - my_wrb(mem_img + i, c); + my_wrb((u32)mem_img + i, c); } #endif copy_count++; diff --git a/src/devices/oprom/yabel/vbe.c b/src/devices/oprom/yabel/vbe.c index c0fd645ff9..75e8f3e1c0 100644 --- a/src/devices/oprom/yabel/vbe.c +++ b/src/devices/oprom/yabel/vbe.c @@ -302,6 +302,7 @@ vbe_set_mode(vbe_mode_info_t * mode_info) return 0; } +#if 0 //VBE Function 08h static u8 vbe_set_palette_format(u8 format) @@ -764,6 +765,7 @@ vbe_get_info(void) } return 0; } +#endif vbe_mode_info_t mode_info;