Merge pull request #863 from angolini/fix-hardknott+bsp

Fix hardknott

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"
 
 # Jailhouse
 MACHINE_EXTRA_RRECOMMENDS += " \
-    ${@bb.utils.contains('COMBINED_FEATURES', 'jailhouse', 'jailhouse', '', d)} \
+    ${@bb.utils.filter('COMBINED_FEATURES', 'jailhouse', d)} \
 "
 
 # GStreamer 1.0 plugins
@@ -334,13 +334,13 @@ MACHINE_GSTREAMER_1_0_PLUGIN_mx8mq  ?= "imx-gst1.0-plugin"
 MACHINE_GSTREAMER_1_0_PLUGIN_mx8qm  ?= "imx-gst1.0-plugin"
 MACHINE_GSTREAMER_1_0_PLUGIN_mx8qxp ?= "imx-gst1.0-plugin"
 
-+PREFERRED_VERSION_gstreamer1.0_mx8              ?= "1.18.0.imx"
-+PREFERRED_VERSION_gstreamer1.0-plugins-base_mx8 ?= "1.18.0.imx"
-+PREFERRED_VERSION_gstreamer1.0-plugins-good_mx8 ?= "1.18.0.imx"
-+PREFERRED_VERSION_gstreamer1.0-plugins-bad_mx8  ?= "1.18.0.imx"
-+PREFERRED_VERSION_gstreamer1.0-plugins-ugly_mx8 ?= "1.18.0"
-+PREFERRED_VERSION_gstreamer1.0-libav_mx8        ?= "1.18.0"
-+PREFERRED_VERSION_gstreamer1.0-rtsp-server_mx8  ?= "1.18.0"
+PREFERRED_VERSION_gstreamer1.0_mx8              ?= "1.18.0.imx"
+PREFERRED_VERSION_gstreamer1.0-plugins-base_mx8 ?= "1.18.0.imx"
+PREFERRED_VERSION_gstreamer1.0-plugins-good_mx8 ?= "1.18.0.imx"
+PREFERRED_VERSION_gstreamer1.0-plugins-bad_mx8  ?= "1.18.0.imx"
+PREFERRED_VERSION_gstreamer1.0-plugins-ugly_mx8 ?= "1.18.0"
+PREFERRED_VERSION_gstreamer1.0-libav_mx8        ?= "1.18.0"
+PREFERRED_VERSION_gstreamer1.0-rtsp-server_mx8  ?= "1.18.0"
 
 # Determines if the SoC has support for Vivante kernel driver
 SOC_HAS_VIVANTE_KERNEL_DRIVER_SUPPORT        = "0"
@@ -477,9 +477,6 @@ KERNEL_IMAGETYPE_aarch64 = "Image"
 
 MACHINE_FEATURES = "usbgadget usbhost vfat alsa touchscreen"
 
-SOC_MACHINE_FEATURES_BACKFILL_mx8m = "jailhouse"
-MACHINE_FEATURES_BACKFILL_append = " ${SOC_MACHINE_FEATURES_BACKFILL}"
-
 # Add the ability to specify _imx machines
 MACHINEOVERRIDES =. "imx:"
 
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
 
 MACHINE_FEATURES += "pci wifi bluetooth bcm43455 bcm4356"
 
-# NXP BSP can consume BCM4359 driver and firmware
+# NXP BSP can consume proprietary jailhouse and BCM4359 firmware
 # Since the firmware is not available publicly, and rather distributed
 # under "Proprietary" license - we opt-out from using it in all BSPs
 # and pin it to NXP BSP only
 # OP-TEE is also applicable to NXP BSP, mainline BSP seems not to have
 # a full support for it yet.
-MACHINE_FEATURES_append_use-nxp-bsp = " optee bcm4359"
+MACHINE_FEATURES:append:use-nxp-bsp = " optee jailhouse bcm4359"
 
 KERNEL_DEVICETREE = " \
     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>
  2 files changed, 158 insertions(+)
  create mode 100644 include/tinycompress/wave_formats.h
 
-diff --git a/include/tinycompress/wave_formats.h b/include/tinycompress/wave_formats.h
-new file mode 100644
-index 000000000000..4e2e009206cf
 --- /dev/null
 +++ b/include/tinycompress/wave_formats.h
-@@ -0,0 +1,51 @@
+@@ -0,0 +1,53 @@
 +#ifndef WAVE_FORMATS_H
 +#define WAVE_FORMATS_H         1
 +
++#include <sys/types.h>
++
 +#define COMPOSE_ID(a,b,c,d)    ((a) | ((b)<<8) | ((c)<<16) | ((d)<<24))
 +
 +#define WAV_RIFF               COMPOSE_ID('R','I','F','F')
@@ -72,8 +71,6 @@ index 000000000000..4e2e009206cf
 +
 +
 +#endif                         /* FORMATS */
-diff --git a/src/utils/cplay.c b/src/utils/cplay.c
-index 5b749419e731..8882f4d9746d 100644
 --- a/src/utils/cplay.c
 +++ b/src/utils/cplay.c
 @@ -1,4 +1,6 @@
@@ -92,7 +89,7 @@ index 5b749419e731..8882f4d9746d 100644
  
  static int verbose;
  static const unsigned int DEFAULT_CODEC_ID = SND_AUDIOCODEC_PCM;
-@@ -166,6 +170,77 @@ static int parse_mp3_header(struct mp3_header *header, unsigned int *num_channel
+@@ -166,6 +170,77 @@ static int parse_mp3_header(struct mp3_h
         return 0;
  }
  
@@ -170,7 +167,7 @@ index 5b749419e731..8882f4d9746d 100644
  static int print_time(struct compress *compress)
  {
         unsigned int avail;
-@@ -385,6 +460,35 @@ void get_codec_iec(FILE *file, struct compr_config *config,
+@@ -385,6 +460,35 @@ void get_codec_iec(FILE *file, struct co
         codec->format = 0;
  }
  
@@ -206,7 +203,7 @@ index 5b749419e731..8882f4d9746d 100644
  void play_samples(char *name, unsigned int card, unsigned int device,
                 unsigned long buffer_size, unsigned int frag,
                 unsigned long codec_id)
-@@ -411,6 +515,9 @@ void play_samples(char *name, unsigned int card, unsigned int device,
+@@ -411,6 +515,9 @@ void play_samples(char *name, unsigned i
         case SND_AUDIOCODEC_IEC61937:
                 get_codec_iec(file, &config, &codec);
                 break;
@@ -216,6 +213,3 @@ index 5b749419e731..8882f4d9746d 100644
         default:
                 fprintf(stderr, "codec ID %ld is not supported\n", codec_id);
                 exit(EXIT_FAILURE);
--- 
-2.27.0
-