gwj / at91sam9263 · Commits

Commit 71b9b0ca5b29899042c5170692c468093fdb8af6

Authored by Anthony Liguori
1 parent 79eb76ad

Partially revert e20a8dff 

From Paul Brook:

 "the fdc is tied to the ISA DMA engine. We don't currently have a target
  independent method of handling inter-device data transfer."

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Inline Side-by-side
Showing 2 changed files with 5 additions and 8 deletions
Makefile.hw
  View file @71b9b0c
... ... @@ -23,9 +23,6 @@ OBJS+= nand.o ecc.o
23 23  
24 24 OBJS+= m48t59.o escc.o
25 25  
26   -# PC style devices
27   -OBJS+= fdc.o
28   -
29 26 # SCSI layer
30 27 OBJS+= lsi53c895a.o esp.o
31 28  
... ...
Makefile.target
  View file @71b9b0c
... ... @@ -563,7 +563,7 @@ OBJS += wdt_ib700.o wdt_i6300esb.o
563 563 ifeq ($(TARGET_BASE_ARCH), i386)
564 564 # Hardware support
565 565 OBJS+= ide.o pckbd.o vga.o $(SOUND_HW) dma.o
566   -OBJS+= mc146818rtc.o serial.o i8259.o i8254.o pcspk.o pc.o
  566 +OBJS+= fdc.o mc146818rtc.o serial.o i8259.o i8254.o pcspk.o pc.o
567 567 OBJS+= cirrus_vga.o apic.o ioapic.o parallel.o acpi.o piix_pci.o
568 568 OBJS+= usb-uhci.o vmmouse.o vmport.o vmware_vga.o hpet.o
569 569 OBJS += device-hotplug.o pci-hotplug.o smbios.o
... ... @@ -574,7 +574,7 @@ CPPFLAGS += -DHAS_AUDIO -DHAS_AUDIO_CHOICE
574 574 # shared objects
575 575 OBJS+= ppc.o ide.o vga.o $(SOUND_HW) dma.o openpic.o
576 576 # PREP target
577   -OBJS+= pckbd.o serial.o i8259.o i8254.o mc146818rtc.o
  577 +OBJS+= pckbd.o serial.o i8259.o i8254.o fdc.o mc146818rtc.o
578 578 OBJS+= prep_pci.o ppc_prep.o
579 579 # Mac shared devices
580 580 OBJS+= macio.o cuda.o adb.o mac_nvram.o mac_dbdma.o
... ... @@ -599,7 +599,7 @@ ifeq ($(TARGET_BASE_ARCH), mips)
599 599 OBJS+= mips_r4k.o mips_jazz.o mips_malta.o mips_mipssim.o
600 600 OBJS+= mips_timer.o mips_int.o dma.o vga.o serial.o i8254.o i8259.o rc4030.o
601 601 OBJS+= g364fb.o jazz_led.o dp8393x.o
602   -OBJS+= ide.o gt64xxx.o pckbd.o mc146818rtc.o usb-uhci.o acpi.o ds1225y.o
  602 +OBJS+= ide.o gt64xxx.o pckbd.o fdc.o mc146818rtc.o usb-uhci.o acpi.o ds1225y.o
603 603 OBJS+= piix_pci.o parallel.o cirrus_vga.o pcspk.o $(SOUND_HW)
604 604 OBJS+= mipsnet.o
605 605 OBJS+= pflash_cfi01.o
... ... @@ -622,11 +622,11 @@ endif
622 622 ifeq ($(TARGET_BASE_ARCH), sparc)
623 623 ifeq ($(TARGET_ARCH), sparc64)
624 624 OBJS+= sun4u.o ide.o pckbd.o vga.o apb_pci.o
625   -OBJS+= mc146818rtc.o serial.o
  625 +OBJS+= fdc.o mc146818rtc.o serial.o
626 626 OBJS+= cirrus_vga.o parallel.o
627 627 else
628 628 OBJS+= sun4m.o tcx.o iommu.o slavio_intctl.o
629   -OBJS+= slavio_timer.o slavio_misc.o sparc32_dma.o
  629 +OBJS+= slavio_timer.o slavio_misc.o fdc.o sparc32_dma.o
630 630 OBJS+= cs4231.o eccmemctl.o sbi.o sun4c_intctl.o
631 631 endif
632 632 endif
... ...