Commit a292f404 authored by David Woodhouse's avatar David Woodhouse Committed by David Woodhouse

firmware: convert maestro3 driver to use firmware loader exclusively

Signed-off-by: default avatarDavid Woodhouse <dwmw2@infradead.org>
parent 76770664
...@@ -21,6 +21,8 @@ fw-external-y := $(subst ",,$(CONFIG_EXTRA_FIRMWARE)) ...@@ -21,6 +21,8 @@ fw-external-y := $(subst ",,$(CONFIG_EXTRA_FIRMWARE))
# But be aware that the config file might not be included at all. # But be aware that the config file might not be included at all.
fw-shipped-$(CONFIG_SND_KORG1212) += korg/k1212.dsp fw-shipped-$(CONFIG_SND_KORG1212) += korg/k1212.dsp
fw-shipped-$(CONFIG_SND_MAESTRO3) += ess/maestro3_assp_kernel.fw \
ess/maestro3_assp_minisrc.fw
fw-shipped-all := $(fw-shipped-y) $(fw-shipped-m) $(fw-shipped-) fw-shipped-all := $(fw-shipped-y) $(fw-shipped-m) $(fw-shipped-)
......
...@@ -17,3 +17,17 @@ Licence: Unknown ...@@ -17,3 +17,17 @@ Licence: Unknown
Found in alsa-firmware package in hex form; no licensing information. Found in alsa-firmware package in hex form; no licensing information.
-------------------------------------------------------------------------- --------------------------------------------------------------------------
Driver: maestro3 -- ESS Allegro Maestro3 audio device
File: ess/maestro3_assp_kernel.fw
File: ess/maestro3_assp_minisrc.fw
Licence: Unknown
Found in alsa-firmware package in hex form with a comment claiming to
be GPLv2+, but without source -- and with another comment saying "ESS
drops binary dsp code images on our heads, but we don't get to see
specs on the dsp."
--------------------------------------------------------------------------
:10000000807930008079B4038079B4038079FB0073
:100010008079DD008079B4038079320380798702AA
:100020008079B4038079B4038079B4038079B40310
:1000300080791A038079B40380792F028079B40320
:100040008079B4038079B4038079B4038079B403F0
:100050008079630080796B008079B4038079B40380
:1000600080BF7C2C0688048840BE20BC09AE0010EE
:100070000AAE0100386908EB53005A6908EBD60054
:100080000900888B806988E3360030BE20BC09698E
:1000900001B8099041BE41BE286988EB780041BE95
:1000A00040BE8079380041BE41BE3A90386908E3CD
:1000B00056003A9041BE40BE00EF3A90396908E3DD
:1000C0005E003A9000EF0B690C668CEF0A690C66D3
:1000D0000B62096600EF10690F6604EF88E3750094
:1000E0000E690F6610620D6600EF0E690D6600EF77
:1000F00070AE010020BC27AE0100396908EB5D003D
:10010000266901B826902600888B806988E3CB0099
:100110002890280D114200E17A00114700E1A0006B
:10012000807A630011B80A66096204E37A000B0C56
:1001300005400A1001BA1290120C02408079AF00FB
:10014000807A6B0002BE0E620D6610BA44E37A003C
:10015000100C05400E1001BA1290120C0240031050
:1001600002BA1290120C0040031088E3BA00041087
:100170008079BC00041001BA1290120C0140050CE9
:100180000340060C04401110B0BFFF011290120C86
:10019000064020BC00EF26AE28107069D0BF0100D9
:1001A000709088E37A0028AE000000EF70AE000384
:1001B000700C0CB05AAE000000EF807A8A037F69A1
:1001C00001B87F905600888BA00C08B071AF00B0CA
:1001D000714E00E2F30056AE57105600A00C08B066
:1001E00056808079A1031008A0BF591004E3A10331
:1001F00056808079A103807A8A0301BF43BE59BE2D
:100200007C90376988E30D0101BA08E30C0171AEF7
:100210000400710C0050366937900ABF9E108A8B1B
:1002200080AF1480804C0ABF600500F50ABF20052E
:1002300000B917BBA090176988E34801170D00E1CA
:1002400027010CBF78050DBF7C0580792B010CBF01
:1002500038050DBF3C05006908E335018C8B59BE9C
:1002600007BBA09020BC807957010C038B8B03B98E
:100270000988C6BE3E01AC69AB90AD69AB9013086E
:100280000A6644E3440109030C8320BC80795701CA
:10029000556988E35701387C0BBF780500F50BBF23
:1002A000380507B90988C6BE5601AB10AA90746913
:1002B00088E3630172AE400500F572AE000561AEE1
:1002C0003B10807AF602786988E382018C8B0CBF40
:1002D000600500E5407C140820BA12883D73807ADE
:1002E00080033E73807A80038C8B0CBF6C0500E525
:1002F000407C14082CBA12883F73807A80034073C4
:10030000807A8003756988E38E0172AE480500F536
:1003100072AE080561AE4110807AF602796988E311
:10032000AD018C8B0CBF600500E5407C140818BA49
:1003300012884373807A80034473807A80038C8BA5
:100340000CBF6C0500E5407C140824BA1288457384
:10035000807A80034673807A8003766988E3B901E6
:1003600072AE580500F572AE180561AE4710807A7E
:10037000F6027A6988E3D8018C8B0CBF600500E532
:10038000407C140808BA12884973807A80034A7343
:10039000807A80038C8B0CBF6C0500E5407C1408D0
:1003A00014BA12884B73807A80034C73807A80036E
:1003B00021BC1CAE90108A8B0ABF600500E5407C12
:1003C000120804B813888D8B0DBF6C0500E5407CC6
:1003D000150804B81188807A4A038A8B0ABF600521
:1003E00000E5407C1F7303B90988C6BEF9018A5431
:1003F00003BEA098207303B90988C6BE01028A54BF
:1004000003BEA098201F1F2F269820BC356988E3C3
:10041000A103336901B83390A0BFEE0208E3A10342
:10042000339000BF516988E31F02347380BE605768
:1004300003BE7E9F59BE34907E69510D139020BC3F
:100440005C6988E3A1035E7380BE605703BE7E9F34
:1004500059BE5E907E695C0D13908079A103807A0D
:100460008A0301BF43BE776988E34E0261AE4D1037
:100470006100888B806988E34E027190710D0B00DA
:10048000A0AF1080A0AF108010080A6608E34902F0
:10049000090010080C6688E34E020B8020BC7B69C3
:1004A00088E3A1030ABF9E108A8B80AF1480804C22
:1004B00000E166027C6990BF6005729072037C69FE
:1004C00090BF640573907304807970027C6990BF5B
:1004D0002005729072037C6990BF240573907304A9
:1004E0007C6901B87C900ABFFD108A8B80AF1080B8
:1004F0004F738A5403BE809821BC26738B5403BE6D
:100500008B618C9803BE806180988079A103807A8A
:100510008A03280D114700E1BE0212AF064012699E
:10052000B0BF000C88E3B602A0BF000888E3B202A7
:100530001269B0BF000CA0BF000488E3A3020969E0
:100540000B908079A5020BAF054001690590026907
:100550000690114300E1ED021169C0BF0020119027
:100560008079ED0209690B908079B8020BAF0540E4
:1005700005AF034006AF04408079ED0212AF06409C
:100580001269B0BF000C88E3E702A0BF000888E34F
:10059000E3021269B0BF000CA0BF000488E3D402DC
:1005A0000D6910908079D60210AF05400169059061
:1005B00002690690114300E1ED021169C0BF0020FD
:1005C00011908079ED020D6910908079E90210AFE9
:1005D000054005AF034006AF044020BC7069719030
:1005E000807A7800716970908079A10320BC6103E2
:1005F0008B8B806988EF7202720304787190710DA1
:100600008A8B0B0003B90988C6BE0903A869AB90A1
:10061000A869AA9010080A6644E30F0309001008AD
:100620000C6688E314030B8020BC616901B86190FB
:100630008079F702807A8A03355D0100346901B858
:1006400034900ABF9E108A8B80AF1480804872AEAF
:10065000500500F572AE100561AE5110807AF602B9
:100660008079A103807A8A03355D02005E6901B852
:100670005E900ABF9E108A8B80AF1480804772AE56
:10068000580500F572AE180561AE5C10807AF6026E
:100690008079A1031C00888B806988EF1D901D0D57
:1006A0000F1010668CE358030E6910660F620D661A
:1006B0000FBA01E37A0310048A8B03B90988C6BE16
:1006C0006C038C6AAA61AB988C6AAB61AD988C6A3A
:1006D000AD61A9988C6AA961AA98047C8B8B047C73
:1006E0008D8B047C898B047C14080E6608E37903E7
:1006F0000D04108421BC1C6901B81C9080794A0348
:1007000003B909888A8BC6BE8803AC5403BE8C61CA
:10071000AA9800EF20BC46BE09086B900A086C90AE
:100720000B086D901A0862901B0863901E08649075
:1007300059BE1E88658066816782688369846A8580
:1007400000EF20BC6B6909886C690A886D690B88A9
:1007500062691A8863691B8864691E88650066017E
:0A0760006702680369046A053ABEE7
:00000001FF
:1000000080BF1E106E906E00888B806988EF6F90A5
:100010006F0D006908EB120420BC6E6901B86E9088
:10002000807903040EB9078843BE01BF47BE41BEB5
:10003000807A2A0040BE2930CCEF41BE807A280069
:1000400040BE2830CCEF076908E32A0409692C90E8
:1000500080792C040D692C9009101A880A1001BAB5
:100060001B880D101C880E1001BA1D8880BFED0082
:100070001E880C05240104B92790186908E3B3040D
:100080002D901369A0BF987504F72DAEFF008D8BDE
:10009000196908E363041A6908E3560407B9098873
:1000A000C6BE5304A910AD9080797C0403B90988B9
:1000B000C6BE60048918226CAD90A910236E226C14
:1000C000AD9080797C041A1008E36F0403B90988A5
:1000D000C6BE6C04A910A090AD9080797C0401B9D3
:1000E0000988C6BE7B048918226CA090AD90A91027
:1000F000236E226CA090AD902D6908E39C0424012E
:1001000003B702B91888898B2C028A10047CA0904E
:100110002B691F88807E5B052A690988898BA099D5
:100120008A10A0902B691F88807E5B052A69098848
:10013000898BAF99997B840424010F061B1013202F
:100140001B90A0BFFF7F44E3AC041B90898B807A97
:100150001A05276901BA2790807A2305276908E3E1
:100160009E0480790F052406261013202690A0BF38
:10017000FF7F04E3C0048D8B807A1A058079B40474
:100180002690131026301B908D8B807A1A05807A6A
:100190002305271001BA279008E3B40424010F06B1
:1001A000898B1A6908E3EA04196988E3E00403B952
:1001B0000988C6BEDD04A01FAE2FA99880790F055F
:1001C00001B9188807B90988C6BEE704EE10A990DE
:1001D00080790F05196908E3FE0403B9098846BE52
:1001E000C6BEFA04A0171EBEAE1FBFBF00FF13BEDF
:1001F000DFBF8080A99947BE80790F0501B90988C2
:10020000C6BE0E05A016A026B7BF00FF1EBEA01ECC
:10021000AE2EBFBF00FF13BEDFBF8080A9990C8543
:100220000F86076988E31605070D108559BE1E88DD
:100230004ABE00EF1E101C901F101D90A0101E90B3
:10024000A0101F9000EF1E101C3020901B73205434
:1002500003BE259825101C2025902573145403BE39
:100260008E8B80982F6988E3390559BE07BB806162
:100270008098A08B1F101D3021901B73215403BE4A
:100280002E982E101D202E902E73155403BE80988C
:100290002F6988E34F0559BE07BB80618098A08B0A
:1002A000186908EF2573165403BEA0982E731754CF
:1002B00003BEA09800EFA08BC6BE6B0559BE04BB61
:1002C00090AA04BE1EBEE099E08BA069D090A06900
:1002D000D0901F0805B81F88908BA069D090A069A6
:1002E0009090D08BD88B1FBE00EF00000000000064
:1002F00000000000000000000000000000000000FE
:1003000000000000000000000000000000000000ED
:020310000000EB
:00000001FF
...@@ -744,7 +744,6 @@ config SND_KORG1212 ...@@ -744,7 +744,6 @@ config SND_KORG1212
config SND_MAESTRO3 config SND_MAESTRO3
tristate "ESS Allegro/Maestro3" tristate "ESS Allegro/Maestro3"
depends on SND depends on SND
select FW_LOADER if !SND_MAESTRO3_FIRMWARE_IN_KERNEL
select SND_AC97_CODEC select SND_AC97_CODEC
help help
Say Y here to include support for soundcards based on ESS Maestro 3 Say Y here to include support for soundcards based on ESS Maestro 3
...@@ -753,15 +752,6 @@ config SND_MAESTRO3 ...@@ -753,15 +752,6 @@ config SND_MAESTRO3
To compile this driver as a module, choose M here: the module To compile this driver as a module, choose M here: the module
will be called snd-maestro3. will be called snd-maestro3.
config SND_MAESTRO3_FIRMWARE_IN_KERNEL
bool "In-kernel firmware for Maestro3 driver"
depends on SND_MAESTRO3
default y
help
Say Y here to include the static firmware built in the kernel
for the Maestro3 driver. If you choose N here, you need to
install the firmware files from the alsa-firmware package.
config SND_MIXART config SND_MIXART
tristate "Digigram miXart" tristate "Digigram miXart"
depends on SND depends on SND
......
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment