[alsa-devel] [PATCH 0/2] conf/ucm: Remove intel UCM conf files from alsa-lib repo
From: Fuwei Tang fuweix.tang@intel.com
Remove the intel UCM configs from alsa-lib repo.
Another series will add them to a dedicated UCM conf repo.License can be changed to BSD for intel files,and left as "unknown" for other conf files when they are moved from alsa-lib to the new repo.The alsa-lib LGPL license does not cover runtime configuration files.
Fuwei Tang (2): conf/ucm: Remove conf files of broxton-rt298 platform conf/ucm: Remove conf files of skylake-rt286 platfrom
configure.ac | 2 - src/conf/ucm/Makefile.am | 2 +- src/conf/ucm/broxton-rt298/Hdmi1 | 22 ----- src/conf/ucm/broxton-rt298/Hdmi2 | 14 --- src/conf/ucm/broxton-rt298/HiFi | 129 -------------------------- src/conf/ucm/broxton-rt298/Makefile.am | 4 - src/conf/ucm/broxton-rt298/broxton-rt298.conf | 58 ------------ src/conf/ucm/skylake-rt286/Hdmi1 | 20 ---- src/conf/ucm/skylake-rt286/Hdmi2 | 20 ---- src/conf/ucm/skylake-rt286/HiFi | 129 -------------------------- src/conf/ucm/skylake-rt286/Makefile.am | 4 - src/conf/ucm/skylake-rt286/skylake-rt286.conf | 60 ------------ 12 files changed, 1 insertion(+), 463 deletions(-) delete mode 100644 src/conf/ucm/broxton-rt298/Hdmi1 delete mode 100644 src/conf/ucm/broxton-rt298/Hdmi2 delete mode 100644 src/conf/ucm/broxton-rt298/HiFi delete mode 100644 src/conf/ucm/broxton-rt298/Makefile.am delete mode 100644 src/conf/ucm/broxton-rt298/broxton-rt298.conf delete mode 100644 src/conf/ucm/skylake-rt286/Hdmi1 delete mode 100644 src/conf/ucm/skylake-rt286/Hdmi2 delete mode 100644 src/conf/ucm/skylake-rt286/HiFi delete mode 100644 src/conf/ucm/skylake-rt286/Makefile.am delete mode 100644 src/conf/ucm/skylake-rt286/skylake-rt286.conf
From: Fuwei Tang fuweix.tang@intel.com
Remove conf files of broxton-rt298 platform from alsa-lib repo. The files will be moved to alsa-ucm-conf repo.
Signed-off-by: Fuwei Tang fuweix.tang@intel.com Reviewed-by: Liam Girdwood liam.r.girdwood@linux.intel.com Reviewed-by: Vinod Koul vinod.koul@intel.com Reviewed-by: Mengdong Lin mengdong.lin@linux.intel.com
diff --git a/configure.ac b/configure.ac index d645ab6..71bd852 100644 --- a/configure.ac +++ b/configure.ac @@ -684,7 +684,6 @@ AC_OUTPUT(Makefile doc/Makefile doc/pictures/Makefile doc/doxygen.cfg \ src/conf/topology/bxtrt298/Makefile \ alsalisp/Makefile aserver/Makefile \ test/Makefile test/lsb/Makefile \ - src/conf/ucm/broxton-rt298/Makefile \ utils/Makefile utils/alsa-lib.spec utils/alsa.pc)
dnl Create asoundlib.h dynamically according to configure options diff --git a/src/conf/ucm/Makefile.am b/src/conf/ucm/Makefile.am index ea9b385..a11d324 100644 --- a/src/conf/ucm/Makefile.am +++ b/src/conf/ucm/Makefile.am @@ -1 +1 @@ -SUBDIRS=DAISY-I2S PandaBoard PandaBoardES SDP4430 tegraalc5632 PAZ00 GoogleNyan broadwell-rt286 skylake-rt286 VEYRON-I2S chtrt5645 DB410c broxton-rt298 +SUBDIRS=DAISY-I2S PandaBoard PandaBoardES SDP4430 tegraalc5632 PAZ00 GoogleNyan broadwell-rt286 skylake-rt286 VEYRON-I2S chtrt5645 DB410c diff --git a/src/conf/ucm/broxton-rt298/Hdmi1 b/src/conf/ucm/broxton-rt298/Hdmi1 deleted file mode 100644 index 48514f4..0000000 --- a/src/conf/ucm/broxton-rt298/Hdmi1 +++ /dev/null @@ -1,22 +0,0 @@ -# Usecase for device HDMI1/Display Port stereo playback on Intel SKYLAKE/KABYLAKE platforms -# For Audio in I2S mode - -SectionDevice."Hdmi1" { - Comment "HDMI/Display Port 1 Stereo" - - EnableSequence [ - exec "echo Hdmi1 EnableSequnece" - ] - - DisableSequence [ - exec "echo Hdmi1 DisableSequnece" - ] - - Value { - PlaybackPCM "hw:broxtonrt298,4" - PlaybackChannels "2" - PlaybackPriority "3" - JackControl "HDMI/DP, pcm=4 Jack" - } -} - diff --git a/src/conf/ucm/broxton-rt298/Hdmi2 b/src/conf/ucm/broxton-rt298/Hdmi2 deleted file mode 100644 index 764f8b9..0000000 --- a/src/conf/ucm/broxton-rt298/Hdmi2 +++ /dev/null @@ -1,14 +0,0 @@ -# Usecase for device HDMI2/Display Port stereo playback on Intel Broxton platforms -# For Audio in I2S mode - -SectionDevice."Hdmi2" { - Comment "HDMI/Display Port 2 Stereo" - - Value { - PlaybackPCM "hw:broxtonrt298,5" - PlaybackChannels "2" - PlaybackPriority "4" - JackControl "HDMI/DP, pcm=5 Jack" - } -} - diff --git a/src/conf/ucm/broxton-rt298/HiFi b/src/conf/ucm/broxton-rt298/HiFi deleted file mode 100644 index 2e2d6fe..0000000 --- a/src/conf/ucm/broxton-rt298/HiFi +++ /dev/null @@ -1,129 +0,0 @@ -# Usecase for stereo playback Speaker and Headset, Recording on DMIC and Headset MIC. -# For Audio in I2S mode on Intel Broxton platforms - -SectionVerb { - - EnableSequence [ - cdev "hw:broxtonrt298" - cset "name='media0_out mo dmic01_hifi_in mi Switch' 1" - ] - - DisableSequence [ - cdev "hw:broxtonrt298" - ] - - Value { - TQ "HiFi" - CapturePCM "hw:broxtonrt298,1" - PlaybackPCM "hw:broxtonrt298,0" - } -} - -SectionDevice."dmiccap" { - Comment "DMIC Stereo" - - ConflictingDevice [ - "Headset" - ] - - EnableSequence [ - - cdev "hw:broxtonrt298" - exec "echo broxtonrt298 dmiccap called" - cset "name='media0_out mo dmic01_hifi_in mi Switch' 1" - cset "name='media0_out mo codec0_in mi Switch' 0" - cset "name='Mic Jack Switch' 0" - - ] - - DisableSequence [ - cdev "hw:broxtonrt298" - cset "name='media0_out mo codec0_in mi Switch' 1" - cset "name='media0_out mo dmic01_hifi_in mi Switch' 0" - cset "name='Mic Jack Switch' 1" - cset "name='ADC 0 Mux' 0" - ] - Value { - CaptureChannels "2" - CapturePriority "2" - } -} - -SectionDevice."Headphones" { - Comment "Headphones" - - ConflictingDevice [ - "Speaker" - ] - EnableSequence [ - cdev "hw:broxtonrt298" - exec "echo broxtonrt298 Headphone called" - cset "name='HPO L Switch' 1" - cset "name='HPO R Switch' 1" - cset "name='Headphone Jack Switch' 1" - cset "name='Speaker Playback Switch' 0,0" - ] - - DisableSequence [ - cdev "hw:broxtonrt298" - ] - Value { - PlaybackChannels "2" - PlaybackPriority "1" - JackControl "Headphone Jack" - JackHWMute "Speaker" - } -} - -SectionDevice."Speaker" { - Comment "Speaker" - - ConflictingDevice [ - "Headphones" - ] - EnableSequence [ - cdev "hw:broxtonrt298" - exec "echo broxtonrt298 speaker called" - cset "name='SPO Switch' 1" - cset "name='Speaker Playback Switch' 1,1" - cset "name='Speaker Switch' 1" - cset "name='HPO L Switch' 0" - cset "name='HPO R Switch' 0" - ] - - DisableSequence [ - ] - Value { - PlaybackChannels "2" - PlaybackPriority "1" - JackHWMute "Headphones" - } -} - -SectionDevice."Headset" { - Comment "Headset Mic" - - ConflictingDevice [ - "dmiccap" - ] - EnableSequence [ - cdev "hw:broxtonrt298" - exec "echo broxtonrt298 Headset called" - cset "name='media0_out mo codec0_in mi Switch' 1" - cset "name='ADC0 Capture Volume' 105,105" - cset "name='ADC 0 Mux' 0" - cset "name='Mic Jack Switch' 1" - cset "name='media0_out mo dmic01_hifi_in mi Switch' 0" - ] - - DisableSequence [ - cdev "hw:broxtonrt298" - cset "name='media0_out mo dmic01_hifi_in mi Switch' 1" - cset "name='media0_out mo codec0_in mi Switch' 0" - ] - Value { - CaptureChannels "2" - CapturePriority "2" - JackControl "Mic Jack" - } -} diff --git a/src/conf/ucm/broxton-rt298/Makefile.am b/src/conf/ucm/broxton-rt298/Makefile.am deleted file mode 100644 index 80f480e..0000000 --- a/src/conf/ucm/broxton-rt298/Makefile.am +++ /dev/null @@ -1,4 +0,0 @@ -alsaconfigdir = @ALSA_CONFIG_DIR@ -ucmdir = $(alsaconfigdir)/ucm/broxton-rt298 -ucm_DATA = broxton-rt298.conf HiFi Hdmi1 Hdmi2 -EXTRA_DIST = $(ucm_DATA) diff --git a/src/conf/ucm/broxton-rt298/broxton-rt298.conf b/src/conf/ucm/broxton-rt298/broxton-rt298.conf deleted file mode 100644 index 3f3d0be..0000000 --- a/src/conf/ucm/broxton-rt298/broxton-rt298.conf +++ /dev/null @@ -1,58 +0,0 @@ -# UCM for Intel Broxton platforms -# For Audio in I2S mode - -SectionUseCase."HiFi" { - File "HiFi" - Comment "Play and record HiFi quality Music" -} - -SectionUseCase."Hdmi1" { - File "Hdmi1" - Comment "Play on Hdmi/DP 1" -} - -SectionUseCase."Hdmi2" { - File "Hdmi2" - Comment "Play on Hdmi/DP 2" -} - -ValueDefaults { - PlaybackCTL "hw:broxtonrt298" - CaptureCTL "hw:broxtonrt298" - CaptureChannels "2" - CapturePriority "2" -} - -SectionDefaults [ - cdev "hw:broxtonrt298" - exec "echo broxtonrt298 CONF Defaults" - cset "name='Headphone Jack Switch' 1" - cset "name='Speaker Switch' 1" - cset "name='Speaker Playback Switch' 0,0" - cset "name='Front DAC Switch' 1" - cset "name='Front RECMIX Switch' 0" - cset "name='Mic Jack Switch' 1" - cset "name='ADC 0 Mux' 2" - cset "name='ADC 1 Mux' 0" - cset "name='DAC0 Playback Volume' 100,100" - cset "name='HPO L Switch' 0" - cset "name='HPO Mux' 0" - cset "name='HPO R Switch' 0" - cset "name='Pin 5 Mux' 1" - cset "name='Pin 6 Mux' 2" - cset "name='Pin 7 Mux' 3" - cset "name='RECMIX Beep Switch' 0" - cset "name='RECMIX Line1 Switch' 0" - cset "name='RECMIX Mic1 Switch' 0" - cset "name='SPK Mux' 0" - cset "name='SPO Switch' 1" - cset "name='codec0_out mo codec0_in mi Switch' 0" - cset "name='codec0_out mo dmic01_hifi_in mi Switch' 0" - cset "name='codec0_out mo media0_in mi Switch' 1" - cset "name='codec1_out mo codec0_in mi Switch' 0" - cset "name='codec1_out mo dmic01_hifi_in mi Switch' 0" - cset "name='codec1_out mo media0_in mi Switch' 0" - cset "name='media0_out mo codec0_in mi Switch' 1" - cset "name='media0_out mo dmic01_hifi_in mi Switch' 1" - cset "name='media0_out mo media0_in mi Switch' 0" -]
From: Fuwei Tang fuweix.tang@intel.com
Remove conf files of skylake-rt286 platform from alsa-lib. The files will be moved to alsa-ucm-conf repo.
Signed-off-by: Fuwei Tang fuweix.tang@intel.com Reviewed-by: Liam Girdwood liam.r.girdwood@linux.intel.com Reviewed-by: Vinod Koul vinod.koul@intel.com Reviewed-by: Mengdong Lin mengdong.lin@linux.intel.com
diff --git a/configure.ac b/configure.ac index 71bd852..9e916d7 100644 --- a/configure.ac +++ b/configure.ac @@ -673,7 +673,6 @@ AC_OUTPUT(Makefile doc/Makefile doc/pictures/Makefile doc/doxygen.cfg \ src/conf/ucm/PAZ00/Makefile \ src/conf/ucm/GoogleNyan/Makefile \ src/conf/ucm/broadwell-rt286/Makefile \ - src/conf/ucm/skylake-rt286/Makefile \ src/conf/ucm/VEYRON-I2S/Makefile \ src/conf/ucm/chtrt5645/Makefile \ src/conf/ucm/DB410c/Makefile \ diff --git a/src/conf/ucm/Makefile.am b/src/conf/ucm/Makefile.am index a11d324..7bf432e 100644 --- a/src/conf/ucm/Makefile.am +++ b/src/conf/ucm/Makefile.am @@ -1 +1 @@ -SUBDIRS=DAISY-I2S PandaBoard PandaBoardES SDP4430 tegraalc5632 PAZ00 GoogleNyan broadwell-rt286 skylake-rt286 VEYRON-I2S chtrt5645 DB410c +SUBDIRS=DAISY-I2S PandaBoard PandaBoardES SDP4430 tegraalc5632 PAZ00 GoogleNyan broadwell-rt286 VEYRON-I2S chtrt5645 DB410c diff --git a/src/conf/ucm/skylake-rt286/Hdmi1 b/src/conf/ucm/skylake-rt286/Hdmi1 deleted file mode 100644 index 0e00fc8..0000000 --- a/src/conf/ucm/skylake-rt286/Hdmi1 +++ /dev/null @@ -1,20 +0,0 @@ -# Usecase for device HDMI1/Display Port stereo playback on Intel SKYLAKE/KABYLAKE platforms -# For Audio in I2S mode - -SectionDevice."Hdmi1" { - Comment "HDMI/Display Port 1 Stereo" - - EnableSequence [ - ] - - DisableSequence [ - ] - - Value { - PlaybackPCM "hw:skylakert286,4" - PlaybackChannels "2" - PlaybackPriority "3" - JackControl "HDMI/DP, pcm=4 Jack" - } -} - diff --git a/src/conf/ucm/skylake-rt286/Hdmi2 b/src/conf/ucm/skylake-rt286/Hdmi2 deleted file mode 100644 index 89b31aa..0000000 --- a/src/conf/ucm/skylake-rt286/Hdmi2 +++ /dev/null @@ -1,20 +0,0 @@ -# Usecase for device HDMI2/Display Port stereo playback on Intel SKYLAKE/KABYLAKE platforms -# For Audio in I2S mode - -SectionDevice."Hdmi2" { - Comment "HDMI/Display Port 2 Stereo" - - EnableSequence [ - ] - - DisableSequence [ - ] - - Value { - PlaybackPCM "hw:skylakert286,5" - PlaybackChannels "2" - PlaybackPriority "4" - JackControl "HDMI/DP, pcm=5 Jack" - } -} - diff --git a/src/conf/ucm/skylake-rt286/HiFi b/src/conf/ucm/skylake-rt286/HiFi deleted file mode 100644 index 41638f4..0000000 --- a/src/conf/ucm/skylake-rt286/HiFi +++ /dev/null @@ -1,129 +0,0 @@ -# Usecase for stereo playback Speaker and Headset, Recording on DMIC and Headset MIC. -# For Audio in I2S mode on Intel SKYLAKE/KABYLAKE platforms - -SectionVerb { - - EnableSequence [ - cdev "hw:skylakert286" - cset "name='media0_out mo dmic01_hifi_in mi Switch' 1" - ] - - DisableSequence [ - cdev "hw:skylakert286" - ] - - Value { - TQ "HiFi" - CapturePCM "hw:skylakert286,1" - PlaybackPCM "hw:skylakert286,0" - } -} - -SectionDevice."Headphones" { - Comment "Headphones" - - ConflictingDevice [ - "Speaker" - ] - EnableSequence [ - cdev "hw:skylakert286" - cset "name='HPO L Switch' 1" - cset "name='HPO R Switch' 1" - cset "name='Headphone Jack Switch' 1" - cset "name='Speaker Playback Switch' 0,0" - ] - - DisableSequence [ - ] - Value { - PlaybackChannels "2" - PlaybackPriority "1" - JackControl "Headphone Jack" - JackHWMute "Speaker" - } -} - -SectionDevice."Speaker" { - Comment "Speaker" - - ConflictingDevice [ - "Headphones" - ] - EnableSequence [ - cdev "hw:skylakert286" - cset "name='SPO Switch' 1" - cset "name='Speaker Playback Switch' 1,1" - cset "name='Speaker Switch' 1" - cset "name='HPO L Switch' 0" - cset "name='HPO R Switch' 0" - ] - - DisableSequence [ - ] - Value { - PlaybackChannels "2" - PlaybackPriority "1" - JackHWMute "Headphones" - } -} - -SectionDevice."Headset" { - Comment "Headset Mic" - - ConflictingDevice [ - "dmiccap" - ] - EnableSequence [ - cdev "hw:skylakert286" - cset "name='media0_out mo codec0_in mi Switch' 1" - cset "name='ADC0 Capture Switch' 1,1" - cset "name='ADC 0 Mux' 0" - cset "name='Mic Jack Switch' 1" - cset "name='media0_out mo dmic01_hifi_in mi Switch' 0" - ] - - DisableSequence [ - cdev "hw:skylakert286" - cset "name='media0_out mo dmic01_hifi_in mi Switch' 1" - cset "name='media0_out mo codec0_in mi Switch' 0" - ] - Value { - CaptureChannels "2" - CapturePriority "2" - JackControl "Mic Jack" - } -} - - -SectionDevice."dmiccap" { - Comment "DMIC Stereo" - - ConflictingDevice [ - "Headpset" - ] - - EnableSequence [ - - cdev "hw:skylakert286" - cset "name='media0_out mo dmic01_hifi_in mi Switch' 1" - cset "name='media0_out mo codec0_in mi Switch' 0" - cset "name='ADC0 Capture Switch' 0,0" - cset "name='Mic Jack Switch' 0" - cset "name='ADC 0 Mux' 0" - - ] - - DisableSequence [ - cdev "hw:skylakert286" - cset "name='media0_out mo codec0_in mi Switch' 1" - cset "name='media0_out mo dmic01_hifi_in mi Switch' 0" - cset "name='ADC0 Capture Switch' 1,1" - cset "name='Mic Jack Switch' 1" - cset "name='ADC 0 Mux' 2" - ] - Value { - CaptureChannels "2" - CapturePriority "2" - } -} - diff --git a/src/conf/ucm/skylake-rt286/Makefile.am b/src/conf/ucm/skylake-rt286/Makefile.am deleted file mode 100644 index 9d6a85a..0000000 --- a/src/conf/ucm/skylake-rt286/Makefile.am +++ /dev/null @@ -1,4 +0,0 @@ -alsaconfigdir = @ALSA_CONFIG_DIR@ -ucmdir = $(alsaconfigdir)/ucm/skylake-rt286 -ucm_DATA = skylake-rt286.conf HiFi Hdmi1 Hdmi2 -EXTRA_DIST = $(ucm_DATA) diff --git a/src/conf/ucm/skylake-rt286/skylake-rt286.conf b/src/conf/ucm/skylake-rt286/skylake-rt286.conf deleted file mode 100644 index 3e43228..0000000 --- a/src/conf/ucm/skylake-rt286/skylake-rt286.conf +++ /dev/null @@ -1,60 +0,0 @@ -# UCM for Intel SKYLAKE/KABYLAKE platforms -# For Audio in I2S mode - -SectionUseCase."HiFi" { - File "HiFi" - Comment "Play and record HiFi quality Music" -} - -SectionUseCase."Hdmi1" { - File "Hdmi1" - Comment "Play on Hdmi/DP 1" -} - -SectionUseCase."Hdmi2" { - File "Hdmi2" - Comment "Play on Hdmi/DP 2" -} - -ValueDefaults { - PlaybackCTL "hw:skylakert286" - CaptureCTL "hw:skylakert286" - CaptureChannels "2" - CapturePriority "2" -} - -SectionDefaults [ - cdev "hw:skylakert286" - cset "name='Headphone Jack Switch' 1" - cset "name='Speaker Switch' 1" - cset "name='Speaker Playback Switch' 0,0" - cset "name='Front DAC Switch' 1" - cset "name='Front RECMIX Switch' 0" - cset "name='Mic Jack Switch' 1" - cset "name='ADC 0 Mux' 2" - cset "name='ADC 1 Mux' 0" - cset "name='ADC0 Capture Volume' 105,105" - cset "name='ADC0 Capture Switch' 1,1" - cset "name='AMIC Volume' 3" - cset "name='DAC0 Playback Volume' 100,100" - cset "name='HPO L Switch' 0" - cset "name='HPO Mux' 0" - cset "name='HPO R Switch' 0" - cset "name='Pin 5 Mux' 1" - cset "name='Pin 6 Mux' 2" - cset "name='Pin 7 Mux' 3" - cset "name='RECMIX Beep Switch' 0" - cset "name='RECMIX Line1 Switch' 0" - cset "name='RECMIX Mic1 Switch' 0" - cset "name='SPK Mux' 0" - cset "name='SPO Switch' 1" - cset "name='codec0_out mo codec0_in mi Switch' 0" - cset "name='codec0_out mo dmic01_hifi_in mi Switch' 0" - cset "name='codec0_out mo media0_in mi Switch' 1" - cset "name='codec1_out mo codec0_in mi Switch' 0" - cset "name='codec1_out mo dmic01_hifi_in mi Switch' 0" - cset "name='codec1_out mo media0_in mi Switch' 0" - cset "name='media0_out mo codec0_in mi Switch' 1" - cset "name='media0_out mo dmic01_hifi_in mi Switch' 1" - cset "name='media0_out mo media0_in mi Switch' 0" -]
On Wed, 15 Mar 2017 07:45:38 +0100, fuweix.tang@intel.com wrote:
From: Fuwei Tang fuweix.tang@intel.com
Remove the intel UCM configs from alsa-lib repo.
Another series will add them to a dedicated UCM conf repo.
So the intention is to *move* the files to another repo, right? Removal is only one of the steps.
License can be changed to BSD for intel files,
I couldn't find it in your next patchset. Where is BSD license defined...?
and left as "unknown" for other conf files when they are moved from alsa-lib to the new repo.The alsa-lib LGPL license does not cover runtime configuration files.
It may cover, but this isn't really intended in our case. Also we have no problem regarding the authorship. So my understanding is that it's fine to move to another repo with a declaration of a more relaxed license. But IANAL.
In anyway, the alsa-project.org site is maintained by Jaroslav, and a creation of a new git repo requires his manual action. I added him to Cc now.
thanks,
Takashi
Fuwei Tang (2): conf/ucm: Remove conf files of broxton-rt298 platform conf/ucm: Remove conf files of skylake-rt286 platfrom
configure.ac | 2 - src/conf/ucm/Makefile.am | 2 +- src/conf/ucm/broxton-rt298/Hdmi1 | 22 ----- src/conf/ucm/broxton-rt298/Hdmi2 | 14 --- src/conf/ucm/broxton-rt298/HiFi | 129 -------------------------- src/conf/ucm/broxton-rt298/Makefile.am | 4 - src/conf/ucm/broxton-rt298/broxton-rt298.conf | 58 ------------ src/conf/ucm/skylake-rt286/Hdmi1 | 20 ---- src/conf/ucm/skylake-rt286/Hdmi2 | 20 ---- src/conf/ucm/skylake-rt286/HiFi | 129 -------------------------- src/conf/ucm/skylake-rt286/Makefile.am | 4 - src/conf/ucm/skylake-rt286/skylake-rt286.conf | 60 ------------ 12 files changed, 1 insertion(+), 463 deletions(-) delete mode 100644 src/conf/ucm/broxton-rt298/Hdmi1 delete mode 100644 src/conf/ucm/broxton-rt298/Hdmi2 delete mode 100644 src/conf/ucm/broxton-rt298/HiFi delete mode 100644 src/conf/ucm/broxton-rt298/Makefile.am delete mode 100644 src/conf/ucm/broxton-rt298/broxton-rt298.conf delete mode 100644 src/conf/ucm/skylake-rt286/Hdmi1 delete mode 100644 src/conf/ucm/skylake-rt286/Hdmi2 delete mode 100644 src/conf/ucm/skylake-rt286/HiFi delete mode 100644 src/conf/ucm/skylake-rt286/Makefile.am delete mode 100644 src/conf/ucm/skylake-rt286/skylake-rt286.conf
-- 2.7.4
Alsa-devel mailing list Alsa-devel@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
Fuwei, I think this is your old patch version as I had similar comments last week about licence and commit message.
On Mon, 2017-03-20 at 12:34 +0100, Takashi Iwai wrote:
On Wed, 15 Mar 2017 07:45:38 +0100, fuweix.tang@intel.com wrote:
From: Fuwei Tang fuweix.tang@intel.com
Remove the intel UCM configs from alsa-lib repo.
Another series will add them to a dedicated UCM conf repo.
So the intention is to *move* the files to another repo, right? Removal is only one of the steps.
Yes, move the Intel files under BSD license as the first step. Subsequent steps are to then move and hopefully re-license the other UCM files once author approval had been granted.
Liam
License can be changed to BSD for intel files,
I couldn't find it in your next patchset. Where is BSD license defined...?
and left as "unknown" for other conf files when they are moved from alsa-lib to the new repo.The alsa-lib LGPL license does not cover runtime configuration files.
It may cover, but this isn't really intended in our case. Also we have no problem regarding the authorship. So my understanding is that it's fine to move to another repo with a declaration of a more relaxed license. But IANAL.
In anyway, the alsa-project.org site is maintained by Jaroslav, and a creation of a new git repo requires his manual action. I added him to Cc now.
thanks,
Takashi
Fuwei Tang (2): conf/ucm: Remove conf files of broxton-rt298 platform conf/ucm: Remove conf files of skylake-rt286 platfrom
configure.ac | 2 - src/conf/ucm/Makefile.am | 2 +- src/conf/ucm/broxton-rt298/Hdmi1 | 22 ----- src/conf/ucm/broxton-rt298/Hdmi2 | 14 --- src/conf/ucm/broxton-rt298/HiFi | 129 -------------------------- src/conf/ucm/broxton-rt298/Makefile.am | 4 - src/conf/ucm/broxton-rt298/broxton-rt298.conf | 58 ------------ src/conf/ucm/skylake-rt286/Hdmi1 | 20 ---- src/conf/ucm/skylake-rt286/Hdmi2 | 20 ---- src/conf/ucm/skylake-rt286/HiFi | 129 -------------------------- src/conf/ucm/skylake-rt286/Makefile.am | 4 - src/conf/ucm/skylake-rt286/skylake-rt286.conf | 60 ------------ 12 files changed, 1 insertion(+), 463 deletions(-) delete mode 100644 src/conf/ucm/broxton-rt298/Hdmi1 delete mode 100644 src/conf/ucm/broxton-rt298/Hdmi2 delete mode 100644 src/conf/ucm/broxton-rt298/HiFi delete mode 100644 src/conf/ucm/broxton-rt298/Makefile.am delete mode 100644 src/conf/ucm/broxton-rt298/broxton-rt298.conf delete mode 100644 src/conf/ucm/skylake-rt286/Hdmi1 delete mode 100644 src/conf/ucm/skylake-rt286/Hdmi2 delete mode 100644 src/conf/ucm/skylake-rt286/HiFi delete mode 100644 src/conf/ucm/skylake-rt286/Makefile.am delete mode 100644 src/conf/ucm/skylake-rt286/skylake-rt286.conf
-- 2.7.4
Alsa-devel mailing list Alsa-devel@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
participants (3)
-
fuweix.tang＠intel.com -
Liam Girdwood -
Takashi Iwai