Merge pull request #1339 from Freescale/backport-1338-to-kirkstone

[Backport kirkstone] Update uefi and fm-ucode to new revision; Fix the weston-init issue

3 files changed, 9 insertions, 8 deletions

diff --git a/recipes-bsp/uefi/uefi_git.bb b/recipes-bsp/uefi/uefi_git.bb
index d7ef0b72..51a8be63 100644
--- a/recipes-bsp/uefi/uefi_git.bb
+++ b/recipes-bsp/uefi/uefi_git.bb
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://NXP-Binary-EULA;md5=343ec8f06efc37467a6de53686fa6315"
 inherit deploy
 
 SRC_URI = "git://github.com/NXP/qoriq-uefi-binary.git;nobranch=1;protocol=https"
-SRCREV= "1b28cad962a3f7b61baae2229cb3b84926941cfa"
+SRCREV = "d887e52b7a50c7d20fd8200cd741ac61309e0af2"
 
 S = "${WORKDIR}/git"
 
diff --git a/recipes-dpaa/fm-ucode/fm-ucode_git.bb b/recipes-dpaa/fm-ucode/fm-ucode_git.bb
index f79122c6..c7eb7319 100644
--- a/recipes-dpaa/fm-ucode/fm-ucode_git.bb
+++ b/recipes-dpaa/fm-ucode/fm-ucode_git.bb
@@ -1,14 +1,14 @@
 DESCRIPTION = "Fman microcode binary"
 SECTION = "fm-ucode"
-LICENSE = "Freescale-Binary-EULA"
-LIC_FILES_CHKSUM = "file://Freescale-Binary-EULA;md5=b784c031868ba1bd5ebc5de372c823fa"
+LICENSE = "NXP-Binary-EULA"
+LIC_FILES_CHKSUM = "file://NXP-Binary-EULA.txt;md5=12e248d404ce1ea8bed0148fcf127e69"
 
 PR = "r1"
 
 inherit deploy
 
 SRC_URI = "git://github.com/NXP/qoriq-fm-ucode.git;nobranch=1;protocol=https"
-SRCREV = "c275e91392e2adab1ed22f3867b8269ca3c54014"
+SRCREV = "83e8467a356316265c7695bdc7741f23066795aa"
 
 S = "${WORKDIR}/git"
 
diff --git a/recipes-graphics/wayland/weston-init.bbappend b/recipes-graphics/wayland/weston-init.bbappend
index 4ba6cba7..917791eb 100644
--- a/recipes-graphics/wayland/weston-init.bbappend
+++ b/recipes-graphics/wayland/weston-init.bbappend
@@ -27,11 +27,12 @@ INI_UNCOMMENT_ASSIGNMENTS:append:mx8mq-nxp-bsp = " \
 # FIXME: The 8QM and 8QXP SoCs have better performance without G2D so don't enable it
 # Ideally, this should be seamless and Vivante ought to handle it internally and take the fastest
 # rendering code.
+INI_UNCOMMENT_USE_G2D               ?= ""
 INI_UNCOMMENT_USE_G2D:imxgpu2d      ?= "use-g2d=1"
-INI_UNCOMMENT_USE_G2D:mx8qm-nxp-bsp  = ""
-INI_UNCOMMENT_USE_G2D:mx8qxp-nxp-bsp = ""
-INI_UNCOMMENT_USE_G2D:mx8dx-nxp-bsp  = ""
-INI_UNCOMMENT_ASSIGNMENTS:append:imxgpu2d = " \
+INI_UNCOMMENT_USE_G2D:mx8qm-nxp-bsp ?= ""
+INI_UNCOMMENT_USE_G2D:mx8qxp-nxp-bsp ?= ""
+INI_UNCOMMENT_USE_G2D:mx8dx-nxp-bsp ?= ""
+INI_UNCOMMENT_ASSIGNMENTS:append = " \
     ${INI_UNCOMMENT_USE_G2D} \
 "