UBUNTU: SAUCE: (no-up) Remove acenic files duplicated in linux-firmware

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

diff --git a/firmware/Makefile b/firmware/Makefile
index 8bc23c98eb3c335a2f413b4fd8a118db32354300..26814441cfcb5c62440ed0eab1e12a50ec2eab16 100644 (file)
--- a/firmware/Makefile
+++ b/firmware/Makefile
@@ -20,30 +20,16 @@ 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_BNX2) += bnx2/bnx2-mips-09-6.2.1a.fw \
-                            bnx2/bnx2-rv2p-09-6.0.17.fw \
-                            bnx2/bnx2-rv2p-09ax-6.0.17.fw \
-                            bnx2/bnx2-mips-06-6.2.1.fw \
-                            bnx2/bnx2-rv2p-06-6.0.15.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_CHELSIO_T3) += cxgb3/t3b_psram-1.1.0.bin \
-                                  cxgb3/t3c_psram-1.1.0.bin \
-                                  cxgb3/ael2005_opt_edc.bin \
-                                  cxgb3/ael2005_twx_edc.bin \
-                                  cxgb3/ael2020_twx_edc.bin
-fw-shipped-$(CONFIG_DRM_MGA) += matrox/g200_warp.fw matrox/g400_warp.fw
-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 \
@@ -60,7 +46,6 @@ fw-shipped-$(CONFIG_DRM_RADEON) += radeon/R100_cp.bin radeon/R200_cp.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_MYRI_SBUS) += myricom/lanai.bin
 fw-shipped-$(CONFIG_PCMCIA_PCNET) += 
                                     
 fw-shipped-$(CONFIG_PCMCIA_3C589) += 
@@ -77,7 +62,6 @@ fw-shipped-$(CONFIG_SND_SB16_CSP) += sb16/mulaw_main.csp sb16/alaw_main.csp \
                                     sb16/ima_adpcm_playback.csp \
                                     sb16/ima_adpcm_capture.csp
 fw-shipped-$(CONFIG_SND_WAVEFRONT) += yamaha/yss225_registers.bin
-fw-shipped-$(CONFIG_TEHUTI) += tehuti/bdx.bin
 fw-shipped-$(CONFIG_TIGON3) += tigon/tg3.bin tigon/tg3_tso.bin \
                               tigon/tg3_tso5.bin
 fw-shipped-$(CONFIG_TYPHOON) += 3com/typhoon.bin
@@ -107,7 +91,6 @@ 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-$(CONFIG_YAM) += yam/1200.bin yam/9600.bin
 
 fw-shipped-all := $(fw-shipped-y) $(fw-shipped-m) $(fw-shipped-)