Commit 2909b29aeea50fc25ea342a39db4c8ef5fd6a716
1 parent
f7bcd4e3
Unbreak the last patch.
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@2303 c046a42c-6fe2-441c-8c8c-71466251a162
Showing
1 changed file
with
2 additions
and
2 deletions
hw/mips_r4k.c
| ... | ... | @@ -9,7 +9,7 @@ |
| 9 | 9 | */ |
| 10 | 10 | #include "vl.h" |
| 11 | 11 | |
| 12 | -#ifdef TARGET_BIG_ENDIAN | |
| 12 | +#ifdef TARGET_WORDS_BIGENDIAN | |
| 13 | 13 | #define BIOS_FILENAME "mips_bios.bin" |
| 14 | 14 | #else |
| 15 | 15 | #define BIOS_FILENAME "mipsel_bios.bin" |
| ... | ... | @@ -165,7 +165,7 @@ void mips_r4k_init (int ram_size, int vga_ram_size, int boot_device, |
| 165 | 165 | bios_offset = ram_size + vga_ram_size; |
| 166 | 166 | snprintf(buf, sizeof(buf), "%s/%s", bios_dir, BIOS_FILENAME); |
| 167 | 167 | bios_size = load_image(buf, phys_ram_base + bios_offset); |
| 168 | - if (bios_size > 0 & bios_size <= BIOS_SIZE) { | |
| 168 | + if ((bios_size > 0) && (bios_size <= BIOS_SIZE)) { | |
| 169 | 169 | cpu_register_physical_memory((uint32_t)(0x1fc00000), |
| 170 | 170 | BIOS_SIZE, bios_offset | IO_MEM_ROM); |
| 171 | 171 | } else { | ... | ... |