6 files changed, 26 insertions, 133 deletions

diff --git a/classes/fsl-u-boot-localversion.bbclass b/classes/fsl-u-boot-localversion.bbclass
index 94b30c04..df4ac5fb 100644
--- a/classes/fsl-u-boot-localversion.bbclass
+++ b/classes/fsl-u-boot-localversion.bbclass
@@ -17,21 +17,21 @@ UBOOT_LOCALVERSION = "${LOCALVERSION}"
 do_compile:prepend() {
         if [ "${SCMVERSION}" = "y" ]; then
                 # Add GIT revision to the local version
-                if [ "${SRCREV}" = "INVALID" ]; then
-                        hash=${SRCREV_machine}
-                else
-                        hash=${SRCREV}
-                fi
-                if [ "$hash" = "AUTOINC" ]; then
-                        branch=`git --git-dir=${S}/.git  symbolic-ref --short -q HEAD`
-                        head=`git --git-dir=${S}/.git rev-parse --verify --short origin/${branch} 2> /dev/null`
-                else
-                        head=`git --git-dir=${S}/.git rev-parse --verify --short $hash 2> /dev/null`
-                fi
-                patches=`git --git-dir=${S}/.git rev-list --count $head..HEAD 2> /dev/null`
-                printf "%s%s%s%s" +g $head +p $patches > ${S}/.scmversion
-                printf "%s%s%s%s" +g $head +p $patches > ${B}/.scmversion
-        else
+                if [ "${SRCREV}" = "INVALID" ]; then
+                        hash=${SRCREV_machine}
+                else
+                        hash=${SRCREV}
+                fi
+                if [ "$hash" = "AUTOINC" ]; then
+                        branch=`git --git-dir=${S}/.git  symbolic-ref --short -q HEAD`
+                        head=`git --git-dir=${S}/.git rev-parse --verify --short origin/${branch} 2> /dev/null`
+                else
+                        head=`git --git-dir=${S}/.git rev-parse --verify --short $hash 2> /dev/null`
+                fi
+                patches=`git --git-dir=${S}/.git rev-list --count $head..HEAD 2> /dev/null`
+                printf "%s%s%s%s%s" "${UBOOT_LOCALVERSION}" +g $head +p $patches > ${S}/.scmversion
+                printf "%s%s%s%s%s" "${UBOOT_LOCALVERSION}" +g $head +p $patches > ${B}/.scmversion
+        else
                 printf "%s" "${UBOOT_LOCALVERSION}" > ${S}/.scmversion
                 printf "%s" "${UBOOT_LOCALVERSION}" > ${B}/.scmversion
         fi
diff --git a/dynamic-layers/openembedded-layer/recipes-devtools/luajit/luajit/ppc-fixplt.patch b/dynamic-layers/openembedded-layer/recipes-devtools/luajit/luajit/ppc-fixplt.patch
deleted file mode 100644
index a576f917..00000000
--- a/dynamic-layers/openembedded-layer/recipes-devtools/luajit/luajit/ppc-fixplt.patch
+++ /dev/null
@@ -1,104 +0,0 @@
-Upstream-Status: Pending
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-
-libluajit is having symbols that can't be
-resolved the reloc cannot accommodate an offset greater than 24 bits.
-
-Looking at libluajit with readelf -r, you see a bunch of entries that look like:
-        000082f0  00003c0a R_PPC_REL24       00000000   sqrt + 0
-
-These should not occur when the code is compiled and linked with -fPIC.
-
-It turns out that libluajit *is* compiled and linked with -fPIC, however...
-There is one assembler file called lj_vm.s which is generated during the build.
-This file is missing the `@plt' qualifier from external references.
-
-This file is generated by a program called buildvm.  This in turn uses tables
-in a file called buildvm_arch.h which is generated by dynasm.lua.
-
-Index: LuaJIT-2.0.1/src/host/buildvm.c
-===================================================================
---- LuaJIT-2.0.1.orig/src/host/buildvm.c        2013-02-19 12:15:00.000000000 -0800
-+++ LuaJIT-2.0.1/src/host/buildvm.c     2013-05-14 20:26:05.933444512 -0700
-@@ -107,12 +107,14 @@
- #endif
-   sprintf(name, "%s%s%s", symprefix, prefix, suffix);
-   p = strchr(name, '@');
-+#if 0
-   if (p) {
-     if (!LJ_64 && (ctx->mode == BUILD_coffasm || ctx->mode == BUILD_peobj))
-       name[0] = '@';
-     else
-       *p = '\0';
-   }
-+#endif
-   p = (char *)malloc(strlen(name)+1);  /* MSVC doesn't like strdup. */
-   strcpy(p, name);
-   return p;
-Index: LuaJIT-2.0.1/src/vm_ppcspe.dasc
-===================================================================
---- LuaJIT-2.0.1.orig/src/vm_ppcspe.dasc        2013-02-19 12:15:00.000000000 -0800
-+++ LuaJIT-2.0.1/src/vm_ppcspe.dasc     2013-05-14 20:26:05.937444512 -0700
-@@ -1390,7 +1390,7 @@
-   |  checknum CARG2
-   |   evmergehi CARG1, CARG2, CARG2
-   |  checkfail ->fff_fallback
--  |  bl extern func
-+  |  bl extern func@plt
-   |  evmergelo CRET1, CRET1, CRET2
-   |  b ->fff_restv
-   |.endmacro
-@@ -1405,7 +1405,7 @@
-   |  checknum CARG1
-   |   evmergehi CARG3, CARG4, CARG4
-   |  checkanyfail ->fff_fallback
--  |  bl extern func
-+  |  bl extern func@plt
-   |  evmergelo CRET1, CRET1, CRET2
-   |  b ->fff_restv
-   |.endmacro
-@@ -1437,7 +1437,7 @@
-   |  checknum CARG2
-   |   evmergehi CARG1, CARG2, CARG2
-   |  checkfail ->fff_fallback
--  |  bl extern log
-+  |  bl extern log@plt
-   |  evmergelo CRET1, CRET1, CRET2
-   |  b ->fff_restv
-   |
-@@ -1471,7 +1471,7 @@
-   |  checknum CARG1
-   |  checkanyfail ->fff_fallback
-   |  efdctsi CARG3, CARG4
--  |  bl extern ldexp
-+  |  bl extern ldexp@plt
-   |  evmergelo CRET1, CRET1, CRET2
-   |  b ->fff_restv
-   |
-@@ -1484,7 +1484,7 @@
-   |  checkfail ->fff_fallback
-   |  la CARG3, DISPATCH_GL(tmptv)(DISPATCH)
-   |   lwz PC, FRAME_PC(BASE)
--  |  bl extern frexp
-+  |  bl extern frexp@plt
-   |   lwz TMP1, DISPATCH_GL(tmptv)(DISPATCH)
-   |  evmergelo CRET1, CRET1, CRET2
-   |   efdcfsi CRET2, TMP1
-@@ -1503,7 +1503,7 @@
-   |  checkfail ->fff_fallback
-   |  la CARG3, -8(BASE)
-   |   lwz PC, FRAME_PC(BASE)
--  |  bl extern modf
-+  |  bl extern modf@plt
-   |  evmergelo CRET1, CRET1, CRET2
-   |   la RA, -8(BASE)
-   |  evstdd CRET1, 0(BASE)
-@@ -2399,7 +2399,7 @@
-     |  checknum CARG1
-     |   evmergehi CARG3, CARG4, CARG4
-     |  checkanyfail ->vmeta_arith_vv
--    |  bl extern pow
-+    |  bl extern pow@plt
-     |  evmergelo CRET2, CRET1, CRET2
-     |  evstddx CRET2, BASE, RA
-     |  ins_next
diff --git a/dynamic-layers/openembedded-layer/recipes-devtools/luajit/luajit_%.bbappend b/dynamic-layers/openembedded-layer/recipes-devtools/luajit/luajit_%.bbappend
deleted file mode 100644
index d07f8ae1..00000000
--- a/dynamic-layers/openembedded-layer/recipes-devtools/luajit/luajit_%.bbappend
+++ /dev/null
@@ -1,4 +0,0 @@
-FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:"
-
-SRC_URI:append:qoriq-ppc = " file://ppc-fixplt.patch "
-
diff --git a/recipes-bsp/firmware-imx/firmware-nxp-wifi_1.0.bb b/recipes-bsp/firmware-imx/firmware-nxp-wifi_1.0.bb
index d28b2382..c425173c 100644
--- a/recipes-bsp/firmware-imx/firmware-nxp-wifi_1.0.bb
+++ b/recipes-bsp/firmware-imx/firmware-nxp-wifi_1.0.bb
@@ -7,11 +7,11 @@ should be preferred."
 
 SECTION = "kernel"
 LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=44a8052c384584ba09077e85a3d1654f"
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=10c0fda810c63b052409b15a5445671a"
 
 SRC_URI = "git://github.com/nxp-imx/imx-firmware.git;protocol=https;branch=${SRCBRANCH}"
-SRCBRANCH = "lf-6.6.3_1.0.0"
-SRCREV = "2afa15e77f0b58eade42b4f59c9215339efcca66"
+SRCBRANCH = "lf-6.6.23_2.0.0"
+SRCREV = "7e038c6afba3118bcee91608764ac3c633bce0c4"
 
 S = "${WORKDIR}/git"
 
@@ -150,6 +150,7 @@ FILES:${PN}-nxpiw612-sdio = " \
     ${nonarch_base_libdir}/firmware/nxp/sd_w61x_v1.bin.se \
     ${nonarch_base_libdir}/firmware/nxp/uartspi_n61x_v1.bin.se \
     ${nonarch_base_libdir}/firmware/nxp/IW612_SD_RFTest/ \
+    ${nonarch_base_libdir}/firmware/nxp/uartuart_n61x_v1.bin.se \
 "
 RDEPENDS:${PN}-nxpiw612-sdio += "${PN}-nxp-common"
 RPROVIDES:${PN}-nxpiw612-sdio = "linux-firmware-nxpiw612-sdio"
diff --git a/recipes-bsp/imx-seco/imx-seco_5.9.0.bb b/recipes-bsp/imx-seco/imx-seco_5.9.4.bb
index f7dadea5..14b15da2 100644
--- a/recipes-bsp/imx-seco/imx-seco_5.9.0.bb
+++ b/recipes-bsp/imx-seco/imx-seco_5.9.4.bb
@@ -4,14 +4,14 @@ SUMMARY = "NXP i.MX SECO firmware"
 DESCRIPTION = "Firmware for i.MX Security Controller Subsystem"
 SECTION = "base"
 LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://COPYING;md5=5a0bf11f745e68024f37b4724a5364fe"
+LIC_FILES_CHKSUM = "file://COPYING;md5=10c0fda810c63b052409b15a5445671a"
 
 inherit fsl-eula-unpack use-imx-security-controller-firmware deploy
 
 SRC_URI = "${FSL_MIRROR}/${BP}.bin;fsl-eula=true"
 
-SRC_URI[md5sum] = "b722a534c4d3cc90270e05eaa812514d"
-SRC_URI[sha256sum] = "c3bd761f457e939035b01a0ab36e79064a2a1bc6c3cdb3cd847f7f38df0964df"
+SRC_URI[md5sum] = "d05d6b15ad9ad0df141e1fc736f4a622"
+SRC_URI[sha256sum] = "9b04be33814a9cbda9bbfcb6711585cf7e4ed2527793813c95230f350323cba7"
 
 
 do_compile[noexec] = "1"
diff --git a/recipes-kernel/kernel-modules/kernel-module-nxp-wlan_git.bb b/recipes-kernel/kernel-modules/kernel-module-nxp-wlan_git.bb
index 48e9cc3b..453fdd48 100644
--- a/recipes-kernel/kernel-modules/kernel-module-nxp-wlan_git.bb
+++ b/recipes-kernel/kernel-modules/kernel-module-nxp-wlan_git.bb
@@ -1,6 +1,6 @@
 SUMMARY = "NXP Wi-Fi driver for module 88w8801/8987/8997/9098 IW416/612"
 LICENSE = "GPL-2.0-only"
-LIC_FILES_CHKSUM = "file://../../LICENSE;md5=ab04ac0f249af12befccb94447c08b77"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=ab04ac0f249af12befccb94447c08b77"
 
 # For backwards compatibility
 PROVIDES += "kernel-module-nxp89xx"
@@ -8,12 +8,12 @@ RREPLACES:${PN} = "kernel-module-nxp89xx"
 RPROVIDES:${PN} = "kernel-module-nxp89xx"
 RCONFLICTS:${PN} = "kernel-module-nxp89xx"
 
-SRCBRANCH = "lf-6.6.3_1.0.0"
+SRCBRANCH = "lf-6.6.23_2.0.0"
 MRVL_SRC ?= "git://github.com/nxp-imx/mwifiex.git;protocol=https"
 SRC_URI = "${MRVL_SRC};branch=${SRCBRANCH}"
-SRCREV = "a84df583155bad2a396a937056805550bdf655ab"
+SRCREV = "88372772badbf30152b3ad12ae251dc567095cab"
 
-S = "${WORKDIR}/git/mxm_wifiex/wlan_src"
+S = "${WORKDIR}/git"
 
 inherit module