From 415b126f2ac372598f8af480f0b76da99df27d7d Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Thu, 25 Jun 2020 17:43:40 +0200 Subject: [PATCH] SDP4430: Move to OMAP/abe-twl6040/SDP4430 tree Signed-off-by: Jaroslav Kysela --- .../{ => Pandaboard}/FMAnalog.conf | 0 .../abe-twl6040/{ => Pandaboard}/HiFi.conf | 0 .../abe-twl6040/{ => Pandaboard}/HiFiLP.conf | 0 .../abe-twl6040/Pandaboard/Pandaboard.conf | 41 +++++++++++++++ .../abe-twl6040/{ => Pandaboard}/Record.conf | 0 .../abe-twl6040/{ => Pandaboard}/Voice.conf | 0 .../{ => Pandaboard}/VoiceCall.conf | 0 .../abe-twl6040}/SDP4430/FMAnalog.conf | 0 ucm2/{ => OMAP/abe-twl6040}/SDP4430/HiFi.conf | 0 .../abe-twl6040}/SDP4430/HiFiLP.conf | 0 .../abe-twl6040}/SDP4430/Record.conf | 0 .../abe-twl6040}/SDP4430/SDP4430.conf | 18 +++---- .../{ => OMAP/abe-twl6040}/SDP4430/Voice.conf | 0 .../abe-twl6040}/SDP4430/VoiceCall.conf | 0 ucm2/OMAP/abe-twl6040/abe-twl6040.conf | 50 ++++--------------- 15 files changed, 59 insertions(+), 50 deletions(-) rename ucm2/OMAP/abe-twl6040/{ => Pandaboard}/FMAnalog.conf (100%) rename ucm2/OMAP/abe-twl6040/{ => Pandaboard}/HiFi.conf (100%) rename ucm2/OMAP/abe-twl6040/{ => Pandaboard}/HiFiLP.conf (100%) create mode 100644 ucm2/OMAP/abe-twl6040/Pandaboard/Pandaboard.conf rename ucm2/OMAP/abe-twl6040/{ => Pandaboard}/Record.conf (100%) rename ucm2/OMAP/abe-twl6040/{ => Pandaboard}/Voice.conf (100%) rename ucm2/OMAP/abe-twl6040/{ => Pandaboard}/VoiceCall.conf (100%) rename ucm2/{ => OMAP/abe-twl6040}/SDP4430/FMAnalog.conf (100%) rename ucm2/{ => OMAP/abe-twl6040}/SDP4430/HiFi.conf (100%) rename ucm2/{ => OMAP/abe-twl6040}/SDP4430/HiFiLP.conf (100%) rename ucm2/{ => OMAP/abe-twl6040}/SDP4430/Record.conf (100%) rename ucm2/{ => OMAP/abe-twl6040}/SDP4430/SDP4430.conf (62%) rename ucm2/{ => OMAP/abe-twl6040}/SDP4430/Voice.conf (100%) rename ucm2/{ => OMAP/abe-twl6040}/SDP4430/VoiceCall.conf (100%) diff --git a/ucm2/OMAP/abe-twl6040/FMAnalog.conf b/ucm2/OMAP/abe-twl6040/Pandaboard/FMAnalog.conf similarity index 100% rename from ucm2/OMAP/abe-twl6040/FMAnalog.conf rename to ucm2/OMAP/abe-twl6040/Pandaboard/FMAnalog.conf diff --git a/ucm2/OMAP/abe-twl6040/HiFi.conf b/ucm2/OMAP/abe-twl6040/Pandaboard/HiFi.conf similarity index 100% rename from ucm2/OMAP/abe-twl6040/HiFi.conf rename to ucm2/OMAP/abe-twl6040/Pandaboard/HiFi.conf diff --git a/ucm2/OMAP/abe-twl6040/HiFiLP.conf b/ucm2/OMAP/abe-twl6040/Pandaboard/HiFiLP.conf similarity index 100% rename from ucm2/OMAP/abe-twl6040/HiFiLP.conf rename to ucm2/OMAP/abe-twl6040/Pandaboard/HiFiLP.conf diff --git a/ucm2/OMAP/abe-twl6040/Pandaboard/Pandaboard.conf b/ucm2/OMAP/abe-twl6040/Pandaboard/Pandaboard.conf new file mode 100644 index 0000000..1a19f96 --- /dev/null +++ b/ucm2/OMAP/abe-twl6040/Pandaboard/Pandaboard.conf @@ -0,0 +1,41 @@ +# UCM configuration for PandaBoard(ES) + +SectionUseCase."Record" { + File "/OMAP/abe-twl6040/Pandaboard/Record.conf" + Comment "Record" +} + +SectionUseCase."HiFi" { + File "/OMAP/abe-twl6040/Pandaboard/HiFi.conf" + Comment "Play HiFi quality Music" +} + +SectionUseCase."HiFi_Low_Power" { + File "/OMAP/abe-twl6040/Pandaboard/HiFiLP.conf" + Comment "Play HiFi quality Music in Low Power Mode" +} + +SectionUseCase."Voice" { + File "/OMAP/abe-twl6040/Pandaboard/Voice.conf" + Comment "Playback Voice quality" +} + +SectionUseCase."Voice_Low_Power" { + File "/OMAP/abe-twl6040/Pandaboard/Voice.conf" + Comment "Playback Voice quality in Low Power Mode" +} + +SectionUseCase."Voice_Call" { + File "/OMAP/abe-twl6040/Pandaboard/VoiceCall.conf" + Comment "Capture and Playback in Voice quality" +} + +SectionUseCase."Voice_Call_IP" { + File "/OMAP/abe-twl6040/Pandaboard/VoiceCall.conf" + Comment "Capture and Playback in Voice quality" +} + +SectionUseCase."FM_Analog_Radio" { + File "/OMAP/abe-twl6040/Pandaboard/FMAnalog.conf" + Comment "Capture FM Analog Radio" +} diff --git a/ucm2/OMAP/abe-twl6040/Record.conf b/ucm2/OMAP/abe-twl6040/Pandaboard/Record.conf similarity index 100% rename from ucm2/OMAP/abe-twl6040/Record.conf rename to ucm2/OMAP/abe-twl6040/Pandaboard/Record.conf diff --git a/ucm2/OMAP/abe-twl6040/Voice.conf b/ucm2/OMAP/abe-twl6040/Pandaboard/Voice.conf similarity index 100% rename from ucm2/OMAP/abe-twl6040/Voice.conf rename to ucm2/OMAP/abe-twl6040/Pandaboard/Voice.conf diff --git a/ucm2/OMAP/abe-twl6040/VoiceCall.conf b/ucm2/OMAP/abe-twl6040/Pandaboard/VoiceCall.conf similarity index 100% rename from ucm2/OMAP/abe-twl6040/VoiceCall.conf rename to ucm2/OMAP/abe-twl6040/Pandaboard/VoiceCall.conf diff --git a/ucm2/SDP4430/FMAnalog.conf b/ucm2/OMAP/abe-twl6040/SDP4430/FMAnalog.conf similarity index 100% rename from ucm2/SDP4430/FMAnalog.conf rename to ucm2/OMAP/abe-twl6040/SDP4430/FMAnalog.conf diff --git a/ucm2/SDP4430/HiFi.conf b/ucm2/OMAP/abe-twl6040/SDP4430/HiFi.conf similarity index 100% rename from ucm2/SDP4430/HiFi.conf rename to ucm2/OMAP/abe-twl6040/SDP4430/HiFi.conf diff --git a/ucm2/SDP4430/HiFiLP.conf b/ucm2/OMAP/abe-twl6040/SDP4430/HiFiLP.conf similarity index 100% rename from ucm2/SDP4430/HiFiLP.conf rename to ucm2/OMAP/abe-twl6040/SDP4430/HiFiLP.conf diff --git a/ucm2/SDP4430/Record.conf b/ucm2/OMAP/abe-twl6040/SDP4430/Record.conf similarity index 100% rename from ucm2/SDP4430/Record.conf rename to ucm2/OMAP/abe-twl6040/SDP4430/Record.conf diff --git a/ucm2/SDP4430/SDP4430.conf b/ucm2/OMAP/abe-twl6040/SDP4430/SDP4430.conf similarity index 62% rename from ucm2/SDP4430/SDP4430.conf rename to ucm2/OMAP/abe-twl6040/SDP4430/SDP4430.conf index fd95890..6ffd874 100644 --- a/ucm2/SDP4430/SDP4430.conf +++ b/ucm2/OMAP/abe-twl6040/SDP4430/SDP4430.conf @@ -1,43 +1,41 @@ # UCM configuration for SDP4430 -Syntax 2 - SectionUseCase."Record" { - File "Record.conf" + File "/OMAP/abe-twl6040/SDP4430/Record.conf" Comment "Record" } SectionUseCase."HiFi" { - File "HiFi.conf" + File "/OMAP/abe-twl6040/SDP4430/HiFi.conf" Comment "Play HiFi quality Music" } SectionUseCase."HiFi_Low_Power" { - File "HiFiLP.conf" + File "/OMAP/abe-twl6040/SDP4430/HiFiLP.conf" Comment "Play HiFi quality Music in Low Power Mode" } SectionUseCase."Voice" { - File "Voice.conf" + File "/OMAP/abe-twl6040/SDP4430/Voice.conf" Comment "Playback Voice quality" } SectionUseCase."Voice_Low_Power" { - File "Voice.conf" + File "/OMAP/abe-twl6040/SDP4430/Voice.conf" Comment "Playback Voice quality in Low Power Mode." } SectionUseCase."Voice_Call" { - File "VoiceCall.conf" + File "/OMAP/abe-twl6040/SDP4430/VoiceCall.conf" Comment "Capture and Playback in Voice quality" } SectionUseCase."Voice_Call_IP" { - File "VoiceCall.conf" + File "/OMAP/abe-twl6040/SDP4430/VoiceCall.conf" Comment "Capture and Playback in Voice quality" } SectionUseCase."FM_Analog_Radio" { - File "FMAnalog.conf" + File "/OMAP/abe-twl6040/SDP4430/FMAnalog.conf" Comment "Capture FM Analog Radio" } diff --git a/ucm2/SDP4430/Voice.conf b/ucm2/OMAP/abe-twl6040/SDP4430/Voice.conf similarity index 100% rename from ucm2/SDP4430/Voice.conf rename to ucm2/OMAP/abe-twl6040/SDP4430/Voice.conf diff --git a/ucm2/SDP4430/VoiceCall.conf b/ucm2/OMAP/abe-twl6040/SDP4430/VoiceCall.conf similarity index 100% rename from ucm2/SDP4430/VoiceCall.conf rename to ucm2/OMAP/abe-twl6040/SDP4430/VoiceCall.conf diff --git a/ucm2/OMAP/abe-twl6040/abe-twl6040.conf b/ucm2/OMAP/abe-twl6040/abe-twl6040.conf index 199408f..5184211 100644 --- a/ucm2/OMAP/abe-twl6040/abe-twl6040.conf +++ b/ucm2/OMAP/abe-twl6040/abe-twl6040.conf @@ -1,43 +1,13 @@ # UCM configuration for PandaBoard(ES) -Syntax 2 - -SectionUseCase."Record" { - File "/OMAP/abe-twl6040/Record.conf" - Comment "Record" -} - -SectionUseCase."HiFi" { - File "/OMAP/abe-twl6040/HiFi.conf" - Comment "Play HiFi quality Music" -} - -SectionUseCase."HiFi_Low_Power" { - File "/OMAP/abe-twl6040/HiFiLP.conf" - Comment "Play HiFi quality Music in Low Power Mode" -} - -SectionUseCase."Voice" { - File "/OMAP/abe-twl6040/Voice.conf" - Comment "Playback Voice quality" -} - -SectionUseCase."Voice_Low_Power" { - File "/OMAP/abe-twl6040/Voice.conf" - Comment "Playback Voice quality in Low Power Mode" -} - -SectionUseCase."Voice_Call" { - File "/OMAP/abe-twl6040/VoiceCall.conf" - Comment "Capture and Playback in Voice quality" -} - -SectionUseCase."Voice_Call_IP" { - File "/OMAP/abe-twl6040/VoiceCall.conf" - Comment "Capture and Playback in Voice quality" -} - -SectionUseCase."FM_Analog_Radio" { - File "/OMAP/abe-twl6040/FMAnalog.conf" - Comment "Capture FM Analog Radio" +Syntax 3 + +If.sdp4430 { + Condition { + Type String + String1 "${CardName}" + String2 "SDP4430" + } + True.Include.sdp4430.File "/OMAP/abe-twl6040/SDP4430/SDP4430.conf" + False.Include.pandaboard.File "/OMAP/abe-twl6040/Pandaboard/Pandaboard.conf" } -- 2.47.1