]> xenbits.xensource.com Git - qemu-xen-3.3-testing.git/commitdiff
Unbreak the last patch.
authorths <ths>
Sat, 6 Jan 2007 02:24:15 +0000 (02:24 +0000)
committerths <ths>
Sat, 6 Jan 2007 02:24:15 +0000 (02:24 +0000)
hw/mips_r4k.c

index 5f5b799d7345cf2b72080bc8cff990a9785affd0..ffed67c2a51af4a076506d0bba303b28c59af3fc 100644 (file)
@@ -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 @@ void mips_r4k_init (int ram_size, int vga_ram_size, int boot_device,
     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 {