diff options
author | Otavio Salvador <otavio@ossystems.com.br> | 2015-07-15 17:14:27 -0300 |
---|---|---|
committer | Otavio Salvador <otavio@ossystems.com.br> | 2015-07-16 15:01:29 -0300 |
commit | f8517afc7a5ada4538b3b7d397fa32586d57ffe5 (patch) | |
tree | 79349f091306d1760fd4687e62336ffa8fb8c721 /meta-fsl-arm/recipes-bsp | |
parent | c92b415d653afc55f33b6b93fb9248193bfd4fa0 (diff) | |
download | meta-freescale-f8517afc7a5ada4538b3b7d397fa32586d57ffe5.tar.gz |
Move meta-fsl-arm content to layer root
The meta-fsl-arm is going to be used as the base for this layer. It
contains a clean history and allowing a more granullar set of changes.
This commit is just a rename of all contents of meta-fsl-arm
subdirectory to this layer's root, subsequent changes are based on top
of that.
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Diffstat (limited to 'meta-fsl-arm/recipes-bsp')
63 files changed, 0 insertions, 4388 deletions
diff --git a/meta-fsl-arm/recipes-bsp/alsa-state/alsa-state.bbappend b/meta-fsl-arm/recipes-bsp/alsa-state/alsa-state.bbappend deleted file mode 100644 index 6bc02467..00000000 --- a/meta-fsl-arm/recipes-bsp/alsa-state/alsa-state.bbappend +++ /dev/null | |||
@@ -1,7 +0,0 @@ | |||
1 | # Append path for freescale layer to include alsa-state asound.conf | ||
2 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" | ||
3 | |||
4 | PACKAGE_ARCH_mx6 = "${MACHINE_ARCH}" | ||
5 | PACKAGE_ARCH_mx5 = "${MACHINE_ARCH}" | ||
6 | PACKAGE_ARCH_mxs = "${MACHINE_ARCH}" | ||
7 | |||
diff --git a/meta-fsl-arm/recipes-bsp/alsa-state/alsa-state/mx5/asound.conf b/meta-fsl-arm/recipes-bsp/alsa-state/alsa-state/mx5/asound.conf deleted file mode 100755 index 0cbe59b2..00000000 --- a/meta-fsl-arm/recipes-bsp/alsa-state/alsa-state/mx5/asound.conf +++ /dev/null | |||
@@ -1,275 +0,0 @@ | |||
1 | defaults.pcm.rate_converter "linear" | ||
2 | |||
3 | pcm.dmix_48000{ | ||
4 | type dmix | ||
5 | ipc_key 5678293 | ||
6 | ipc_key_add_uid yes | ||
7 | slave{ | ||
8 | pcm "hw:0,0" | ||
9 | period_time 0 | ||
10 | period_size 2048 | ||
11 | buffer_size 24576 | ||
12 | format S16_LE | ||
13 | rate 48000 | ||
14 | } | ||
15 | } | ||
16 | |||
17 | pcm.dmix_44100{ | ||
18 | type dmix | ||
19 | ipc_key 5678293 | ||
20 | ipc_key_add_uid yes | ||
21 | slave{ | ||
22 | pcm "hw:0,0" | ||
23 | period_time 0 | ||
24 | period_size 2048 | ||
25 | buffer_size 24576 | ||
26 | format S16_LE | ||
27 | rate 44100 | ||
28 | } | ||
29 | } | ||
30 | |||
31 | pcm.dmix_32000{ | ||
32 | type dmix | ||
33 | ipc_key 5678293 | ||
34 | ipc_key_add_uid yes | ||
35 | slave{ | ||
36 | pcm "hw:0,0" | ||
37 | period_time 0 | ||
38 | period_size 2048 | ||
39 | buffer_size 24576 | ||
40 | format S16_LE | ||
41 | rate 32000 | ||
42 | } | ||
43 | } | ||
44 | |||
45 | pcm.dmix_24000{ | ||
46 | type dmix | ||
47 | ipc_key 5678293 | ||
48 | ipc_key_add_uid yes | ||
49 | slave{ | ||
50 | pcm "hw:0,0" | ||
51 | period_time 0 | ||
52 | period_size 2048 | ||
53 | buffer_size 24576 | ||
54 | format S16_LE | ||
55 | rate 24000 | ||
56 | } | ||
57 | } | ||
58 | |||
59 | pcm.dmix_22050{ | ||
60 | type dmix | ||
61 | ipc_key 5678293 | ||
62 | ipc_key_add_uid yes | ||
63 | slave{ | ||
64 | pcm "hw:0,0" | ||
65 | period_time 0 | ||
66 | period_size 2048 | ||
67 | buffer_size 24576 | ||
68 | format S16_LE | ||
69 | rate 22050 | ||
70 | } | ||
71 | } | ||
72 | |||
73 | pcm.dmix_16000{ | ||
74 | type dmix | ||
75 | ipc_key 5678293 | ||
76 | ipc_key_add_uid yes | ||
77 | slave{ | ||
78 | pcm "hw:0,0" | ||
79 | period_time 0 | ||
80 | period_size 2048 | ||
81 | buffer_size 24576 | ||
82 | format S16_LE | ||
83 | rate 16000 | ||
84 | } | ||
85 | } | ||
86 | |||
87 | pcm.dmix_12000{ | ||
88 | type dmix | ||
89 | ipc_key 5678293 | ||
90 | ipc_key_add_uid yes | ||
91 | slave{ | ||
92 | pcm "hw:0,0" | ||
93 | period_time 0 | ||
94 | period_size 2048 | ||
95 | buffer_size 24576 | ||
96 | format S16_LE | ||
97 | rate 12000 | ||
98 | } | ||
99 | } | ||
100 | |||
101 | pcm.dmix_11025{ | ||
102 | type dmix | ||
103 | ipc_key 5678293 | ||
104 | ipc_key_add_uid yes | ||
105 | slave{ | ||
106 | pcm "hw:0,0" | ||
107 | period_time 0 | ||
108 | period_size 2048 | ||
109 | buffer_size 24576 | ||
110 | format S16_LE | ||
111 | rate 11025 | ||
112 | } | ||
113 | } | ||
114 | |||
115 | pcm.dmix_8000{ | ||
116 | type dmix | ||
117 | ipc_key 5678293 | ||
118 | ipc_key_add_uid yes | ||
119 | slave{ | ||
120 | pcm "hw:0,0" | ||
121 | period_time 0 | ||
122 | period_size 2048 | ||
123 | buffer_size 24576 | ||
124 | format S16_LE | ||
125 | rate 8000 | ||
126 | } | ||
127 | } | ||
128 | |||
129 | pcm.!dsnoop_48000{ | ||
130 | type dsnoop | ||
131 | ipc_key 5778293 | ||
132 | ipc_key_add_uid yes | ||
133 | slave{ | ||
134 | pcm "hw:0,0" | ||
135 | period_time 0 | ||
136 | period_size 2048 | ||
137 | buffer_size 24576 | ||
138 | format S16_LE | ||
139 | rate 48000 | ||
140 | } | ||
141 | } | ||
142 | |||
143 | pcm.!dsnoop_44100{ | ||
144 | type dsnoop | ||
145 | ipc_key 5778293 | ||
146 | ipc_key_add_uid yes | ||
147 | slave{ | ||
148 | pcm "hw:0,0" | ||
149 | period_time 0 | ||
150 | period_size 2048 | ||
151 | buffer_size 24576 | ||
152 | format S16_LE | ||
153 | rate 44100 | ||
154 | } | ||
155 | } | ||
156 | |||
157 | pcm.!dsnoop_32000{ | ||
158 | type dsnoop | ||
159 | ipc_key 5778293 | ||
160 | ipc_key_add_uid yes | ||
161 | slave{ | ||
162 | pcm "hw:0,0" | ||
163 | period_time 0 | ||
164 | period_size 2048 | ||
165 | buffer_size 24576 | ||
166 | format S16_LE | ||
167 | rate 32000 | ||
168 | } | ||
169 | } | ||
170 | |||
171 | pcm.!dsnoop_24000{ | ||
172 | type dsnoop | ||
173 | ipc_key 5778293 | ||
174 | ipc_key_add_uid yes | ||
175 | slave{ | ||
176 | pcm "hw:0,0" | ||
177 | period_time 0 | ||
178 | period_size 2048 | ||
179 | buffer_size 24576 | ||
180 | format S16_LE | ||
181 | rate 24000 | ||
182 | } | ||
183 | } | ||
184 | |||
185 | pcm.!dsnoop_22050{ | ||
186 | type dsnoop | ||
187 | ipc_key 5778293 | ||
188 | ipc_key_add_uid yes | ||
189 | slave{ | ||
190 | pcm "hw:0,0" | ||
191 | period_time 0 | ||
192 | period_size 2048 | ||
193 | buffer_size 24576 | ||
194 | format S16_LE | ||
195 | rate 22050 | ||
196 | } | ||
197 | } | ||
198 | |||
199 | pcm.!dsnoop_16000{ | ||
200 | type dsnoop | ||
201 | ipc_key 5778293 | ||
202 | ipc_key_add_uid yes | ||
203 | slave{ | ||
204 | pcm "hw:0,0" | ||
205 | period_time 0 | ||
206 | period_size 2048 | ||
207 | buffer_size 24576 | ||
208 | format S16_LE | ||
209 | rate 16000 | ||
210 | } | ||
211 | } | ||
212 | |||
213 | pcm.!dsnoop_12000{ | ||
214 | type dsnoop | ||
215 | ipc_key 5778293 | ||
216 | ipc_key_add_uid yes | ||
217 | slave{ | ||
218 | pcm "hw:0,0" | ||
219 | period_time 0 | ||
220 | period_size 2048 | ||
221 | buffer_size 24576 | ||
222 | format S16_LE | ||
223 | rate 12000 | ||
224 | } | ||
225 | } | ||
226 | |||
227 | pcm.!dsnoop_11025{ | ||
228 | type dsnoop | ||
229 | ipc_key 5778293 | ||
230 | ipc_key_add_uid yes | ||
231 | slave{ | ||
232 | pcm "hw:0,0" | ||
233 | period_time 0 | ||
234 | period_size 2048 | ||
235 | buffer_size 24576 | ||
236 | format S16_LE | ||
237 | rate 11025 | ||
238 | } | ||
239 | } | ||
240 | |||
241 | pcm.!dsnoop_8000{ | ||
242 | type dsnoop | ||
243 | ipc_key 5778293 | ||
244 | ipc_key_add_uid yes | ||
245 | slave{ | ||
246 | pcm "hw:0,0" | ||
247 | period_time 0 | ||
248 | period_size 2048 | ||
249 | buffer_size 24576 | ||
250 | format S16_LE | ||
251 | rate 8000 | ||
252 | } | ||
253 | } | ||
254 | |||
255 | pcm.asymed{ | ||
256 | type asym | ||
257 | playback.pcm "dmix_44100" | ||
258 | capture.pcm "dsnoop_44100" | ||
259 | } | ||
260 | |||
261 | pcm.dsp0{ | ||
262 | type plug | ||
263 | slave.pcm "asymed" | ||
264 | } | ||
265 | |||
266 | pcm.!default{ | ||
267 | type plug | ||
268 | route_policy "average" | ||
269 | slave.pcm "asymed" | ||
270 | } | ||
271 | |||
272 | ctl.mixer0{ | ||
273 | type hw | ||
274 | card 0 | ||
275 | } | ||
diff --git a/meta-fsl-arm/recipes-bsp/alsa-state/alsa-state/mx5/asound.state b/meta-fsl-arm/recipes-bsp/alsa-state/alsa-state/mx5/asound.state deleted file mode 100644 index 7c13a88a..00000000 --- a/meta-fsl-arm/recipes-bsp/alsa-state/alsa-state/mx5/asound.state +++ /dev/null | |||
@@ -1,139 +0,0 @@ | |||
1 | state.imx3stack { | ||
2 | control.1 { | ||
3 | iface MIXER | ||
4 | name 'MIC GAIN' | ||
5 | value '0dB' | ||
6 | comment { | ||
7 | access 'read write' | ||
8 | type ENUMERATED | ||
9 | count 1 | ||
10 | item.0 '0dB' | ||
11 | item.1 '20dB' | ||
12 | item.2 '30dB' | ||
13 | item.3 '40dB' | ||
14 | } | ||
15 | } | ||
16 | control.2 { | ||
17 | iface MIXER | ||
18 | name 'Capture Volume' | ||
19 | value.0 12 | ||
20 | value.1 12 | ||
21 | comment { | ||
22 | access 'read write' | ||
23 | type INTEGER | ||
24 | count 2 | ||
25 | range '0 - 15' | ||
26 | } | ||
27 | } | ||
28 | control.3 { | ||
29 | iface MIXER | ||
30 | name 'Capture Vol Reduction' | ||
31 | value 'No Change' | ||
32 | comment { | ||
33 | access 'read write' | ||
34 | type ENUMERATED | ||
35 | count 1 | ||
36 | item.0 'No Change' | ||
37 | item.1 'Reduced by 6dB' | ||
38 | } | ||
39 | } | ||
40 | control.4 { | ||
41 | iface MIXER | ||
42 | name 'Playback Volume' | ||
43 | value.0 192 | ||
44 | value.1 192 | ||
45 | comment { | ||
46 | access 'read write' | ||
47 | type INTEGER | ||
48 | count 2 | ||
49 | range '0 - 192' | ||
50 | } | ||
51 | } | ||
52 | control.5 { | ||
53 | iface MIXER | ||
54 | name 'Headphone Volume' | ||
55 | value.0 127 | ||
56 | value.1 127 | ||
57 | comment { | ||
58 | access 'read write' | ||
59 | type INTEGER | ||
60 | count 2 | ||
61 | range '0 - 127' | ||
62 | } | ||
63 | } | ||
64 | control.6 { | ||
65 | iface MIXER | ||
66 | name 'DAC Mux' | ||
67 | value DAC | ||
68 | comment { | ||
69 | access 'read write' | ||
70 | type ENUMERATED | ||
71 | count 1 | ||
72 | item.0 DAC | ||
73 | item.1 LINE_IN | ||
74 | } | ||
75 | } | ||
76 | control.7 { | ||
77 | iface MIXER | ||
78 | name 'ADC Mux' | ||
79 | value LINE_IN | ||
80 | comment { | ||
81 | access 'read write' | ||
82 | type ENUMERATED | ||
83 | count 1 | ||
84 | item.0 MIC_IN | ||
85 | item.1 LINE_IN | ||
86 | } | ||
87 | } | ||
88 | control.8 { | ||
89 | iface MIXER | ||
90 | name ASRC | ||
91 | value disable | ||
92 | comment { | ||
93 | access 'read write' | ||
94 | type ENUMERATED | ||
95 | count 1 | ||
96 | item.0 disable | ||
97 | item.1 '32KHz' | ||
98 | item.2 '44.1KHz' | ||
99 | item.3 '48KHz' | ||
100 | item.4 '96KHz' | ||
101 | } | ||
102 | } | ||
103 | control.9 { | ||
104 | iface MIXER | ||
105 | name 'Jack Function' | ||
106 | value on | ||
107 | comment { | ||
108 | access 'read write' | ||
109 | type ENUMERATED | ||
110 | count 1 | ||
111 | item.0 off | ||
112 | item.1 on | ||
113 | } | ||
114 | } | ||
115 | control.10 { | ||
116 | iface MIXER | ||
117 | name 'Speaker Function' | ||
118 | value on | ||
119 | comment { | ||
120 | access 'read write' | ||
121 | type ENUMERATED | ||
122 | count 1 | ||
123 | item.0 off | ||
124 | item.1 on | ||
125 | } | ||
126 | } | ||
127 | control.11 { | ||
128 | iface MIXER | ||
129 | name 'Line In Function' | ||
130 | value off | ||
131 | comment { | ||
132 | access 'read write' | ||
133 | type ENUMERATED | ||
134 | count 1 | ||
135 | item.0 off | ||
136 | item.1 on | ||
137 | } | ||
138 | } | ||
139 | } | ||
diff --git a/meta-fsl-arm/recipes-bsp/alsa-state/alsa-state/mx6/asound.conf b/meta-fsl-arm/recipes-bsp/alsa-state/alsa-state/mx6/asound.conf deleted file mode 100644 index 3f4e0482..00000000 --- a/meta-fsl-arm/recipes-bsp/alsa-state/alsa-state/mx6/asound.conf +++ /dev/null | |||
@@ -1,257 +0,0 @@ | |||
1 | defaults.pcm.rate_converter "linear" | ||
2 | |||
3 | pcm.dmix_48000{ | ||
4 | type dmix | ||
5 | ipc_key 5678293 | ||
6 | ipc_key_add_uid yes | ||
7 | slave{ | ||
8 | pcm "hw:0,0" | ||
9 | period_time 40000 | ||
10 | buffer_time 320000 | ||
11 | format S16_LE | ||
12 | rate 48000 | ||
13 | } | ||
14 | } | ||
15 | |||
16 | pcm.dmix_44100{ | ||
17 | type dmix | ||
18 | ipc_key 5678293 | ||
19 | ipc_key_add_uid yes | ||
20 | slave{ | ||
21 | pcm "hw:0,0" | ||
22 | period_time 40000 | ||
23 | buffer_time 360000 | ||
24 | format S16_LE | ||
25 | rate 44100 | ||
26 | } | ||
27 | } | ||
28 | |||
29 | pcm.dmix_32000{ | ||
30 | type dmix | ||
31 | ipc_key 5678293 | ||
32 | ipc_key_add_uid yes | ||
33 | slave{ | ||
34 | pcm "hw:0,0" | ||
35 | period_time 40000 | ||
36 | buffer_time 360000 | ||
37 | format S16_LE | ||
38 | rate 32000 | ||
39 | } | ||
40 | } | ||
41 | |||
42 | pcm.dmix_24000{ | ||
43 | type dmix | ||
44 | ipc_key 5678293 | ||
45 | ipc_key_add_uid yes | ||
46 | slave{ | ||
47 | pcm "hw:0,0" | ||
48 | period_time 40000 | ||
49 | buffer_time 360000 | ||
50 | format S16_LE | ||
51 | rate 24000 | ||
52 | } | ||
53 | } | ||
54 | |||
55 | pcm.dmix_22050{ | ||
56 | type dmix | ||
57 | ipc_key 5678293 | ||
58 | ipc_key_add_uid yes | ||
59 | slave{ | ||
60 | pcm "hw:0,0" | ||
61 | period_time 40000 | ||
62 | buffer_time 360000 | ||
63 | format S16_LE | ||
64 | rate 22050 | ||
65 | } | ||
66 | } | ||
67 | |||
68 | pcm.dmix_16000{ | ||
69 | type dmix | ||
70 | ipc_key 5678293 | ||
71 | ipc_key_add_uid yes | ||
72 | slave{ | ||
73 | pcm "hw:0,0" | ||
74 | period_time 40000 | ||
75 | buffer_time 360000 | ||
76 | format S16_LE | ||
77 | rate 16000 | ||
78 | } | ||
79 | } | ||
80 | |||
81 | pcm.dmix_12000{ | ||
82 | type dmix | ||
83 | ipc_key 5678293 | ||
84 | ipc_key_add_uid yes | ||
85 | slave{ | ||
86 | pcm "hw:0,0" | ||
87 | period_time 40000 | ||
88 | buffer_time 240000 | ||
89 | format S16_LE | ||
90 | rate 12000 | ||
91 | } | ||
92 | } | ||
93 | |||
94 | pcm.dmix_11025{ | ||
95 | type dmix | ||
96 | ipc_key 5678293 | ||
97 | ipc_key_add_uid yes | ||
98 | slave{ | ||
99 | pcm "hw:0,0" | ||
100 | period_time 40000 | ||
101 | buffer_time 240000 | ||
102 | format S16_LE | ||
103 | rate 11025 | ||
104 | } | ||
105 | } | ||
106 | |||
107 | pcm.dmix_8000{ | ||
108 | type dmix | ||
109 | ipc_key 5678293 | ||
110 | ipc_key_add_uid yes | ||
111 | slave{ | ||
112 | pcm "hw:0,0" | ||
113 | period_time 40000 | ||
114 | buffer_time 360000 | ||
115 | format S16_LE | ||
116 | rate 8000 | ||
117 | } | ||
118 | } | ||
119 | |||
120 | pcm.!dsnoop_48000{ | ||
121 | type dsnoop | ||
122 | ipc_key 5778293 | ||
123 | ipc_key_add_uid yes | ||
124 | slave{ | ||
125 | pcm "hw:0,0" | ||
126 | period_time 40000 | ||
127 | buffer_time 320000 | ||
128 | format S16_LE | ||
129 | rate 48000 | ||
130 | } | ||
131 | } | ||
132 | |||
133 | pcm.!dsnoop_44100{ | ||
134 | type dsnoop | ||
135 | ipc_key 5778293 | ||
136 | ipc_key_add_uid yes | ||
137 | slave{ | ||
138 | pcm "hw:0,0" | ||
139 | period_time 40000 | ||
140 | buffer_time 360000 | ||
141 | format S16_LE | ||
142 | rate 44100 | ||
143 | } | ||
144 | } | ||
145 | |||
146 | pcm.!dsnoop_32000{ | ||
147 | type dsnoop | ||
148 | ipc_key 5778293 | ||
149 | ipc_key_add_uid yes | ||
150 | slave{ | ||
151 | pcm "hw:0,0" | ||
152 | period_time 40000 | ||
153 | buffer_time 360000 | ||
154 | format S16_LE | ||
155 | rate 32000 | ||
156 | } | ||
157 | } | ||
158 | |||
159 | pcm.!dsnoop_24000{ | ||
160 | type dsnoop | ||
161 | ipc_key 5778293 | ||
162 | ipc_key_add_uid yes | ||
163 | slave{ | ||
164 | pcm "hw:0,0" | ||
165 | period_time 40000 | ||
166 | buffer_time 360000 | ||
167 | format S16_LE | ||
168 | rate 24000 | ||
169 | } | ||
170 | } | ||
171 | |||
172 | pcm.!dsnoop_22050{ | ||
173 | type dsnoop | ||
174 | ipc_key 5778293 | ||
175 | ipc_key_add_uid yes | ||
176 | slave{ | ||
177 | pcm "hw:0,0" | ||
178 | period_time 40000 | ||
179 | buffer_time 360000 | ||
180 | format S16_LE | ||
181 | rate 22050 | ||
182 | } | ||
183 | } | ||
184 | |||
185 | pcm.!dsnoop_16000{ | ||
186 | type dsnoop | ||
187 | ipc_key 5778293 | ||
188 | ipc_key_add_uid yes | ||
189 | slave{ | ||
190 | pcm "hw:0,0" | ||
191 | period_time 40000 | ||
192 | buffer_time 360000 | ||
193 | format S16_LE | ||
194 | rate 16000 | ||
195 | } | ||
196 | } | ||
197 | |||
198 | pcm.!dsnoop_12000{ | ||
199 | type dsnoop | ||
200 | ipc_key 5778293 | ||
201 | ipc_key_add_uid yes | ||
202 | slave{ | ||
203 | pcm "hw:0,0" | ||
204 | period_time 40000 | ||
205 | buffer_time 240000 | ||
206 | format S16_LE | ||
207 | rate 12000 | ||
208 | } | ||
209 | } | ||
210 | |||
211 | pcm.!dsnoop_11025{ | ||
212 | type dsnoop | ||
213 | ipc_key 5778293 | ||
214 | ipc_key_add_uid yes | ||
215 | slave{ | ||
216 | pcm "hw:0,0" | ||
217 | period_time 40000 | ||
218 | buffer_time 240000 | ||
219 | format S16_LE | ||
220 | rate 11025 | ||
221 | } | ||
222 | } | ||
223 | |||
224 | pcm.!dsnoop_8000{ | ||
225 | type dsnoop | ||
226 | ipc_key 5778293 | ||
227 | ipc_key_add_uid yes | ||
228 | slave{ | ||
229 | pcm "hw:0,0" | ||
230 | period_time 40000 | ||
231 | buffer_time 360000 | ||
232 | format S16_LE | ||
233 | rate 8000 | ||
234 | } | ||
235 | } | ||
236 | |||
237 | pcm.asymed{ | ||
238 | type asym | ||
239 | playback.pcm "dmix_44100" | ||
240 | capture.pcm "dsnoop_44100" | ||
241 | } | ||
242 | |||
243 | pcm.dsp0{ | ||
244 | type plug | ||
245 | slave.pcm "asymed" | ||
246 | } | ||
247 | |||
248 | pcm.!default{ | ||
249 | type plug | ||
250 | route_policy "average" | ||
251 | slave.pcm "asymed" | ||
252 | } | ||
253 | |||
254 | ctl.mixer0{ | ||
255 | type hw | ||
256 | card 0 | ||
257 | } | ||
diff --git a/meta-fsl-arm/recipes-bsp/alsa-state/alsa-state/mx6/asound.state b/meta-fsl-arm/recipes-bsp/alsa-state/alsa-state/mx6/asound.state deleted file mode 100644 index 552f763d..00000000 --- a/meta-fsl-arm/recipes-bsp/alsa-state/alsa-state/mx6/asound.state +++ /dev/null | |||
@@ -1,1374 +0,0 @@ | |||
1 | state.wm8962audio { | ||
2 | control.1 { | ||
3 | iface MIXER | ||
4 | name 'Input Mixer Switch' | ||
5 | value.0 true | ||
6 | value.1 true | ||
7 | comment { | ||
8 | access 'read write' | ||
9 | type BOOLEAN | ||
10 | count 2 | ||
11 | } | ||
12 | } | ||
13 | control.2 { | ||
14 | iface MIXER | ||
15 | name 'MIXINL IN2L Volume' | ||
16 | value 5 | ||
17 | comment { | ||
18 | access 'read write' | ||
19 | type INTEGER | ||
20 | count 1 | ||
21 | range '0 - 7' | ||
22 | dbmin -1500 | ||
23 | dbmax 600 | ||
24 | dbvalue.0 0 | ||
25 | } | ||
26 | } | ||
27 | control.3 { | ||
28 | iface MIXER | ||
29 | name 'MIXINL PGA Volume' | ||
30 | value 0 | ||
31 | comment { | ||
32 | access 'read write' | ||
33 | type INTEGER | ||
34 | count 1 | ||
35 | range '0 - 7' | ||
36 | dbmin 0 | ||
37 | dbmax 3000 | ||
38 | dbvalue.0 0 | ||
39 | } | ||
40 | } | ||
41 | control.4 { | ||
42 | iface MIXER | ||
43 | name 'MIXINL IN3L Volume' | ||
44 | value 5 | ||
45 | comment { | ||
46 | access 'read write' | ||
47 | type INTEGER | ||
48 | count 1 | ||
49 | range '0 - 7' | ||
50 | dbmin -1500 | ||
51 | dbmax 600 | ||
52 | dbvalue.0 0 | ||
53 | } | ||
54 | } | ||
55 | control.5 { | ||
56 | iface MIXER | ||
57 | name 'MIXINR IN2R Volume' | ||
58 | value 5 | ||
59 | comment { | ||
60 | access 'read write' | ||
61 | type INTEGER | ||
62 | count 1 | ||
63 | range '0 - 7' | ||
64 | dbmin -1500 | ||
65 | dbmax 600 | ||
66 | dbvalue.0 0 | ||
67 | } | ||
68 | } | ||
69 | control.6 { | ||
70 | iface MIXER | ||
71 | name 'MIXINR PGA Volume' | ||
72 | value 0 | ||
73 | comment { | ||
74 | access 'read write' | ||
75 | type INTEGER | ||
76 | count 1 | ||
77 | range '0 - 7' | ||
78 | dbmin 0 | ||
79 | dbmax 3000 | ||
80 | dbvalue.0 0 | ||
81 | } | ||
82 | } | ||
83 | control.7 { | ||
84 | iface MIXER | ||
85 | name 'MIXINR IN3R Volume' | ||
86 | value 7 | ||
87 | comment { | ||
88 | access 'read write' | ||
89 | type INTEGER | ||
90 | count 1 | ||
91 | range '0 - 7' | ||
92 | dbmin -1500 | ||
93 | dbmax 600 | ||
94 | dbvalue.0 600 | ||
95 | } | ||
96 | } | ||
97 | control.8 { | ||
98 | iface MIXER | ||
99 | name 'Digital Capture Volume' | ||
100 | value.0 108 | ||
101 | value.1 108 | ||
102 | comment { | ||
103 | access 'read write' | ||
104 | type INTEGER | ||
105 | count 2 | ||
106 | range '0 - 127' | ||
107 | dbmin -9999999 | ||
108 | dbmax 2325 | ||
109 | dbvalue.0 900 | ||
110 | dbvalue.1 900 | ||
111 | } | ||
112 | } | ||
113 | control.9 { | ||
114 | iface MIXER | ||
115 | name 'Capture Volume' | ||
116 | value.0 63 | ||
117 | value.1 63 | ||
118 | comment { | ||
119 | access 'read write' | ||
120 | type INTEGER | ||
121 | count 2 | ||
122 | range '0 - 63' | ||
123 | dbmin -2325 | ||
124 | dbmax 2400 | ||
125 | dbvalue.0 2400 | ||
126 | dbvalue.1 2400 | ||
127 | } | ||
128 | } | ||
129 | control.10 { | ||
130 | iface MIXER | ||
131 | name 'Capture Switch' | ||
132 | value.0 false | ||
133 | value.1 false | ||
134 | comment { | ||
135 | access 'read write' | ||
136 | type BOOLEAN | ||
137 | count 2 | ||
138 | } | ||
139 | } | ||
140 | control.11 { | ||
141 | iface MIXER | ||
142 | name 'Capture ZC Switch' | ||
143 | value.0 true | ||
144 | value.1 true | ||
145 | comment { | ||
146 | access 'read write' | ||
147 | type BOOLEAN | ||
148 | count 2 | ||
149 | } | ||
150 | } | ||
151 | control.12 { | ||
152 | iface MIXER | ||
153 | name 'Capture HPF Switch' | ||
154 | value true | ||
155 | comment { | ||
156 | access 'read write' | ||
157 | type BOOLEAN | ||
158 | count 1 | ||
159 | } | ||
160 | } | ||
161 | control.13 { | ||
162 | iface MIXER | ||
163 | name 'Capture HPF Mode' | ||
164 | value Hi-fi | ||
165 | comment { | ||
166 | access 'read write' | ||
167 | type ENUMERATED | ||
168 | count 1 | ||
169 | item.0 Hi-fi | ||
170 | item.1 Application | ||
171 | } | ||
172 | } | ||
173 | control.14 { | ||
174 | iface MIXER | ||
175 | name 'Capture HPF Cutoff' | ||
176 | value 0 | ||
177 | comment { | ||
178 | access 'read write' | ||
179 | type INTEGER | ||
180 | count 1 | ||
181 | range '0 - 7' | ||
182 | } | ||
183 | } | ||
184 | control.15 { | ||
185 | iface MIXER | ||
186 | name 'Capture LHPF Switch' | ||
187 | value false | ||
188 | comment { | ||
189 | access 'read write' | ||
190 | type BOOLEAN | ||
191 | count 1 | ||
192 | } | ||
193 | } | ||
194 | control.16 { | ||
195 | iface MIXER | ||
196 | name 'Capture LHPF Mode' | ||
197 | value LPF | ||
198 | comment { | ||
199 | access 'read write' | ||
200 | type ENUMERATED | ||
201 | count 1 | ||
202 | item.0 LPF | ||
203 | item.1 HPF | ||
204 | } | ||
205 | } | ||
206 | control.17 { | ||
207 | iface MIXER | ||
208 | name 'Sidetone Volume' | ||
209 | value.0 0 | ||
210 | value.1 0 | ||
211 | comment { | ||
212 | access 'read write' | ||
213 | type INTEGER | ||
214 | count 2 | ||
215 | range '0 - 12' | ||
216 | dbmin -3600 | ||
217 | dbmax 0 | ||
218 | dbvalue.0 -3600 | ||
219 | dbvalue.1 -3600 | ||
220 | } | ||
221 | } | ||
222 | control.18 { | ||
223 | iface MIXER | ||
224 | name 'Digital Playback Volume' | ||
225 | value.0 96 | ||
226 | value.1 96 | ||
227 | comment { | ||
228 | access 'read write' | ||
229 | type INTEGER | ||
230 | count 2 | ||
231 | range '0 - 127' | ||
232 | dbmin -9999999 | ||
233 | dbmax 2325 | ||
234 | dbvalue.0 0 | ||
235 | dbvalue.1 0 | ||
236 | } | ||
237 | } | ||
238 | control.19 { | ||
239 | iface MIXER | ||
240 | name 'DAC High Performance Switch' | ||
241 | value false | ||
242 | comment { | ||
243 | access 'read write' | ||
244 | type BOOLEAN | ||
245 | count 1 | ||
246 | } | ||
247 | } | ||
248 | control.20 { | ||
249 | iface MIXER | ||
250 | name 'DAC L/R Swap Switch' | ||
251 | value false | ||
252 | comment { | ||
253 | access 'read write' | ||
254 | type BOOLEAN | ||
255 | count 1 | ||
256 | } | ||
257 | } | ||
258 | control.21 { | ||
259 | iface MIXER | ||
260 | name 'ADC L/R Swap Switch' | ||
261 | value false | ||
262 | comment { | ||
263 | access 'read write' | ||
264 | type BOOLEAN | ||
265 | count 1 | ||
266 | } | ||
267 | } | ||
268 | control.22 { | ||
269 | iface MIXER | ||
270 | name 'ADC High Performance Switch' | ||
271 | value true | ||
272 | comment { | ||
273 | access 'read write' | ||
274 | type BOOLEAN | ||
275 | count 1 | ||
276 | } | ||
277 | } | ||
278 | control.23 { | ||
279 | iface MIXER | ||
280 | name 'Beep Volume' | ||
281 | value 0 | ||
282 | comment { | ||
283 | access 'read write' | ||
284 | type INTEGER | ||
285 | count 1 | ||
286 | range '0 - 15' | ||
287 | dbmin -9999999 | ||
288 | dbmax -600 | ||
289 | dbvalue.0 -9999999 | ||
290 | } | ||
291 | } | ||
292 | control.24 { | ||
293 | iface MIXER | ||
294 | name 'Headphone Volume' | ||
295 | value.0 93 | ||
296 | value.1 93 | ||
297 | comment { | ||
298 | access 'read write' | ||
299 | type INTEGER | ||
300 | count 2 | ||
301 | range '0 - 127' | ||
302 | dbmin -9999999 | ||
303 | dbmax 600 | ||
304 | dbvalue.0 -2800 | ||
305 | dbvalue.1 -2800 | ||
306 | } | ||
307 | } | ||
308 | control.25 { | ||
309 | iface MIXER | ||
310 | name 'Headphone Switch' | ||
311 | value.0 true | ||
312 | value.1 true | ||
313 | comment { | ||
314 | access 'read write' | ||
315 | type BOOLEAN | ||
316 | count 2 | ||
317 | } | ||
318 | } | ||
319 | control.26 { | ||
320 | iface MIXER | ||
321 | name 'Headphone ZC Switch' | ||
322 | value.0 false | ||
323 | value.1 false | ||
324 | comment { | ||
325 | access 'read write' | ||
326 | type BOOLEAN | ||
327 | count 2 | ||
328 | } | ||
329 | } | ||
330 | control.27 { | ||
331 | iface MIXER | ||
332 | name 'Headphone Aux Volume' | ||
333 | value.0 7 | ||
334 | value.1 7 | ||
335 | comment { | ||
336 | access 'read write' | ||
337 | type INTEGER | ||
338 | count 2 | ||
339 | range '0 - 7' | ||
340 | dbmin -700 | ||
341 | dbmax 0 | ||
342 | dbvalue.0 0 | ||
343 | dbvalue.1 0 | ||
344 | } | ||
345 | } | ||
346 | control.28 { | ||
347 | iface MIXER | ||
348 | name 'Headphone Mixer Switch' | ||
349 | value.0 false | ||
350 | value.1 false | ||
351 | comment { | ||
352 | access 'read write' | ||
353 | type BOOLEAN | ||
354 | count 2 | ||
355 | } | ||
356 | } | ||
357 | control.29 { | ||
358 | iface MIXER | ||
359 | name 'HPMIXL IN4L Volume' | ||
360 | value 7 | ||
361 | comment { | ||
362 | access 'read write' | ||
363 | type INTEGER | ||
364 | count 1 | ||
365 | range '0 - 7' | ||
366 | dbmin -1500 | ||
367 | dbmax 600 | ||
368 | dbvalue.0 600 | ||
369 | } | ||
370 | } | ||
371 | control.30 { | ||
372 | iface MIXER | ||
373 | name 'HPMIXL IN4R Volume' | ||
374 | value 7 | ||
375 | comment { | ||
376 | access 'read write' | ||
377 | type INTEGER | ||
378 | count 1 | ||
379 | range '0 - 7' | ||
380 | dbmin -1500 | ||
381 | dbmax 600 | ||
382 | dbvalue.0 600 | ||
383 | } | ||
384 | } | ||
385 | control.31 { | ||
386 | iface MIXER | ||
387 | name 'HPMIXL MIXINL Volume' | ||
388 | value 1 | ||
389 | comment { | ||
390 | access 'read write' | ||
391 | type INTEGER | ||
392 | count 1 | ||
393 | range '0 - 1' | ||
394 | dbmin -600 | ||
395 | dbmax 0 | ||
396 | dbvalue.0 0 | ||
397 | } | ||
398 | } | ||
399 | control.32 { | ||
400 | iface MIXER | ||
401 | name 'HPMIXL MIXINR Volume' | ||
402 | value 1 | ||
403 | comment { | ||
404 | access 'read write' | ||
405 | type INTEGER | ||
406 | count 1 | ||
407 | range '0 - 1' | ||
408 | dbmin -600 | ||
409 | dbmax 0 | ||
410 | dbvalue.0 0 | ||
411 | } | ||
412 | } | ||
413 | control.33 { | ||
414 | iface MIXER | ||
415 | name 'HPMIXR IN4L Volume' | ||
416 | value 7 | ||
417 | comment { | ||
418 | access 'read write' | ||
419 | type INTEGER | ||
420 | count 1 | ||
421 | range '0 - 7' | ||
422 | dbmin -1500 | ||
423 | dbmax 600 | ||
424 | dbvalue.0 600 | ||
425 | } | ||
426 | } | ||
427 | control.34 { | ||
428 | iface MIXER | ||
429 | name 'HPMIXR IN4R Volume' | ||
430 | value 7 | ||
431 | comment { | ||
432 | access 'read write' | ||
433 | type INTEGER | ||
434 | count 1 | ||
435 | range '0 - 7' | ||
436 | dbmin -1500 | ||
437 | dbmax 600 | ||
438 | dbvalue.0 600 | ||
439 | } | ||
440 | } | ||
441 | control.35 { | ||
442 | iface MIXER | ||
443 | name 'HPMIXR MIXINL Volume' | ||
444 | value 1 | ||
445 | comment { | ||
446 | access 'read write' | ||
447 | type INTEGER | ||
448 | count 1 | ||
449 | range '0 - 1' | ||
450 | dbmin -600 | ||
451 | dbmax 0 | ||
452 | dbvalue.0 0 | ||
453 | } | ||
454 | } | ||
455 | control.36 { | ||
456 | iface MIXER | ||
457 | name 'HPMIXR MIXINR Volume' | ||
458 | value 1 | ||
459 | comment { | ||
460 | access 'read write' | ||
461 | type INTEGER | ||
462 | count 1 | ||
463 | range '0 - 1' | ||
464 | dbmin -600 | ||
465 | dbmax 0 | ||
466 | dbvalue.0 0 | ||
467 | } | ||
468 | } | ||
469 | control.37 { | ||
470 | iface MIXER | ||
471 | name 'Speaker Boost Volume' | ||
472 | value 3 | ||
473 | comment { | ||
474 | access 'read write' | ||
475 | type INTEGER | ||
476 | count 1 | ||
477 | range '0 - 7' | ||
478 | dbmin 0 | ||
479 | dbmax 1200 | ||
480 | dbvalue.0 450 | ||
481 | } | ||
482 | } | ||
483 | control.38 { | ||
484 | iface MIXER | ||
485 | name 'EQ Switch' | ||
486 | value false | ||
487 | comment { | ||
488 | access 'read write' | ||
489 | type BOOLEAN | ||
490 | count 1 | ||
491 | } | ||
492 | } | ||
493 | control.39 { | ||
494 | iface MIXER | ||
495 | name 'EQ1 Volume' | ||
496 | value.0 12 | ||
497 | value.1 12 | ||
498 | comment { | ||
499 | access 'read write' | ||
500 | type INTEGER | ||
501 | count 2 | ||
502 | range '0 - 31' | ||
503 | dbmin -1200 | ||
504 | dbmax 1900 | ||
505 | dbvalue.0 0 | ||
506 | dbvalue.1 0 | ||
507 | } | ||
508 | } | ||
509 | control.40 { | ||
510 | iface MIXER | ||
511 | name 'EQ2 Volume' | ||
512 | value.0 12 | ||
513 | value.1 12 | ||
514 | comment { | ||
515 | access 'read write' | ||
516 | type INTEGER | ||
517 | count 2 | ||
518 | range '0 - 31' | ||
519 | dbmin -1200 | ||
520 | dbmax 1900 | ||
521 | dbvalue.0 0 | ||
522 | dbvalue.1 0 | ||
523 | } | ||
524 | } | ||
525 | control.41 { | ||
526 | iface MIXER | ||
527 | name 'EQ3 Volume' | ||
528 | value.0 12 | ||
529 | value.1 12 | ||
530 | comment { | ||
531 | access 'read write' | ||
532 | type INTEGER | ||
533 | count 2 | ||
534 | range '0 - 31' | ||
535 | dbmin -1200 | ||
536 | dbmax 1900 | ||
537 | dbvalue.0 0 | ||
538 | dbvalue.1 0 | ||
539 | } | ||
540 | } | ||
541 | control.42 { | ||
542 | iface MIXER | ||
543 | name 'EQ4 Volume' | ||
544 | value.0 12 | ||
545 | value.1 12 | ||
546 | comment { | ||
547 | access 'read write' | ||
548 | type INTEGER | ||
549 | count 2 | ||
550 | range '0 - 31' | ||
551 | dbmin -1200 | ||
552 | dbmax 1900 | ||
553 | dbvalue.0 0 | ||
554 | dbvalue.1 0 | ||
555 | } | ||
556 | } | ||
557 | control.43 { | ||
558 | iface MIXER | ||
559 | name 'EQ5 Volume' | ||
560 | value.0 12 | ||
561 | value.1 12 | ||
562 | comment { | ||
563 | access 'read write' | ||
564 | type INTEGER | ||
565 | count 2 | ||
566 | range '0 - 31' | ||
567 | dbmin -1200 | ||
568 | dbmax 1900 | ||
569 | dbvalue.0 0 | ||
570 | dbvalue.1 0 | ||
571 | } | ||
572 | } | ||
573 | control.44 { | ||
574 | iface MIXER | ||
575 | name '3D Switch' | ||
576 | value false | ||
577 | comment { | ||
578 | access 'read write' | ||
579 | type BOOLEAN | ||
580 | count 1 | ||
581 | } | ||
582 | } | ||
583 | control.45 { | ||
584 | iface MIXER | ||
585 | name '3D Coefficients' | ||
586 | value '0040000000000000' | ||
587 | comment { | ||
588 | access 'read write' | ||
589 | type BYTES | ||
590 | count 8 | ||
591 | } | ||
592 | } | ||
593 | control.46 { | ||
594 | iface MIXER | ||
595 | name 'DF1 Switch' | ||
596 | value false | ||
597 | comment { | ||
598 | access 'read write' | ||
599 | type BOOLEAN | ||
600 | count 1 | ||
601 | } | ||
602 | } | ||
603 | control.47 { | ||
604 | iface MIXER | ||
605 | name 'DF1 Coefficients' | ||
606 | value '0000000000000000000000000000' | ||
607 | comment { | ||
608 | access 'read write' | ||
609 | type BYTES | ||
610 | count 14 | ||
611 | } | ||
612 | } | ||
613 | control.48 { | ||
614 | iface MIXER | ||
615 | name 'DRC Switch' | ||
616 | value false | ||
617 | comment { | ||
618 | access 'read write' | ||
619 | type BOOLEAN | ||
620 | count 1 | ||
621 | } | ||
622 | } | ||
623 | control.49 { | ||
624 | iface MIXER | ||
625 | name 'DRC Coefficients' | ||
626 | value '000c0925000000000000' | ||
627 | comment { | ||
628 | access 'read write' | ||
629 | type BYTES | ||
630 | count 10 | ||
631 | } | ||
632 | } | ||
633 | control.50 { | ||
634 | iface MIXER | ||
635 | name 'VSS Switch' | ||
636 | value false | ||
637 | comment { | ||
638 | access 'read write' | ||
639 | type BOOLEAN | ||
640 | count 1 | ||
641 | } | ||
642 | } | ||
643 | control.51 { | ||
644 | iface MIXER | ||
645 | name 'VSS Coefficients' | ||
646 | value '008c020000350700003a4100008b7d00003a4100008cfee800780000003fb260002d18180020000000f1834000fb830000eeaec000fbac4000f17f8000f43b4000f5fb0000ea10c000fcc58000e275c00004b48000d4f9800004914000d8a48000023dc000cf7a8000dc060000f2dac000baf340000a7940001c068000fd2d00001ce840000ddc4000fc9d000009558000fe7e80000eab4000f99880000987c000fd2c400009480000035f400000870000fae4c000000b400004e18000011f4000f8b00000fbcbc00004f3800007df4000ff070000efd70000fbaf4000108a80001107c000e0080000d276000020cf400030234000fd69c0002835000006330000d9f6c000f33340000f420000040c8000fb3f8000f757c0000354000000c6c0000312c000fd8580' | ||
647 | comment { | ||
648 | access 'read write' | ||
649 | type BYTES | ||
650 | count 296 | ||
651 | } | ||
652 | } | ||
653 | control.52 { | ||
654 | iface MIXER | ||
655 | name 'HPF1 Switch' | ||
656 | value false | ||
657 | comment { | ||
658 | access 'read write' | ||
659 | type BOOLEAN | ||
660 | count 1 | ||
661 | } | ||
662 | } | ||
663 | control.53 { | ||
664 | iface MIXER | ||
665 | name 'HPF2 Switch' | ||
666 | value false | ||
667 | comment { | ||
668 | access 'read write' | ||
669 | type BOOLEAN | ||
670 | count 1 | ||
671 | } | ||
672 | } | ||
673 | control.54 { | ||
674 | iface MIXER | ||
675 | name 'HPF Coefficients' | ||
676 | value '0000' | ||
677 | comment { | ||
678 | access 'read write' | ||
679 | type BYTES | ||
680 | count 2 | ||
681 | } | ||
682 | } | ||
683 | control.55 { | ||
684 | iface MIXER | ||
685 | name 'HD Bass Switch' | ||
686 | value false | ||
687 | comment { | ||
688 | access 'read write' | ||
689 | type BOOLEAN | ||
690 | count 1 | ||
691 | } | ||
692 | } | ||
693 | control.56 { | ||
694 | iface MIXER | ||
695 | name 'HD Bass Coefficients' | ||
696 | value '0002bd12007c586c00538121003f8bd80032f52d0065ac8c006be08700721483007214830043352500066a4a0043607900080000000100000059999a' | ||
697 | comment { | ||
698 | access 'read write' | ||
699 | type BYTES | ||
700 | count 60 | ||
701 | } | ||
702 | } | ||
703 | control.57 { | ||
704 | iface MIXER | ||
705 | name 'Speaker Volume' | ||
706 | value.0 114 | ||
707 | value.1 114 | ||
708 | comment { | ||
709 | access 'read write' | ||
710 | type INTEGER | ||
711 | count 2 | ||
712 | range '0 - 127' | ||
713 | dbmin -9999999 | ||
714 | dbmax 600 | ||
715 | dbvalue.0 -700 | ||
716 | dbvalue.1 -700 | ||
717 | } | ||
718 | } | ||
719 | control.58 { | ||
720 | iface MIXER | ||
721 | name 'Speaker Switch' | ||
722 | value.0 false | ||
723 | value.1 false | ||
724 | comment { | ||
725 | access 'read write' | ||
726 | type BOOLEAN | ||
727 | count 2 | ||
728 | } | ||
729 | } | ||
730 | control.59 { | ||
731 | iface MIXER | ||
732 | name 'Speaker ZC Switch' | ||
733 | value.0 false | ||
734 | value.1 false | ||
735 | comment { | ||
736 | access 'read write' | ||
737 | type BOOLEAN | ||
738 | count 2 | ||
739 | } | ||
740 | } | ||
741 | control.60 { | ||
742 | iface MIXER | ||
743 | name 'Speaker Mixer Switch' | ||
744 | value.0 false | ||
745 | value.1 false | ||
746 | comment { | ||
747 | access 'read write' | ||
748 | type BOOLEAN | ||
749 | count 2 | ||
750 | } | ||
751 | } | ||
752 | control.61 { | ||
753 | iface MIXER | ||
754 | name 'SPKOUTL Mixer IN4L Volume' | ||
755 | value 7 | ||
756 | comment { | ||
757 | access 'read write' | ||
758 | type INTEGER | ||
759 | count 1 | ||
760 | range '0 - 7' | ||
761 | dbmin -1500 | ||
762 | dbmax 600 | ||
763 | dbvalue.0 600 | ||
764 | } | ||
765 | } | ||
766 | control.62 { | ||
767 | iface MIXER | ||
768 | name 'SPKOUTL Mixer IN4R Volume' | ||
769 | value 7 | ||
770 | comment { | ||
771 | access 'read write' | ||
772 | type INTEGER | ||
773 | count 1 | ||
774 | range '0 - 7' | ||
775 | dbmin -1500 | ||
776 | dbmax 600 | ||
777 | dbvalue.0 600 | ||
778 | } | ||
779 | } | ||
780 | control.63 { | ||
781 | iface MIXER | ||
782 | name 'SPKOUTL Mixer MIXINL Volume' | ||
783 | value 1 | ||
784 | comment { | ||
785 | access 'read write' | ||
786 | type INTEGER | ||
787 | count 1 | ||
788 | range '0 - 1' | ||
789 | dbmin -600 | ||
790 | dbmax 0 | ||
791 | dbvalue.0 0 | ||
792 | } | ||
793 | } | ||
794 | control.64 { | ||
795 | iface MIXER | ||
796 | name 'SPKOUTL Mixer MIXINR Volume' | ||
797 | value 1 | ||
798 | comment { | ||
799 | access 'read write' | ||
800 | type INTEGER | ||
801 | count 1 | ||
802 | range '0 - 1' | ||
803 | dbmin -600 | ||
804 | dbmax 0 | ||
805 | dbvalue.0 0 | ||
806 | } | ||
807 | } | ||
808 | control.65 { | ||
809 | iface MIXER | ||
810 | name 'SPKOUTL Mixer DACL Volume' | ||
811 | value 0 | ||
812 | comment { | ||
813 | access 'read write' | ||
814 | type INTEGER | ||
815 | count 1 | ||
816 | range '0 - 1' | ||
817 | dbmin -600 | ||
818 | dbmax 0 | ||
819 | dbvalue.0 -600 | ||
820 | } | ||
821 | } | ||
822 | control.66 { | ||
823 | iface MIXER | ||
824 | name 'SPKOUTL Mixer DACR Volume' | ||
825 | value 0 | ||
826 | comment { | ||
827 | access 'read write' | ||
828 | type INTEGER | ||
829 | count 1 | ||
830 | range '0 - 1' | ||
831 | dbmin -600 | ||
832 | dbmax 0 | ||
833 | dbvalue.0 -600 | ||
834 | } | ||
835 | } | ||
836 | control.67 { | ||
837 | iface MIXER | ||
838 | name 'SPKOUTR Mixer IN4L Volume' | ||
839 | value 7 | ||
840 | comment { | ||
841 | access 'read write' | ||
842 | type INTEGER | ||
843 | count 1 | ||
844 | range '0 - 7' | ||
845 | dbmin -1500 | ||
846 | dbmax 600 | ||
847 | dbvalue.0 600 | ||
848 | } | ||
849 | } | ||
850 | control.68 { | ||
851 | iface MIXER | ||
852 | name 'SPKOUTR Mixer IN4R Volume' | ||
853 | value 7 | ||
854 | comment { | ||
855 | access 'read write' | ||
856 | type INTEGER | ||
857 | count 1 | ||
858 | range '0 - 7' | ||
859 | dbmin -1500 | ||
860 | dbmax 600 | ||
861 | dbvalue.0 600 | ||
862 | } | ||
863 | } | ||
864 | control.69 { | ||
865 | iface MIXER | ||
866 | name 'SPKOUTR Mixer MIXINL Volume' | ||
867 | value 1 | ||
868 | comment { | ||
869 | access 'read write' | ||
870 | type INTEGER | ||
871 | count 1 | ||
872 | range '0 - 1' | ||
873 | dbmin -600 | ||
874 | dbmax 0 | ||
875 | dbvalue.0 0 | ||
876 | } | ||
877 | } | ||
878 | control.70 { | ||
879 | iface MIXER | ||
880 | name 'SPKOUTR Mixer MIXINR Volume' | ||
881 | value 1 | ||
882 | comment { | ||
883 | access 'read write' | ||
884 | type INTEGER | ||
885 | count 1 | ||
886 | range '0 - 1' | ||
887 | dbmin -600 | ||
888 | dbmax 0 | ||
889 | dbvalue.0 0 | ||
890 | } | ||
891 | } | ||
892 | control.71 { | ||
893 | iface MIXER | ||
894 | name 'SPKOUTR Mixer DACL Volume' | ||
895 | value 0 | ||
896 | comment { | ||
897 | access 'read write' | ||
898 | type INTEGER | ||
899 | count 1 | ||
900 | range '0 - 1' | ||
901 | dbmin -600 | ||
902 | dbmax 0 | ||
903 | dbvalue.0 -600 | ||
904 | } | ||
905 | } | ||
906 | control.72 { | ||
907 | iface MIXER | ||
908 | name 'SPKOUTR Mixer DACR Volume' | ||
909 | value 0 | ||
910 | comment { | ||
911 | access 'read write' | ||
912 | type INTEGER | ||
913 | count 1 | ||
914 | range '0 - 1' | ||
915 | dbmin -600 | ||
916 | dbmax 0 | ||
917 | dbvalue.0 -600 | ||
918 | } | ||
919 | } | ||
920 | control.73 { | ||
921 | iface MIXER | ||
922 | name 'SPKOUTR PGA' | ||
923 | value DAC | ||
924 | comment { | ||
925 | access 'read write' | ||
926 | type ENUMERATED | ||
927 | count 1 | ||
928 | item.0 DAC | ||
929 | item.1 Mixer | ||
930 | } | ||
931 | } | ||
932 | control.74 { | ||
933 | iface MIXER | ||
934 | name 'SPKOUTL PGA' | ||
935 | value DAC | ||
936 | comment { | ||
937 | access 'read write' | ||
938 | type ENUMERATED | ||
939 | count 1 | ||
940 | item.0 DAC | ||
941 | item.1 Mixer | ||
942 | } | ||
943 | } | ||
944 | control.75 { | ||
945 | iface MIXER | ||
946 | name 'SPKOUTR Mixer DACL Switch' | ||
947 | value false | ||
948 | comment { | ||
949 | access 'read write' | ||
950 | type BOOLEAN | ||
951 | count 1 | ||
952 | } | ||
953 | } | ||
954 | control.76 { | ||
955 | iface MIXER | ||
956 | name 'SPKOUTR Mixer DACR Switch' | ||
957 | value false | ||
958 | comment { | ||
959 | access 'read write' | ||
960 | type BOOLEAN | ||
961 | count 1 | ||
962 | } | ||
963 | } | ||
964 | control.77 { | ||
965 | iface MIXER | ||
966 | name 'SPKOUTR Mixer MIXINL Switch' | ||
967 | value false | ||
968 | comment { | ||
969 | access 'read write' | ||
970 | type BOOLEAN | ||
971 | count 1 | ||
972 | } | ||
973 | } | ||
974 | control.78 { | ||
975 | iface MIXER | ||
976 | name 'SPKOUTR Mixer MIXINR Switch' | ||
977 | value false | ||
978 | comment { | ||
979 | access 'read write' | ||
980 | type BOOLEAN | ||
981 | count 1 | ||
982 | } | ||
983 | } | ||
984 | control.79 { | ||
985 | iface MIXER | ||
986 | name 'SPKOUTR Mixer IN4L Switch' | ||
987 | value false | ||
988 | comment { | ||
989 | access 'read write' | ||
990 | type BOOLEAN | ||
991 | count 1 | ||
992 | } | ||
993 | } | ||
994 | control.80 { | ||
995 | iface MIXER | ||
996 | name 'SPKOUTR Mixer IN4R Switch' | ||
997 | value false | ||
998 | comment { | ||
999 | access 'read write' | ||
1000 | type BOOLEAN | ||
1001 | count 1 | ||
1002 | } | ||
1003 | } | ||
1004 | control.81 { | ||
1005 | iface MIXER | ||
1006 | name 'SPKOUTL Mixer DACL Switch' | ||
1007 | value false | ||
1008 | comment { | ||
1009 | access 'read write' | ||
1010 | type BOOLEAN | ||
1011 | count 1 | ||
1012 | } | ||
1013 | } | ||
1014 | control.82 { | ||
1015 | iface MIXER | ||
1016 | name 'SPKOUTL Mixer DACR Switch' | ||
1017 | value false | ||
1018 | comment { | ||
1019 | access 'read write' | ||
1020 | type BOOLEAN | ||
1021 | count 1 | ||
1022 | } | ||
1023 | } | ||
1024 | control.83 { | ||
1025 | iface MIXER | ||
1026 | name 'SPKOUTL Mixer MIXINL Switch' | ||
1027 | value false | ||
1028 | comment { | ||
1029 | access 'read write' | ||
1030 | type BOOLEAN | ||
1031 | count 1 | ||
1032 | } | ||
1033 | } | ||
1034 | control.84 { | ||
1035 | iface MIXER | ||
1036 | name 'SPKOUTL Mixer MIXINR Switch' | ||
1037 | value false | ||
1038 | comment { | ||
1039 | access 'read write' | ||
1040 | type BOOLEAN | ||
1041 | count 1 | ||
1042 | } | ||
1043 | } | ||
1044 | control.85 { | ||
1045 | iface MIXER | ||
1046 | name 'SPKOUTL Mixer IN4L Switch' | ||
1047 | value false | ||
1048 | comment { | ||
1049 | access 'read write' | ||
1050 | type BOOLEAN | ||
1051 | count 1 | ||
1052 | } | ||
1053 | } | ||
1054 | control.86 { | ||
1055 | iface MIXER | ||
1056 | name 'SPKOUTL Mixer IN4R Switch' | ||
1057 | value false | ||
1058 | comment { | ||
1059 | access 'read write' | ||
1060 | type BOOLEAN | ||
1061 | count 1 | ||
1062 | } | ||
1063 | } | ||
1064 | control.87 { | ||
1065 | iface MIXER | ||
1066 | name 'HPOUTR PGA' | ||
1067 | value DAC | ||
1068 | comment { | ||
1069 | access 'read write' | ||
1070 | type ENUMERATED | ||
1071 | count 1 | ||
1072 | item.0 DAC | ||
1073 | item.1 Mixer | ||
1074 | } | ||
1075 | } | ||
1076 | control.88 { | ||
1077 | iface MIXER | ||
1078 | name 'HPOUTL PGA' | ||
1079 | value DAC | ||
1080 | comment { | ||
1081 | access 'read write' | ||
1082 | type ENUMERATED | ||
1083 | count 1 | ||
1084 | item.0 DAC | ||
1085 | item.1 Mixer | ||
1086 | } | ||
1087 | } | ||
1088 | control.89 { | ||
1089 | iface MIXER | ||
1090 | name 'HPMIXR DACL Switch' | ||
1091 | value false | ||
1092 | comment { | ||
1093 | access 'read write' | ||
1094 | type BOOLEAN | ||
1095 | count 1 | ||
1096 | } | ||
1097 | } | ||
1098 | control.90 { | ||
1099 | iface MIXER | ||
1100 | name 'HPMIXR DACR Switch' | ||
1101 | value false | ||
1102 | comment { | ||
1103 | access 'read write' | ||
1104 | type BOOLEAN | ||
1105 | count 1 | ||
1106 | } | ||
1107 | } | ||
1108 | control.91 { | ||
1109 | iface MIXER | ||
1110 | name 'HPMIXR MIXINL Switch' | ||
1111 | value false | ||
1112 | comment { | ||
1113 | access 'read write' | ||
1114 | type BOOLEAN | ||
1115 | count 1 | ||
1116 | } | ||
1117 | } | ||
1118 | control.92 { | ||
1119 | iface MIXER | ||
1120 | name 'HPMIXR MIXINR Switch' | ||
1121 | value false | ||
1122 | comment { | ||
1123 | access 'read write' | ||
1124 | type BOOLEAN | ||
1125 | count 1 | ||
1126 | } | ||
1127 | } | ||
1128 | control.93 { | ||
1129 | iface MIXER | ||
1130 | name 'HPMIXR IN4L Switch' | ||
1131 | value false | ||
1132 | comment { | ||
1133 | access 'read write' | ||
1134 | type BOOLEAN | ||
1135 | count 1 | ||
1136 | } | ||
1137 | } | ||
1138 | control.94 { | ||
1139 | iface MIXER | ||
1140 | name 'HPMIXR IN4R Switch' | ||
1141 | value false | ||
1142 | comment { | ||
1143 | access 'read write' | ||
1144 | type BOOLEAN | ||
1145 | count 1 | ||
1146 | } | ||
1147 | } | ||
1148 | control.95 { | ||
1149 | iface MIXER | ||
1150 | name 'HPMIXL DACL Switch' | ||
1151 | value false | ||
1152 | comment { | ||
1153 | access 'read write' | ||
1154 | type BOOLEAN | ||
1155 | count 1 | ||
1156 | } | ||
1157 | } | ||
1158 | control.96 { | ||
1159 | iface MIXER | ||
1160 | name 'HPMIXL DACR Switch' | ||
1161 | value false | ||
1162 | comment { | ||
1163 | access 'read write' | ||
1164 | type BOOLEAN | ||
1165 | count 1 | ||
1166 | } | ||
1167 | } | ||
1168 | control.97 { | ||
1169 | iface MIXER | ||
1170 | name 'HPMIXL MIXINL Switch' | ||
1171 | value false | ||
1172 | comment { | ||
1173 | access 'read write' | ||
1174 | type BOOLEAN | ||
1175 | count 1 | ||
1176 | } | ||
1177 | } | ||
1178 | control.98 { | ||
1179 | iface MIXER | ||
1180 | name 'HPMIXL MIXINR Switch' | ||
1181 | value false | ||
1182 | comment { | ||
1183 | access 'read write' | ||
1184 | type BOOLEAN | ||
1185 | count 1 | ||
1186 | } | ||
1187 | } | ||
1188 | control.99 { | ||
1189 | iface MIXER | ||
1190 | name 'HPMIXL IN4L Switch' | ||
1191 | value false | ||
1192 | comment { | ||
1193 | access 'read write' | ||
1194 | type BOOLEAN | ||
1195 | count 1 | ||
1196 | } | ||
1197 | } | ||
1198 | control.100 { | ||
1199 | iface MIXER | ||
1200 | name 'HPMIXL IN4R Switch' | ||
1201 | value false | ||
1202 | comment { | ||
1203 | access 'read write' | ||
1204 | type BOOLEAN | ||
1205 | count 1 | ||
1206 | } | ||
1207 | } | ||
1208 | control.101 { | ||
1209 | iface MIXER | ||
1210 | name STR | ||
1211 | value None | ||
1212 | comment { | ||
1213 | access 'read write' | ||
1214 | type ENUMERATED | ||
1215 | count 1 | ||
1216 | item.0 None | ||
1217 | item.1 Left | ||
1218 | item.2 Right | ||
1219 | } | ||
1220 | } | ||
1221 | control.102 { | ||
1222 | iface MIXER | ||
1223 | name STL | ||
1224 | value None | ||
1225 | comment { | ||
1226 | access 'read write' | ||
1227 | type ENUMERATED | ||
1228 | count 1 | ||
1229 | item.0 None | ||
1230 | item.1 Left | ||
1231 | item.2 Right | ||
1232 | } | ||
1233 | } | ||
1234 | control.103 { | ||
1235 | iface MIXER | ||
1236 | name 'MIXINR IN2R Switch' | ||
1237 | value false | ||
1238 | comment { | ||
1239 | access 'read write' | ||
1240 | type BOOLEAN | ||
1241 | count 1 | ||
1242 | } | ||
1243 | } | ||
1244 | control.104 { | ||
1245 | iface MIXER | ||
1246 | name 'MIXINR IN3R Switch' | ||
1247 | value false | ||
1248 | comment { | ||
1249 | access 'read write' | ||
1250 | type BOOLEAN | ||
1251 | count 1 | ||
1252 | } | ||
1253 | } | ||
1254 | control.105 { | ||
1255 | iface MIXER | ||
1256 | name 'MIXINR PGA Switch' | ||
1257 | value true | ||
1258 | comment { | ||
1259 | access 'read write' | ||
1260 | type BOOLEAN | ||
1261 | count 1 | ||
1262 | } | ||
1263 | } | ||
1264 | control.106 { | ||
1265 | iface MIXER | ||
1266 | name 'MIXINL IN2L Switch' | ||
1267 | value false | ||
1268 | comment { | ||
1269 | access 'read write' | ||
1270 | type BOOLEAN | ||
1271 | count 1 | ||
1272 | } | ||
1273 | } | ||
1274 | control.107 { | ||
1275 | iface MIXER | ||
1276 | name 'MIXINL IN3L Switch' | ||
1277 | value false | ||
1278 | comment { | ||
1279 | access 'read write' | ||
1280 | type BOOLEAN | ||
1281 | count 1 | ||
1282 | } | ||
1283 | } | ||
1284 | control.108 { | ||
1285 | iface MIXER | ||
1286 | name 'MIXINL PGA Switch' | ||
1287 | value true | ||
1288 | comment { | ||
1289 | access 'read write' | ||
1290 | type BOOLEAN | ||
1291 | count 1 | ||
1292 | } | ||
1293 | } | ||
1294 | control.109 { | ||
1295 | iface MIXER | ||
1296 | name 'INPGAR IN1R Switch' | ||
1297 | value true | ||
1298 | comment { | ||
1299 | access 'read write' | ||
1300 | type BOOLEAN | ||
1301 | count 1 | ||
1302 | } | ||
1303 | } | ||
1304 | control.110 { | ||
1305 | iface MIXER | ||
1306 | name 'INPGAR IN2R Switch' | ||
1307 | value false | ||
1308 | comment { | ||
1309 | access 'read write' | ||
1310 | type BOOLEAN | ||
1311 | count 1 | ||
1312 | } | ||
1313 | } | ||
1314 | control.111 { | ||
1315 | iface MIXER | ||
1316 | name 'INPGAR IN3R Switch' | ||
1317 | value false | ||
1318 | comment { | ||
1319 | access 'read write' | ||
1320 | type BOOLEAN | ||
1321 | count 1 | ||
1322 | } | ||
1323 | } | ||
1324 | control.112 { | ||
1325 | iface MIXER | ||
1326 | name 'INPGAR IN4R Switch' | ||
1327 | value false | ||
1328 | comment { | ||
1329 | access 'read write' | ||
1330 | type BOOLEAN | ||
1331 | count 1 | ||
1332 | } | ||
1333 | } | ||
1334 | control.113 { | ||
1335 | iface MIXER | ||
1336 | name 'INPGAL IN1L Switch' | ||
1337 | value true | ||
1338 | comment { | ||
1339 | access 'read write' | ||
1340 | type BOOLEAN | ||
1341 | count 1 | ||
1342 | } | ||
1343 | } | ||
1344 | control.114 { | ||
1345 | iface MIXER | ||
1346 | name 'INPGAL IN2L Switch' | ||
1347 | value false | ||
1348 | comment { | ||
1349 | access 'read write' | ||
1350 | type BOOLEAN | ||
1351 | count 1 | ||
1352 | } | ||
1353 | } | ||
1354 | control.115 { | ||
1355 | iface MIXER | ||
1356 | name 'INPGAL IN3L Switch' | ||
1357 | value false | ||
1358 | comment { | ||
1359 | access 'read write' | ||
1360 | type BOOLEAN | ||
1361 | count 1 | ||
1362 | } | ||
1363 | } | ||
1364 | control.116 { | ||
1365 | iface MIXER | ||
1366 | name 'INPGAL IN4L Switch' | ||
1367 | value false | ||
1368 | comment { | ||
1369 | access 'read write' | ||
1370 | type BOOLEAN | ||
1371 | count 1 | ||
1372 | } | ||
1373 | } | ||
1374 | } | ||
diff --git a/meta-fsl-arm/recipes-bsp/alsa-state/alsa-state/mxs/asound.conf b/meta-fsl-arm/recipes-bsp/alsa-state/alsa-state/mxs/asound.conf deleted file mode 100644 index 39cb3961..00000000 --- a/meta-fsl-arm/recipes-bsp/alsa-state/alsa-state/mxs/asound.conf +++ /dev/null | |||
@@ -1,299 +0,0 @@ | |||
1 | defaults.pcm.rate_converter "linear" | ||
2 | |||
3 | pcm.dmix_48000{ | ||
4 | type plug | ||
5 | slave.pcm{ | ||
6 | type dmix | ||
7 | ipc_key 5678293 | ||
8 | ipc_key_add_uid yes | ||
9 | slave{ | ||
10 | pcm "hw:0,0" | ||
11 | period_time 0 | ||
12 | period_size 2048 | ||
13 | buffer_size 24576 | ||
14 | format S16_LE | ||
15 | rate 48000 | ||
16 | } | ||
17 | } | ||
18 | } | ||
19 | |||
20 | pcm.dmix_44100{ | ||
21 | type dmix | ||
22 | ipc_key 5678293 | ||
23 | ipc_key_add_uid yes | ||
24 | slave{ | ||
25 | pcm "hw:0,0" | ||
26 | period_time 0 | ||
27 | period_size 2048 | ||
28 | buffer_size 24576 | ||
29 | format S16_LE | ||
30 | rate 44100 | ||
31 | } | ||
32 | } | ||
33 | |||
34 | pcm.dmix_32000{ | ||
35 | type plug | ||
36 | slave.pcm{ | ||
37 | type dmix | ||
38 | ipc_key 5678293 | ||
39 | ipc_key_add_uid yes | ||
40 | slave{ | ||
41 | pcm "hw:0,0" | ||
42 | period_time 0 | ||
43 | period_size 2048 | ||
44 | buffer_size 24576 | ||
45 | format S16_LE | ||
46 | rate 32000 | ||
47 | } | ||
48 | } | ||
49 | } | ||
50 | |||
51 | pcm.dmix_24000{ | ||
52 | type plug | ||
53 | slave.pcm{ | ||
54 | type dmix | ||
55 | ipc_key 5678293 | ||
56 | ipc_key_add_uid yes | ||
57 | slave{ | ||
58 | pcm "hw:0,0" | ||
59 | period_time 0 | ||
60 | period_size 2048 | ||
61 | buffer_size 24576 | ||
62 | format S16_LE | ||
63 | rate 24000 | ||
64 | } | ||
65 | } | ||
66 | } | ||
67 | |||
68 | pcm.dmix_22050{ | ||
69 | type plug | ||
70 | slave.pcm{ | ||
71 | type dmix | ||
72 | ipc_key 5678293 | ||
73 | ipc_key_add_uid yes | ||
74 | slave{ | ||
75 | pcm "hw:0,0" | ||
76 | period_time 0 | ||
77 | period_size 2048 | ||
78 | buffer_size 24576 | ||
79 | format S16_LE | ||
80 | rate 22050 | ||
81 | } | ||
82 | } | ||
83 | } | ||
84 | |||
85 | pcm.dmix_16000{ | ||
86 | type plug | ||
87 | slave.pcm{ | ||
88 | type dmix | ||
89 | ipc_key 5678293 | ||
90 | ipc_key_add_uid yes | ||
91 | slave{ | ||
92 | pcm "hw:0,0" | ||
93 | period_time 0 | ||
94 | period_size 2048 | ||
95 | buffer_size 24576 | ||
96 | format S16_LE | ||
97 | rate 16000 | ||
98 | } | ||
99 | } | ||
100 | } | ||
101 | |||
102 | pcm.dmix_12000{ | ||
103 | type plug | ||
104 | slave.pcm{ | ||
105 | type dmix | ||
106 | ipc_key 5678293 | ||
107 | ipc_key_add_uid yes | ||
108 | slave{ | ||
109 | pcm "hw:0,0" | ||
110 | period_time 0 | ||
111 | period_size 2048 | ||
112 | buffer_size 24576 | ||
113 | format S16_LE | ||
114 | rate 12000 | ||
115 | } | ||
116 | } | ||
117 | } | ||
118 | |||
119 | pcm.dmix_11025{ | ||
120 | type plug | ||
121 | slave.pcm{ | ||
122 | type dmix | ||
123 | ipc_key 5678293 | ||
124 | ipc_key_add_uid yes | ||
125 | slave{ | ||
126 | pcm "hw:0,0" | ||
127 | period_time 0 | ||
128 | period_size 2048 | ||
129 | buffer_size 24576 | ||
130 | format S16_LE | ||
131 | rate 11025 | ||
132 | } | ||
133 | } | ||
134 | } | ||
135 | |||
136 | pcm.dmix_8000{ | ||
137 | type plug | ||
138 | slave.pcm{ | ||
139 | type dmix | ||
140 | ipc_key 5678293 | ||
141 | ipc_key_add_uid yes | ||
142 | slave{ | ||
143 | pcm "hw:0,0" | ||
144 | period_time 0 | ||
145 | period_size 2048 | ||
146 | buffer_size 24576 | ||
147 | format S16_LE | ||
148 | rate 8000 | ||
149 | } | ||
150 | } | ||
151 | } | ||
152 | |||
153 | pcm.!dsnoop_48000{ | ||
154 | type dsnoop | ||
155 | ipc_key 5778293 | ||
156 | ipc_key_add_uid yes | ||
157 | slave{ | ||
158 | pcm "hw:0,0" | ||
159 | period_time 0 | ||
160 | period_size 2048 | ||
161 | buffer_size 24576 | ||
162 | format S16_LE | ||
163 | rate 48000 | ||
164 | } | ||
165 | } | ||
166 | |||
167 | pcm.!dsnoop_44100{ | ||
168 | type dsnoop | ||
169 | ipc_key 5778293 | ||
170 | ipc_key_add_uid yes | ||
171 | slave{ | ||
172 | pcm "hw:0,0" | ||
173 | period_time 0 | ||
174 | period_size 2048 | ||
175 | buffer_size 24576 | ||
176 | format S16_LE | ||
177 | rate 44100 | ||
178 | } | ||
179 | } | ||
180 | |||
181 | pcm.!dsnoop_32000{ | ||
182 | type dsnoop | ||
183 | ipc_key 5778293 | ||
184 | ipc_key_add_uid yes | ||
185 | slave{ | ||
186 | pcm "hw:0,0" | ||
187 | period_time 0 | ||
188 | period_size 2048 | ||
189 | buffer_size 24576 | ||
190 | format S16_LE | ||
191 | rate 32000 | ||
192 | } | ||
193 | } | ||
194 | |||
195 | pcm.!dsnoop_24000{ | ||
196 | type dsnoop | ||
197 | ipc_key 5778293 | ||
198 | ipc_key_add_uid yes | ||
199 | slave{ | ||
200 | pcm "hw:0,0" | ||
201 | period_time 0 | ||
202 | period_size 2048 | ||
203 | buffer_size 24576 | ||
204 | format S16_LE | ||
205 | rate 24000 | ||
206 | } | ||
207 | } | ||
208 | |||
209 | pcm.!dsnoop_22050{ | ||
210 | type dsnoop | ||
211 | ipc_key 5778293 | ||
212 | ipc_key_add_uid yes | ||
213 | slave{ | ||
214 | pcm "hw:0,0" | ||
215 | period_time 0 | ||
216 | period_size 2048 | ||
217 | buffer_size 24576 | ||
218 | format S16_LE | ||
219 | rate 22050 | ||
220 | } | ||
221 | } | ||
222 | |||
223 | pcm.!dsnoop_16000{ | ||
224 | type dsnoop | ||
225 | ipc_key 5778293 | ||
226 | ipc_key_add_uid yes | ||
227 | slave{ | ||
228 | pcm "hw:0,0" | ||
229 | period_time 0 | ||
230 | period_size 2048 | ||
231 | buffer_size 24576 | ||
232 | format S16_LE | ||
233 | rate 16000 | ||
234 | } | ||
235 | } | ||
236 | |||
237 | pcm.!dsnoop_12000{ | ||
238 | type dsnoop | ||
239 | ipc_key 5778293 | ||
240 | ipc_key_add_uid yes | ||
241 | slave{ | ||
242 | pcm "hw:0,0" | ||
243 | period_time 0 | ||
244 | period_size 2048 | ||
245 | buffer_size 24576 | ||
246 | format S16_LE | ||
247 | rate 12000 | ||
248 | } | ||
249 | } | ||
250 | |||
251 | pcm.!dsnoop_11025{ | ||
252 | type dsnoop | ||
253 | ipc_key 5778293 | ||
254 | ipc_key_add_uid yes | ||
255 | slave{ | ||
256 | pcm "hw:0,0" | ||
257 | period_time 0 | ||
258 | period_size 2048 | ||
259 | buffer_size 24576 | ||
260 | format S16_LE | ||
261 | rate 11025 | ||
262 | } | ||
263 | } | ||
264 | |||
265 | pcm.!dsnoop_8000{ | ||
266 | type dsnoop | ||
267 | ipc_key 5778293 | ||
268 | ipc_key_add_uid yes | ||
269 | slave{ | ||
270 | pcm "hw:0,0" | ||
271 | period_time 0 | ||
272 | period_size 2048 | ||
273 | buffer_size 24576 | ||
274 | format S16_LE | ||
275 | rate 8000 | ||
276 | } | ||
277 | } | ||
278 | |||
279 | pcm.asymed{ | ||
280 | type asym | ||
281 | playback.pcm "dmix_44100" | ||
282 | capture.pcm "dsnoop_44100" | ||
283 | } | ||
284 | |||
285 | pcm.dsp0{ | ||
286 | type plug | ||
287 | slave.pcm "asymed" | ||
288 | } | ||
289 | |||
290 | pcm.!default{ | ||
291 | type plug | ||
292 | route_policy "average" | ||
293 | slave.pcm "asymed" | ||
294 | } | ||
295 | |||
296 | ctl.mixer0{ | ||
297 | type hw | ||
298 | card 0 | ||
299 | } | ||
diff --git a/meta-fsl-arm/recipes-bsp/alsa-state/alsa-state/mxs/asound.state b/meta-fsl-arm/recipes-bsp/alsa-state/alsa-state/mxs/asound.state deleted file mode 100644 index d508cc36..00000000 --- a/meta-fsl-arm/recipes-bsp/alsa-state/alsa-state/mxs/asound.state +++ /dev/null | |||
@@ -1,191 +0,0 @@ | |||
1 | state.mxsevk { | ||
2 | control.1 { | ||
3 | iface MIXER | ||
4 | name 'MIC GAIN' | ||
5 | value '0dB' | ||
6 | comment { | ||
7 | access 'read write' | ||
8 | type ENUMERATED | ||
9 | count 1 | ||
10 | item.0 '0dB' | ||
11 | item.1 '20dB' | ||
12 | item.2 '30dB' | ||
13 | item.3 '40dB' | ||
14 | } | ||
15 | } | ||
16 | control.2 { | ||
17 | iface MIXER | ||
18 | name 'Capture Volume' | ||
19 | value.0 12 | ||
20 | value.1 12 | ||
21 | comment { | ||
22 | access 'read write' | ||
23 | type INTEGER | ||
24 | count 2 | ||
25 | range '0 - 15' | ||
26 | } | ||
27 | } | ||
28 | control.3 { | ||
29 | iface MIXER | ||
30 | name 'Capture Vol Reduction' | ||
31 | value 'No Change' | ||
32 | comment { | ||
33 | access 'read write' | ||
34 | type ENUMERATED | ||
35 | count 1 | ||
36 | item.0 'No Change' | ||
37 | item.1 'Reduced by 6dB' | ||
38 | } | ||
39 | } | ||
40 | control.4 { | ||
41 | iface MIXER | ||
42 | name 'Playback Volume' | ||
43 | value.0 156 | ||
44 | value.1 156 | ||
45 | comment { | ||
46 | access 'read write' | ||
47 | type INTEGER | ||
48 | count 2 | ||
49 | range '0 - 192' | ||
50 | } | ||
51 | } | ||
52 | control.5 { | ||
53 | iface MIXER | ||
54 | name 'Headphone Volume' | ||
55 | value.0 127 | ||
56 | value.1 127 | ||
57 | comment { | ||
58 | access 'read write' | ||
59 | type INTEGER | ||
60 | count 2 | ||
61 | range '0 - 127' | ||
62 | } | ||
63 | } | ||
64 | control.6 { | ||
65 | iface MIXER | ||
66 | name 'DAC Mux' | ||
67 | value DAC | ||
68 | comment { | ||
69 | access 'read write' | ||
70 | type ENUMERATED | ||
71 | count 1 | ||
72 | item.0 DAC | ||
73 | item.1 LINE_IN | ||
74 | } | ||
75 | } | ||
76 | control.7 { | ||
77 | iface MIXER | ||
78 | name 'ADC Mux' | ||
79 | value MIC_IN | ||
80 | comment { | ||
81 | access 'read write' | ||
82 | type ENUMERATED | ||
83 | count 1 | ||
84 | item.0 MIC_IN | ||
85 | item.1 LINE_IN | ||
86 | } | ||
87 | } | ||
88 | } | ||
89 | state.mxsevk_1 { | ||
90 | control.1 { | ||
91 | iface MIXER | ||
92 | name PRO | ||
93 | value false | ||
94 | comment { | ||
95 | access 'read write' | ||
96 | type BOOLEAN | ||
97 | count 1 | ||
98 | } | ||
99 | } | ||
100 | control.2 { | ||
101 | iface MIXER | ||
102 | name AUDIO | ||
103 | value false | ||
104 | comment { | ||
105 | access 'read write' | ||
106 | type BOOLEAN | ||
107 | count 1 | ||
108 | } | ||
109 | } | ||
110 | control.3 { | ||
111 | iface MIXER | ||
112 | name COPY | ||
113 | value false | ||
114 | comment { | ||
115 | access 'read write' | ||
116 | type BOOLEAN | ||
117 | count 1 | ||
118 | } | ||
119 | } | ||
120 | control.4 { | ||
121 | iface MIXER | ||
122 | name PRE | ||
123 | value false | ||
124 | comment { | ||
125 | access 'read write' | ||
126 | type BOOLEAN | ||
127 | count 1 | ||
128 | } | ||
129 | } | ||
130 | control.5 { | ||
131 | iface MIXER | ||
132 | name CC | ||
133 | value 0 | ||
134 | comment { | ||
135 | access 'read write' | ||
136 | type INTEGER | ||
137 | count 1 | ||
138 | range '0 - 127' | ||
139 | } | ||
140 | } | ||
141 | control.6 { | ||
142 | iface MIXER | ||
143 | name L | ||
144 | value false | ||
145 | comment { | ||
146 | access 'read write' | ||
147 | type BOOLEAN | ||
148 | count 1 | ||
149 | } | ||
150 | } | ||
151 | control.7 { | ||
152 | iface MIXER | ||
153 | name V | ||
154 | value false | ||
155 | comment { | ||
156 | access 'read write' | ||
157 | type BOOLEAN | ||
158 | count 1 | ||
159 | } | ||
160 | } | ||
161 | control.8 { | ||
162 | iface MIXER | ||
163 | name 'USER DATA' | ||
164 | value false | ||
165 | comment { | ||
166 | access 'read write' | ||
167 | type BOOLEAN | ||
168 | count 1 | ||
169 | } | ||
170 | } | ||
171 | control.9 { | ||
172 | iface MIXER | ||
173 | name 'AUTO MUTE' | ||
174 | value false | ||
175 | comment { | ||
176 | access 'read write' | ||
177 | type BOOLEAN | ||
178 | count 1 | ||
179 | } | ||
180 | } | ||
181 | control.10 { | ||
182 | iface MIXER | ||
183 | name 'V CONFIG' | ||
184 | value false | ||
185 | comment { | ||
186 | access 'read write' | ||
187 | type BOOLEAN | ||
188 | count 1 | ||
189 | } | ||
190 | } | ||
191 | } | ||
diff --git a/meta-fsl-arm/recipes-bsp/apptrk/apptrk/apptrk-install-create-all-components-of-DEST.patch b/meta-fsl-arm/recipes-bsp/apptrk/apptrk/apptrk-install-create-all-components-of-DEST.patch deleted file mode 100644 index 6b4a0e83..00000000 --- a/meta-fsl-arm/recipes-bsp/apptrk/apptrk/apptrk-install-create-all-components-of-DEST.patch +++ /dev/null | |||
@@ -1,24 +0,0 @@ | |||
1 | Upstream-Status: Pending | ||
2 | |||
3 | Signed-off-by: Chunrong Guo <B40290@freescale.com> | ||
4 | |||
5 | |||
6 | for fix the following error: | ||
7 | |install: cannot create regular file /usr/bin/apptrk | ||
8 | |No such file or directory | ||
9 | |||
10 | |||
11 | --- a/Makefileold 2014-12-21 23:46:26.872329032 -0600 | ||
12 | +++ b/Makefile 2014-12-21 23:47:33.724326646 -0600 | ||
13 | @@ -89,9 +89,9 @@ | ||
14 | # Other Targets | ||
15 | install: all | ||
16 | if [ -f $(DESTDIR)/usr/bin/apptrk ]; then rm -f $(DESTDIR)/usr/bin/apptrk ; fi | ||
17 | - install $(OUTPUT) $(DESTDIR)/usr/bin/apptrk | ||
18 | + install -D $(OUTPUT) $(DESTDIR)/usr/bin/apptrk | ||
19 | if [ -f $(DESTDIR)/usr/bin/apptrk_debug ]; then rm -f $(DESTDIR)/usr/bin/apptrk_debug ; fi | ||
20 | - install $(OUTPUT_DBG) $(DESTDIR)/usr/bin/apptrk_debug | ||
21 | + install -D $(OUTPUT_DBG) $(DESTDIR)/usr/bin/apptrk_debug | ||
22 | |||
23 | clean: | ||
24 | -$(RM) $(OBJS)$(OBJS_DBG)$(EXECUTABLES)$(C_DEPS)$(C_DEPS_DBG) $(OUTPUT) $(OUTPUT_DBG) | ||
diff --git a/meta-fsl-arm/recipes-bsp/apptrk/apptrk/no-strip.patch b/meta-fsl-arm/recipes-bsp/apptrk/apptrk/no-strip.patch deleted file mode 100644 index a8cf6205..00000000 --- a/meta-fsl-arm/recipes-bsp/apptrk/apptrk/no-strip.patch +++ /dev/null | |||
@@ -1,20 +0,0 @@ | |||
1 | Disable stripping of binaries | ||
2 | |||
3 | We don't want to strip these as this is handled separately at package | ||
4 | time. | ||
5 | |||
6 | Upstream-Status: Inappropriate [configuration] | ||
7 | |||
8 | Signed-off-by: Chunrong Guo <B40290@freescale.com> | ||
9 | |||
10 | --- a/Makefileold 2015-01-07 03:45:32.786477574 -0600 | ||
11 | +++ b/Makefile 2015-01-07 03:46:28.426475588 -0600 | ||
12 | @@ -62,7 +62,7 @@ | ||
13 | # CFLAGS += -DENABLE_64BIT_SUPPORT | ||
14 | |||
15 | |||
16 | -LDFLAGS += -s | ||
17 | + | ||
18 | |||
19 | # Add inputs and outputs from these tool invocations to the build variables | ||
20 | |||
diff --git a/meta-fsl-arm/recipes-bsp/apptrk/apptrk_git.bb b/meta-fsl-arm/recipes-bsp/apptrk/apptrk_git.bb deleted file mode 100644 index 4453cf87..00000000 --- a/meta-fsl-arm/recipes-bsp/apptrk/apptrk_git.bb +++ /dev/null | |||
@@ -1,24 +0,0 @@ | |||
1 | SUMMARY = "Debug agent for Freescale CodeWarrior" | ||
2 | SECTION = "apptrk" | ||
3 | LICENSE = "Freescale-EULA" | ||
4 | LIC_FILES_CHKSUM = "file://COPYING;md5=95560debfde180684364319811cc1421" | ||
5 | |||
6 | DEPENDS = "elfutils" | ||
7 | |||
8 | inherit kernel-arch | ||
9 | |||
10 | SRC_URI = "git://git.freescale.com/ppc/sdk/apptrk.git;nobranch=1 \ | ||
11 | file://apptrk-install-create-all-components-of-DEST.patch \ | ||
12 | file://no-strip.patch \ | ||
13 | " | ||
14 | SRCREV = "cbed10997c5e2a4aaa004fb0e1efec858bf1bbe1" | ||
15 | |||
16 | S = "${WORKDIR}/git" | ||
17 | |||
18 | EXTRA_OEMAKE = "" | ||
19 | |||
20 | CFLAGS += " -I${STAGING_INCDIR}" | ||
21 | |||
22 | do_install() { | ||
23 | oe_runmake install DESTDIR=${D} | ||
24 | } | ||
diff --git a/meta-fsl-arm/recipes-bsp/barebox/barebox.inc b/meta-fsl-arm/recipes-bsp/barebox/barebox.inc deleted file mode 100644 index 0d5c127b..00000000 --- a/meta-fsl-arm/recipes-bsp/barebox/barebox.inc +++ /dev/null | |||
@@ -1,63 +0,0 @@ | |||
1 | DESCRIPTION = "Barebox - a bootloader that inherits the best of U-Boot and the Linux kernel" | ||
2 | HOMEPAGE = "http://www.barebox.org/" | ||
3 | SECTION = "bootloader" | ||
4 | PROVIDES = "virtual/bootloader" | ||
5 | PRIORITY = "optional" | ||
6 | LICENSE = "GPLv2" | ||
7 | LIC_FILES_CHKSUM = "file://COPYING;md5=057bf9e50e1ca857d0eb97bfe4ba8e5d" | ||
8 | |||
9 | PACKAGE_ARCH = "${MACHINE_ARCH}" | ||
10 | |||
11 | inherit kernel-arch | ||
12 | |||
13 | EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX}" | ||
14 | |||
15 | BAREBOX_BINARY ?= "barebox.bin" | ||
16 | BAREBOX_IMAGE ?= "barebox-${MACHINE}-${PV}-${PR}.bin" | ||
17 | BAREBOXENV_BIN ?= "bareboxenv-${MACHINE}-${PV}-${PR}.bin" | ||
18 | BAREBOX_SYMLINK ?= "barebox-${MACHINE}.bin" | ||
19 | BAREBOXENV_SYMLINK ?= "bareboxenv-${MACHINE}.bin" | ||
20 | |||
21 | INSANE_SKIP_${PN} = "True" | ||
22 | |||
23 | do_pre_configure() { | ||
24 | cp ${WORKDIR}/defconfig ${S}/.config | ||
25 | oe_runmake oldconfig | ||
26 | } | ||
27 | addtask pre_configure before do_configure after do_patch | ||
28 | |||
29 | do_compile () { | ||
30 | if [ "${@base_contains('DISTRO_FEATURES', 'ld-is-gold', 'ld-is-gold', '', d)}" = "ld-is-gold" ] ; then | ||
31 | sed -i 's/$(CROSS_COMPILE)ld/$(CROSS_COMPILE)ld.bfd/g' Makefile | ||
32 | fi | ||
33 | unset LDFLAGS | ||
34 | unset CFLAGS | ||
35 | unset CPPFLAGS | ||
36 | oe_runmake all | ||
37 | } | ||
38 | |||
39 | do_deploy () { | ||
40 | install -d ${DEPLOY_DIR_IMAGE} | ||
41 | install ${S}/${BAREBOX_BINARY} ${DEPLOY_DIR_IMAGE}/${BAREBOX_IMAGE} | ||
42 | |||
43 | cd ${DEPLOY_DIR_IMAGE} | ||
44 | rm -f ${BAREBOX_SYMLINK} | ||
45 | ln -sf ${BAREBOX_IMAGE} ${BAREBOX_SYMLINK} | ||
46 | |||
47 | install -d ${STAGING_BINDIR_NATIVE} | ||
48 | cd ${S} | ||
49 | install -m 755 scripts/mkimage ${STAGING_BINDIR_NATIVE}/ | ||
50 | install -m 755 scripts/bareboxenv ${STAGING_BINDIR_NATIVE}/ | ||
51 | } | ||
52 | |||
53 | do_deploy[dirs] = "${S}" | ||
54 | addtask deploy before do_build after do_compile | ||
55 | |||
56 | do_env_deploy() { | ||
57 | install ${S}/common/barebox_default_env ${DEPLOY_DIR_IMAGE}/${BAREBOXENV_BIN} | ||
58 | |||
59 | cd ${DEPLOY_DIR_IMAGE} | ||
60 | rm -f ${BAREBOXENV_SYMLINK} | ||
61 | ln -sf ${BAREBOXENV_BIN} ${BAREBOXENV_SYMLINK} | ||
62 | } | ||
63 | addtask env_deploy before do_build after do_deploy | ||
diff --git a/meta-fsl-arm/recipes-bsp/barebox/barebox_2013.08.0.bb b/meta-fsl-arm/recipes-bsp/barebox/barebox_2013.08.0.bb deleted file mode 100644 index e4e37179..00000000 --- a/meta-fsl-arm/recipes-bsp/barebox/barebox_2013.08.0.bb +++ /dev/null | |||
@@ -1,9 +0,0 @@ | |||
1 | require recipes-bsp/barebox/barebox.inc | ||
2 | |||
3 | SRC_URI = "http://barebox.org/download/${PN}-${PV}.tar.bz2 \ | ||
4 | file://defconfig" | ||
5 | |||
6 | SRC_URI[md5sum] = "a61b97a2fedebc808d4b182c2ca18a0c" | ||
7 | SRC_URI[sha256sum] = "d9e46dd3c68b04ab4cbc37135dc34907dbebef393da4b3e54abb203c295c1620" | ||
8 | |||
9 | COMPATIBLE_MACHINE = "Invalid!" | ||
diff --git a/meta-fsl-arm/recipes-bsp/change-file-endianess/change-file-endianess.bb b/meta-fsl-arm/recipes-bsp/change-file-endianess/change-file-endianess.bb deleted file mode 100644 index 2ad8c588..00000000 --- a/meta-fsl-arm/recipes-bsp/change-file-endianess/change-file-endianess.bb +++ /dev/null | |||
@@ -1,23 +0,0 @@ | |||
1 | DESCRIPTION = "provides the tcl script for endian swap" | ||
2 | LICENSE = "MIT" | ||
3 | LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=4d92cd373abda3937c2bc47fbc49d690 \ | ||
4 | file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" | ||
5 | |||
6 | |||
7 | SRC_URI = "file://byte_swap.tcl" | ||
8 | |||
9 | RDEPENDS += "tcl-native" | ||
10 | |||
11 | inherit native | ||
12 | |||
13 | S = "${WORKDIR}" | ||
14 | |||
15 | do_configure[noexec] = "1" | ||
16 | do_compile[noexec] = "1" | ||
17 | |||
18 | do_install () { | ||
19 | install -d ${D}/${bindir} | ||
20 | install -m 755 ${WORKDIR}/byte_swap.tcl ${D}/${bindir} | ||
21 | } | ||
22 | |||
23 | BBCLASSEXTEND = "native nativesdk" | ||
diff --git a/meta-fsl-arm/recipes-bsp/change-file-endianess/change-file-endianess/byte_swap.tcl b/meta-fsl-arm/recipes-bsp/change-file-endianess/change-file-endianess/byte_swap.tcl deleted file mode 100755 index aca956bd..00000000 --- a/meta-fsl-arm/recipes-bsp/change-file-endianess/change-file-endianess/byte_swap.tcl +++ /dev/null | |||
@@ -1,29 +0,0 @@ | |||
1 | puts $argv | ||
2 | set i_file [lindex $argv 0] | ||
3 | set o_file [lindex $argv 1] | ||
4 | set num_b [lindex $argv 2] | ||
5 | puts "" | ||
6 | |||
7 | set fileid_i [open $i_file "r"] | ||
8 | set fileid_o [open $o_file "w+"] | ||
9 | fconfigure $fileid_i -translation {binary binary} | ||
10 | fconfigure $fileid_o -translation {binary binary} | ||
11 | |||
12 | set old_bin [read $fileid_i] | ||
13 | set new_bin {} | ||
14 | for {set i 0} {$i<[string length $old_bin]} {incr i $num_b} { | ||
15 | for {set j $num_b} {$j>0} {incr j -1} { | ||
16 | append new_bin [string index $old_bin [expr $i+($j-1)]] | ||
17 | } | ||
18 | } | ||
19 | |||
20 | for {set i 0} {$i<[string length $old_bin]} {incr i $num_b} { | ||
21 | set binValue [string range $old_bin [expr $i+0] [expr $i+($num_b-1)]] | ||
22 | binary scan $binValue H[expr $num_b*2] hexValue | ||
23 | |||
24 | set binValue [string range $new_bin [expr $i+0] [expr $i+($num_b-1)]] | ||
25 | binary scan $binValue H[expr $num_b*2] hexValue | ||
26 | } | ||
27 | |||
28 | puts -nonewline $fileid_o $new_bin | ||
29 | close $fileid_o | ||
diff --git a/meta-fsl-arm/recipes-bsp/elftosb/elftosb_10.12.01.bb b/meta-fsl-arm/recipes-bsp/elftosb/elftosb_10.12.01.bb deleted file mode 100644 index 2cef1f6a..00000000 --- a/meta-fsl-arm/recipes-bsp/elftosb/elftosb_10.12.01.bb +++ /dev/null | |||
@@ -1,22 +0,0 @@ | |||
1 | # Copyright (C) 2011, 2012 Freescale | ||
2 | # Released under the MIT license (see COPYING.MIT for the terms) | ||
3 | |||
4 | DESCRIPTION = "Helper utility for freescale imx platforms" | ||
5 | LICENSE = "MIT" | ||
6 | LIC_FILES_CHKSUM = "file://COPYING;md5=172ede34353056ebec7a597d8459f029" | ||
7 | SECTION = "bootloader" | ||
8 | PR = "r4" | ||
9 | BBCLASSEXTEND = "native nativesdk" | ||
10 | |||
11 | SRC_URI = "http://repository.timesys.com/buildsources/e/elftosb/elftosb-${PV}/elftosb-${PV}.tar.gz \ | ||
12 | file://cross-build.patch \ | ||
13 | file://don-t-use-full-path-for-headers.patch" | ||
14 | SRC_URI[md5sum] = "e8005d606c1e0bb3507c82f6eceb3056" | ||
15 | SRC_URI[sha256sum] = "77bb6981620f7575b87d136d94c7daa88dd09195959cc75fc18b138369ecd42b" | ||
16 | |||
17 | do_install() { | ||
18 | install -d ${D}${bindir} | ||
19 | install ${S}/bld/linux/elftosb ${D}${bindir} | ||
20 | install ${S}/bld/linux/keygen ${D}${bindir} | ||
21 | install ${S}/bld/linux/sbtool ${D}${bindir} | ||
22 | } | ||
diff --git a/meta-fsl-arm/recipes-bsp/elftosb/files/cross-build.patch b/meta-fsl-arm/recipes-bsp/elftosb/files/cross-build.patch deleted file mode 100644 index 8cffa03e..00000000 --- a/meta-fsl-arm/recipes-bsp/elftosb/files/cross-build.patch +++ /dev/null | |||
@@ -1,50 +0,0 @@ | |||
1 | --- a/makefile.rules.orig 2012-05-09 21:03:28.000000000 +0200 | ||
2 | +++ b/makefile.rules 2012-05-09 21:03:56.000000000 +0200 | ||
3 | @@ -9,6 +9,8 @@ | ||
4 | # SRC_DIR needs to be passed in. It is assumed that make is running in | ||
5 | # the build directory. | ||
6 | |||
7 | +CC ?= gcc | ||
8 | + | ||
9 | #******************************************************************************* | ||
10 | # Environment | ||
11 | |||
12 | @@ -101,7 +103,7 @@ | ||
13 | keygen.o | ||
14 | |||
15 | |||
16 | -LIBS = -lstdc++ | ||
17 | +LIBS ?= -lstdc++ -lm | ||
18 | |||
19 | |||
20 | ifeq ("${UNAMES}", "Linux") | ||
21 | @@ -137,13 +139,13 @@ | ||
22 | ${EXEC_FILE_ELFTOSB2} ${EXEC_FILE_SBTOOL} ${EXEC_FILE_KEYGEN} | ||
23 | |||
24 | elftosb: ${OBJ_FILES_ELFTOSB2} | ||
25 | - gcc ${OBJ_FILES_ELFTOSB2} ${LIBS} -o ${EXEC_FILE_ELFTOSB2} | ||
26 | + ${CC} ${OBJ_FILES_ELFTOSB2} ${LIBS} -o ${EXEC_FILE_ELFTOSB2} | ||
27 | |||
28 | sbtool: ${OBJ_FILES_SBTOOL} | ||
29 | - gcc ${OBJ_FILES_SBTOOL} ${LIBS} -o ${EXEC_FILE_SBTOOL} | ||
30 | + ${CC} ${OBJ_FILES_SBTOOL} ${LIBS} -o ${EXEC_FILE_SBTOOL} | ||
31 | |||
32 | keygen: ${OBJ_FILES_KEYGEN} | ||
33 | - gcc ${OBJ_FILES_KEYGEN} ${LIBS} -o ${EXEC_FILE_KEYGEN} | ||
34 | + ${CC} ${OBJ_FILES_KEYGEN} ${LIBS} -o ${EXEC_FILE_KEYGEN} | ||
35 | |||
36 | |||
37 | #ifeq ("${UNAMES}", "Linux") | ||
38 | @@ -153,10 +155,10 @@ | ||
39 | .SUFFIXES : .c .cpp | ||
40 | |||
41 | .c.o : | ||
42 | - gcc ${CFLAGS} -c $< | ||
43 | + ${CC} ${CFLAGS} -c $< | ||
44 | |||
45 | .cpp.o : | ||
46 | - gcc ${CFLAGS} -c $< | ||
47 | + ${CC} ${CFLAGS} -c $< | ||
48 | |||
49 | #endif | ||
50 | |||
diff --git a/meta-fsl-arm/recipes-bsp/elftosb/files/don-t-use-full-path-for-headers.patch b/meta-fsl-arm/recipes-bsp/elftosb/files/don-t-use-full-path-for-headers.patch deleted file mode 100644 index 8996ffbb..00000000 --- a/meta-fsl-arm/recipes-bsp/elftosb/files/don-t-use-full-path-for-headers.patch +++ /dev/null | |||
@@ -1,42 +0,0 @@ | |||
1 | elftosb: don't use full path for headers | ||
2 | |||
3 | This fixes the building on new host distributions where header might | ||
4 | move due multilib support and other possible changes in future. | ||
5 | |||
6 | Upstream-Status: Pending | ||
7 | |||
8 | Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> | ||
9 | --- | ||
10 | common/stdafx.h | 2 +- | ||
11 | stdafx.h | 2 +- | ||
12 | 2 files changed, 2 insertions(+), 2 deletions(-) | ||
13 | |||
14 | diff --git a/common/stdafx.h b/common/stdafx.h | ||
15 | index e6bf9dd..fb3c2d7 100644 | ||
16 | --- a/common/stdafx.h | ||
17 | +++ b/common/stdafx.h | ||
18 | @@ -27,7 +27,7 @@ | ||
19 | // For Linux systems only, types.h only defines the signed | ||
20 | // integer types. This is not professional code. | ||
21 | // Update: They are defined in the header files in the more recent version of redhat enterprise gcc. | ||
22 | -#include "/usr/include/sys/types.h" | ||
23 | +#include <sys/types.h> | ||
24 | #include <stdint.h> | ||
25 | //typedef unsigned long uint32_t; | ||
26 | //typedef unsigned short uint16_t; | ||
27 | diff --git a/stdafx.h b/stdafx.h | ||
28 | index ce80458..6ff2f44 100644 | ||
29 | --- a/stdafx.h | ||
30 | +++ b/stdafx.h | ||
31 | @@ -27,7 +27,7 @@ | ||
32 | // For Linux systems only, types.h only defines the signed | ||
33 | // integer types. This is not professional code. | ||
34 | // Update: They are defined in the header files in the more recent version of redhat enterprise gcc. | ||
35 | -#include "/usr/include/sys/types.h" | ||
36 | +#include <sys/types.h> | ||
37 | //typedef unsigned long uint32_t; | ||
38 | //typedef unsigned short uint16_t; | ||
39 | //typedef unsigned char uint8_t; | ||
40 | -- | ||
41 | 1.7.2.5 | ||
42 | |||
diff --git a/meta-fsl-arm/recipes-bsp/firmware-imx/firmware-imx.inc b/meta-fsl-arm/recipes-bsp/firmware-imx/firmware-imx.inc deleted file mode 100644 index 80e5e59e..00000000 --- a/meta-fsl-arm/recipes-bsp/firmware-imx/firmware-imx.inc +++ /dev/null | |||
@@ -1,42 +0,0 @@ | |||
1 | SUMMARY = "Freescale IMX firmware" | ||
2 | DESCRIPTION = "Freescale IMX firmware such as for the VPU" | ||
3 | SECTION = "base" | ||
4 | LICENSE = "Proprietary" | ||
5 | LIC_FILES_CHKSUM = "file://COPYING;md5=acdb807ac7275fe32f9f64992e111241" | ||
6 | |||
7 | PE = "1" | ||
8 | |||
9 | SRC_URI = "${FSL_MIRROR}/firmware-imx-${PV}.bin;fsl-eula=true" | ||
10 | |||
11 | inherit fsl-eula-unpack | ||
12 | |||
13 | do_install() { | ||
14 | install -d ${D}/lib/firmware | ||
15 | cp -rfv firmware/* ${D}/lib/firmware/ | ||
16 | find ${D}/lib/firmware -type f -exec chmod 644 '{}' ';' | ||
17 | |||
18 | # Remove files not going to be installed | ||
19 | find ${D}/lib/firmware/ -name Android.mk -exec rm '{}' ';' | ||
20 | } | ||
21 | |||
22 | python populate_packages_prepend() { | ||
23 | vpudir = bb.data.expand('/lib/firmware/vpu', d) | ||
24 | do_split_packages(d, vpudir, '^vpu_fw_([^_]*).*\.bin', | ||
25 | output_pattern='firmware-imx-vpu-%s', | ||
26 | description='Freescale IMX Firmware %s', | ||
27 | extra_depends='', | ||
28 | prepend=True) | ||
29 | |||
30 | sdmadir = bb.data.expand('/lib/firmware/sdma', d) | ||
31 | do_split_packages(d, sdmadir, '^sdma-([^-]*).*\.bin', | ||
32 | output_pattern='firmware-imx-sdma-%s', | ||
33 | description='Freescale IMX Firmware %s', | ||
34 | extra_depends='', | ||
35 | prepend=True) | ||
36 | } | ||
37 | |||
38 | ALLOW_EMPTY_${PN} = "1" | ||
39 | |||
40 | PACKAGES_DYNAMIC = "${PN}-vpu-* ${PN}-sdma-*" | ||
41 | |||
42 | PACKAGE_ARCH = "${MACHINE_SOCARCH}" | ||
diff --git a/meta-fsl-arm/recipes-bsp/firmware-imx/firmware-imx_3.14.28-1.0.0.bb b/meta-fsl-arm/recipes-bsp/firmware-imx/firmware-imx_3.14.28-1.0.0.bb deleted file mode 100644 index 408baf18..00000000 --- a/meta-fsl-arm/recipes-bsp/firmware-imx/firmware-imx_3.14.28-1.0.0.bb +++ /dev/null | |||
@@ -1,8 +0,0 @@ | |||
1 | # Copyright (C) 2012-2015 Freescale Semiconductor | ||
2 | |||
3 | require firmware-imx.inc | ||
4 | |||
5 | SRC_URI[md5sum] = "6e700f3d3a6482db08d5aabee7751630" | ||
6 | SRC_URI[sha256sum] = "1f09acd4d605efc78a0672068a658cb16274811d2f444cf3ae7aaa075266746f" | ||
7 | |||
8 | COMPATIBLE_MACHINE = "(mx5|mx6)" | ||
diff --git a/meta-fsl-arm/recipes-bsp/formfactor/formfactor/imx51evk/machconfig b/meta-fsl-arm/recipes-bsp/formfactor/formfactor/imx51evk/machconfig deleted file mode 100644 index 3dbcc111..00000000 --- a/meta-fsl-arm/recipes-bsp/formfactor/formfactor/imx51evk/machconfig +++ /dev/null | |||
@@ -1,11 +0,0 @@ | |||
1 | # Display options | ||
2 | HAVE_TOUCHSCREEN=0 | ||
3 | HAVE_KEYBOARD=1 | ||
4 | |||
5 | #DISPLAY_CAN_ROTATE=0 | ||
6 | #DISPLAY_ORIENTATION=0 | ||
7 | #DISPLAY_WIDTH_PIXELS=1024 | ||
8 | #DISPLAY_HEIGHT_PIXELS=720 | ||
9 | #DISPLAY_BPP=16 | ||
10 | #DISPLAY_DPI=150 | ||
11 | #DISPLAY_SUBPIXEL_ORDER=vrgb | ||
diff --git a/meta-fsl-arm/recipes-bsp/formfactor/formfactor/imx53ard/machconfig b/meta-fsl-arm/recipes-bsp/formfactor/formfactor/imx53ard/machconfig deleted file mode 100644 index 7f884fe8..00000000 --- a/meta-fsl-arm/recipes-bsp/formfactor/formfactor/imx53ard/machconfig +++ /dev/null | |||
@@ -1,13 +0,0 @@ | |||
1 | # Display options | ||
2 | HAVE_TOUCHSCREEN=1 | ||
3 | HAVE_KEYBOARD=0 | ||
4 | |||
5 | TSLIB_TSDEVICE="/dev/input/touchscreen0" | ||
6 | |||
7 | #DISPLAY_CAN_ROTATE=0 | ||
8 | #DISPLAY_ORIENTATION=0 | ||
9 | #DISPLAY_WIDTH_PIXELS=1024 | ||
10 | #DISPLAY_HEIGHT_PIXELS=720 | ||
11 | #DISPLAY_BPP=16 | ||
12 | #DISPLAY_DPI=150 | ||
13 | #DISPLAY_SUBPIXEL_ORDER=vrgb | ||
diff --git a/meta-fsl-arm/recipes-bsp/formfactor/formfactor/imx53qsb/machconfig b/meta-fsl-arm/recipes-bsp/formfactor/formfactor/imx53qsb/machconfig deleted file mode 100644 index 3dbcc111..00000000 --- a/meta-fsl-arm/recipes-bsp/formfactor/formfactor/imx53qsb/machconfig +++ /dev/null | |||
@@ -1,11 +0,0 @@ | |||
1 | # Display options | ||
2 | HAVE_TOUCHSCREEN=0 | ||
3 | HAVE_KEYBOARD=1 | ||
4 | |||
5 | #DISPLAY_CAN_ROTATE=0 | ||
6 | #DISPLAY_ORIENTATION=0 | ||
7 | #DISPLAY_WIDTH_PIXELS=1024 | ||
8 | #DISPLAY_HEIGHT_PIXELS=720 | ||
9 | #DISPLAY_BPP=16 | ||
10 | #DISPLAY_DPI=150 | ||
11 | #DISPLAY_SUBPIXEL_ORDER=vrgb | ||
diff --git a/meta-fsl-arm/recipes-bsp/formfactor/formfactor_%.bbappend b/meta-fsl-arm/recipes-bsp/formfactor/formfactor_%.bbappend deleted file mode 100644 index 8c77b8d3..00000000 --- a/meta-fsl-arm/recipes-bsp/formfactor/formfactor_%.bbappend +++ /dev/null | |||
@@ -1,2 +0,0 @@ | |||
1 | # Append path for freescale to include costom matchconfig | ||
2 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" | ||
diff --git a/meta-fsl-arm/recipes-bsp/imx-bootlets/imx-bootlets/add-command-script-for-barebox.patch b/meta-fsl-arm/recipes-bsp/imx-bootlets/imx-bootlets/add-command-script-for-barebox.patch deleted file mode 100644 index 1deca1cb..00000000 --- a/meta-fsl-arm/recipes-bsp/imx-bootlets/imx-bootlets/add-command-script-for-barebox.patch +++ /dev/null | |||
@@ -1,46 +0,0 @@ | |||
1 | imx-bootlets: Add command script for barebox | ||
2 | |||
3 | Upstream-Status: Inappropriate [configuration] | ||
4 | |||
5 | Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com> | ||
6 | |||
7 | diff --git a/barebox_ivt.bd b/barebox_ivt.bd | ||
8 | new file mode 100644 | ||
9 | index 0000000..79cbccf | ||
10 | --- /dev/null | ||
11 | +++ b/barebox_ivt.bd | ||
12 | @@ -0,0 +1,34 @@ | ||
13 | +// STMP378x ROM command script to load and run barebox | ||
14 | + | ||
15 | +sources { | ||
16 | + power_prep="imx-bootlets-power_prep-@MACHINE@"; | ||
17 | + sdram_prep="imx-bootlets-boot_prep-@MACHINE@"; | ||
18 | + barebox="barebox-@MACHINE@.bin"; | ||
19 | +} | ||
20 | + | ||
21 | +section (0) { | ||
22 | + | ||
23 | + //---------------------------------------------------------- | ||
24 | + // Power Supply initialization | ||
25 | + //---------------------------------------------------------- | ||
26 | + | ||
27 | + load power_prep; | ||
28 | + load ivt (entry = power_prep:_start) > 0x8000; | ||
29 | + hab call 0x8000; | ||
30 | + | ||
31 | + //---------------------------------------------------------- | ||
32 | + // SDRAM initialization | ||
33 | + //---------------------------------------------------------- | ||
34 | + | ||
35 | + load sdram_prep; | ||
36 | + load ivt (entry = sdram_prep:_start) > 0x8000; | ||
37 | + hab call 0x8000; | ||
38 | + //---------------------------------------------------------- | ||
39 | + // Load and call barebox - ELF ARM image | ||
40 | + //---------------------------------------------------------- | ||
41 | + | ||
42 | + load barebox; | ||
43 | + load ivt (entry = barebox:start) > 0x8000; | ||
44 | + hab call 0x8000; | ||
45 | + | ||
46 | +} | ||
diff --git a/meta-fsl-arm/recipes-bsp/imx-bootlets/imx-bootlets/linux-fix-paths.patch b/meta-fsl-arm/recipes-bsp/imx-bootlets/imx-bootlets/linux-fix-paths.patch deleted file mode 100644 index d54add12..00000000 --- a/meta-fsl-arm/recipes-bsp/imx-bootlets/imx-bootlets/linux-fix-paths.patch +++ /dev/null | |||
@@ -1,28 +0,0 @@ | |||
1 | imx-bootlets: Fix paths for used during boot stream generation | ||
2 | |||
3 | This will be run during image generation thus this won't use a | ||
4 | complete path to allow for relocation. | ||
5 | |||
6 | Upstream-Status: Inappropriate [configuration] | ||
7 | |||
8 | Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> | ||
9 | |||
10 | diff --git a/linux.bd b/linux.bd | ||
11 | index 516f4f2..366ac22 100644 | ||
12 | --- a/linux.bd | ||
13 | +++ b/linux.bd | ||
14 | @@ -4,10 +4,10 @@ | ||
15 | flags = 0x01; | ||
16 | } | ||
17 | sources { | ||
18 | - power_prep="./power_prep/power_prep"; | ||
19 | - sdram_prep="./boot_prep/boot_prep"; | ||
20 | - linux_prep="./linux_prep/output-target/linux_prep"; | ||
21 | - zImage = "./zImage"; | ||
22 | + power_prep="imx-bootlets-power_prep-@MACHINE@"; | ||
23 | + sdram_prep="imx-bootlets-boot_prep-@MACHINE@"; | ||
24 | + linux_prep="imx-bootlets-linux_prep-@MACHINE@"; | ||
25 | + zImage="zImage-@MACHINE@.bin@DTB@"; | ||
26 | } | ||
27 | |||
28 | section (0) { | ||
diff --git a/meta-fsl-arm/recipes-bsp/imx-bootlets/imx-bootlets/linux_prep-fix-cmdlines.patch b/meta-fsl-arm/recipes-bsp/imx-bootlets/imx-bootlets/linux_prep-fix-cmdlines.patch deleted file mode 100644 index 4fb4c519..00000000 --- a/meta-fsl-arm/recipes-bsp/imx-bootlets/imx-bootlets/linux_prep-fix-cmdlines.patch +++ /dev/null | |||
@@ -1,30 +0,0 @@ | |||
1 | imx-bootlets: Fix cmdlines for Linux boot | ||
2 | |||
3 | This adapt the cmdlines for the partitioning layout used on the | ||
4 | generated SD cards. | ||
5 | |||
6 | Upstream-Status: Inappropriate [configuration] | ||
7 | |||
8 | Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> | ||
9 | |||
10 | diff --git a/linux_prep/cmdlines/iMX28_EVK.txt b/linux_prep/cmdlines/iMX28_EVK.txt | ||
11 | index 6bc36b9..6cf89a0 100644 | ||
12 | --- a/linux_prep/cmdlines/iMX28_EVK.txt | ||
13 | +++ b/linux_prep/cmdlines/iMX28_EVK.txt | ||
14 | @@ -1 +1 @@ | ||
15 | -console=ttyAM0,115200 root=/dev/mmcblk0p3 rw rootwait | ||
16 | +console=ttyAMA0,115200 root=/dev/mmcblk0p2 rw rootwait | ||
17 | diff --git a/linux_prep/cmdlines/stmp378x_dev.txt b/linux_prep/cmdlines/stmp378x_dev.txt | ||
18 | index 9a717eb..fdb7390 100644 | ||
19 | --- a/linux_prep/cmdlines/stmp378x_dev.txt | ||
20 | +++ b/linux_prep/cmdlines/stmp378x_dev.txt | ||
21 | @@ -1,6 +1,3 @@ | ||
22 | -console=ttyAM0,115200 root=/dev/mmcblk0p3 rw rootwait lcd_panel=lms430 no_console_suspend | ||
23 | -console=ttyAM0,115200 root=/dev/mmcblk0p3 rw rootwait lcd_panel=lms350 | ||
24 | -console=ttyAM0,115200 ssp1=spi1 ubi.mtd=2 root=ubi0:rootfs0 rootfstype=ubifs lcd_panel=lms430 | ||
25 | - | ||
26 | - | ||
27 | - | ||
28 | +console=ttyAMA0,115200 root=/dev/mmcblk0p2 rw rootwait ssp1=mmc lcd_panel=lms430 no_console_suspend | ||
29 | +console=ttyAMA0,115200 root=/dev/mmcblk0p2 rw rootwait ssp1=mmc lcd_panel=lms350 | ||
30 | +console=ttyAMA0,115200 ssp1=spi1 ubi.mtd=2 root=ubi0:rootfs0 rootfstype=ubifs lcd_panel=lms430 | ||
diff --git a/meta-fsl-arm/recipes-bsp/imx-bootlets/imx-bootlets_10.12.01.bb b/meta-fsl-arm/recipes-bsp/imx-bootlets/imx-bootlets_10.12.01.bb deleted file mode 100644 index 6084f169..00000000 --- a/meta-fsl-arm/recipes-bsp/imx-bootlets/imx-bootlets_10.12.01.bb +++ /dev/null | |||
@@ -1,79 +0,0 @@ | |||
1 | DESCRIPTION = "i.MXS boot streams" | ||
2 | LICENSE = "GPL-2.0" | ||
3 | LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" | ||
4 | |||
5 | PR = "r5" | ||
6 | |||
7 | SRC_URI = "http://download.ossystems.com.br/bsp/freescale/source/imx-bootlets-src-${PV}.tar.gz \ | ||
8 | file://linux-fix-paths.patch \ | ||
9 | file://linux_prep-fix-cmdlines.patch \ | ||
10 | file://add-command-script-for-barebox.patch" | ||
11 | |||
12 | SRC_URI[md5sum] = "cf0ab3822dca694b930a051501c1d0e4" | ||
13 | SRC_URI[sha256sum] = "63f6068ae36884adef4259bbb1fe2591755718f22c46d0a59d854883dfab1ffc" | ||
14 | |||
15 | S = "${WORKDIR}/imx-bootlets-src-${PV}" | ||
16 | |||
17 | inherit deploy | ||
18 | |||
19 | # Disable parallel building or it may fail to build. | ||
20 | PARALLEL_MAKE = "" | ||
21 | |||
22 | EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX}" | ||
23 | |||
24 | # Ensure machine defines the IMXBOOTLETS_MACHINE | ||
25 | python () { | ||
26 | if not d.getVar("IMXBOOTLETS_MACHINE", True): | ||
27 | PN = d.getVar("PN", True) | ||
28 | FILE = os.path.basename(d.getVar("FILE", True)) | ||
29 | bb.debug(1, "To build %s, see %s for instructions on \ | ||
30 | setting up your machine config" % (PN, FILE)) | ||
31 | raise bb.parse.SkipPackage("because IMXBOOTLETS_MACHINE is not set") | ||
32 | } | ||
33 | |||
34 | do_configure () { | ||
35 | # Use machine specific binaries | ||
36 | sed 's,@MACHINE@,${MACHINE},g;s,@DTB@,-dtb,g' < linux.bd > linux.bd-dtb | ||
37 | sed -i 's,@MACHINE@,${MACHINE},g;s,@DTB@,,g' linux.bd | ||
38 | sed -i 's,@MACHINE@,${MACHINE},g' barebox_ivt.bd | ||
39 | } | ||
40 | |||
41 | do_compile () { | ||
42 | oe_runmake BOARD=${IMXBOOTLETS_MACHINE} linux_prep \ | ||
43 | boot_prep \ | ||
44 | power_prep \ | ||
45 | 'CC=${TARGET_PREFIX}gcc --sysroot="${STAGING_DIR_TARGET}"' \ | ||
46 | 'LD=${TARGET_PREFIX}ld --sysroot="${STAGING_DIR_TARGET}"' | ||
47 | } | ||
48 | |||
49 | do_install () { | ||
50 | install -d ${D}/boot/ | ||
51 | install -m 644 boot_prep/boot_prep power_prep/power_prep \ | ||
52 | linux_prep/output-target/linux_prep \ | ||
53 | linux.bd linux.bd-dtb \ | ||
54 | barebox_ivt.bd \ | ||
55 | ${D}/boot | ||
56 | } | ||
57 | |||
58 | FILES_${PN} = "/boot" | ||
59 | |||
60 | do_deploy () { | ||
61 | install -d ${DEPLOYDIR} | ||
62 | |||
63 | for f in boot_prep/boot_prep \ | ||
64 | power_prep/power_prep \ | ||
65 | linux_prep/output-target/linux_prep \ | ||
66 | barebox_ivt.bd \ | ||
67 | linux.bd linux.bd-dtb; do | ||
68 | full_name="imx-bootlets-`basename $f`-${MACHINE}-${PV}-${PR}" | ||
69 | symlink_name="imx-bootlets-`basename $f`-${MACHINE}" | ||
70 | |||
71 | install -m 644 ${S}/$f ${DEPLOYDIR}/$full_name | ||
72 | (cd ${DEPLOYDIR} ; rm -f $symlink_name ; ln -sf $full_name $symlink_name) | ||
73 | done | ||
74 | } | ||
75 | |||
76 | addtask deploy before do_build after do_compile | ||
77 | |||
78 | PACKAGE_ARCH = "${MACHINE_ARCH}" | ||
79 | COMPATIBLE_MACHINE = "(mxs)" | ||
diff --git a/meta-fsl-arm/recipes-bsp/imx-kobs/imx-kobs_3.14.28-1.0.0.bb b/meta-fsl-arm/recipes-bsp/imx-kobs/imx-kobs_3.14.28-1.0.0.bb deleted file mode 100644 index 2cf19005..00000000 --- a/meta-fsl-arm/recipes-bsp/imx-kobs/imx-kobs_3.14.28-1.0.0.bb +++ /dev/null | |||
@@ -1,13 +0,0 @@ | |||
1 | # Copyright (C) 2013-2015 Freescale Semiconductor | ||
2 | |||
3 | SUMMARY = "Nand boot write source" | ||
4 | SECTION = "base" | ||
5 | LICENSE = "GPLv2" | ||
6 | LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833" | ||
7 | |||
8 | SRC_URI = "${FSL_MIRROR}/imx-kobs-${PV}.tar.gz" | ||
9 | |||
10 | SRC_URI[md5sum] = "0077ec992b281ebbce2928564a08b207" | ||
11 | SRC_URI[sha256sum] = "cfac042f5c96731205c397a4a6b3ed966f804569ae4d0e2685d22fdf6bdc9eb7" | ||
12 | |||
13 | inherit autotools pkgconfig | ||
diff --git a/meta-fsl-arm/recipes-bsp/imx-lib/imx-lib-11.09.02/obey-variables.patch b/meta-fsl-arm/recipes-bsp/imx-lib/imx-lib-11.09.02/obey-variables.patch deleted file mode 100644 index 901345ac..00000000 --- a/meta-fsl-arm/recipes-bsp/imx-lib/imx-lib-11.09.02/obey-variables.patch +++ /dev/null | |||
@@ -1,209 +0,0 @@ | |||
1 | Obey CFLAGS, LDFLAGS | ||
2 | |||
3 | Signed-off-by: Christopher Larson <chris_larson@mentor.com> | ||
4 | Upstream-status: Pending | ||
5 | |||
6 | --- imx-lib-11.09.02.orig/hdmi-cec/Makefile 2014-09-02 13:04:37.114250749 -0700 | ||
7 | +++ imx-lib-11.09.02/hdmi-cec/Makefile 2014-09-02 13:04:37.086250568 -0700 | ||
8 | @@ -1,5 +1,6 @@ | ||
9 | CC ?=$(CROSS_COMPILE)gcc | ||
10 | AR ?=$(CROSS_COMPILE)ar | ||
11 | +CFLAGS ?=-O2 | ||
12 | |||
13 | # list of platforms which want this test case | ||
14 | INCLUDE_LIST:= IMX6Q | ||
15 | @@ -32,10 +33,10 @@ | ||
16 | endif | ||
17 | |||
18 | %.o: %.c | ||
19 | - $(CC) -D$(PLATFORM) -Wall -O2 -fPIC -c $^ -o $@ | ||
20 | + $(CC) -D$(PLATFORM) -Wall -fPIC $(CFLAGS) -c $^ -o $@ | ||
21 | |||
22 | $(LIBNAME).so.$(SONAMEVERSION): $(OBJ) | ||
23 | - $(CC) -shared -nostartfiles -Wl,-soname,$@ $^ -o $@ | ||
24 | + $(CC) -shared -nostartfiles -Wl,-soname,$@ $^ -o $@ $(LDFLAGS) | ||
25 | |||
26 | $(LIBNAME).so: $(LIBNAME).so.$(SONAMEVERSION) | ||
27 | ln -s $< $@ | ||
28 | --- imx-lib-11.09.02.orig/ipu/Makefile 2014-09-02 13:04:37.114250749 -0700 | ||
29 | +++ imx-lib-11.09.02/ipu/Makefile 2014-09-02 13:05:11.062458117 -0700 | ||
30 | @@ -1,5 +1,6 @@ | ||
31 | CC ?=$(CROSS_COMPILE)gcc | ||
32 | AR ?=$(CROSS_COMPILE)ar | ||
33 | +CFLAGS ?=-O2 | ||
34 | |||
35 | ifeq ($(PLATFORM), IMX6Q) | ||
36 | OBJS = mxc_ipu_hl_lib_dummy.o | ||
37 | @@ -28,7 +29,7 @@ | ||
38 | endif | ||
39 | |||
40 | $(LIBNAME).so.$(SONAMEVERSION): $(OBJS) | ||
41 | - $(CC) -shared -nostartfiles -Wl,-soname,$@ -o $@ $^ -lpthread | ||
42 | + $(CC) -shared -nostartfiles -Wl,-soname,$@ -o $@ $^ -lpthread $(LDFLAGS) | ||
43 | |||
44 | $(LIBNAME).so: $(LIBNAME).so.$(SONAMEVERSION) | ||
45 | ln -s $< $@ | ||
46 | @@ -37,7 +38,7 @@ | ||
47 | ifeq "$(PLATFORM)" "" | ||
48 | $(error "Unspecified PLATFORM variable") | ||
49 | endif | ||
50 | - $(CC) -D$(PLATFORM) $(INCLUDE) -Wall -O2 -fPIC -c $^ -o $@ | ||
51 | + $(CC) -D$(PLATFORM) $(INCLUDE) -Wall -fPIC $(CFLAGS) -c $^ -o $@ | ||
52 | |||
53 | .PHONY: clean | ||
54 | clean: | ||
55 | --- imx-lib-11.09.02.orig/pxp/Makefile 2014-09-02 13:04:37.114250749 -0700 | ||
56 | +++ imx-lib-11.09.02/pxp/Makefile 2014-09-02 13:05:53.354716651 -0700 | ||
57 | @@ -1,5 +1,6 @@ | ||
58 | CC ?=$(CROSS_COMPILE)gcc | ||
59 | AR ?=$(CROSS_COMPILE)ar | ||
60 | +CFLAGS ?=-O2 | ||
61 | |||
62 | # list of platforms which want this test case | ||
63 | INCLUDE_LIST:=IMX50 IMX51 IMX5 IMX6Q IMX6S | ||
64 | @@ -25,10 +26,10 @@ | ||
65 | endif | ||
66 | |||
67 | %.o: %.c | ||
68 | - $(CC) -D$(PLATFORM) $(INCLUDE) -Wall -O2 -fPIC -c $^ -o $@ | ||
69 | + $(CC) -D$(PLATFORM) $(INCLUDE) -Wall -fPIC $(CFLAGS) -c $^ -o $@ | ||
70 | |||
71 | $(LIBNAME).so.$(SONAMEVERSION): $(OBJ) | ||
72 | - $(CC) -shared -nostartfiles -Wl,-soname,$@ $^ -o $@ | ||
73 | + $(CC) -shared -nostartfiles -Wl,-soname,$@ $^ -o $@ $(LDFLAGS) | ||
74 | |||
75 | $(LIBNAME).so: $(LIBNAME).so.$(SONAMEVERSION) | ||
76 | ln -s $< $@ | ||
77 | --- imx-lib-11.09.02.orig/rng/Makefile 2014-09-02 13:04:37.114250749 -0700 | ||
78 | +++ imx-lib-11.09.02/rng/Makefile 2014-09-02 13:04:37.086250568 -0700 | ||
79 | @@ -4,16 +4,17 @@ | ||
80 | AR = ar -crv | ||
81 | RM = rm -f | ||
82 | CC ?=$(CROSS_COMPILE)gcc | ||
83 | -LD=$(CROSS_COMPILE)ld | ||
84 | +LD ?=$(CROSS_COMPILE)ld | ||
85 | +CFLAGS ?=-g | ||
86 | |||
87 | INC := $(INCLUDE) | ||
88 | |||
89 | # Add compilation checks | ||
90 | -CFLAGS += -g -Wall -W -Wmissing-prototypes -Wstrict-prototypes -Wdeclaration-after-statement -fPIC | ||
91 | +override CFLAGS += -Wall -W -Wmissing-prototypes -Wstrict-prototypes -Wdeclaration-after-statement -fPIC | ||
92 | |||
93 | # In absence of kernel CONFIG flags, set API library to build on | ||
94 | # 'unknown' platform. | ||
95 | -CFLAGS += -DFSL_PLATFORM_OTHER -DFSL_HAVE_RNGC $(INC) | ||
96 | +override CFLAGS += -DFSL_PLATFORM_OTHER -DFSL_HAVE_RNGC $(INC) | ||
97 | |||
98 | OBJS= fsl_shw_rand.o fsl_shw_hash.o fsl_shw_sym.o fsl_shw_user.o \ | ||
99 | fsl_shw_keystore.o fsl_shw_auth.o fsl_shw_hmac.o fsl_shw_wrap.o | ||
100 | @@ -34,7 +35,7 @@ | ||
101 | $(AR) $@ $^ | ||
102 | |||
103 | $(LIBNAME).so.$(SONAMEVERSION): $(OBJS) | ||
104 | - $(CC) -shared -nostartfiles -Wl,-soname,$@ -o $@ $^ | ||
105 | + $(CC) -shared -nostartfiles -Wl,-soname,$@ -o $@ $^ $(LDFLAGS) | ||
106 | |||
107 | $(LIBNAME).so: $(LIBNAME).so.$(SONAMEVERSION) | ||
108 | ln -s $< $@ | ||
109 | --- imx-lib-11.09.02.orig/sahara2/Makefile 2014-09-02 13:04:37.114250749 -0700 | ||
110 | +++ imx-lib-11.09.02/sahara2/Makefile 2014-09-02 13:04:37.086250568 -0700 | ||
111 | @@ -4,7 +4,8 @@ | ||
112 | AR = ar -crv | ||
113 | RM = rm -f | ||
114 | CC ?=$(CROSS_COMPILE)gcc | ||
115 | -LD=$(CROSS_COMPILE)ld | ||
116 | +LD ?=$(CROSS_COMPILE)ld | ||
117 | +CFLAGS ?=-g | ||
118 | |||
119 | INC := $(INCLUDE) | ||
120 | |||
121 | @@ -18,19 +19,19 @@ | ||
122 | endif | ||
123 | |||
124 | # Add compilation checks | ||
125 | -CFLAGS += -g -Wall -W -Wmissing-prototypes -Wstrict-prototypes -Wdeclaration-after-statement -fPIC | ||
126 | +override CFLAGS += -Wall -W -Wmissing-prototypes -Wstrict-prototypes -Wdeclaration-after-statement -fPIC | ||
127 | |||
128 | OBJS= fsl_shw_rand.o fsl_shw_hash.o fsl_shw_sym.o fsl_shw_user.o \ | ||
129 | fsl_shw_auth.o fsl_shw_hmac.o fsl_shw_wrap.o fsl_shw_keystore.o um_adaptor.o sf_util.o | ||
130 | |||
131 | |||
132 | #CFLAGS += -DSAHARA -DLINUX -I$(APIINCDIR) | ||
133 | -CFLAGS += -DSAHARA -DLINUX $(INC) | ||
134 | -CFLAGS += $(TARGET_ARCH) | ||
135 | +override CFLAGS += -DSAHARA -DLINUX $(INC) | ||
136 | +override CFLAGS += $(TARGET_ARCH) | ||
137 | # Uncomment to debug Library's creation of structures for driver | ||
138 | -#CFLAGS += -DDIAG_SECURITY_FUNC | ||
139 | +#override CFLAGS += -DDIAG_SECURITY_FUNC | ||
140 | # Uncomment to simulate memory allocation errors | ||
141 | -#CFLAGS += -DDIAG_MEM_ERRORS -DDIAG_MEM_CONST=5 | ||
142 | +#override CFLAGS += -DDIAG_MEM_ERRORS -DDIAG_MEM_CONST=5 | ||
143 | |||
144 | LIBNAME=libsahara | ||
145 | SONAMEVERSION=0 | ||
146 | @@ -53,7 +54,7 @@ | ||
147 | $(AR) $@ $^ | ||
148 | |||
149 | $(LIBNAME).so.$(SONAMEVERSION): $(OBJS) | ||
150 | - $(CC) -shared -nostartfiles -Wl,-soname,$@ -o $@ $^ | ||
151 | + $(CC) -shared -nostartfiles -Wl,-soname,$@ -o $@ $^ $(LDFLAGS) | ||
152 | |||
153 | $(LIBNAME).so: $(LIBNAME).so.$(SONAMEVERSION) | ||
154 | ln -s $< $@ | ||
155 | --- imx-lib-11.09.02.orig/screenlayer/Makefile 2014-09-02 13:04:37.114250749 -0700 | ||
156 | +++ imx-lib-11.09.02/screenlayer/Makefile 2014-09-02 13:04:37.086250568 -0700 | ||
157 | @@ -1,5 +1,6 @@ | ||
158 | CC ?=$(CROSS_COMPILE)gcc | ||
159 | AR ?=$(CROSS_COMPILE)ar | ||
160 | +CFLAGS ?=-O2 | ||
161 | INC = $(INCLUDE) -I../ipu | ||
162 | |||
163 | OBJS = ScreenLayer.o | ||
164 | @@ -24,13 +25,13 @@ | ||
165 | endif | ||
166 | |||
167 | $(LIBNAME).so.$(SONAMEVERSION): $(OBJS) | ||
168 | - $(CC) -shared -nostartfiles -Wl,-soname,$@ -o $@ $^ -L../ipu -lipu | ||
169 | + $(CC) -shared -nostartfiles -Wl,-soname,$@ -o $@ $^ -L../ipu -lipu $(LDFLAGS) | ||
170 | |||
171 | $(LIBNAME).so: $(LIBNAME).so.$(SONAMEVERSION) | ||
172 | ln -s $< $@ | ||
173 | |||
174 | %.o: %.c | ||
175 | - $(CC) $(INC) -Wall -O2 -fPIC -c $^ -o $@ | ||
176 | + $(CC) $(INC) -Wall -fPIC $(CFLAGS) -c $^ -o $@ | ||
177 | |||
178 | .PHONY: clean | ||
179 | clean: | ||
180 | --- imx-lib-11.09.02.orig/sim/Makefile 2014-09-02 13:04:37.114250749 -0700 | ||
181 | +++ imx-lib-11.09.02/sim/Makefile 2014-09-02 13:04:37.086250568 -0700 | ||
182 | @@ -1,9 +1,10 @@ | ||
183 | CC ?=$(CROSS_COMPILE)gcc | ||
184 | AR ?=$(CROSS_COMPILE)ar | ||
185 | +CFLAGS ?=-O2 | ||
186 | |||
187 | OBJS = iso7816-3.o | ||
188 | |||
189 | -CFLAGS += $(INCLUDE) | ||
190 | +override CFLAGS += $(INCLUDE) | ||
191 | |||
192 | LIBNAME=libsim | ||
193 | SONAMEVERSION=0 | ||
194 | @@ -21,13 +22,13 @@ | ||
195 | cp iso7816-3.h $(DEST_DIR)/usr/include | ||
196 | |||
197 | $(LIBNAME).so.$(SONAMEVERSION): $(OBJS) | ||
198 | - $(CC) -shared -nostartfiles -Wl,-soname,$@ -o $@ $^ -lpthread | ||
199 | + $(CC) -shared -nostartfiles -Wl,-soname,$@ -o $@ $^ -lpthread $(LDFLAGS) | ||
200 | |||
201 | $(LIBNAME).so: $(LIBNAME).so.$(SONAMEVERSION) | ||
202 | ln -s $< $@ | ||
203 | |||
204 | %.o: %.c | ||
205 | - $(CC) -D$(PLATFORM) $(INCLUDE) -Wall -O2 -fPIC -c $^ -o $@ | ||
206 | + $(CC) -D$(PLATFORM) $(INCLUDE) -Wall -fPIC $(CFLAGS) -c $^ -o $@ | ||
207 | |||
208 | else | ||
209 | all install : | ||
diff --git a/meta-fsl-arm/recipes-bsp/imx-lib/imx-lib.inc b/meta-fsl-arm/recipes-bsp/imx-lib/imx-lib.inc deleted file mode 100644 index 314e153b..00000000 --- a/meta-fsl-arm/recipes-bsp/imx-lib/imx-lib.inc +++ /dev/null | |||
@@ -1,30 +0,0 @@ | |||
1 | # Copyright (C) 2012-2013 Freescale Semiconductor | ||
2 | |||
3 | DESCRIPTION = "Platform specific libraries for imx platform" | ||
4 | LICENSE = "LGPLv2.1" | ||
5 | SECTION = "multimedia" | ||
6 | DEPENDS = "virtual/kernel" | ||
7 | |||
8 | LIC_FILES_CHKSUM = "file://ipu/mxc_ipu_hl_lib.h;endline=13;md5=6c7486b21a8524b1879fa159578da31e" | ||
9 | |||
10 | PLATFORM_mx6 = "IMX6Q" | ||
11 | PLATFORM_mx5 = "IMX51" | ||
12 | PLATFORM_mx6sl = "IMX6S" | ||
13 | PLATFORM_mx6sx = "IMX6S" | ||
14 | |||
15 | PARALLEL_MAKE="-j 1" | ||
16 | EXTRA_OEMAKE = "" | ||
17 | |||
18 | SRC_URI = "${FSL_MIRROR}/imx-lib-${PV}.tar.gz" | ||
19 | |||
20 | do_compile () { | ||
21 | INCLUDE_DIR="-I${STAGING_KERNEL_DIR}/include/uapi -I${STAGING_KERNEL_DIR}/include \ | ||
22 | -I${STAGING_KERNEL_DIR}/drivers/mxc/security/rng/include \ | ||
23 | -I${STAGING_KERNEL_DIR}/drivers/mxc/security/sahara2/include" | ||
24 | |||
25 | oe_runmake CROSS_COMPILE="${HOST_PREFIX}" PLATFORM="${PLATFORM}" INCLUDE="${INCLUDE_DIR}" all | ||
26 | } | ||
27 | |||
28 | do_install () { | ||
29 | oe_runmake PLATFORM="${PLATFORM}" DEST_DIR="${D}" install | ||
30 | } | ||
diff --git a/meta-fsl-arm/recipes-bsp/imx-lib/imx-lib_11.09.02.bb b/meta-fsl-arm/recipes-bsp/imx-lib/imx-lib_11.09.02.bb deleted file mode 100644 index 16ca1df5..00000000 --- a/meta-fsl-arm/recipes-bsp/imx-lib/imx-lib_11.09.02.bb +++ /dev/null | |||
@@ -1,9 +0,0 @@ | |||
1 | # Copyright (C) 2013 Freescale Semiconductor | ||
2 | require imx-lib.inc | ||
3 | |||
4 | SRC_URI = "${FSL_MIRROR}/imx-lib-${PV}.tar.gz \ | ||
5 | file://obey-variables.patch" | ||
6 | SRC_URI[md5sum] = "a4e7447e35cfac0b966a51f001390d6e" | ||
7 | SRC_URI[sha256sum] = "3ed082005789db0c9c41e14073417319f4e23f5646a7d21f34840470f4328bd5" | ||
8 | |||
9 | COMPATIBLE_MACHINE = "(mx5)" | ||
diff --git a/meta-fsl-arm/recipes-bsp/imx-lib/imx-lib_3.10.53-1.1.0.bb b/meta-fsl-arm/recipes-bsp/imx-lib/imx-lib_3.10.53-1.1.0.bb deleted file mode 100644 index 4768ce9d..00000000 --- a/meta-fsl-arm/recipes-bsp/imx-lib/imx-lib_3.10.53-1.1.0.bb +++ /dev/null | |||
@@ -1,10 +0,0 @@ | |||
1 | # Copyright (C) 2013-2015 Freescale Semiconductor | ||
2 | |||
3 | include imx-lib.inc | ||
4 | |||
5 | PE = "1" | ||
6 | |||
7 | SRC_URI[md5sum] = "c510512ebd2bae5a7e57079b9788960e" | ||
8 | SRC_URI[sha256sum] = "4db2c1f286f2478b8236e62de4df9d2a2c26ff727c752dc4f21e2910f4a5e5d7" | ||
9 | |||
10 | COMPATIBLE_MACHINE = "(mx6)" | ||
diff --git a/meta-fsl-arm/recipes-bsp/imx-test/imx-test.inc b/meta-fsl-arm/recipes-bsp/imx-test/imx-test.inc deleted file mode 100644 index cba72f58..00000000 --- a/meta-fsl-arm/recipes-bsp/imx-test/imx-test.inc +++ /dev/null | |||
@@ -1,69 +0,0 @@ | |||
1 | # Copyright (C) 2012-2015 O.S. Systems Software LTDA. | ||
2 | |||
3 | SUMMARY = "Test programs for IMX BSP" | ||
4 | DESCRIPTION = "Unit tests for the IMX BSP" | ||
5 | SECTION = "base" | ||
6 | DEPENDS_mx5 = "virtual/kernel imx-lib imx-vpu" | ||
7 | DEPENDS_mx6q = "virtual/kernel imx-lib imx-vpu" | ||
8 | DEPENDS_mx6dl = "virtual/kernel imx-lib imx-vpu" | ||
9 | DEPENDS_mx6sl = "virtual/kernel imx-lib" | ||
10 | DEPENDS_mx6sx = "virtual/kernel imx-lib" | ||
11 | DEPENDS_mxs = "virtual/kernel" | ||
12 | |||
13 | LICENSE = "GPLv2" | ||
14 | LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" | ||
15 | |||
16 | PE = "1" | ||
17 | |||
18 | SRC_URI = "${FSL_MIRROR}/imx-test-${PV}.tar.gz" | ||
19 | |||
20 | inherit module-base | ||
21 | |||
22 | INHIBIT_PACKAGE_STRIP = "1" | ||
23 | INHIBIT_PACKAGE_DEBUG_SPLIT = "1" | ||
24 | |||
25 | PLATFORM_mx6 = "IMX6Q" | ||
26 | PLATFORM_mx6sl = "IMX6SL" | ||
27 | PLATFORM_mx6sx = "IMX6SX" | ||
28 | PLATFORM_mx53 = "IMX53" | ||
29 | PLATFORM_mx51 = "IMX51" | ||
30 | |||
31 | # Required so the fixdep binary is generated | ||
32 | addtask make_scripts after do_patch before do_compile | ||
33 | do_make_scripts[lockfiles] = "${TMPDIR}/kernel-scripts.lock" | ||
34 | do_make_scripts[deptask] = "do_populate_sysroot" | ||
35 | do_make_scripts[depends] += "virtual/kernel:do_install" | ||
36 | |||
37 | do_compile() { | ||
38 | CFLAGS="${TOOLCHAIN_OPTIONS}" | ||
39 | LDFLAGS="${TOOLCHAIN_OPTIONS} -L${STAGING_LIBDIR}" | ||
40 | oe_runmake V=1 VERBOSE='' \ | ||
41 | CROSS_COMPILE=${TARGET_PREFIX} \ | ||
42 | INC="-I${STAGING_INCDIR} \ | ||
43 | -I${S}/include \ | ||
44 | -I${STAGING_KERNEL_BUILDDIR}/include/uapi \ | ||
45 | -I${STAGING_KERNEL_BUILDDIR}/include \ | ||
46 | -I${STAGING_KERNEL_DIR}/include/uapi \ | ||
47 | -I${STAGING_KERNEL_DIR}/include \ | ||
48 | -I${STAGING_KERNEL_DIR}/arch/arm/include \ | ||
49 | -I${STAGING_KERNEL_DIR}/drivers/mxc/security/rng/include \ | ||
50 | -I${STAGING_KERNEL_DIR}/drivers/mxc/security/sahara2/include" \ | ||
51 | LINUXPATH=${STAGING_KERNEL_DIR} \ | ||
52 | KBUILD_OUTPUT=${STAGING_KERNEL_BUILDDIR} \ | ||
53 | PLATFORM=${PLATFORM} | ||
54 | } | ||
55 | |||
56 | do_install() { | ||
57 | oe_runmake DESTDIR=${D}/unit_tests \ | ||
58 | PLATFORM=${PLATFORM} \ | ||
59 | install | ||
60 | |||
61 | if [ -e ${WORKDIR}/clocks.sh ]; then | ||
62 | install -m 755 ${WORKDIR}/clocks.sh ${D}/unit_tests/clocks.sh | ||
63 | fi | ||
64 | } | ||
65 | |||
66 | FILES_${PN} += "/unit_tests" | ||
67 | RDEPENDS_${PN} = "bash" | ||
68 | |||
69 | FILES_${PN}-dbg += "/unit_tests/.debug" | ||
diff --git a/meta-fsl-arm/recipes-bsp/imx-test/imx-test/Fix-build-in-OpenEmbedded-Core-environment.patch b/meta-fsl-arm/recipes-bsp/imx-test/imx-test/Fix-build-in-OpenEmbedded-Core-environment.patch deleted file mode 100644 index 7497e91d..00000000 --- a/meta-fsl-arm/recipes-bsp/imx-test/imx-test/Fix-build-in-OpenEmbedded-Core-environment.patch +++ /dev/null | |||
@@ -1,30 +0,0 @@ | |||
1 | From fd826140db0f2a867ef588cccf2e5322cc77126a Mon Sep 17 00:00:00 2001 | ||
2 | From: Otavio Salvador <otavio@ossystems.com.br> | ||
3 | Date: Mon, 19 Jan 2015 16:56:29 -0200 | ||
4 | Subject: [PATCH] Fix build in OpenEmbedded-Core environment | ||
5 | Organization: O.S. Systems Software LTDA. | ||
6 | |||
7 | Some of the unit-tests were not being built due to differences on how | ||
8 | the build system behaves when running inside of the OE-Core. This | ||
9 | fixes those minor issues and increases the number of tests available. | ||
10 | |||
11 | Upstream-Status: Pending | ||
12 | |||
13 | Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> | ||
14 | |||
15 | diff --git a/test/ar3k_bt/Makefile b/test/ar3k_bt/Makefile | ||
16 | index 92e2901..75d3e78 100755 | ||
17 | --- a/test/ar3k_bt/Makefile | ||
18 | +++ b/test/ar3k_bt/Makefile | ||
19 | @@ -21,7 +21,7 @@ all: $(OBJS) | ||
20 | CFLAGS += -lbluetooth | ||
21 | |||
22 | $(OBJDIR)/hciattach-ar3k.bin : | ||
23 | - $(CC) ${INC} -Wall -lbluetooth -g hciattach_ath3k.c hciattach.c hciattach_qualcomm.c hciattach_st.c hciattach_tialt.c hciattach_ti.c -o hciattach-ar3k.bin | ||
24 | + $(CC) ${INC} -Wall -lbluetooth -g hciattach_ath3k.c hciattach.c hciattach_qualcomm.c hciattach_st.c hciattach_tialt.c hciattach_ti.c -o $(OBJDIR)/hciattach-ar3k.bin | ||
25 | |||
26 | clean: | ||
27 | rm -f *.o hciattach-ar3k.bin | ||
28 | -- | ||
29 | 2.1.4 | ||
30 | |||
diff --git a/meta-fsl-arm/recipes-bsp/imx-test/imx-test/clocks.sh b/meta-fsl-arm/recipes-bsp/imx-test/imx-test/clocks.sh deleted file mode 100755 index 2121bef6..00000000 --- a/meta-fsl-arm/recipes-bsp/imx-test/imx-test/clocks.sh +++ /dev/null | |||
@@ -1,29 +0,0 @@ | |||
1 | #!/bin/bash | ||
2 | |||
3 | # This script is taken directly from the section 5.10 of the Freescale Application Note | ||
4 | # AN4509 and it simple prints the CPU clocks in a nice format | ||
5 | |||
6 | saved_path=$PWD | ||
7 | if ! mount|grep -sq '/sys/kernel/debug'; then | ||
8 | mount -t debugfs none /sys/kernel/debug | ||
9 | fi | ||
10 | |||
11 | printf "%-24s %-20s %3s %9s\n" "clock" "parent" "use" "flags" "rate" | ||
12 | |||
13 | for foo in $(find /sys/kernel/debug/clock -type d); do | ||
14 | if [ "$foo" = '/sys/kernel/debug/clock' ]; then | ||
15 | continue | ||
16 | fi | ||
17 | cd $foo | ||
18 | ec="$(cat usecount)" | ||
19 | rate="$(cat rate)" | ||
20 | flag="$(cat flags)" | ||
21 | clk="$(basename $foo)" | ||
22 | cd .. | ||
23 | parent="$(basename $PWD)" | ||
24 | if [ "$parent" = 'clock' ]; then | ||
25 | parent=" ---" | ||
26 | fi | ||
27 | printf "%-24s %-24s %2d %2d %10d\n" "$clk" "$parent" "$ec" "$flag" "$rate" | ||
28 | cd $saved_path | ||
29 | done | ||
diff --git a/meta-fsl-arm/recipes-bsp/imx-test/imx-test/revert_epdc_hdr_change.patch b/meta-fsl-arm/recipes-bsp/imx-test/imx-test/revert_epdc_hdr_change.patch deleted file mode 100644 index 4fb0564a..00000000 --- a/meta-fsl-arm/recipes-bsp/imx-test/imx-test/revert_epdc_hdr_change.patch +++ /dev/null | |||
@@ -1,30 +0,0 @@ | |||
1 | From e559eb0a9573b9011c03efaf42364dce67af893a Mon Sep 17 00:00:00 2001 | ||
2 | From: Lauren Post <lauren.post@freescale.com> | ||
3 | Date: Tue, 10 Sep 2013 10:58:28 -0500 | ||
4 | Subject: [PATCH] ENGR00279068-2 epdc_test_driver: Update header name change | ||
5 | of mxc_epdc.h | ||
6 | |||
7 | Upstream-Status: Pending | ||
8 | |||
9 | Signed-off-by: Lauren Post <lauren.post@freescale.com> | ||
10 | Signed-off-by: Frank Li <Frank.li@freescale.com> | ||
11 | --- | ||
12 | module_test/epdc_test_driver.c | 4 ++-- | ||
13 | 1 file changed, 1 insertions(+), 1 deletions(-) | ||
14 | |||
15 | diff --git a/module_test/epdc_test_driver.c b/module_test/epdc_test_driver.c | ||
16 | index fb15aec..447246f 100644 | ||
17 | --- a/module_test/epdc_test_driver.c | ||
18 | +++ b/module_test/epdc_test_driver.c | ||
19 | @@ -36,7 +36,7 @@ | ||
20 | |||
21 | #include <linux/device.h> | ||
22 | #include <linux/mxcfb.h> | ||
23 | -#include <linux/mxcfb_epdc.h> | ||
24 | +#include <linux/mxcfb_epdc_kernel.h> | ||
25 | |||
26 | /* major number of device */ | ||
27 | static int gMajor; | ||
28 | -- | ||
29 | 1.7.9.5 | ||
30 | |||
diff --git a/meta-fsl-arm/recipes-bsp/imx-test/imx-test_00.00.00.bb b/meta-fsl-arm/recipes-bsp/imx-test/imx-test_00.00.00.bb deleted file mode 100644 index f38dc67f..00000000 --- a/meta-fsl-arm/recipes-bsp/imx-test/imx-test_00.00.00.bb +++ /dev/null | |||
@@ -1,10 +0,0 @@ | |||
1 | SUMMARY = "Dummy package for SoCs lacking imx-test package" | ||
2 | DESCRIPTION = "Dummy package for SoCs lacking imx-test package" | ||
3 | SECTION = "base" | ||
4 | LICENSE = "MIT" | ||
5 | LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" | ||
6 | |||
7 | ALLOW_EMPTY_${PN} = "1" | ||
8 | |||
9 | PACKAGE_ARCH = "${MACHINE_ARCH}" | ||
10 | COMPATIBLE_MACHINE = "(mxs|mx3|mx5|mx6|vf50|vf60)" | ||
diff --git a/meta-fsl-arm/recipes-bsp/imx-test/imx-test_3.14.28-1.0.0.bb b/meta-fsl-arm/recipes-bsp/imx-test/imx-test_3.14.28-1.0.0.bb deleted file mode 100644 index fc2ad1d5..00000000 --- a/meta-fsl-arm/recipes-bsp/imx-test/imx-test_3.14.28-1.0.0.bb +++ /dev/null | |||
@@ -1,13 +0,0 @@ | |||
1 | # Copyright (C) 2013-2015 Freescale Semiconductor | ||
2 | |||
3 | include imx-test.inc | ||
4 | |||
5 | SRC_URI_append_mx5 = " file://revert_epdc_hdr_change.patch \ | ||
6 | file://clocks.sh" | ||
7 | SRC_URI_append_mxs = " file://revert_epdc_hdr_change.patch \ | ||
8 | file://clocks.sh" | ||
9 | |||
10 | SRC_URI[md5sum] = "f349aed49830a21cc75d305b06979205" | ||
11 | SRC_URI[sha256sum] = "ea3d572e82a374bcfc9acc654b66262cd97a246ffec9fb9fc458b19a02512723" | ||
12 | |||
13 | COMPATIBLE_MACHINE = "(mxs|mx5|mx6)" | ||
diff --git a/meta-fsl-arm/recipes-bsp/imx-uuc/imx-uuc_0.5.bb b/meta-fsl-arm/recipes-bsp/imx-uuc/imx-uuc_0.5.bb deleted file mode 100644 index b172b32c..00000000 --- a/meta-fsl-arm/recipes-bsp/imx-uuc/imx-uuc_0.5.bb +++ /dev/null | |||
@@ -1,16 +0,0 @@ | |||
1 | # Copyright (C) 2014 Freescale Semiconductor | ||
2 | # Copyright (C) 2014 O.S. Systems Software LTDA. | ||
3 | |||
4 | SUMMARY = "Universal Adapter source" | ||
5 | SECTION = "base" | ||
6 | DEPENDS = "virtual/kernel" | ||
7 | LICENSE = "GPLv2" | ||
8 | LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" | ||
9 | |||
10 | SRC_URI = "${FSL_MIRROR}/${PN}-${PV}.tar.gz" | ||
11 | SRC_URI[md5sum] = "4a82f106f85199c91a058ee54c127477" | ||
12 | SRC_URI[sha256sum] = "ec5894ab7967797c8500b4988d0aba6c6f78ef22b4a190f9db12be33df08faaf" | ||
13 | |||
14 | inherit autotools-brokensep | ||
15 | |||
16 | FILES_${PN} += "/linuxrc" | ||
diff --git a/meta-fsl-arm/recipes-bsp/imx-vpu/imx-vpu-11.09.02/obey-variables.patch b/meta-fsl-arm/recipes-bsp/imx-vpu/imx-vpu-11.09.02/obey-variables.patch deleted file mode 100644 index 13f61b27..00000000 --- a/meta-fsl-arm/recipes-bsp/imx-vpu/imx-vpu-11.09.02/obey-variables.patch +++ /dev/null | |||
@@ -1,27 +0,0 @@ | |||
1 | Obey CFLAGS, LDFLAGS | ||
2 | |||
3 | Signed-off-by: Christopher Larson <chris_larson@mentor.com> | ||
4 | Upstream-status: Pending | ||
5 | |||
6 | --- imx-vpu-11.09.02.orig/vpu/Makefile 2014-09-02 13:14:50.862005896 -0700 | ||
7 | +++ imx-vpu-11.09.02/vpu/Makefile 2014-09-02 13:15:15.018153222 -0700 | ||
8 | @@ -1,5 +1,6 @@ | ||
9 | CC ?=$(CROSS_COMPILE)gcc | ||
10 | AR ?=$(CROSS_COMPILE)ar | ||
11 | +CFLAGS ?= -O2 | ||
12 | |||
13 | # list of platforms which want this test case | ||
14 | INCLUDE_LIST:= IMX27ADS IMX51 IMX53 IMX6Q | ||
15 | @@ -33,10 +34,10 @@ | ||
16 | endif | ||
17 | |||
18 | %.o: %.c | ||
19 | - $(CC) -D$(PLATFORM) -Wall -O2 -fPIC -c $^ -o $@ | ||
20 | + $(CC) -D$(PLATFORM) -Wall -fPIC $(CFLAGS) -c $^ -o $@ | ||
21 | |||
22 | $(LIBNAME).so.$(SONAMEVERSION): $(OBJ) | ||
23 | - $(CC) -shared -nostartfiles -Wl,-soname,$@ $^ -o $@ | ||
24 | + $(CC) -shared -nostartfiles -Wl,-soname,$@ $^ -o $@ $(LDFLAGS) | ||
25 | |||
26 | $(LIBNAME).so: $(LIBNAME).so.$(SONAMEVERSION) | ||
27 | ln -s $< $@ | ||
diff --git a/meta-fsl-arm/recipes-bsp/imx-vpu/imx-vpu.inc b/meta-fsl-arm/recipes-bsp/imx-vpu/imx-vpu.inc deleted file mode 100644 index fd59770a..00000000 --- a/meta-fsl-arm/recipes-bsp/imx-vpu/imx-vpu.inc +++ /dev/null | |||
@@ -1,22 +0,0 @@ | |||
1 | # Copyright (C) 2013 Freescale Semiconductor | ||
2 | DESCRIPTION = "Freescale VPU library" | ||
3 | LICENSE = "Proprietary" | ||
4 | LIC_FILES_CHKSUM = "file://vpu/EULA.txt;md5=b063366b066c9f10037c59756a9ced54" | ||
5 | DEPENDS = "virtual/kernel" | ||
6 | inherit fsl-eula-unpack | ||
7 | |||
8 | PLATFORM_mx5 = "IMX51" | ||
9 | PLATFORM_mx6 = "IMX6Q" | ||
10 | |||
11 | SRC_URI = "${FSL_MIRROR}/${PN}-${PV}.bin;fsl-eula=true" | ||
12 | |||
13 | do_compile () { | ||
14 | INCLUDE_DIR="-I${STAGING_KERNEL_DIR}/include/uapi -I${STAGING_KERNEL_DIR}/include" | ||
15 | |||
16 | oe_runmake CROSS_COMPILE="${HOST_PREFIX}" PLATFORM="${PLATFORM}" INCLUDE="${INCLUDE_DIR}" all | ||
17 | } | ||
18 | |||
19 | do_install () { | ||
20 | oe_runmake PLATFORM="${PLATFORM}" DEST_DIR="${D}" install | ||
21 | } | ||
22 | |||
diff --git a/meta-fsl-arm/recipes-bsp/imx-vpu/imx-vpu_11.09.02.bb b/meta-fsl-arm/recipes-bsp/imx-vpu/imx-vpu_11.09.02.bb deleted file mode 100644 index c5dd9bd5..00000000 --- a/meta-fsl-arm/recipes-bsp/imx-vpu/imx-vpu_11.09.02.bb +++ /dev/null | |||
@@ -1,8 +0,0 @@ | |||
1 | # Copyright (C) 2013 Freescale Semiconductor | ||
2 | require imx-vpu.inc | ||
3 | |||
4 | SRC_URI += "file://obey-variables.patch" | ||
5 | SRC_URI[md5sum] = "1988a08687a09ef8590e66ff17ac6ed3" | ||
6 | SRC_URI[sha256sum] = "783f136aa9b9257d4bffbdaf05bdcb85d177c544c3f8a4674421ba7b065ed5c0" | ||
7 | |||
8 | COMPATIBLE_MACHINE = "(mx5)" | ||
diff --git a/meta-fsl-arm/recipes-bsp/imx-vpu/imx-vpu_5.4.28.bb b/meta-fsl-arm/recipes-bsp/imx-vpu/imx-vpu_5.4.28.bb deleted file mode 100644 index 6f691562..00000000 --- a/meta-fsl-arm/recipes-bsp/imx-vpu/imx-vpu_5.4.28.bb +++ /dev/null | |||
@@ -1,12 +0,0 @@ | |||
1 | # Copyright (C) 2013-2015 Freescale Semiconductor | ||
2 | |||
3 | require imx-vpu.inc | ||
4 | |||
5 | LIC_FILES_CHKSUM = "file://COPYING;md5=acdb807ac7275fe32f9f64992e111241" | ||
6 | |||
7 | PE = "1" | ||
8 | |||
9 | SRC_URI[md5sum] = "774455b57aaa12bae2e2cecf39b63ac4" | ||
10 | SRC_URI[sha256sum] = "0a05af1a5978175de852b2cf61763ec789f2845df78edb8d02a28611439b57f7" | ||
11 | |||
12 | COMPATIBLE_MACHINE = "(mx6)" | ||
diff --git a/meta-fsl-arm/recipes-bsp/libmcc/libmcc/build-Fix-symlink-generation.patch b/meta-fsl-arm/recipes-bsp/libmcc/libmcc/build-Fix-symlink-generation.patch deleted file mode 100644 index 0aebe00b..00000000 --- a/meta-fsl-arm/recipes-bsp/libmcc/libmcc/build-Fix-symlink-generation.patch +++ /dev/null | |||
@@ -1,32 +0,0 @@ | |||
1 | From adef7a71a3bd40650685183c8a023000423ec880 Mon Sep 17 00:00:00 2001 | ||
2 | From: Otavio Salvador <otavio@ossystems.com.br> | ||
3 | Date: Tue, 6 Jan 2015 12:03:27 -0200 | ||
4 | Subject: [PATCH] build: Fix symlink generation | ||
5 | Organization: O.S. Systems Software LTDA. | ||
6 | |||
7 | Upstream-Status: Pending | ||
8 | |||
9 | Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> | ||
10 | --- | ||
11 | Makefile | 5 ++--- | ||
12 | 1 file changed, 2 insertions(+), 3 deletions(-) | ||
13 | |||
14 | diff --git a/Makefile b/Makefile | ||
15 | index ac46f5c..248b2eb 100644 | ||
16 | --- a/Makefile | ||
17 | +++ b/Makefile | ||
18 | @@ -14,9 +14,8 @@ install: | ||
19 | mkdir -p $(DESTDIR)/usr/include $(DESTDIR)/usr/lib | ||
20 | cp -f build/libmcc.so.* build/libmcc.a $(DESTDIR)/usr/lib | ||
21 | cp -f include/*.h $(DESTDIR)/usr/include | ||
22 | - cd $(DESTDIR)/usr/lib/ | ||
23 | - ln -sf libmcc.so.1.0 libmcc.so.1 | ||
24 | - ln -sf libmcc.so.1 libmcc.so | ||
25 | + ln -sf libmcc.so.1.0 $(DESTDIR)/usr/lib/libmcc.so.1 | ||
26 | + ln -sf libmcc.so.1 $(DESTDIR)/usr/lib/libmcc.so | ||
27 | |||
28 | clean: | ||
29 | rm -rf build | ||
30 | -- | ||
31 | 2.1.4 | ||
32 | |||
diff --git a/meta-fsl-arm/recipes-bsp/libmcc/libmcc/build-with-versioned-soname.patch b/meta-fsl-arm/recipes-bsp/libmcc/libmcc/build-with-versioned-soname.patch deleted file mode 100644 index d004b78a..00000000 --- a/meta-fsl-arm/recipes-bsp/libmcc/libmcc/build-with-versioned-soname.patch +++ /dev/null | |||
@@ -1,18 +0,0 @@ | |||
1 | libmcc: build with versioned soname | ||
2 | |||
3 | This adds a versioned soname to the shared library during linking. | ||
4 | Otherwise an application linked with '-lmcc' needs libmcc.so for execution, | ||
5 | having libmcc.so.1 would not be enough. | ||
6 | |||
7 | Signed-off-by: Max Krummenacher <max.oss.09@gmail.com> | ||
8 | --- a/Makefile 2015-01-07 17:09:13.657675270 +0100 | ||
9 | +++ b/Makefile 2015-01-07 17:21:19.457545709 +0100 | ||
10 | @@ -8,7 +8,7 @@ | ||
11 | $(AR) rcs $@ $< | ||
12 | |||
13 | build/libmcc.so.1.0: build/libmcc.o | ||
14 | - $(CC) -shared -o $@ $< | ||
15 | + $(CC) -shared -Wl,-soname,libmcc.so.1 -o $@ $< -lc | ||
16 | |||
17 | install: | ||
18 | mkdir -p $(DESTDIR)/usr/include $(DESTDIR)/usr/lib | ||
diff --git a/meta-fsl-arm/recipes-bsp/libmcc/libmcc_1.05.bb b/meta-fsl-arm/recipes-bsp/libmcc/libmcc_1.05.bb deleted file mode 100644 index 1140ed18..00000000 --- a/meta-fsl-arm/recipes-bsp/libmcc/libmcc_1.05.bb +++ /dev/null | |||
@@ -1,27 +0,0 @@ | |||
1 | # Copyright (C) 2013 Timesys Corporation | ||
2 | SUMMARY = "Multicore communication Library" | ||
3 | LICENSE = "GPL-2.0" | ||
4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=c49712341497d0b5f2e40c30dff2af9d" | ||
5 | |||
6 | DEPENDS = "virtual/kernel-module-mcc" | ||
7 | |||
8 | SRC_URI = "http://repository.timesys.com/buildsources/l/libmcc/libmcc-${PV}/libmcc-${PV}.tar.bz2 \ | ||
9 | file://build-Fix-symlink-generation.patch \ | ||
10 | file://build-with-versioned-soname.patch" | ||
11 | |||
12 | SRC_URI[md5sum] = "cc3965f162dd20b8e6b9babf5dd963ee" | ||
13 | SRC_URI[sha256sum] = "b98c1f857bf851e41c35c4fcdb823e83e0e058c746dffb50038c8759c8c1e104" | ||
14 | |||
15 | S = "${WORKDIR}/libmcc-${PV}" | ||
16 | |||
17 | CFLAGS += "-I${STAGING_KERNEL_DIR}/include" | ||
18 | |||
19 | RDEPENDS_${PN} = "virtual/kernel-module-mcc" | ||
20 | |||
21 | COMPATIBLE_MACHINE = "(vf60)" | ||
22 | |||
23 | do_install() { | ||
24 | oe_runmake 'DESTDIR=${D}' install | ||
25 | } | ||
26 | |||
27 | RDEPENDS_${PN}-dev += "virtual/kernel-module-mcc-dev" | ||
diff --git a/meta-fsl-arm/recipes-bsp/mqxboot/mqxboot_1.0.bb b/meta-fsl-arm/recipes-bsp/mqxboot/mqxboot_1.0.bb deleted file mode 100644 index 7f11a984..00000000 --- a/meta-fsl-arm/recipes-bsp/mqxboot/mqxboot_1.0.bb +++ /dev/null | |||
@@ -1,23 +0,0 @@ | |||
1 | # Copyright (C) 2013 Timesys Corporation | ||
2 | SUMMARY = "MQX Image loader - starts an MQX image on the M4" | ||
3 | LICENSE = "GPL-2.0" | ||
4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=c49712341497d0b5f2e40c30dff2af9d" | ||
5 | |||
6 | DEPENDS = "virtual/kernel-module-mcc" | ||
7 | |||
8 | SRC_URI = "http://repository.timesys.com/buildsources/m/mqxboot/mqxboot-${PV}/mqxboot-${PV}.tar.bz2" | ||
9 | |||
10 | SRC_URI[md5sum] = "3de3c8b5f8cd6664870587d29c04c421" | ||
11 | SRC_URI[sha256sum] = "c2f66ae962fe2529578d5c007e3f91a36085b714a0ea276f47bc3aea90e69699" | ||
12 | |||
13 | S = "${WORKDIR}/mqxboot-${PV}" | ||
14 | |||
15 | CFLAGS += "-I${STAGING_KERNEL_DIR}/include" | ||
16 | |||
17 | RDEPENDS_${PN} = "virtual/kernel-module-mcc" | ||
18 | |||
19 | COMPATIBLE_MACHINE = "(vf60)" | ||
20 | |||
21 | do_install() { | ||
22 | oe_runmake 'DESTDIR=${D}' install | ||
23 | } | ||
diff --git a/meta-fsl-arm/recipes-bsp/mxsldr/mxsldr_git.bb b/meta-fsl-arm/recipes-bsp/mxsldr/mxsldr_git.bb deleted file mode 100644 index 497f6a19..00000000 --- a/meta-fsl-arm/recipes-bsp/mxsldr/mxsldr_git.bb +++ /dev/null | |||
@@ -1,18 +0,0 @@ | |||
1 | # Copyright (C) 2012 O.S. Systems Software LTDA. | ||
2 | # Released under the MIT license (see COPYING.MIT for the terms) | ||
3 | |||
4 | DESCRIPTION = "Freescale i.MX233/i.MX28 USB loader" | ||
5 | DEPENDS = "libusb" | ||
6 | LICENSE = "GPLv2+" | ||
7 | LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" | ||
8 | |||
9 | SRCREV = "c40d80472525e1d57dae5317c028b745968c0399" | ||
10 | SRC_URI = "git://git.denx.de/mxsldr.git" | ||
11 | |||
12 | PV = "0.0.0+git${SRCPV}" | ||
13 | |||
14 | S = "${WORKDIR}/git" | ||
15 | |||
16 | inherit autotools-brokensep | ||
17 | |||
18 | BBCLASSEXTEND = "native nativesdk" | ||
diff --git a/meta-fsl-arm/recipes-bsp/qe-ucode/qe-ucode_git.bb b/meta-fsl-arm/recipes-bsp/qe-ucode/qe-ucode_git.bb deleted file mode 100644 index 28af4b65..00000000 --- a/meta-fsl-arm/recipes-bsp/qe-ucode/qe-ucode_git.bb +++ /dev/null | |||
@@ -1,36 +0,0 @@ | |||
1 | DESCRIPTION = "qe microcode binary" | ||
2 | SECTION = "qe-ucode" | ||
3 | LICENSE = "Freescale-EULA" | ||
4 | LIC_FILES_CHKSUM = "file://EULA;md5=60037ccba533a5995e8d1a838d85799c" | ||
5 | |||
6 | inherit deploy | ||
7 | |||
8 | SRC_URI = "git://git.freescale.com/ppc/sdk/qe-ucode.git;nobranch=1" | ||
9 | SRCREV= "49efc94b553de5c2a9bd28093592eff0068e161c" | ||
10 | |||
11 | S = "${WORKDIR}/git" | ||
12 | |||
13 | python () { | ||
14 | if not d.getVar("QE_UCODE", True): | ||
15 | PN = d.getVar("PN", True) | ||
16 | FILE = os.path.basename(d.getVar("FILE", True)) | ||
17 | bb.debug(1, "To build %s, see %s for instructions on \ | ||
18 | setting up your qe-ucode" % (PN, FILE)) | ||
19 | raise bb.parse.SkipPackage("because QE_UCODE is not set") | ||
20 | } | ||
21 | |||
22 | do_install () { | ||
23 | install -d ${D}/boot | ||
24 | install -m 644 ${QE_UCODE} ${D}/boot | ||
25 | } | ||
26 | |||
27 | do_deploy () { | ||
28 | install -d ${DEPLOYDIR}/boot | ||
29 | install -m 644 ${QE_UCODE} ${DEPLOYDIR}/boot | ||
30 | } | ||
31 | addtask deploy before do_build after do_install | ||
32 | |||
33 | PACKAGES += "${PN}-image" | ||
34 | FILES_${PN}-image += "/boot/*" | ||
35 | ALLOW_EMPTY_${PN} = "1" | ||
36 | COMPATIBLE_MACHINE = "(ls102xa)" | ||
diff --git a/meta-fsl-arm/recipes-bsp/rcw/rcw/rcw-make-BOARDS-DESTDIR-overidable-in-Makefile.patch b/meta-fsl-arm/recipes-bsp/rcw/rcw/rcw-make-BOARDS-DESTDIR-overidable-in-Makefile.patch deleted file mode 100644 index 49d99fc5..00000000 --- a/meta-fsl-arm/recipes-bsp/rcw/rcw/rcw-make-BOARDS-DESTDIR-overidable-in-Makefile.patch +++ /dev/null | |||
@@ -1,57 +0,0 @@ | |||
1 | From f2e796c903b2a3f81dbd38da3dc087cb7539d307 Mon Sep 17 00:00:00 2001 | ||
2 | From: Zhenhua Luo <zhenhua.luo@freescale.com> | ||
3 | Date: Wed, 3 Sep 2014 03:03:42 -0500 | ||
4 | Subject: [PATCH] Makefile: make BOARDS/DESTDIR overidable and add endian | ||
5 | switch | ||
6 | |||
7 | 1. For one specific board, no need to build the rcw for all supported | ||
8 | targets, make BOARDS and DESTDIR overridable to achieve this. | ||
9 | 2. Add the endian swap for qspiboot rcw | ||
10 | |||
11 | Upstream-Status: Pending | ||
12 | |||
13 | Signed-off-by: Zhenhua Luo <zhenhua.luo@freescale.com> | ||
14 | --- | ||
15 | Makefile | 4 ++-- | ||
16 | Makefile.inc | 9 +++++++-- | ||
17 | 2 files changed, 9 insertions(+), 4 deletions(-) | ||
18 | |||
19 | diff --git a/Makefile b/Makefile | ||
20 | index 6ec1697..0f94293 100644 | ||
21 | --- a/Makefile | ||
22 | +++ b/Makefile | ||
23 | @@ -1,5 +1,5 @@ | ||
24 | -DESTDIR = . | ||
25 | -BOARDS = b4420qds b4860qds \ | ||
26 | +DESTDIR ?= . | ||
27 | +BOARDS ?= b4420qds b4860qds \ | ||
28 | ls1021aqds ls1021atwr \ | ||
29 | p2041rdb p3041ds p4080ds p5020ds p5040ds \ | ||
30 | t1024qds t1023rdb t1024rdb t1040rdb t1042rdb t1042rdb_pi t1040qds \ | ||
31 | diff --git a/Makefile.inc b/Makefile.inc | ||
32 | index 4cadb2e..6e8b78f 100644 | ||
33 | --- a/Makefile.inc | ||
34 | +++ b/Makefile.inc | ||
35 | @@ -1,4 +1,4 @@ | ||
36 | -DESTDIR = . | ||
37 | +DESTDIR ?= . | ||
38 | INSTALL = install | ||
39 | PYTHON ?= python2 | ||
40 | RCW = $(PYTHON) ../rcw.py | ||
41 | @@ -18,7 +18,12 @@ all: $(targets) | ||
42 | install: $(targets) | ||
43 | $(INSTALL) -d $(DESTDIR) | ||
44 | @for file in $^; do \ | ||
45 | - $(INSTALL) -m 644 -D $$file $(DESTDIR)/$$file; \ | ||
46 | + case $$file in \ | ||
47 | + *qspiboot*) file_swap="`echo $$file | sed -e 's/qspiboot/qspiboot_swap/'`"; \ | ||
48 | + tclsh byte_swap.tcl $$file $$file_swap 8 ; \ | ||
49 | + $(INSTALL) -m 644 -D $$file_swap $(DESTDIR)/$$file_swap ;; \ | ||
50 | + *) $(INSTALL) -m 644 -D $$file $(DESTDIR)/$$file; \ | ||
51 | + esac \ | ||
52 | done | ||
53 | $(INSTALL) -m 644 -D README $(DESTDIR) | ||
54 | |||
55 | -- | ||
56 | 1.7.9.7 | ||
57 | |||
diff --git a/meta-fsl-arm/recipes-bsp/rcw/rcw_git.bb b/meta-fsl-arm/recipes-bsp/rcw/rcw_git.bb deleted file mode 100644 index 2a03309c..00000000 --- a/meta-fsl-arm/recipes-bsp/rcw/rcw_git.bb +++ /dev/null | |||
@@ -1,36 +0,0 @@ | |||
1 | SUMMARY = "Reset Configuration Word" | ||
2 | DESCRIPTION = "Reset Configuration Word - hardware boot-time parameters for the QorIQ targets" | ||
3 | LICENSE = "BSD" | ||
4 | LIC_FILES_CHKSUM = "file://rcw.py;beginline=8;endline=28;md5=9ba0b28922dd187b06b6c8ebcfdd208e" | ||
5 | |||
6 | DEPENDS += "change-file-endianess-native" | ||
7 | |||
8 | inherit deploy | ||
9 | |||
10 | SRCBRANCH = "master" | ||
11 | SRCREV = "426f7a6535d93dac76f5125035e0938a85e778d2" | ||
12 | SRC_URI = "git://git.freescale.com/ppc/sdk/rcw.git;branch=${SRCBRANCH} \ | ||
13 | file://rcw-make-BOARDS-DESTDIR-overidable-in-Makefile.patch \ | ||
14 | " | ||
15 | |||
16 | S = "${WORKDIR}/git" | ||
17 | |||
18 | EXTRA_OEMAKE = "BOARDS=${@d.getVar('MACHINE', True).replace('-64b','')} DESTDIR=${D}/boot/rcw/" | ||
19 | |||
20 | do_install () { | ||
21 | oe_runmake install | ||
22 | } | ||
23 | |||
24 | do_deploy () { | ||
25 | install -d ${DEPLOYDIR}/rcw | ||
26 | cp -r ${D}/boot/rcw/* ${DEPLOYDIR}/rcw/ | ||
27 | } | ||
28 | addtask deploy after do_install | ||
29 | |||
30 | PACKAGES += "${PN}-image" | ||
31 | FILES_${PN}-image += "/boot" | ||
32 | |||
33 | ALLOW_EMPTY_${PN} = "1" | ||
34 | |||
35 | PACKAGE_ARCH = "${MACHINE_ARCH}" | ||
36 | COMPATIBLE_MACHINE = "(ls102xa)" | ||
diff --git a/meta-fsl-arm/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2015.04.bb b/meta-fsl-arm/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2015.04.bb deleted file mode 100644 index 3981b604..00000000 --- a/meta-fsl-arm/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2015.04.bb +++ /dev/null | |||
@@ -1,35 +0,0 @@ | |||
1 | DESCRIPTION = "U-boot bootloader mxsboot tool" | ||
2 | LICENSE = "GPLv2+" | ||
3 | LIC_FILES_CHKSUM = "file://Licenses/README;md5=c7383a594871c03da76b3707929d2919" | ||
4 | SECTION = "bootloader" | ||
5 | DEPENDS = "openssl" | ||
6 | PROVIDES = "u-boot-mxsboot" | ||
7 | |||
8 | PV = "v2015.04+git${SRCPV}" | ||
9 | |||
10 | SRCREV = "10aced37cecf117e54e71bd700228f57dc34e579" | ||
11 | SRCBRANCH = "patches-2015.04" | ||
12 | |||
13 | SRC_URI = "git://github.com/Freescale/u-boot-fslc.git;branch=${SRCBRANCH}" | ||
14 | |||
15 | S = "${WORKDIR}/git" | ||
16 | |||
17 | inherit fsl-u-boot-localversion | ||
18 | |||
19 | EXTRA_OEMAKE = 'HOSTCC="${CC} ${CPPFLAGS}" HOSTLDFLAGS="-L${libdir} -L${base_libdir}" HOSTSTRIP=true CONFIG_MX28=y' | ||
20 | |||
21 | do_configure () { | ||
22 | oe_runmake sandbox_defconfig | ||
23 | } | ||
24 | |||
25 | do_compile () { | ||
26 | oe_runmake tools-only | ||
27 | } | ||
28 | |||
29 | do_install () { | ||
30 | install -d ${D}${bindir} | ||
31 | install -m 0755 tools/mxsboot ${D}${bindir}/uboot-mxsboot | ||
32 | ln -sf uboot-mxsboot ${D}${bindir}/mxsboot | ||
33 | } | ||
34 | |||
35 | BBCLASSEXTEND = "native nativesdk" | ||
diff --git a/meta-fsl-arm/recipes-bsp/u-boot/u-boot-fslc.inc b/meta-fsl-arm/recipes-bsp/u-boot/u-boot-fslc.inc deleted file mode 100644 index 07fb5074..00000000 --- a/meta-fsl-arm/recipes-bsp/u-boot/u-boot-fslc.inc +++ /dev/null | |||
@@ -1,33 +0,0 @@ | |||
1 | # Copyright (C) 2012-2014 O.S. Systems Software LTDA. | ||
2 | # Released under the MIT license (see COPYING.MIT for the terms) | ||
3 | |||
4 | require recipes-bsp/u-boot/u-boot.inc | ||
5 | |||
6 | inherit fsl-u-boot-localversion | ||
7 | |||
8 | DESCRIPTION = "U-Boot based on mainline U-Boot used by FSL Community BSP in \ | ||
9 | order to provide support for some backported features and fixes, or because it \ | ||
10 | was submitted for revision and it takes some time to become part of a stable \ | ||
11 | version, or because it is not applicable for upstreaming." | ||
12 | LICENSE = "GPLv2+" | ||
13 | LIC_FILES_CHKSUM = "file://Licenses/README;md5=c7383a594871c03da76b3707929d2919" | ||
14 | COMPATIBLE_MACHINE = "(mxs|mx3|mx5|mx6|vf)" | ||
15 | |||
16 | DEPENDS_mxs += "elftosb-native openssl-native" | ||
17 | |||
18 | PROVIDES += "u-boot" | ||
19 | |||
20 | SRCBRANCH ??= "master" | ||
21 | |||
22 | SRC_URI = "git://github.com/Freescale/u-boot-fslc.git;branch=${SRCBRANCH}" | ||
23 | |||
24 | S = "${WORKDIR}/git" | ||
25 | |||
26 | # FIXME: Allow linking of 'tools' binaries with native libraries | ||
27 | # used for generating the boot logo and other tools used | ||
28 | # during the build process. | ||
29 | EXTRA_OEMAKE += 'HOSTCC="${BUILD_CC} ${BUILD_CPPFLAGS}" \ | ||
30 | HOSTLDFLAGS="${BUILD_LDFLAGS}" \ | ||
31 | HOSTSTRIP=true' | ||
32 | |||
33 | PACKAGE_ARCH = "${MACHINE_ARCH}" | ||
diff --git a/meta-fsl-arm/recipes-bsp/u-boot/u-boot-fslc_2015.04.bb b/meta-fsl-arm/recipes-bsp/u-boot/u-boot-fslc_2015.04.bb deleted file mode 100644 index aeefc5a9..00000000 --- a/meta-fsl-arm/recipes-bsp/u-boot/u-boot-fslc_2015.04.bb +++ /dev/null | |||
@@ -1,6 +0,0 @@ | |||
1 | include u-boot-fslc.inc | ||
2 | |||
3 | PV = "v2015.04+git${SRCPV}" | ||
4 | |||
5 | SRCREV = "5d9ffd22149119c0acfd31efb8c4d40afca7ce6f" | ||
6 | SRCBRANCH = "patches-2015.04" | ||
diff --git a/meta-fsl-arm/recipes-bsp/u-boot/u-boot-imx-mfgtool_2014.04.bb b/meta-fsl-arm/recipes-bsp/u-boot/u-boot-imx-mfgtool_2014.04.bb deleted file mode 100644 index f66114c7..00000000 --- a/meta-fsl-arm/recipes-bsp/u-boot/u-boot-imx-mfgtool_2014.04.bb +++ /dev/null | |||
@@ -1,4 +0,0 @@ | |||
1 | # Copyright (C) 2014 O.S. Systems Software LTDA. | ||
2 | |||
3 | require u-boot-imx_${PV}.bb | ||
4 | require u-boot-mfgtool.inc | ||
diff --git a/meta-fsl-arm/recipes-bsp/u-boot/u-boot-imx/mx53_loco_bootenv.patch b/meta-fsl-arm/recipes-bsp/u-boot/u-boot-imx/mx53_loco_bootenv.patch deleted file mode 100644 index 4b0ac9bf..00000000 --- a/meta-fsl-arm/recipes-bsp/u-boot/u-boot-imx/mx53_loco_bootenv.patch +++ /dev/null | |||
@@ -1,51 +0,0 @@ | |||
1 | diff --git a/include/configs/mx53_loco.h b/include/configs/mx53_loco.h | ||
2 | index 0f57f78..e8a6414 100644 | ||
3 | --- a/include/configs/mx53_loco.h | ||
4 | +++ b/include/configs/mx53_loco.h | ||
5 | @@ -114,22 +114,30 @@ | ||
6 | #define CONFIG_RD_LOADADDR (CONFIG_LOADADDR + 0x300000) | ||
7 | |||
8 | #define CONFIG_EXTRA_ENV_SETTINGS \ | ||
9 | - "netdev=eth0\0" \ | ||
10 | - "ethprime=FEC0\0" \ | ||
11 | - "uboot=u-boot.bin\0" \ | ||
12 | - "kernel=uImage\0" \ | ||
13 | - "nfsroot=/opt/eldk/arm\0" \ | ||
14 | - "bootargs_base=setenv bootargs console=ttymxc0,115200\0"\ | ||
15 | - "bootargs_nfs=setenv bootargs ${bootargs} root=/dev/nfs "\ | ||
16 | - "ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp\0"\ | ||
17 | - "bootcmd_net=run bootargs_base bootargs_nfs; " \ | ||
18 | - "tftpboot ${loadaddr} ${kernel}; bootm\0" \ | ||
19 | - "bootargs_mmc=setenv bootargs ${bootargs} ip=dhcp " \ | ||
20 | - "root=/dev/mmcblk0p1 rootwait rw\0" \ | ||
21 | - "bootcmd_mmc=run bootargs_base bootargs_mmc; " \ | ||
22 | - "mmc dev 0; " \ | ||
23 | - "mmc read ${loadaddr} 0x800 0x1800; bootm\0" \ | ||
24 | - "bootcmd=run bootcmd_mmc\0" \ | ||
25 | + "script=boot.scr\0" \ | ||
26 | + "uimage=uImage\0" \ | ||
27 | + "mmcdev=0\0" \ | ||
28 | + "mmcpart=1\0" \ | ||
29 | + "mmcroot=/dev/mmcblk0p2 rw\0" \ | ||
30 | + "mmcrootfstype=ext3 rootwait\0" \ | ||
31 | + "mmcargs=setenv bootargs console=ttymxc0,${baudrate} " \ | ||
32 | + "root=${mmcroot} " \ | ||
33 | + "rootfstype=${mmcrootfstype}\0" \ | ||
34 | + "loadbootscript=" \ | ||
35 | + "fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \ | ||
36 | + "bootscript=echo Running bootscript from mmc ...; " \ | ||
37 | + "source\0" \ | ||
38 | + "loaduimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${uimage}\0" \ | ||
39 | + "mmcboot=echo Booting from mmc ...; " \ | ||
40 | + "run mmcargs; " \ | ||
41 | + "bootm\0" \ | ||
42 | + "netargs=setenv bootargs console=ttymxc0,${baudrate} " \ | ||
43 | + "root=/dev/nfs " \ | ||
44 | + "ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp\0" \ | ||
45 | + "netboot=echo Booting from net ...; " \ | ||
46 | + "run netargs; " \ | ||
47 | + "dhcp ${uimage}; bootm\0" \ | ||
48 | + "bootcmd=run loaduimage; run mmcboot;\0" \ | ||
49 | \ | ||
50 | |||
51 | |||
diff --git a/meta-fsl-arm/recipes-bsp/u-boot/u-boot-imx/mx6dl_sabresd-Change-default-environment-to-work-wit.patch b/meta-fsl-arm/recipes-bsp/u-boot/u-boot-imx/mx6dl_sabresd-Change-default-environment-to-work-wit.patch deleted file mode 100644 index da4a771e..00000000 --- a/meta-fsl-arm/recipes-bsp/u-boot/u-boot-imx/mx6dl_sabresd-Change-default-environment-to-work-wit.patch +++ /dev/null | |||
@@ -1,67 +0,0 @@ | |||
1 | From 7ae3e4c665bd27111ee8ae2b801251b1d32f44cc Mon Sep 17 00:00:00 2001 | ||
2 | From: Daiane Angolini <daiane.angolini@freescale.com> | ||
3 | Date: Wed, 20 Mar 2013 03:57:54 -0500 | ||
4 | Subject: [PATCH] mx6dl_sabresd: Change default environment to work with OE | ||
5 | |||
6 | Upstream-Status: Inappropriate [configuration] | ||
7 | |||
8 | Signed-off-by: Daiane Angolini <daiane.angolini@freescale.com> | ||
9 | --- | ||
10 | include/configs/mx6dl_sabresd.h | 41 ++++++++++++++++++++++---------------- | ||
11 | 1 files changed, 24 insertions(+), 17 deletions(-) | ||
12 | |||
13 | diff --git a/include/configs/mx6dl_sabresd.h b/include/configs/mx6dl_sabresd.h | ||
14 | index a496453..6499d25 100644 | ||
15 | --- a/include/configs/mx6dl_sabresd.h | ||
16 | +++ b/include/configs/mx6dl_sabresd.h | ||
17 | @@ -121,23 +121,30 @@ | ||
18 | #define CONFIG_RD_LOADADDR (CONFIG_LOADADDR + 0x300000) | ||
19 | |||
20 | #define CONFIG_EXTRA_ENV_SETTINGS \ | ||
21 | - "netdev=eth0\0" \ | ||
22 | - "ethprime=FEC0\0" \ | ||
23 | - "uboot=u-boot.bin\0" \ | ||
24 | - "kernel=uImage\0" \ | ||
25 | - "nfsroot=/opt/eldk/arm\0" \ | ||
26 | - "bootargs_base=setenv bootargs console=ttymxc0,115200\0"\ | ||
27 | - "bootargs_nfs=setenv bootargs ${bootargs} root=/dev/nfs "\ | ||
28 | - "ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp\0"\ | ||
29 | - "bootcmd_net=run bootargs_base bootargs_nfs; " \ | ||
30 | - "tftpboot ${loadaddr} ${kernel}; bootm\0" \ | ||
31 | - "bootargs_mmc=setenv bootargs ${bootargs} ip=dhcp " \ | ||
32 | - "root=/dev/mmcblk0p1 rootwait\0" \ | ||
33 | - "bootcmd_mmc=run bootargs_base bootargs_mmc; " \ | ||
34 | - "mmc dev 3; " \ | ||
35 | - "mmc read ${loadaddr} 0x800 0x2000; bootm\0" \ | ||
36 | - "bootcmd=run bootcmd_net\0" \ | ||
37 | - | ||
38 | + "script=boot.scr\0" \ | ||
39 | + "uimage=uImage\0" \ | ||
40 | + "mmcdev=2\0" \ | ||
41 | + "mmcpart=1\0" \ | ||
42 | + "mmcroot=/dev/mmcblk1p2 rw\0" \ | ||
43 | + "mmcrootfstype=ext3 rootwait\0" \ | ||
44 | + "mmcargs=setenv bootargs console=ttymxc0,${baudrate} " \ | ||
45 | + "root=${mmcroot} " \ | ||
46 | + "rootfstype=${mmcrootfstype}\0" \ | ||
47 | + "loadbootscript=" \ | ||
48 | + "fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \ | ||
49 | + "bootscript=echo Running bootscript from mmc ...; " \ | ||
50 | + "source\0" \ | ||
51 | + "loaduimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${uimage}\0" \ | ||
52 | + "mmcboot=echo Booting from mmc ...; " \ | ||
53 | + "run mmcargs; " \ | ||
54 | + "bootm\0" \ | ||
55 | + "netargs=setenv bootargs console=ttymxc0,${baudrate} " \ | ||
56 | + "root=/dev/nfs " \ | ||
57 | + "ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp\0" \ | ||
58 | + "netboot=echo Booting from net ...; " \ | ||
59 | + "run netargs; " \ | ||
60 | + "dhcp ${uimage}; bootm\0" \ | ||
61 | + "bootcmd=run loaduimage; run mmcboot;\0" \ | ||
62 | |||
63 | #define CONFIG_ARP_TIMEOUT 200UL | ||
64 | |||
65 | -- | ||
66 | 1.7.5.4 | ||
67 | |||
diff --git a/meta-fsl-arm/recipes-bsp/u-boot/u-boot-imx/mx6q_sabreauto-Fix-the-patch-for-the-default-environ.patch b/meta-fsl-arm/recipes-bsp/u-boot/u-boot-imx/mx6q_sabreauto-Fix-the-patch-for-the-default-environ.patch deleted file mode 100644 index 80ef444f..00000000 --- a/meta-fsl-arm/recipes-bsp/u-boot/u-boot-imx/mx6q_sabreauto-Fix-the-patch-for-the-default-environ.patch +++ /dev/null | |||
@@ -1,66 +0,0 @@ | |||
1 | From a81c7686f8c0c4fc6e88228f215092c00d4714c1 Mon Sep 17 00:00:00 2001 | ||
2 | From: Daiane Angolini <daiane.angolini@freescale.com> | ||
3 | Date: Tue, 30 Oct 2012 07:47:59 -0500 | ||
4 | Subject: [PATCH] mx6q_sabreauto: Fix the patch for the default environment | ||
5 | variable | ||
6 | |||
7 | Signed-off-by: Daiane Angolini <daiane.angolini@freescale.com> | ||
8 | --- | ||
9 | include/configs/mx6q_sabreauto.h | 41 ++++++++++++++++++++++--------------- | ||
10 | 1 files changed, 24 insertions(+), 17 deletions(-) | ||
11 | |||
12 | diff --git a/include/configs/mx6q_sabreauto.h b/include/configs/mx6q_sabreauto.h | ||
13 | index 5f8f02c..5910eca 100644 | ||
14 | --- a/include/configs/mx6q_sabreauto.h | ||
15 | +++ b/include/configs/mx6q_sabreauto.h | ||
16 | @@ -121,23 +121,30 @@ | ||
17 | #define CONFIG_RD_LOADADDR (CONFIG_LOADADDR + 0x300000) | ||
18 | |||
19 | #define CONFIG_EXTRA_ENV_SETTINGS \ | ||
20 | - "netdev=eth0\0" \ | ||
21 | - "ethprime=FEC0\0" \ | ||
22 | - "uboot=u-boot.bin\0" \ | ||
23 | - "kernel=uImage\0" \ | ||
24 | - "nfsroot=/opt/eldk/arm\0" \ | ||
25 | - "bootargs_base=setenv bootargs console=ttymxc3,115200\0"\ | ||
26 | - "bootargs_nfs=setenv bootargs ${bootargs} root=/dev/nfs "\ | ||
27 | - "ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp\0"\ | ||
28 | - "bootcmd_net=run bootargs_base bootargs_nfs; " \ | ||
29 | - "tftpboot ${loadaddr} ${kernel}; bootm\0" \ | ||
30 | - "bootargs_mmc=setenv bootargs ${bootargs} " \ | ||
31 | - "root=/dev/mmcblk0p1 rootwait\0" \ | ||
32 | - "bootcmd_mmc=run bootargs_base bootargs_mmc; " \ | ||
33 | - "mmc dev 2; " \ | ||
34 | - "mmc read ${loadaddr} 0x800 0x2000; bootm\0" \ | ||
35 | - "bootcmd=run bootcmd_mmc\0" \ | ||
36 | - | ||
37 | + "script=boot.scr\0" \ | ||
38 | + "uimage=uImage\0" \ | ||
39 | + "mmcdev=2\0" \ | ||
40 | + "mmcpart=1\0" \ | ||
41 | + "mmcroot=/dev/mmcblk0p2 rw\0" \ | ||
42 | + "mmcrootfstype=ext3 rootwait\0" \ | ||
43 | + "mmcargs=setenv bootargs console=ttymxc3,${baudrate} " \ | ||
44 | + "root=${mmcroot} " \ | ||
45 | + "rootfstype=${mmcrootfstype}\0" \ | ||
46 | + "loadbootscript=" \ | ||
47 | + "fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \ | ||
48 | + "bootscript=echo Running bootscript from mmc ...; " \ | ||
49 | + "source\0" \ | ||
50 | + "loaduimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${uimage}\0" \ | ||
51 | + "mmcboot=echo Booting from mmc ...; " \ | ||
52 | + "run mmcargs; " \ | ||
53 | + "bootm\0" \ | ||
54 | + "netargs=setenv bootargs console=ttymxc3,${baudrate} " \ | ||
55 | + "root=/dev/nfs " \ | ||
56 | + "ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp\0" \ | ||
57 | + "netboot=echo Booting from net ...; " \ | ||
58 | + "run netargs; " \ | ||
59 | + "dhcp ${uimage}; bootm\0" \ | ||
60 | + "bootcmd=run loaduimage; run mmcboot;\0" \ | ||
61 | |||
62 | #define CONFIG_ARP_TIMEOUT 200UL | ||
63 | |||
64 | -- | ||
65 | 1.7.5.4 | ||
66 | |||
diff --git a/meta-fsl-arm/recipes-bsp/u-boot/u-boot-imx/mx6q_sabresd-Change-default-environment-to-work-with.patch b/meta-fsl-arm/recipes-bsp/u-boot/u-boot-imx/mx6q_sabresd-Change-default-environment-to-work-with.patch deleted file mode 100644 index bf85800f..00000000 --- a/meta-fsl-arm/recipes-bsp/u-boot/u-boot-imx/mx6q_sabresd-Change-default-environment-to-work-with.patch +++ /dev/null | |||
@@ -1,66 +0,0 @@ | |||
1 | From 970f04b228a60c805cce41ef8403ba2c8cb56d97 Mon Sep 17 00:00:00 2001 | ||
2 | From: Otavio Salvador <otavio@ossystems.com.br> | ||
3 | Date: Wed, 13 Feb 2013 15:15:28 -0200 | ||
4 | Subject: [PATCH] mx6q_sabresd: Change default environment to work with OE | ||
5 | |||
6 | Upstream-Status: Inappropriate [configuration] | ||
7 | |||
8 | Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> | ||
9 | --- | ||
10 | include/configs/mx6q_sabresd.h | 40 ++++++++++++++++++++++++---------------- | ||
11 | 1 file changed, 24 insertions(+), 16 deletions(-) | ||
12 | |||
13 | diff --git a/include/configs/mx6q_sabresd.h b/include/configs/mx6q_sabresd.h | ||
14 | index 6f07961..db31a34 100644 | ||
15 | --- a/include/configs/mx6q_sabresd.h | ||
16 | +++ b/include/configs/mx6q_sabresd.h | ||
17 | @@ -116,22 +116,30 @@ | ||
18 | #define CONFIG_RD_LOADADDR (0x1300000) | ||
19 | |||
20 | #define CONFIG_EXTRA_ENV_SETTINGS \ | ||
21 | - "netdev=eth0\0" \ | ||
22 | - "ethprime=FEC0\0" \ | ||
23 | - "uboot=u-boot.bin\0" \ | ||
24 | - "kernel=uImage\0" \ | ||
25 | - "nfsroot=/opt/eldk/arm\0" \ | ||
26 | - "bootargs_base=setenv bootargs console=ttymxc0,115200\0"\ | ||
27 | - "bootargs_nfs=setenv bootargs ${bootargs} root=/dev/nfs "\ | ||
28 | - "ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp\0"\ | ||
29 | - "bootcmd_net=run bootargs_base bootargs_nfs; " \ | ||
30 | - "tftpboot ${loadaddr} ${kernel}; bootm\0" \ | ||
31 | - "bootargs_mmc=setenv bootargs ${bootargs} ip=dhcp " \ | ||
32 | - "root=/dev/mmcblk0p1 rootwait\0" \ | ||
33 | - "bootcmd_mmc=run bootargs_base bootargs_mmc; " \ | ||
34 | - "mmc dev 3; " \ | ||
35 | - "mmc read ${loadaddr} 0x800 0x2000; bootm\0" \ | ||
36 | - "bootcmd=run bootcmd_net\0" \ | ||
37 | + "script=boot.scr\0" \ | ||
38 | + "uimage=uImage\0" \ | ||
39 | + "mmcdev=2\0" \ | ||
40 | + "mmcpart=1\0" \ | ||
41 | + "mmcroot=/dev/mmcblk0p2 rw\0" \ | ||
42 | + "mmcrootfstype=ext3 rootwait\0" \ | ||
43 | + "mmcargs=setenv bootargs console=ttymxc3,${baudrate} " \ | ||
44 | + "root=${mmcroot} " \ | ||
45 | + "rootfstype=${mmcrootfstype}\0" \ | ||
46 | + "loadbootscript=" \ | ||
47 | + "fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \ | ||
48 | + "bootscript=echo Running bootscript from mmc ...; " \ | ||
49 | + "source\0" \ | ||
50 | + "loaduimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${uimage}\0" \ | ||
51 | + "mmcboot=echo Booting from mmc ...; " \ | ||
52 | + "run mmcargs; " \ | ||
53 | + "bootm\0" \ | ||
54 | + "netargs=setenv bootargs console=ttymxc3,${baudrate} " \ | ||
55 | + "root=/dev/nfs " \ | ||
56 | + "ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp\0" \ | ||
57 | + "netboot=echo Booting from net ...; " \ | ||
58 | + "run netargs; " \ | ||
59 | + "dhcp ${uimage}; bootm\0" \ | ||
60 | + "bootcmd=run loaduimage; run mmcboot;\0" \ | ||
61 | |||
62 | |||
63 | #define CONFIG_ARP_TIMEOUT 200UL | ||
64 | -- | ||
65 | 1.8.1 | ||
66 | |||
diff --git a/meta-fsl-arm/recipes-bsp/u-boot/u-boot-imx/mx6sl_evk-Fix-the-patch-for-the-default-environment-.patch b/meta-fsl-arm/recipes-bsp/u-boot/u-boot-imx/mx6sl_evk-Fix-the-patch-for-the-default-environment-.patch deleted file mode 100644 index 5d3f868d..00000000 --- a/meta-fsl-arm/recipes-bsp/u-boot/u-boot-imx/mx6sl_evk-Fix-the-patch-for-the-default-environment-.patch +++ /dev/null | |||
@@ -1,67 +0,0 @@ | |||
1 | From bf99fdddbca321f7e74ed82febbe4b5539e3ac66 Mon Sep 17 00:00:00 2001 | ||
2 | From: Daiane Angolini <daiane.angolini@freescale.com> | ||
3 | Date: Thu, 14 Mar 2013 16:35:35 -0300 | ||
4 | Subject: [PATCH] mx6sl_evk: Change the patch for the default environment | ||
5 | variable | ||
6 | |||
7 | Upstream-Status: Pending | ||
8 | |||
9 | Signed-off-by: Daiane Angolini <daiane.angolini@freescale.com> | ||
10 | --- | ||
11 | include/configs/mx6sl_evk.h | 40 ++++++++++++++++++++++++---------------- | ||
12 | 1 file changed, 24 insertions(+), 16 deletions(-) | ||
13 | |||
14 | diff --git a/include/configs/mx6sl_evk.h b/include/configs/mx6sl_evk.h | ||
15 | index 4c327bc..dfb6374 100644 | ||
16 | --- a/include/configs/mx6sl_evk.h | ||
17 | +++ b/include/configs/mx6sl_evk.h | ||
18 | @@ -122,22 +122,30 @@ | ||
19 | #define CONFIG_RD_LOADADDR 0x81000000 | ||
20 | |||
21 | #define CONFIG_EXTRA_ENV_SETTINGS \ | ||
22 | - "netdev=eth0\0" \ | ||
23 | - "ethprime=FEC0\0" \ | ||
24 | - "uboot=u-boot.bin\0" \ | ||
25 | - "kernel=uImage\0" \ | ||
26 | - "nfsroot=/opt/eldk/arm\0" \ | ||
27 | - "bootargs_base=setenv bootargs console=ttymxc0,115200\0"\ | ||
28 | - "bootargs_nfs=setenv bootargs ${bootargs} root=/dev/nfs "\ | ||
29 | - "ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp\0"\ | ||
30 | - "bootcmd_net=run bootargs_base bootargs_nfs; " \ | ||
31 | - "tftpboot ${loadaddr} ${kernel}; bootm\0" \ | ||
32 | - "bootargs_mmc=setenv bootargs ${bootargs} " \ | ||
33 | - "root=/dev/mmcblk0p1 rootwait\0" \ | ||
34 | - "bootcmd_mmc=run bootargs_base bootargs_mmc; " \ | ||
35 | - "mmc dev 1; " \ | ||
36 | - "mmc read ${loadaddr} 0x800 0x2000; bootm\0" \ | ||
37 | - "bootcmd=run bootcmd_mmc\0" \ | ||
38 | + "script=boot.scr\0" \ | ||
39 | + "uimage=uImage\0" \ | ||
40 | + "mmcdev=1\0" \ | ||
41 | + "mmcpart=1\0" \ | ||
42 | + "mmcroot=/dev/mmcblk0p2 rw\0" \ | ||
43 | + "mmcrootfstype=ext3 rootwait\0" \ | ||
44 | + "mmcargs=setenv bootargs console=ttymxc0,${baudrate} " \ | ||
45 | + "root=${mmcroot} " \ | ||
46 | + "rootfstype=${mmcrootfstype}\0" \ | ||
47 | + "loadbootscript=" \ | ||
48 | + "fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \ | ||
49 | + "bootscript=echo Running bootscript from mmc ...; " \ | ||
50 | + "source\0" \ | ||
51 | + "loaduimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${uimage}\0" \ | ||
52 | + "mmcboot=echo Booting from mmc ...; " \ | ||
53 | + "run mmcargs; " \ | ||
54 | + "bootm\0" \ | ||
55 | + "netargs=setenv bootargs console=ttymxc0,${baudrate} " \ | ||
56 | + "root=/dev/nfs " \ | ||
57 | + "ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp\0" \ | ||
58 | + "netboot=echo Booting from net ...; " \ | ||
59 | + "run netargs; " \ | ||
60 | + "dhcp ${uimage}; bootm\0" \ | ||
61 | + "bootcmd=run loaduimage; run mmcboot;\0" \ | ||
62 | |||
63 | |||
64 | #define CONFIG_ARP_TIMEOUT 200UL | ||
65 | -- | ||
66 | 1.7.10.4 | ||
67 | |||
diff --git a/meta-fsl-arm/recipes-bsp/u-boot/u-boot-imx_2014.04.bb b/meta-fsl-arm/recipes-bsp/u-boot/u-boot-imx_2014.04.bb deleted file mode 100644 index ebae6922..00000000 --- a/meta-fsl-arm/recipes-bsp/u-boot/u-boot-imx_2014.04.bb +++ /dev/null | |||
@@ -1,22 +0,0 @@ | |||
1 | # Copyright (C) 2013-2015 Freescale Semiconductor | ||
2 | |||
3 | DESCRIPTION = "U-Boot provided by Freescale with focus on i.MX reference boards." | ||
4 | require recipes-bsp/u-boot/u-boot.inc | ||
5 | |||
6 | PROVIDES += "u-boot" | ||
7 | |||
8 | LICENSE = "GPLv2+" | ||
9 | LIC_FILES_CHKSUM = "file://Licenses/gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263" | ||
10 | |||
11 | SRCBRANCH = "imx_v2014.04_3.14.28_1.0.0_ga" | ||
12 | SRC_URI = "git://git.freescale.com/imx/uboot-imx.git;protocol=git;branch=${SRCBRANCH}" | ||
13 | SRCREV = "88123ea911e133724cbe738c2b0517fa470592c0" | ||
14 | |||
15 | S = "${WORKDIR}/git" | ||
16 | |||
17 | inherit fsl-u-boot-localversion | ||
18 | |||
19 | LOCALVERSION ?= "-${SRCBRANCH}" | ||
20 | |||
21 | PACKAGE_ARCH = "${MACHINE_ARCH}" | ||
22 | COMPATIBLE_MACHINE = "(mx6)" | ||
diff --git a/meta-fsl-arm/recipes-bsp/u-boot/u-boot-ls1_2015.01.bb b/meta-fsl-arm/recipes-bsp/u-boot/u-boot-ls1_2015.01.bb deleted file mode 100644 index 716105f4..00000000 --- a/meta-fsl-arm/recipes-bsp/u-boot/u-boot-ls1_2015.01.bb +++ /dev/null | |||
@@ -1,48 +0,0 @@ | |||
1 | require recipes-bsp/u-boot/u-boot.inc | ||
2 | |||
3 | DESCRIPTION = "U-Boot provided by Freescale with focus on QorIQ Layerscape1 boards" | ||
4 | LICENSE = "GPLv2 & BSD-3-Clause & BSD-2-Clause & LGPL-2.0 & LGPL-2.1" | ||
5 | LIC_FILES_CHKSUM = " \ | ||
6 | file://Licenses/gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ | ||
7 | file://Licenses/bsd-2-clause.txt;md5=6a31f076f5773aabd8ff86191ad6fdd5 \ | ||
8 | file://Licenses/bsd-3-clause.txt;md5=4a1190eac56a9db675d58ebe86eaf50c \ | ||
9 | file://Licenses/lgpl-2.0.txt;md5=5f30f0716dfdd0d91eb439ebec522ec2 \ | ||
10 | file://Licenses/lgpl-2.1.txt;md5=4fbd65380cdd255951079008b364516c \ | ||
11 | " | ||
12 | |||
13 | SRCBRANCH = "master" | ||
14 | SRC_URI = "git://git.freescale.com/ppc/sdk/u-boot.git;branch=${SRCBRANCH}" | ||
15 | SRCREV = "6ba8eedbcdc4b063f59a63e6288b938af739e8ad" | ||
16 | |||
17 | LOCALVERSION ?= "+ls1" | ||
18 | |||
19 | S = "${WORKDIR}/git" | ||
20 | |||
21 | inherit fsl-u-boot-localversion | ||
22 | |||
23 | DEPENDS += "change-file-endianess-native dtc-native" | ||
24 | PROVIDES += "u-boot" | ||
25 | |||
26 | do_compile_append () { | ||
27 | if [ "x${UBOOT_CONFIG}" != "x" ] | ||
28 | then | ||
29 | for config in ${UBOOT_MACHINE}; do | ||
30 | case "${config}" in | ||
31 | *spi*) tclsh ${STAGING_BINDIR_NATIVE}/byte_swap.tcl ${S}/${config}/u-boot-dtb.bin ${S}/${config}/u-boot.swap.bin 8 | ||
32 | mv ${S}/${config}/u-boot.swap.bin ${S}/u-boot-${type}.${UBOOT_SUFFIX};; | ||
33 | *sdcard*) mv ${S}/${config}/u-boot-with-spl-pbl.bin ${S}/${config}/u-boot.bin;; | ||
34 | *nand*) mv ${S}/u-boot-with-spl-pbl.bin ${S}/u-boot.bin;; | ||
35 | esac | ||
36 | done | ||
37 | fi | ||
38 | |||
39 | } | ||
40 | |||
41 | PACKAGES += "${PN}-images" | ||
42 | FILES_${PN}-images += "/boot" | ||
43 | |||
44 | ALLOW_EMPTY_${PN} = "1" | ||
45 | |||
46 | PACKAGE_ARCH = "${MACHINE_ARCH}" | ||
47 | COMPATIBLE_MACHINE = "(ls102xa)" | ||
48 | |||
diff --git a/meta-fsl-arm/recipes-bsp/u-boot/u-boot-mfgtool.inc b/meta-fsl-arm/recipes-bsp/u-boot/u-boot-mfgtool.inc deleted file mode 100644 index 91526ad7..00000000 --- a/meta-fsl-arm/recipes-bsp/u-boot/u-boot-mfgtool.inc +++ /dev/null | |||
@@ -1,21 +0,0 @@ | |||
1 | # Produces a Manufacturing Tool compatible U-Boot | ||
2 | # | ||
3 | # This makes a separated binary set for Manufacturing Tool use | ||
4 | # without clobbering the U-Boot used for normal use. | ||
5 | # | ||
6 | # This file must to be included after the original u-boot.inc file, | ||
7 | # as it overrides the need values. | ||
8 | # | ||
9 | # Copyright (C) 2014 O.S. Systems Software LTDA. | ||
10 | |||
11 | # Adjust provides | ||
12 | PROVIDES = "u-boot-mfgtool" | ||
13 | |||
14 | # Use 'mfgtool' config | ||
15 | UBOOT_CONFIG = "mfgtool" | ||
16 | |||
17 | # Add 'mfgtool' suffix | ||
18 | UBOOT_IMAGE = "u-boot-${MACHINE}-mfgtool-${PV}-${PR}.${UBOOT_SUFFIX}" | ||
19 | UBOOT_SYMLINK = "u-boot-${MACHINE}-mfgtool.${UBOOT_SUFFIX}" | ||
20 | SPL_IMAGE = "${SPL_BINARY}-${MACHINE}-mfgtool-${PV}-${PR}" | ||
21 | SPL_SYMLINK = "${SPL_BINARY}-mfgtool-${MACHINE}" | ||