From 48c863b8adc7ac87e009a72cda8fcd4a38e7e902 Mon Sep 17 00:00:00 2001 From: Chris Dimich Date: Wed, 19 Oct 2022 13:57:19 -0700 Subject: [PATCH] nitrogen8m: allow for all uboot defconfigs variants to be built Signed-off-by: Chris Dimich --- conf/machine/nitrogen8m.conf | 30 +++++++++++++++++++----------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/conf/machine/nitrogen8m.conf b/conf/machine/nitrogen8m.conf index 52dca23..61e76df 100644 --- a/conf/machine/nitrogen8m.conf +++ b/conf/machine/nitrogen8m.conf @@ -30,16 +30,16 @@ PREFERRED_PROVIDER_imx-atf ??= "imx-atf-boundary" SPL_BINARY = "spl/u-boot-spl.bin" UBOOT_SUFFIX = "bin" -# Used to define the U-Boot defconfig for different board variants. The naming -# is here as a safeguard mechanism so that a user doesn't build and flash the -# wrong configuration. -# -# This method will be optimized in the future, but for now, use this variable to -# define the defconfig to be built. -BOUNDARY_DEVICES_UBOOT_DEFCONFIG ?= "nitrogen8m" - -UBOOT_CONFIG ??= "sd" -UBOOT_CONFIG[sd] = "${BOUNDARY_DEVICES_UBOOT_DEFCONFIG}_defconfig,sdcard" +UBOOT_CONFIG ??= "2g 2gr0 3g 4g som_2g som_2gr0 som_4g som_sd_2g som_sd_4g" +UBOOT_CONFIG[2g] = "${MACHINE}_2g_defconfig,sdcard" +UBOOT_CONFIG[2gr0] = "${MACHINE}_2gr0_defconfig,sdcard" +UBOOT_CONFIG[3g] = "${MACHINE}_3g_defconfig,sdcard" +UBOOT_CONFIG[4g] = "${MACHINE}_4g_defconfig,sdcard" +UBOOT_CONFIG[som_2g] = "${MACHINE}_som_2g_defconfig,sdcard" +UBOOT_CONFIG[som_2gr0] = "${MACHINE}_som_2gr0_defconfig,sdcard" +UBOOT_CONFIG[som_4g] = "${MACHINE}_som_4g_defconfig,sdcard" +UBOOT_CONFIG[som_sd_2g] = "${MACHINE}_som_sd_2g_defconfig,sdcard" +UBOOT_CONFIG[som_sd_4g] = "${MACHINE}_som_sd_4g_defconfig,sdcard" ATF_PLATFORM = "imx8mq" @@ -53,7 +53,15 @@ DDR_FIRMWARE_NAME = "\ IMAGE_BOOT_FILES:append = " \ boot.scr-${MACHINE};boot.scr \ upgrade.scr-${MACHINE};upgrade.scr \ - flash.bin-${MACHINE};u-boot.${BOUNDARY_DEVICES_UBOOT_DEFCONFIG} \ + flash.bin-${MACHINE}-2g;u-boot.${MACHINE}_2g \ + flash.bin-${MACHINE}-2gr0;u-boot.${MACHINE}_2gr0 \ + flash.bin-${MACHINE}-3g;u-boot.${MACHINE}_3g \ + flash.bin-${MACHINE}-4g;u-boot.${MACHINE}_4g \ + 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}-som_sd_2g;u-boot.${MACHINE}_som_sd_2g \ + flash.bin-${MACHINE}-som_sd_4g;u-boot.${MACHINE}_som_sd_4g \ " # wic support