From f8bc5f5664d07dc86bf9bc16b985a891375af160 Mon Sep 17 00:00:00 2001 From: Chris Dimich Date: Tue, 14 Nov 2023 12:37:37 -0800 Subject: [PATCH 1/2] nitrogen8mp: add more smarc uboot variants Signed-off-by: Chris Dimich --- conf/machine/nitrogen8mp.conf | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/conf/machine/nitrogen8mp.conf b/conf/machine/nitrogen8mp.conf index f52f7a8f..b2ee5f1d 100644 --- 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 From cfb24c2a51c6443c23fb333e6144f363919df4e4 Mon Sep 17 00:00:00 2001 From: Chris Dimich Date: Tue, 14 Nov 2023 12:38:05 -0800 Subject: [PATCH 2/2] nitrogen8mm: add 8mm smarc uboot support Signed-off-by: Chris Dimich --- conf/machine/nitrogen8mm.conf | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/conf/machine/nitrogen8mm.conf b/conf/machine/nitrogen8mm.conf index 9e808247..82c29336 100644 --- 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