commit 2909b29aeea50fc25ea342a39db4c8ef5fd6a716
author ths <ths@c046a42c-6fe2-441c-8c8c-71466251a162> Sat Jan 06 02:24:15 2007 +0000
committer ths <ths@c046a42c-6fe2-441c-8c8c-71466251a162> Sat Jan 06 02:24:15 2007 +0000
tree c4edcaf03456e438d3d8e0cf3b2e20b25d58799b
parent f7bcd4e373193fd3d78d7ee24c0a1bcca9dcc3a3

Unbreak the last patch.


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@2303 c046a42c-6fe2-441c-8c8c-71466251a162

hw/mips_r4k.c

diff --git a/hw/mips_r4k.c b/hw/mips_r4k.c
index 5f5b799..ffed67c 100644
--- a/hw/mips_r4k.c
+++ b/hw/mips_r4k.c
@@ -9,7 +9,7 @@
 */
 #include "vl.h"
 
-#ifdef TARGET_BIG_ENDIAN
+#ifdef TARGET_WORDS_BIGENDIAN
 #define BIOS_FILENAME "mips_bios.bin"
 #else
 #define BIOS_FILENAME "mipsel_bios.bin"
@@ -165,7 +165,7 @@
     bios_offset = ram_size + vga_ram_size;
     snprintf(buf, sizeof(buf), "%s/%s", bios_dir, BIOS_FILENAME);
     bios_size = load_image(buf, phys_ram_base + bios_offset);
-    if (bios_size > 0 & bios_size <= BIOS_SIZE) {
+    if ((bios_size > 0) && (bios_size <= BIOS_SIZE)) {
 	cpu_register_physical_memory((uint32_t)(0x1fc00000),
 				     BIOS_SIZE, bios_offset | IO_MEM_ROM);
     } else {