diff options
author | Otavio Salvador <otavio@ossystems.com.br> | 2015-08-05 08:50:26 -0300 |
---|---|---|
committer | Otavio Salvador <otavio@ossystems.com.br> | 2016-04-19 15:03:14 -0300 |
commit | d5e730317a4d1aa94bdfbf25654847fe788d70df (patch) | |
tree | 36c4c98296a7c073fa66a9bf938343ba63a9cf91 /recipes-bsp | |
parent | b33e2a1f77655f625f3a4477a345991310af615b (diff) | |
download | meta-freescale-d5e730317a4d1aa94bdfbf25654847fe788d70df.tar.gz |
Drop Freescale official Linux kernel for i.MX23, i.MX28 and i.MX5 SoC families
The Linux kernel provided by Freescale for i.MX28 and i.MX5 is too old
(2.6.35.3) and there are no plans to upgrade it, as the OE-Core is
going to use GCC 5.2 as default compiler soon and it is not possible
to compile this kernel with the new toolchain, thus the removal.
The metadata related to the i.MX23, i.MX28 and i.MX5 SoC family, which
is dependant of this Linux kernel support, has been removed in this
commit so if someone ever wants to bring it back it is easy to find
out all the necessary changes. The recipes affected are:
- alsa-state
- amd-gpu-x11-bin
- gtk+3
- imx-lib
- imx-test
- imx-vpu
- libfslcodec
- linux-imx
- mesa
- qt4-embedded-free
- qt4-x11-free
- qtbase
- xf86-video-imxfb
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Acked-by: Daiane Angolini <daiane.angolini@freescale.com>
Diffstat (limited to 'recipes-bsp')
-rw-r--r-- | recipes-bsp/alsa-state/alsa-state.bbappend | 2 | ||||
-rwxr-xr-x | recipes-bsp/alsa-state/alsa-state/mx5/asound.conf | 275 | ||||
-rw-r--r-- | recipes-bsp/alsa-state/alsa-state/mx5/asound.state | 139 | ||||
-rw-r--r-- | recipes-bsp/alsa-state/alsa-state/mxs/asound.conf | 299 | ||||
-rw-r--r-- | recipes-bsp/alsa-state/alsa-state/mxs/asound.state | 191 | ||||
-rw-r--r-- | recipes-bsp/imx-lib/imx-lib-11.09.02/obey-variables.patch | 209 | ||||
-rw-r--r-- | recipes-bsp/imx-lib/imx-lib.inc | 1 | ||||
-rw-r--r-- | recipes-bsp/imx-lib/imx-lib_11.09.02.bb | 11 | ||||
-rw-r--r-- | recipes-bsp/imx-test/imx-test.inc | 4 | ||||
-rw-r--r-- | recipes-bsp/imx-test/imx-test/Fix-build-in-OpenEmbedded-Core-environment.patch | 30 | ||||
-rwxr-xr-x | recipes-bsp/imx-test/imx-test/clocks.sh | 29 | ||||
-rw-r--r-- | recipes-bsp/imx-test/imx-test/revert_epdc_hdr_change.patch | 30 | ||||
-rw-r--r-- | recipes-bsp/imx-test/imx-test_5.1.bb | 5 | ||||
-rw-r--r-- | recipes-bsp/imx-vpu/imx-vpu-11.09.02/obey-variables.patch | 27 | ||||
-rw-r--r-- | recipes-bsp/imx-vpu/imx-vpu.inc | 1 | ||||
-rw-r--r-- | recipes-bsp/imx-vpu/imx-vpu_11.09.02.bb | 8 |
16 files changed, 1 insertions, 1260 deletions
diff --git a/recipes-bsp/alsa-state/alsa-state.bbappend b/recipes-bsp/alsa-state/alsa-state.bbappend index 3689c43a..dbfed385 100644 --- a/recipes-bsp/alsa-state/alsa-state.bbappend +++ b/recipes-bsp/alsa-state/alsa-state.bbappend | |||
@@ -3,5 +3,3 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" | |||
3 | 3 | ||
4 | PACKAGE_ARCH_mx7 = "${MACHINE_ARCH}" | 4 | PACKAGE_ARCH_mx7 = "${MACHINE_ARCH}" |
5 | PACKAGE_ARCH_mx6 = "${MACHINE_ARCH}" | 5 | PACKAGE_ARCH_mx6 = "${MACHINE_ARCH}" |
6 | PACKAGE_ARCH_mx5 = "${MACHINE_ARCH}" | ||
7 | PACKAGE_ARCH_mxs = "${MACHINE_ARCH}" | ||
diff --git a/recipes-bsp/alsa-state/alsa-state/mx5/asound.conf b/recipes-bsp/alsa-state/alsa-state/mx5/asound.conf deleted file mode 100755 index 0cbe59b2..00000000 --- a/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/recipes-bsp/alsa-state/alsa-state/mx5/asound.state b/recipes-bsp/alsa-state/alsa-state/mx5/asound.state deleted file mode 100644 index 7c13a88a..00000000 --- a/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/recipes-bsp/alsa-state/alsa-state/mxs/asound.conf b/recipes-bsp/alsa-state/alsa-state/mxs/asound.conf deleted file mode 100644 index 39cb3961..00000000 --- a/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/recipes-bsp/alsa-state/alsa-state/mxs/asound.state b/recipes-bsp/alsa-state/alsa-state/mxs/asound.state deleted file mode 100644 index d508cc36..00000000 --- a/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/recipes-bsp/imx-lib/imx-lib-11.09.02/obey-variables.patch b/recipes-bsp/imx-lib/imx-lib-11.09.02/obey-variables.patch deleted file mode 100644 index 901345ac..00000000 --- a/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/recipes-bsp/imx-lib/imx-lib.inc b/recipes-bsp/imx-lib/imx-lib.inc index 2e316265..ff427130 100644 --- a/recipes-bsp/imx-lib/imx-lib.inc +++ b/recipes-bsp/imx-lib/imx-lib.inc | |||
@@ -8,7 +8,6 @@ DEPENDS = "virtual/kernel" | |||
8 | LIC_FILES_CHKSUM = "file://COPYING-LGPL-2.1;md5=fbc093901857fcd118f065f900982c24" | 8 | LIC_FILES_CHKSUM = "file://COPYING-LGPL-2.1;md5=fbc093901857fcd118f065f900982c24" |
9 | 9 | ||
10 | PLATFORM_mx6 = "IMX6Q" | 10 | PLATFORM_mx6 = "IMX6Q" |
11 | PLATFORM_mx5 = "IMX51" | ||
12 | PLATFORM_mx6sl = "IMX6S" | 11 | PLATFORM_mx6sl = "IMX6S" |
13 | PLATFORM_mx6sx = "IMX6S" | 12 | PLATFORM_mx6sx = "IMX6S" |
14 | PLATFORM_mx7 = "IMX7" | 13 | PLATFORM_mx7 = "IMX7" |
diff --git a/recipes-bsp/imx-lib/imx-lib_11.09.02.bb b/recipes-bsp/imx-lib/imx-lib_11.09.02.bb deleted file mode 100644 index f8e0e3a6..00000000 --- a/recipes-bsp/imx-lib/imx-lib_11.09.02.bb +++ /dev/null | |||
@@ -1,11 +0,0 @@ | |||
1 | # Copyright (C) 2013 Freescale Semiconductor | ||
2 | require imx-lib.inc | ||
3 | |||
4 | LIC_FILES_CHKSUM = "file://ipu/mxc_ipu_hl_lib.h;endline=13;md5=6c7486b21a8524b1879fa159578da31e" | ||
5 | |||
6 | SRC_URI = "${FSL_MIRROR}/imx-lib-${PV}.tar.gz \ | ||
7 | file://obey-variables.patch" | ||
8 | SRC_URI[md5sum] = "a4e7447e35cfac0b966a51f001390d6e" | ||
9 | SRC_URI[sha256sum] = "3ed082005789db0c9c41e14073417319f4e23f5646a7d21f34840470f4328bd5" | ||
10 | |||
11 | COMPATIBLE_MACHINE = "(mx5)" | ||
diff --git a/recipes-bsp/imx-test/imx-test.inc b/recipes-bsp/imx-test/imx-test.inc index a459ea91..7174b052 100644 --- a/recipes-bsp/imx-test/imx-test.inc +++ b/recipes-bsp/imx-test/imx-test.inc | |||
@@ -3,12 +3,10 @@ | |||
3 | SUMMARY = "Test programs for IMX BSP" | 3 | SUMMARY = "Test programs for IMX BSP" |
4 | DESCRIPTION = "Unit tests for the IMX BSP" | 4 | DESCRIPTION = "Unit tests for the IMX BSP" |
5 | SECTION = "base" | 5 | SECTION = "base" |
6 | DEPENDS_mx5 = "virtual/kernel imx-lib imx-vpu" | ||
7 | DEPENDS_mx6q = "virtual/kernel imx-lib imx-vpu" | 6 | DEPENDS_mx6q = "virtual/kernel imx-lib imx-vpu" |
8 | DEPENDS_mx6dl = "virtual/kernel imx-lib imx-vpu" | 7 | DEPENDS_mx6dl = "virtual/kernel imx-lib imx-vpu" |
9 | DEPENDS_mx6sl = "virtual/kernel imx-lib" | 8 | DEPENDS_mx6sl = "virtual/kernel imx-lib" |
10 | DEPENDS_mx6sx = "virtual/kernel imx-lib" | 9 | DEPENDS_mx6sx = "virtual/kernel imx-lib" |
11 | DEPENDS_mxs = "virtual/kernel" | ||
12 | DEPENDS_mx6ul = "virtual/kernel imx-lib" | 10 | DEPENDS_mx6ul = "virtual/kernel imx-lib" |
13 | DEPENDS_mx7 = "virtual/kernel imx-lib" | 11 | DEPENDS_mx7 = "virtual/kernel imx-lib" |
14 | 12 | ||
@@ -28,8 +26,6 @@ INHIBIT_PACKAGE_DEBUG_SPLIT = "1" | |||
28 | PLATFORM_mx6 = "IMX6Q" | 26 | PLATFORM_mx6 = "IMX6Q" |
29 | PLATFORM_mx6sl = "IMX6SL" | 27 | PLATFORM_mx6sl = "IMX6SL" |
30 | PLATFORM_mx6sx = "IMX6SX" | 28 | PLATFORM_mx6sx = "IMX6SX" |
31 | PLATFORM_mx53 = "IMX53" | ||
32 | PLATFORM_mx51 = "IMX51" | ||
33 | PLATFORM_mx7 = "IMX7D" | 29 | PLATFORM_mx7 = "IMX7D" |
34 | PLATFORM_mx6ul = "IMX6UL" | 30 | PLATFORM_mx6ul = "IMX6UL" |
35 | 31 | ||
diff --git a/recipes-bsp/imx-test/imx-test/Fix-build-in-OpenEmbedded-Core-environment.patch b/recipes-bsp/imx-test/imx-test/Fix-build-in-OpenEmbedded-Core-environment.patch deleted file mode 100644 index 7497e91d..00000000 --- a/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/recipes-bsp/imx-test/imx-test/clocks.sh b/recipes-bsp/imx-test/imx-test/clocks.sh deleted file mode 100755 index 2121bef6..00000000 --- a/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/recipes-bsp/imx-test/imx-test/revert_epdc_hdr_change.patch b/recipes-bsp/imx-test/imx-test/revert_epdc_hdr_change.patch deleted file mode 100644 index 4fb0564a..00000000 --- a/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/recipes-bsp/imx-test/imx-test_5.1.bb b/recipes-bsp/imx-test/imx-test_5.1.bb index ff42c7fe..82df7652 100644 --- a/recipes-bsp/imx-test/imx-test_5.1.bb +++ b/recipes-bsp/imx-test/imx-test_5.1.bb | |||
@@ -2,10 +2,7 @@ | |||
2 | 2 | ||
3 | include imx-test.inc | 3 | include imx-test.inc |
4 | 4 | ||
5 | SRC_URI_append_mx5 = " file://clocks.sh" | ||
6 | SRC_URI_append_mxs = " file://clocks.sh" | ||
7 | |||
8 | SRC_URI[md5sum] = "5991439d4b20abac1095688164d26f40" | 5 | SRC_URI[md5sum] = "5991439d4b20abac1095688164d26f40" |
9 | SRC_URI[sha256sum] = "042d0b03d7838395a6b35d0ca7159f1f4b6cf3055dcc4a12a1b66488fca987b1" | 6 | SRC_URI[sha256sum] = "042d0b03d7838395a6b35d0ca7159f1f4b6cf3055dcc4a12a1b66488fca987b1" |
10 | 7 | ||
11 | COMPATIBLE_MACHINE = "(mxs|mx5|mx6|mx7)" | 8 | COMPATIBLE_MACHINE = "(mx6|mx7)" |
diff --git a/recipes-bsp/imx-vpu/imx-vpu-11.09.02/obey-variables.patch b/recipes-bsp/imx-vpu/imx-vpu-11.09.02/obey-variables.patch deleted file mode 100644 index 13f61b27..00000000 --- a/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/recipes-bsp/imx-vpu/imx-vpu.inc b/recipes-bsp/imx-vpu/imx-vpu.inc index fd59770a..c84bf955 100644 --- a/recipes-bsp/imx-vpu/imx-vpu.inc +++ b/recipes-bsp/imx-vpu/imx-vpu.inc | |||
@@ -5,7 +5,6 @@ LIC_FILES_CHKSUM = "file://vpu/EULA.txt;md5=b063366b066c9f10037c59756a9ced54" | |||
5 | DEPENDS = "virtual/kernel" | 5 | DEPENDS = "virtual/kernel" |
6 | inherit fsl-eula-unpack | 6 | inherit fsl-eula-unpack |
7 | 7 | ||
8 | PLATFORM_mx5 = "IMX51" | ||
9 | PLATFORM_mx6 = "IMX6Q" | 8 | PLATFORM_mx6 = "IMX6Q" |
10 | 9 | ||
11 | SRC_URI = "${FSL_MIRROR}/${PN}-${PV}.bin;fsl-eula=true" | 10 | SRC_URI = "${FSL_MIRROR}/${PN}-${PV}.bin;fsl-eula=true" |
diff --git a/recipes-bsp/imx-vpu/imx-vpu_11.09.02.bb b/recipes-bsp/imx-vpu/imx-vpu_11.09.02.bb deleted file mode 100644 index c5dd9bd5..00000000 --- a/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)" | ||