SDP4430: Move to OMAP/abe-twl6040/SDP4430 tree

Signed-off-by: Jaroslav Kysela <perex@perex.cz>

15 files changed, 59 insertions, 50 deletions

diff --git a/ucm2/OMAP/abe-twl6040/FMAnalog.conf b/ucm2/OMAP/abe-twl6040/Pandaboard/FMAnalog.conf
index fa81977..fa81977 100644
--- a/ucm2/OMAP/abe-twl6040/FMAnalog.conf
+++ b/ucm2/OMAP/abe-twl6040/Pandaboard/FMAnalog.conf
diff --git a/ucm2/OMAP/abe-twl6040/HiFi.conf b/ucm2/OMAP/abe-twl6040/Pandaboard/HiFi.conf
index 597c326..597c326 100644
--- a/ucm2/OMAP/abe-twl6040/HiFi.conf
+++ b/ucm2/OMAP/abe-twl6040/Pandaboard/HiFi.conf
diff --git a/ucm2/OMAP/abe-twl6040/HiFiLP.conf b/ucm2/OMAP/abe-twl6040/Pandaboard/HiFiLP.conf
index 481f238..481f238 100644
--- a/ucm2/OMAP/abe-twl6040/HiFiLP.conf
+++ b/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
index 042e5ce..042e5ce 100644
--- a/ucm2/OMAP/abe-twl6040/Record.conf
+++ b/ucm2/OMAP/abe-twl6040/Pandaboard/Record.conf
diff --git a/ucm2/OMAP/abe-twl6040/Voice.conf b/ucm2/OMAP/abe-twl6040/Pandaboard/Voice.conf
index 3eaffb4..3eaffb4 100644
--- a/ucm2/OMAP/abe-twl6040/Voice.conf
+++ b/ucm2/OMAP/abe-twl6040/Pandaboard/Voice.conf
diff --git a/ucm2/OMAP/abe-twl6040/VoiceCall.conf b/ucm2/OMAP/abe-twl6040/Pandaboard/VoiceCall.conf
index 4e82e7a..4e82e7a 100644
--- a/ucm2/OMAP/abe-twl6040/VoiceCall.conf
+++ b/ucm2/OMAP/abe-twl6040/Pandaboard/VoiceCall.conf
diff --git a/ucm2/SDP4430/FMAnalog.conf b/ucm2/OMAP/abe-twl6040/SDP4430/FMAnalog.conf
index 822f3d8..822f3d8 100644
--- a/ucm2/SDP4430/FMAnalog.conf
+++ b/ucm2/OMAP/abe-twl6040/SDP4430/FMAnalog.conf
diff --git a/ucm2/SDP4430/HiFi.conf b/ucm2/OMAP/abe-twl6040/SDP4430/HiFi.conf
index 6d4a8ae..6d4a8ae 100644
--- a/ucm2/SDP4430/HiFi.conf
+++ b/ucm2/OMAP/abe-twl6040/SDP4430/HiFi.conf
diff --git a/ucm2/SDP4430/HiFiLP.conf b/ucm2/OMAP/abe-twl6040/SDP4430/HiFiLP.conf
index 4cb8b1d..4cb8b1d 100644
--- a/ucm2/SDP4430/HiFiLP.conf
+++ b/ucm2/OMAP/abe-twl6040/SDP4430/HiFiLP.conf
diff --git a/ucm2/SDP4430/Record.conf b/ucm2/OMAP/abe-twl6040/SDP4430/Record.conf
index 1763781..1763781 100644
--- a/ucm2/SDP4430/Record.conf
+++ b/ucm2/OMAP/abe-twl6040/SDP4430/Record.conf
diff --git a/ucm2/SDP4430/SDP4430.conf b/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
index 57f4554..57f4554 100644
--- a/ucm2/SDP4430/Voice.conf
+++ b/ucm2/OMAP/abe-twl6040/SDP4430/Voice.conf
diff --git a/ucm2/SDP4430/VoiceCall.conf b/ucm2/OMAP/abe-twl6040/SDP4430/VoiceCall.conf
index adf62ea..adf62ea 100644
--- a/ucm2/SDP4430/VoiceCall.conf
+++ b/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"
 }