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

diff --git a/.cvsignore b/.cvsignore
index 81d7082..232fbdd 100644 (file)
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,5 +1,6 @@
 config-host.*
 dyngen
+dyngen.dSYM
 i386
 *-softmmu
 *-darwin-user

diff --git a/Makefile b/Makefile
index e76d617..c60f3df 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -146,6 +146,7 @@ clean:
 # avoid old build problems by removing potentially incorrect old files
        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
        rm -f *.o *.d *.a $(TOOLS) dyngen$(EXESUF) TAGS cscope.* *.pod *~ */*~
+       rm -rf dyngen.dSYM
        rm -f slirp/*.o slirp/*.d audio/*.o audio/*.d
        $(MAKE) -C tests clean
        for d in $(TARGET_DIRS); do \

diff --git a/hw/gumstix.c b/hw/gumstix.c
index 2cf52f9..81bb957 100644 (file)
--- a/hw/gumstix.c
+++ b/hw/gumstix.c
@@ -76,9 +76,11 @@ static void connex_init(int ram_size, int vga_ram_size,
 
     cpu->env->regs[15] = 0x00000000;
 
-    /* Interrupt line of NIC is connected to GPIO line 36 */
+    /* Interrupt lines of the NICs are connected to GPIO lines 36 and 27 */
     smc91c111_init(&nd_table[0], 0x04000300,
                     pxa2xx_gpio_in_get(cpu->gpio)[36]);
+    smc91c111_init(&nd_table[1], 0x08000300,
+                    pxa2xx_gpio_in_get(cpu->gpio)[36]);
 }
 
 static void verdex_init(int ram_size, int vga_ram_size,