summaryrefslogtreecommitdiffstats
path: root/drivers/bios_emulator/biosemu.c
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2007-11-18 16:36:27 +0100
committerWolfgang Denk <wd@denx.de>2007-11-18 16:36:27 +0100
commit409ecdc0bb47dd28b0af6c25ffd658d22cc36b37 (patch)
tree3216a241047e1e3edf63aa56f6f28bd3c1542f84 /drivers/bios_emulator/biosemu.c
parent079c2c4fa71c0d1ebef394508df9088df8a308d3 (diff)
downloadblackbird-obmc-uboot-409ecdc0bb47dd28b0af6c25ffd658d22cc36b37.tar.gz
blackbird-obmc-uboot-409ecdc0bb47dd28b0af6c25ffd658d22cc36b37.zip
Fix compiler warnings for PPC systems. Update CHANGELOG.
Signed-off-by: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'drivers/bios_emulator/biosemu.c')
-rw-r--r--drivers/bios_emulator/biosemu.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/bios_emulator/biosemu.c b/drivers/bios_emulator/biosemu.c
index ccfc872f78..75ceb458cf 100644
--- a/drivers/bios_emulator/biosemu.c
+++ b/drivers/bios_emulator/biosemu.c
@@ -96,7 +96,7 @@ int X86API BE_init(u32 debugFlags, int memSize, BE_VGAInfo * info, int shared)
return 0;
}
- M.mem_base = (unsigned long)malloc(memSize);
+ M.mem_base = malloc(memSize);
if (M.mem_base == NULL){
printf("Biosemu:Out of memory!");
@@ -106,7 +106,7 @@ int X86API BE_init(u32 debugFlags, int memSize, BE_VGAInfo * info, int shared)
_BE_env.emulateVGA = 0;
_BE_env.busmem_base = (unsigned long)malloc(128 * 1024);
- if (_BE_env.busmem_base == NULL){
+ if ((void *)_BE_env.busmem_base == NULL){
printf("Biosemu:Out of memory!");
return 0;
}
@@ -230,7 +230,7 @@ Cleans up and exits the emulator.
void X86API BE_exit(void)
{
free(M.mem_base);
- free(_BE_env.busmem_base);
+ free((void *)_BE_env.busmem_base);
}
/****************************************************************************
OpenPOWER on IntegriCloud