Merge pull request #287 from chrisdimich/master

nitrogen8mm and nitrogen8mp: add smarc uboot variants
Freescale · Nov 14, 2023 · a9bba0f · a9bba0f
2 parents bf46965 + cfb24c2
commit a9bba0f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/conf/machine/nitrogen8mm.conf b/conf/machine/nitrogen8mm.conf
@@ -39,7 +39,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"
@@ -50,6 +50,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"
 
@@ -74,6 +75,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/conf/machine/nitrogen8mp.conf b/conf/machine/nitrogen8mp.conf
@@ -44,12 +44,14 @@ PREFERRED_PROVIDER_imx-atf ??= "imx-atf-boundary"
 SPL_BINARY = "spl/u-boot-spl.bin"
 UBOOT_SUFFIX = "bin"
 
-UBOOT_CONFIG ??= "2g 2gr0 4g 8g smarc"
+UBOOT_CONFIG ??= "2g 2gr0 4g 8g smarc_2gr0 smarc_4g smarc_8g"
 UBOOT_CONFIG[2g]   = "${MACHINE}_2g_defconfig,sdcard"
 UBOOT_CONFIG[2gr0] = "${MACHINE}_2gr0_defconfig,sdcard"
 UBOOT_CONFIG[4g]   = "${MACHINE}_4g_defconfig,sdcard"
 UBOOT_CONFIG[8g]   = "${MACHINE}_8g_defconfig,sdcard"
-UBOOT_CONFIG[smarc]   = "imx8mp_nitrogen_smarc_2gr0_defconfig,sdcard"
+UBOOT_CONFIG[smarc_2gr0]   = "imx8mp_nitrogen_smarc_2gr0_defconfig,sdcard"
+UBOOT_CONFIG[smarc_4g]   = "imx8mp_nitrogen_smarc_4g_defconfig,sdcard"
+UBOOT_CONFIG[smarc_8g]   = "imx8mp_nitrogen_smarc_8g_defconfig,sdcard"
 
 ATF_PLATFORM = "imx8mp"
 
@@ -67,7 +69,9 @@ IMAGE_BOOT_FILES:append = " \
 	flash.bin-${MACHINE}-2gr0;u-boot.${MACHINE}_2gr0 \
 	flash.bin-${MACHINE}-4g;u-boot.${MACHINE}_4g \
 	flash.bin-${MACHINE}-8g;u-boot.${MACHINE}_8g \
-	flash.bin-${MACHINE}-smarc;u-boot.imx8mp_nitrogen_smarc_2gr0 \
+	flash.bin-${MACHINE}-smarc_2gr0;u-boot.imx8mp_nitrogen_smarc_2gr0 \
+	flash.bin-${MACHINE}-smarc_4g;u-boot.imx8mp_nitrogen_smarc_4g \
+	flash.bin-${MACHINE}-smarc_8g;u-boot.imx8mp_nitrogen_smarc_8g \
 "
 
 # wic support