Skip to contentSkip to conversation

Remove broken MIPS PICA 61 machine

PATCH In review Hervé Poussineau 3 participants 3 messages Jan 30, 2008 Kbuild

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Remove broken MIPS PICA 61 machine

Hi,

This patch removes the MIPS Pica 61 machine and the RTC memory-mapped interface. Those don't work.
I didn't know how to do a patch which removes the file hw/mips_pica61.c, so this file will have to be removed manually by the committer.

Hervé

Index: Makefile.target
===================================================================
RCS file: /sources/qemu/qemu/Makefile.target,v
retrieving revision 1.240

Makefile.target +1 -1
diff -u -r1.240 Makefile.target
@@ -470,7 +470,7 @@
 VL_OBJS+= pflash_cfi02.o ppc4xx_devs.o ppc405_uc.o ppc405_boards.o
 endif
 ifeq ($(TARGET_BASE_ARCH), mips)
-VL_OBJS+= mips_r4k.o mips_malta.o mips_pica61.o mips_mipssim.o
+VL_OBJS+= mips_r4k.o mips_malta.o mips_mipssim.o
 VL_OBJS+= mips_timer.o mips_int.o dma.o vga.o serial.o i8254.o i8259.o
 VL_OBJS+= jazz_led.o
 VL_OBJS+= ide.o gt64xxx.o pckbd.o ps2.o fdc.o mc146818rtc.o usb-uhci.o acpi.o ds1225y.o

Index: vl.c
===================================================================
RCS file: /sources/qemu/qemu/vl.c,v
retrieving revision 1.401

vl.c +0 -1
diff -u -r1.401 vl.c
@@ -7935,7 +7935,6 @@
 #elif defined(TARGET_MIPS)
     qemu_register_machine(&mips_machine);
     qemu_register_machine(&mips_malta_machine);
-    qemu_register_machine(&mips_pica61_machine);
     qemu_register_machine(&mips_mipssim_machine);
 #elif defined(TARGET_SPARC)
 #ifdef TARGET_SPARC64

Index: hw/boards.h
===================================================================
RCS file: /sources/qemu/qemu/hw/boards.h,v
retrieving revision 1.7

boards.h +0 -3
diff -u -r1.7 boards.h
@@ -39,9 +39,6 @@
 /* mips_malta.c */
 extern QEMUMachine mips_malta_machine;
 
-/* mips_pica61.c */
-extern QEMUMachine mips_pica61_machine;
-
 /* mips_mipssim.c */
 extern QEMUMachine mips_mipssim_machine;
 

Index: hw/mc146818rtc.c
===================================================================
RCS file: /sources/qemu/qemu/hw/mc146818rtc.c,v
retrieving revision 1.16

mc146818rtc.c +0 -107

110 lines not on this page · raw message

#1 lore raw
Quoted 3 lines · Hervé Poussineau

I didn't know how to do a patch which removes the file hw/mips_pica61.c, so this file will have to be removed manually by the committer.

One work-around for that is to do:

  $ cvs diff ... > my.diff
  $ diff -pu hw/mips_pica61.c /dev/null >> my.diff

Tedious for more than a couple of files, and still requires the committer to issue a "cvs remove", but at least it makes the diff more complete.

Regards
Marius

#2 lore raw
Quoted 10 lines · Marius Groeger, le Wed 30 Jan 2008 14:41:17 +0100, a écrit :
Quoted 3 lines · Hervé Poussineau

I didn't know how to do a patch which removes the file hw/mips_pica61.c, so this file will have to be removed manually by the committer.

One work-around for that is to do:

  $ cvs diff ... > my.diff
  $ diff -pu hw/mips_pica61.c /dev/null >> my.diff

Another way is to use cvsdo:

cvsdo rm hw/mips_pica61.c

and then cvs diff will dump the removal.

Samuel