KVM: PPC: Use preregistered memory API to access TCE list

[mirror_ubuntu-zesty-kernel.git] / firmware / Makefile

diff --git a/firmware/Makefile b/firmware/Makefile
index 3c4207d67ebb160998caec556a3ff2c2a8feeb02..cee34536e4a20a1de1dce64512f2c9c86bd55c37 100644 (file)
--- a/firmware/Makefile
+++ b/firmware/Makefile
@@ -20,38 +20,14 @@ fw-external-y := $(subst $(quote),,$(CONFIG_EXTRA_FIRMWARE))
 # accurate. In the latter case it doesn't matter -- it'll use $(fw-shipped-all).
 # But be aware that the config file might not be included at all.
 
-ifdef CONFIG_ACENIC_OMIT_TIGON_I
-acenic-objs := acenic/tg2.bin
-fw-shipped- += acenic/tg1.bin
-else
-acenic-objs := acenic/tg1.bin acenic/tg2.bin
-endif
-fw-shipped-$(CONFIG_ACENIC) += $(acenic-objs)
-fw-shipped-$(CONFIG_ATARI_DSP56K) += dsp56k/bootstrap.bin
-fw-shipped-$(CONFIG_BNX2X) += bnx2x/bnx2x-e1-7.2.51.0.fw \
-                             bnx2x/bnx2x-e1h-7.2.51.0.fw \
-                             bnx2x/bnx2x-e2-7.2.51.0.fw
+fw-shipped-$(CONFIG_BNX2X) += bnx2x/bnx2x-e1-7.13.1.0.fw \
+                             bnx2x/bnx2x-e1h-7.13.1.0.fw \
+                             bnx2x/bnx2x-e2-7.13.1.0.fw
 fw-shipped-$(CONFIG_BNX2) +=   bnx2/bnx2-mips-09-6.2.1b.fw \
                                bnx2/bnx2-rv2p-06-6.0.15.fw \
                                bnx2/bnx2-mips-06-6.2.3.fw \
                                bnx2/bnx2-rv2p-09-6.0.17.fw \
                                bnx2/bnx2-rv2p-09ax-6.0.17.fw
-fw-shipped-$(CONFIG_CASSINI) += sun/cassini.bin
-fw-shipped-$(CONFIG_DRM_R128) += r128/r128_cce.bin
-fw-shipped-$(CONFIG_DRM_RADEON) += radeon/R100_cp.bin radeon/R200_cp.bin \
-                                  radeon/R300_cp.bin radeon/R420_cp.bin \
-                                  radeon/RS690_cp.bin radeon/RS600_cp.bin \
-                                  radeon/R520_cp.bin \
-                                  radeon/R600_pfp.bin radeon/R600_me.bin \
-                                  radeon/RV610_pfp.bin radeon/RV610_me.bin \
-                                  radeon/RV630_pfp.bin radeon/RV630_me.bin \
-                                  radeon/RV620_pfp.bin radeon/RV620_me.bin \
-                                  radeon/RV635_pfp.bin radeon/RV635_me.bin \
-                                  radeon/RV670_pfp.bin radeon/RV670_me.bin \
-                                  radeon/RS780_pfp.bin radeon/RS780_me.bin \
-                                  radeon/RV770_pfp.bin radeon/RV770_me.bin \
-                                  radeon/RV730_pfp.bin radeon/RV730_me.bin \
-                                  radeon/RV710_pfp.bin radeon/RV710_me.bin
 fw-shipped-$(CONFIG_E100) += e100/d101m_ucode.bin e100/d101s_ucode.bin \
                             e100/d102e_ucode.bin
 fw-shipped-$(CONFIG_PCMCIA_PCNET) += 
@@ -77,28 +53,8 @@ fw-shipped-$(CONFIG_USB_EMI26) += emi26/loader.fw emi26/firmware.fw \
                                  emi26/bitstream.fw
 fw-shipped-$(CONFIG_USB_EMI62) += emi62/loader.fw emi62/bitstream.fw \
                                  emi62/spdif.fw emi62/midi.fw
-ifdef CONFIG_FIRMWARE_IN_KERNEL
-fw-shipped-$(CONFIG_USB_SERIAL_KEYSPAN_MPR) += keyspan/mpr.fw
-fw-shipped-$(CONFIG_USB_SERIAL_KEYSPAN_USA18X) += keyspan/usa18x.fw
-fw-shipped-$(CONFIG_USB_SERIAL_KEYSPAN_USA19) += keyspan/usa19.fw
-fw-shipped-$(CONFIG_USB_SERIAL_KEYSPAN_USA19QI) += keyspan/usa19qi.fw
-fw-shipped-$(CONFIG_USB_SERIAL_KEYSPAN_USA19QW) += keyspan/usa19qw.fw
-fw-shipped-$(CONFIG_USB_SERIAL_KEYSPAN_USA19W) += keyspan/usa19w.fw
-fw-shipped-$(CONFIG_USB_SERIAL_KEYSPAN_USA28) += keyspan/usa28.fw
-fw-shipped-$(CONFIG_USB_SERIAL_KEYSPAN_USA28XA) += keyspan/usa28xa.fw
-fw-shipped-$(CONFIG_USB_SERIAL_KEYSPAN_USA28XB) += keyspan/usa28xb.fw
-fw-shipped-$(CONFIG_USB_SERIAL_KEYSPAN_USA28X) += keyspan/usa28x.fw
-fw-shipped-$(CONFIG_USB_SERIAL_KEYSPAN_USA49W) += keyspan/usa49w.fw
-fw-shipped-$(CONFIG_USB_SERIAL_KEYSPAN_USA49WLC) += keyspan/usa49wlc.fw
-else
-fw-shipped- += keyspan/mpr.fw keyspan/usa18x.fw keyspan/usa19.fw       \
-       keyspan/usa19qi.fw keyspan/usa19qw.fw keyspan/usa19w.fw         \
-       keyspan/usa28.fw keyspan/usa28xa.fw keyspan/usa28xb.fw          \
-       keyspan/usa28x.fw keyspan/usa49w.fw keyspan/usa49wlc.fw
-endif
 fw-shipped-$(CONFIG_USB_SERIAL_WHITEHEAT) += whiteheat_loader.fw whiteheat.fw \
                                           # whiteheat_loader_debug.fw
-fw-shipped-$(CONFIG_USB_VICAM) += vicam/firmware.fw
 
 fw-shipped-all := $(fw-shipped-y) $(fw-shipped-m) $(fw-shipped-)