diff options
| author | Wolfgang Denk <wd@denx.de> | 2007-11-18 16:36:27 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2007-11-18 16:36:27 +0100 |
| commit | 409ecdc0bb47dd28b0af6c25ffd658d22cc36b37 (patch) | |
| tree | 3216a241047e1e3edf63aa56f6f28bd3c1542f84 /drivers/bios_emulator | |
| parent | 079c2c4fa71c0d1ebef394508df9088df8a308d3 (diff) | |
| download | u-boot-imx-409ecdc0bb47dd28b0af6c25ffd658d22cc36b37.zip u-boot-imx-409ecdc0bb47dd28b0af6c25ffd658d22cc36b37.tar.gz u-boot-imx-409ecdc0bb47dd28b0af6c25ffd658d22cc36b37.tar.bz2 | |
Fix compiler warnings for PPC systems. Update CHANGELOG.
Signed-off-by: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'drivers/bios_emulator')
| -rw-r--r-- | drivers/bios_emulator/besys.c | 2 | ||||
| -rw-r--r-- | drivers/bios_emulator/biosemu.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/bios_emulator/besys.c b/drivers/bios_emulator/besys.c index 8f1d8b2..cb1b0c1 100644 --- a/drivers/bios_emulator/besys.c +++ b/drivers/bios_emulator/besys.c @@ -96,7 +96,7 @@ static u8 *BE_memaddr(u32 addr) else if (addr >= 0xFFFF5 && addr < 0xFFFFE) { /* Return a faked BIOS date string for non-x86 machines */ DB(printf("BE_memaddr - Returning BIOS date\n");) - return BE_biosDate + addr - 0xFFFF5; + return (u8 *)(BE_biosDate + addr - 0xFFFF5); } else if (addr == 0xFFFFE) { /* Return system model identifier for non-x86 machines */ DB(printf("BE_memaddr - Returning model\n");) diff --git a/drivers/bios_emulator/biosemu.c b/drivers/bios_emulator/biosemu.c index ccfc872..75ceb45 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); } /**************************************************************************** |