Merge pull request #289 from chrisdimich/kirkstone

Kirkstone: Boundary: add 8mm smarc support
Freescale · Dec 2, 2023 · 9cb7794 · 9cb7794
2 parents 1a6ea56 + b07fe33
commit 9cb7794
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/conf/machine/nitrogen8mm.conf b/conf/machine/nitrogen8mm.conf
@@ -21,6 +21,7 @@ KERNEL_DEVICETREE = "freescale/imx8mm-nitrogen8mm.dtb \
 	freescale/imx8mm-nitrogen8mm-m4.dtb \
 	freescale/imx8mm-nitrogen8mm-tc358743.dtb \
 	freescale/imx8mm-nitrogen8mm_som-tc358743.dtb \
+	freescale/imx8mm-nitrogen_smarc.dtb \
 "
 KERNEL_IMAGETYPE = "Image"
 RRECOMMENDS:${KERNEL_PACKAGE_NAME}-base = ""
@@ -33,7 +34,7 @@ PREFERRED_PROVIDER_imx-atf ??= "imx-atf-boundary"
 SPL_BINARY = "spl/u-boot-spl.bin"
 UBOOT_SUFFIX = "bin"
 
-UBOOT_CONFIG ??= "2g 2gr0 4g rev2_2g rev2_2gr0 rev2_4g som_1gr0 som_2g som_2gr0 som_4g"
+UBOOT_CONFIG ??= "2g 2gr0 4g rev2_2g rev2_2gr0 rev2_4g som_1gr0 som_2g som_2gr0 som_4g smarc_2gr0"
 UBOOT_CONFIG[2g]       = "${MACHINE}_2g_defconfig,sdcard"
 UBOOT_CONFIG[2gr0]     = "${MACHINE}_2gr0_defconfig,sdcard"
 UBOOT_CONFIG[4g]       = "${MACHINE}_4g_defconfig,sdcard"
@@ -44,6 +45,7 @@ UBOOT_CONFIG[som_1gr0] = "${MACHINE}_som_1gr0_defconfig,sdcard"
 UBOOT_CONFIG[som_2g]   = "${MACHINE}_som_2g_defconfig,sdcard"
 UBOOT_CONFIG[som_2gr0]   = "${MACHINE}_som_2g_defconfig,sdcard"
 UBOOT_CONFIG[som_4g]   = "${MACHINE}_som_4g_defconfig,sdcard"
+UBOOT_CONFIG[smarc_2gr0]   = "imx8mm_nitrogen_smarc_2gr0_defconfig,sdcard"
 
 ATF_PLATFORM = "imx8mm"
 
@@ -68,6 +70,7 @@ IMAGE_BOOT_FILES:append = " \
 	flash.bin-${MACHINE}-som_2g;u-boot.${MACHINE}_som_2g \
 	flash.bin-${MACHINE}-som_2gr0;u-boot.${MACHINE}_som_2gr0 \
 	flash.bin-${MACHINE}-som_4g;u-boot.${MACHINE}_som_4g \
+	flash.bin-${MACHINE}-smarc_2gr0;u-boot.imx8mm_nitrogen_smarc_2gr0 \
 "
 
 # wic support

diff --git a/recipes-bsp/u-boot/u-boot-boundary-common_2022.04.inc b/recipes-bsp/u-boot/u-boot-boundary-common_2022.04.inc
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://Licenses/README;md5=5a7450c57ffe5ae63fd732446b988025"
 
 PV = "v2022.04+git${SRCPV}"
 
-SRCREV = "7e7eff7463572dbe689ea1c557c34d11c5f7a9ec"
+SRCREV = "325116286aafc14133fa66719b4277c87a00074e"
 SRCBRANCH = "boundary-v2022.04"
 SRC_URI = "git://github.com/boundarydevices/u-boot.git;branch=${SRCBRANCH};protocol=https"
 

diff --git a/recipes-kernel/linux/linux-boundary_5.15.bb b/recipes-kernel/linux/linux-boundary_5.15.bb
@@ -15,7 +15,7 @@ SRC_URI = "git://github.com/boundarydevices/linux.git;branch=${SRCBRANCH};protoc
 
 LOCALVERSION = "-2.2.0+yocto"
 SRCBRANCH = "boundary-imx_5.15.y"
-SRCREV = "0d2e8ff2b3a96a3be9f2243d78f9953afa0569cf"
+SRCREV = "aaf028b285b7e5fcccd262a1fe61fbf16074f1f9"
 DEPENDS += "lzop-native bc-native"
 COMPATIBLE_MACHINE = "(nitrogen6x|nitrogen6x-lite|nitrogen6sx|nitrogen7|nitrogen8m|nitrogen8mm|nitrogen8mn|nitrogen8mp)"