Merge branch 'master' of git://www.denx.de/git/u-boot-net

[u-boot] / drivers / bios_emulator / besys.c

diff --git a/drivers/bios_emulator/besys.c b/drivers/bios_emulator/besys.c
index 2a8e1a01c1fc948be61fd86f749764e332f748dc..cb1b0c1b958a473072e483c23b62187d01bfe258 100644 (file)
--- a/drivers/bios_emulator/besys.c
+++ b/drivers/bios_emulator/besys.c
@@ -47,6 +47,10 @@
 *
 ****************************************************************************/
 
+#include <common.h>
+
+#if defined(CONFIG_BIOSEMU)
+
 #include "biosemui.h"
 
 /*------------------------- Global Variables ------------------------------*/
@@ -92,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");)
@@ -717,3 +721,4 @@ void X86API BE_outl(X86EMU_pioAddr port, u32 val)
 #endif
                LOG_outpd(port, val);
 }
+#endif