Commit f1698408 authored by Blue Swirl's avatar Blue Swirl
Browse files

Compile usb-ohci only once 



Push TARGET_WORDS_BIGENDIAN dependency to board level.

Signed-off-by: default avatarBlue Swirl <blauwirbel@gmail.com>
parent 2d48377a

Makefile.objs

+1 −0
Original line number Diff line number Diff line
@@ -143,6 +143,7 @@ hw-obj-$(CONFIG_PARALLEL) += parallel.o 
hw-obj-$(CONFIG_I8254) += i8254.o

hw-obj-$(CONFIG_PCSPK) += pcspk.o

hw-obj-$(CONFIG_USB_UHCI) += usb-uhci.o

hw-obj-$(CONFIG_USB_OHCI) += usb-ohci.o

hw-obj-$(CONFIG_FDC) += fdc.o



# PCI watchdog devices

Makefile.target

+0 −3
Original line number Diff line number Diff line
@@ -186,9 +186,6 @@ QEMU_CFLAGS += $(VNC_SASL_CFLAGS) 
# xen backend driver support

obj-$(CONFIG_XEN) += xen_machine_pv.o xen_domainbuild.o



# USB layer

obj-$(CONFIG_USB_OHCI) += usb-ohci.o



# PCI network cards

obj-y += rtl8139.o

obj-y += e1000.o

hw/devices.h

+1 −1
Original line number Diff line number Diff line
@@ -69,5 +69,5 @@ void sm501_init(uint32_t base, uint32_t local_mem_bytes, qemu_irq irq, 


/* usb-ohci.c */

void usb_ohci_init_sm501(uint32_t mmio_base, uint32_t localmem_base,

                         int num_ports, int devfn, qemu_irq irq);

                         int num_ports, int devfn, qemu_irq irq, int be);

#endif

hw/ppc_newworld.c

+1 −1
Original line number Diff line number Diff line
@@ -387,7 +387,7 @@ static void ppc_core99_init (ram_addr_t ram_size, 
               escc_mem_index);



    if (usb_enabled) {

        usb_ohci_init_pci(pci_bus, -1);

        usb_ohci_init_pci(pci_bus, -1, 1);

    }



    /* U3 needs to use USB for input because Linux doesn't support via-cuda

hw/ppc_oldworld.c

+1 −1
Original line number Diff line number Diff line
@@ -370,7 +370,7 @@ static void ppc_heathrow_init (ram_addr_t ram_size, 
               escc_mem_index);



    if (usb_enabled) {

        usb_ohci_init_pci(pci_bus, -1);

        usb_ohci_init_pci(pci_bus, -1, 1);

    }



    if (graphic_depth != 15 && graphic_depth != 32 && graphic_depth != 8)