Commit b94ec3eca8d93e7502c28915eb11d1f1764ebe79
1 parent
14512990
Fully clean up on Mac OS X Leopard (Andreas Färber).
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3907 c046a42c-6fe2-441c-8c8c-71466251a162
Showing
3 changed files
with
5 additions
and
1 deletions
.cvsignore
Makefile
| @@ -146,6 +146,7 @@ clean: | @@ -146,6 +146,7 @@ clean: | ||
| 146 | # avoid old build problems by removing potentially incorrect old files | 146 | # avoid old build problems by removing potentially incorrect old files |
| 147 | rm -f config.mak config.h op-i386.h opc-i386.h gen-op-i386.h op-arm.h opc-arm.h gen-op-arm.h | 147 | rm -f config.mak config.h op-i386.h opc-i386.h gen-op-i386.h op-arm.h opc-arm.h gen-op-arm.h |
| 148 | rm -f *.o *.d *.a $(TOOLS) dyngen$(EXESUF) TAGS cscope.* *.pod *~ */*~ | 148 | rm -f *.o *.d *.a $(TOOLS) dyngen$(EXESUF) TAGS cscope.* *.pod *~ */*~ |
| 149 | + rm -rf dyngen.dSYM | ||
| 149 | rm -f slirp/*.o slirp/*.d audio/*.o audio/*.d | 150 | rm -f slirp/*.o slirp/*.d audio/*.o audio/*.d |
| 150 | $(MAKE) -C tests clean | 151 | $(MAKE) -C tests clean |
| 151 | for d in $(TARGET_DIRS); do \ | 152 | for d in $(TARGET_DIRS); do \ |
hw/gumstix.c
| @@ -76,9 +76,11 @@ static void connex_init(int ram_size, int vga_ram_size, | @@ -76,9 +76,11 @@ static void connex_init(int ram_size, int vga_ram_size, | ||
| 76 | 76 | ||
| 77 | cpu->env->regs[15] = 0x00000000; | 77 | cpu->env->regs[15] = 0x00000000; |
| 78 | 78 | ||
| 79 | - /* Interrupt line of NIC is connected to GPIO line 36 */ | 79 | + /* Interrupt lines of the NICs are connected to GPIO lines 36 and 27 */ |
| 80 | smc91c111_init(&nd_table[0], 0x04000300, | 80 | smc91c111_init(&nd_table[0], 0x04000300, |
| 81 | pxa2xx_gpio_in_get(cpu->gpio)[36]); | 81 | pxa2xx_gpio_in_get(cpu->gpio)[36]); |
| 82 | + smc91c111_init(&nd_table[1], 0x08000300, | ||
| 83 | + pxa2xx_gpio_in_get(cpu->gpio)[36]); | ||
| 82 | } | 84 | } |
| 83 | 85 | ||
| 84 | static void verdex_init(int ram_size, int vga_ram_size, | 86 | static void verdex_init(int ram_size, int vga_ram_size, |