From a54bd1758b324f11ef73008a6cd1fbd7fc2f1a04 Mon Sep 17 00:00:00 2001
From: Eduardo Habkost <ehabkost@redhat.com>
Date: Fri, 2 Oct 2009 16:51:30 -0300
Subject: [PATCH 5/7] Don't compile drivers that are not used in a pc

RH-Author: Juan Quintela <quintela@redhat.com>
Message-id: <d3ad60d0fef326b698eb884a181ae19261c22ebe.1253286927.git.quintela@redhat.com>
Patchwork-id: 3452
O-Subject: [PATCH 4/4] Don't compile drivers that are not used in a pc
Bugzilla: 516672
RH-Acked-by: Markus Armbruster <armbru@redhat.com>
RH-Acked-by: Luiz Capitulino <lcapitulino@redhat.com>
RH-Acked-by: Eduardo Habkost <ehabkost@redhat.com>

Instead of removing them, I added them to a NOPC variable in the same place
that they were used.

Upstream is using a different solution too invasible for RHEL5.5.

Signed-off-by: Juan Quintela <quintela@redhat.com>
---
 qemu/Makefile        |    9 +++++----
 qemu/Makefile.target |   11 +++++++----
 2 files changed, 12 insertions(+), 8 deletions(-)

Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
 qemu/Makefile        |    9 +++++----
 qemu/Makefile.target |   11 +++++++----
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/qemu/Makefile b/qemu/Makefile
index cf23885..9249d89 100644
--- a/qemu/Makefile
+++ b/qemu/Makefile
@@ -77,9 +77,10 @@ OBJS=$(BLOCK_OBJS)
 OBJS+=readline.o console.o
 
 OBJS+=irq.o
-OBJS+=i2c.o smbus.o smbus_eeprom.o max7310.o max111x.o wm8750.o
-OBJS+=ssd0303.o ssd0323.o ads7846.o stellaris_input.o twl92230.o
-OBJS+=tmp105.o lm832x.o
+OBJS+=i2c.o smbus.o smbus_eeprom.o
+NOPC= max7310.o max111x.o wm8750.o
+NOPC+=ssd0303.o ssd0323.o ads7846.o stellaris_input.o twl92230.o
+NOPC+=tmp105.o lm832x.o
 OBJS+=cdrom.o
 ifdef CONFIG_SCSI
 OBJS+=scsi-disk.o scsi-generic.o
@@ -97,7 +98,7 @@ endif
 ifdef CONFIG_USB_NET
 OBJS+=usb-net.o
 endif
-OBJS+=sd.o ssi-sd.o
+NOPC+=sd.o ssi-sd.o
 ifdef CONFIG_BLUEZ
 OBJS+=bt.o bt-host.o bt-vhci.o bt-l2cap.o bt-sdp.o bt-hci.o bt-hid.o
 ifdef CONFIG_USB_BLUEZ
diff --git a/qemu/Makefile.target b/qemu/Makefile.target
index 4c59920..e094b90 100644
--- a/qemu/Makefile.target
+++ b/qemu/Makefile.target
@@ -190,7 +190,8 @@ all: $(PROGS)
 
 #########################################################
 # cpu emulator library
-LIBOBJS=exec.o kqemu.o cpu-exec.o host-utils.o
+LIBOBJS=exec.o cpu-exec.o host-utils.o
+NOPC+=kqemu.o
 
 ifeq ($(NO_CPU_EMULATION), 1)
 LIBOBJS+=fake-exec.o
@@ -612,7 +613,8 @@ endif #CONFIG_BSD_USER
 # System emulator target
 ifndef CONFIG_USER_ONLY
 
-OBJS=vl.o osdep.o monitor.o pci.o loader.o isa_mmio.o machine.o
+OBJS=vl.o osdep.o monitor.o pci.o loader.o machine.o
+NOPC=isa_mmio.o
 # virtio has to be here due to weird dependency between PCI and virtio-net.
 # need to fix this properly
 OBJS+=virtio.o virtio-blk.o virtio-balloon.o virtio-net.o
@@ -700,7 +702,7 @@ OBJS+= lsi53c895a.o esp.o
 endif
 
 # USB layer
-OBJS+= usb-ohci.o
+NOPC+= usb-ohci.o
 
 # EEPROM emulation
 OBJS += eeprom93xx.o
@@ -850,7 +852,8 @@ OBJS+= an5206.o mcf5206.o ptimer.o mcf_uart.o mcf_intc.o mcf5208.o mcf_fec.o
 OBJS+= m68k-semi.o dummy_m68k.o
 endif
 ifdef CONFIG_GDBSTUB
-OBJS+=gdbstub.o gdbstub-xml.o
+OBJS+=gdbstub.o
+NOPC+=gdbstub-xml.o
 endif
 ifdef CONFIG_COCOA
 COCOA_LIBS=-F/System/Library/Frameworks -framework Cocoa -framework IOKit
-- 
1.6.3.rc4.29.g8146