diff options
author | Otavio Salvador <otavio@ossystems.com.br> | 2021-09-13 16:31:14 -0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-09-13 16:31:14 -0300 |
commit | 012e0f755aedb79de3d225640963d454fe668120 (patch) | |
tree | 1b1e367f66d03a95e5bc2f0fbaf5fae17b4c43a8 | |
parent | 16e0d07d36787d14e9d00ff8123419863d1f19d2 (diff) | |
parent | f06c7da5e810168398685d9b4d7d0ae14d291a87 (diff) | |
download | meta-freescale-012e0f755aedb79de3d225640963d454fe668120.tar.gz |
Merge pull request #863 from angolini/fix-hardknott+bsp
Fix hardknott
-rw-r--r-- | conf/machine/include/imx-base.inc | 19 | ||||
-rw-r--r-- | conf/machine/include/imx8mm-evk.inc | 4 | ||||
-rwxr-xr-x | recipes-multimedia/tinycompress/tinycompress/0002-cplay-Support-wave-file.patch | 18 |
3 files changed, 16 insertions, 25 deletions
diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc index 6cb04f09..417fd17b 100644 --- a/conf/machine/include/imx-base.inc +++ b/conf/machine/include/imx-base.inc | |||
@@ -315,7 +315,7 @@ MACHINE_EXTRA_RRECOMMENDS += "udev-rules-imx" | |||
315 | 315 | ||
316 | # Jailhouse | 316 | # Jailhouse |
317 | MACHINE_EXTRA_RRECOMMENDS += " \ | 317 | MACHINE_EXTRA_RRECOMMENDS += " \ |
318 | ${@bb.utils.contains('COMBINED_FEATURES', 'jailhouse', 'jailhouse', '', d)} \ | 318 | ${@bb.utils.filter('COMBINED_FEATURES', 'jailhouse', d)} \ |
319 | " | 319 | " |
320 | 320 | ||
321 | # GStreamer 1.0 plugins | 321 | # GStreamer 1.0 plugins |
@@ -334,13 +334,13 @@ MACHINE_GSTREAMER_1_0_PLUGIN_mx8mq ?= "imx-gst1.0-plugin" | |||
334 | MACHINE_GSTREAMER_1_0_PLUGIN_mx8qm ?= "imx-gst1.0-plugin" | 334 | MACHINE_GSTREAMER_1_0_PLUGIN_mx8qm ?= "imx-gst1.0-plugin" |
335 | MACHINE_GSTREAMER_1_0_PLUGIN_mx8qxp ?= "imx-gst1.0-plugin" | 335 | MACHINE_GSTREAMER_1_0_PLUGIN_mx8qxp ?= "imx-gst1.0-plugin" |
336 | 336 | ||
337 | +PREFERRED_VERSION_gstreamer1.0_mx8 ?= "1.18.0.imx" | 337 | PREFERRED_VERSION_gstreamer1.0_mx8 ?= "1.18.0.imx" |
338 | +PREFERRED_VERSION_gstreamer1.0-plugins-base_mx8 ?= "1.18.0.imx" | 338 | PREFERRED_VERSION_gstreamer1.0-plugins-base_mx8 ?= "1.18.0.imx" |
339 | +PREFERRED_VERSION_gstreamer1.0-plugins-good_mx8 ?= "1.18.0.imx" | 339 | PREFERRED_VERSION_gstreamer1.0-plugins-good_mx8 ?= "1.18.0.imx" |
340 | +PREFERRED_VERSION_gstreamer1.0-plugins-bad_mx8 ?= "1.18.0.imx" | 340 | PREFERRED_VERSION_gstreamer1.0-plugins-bad_mx8 ?= "1.18.0.imx" |
341 | +PREFERRED_VERSION_gstreamer1.0-plugins-ugly_mx8 ?= "1.18.0" | 341 | PREFERRED_VERSION_gstreamer1.0-plugins-ugly_mx8 ?= "1.18.0" |
342 | +PREFERRED_VERSION_gstreamer1.0-libav_mx8 ?= "1.18.0" | 342 | PREFERRED_VERSION_gstreamer1.0-libav_mx8 ?= "1.18.0" |
343 | +PREFERRED_VERSION_gstreamer1.0-rtsp-server_mx8 ?= "1.18.0" | 343 | PREFERRED_VERSION_gstreamer1.0-rtsp-server_mx8 ?= "1.18.0" |
344 | 344 | ||
345 | # Determines if the SoC has support for Vivante kernel driver | 345 | # Determines if the SoC has support for Vivante kernel driver |
346 | SOC_HAS_VIVANTE_KERNEL_DRIVER_SUPPORT = "0" | 346 | SOC_HAS_VIVANTE_KERNEL_DRIVER_SUPPORT = "0" |
@@ -477,9 +477,6 @@ KERNEL_IMAGETYPE_aarch64 = "Image" | |||
477 | 477 | ||
478 | MACHINE_FEATURES = "usbgadget usbhost vfat alsa touchscreen" | 478 | MACHINE_FEATURES = "usbgadget usbhost vfat alsa touchscreen" |
479 | 479 | ||
480 | SOC_MACHINE_FEATURES_BACKFILL_mx8m = "jailhouse" | ||
481 | MACHINE_FEATURES_BACKFILL_append = " ${SOC_MACHINE_FEATURES_BACKFILL}" | ||
482 | |||
483 | # Add the ability to specify _imx machines | 480 | # Add the ability to specify _imx machines |
484 | MACHINEOVERRIDES =. "imx:" | 481 | MACHINEOVERRIDES =. "imx:" |
485 | 482 | ||
diff --git a/conf/machine/include/imx8mm-evk.inc b/conf/machine/include/imx8mm-evk.inc index 62d5bfdd..82384ac6 100644 --- a/conf/machine/include/imx8mm-evk.inc +++ b/conf/machine/include/imx8mm-evk.inc | |||
@@ -5,13 +5,13 @@ require conf/machine/include/tune-cortexa53.inc | |||
5 | 5 | ||
6 | MACHINE_FEATURES += "pci wifi bluetooth bcm43455 bcm4356" | 6 | MACHINE_FEATURES += "pci wifi bluetooth bcm43455 bcm4356" |
7 | 7 | ||
8 | # NXP BSP can consume BCM4359 driver and firmware | 8 | # NXP BSP can consume proprietary jailhouse and BCM4359 firmware |
9 | # Since the firmware is not available publicly, and rather distributed | 9 | # Since the firmware is not available publicly, and rather distributed |
10 | # under "Proprietary" license - we opt-out from using it in all BSPs | 10 | # under "Proprietary" license - we opt-out from using it in all BSPs |
11 | # and pin it to NXP BSP only | 11 | # and pin it to NXP BSP only |
12 | # OP-TEE is also applicable to NXP BSP, mainline BSP seems not to have | 12 | # OP-TEE is also applicable to NXP BSP, mainline BSP seems not to have |
13 | # a full support for it yet. | 13 | # a full support for it yet. |
14 | MACHINE_FEATURES_append_use-nxp-bsp = " optee bcm4359" | 14 | MACHINE_FEATURES:append:use-nxp-bsp = " optee jailhouse bcm4359" |
15 | 15 | ||
16 | KERNEL_DEVICETREE = " \ | 16 | KERNEL_DEVICETREE = " \ |
17 | freescale/${KERNEL_DEVICETREE_BASENAME}.dtb \ | 17 | freescale/${KERNEL_DEVICETREE_BASENAME}.dtb \ |
diff --git a/recipes-multimedia/tinycompress/tinycompress/0002-cplay-Support-wave-file.patch b/recipes-multimedia/tinycompress/tinycompress/0002-cplay-Support-wave-file.patch index 9189bc0e..79544711 100755 --- a/recipes-multimedia/tinycompress/tinycompress/0002-cplay-Support-wave-file.patch +++ b/recipes-multimedia/tinycompress/tinycompress/0002-cplay-Support-wave-file.patch | |||
@@ -15,15 +15,14 @@ Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com> | |||
15 | 2 files changed, 158 insertions(+) | 15 | 2 files changed, 158 insertions(+) |
16 | create mode 100644 include/tinycompress/wave_formats.h | 16 | create mode 100644 include/tinycompress/wave_formats.h |
17 | 17 | ||
18 | diff --git a/include/tinycompress/wave_formats.h b/include/tinycompress/wave_formats.h | ||
19 | new file mode 100644 | ||
20 | index 000000000000..4e2e009206cf | ||
21 | --- /dev/null | 18 | --- /dev/null |
22 | +++ b/include/tinycompress/wave_formats.h | 19 | +++ b/include/tinycompress/wave_formats.h |
23 | @@ -0,0 +1,51 @@ | 20 | @@ -0,0 +1,53 @@ |
24 | +#ifndef WAVE_FORMATS_H | 21 | +#ifndef WAVE_FORMATS_H |
25 | +#define WAVE_FORMATS_H 1 | 22 | +#define WAVE_FORMATS_H 1 |
26 | + | 23 | + |
24 | +#include <sys/types.h> | ||
25 | + | ||
27 | +#define COMPOSE_ID(a,b,c,d) ((a) | ((b)<<8) | ((c)<<16) | ((d)<<24)) | 26 | +#define COMPOSE_ID(a,b,c,d) ((a) | ((b)<<8) | ((c)<<16) | ((d)<<24)) |
28 | + | 27 | + |
29 | +#define WAV_RIFF COMPOSE_ID('R','I','F','F') | 28 | +#define WAV_RIFF COMPOSE_ID('R','I','F','F') |
@@ -72,8 +71,6 @@ index 000000000000..4e2e009206cf | |||
72 | + | 71 | + |
73 | + | 72 | + |
74 | +#endif /* FORMATS */ | 73 | +#endif /* FORMATS */ |
75 | diff --git a/src/utils/cplay.c b/src/utils/cplay.c | ||
76 | index 5b749419e731..8882f4d9746d 100644 | ||
77 | --- a/src/utils/cplay.c | 74 | --- a/src/utils/cplay.c |
78 | +++ b/src/utils/cplay.c | 75 | +++ b/src/utils/cplay.c |
79 | @@ -1,4 +1,6 @@ | 76 | @@ -1,4 +1,6 @@ |
@@ -92,7 +89,7 @@ index 5b749419e731..8882f4d9746d 100644 | |||
92 | 89 | ||
93 | static int verbose; | 90 | static int verbose; |
94 | static const unsigned int DEFAULT_CODEC_ID = SND_AUDIOCODEC_PCM; | 91 | static const unsigned int DEFAULT_CODEC_ID = SND_AUDIOCODEC_PCM; |
95 | @@ -166,6 +170,77 @@ static int parse_mp3_header(struct mp3_header *header, unsigned int *num_channel | 92 | @@ -166,6 +170,77 @@ static int parse_mp3_header(struct mp3_h |
96 | return 0; | 93 | return 0; |
97 | } | 94 | } |
98 | 95 | ||
@@ -170,7 +167,7 @@ index 5b749419e731..8882f4d9746d 100644 | |||
170 | static int print_time(struct compress *compress) | 167 | static int print_time(struct compress *compress) |
171 | { | 168 | { |
172 | unsigned int avail; | 169 | unsigned int avail; |
173 | @@ -385,6 +460,35 @@ void get_codec_iec(FILE *file, struct compr_config *config, | 170 | @@ -385,6 +460,35 @@ void get_codec_iec(FILE *file, struct co |
174 | codec->format = 0; | 171 | codec->format = 0; |
175 | } | 172 | } |
176 | 173 | ||
@@ -206,7 +203,7 @@ index 5b749419e731..8882f4d9746d 100644 | |||
206 | void play_samples(char *name, unsigned int card, unsigned int device, | 203 | void play_samples(char *name, unsigned int card, unsigned int device, |
207 | unsigned long buffer_size, unsigned int frag, | 204 | unsigned long buffer_size, unsigned int frag, |
208 | unsigned long codec_id) | 205 | unsigned long codec_id) |
209 | @@ -411,6 +515,9 @@ void play_samples(char *name, unsigned int card, unsigned int device, | 206 | @@ -411,6 +515,9 @@ void play_samples(char *name, unsigned i |
210 | case SND_AUDIOCODEC_IEC61937: | 207 | case SND_AUDIOCODEC_IEC61937: |
211 | get_codec_iec(file, &config, &codec); | 208 | get_codec_iec(file, &config, &codec); |
212 | break; | 209 | break; |
@@ -216,6 +213,3 @@ index 5b749419e731..8882f4d9746d 100644 | |||
216 | default: | 213 | default: |
217 | fprintf(stderr, "codec ID %ld is not supported\n", codec_id); | 214 | fprintf(stderr, "codec ID %ld is not supported\n", codec_id); |
218 | exit(EXIT_FAILURE); | 215 | exit(EXIT_FAILURE); |
219 | -- | ||
220 | 2.27.0 | ||
221 | |||