From f65292fe4c0ac3badec1c5de8f75830c3e1aa735 Mon Sep 17 00:00:00 2001 From: Chris Dimich Date: Mon, 17 Oct 2022 11:48:05 -0700 Subject: [PATCH 01/10] u-boot-boundary: bump version to 2022.04 Signed-off-by: Chris Dimich --- ...mon_2020.10.inc => u-boot-boundary-common_2022.04.inc} | 8 ++++---- ...oot-boundary_2020.10.bb => u-boot-boundary_2022.04.bb} | 0 ...ndary_2020.10.bb => u-boot-script-boundary_2022.04.bb} | 0 3 files changed, 4 insertions(+), 4 deletions(-) rename recipes-bsp/u-boot/{u-boot-boundary-common_2020.10.inc => u-boot-boundary-common_2022.04.inc} (53%) rename recipes-bsp/u-boot/{u-boot-boundary_2020.10.bb => u-boot-boundary_2022.04.bb} (100%) rename recipes-bsp/u-boot/{u-boot-script-boundary_2020.10.bb => u-boot-script-boundary_2022.04.bb} (100%) diff --git a/recipes-bsp/u-boot/u-boot-boundary-common_2020.10.inc b/recipes-bsp/u-boot/u-boot-boundary-common_2022.04.inc similarity index 53% rename from recipes-bsp/u-boot/u-boot-boundary-common_2020.10.inc rename to recipes-bsp/u-boot/u-boot-boundary-common_2022.04.inc index 5593245..31c5ce3 100644 --- a/recipes-bsp/u-boot/u-boot-boundary-common_2020.10.inc +++ b/recipes-bsp/u-boot/u-boot-boundary-common_2022.04.inc @@ -2,11 +2,11 @@ DESCRIPTION = "U-Boot for Boundary Devices boards" LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://Licenses/README;md5=5a7450c57ffe5ae63fd732446b988025" -PV = "v2020.10+git${SRCPV}" +PV = "v2022.04+git${SRCPV}" -SRCREV = "3d5e7f60236b1f70ed244a2270a50238a2acfd72" -SRCBRANCH = "boundary-v2020.10" -SRC_URI = "git://github.com/boundarydevices/u-boot-imx6.git;branch=${SRCBRANCH};protocol=https" +SRCREV = "951b0deec7d391435d0f77a141b7b7f5931663e3" +SRCBRANCH = "boundary-v2022.04" +SRC_URI = "git://github.com/boundarydevices/u-boot.git;branch=${SRCBRANCH};protocol=https" S = "${WORKDIR}/git" B = "${WORKDIR}/build" diff --git a/recipes-bsp/u-boot/u-boot-boundary_2020.10.bb b/recipes-bsp/u-boot/u-boot-boundary_2022.04.bb similarity index 100% rename from recipes-bsp/u-boot/u-boot-boundary_2020.10.bb rename to recipes-bsp/u-boot/u-boot-boundary_2022.04.bb diff --git a/recipes-bsp/u-boot/u-boot-script-boundary_2020.10.bb b/recipes-bsp/u-boot/u-boot-script-boundary_2022.04.bb similarity index 100% rename from recipes-bsp/u-boot/u-boot-script-boundary_2020.10.bb rename to recipes-bsp/u-boot/u-boot-script-boundary_2022.04.bb From 34290eefbb48ed322384ac1c5501390c6899733f Mon Sep 17 00:00:00 2001 From: Chris Dimich Date: Mon, 17 Oct 2022 11:49:42 -0700 Subject: [PATCH 02/10] u-boot-boundary: add support for imx-boot-container Also remove obsolete code needed for imx-boot. Signed-off-by: Chris Dimich --- recipes-bsp/u-boot/u-boot-boundary_2022.04.bb | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/recipes-bsp/u-boot/u-boot-boundary_2022.04.bb b/recipes-bsp/u-boot/u-boot-boundary_2022.04.bb index a96e5f0..cf5314c 100644 --- a/recipes-bsp/u-boot/u-boot-boundary_2022.04.bb +++ b/recipes-bsp/u-boot/u-boot-boundary_2022.04.bb @@ -1,18 +1,12 @@ require recipes-bsp/u-boot/u-boot.inc require recipes-bsp/u-boot/u-boot-boundary-common_${PV}.inc -DEPENDS += "bison-native" +inherit deploy ${@oe.utils.ifelse(d.getVar('UBOOT_PROVIDES_BOOT_CONTAINER') == '1', 'imx-boot-container', '')} + +DEPENDS += "bison-native dtc-native python3-setuptools-native" SRC_URI += "file://fw_env.config" PROVIDES += "u-boot" -BOOT_TOOLS = "imx-boot-tools" - -do_deploy:append:mx8-nxp-bsp () { - install -d ${DEPLOYDIR}/${BOOT_TOOLS} - install -m 0777 ${B}/${config}/arch/arm/dts/${UBOOT_DTB_NAME} ${DEPLOYDIR}/${BOOT_TOOLS} - install -m 0777 ${B}/${config}/u-boot-nodtb.bin ${DEPLOYDIR}/${BOOT_TOOLS}/u-boot-nodtb.bin-${MACHINE}-${UBOOT_CONFIG} -} - COMPATIBLE_MACHINE = "(nitrogen6x-lite|nitrogen6x|nitrogen6sx|nitrogen7|nitrogen8m|nitrogen8mm|nitrogen8mn|nitrogen8mp)" From 58ae19468fd4b2d9dbb54c9a46baad174fc46129 Mon Sep 17 00:00:00 2001 From: Chris Dimich Date: Mon, 17 Oct 2022 12:09:24 -0700 Subject: [PATCH 03/10] nitrogen8mp: use imx-boot-container to generate u-boot binary Also remove obsolete variables. Signed-off-by: Chris Dimich --- conf/machine/nitrogen8mp.conf | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/conf/machine/nitrogen8mp.conf b/conf/machine/nitrogen8mp.conf index 98a2e76..300a1ca 100644 --- a/conf/machine/nitrogen8mp.conf +++ b/conf/machine/nitrogen8mp.conf @@ -4,7 +4,7 @@ #@DESCRIPTION: Machine configuration for Boundary Devices Nitrogen8MP #@MAINTAINER: Chris Dimich -MACHINEOVERRIDES =. "mx8mp:" +MACHINEOVERRIDES =. "mx8mp:imx-boot-container:" IMX_DEFAULT_BSP ?= "nxp" @@ -26,8 +26,6 @@ PREFERRED_PROVIDER_u-boot ??= "u-boot-boundary" PREFERRED_PROVIDER_virtual/bootloader ??= "u-boot-boundary" PREFERRED_PROVIDER_imx-atf ??= "imx-atf-boundary" SPL_BINARY = "spl/u-boot-spl.bin" -UBOOT_DTB_NAME ?= "imx8mp-nitrogen8mp.dtb" -UBOOT_MAKE_TARGET = "" UBOOT_SUFFIX = "bin" # Used to define the U-Boot defconfig for different board variants. The naming @@ -41,10 +39,7 @@ BOUNDARY_DEVICES_UBOOT_DEFCONFIG ?= "nitrogen8mp_2gr0" UBOOT_CONFIG ??= "sd" UBOOT_CONFIG[sd] = "${BOUNDARY_DEVICES_UBOOT_DEFCONFIG}_defconfig,sdcard" -IMAGE_BOOTLOADER = "imx-boot" ATF_PLATFORM = "imx8mp" -IMXBOOT_TARGETS = "flash_evk" -IMX_BOOT_SOC_TARGET = "iMX8MP" DDR_FIRMWARE_NAME = "\ lpddr4_pmu_train_1d_imem_202006.bin \ @@ -58,7 +53,7 @@ WKS_FILE = "sdimage-bootpart.wks" IMAGE_BOOT_FILES:append = " \ boot.scr-${MACHINE};boot.scr \ upgrade.scr-${MACHINE};upgrade.scr \ - imx-boot;u-boot.${BOUNDARY_DEVICES_UBOOT_DEFCONFIG} \ + flash.bin-${MACHINE};u-boot.${BOUNDARY_DEVICES_UBOOT_DEFCONFIG} \ " WKS_FILE_DEPENDS += "u-boot-script-boundary" From 2089403f0bc5ce515fea727df5dcf52b3e621582 Mon Sep 17 00:00:00 2001 From: Chris Dimich Date: Mon, 17 Oct 2022 12:15:11 -0700 Subject: [PATCH 04/10] nitrogen8mp: allow for all uboot defconfigs variants to be built Signed-off-by: Chris Dimich --- conf/machine/nitrogen8mp.conf | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/conf/machine/nitrogen8mp.conf b/conf/machine/nitrogen8mp.conf index 300a1ca..7a17670 100644 --- a/conf/machine/nitrogen8mp.conf +++ b/conf/machine/nitrogen8mp.conf @@ -28,16 +28,11 @@ 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 ?= "nitrogen8mp_2gr0" - -UBOOT_CONFIG ??= "sd" -UBOOT_CONFIG[sd] = "${BOUNDARY_DEVICES_UBOOT_DEFCONFIG}_defconfig,sdcard" +UBOOT_CONFIG ??= "2g 2gr0 4g 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" ATF_PLATFORM = "imx8mp" @@ -48,13 +43,17 @@ DDR_FIRMWARE_NAME = "\ lpddr4_pmu_train_2d_dmem_202006.bin \ " -# wic support -WKS_FILE = "sdimage-bootpart.wks" 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}-4g;u-boot.${MACHINE}_4g \ + flash.bin-${MACHINE}-8g;u-boot.${MACHINE}_8g \ " + +# wic support +WKS_FILE = "sdimage-bootpart.wks" WKS_FILE_DEPENDS += "u-boot-script-boundary" OPTEE_BIN_EXT = "8mp" From a185fcf7dcee81cfcc43d12ff9528e1ab4f270c1 Mon Sep 17 00:00:00 2001 From: Chris Dimich Date: Wed, 19 Oct 2022 13:53:06 -0700 Subject: [PATCH 05/10] nitrogen8m: use imx-boot-container to generate u-boot binary Also remove obsolete variables. Signed-off-by: Chris Dimich --- conf/machine/nitrogen8m.conf | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/conf/machine/nitrogen8m.conf b/conf/machine/nitrogen8m.conf index ba5985c..52dca23 100644 --- a/conf/machine/nitrogen8m.conf +++ b/conf/machine/nitrogen8m.conf @@ -4,7 +4,7 @@ #@DESCRIPTION: Machine configuration for Boundary Devices Nitrogen8M #@MAINTAINER: Chris Dimich -MACHINEOVERRIDES =. "mx8mq:" +MACHINEOVERRIDES =. "mx8mq:imx-boot-container:" IMX_DEFAULT_BSP ?= "nxp" @@ -28,8 +28,6 @@ PREFERRED_PROVIDER_u-boot ??= "u-boot-boundary" PREFERRED_PROVIDER_virtual/bootloader ??= "u-boot-boundary" PREFERRED_PROVIDER_imx-atf ??= "imx-atf-boundary" SPL_BINARY = "spl/u-boot-spl.bin" -UBOOT_DTB_NAME ?= "imx8mq-nitrogen8m.dtb" -UBOOT_MAKE_TARGET = "" UBOOT_SUFFIX = "bin" # Used to define the U-Boot defconfig for different board variants. The naming @@ -43,12 +41,8 @@ BOUNDARY_DEVICES_UBOOT_DEFCONFIG ?= "nitrogen8m" UBOOT_CONFIG ??= "sd" UBOOT_CONFIG[sd] = "${BOUNDARY_DEVICES_UBOOT_DEFCONFIG}_defconfig,sdcard" -# Set ATF platform name ATF_PLATFORM = "imx8mq" -IMXBOOT_TARGETS = "flash_evk" -IMX_BOOT_SOC_TARGET = "iMX8M" - DDR_FIRMWARE_NAME = "\ lpddr4_pmu_train_1d_imem.bin \ lpddr4_pmu_train_1d_dmem.bin \ @@ -59,7 +53,7 @@ DDR_FIRMWARE_NAME = "\ IMAGE_BOOT_FILES:append = " \ boot.scr-${MACHINE};boot.scr \ upgrade.scr-${MACHINE};upgrade.scr \ - imx-boot;u-boot.${BOUNDARY_DEVICES_UBOOT_DEFCONFIG} \ + flash.bin-${MACHINE};u-boot.${BOUNDARY_DEVICES_UBOOT_DEFCONFIG} \ " # wic support From c64f2783313414f475db540d157d5b1e270e5530 Mon Sep 17 00:00:00 2001 From: Chris Dimich Date: Wed, 19 Oct 2022 13:53:34 -0700 Subject: [PATCH 06/10] nitrogen8mm: use imx-boot-container to generate u-boot binary Also remove obsolete variables. Signed-off-by: Chris Dimich --- conf/machine/nitrogen8mm.conf | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/conf/machine/nitrogen8mm.conf b/conf/machine/nitrogen8mm.conf index 972a543..7b338ef 100644 --- a/conf/machine/nitrogen8mm.conf +++ b/conf/machine/nitrogen8mm.conf @@ -4,7 +4,7 @@ #@DESCRIPTION: Machine configuration for Boundary Devices Nitrogen8MM #@MAINTAINER: Chris Dimich -MACHINEOVERRIDES =. "mx8mm:" +MACHINEOVERRIDES =. "mx8mm:imx-boot-container:" IMX_DEFAULT_BSP ?= "nxp" @@ -32,8 +32,6 @@ PREFERRED_PROVIDER_u-boot ??= "u-boot-boundary" PREFERRED_PROVIDER_virtual/bootloader ??= "u-boot-boundary" PREFERRED_PROVIDER_imx-atf ??= "imx-atf-boundary" SPL_BINARY = "spl/u-boot-spl.bin" -UBOOT_DTB_NAME ?= "imx8mm-nitrogen8mm_rev2.dtb" -UBOOT_MAKE_TARGET = "" UBOOT_SUFFIX = "bin" # Used to define the U-Boot defconfig for different board variants. The naming @@ -47,12 +45,8 @@ BOUNDARY_DEVICES_UBOOT_DEFCONFIG ?= "nitrogen8mm_rev2_2g" UBOOT_CONFIG ??= "sd" UBOOT_CONFIG[sd] = "${BOUNDARY_DEVICES_UBOOT_DEFCONFIG}_defconfig,sdcard" -# Set ATF platform name ATF_PLATFORM = "imx8mm" -IMXBOOT_TARGETS = "flash_evk" -IMX_BOOT_SOC_TARGET = "iMX8MM" - # Set DDR FIRMWARE DDR_FIRMWARE_NAME = "\ lpddr4_pmu_train_1d_imem.bin \ @@ -64,7 +58,7 @@ DDR_FIRMWARE_NAME = "\ IMAGE_BOOT_FILES:append = " \ boot.scr-${MACHINE};boot.scr \ upgrade.scr-${MACHINE};upgrade.scr \ - imx-boot;u-boot.${BOUNDARY_DEVICES_UBOOT_DEFCONFIG} \ + flash.bin-${MACHINE};u-boot.${BOUNDARY_DEVICES_UBOOT_DEFCONFIG} \ " # wic support From 64d71d5ab77359be867b2f2817c7bc22876ce7dc Mon Sep 17 00:00:00 2001 From: Chris Dimich Date: Wed, 19 Oct 2022 13:53:59 -0700 Subject: [PATCH 07/10] nitrogen8mn: use imx-boot-container to generate u-boot binary Also remove obsolete variables. Signed-off-by: Chris Dimich --- conf/machine/nitrogen8mn.conf | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/conf/machine/nitrogen8mn.conf b/conf/machine/nitrogen8mn.conf index f7f71c7..a3fd521 100644 --- a/conf/machine/nitrogen8mn.conf +++ b/conf/machine/nitrogen8mn.conf @@ -4,7 +4,7 @@ #@DESCRIPTION: Machine configuration for Boundary Devices Nitrogen8M Nano #@MAINTAINER: Chris Dimich -MACHINEOVERRIDES =. "mx8mn:" +MACHINEOVERRIDES =. "mx8mn:imx-boot-container:" IMX_DEFAULT_BSP ?= "nxp" @@ -27,8 +27,6 @@ PREFERRED_PROVIDER_u-boot ??= "u-boot-boundary" PREFERRED_PROVIDER_virtual/bootloader ??= "u-boot-boundary" PREFERRED_PROVIDER_imx-atf ??= "imx-atf-boundary" SPL_BINARY = "spl/u-boot-spl.bin" -UBOOT_DTB_NAME ?= "imx8mn-nitrogen8_nano.dtb" -UBOOT_MAKE_TARGET = "" UBOOT_SUFFIX = "bin" # Used to define the U-Boot defconfig for different board variants. The naming @@ -42,12 +40,8 @@ BOUNDARY_DEVICES_UBOOT_DEFCONFIG ?= "nitrogen8_nano_8mn1gr0" UBOOT_CONFIG ??= "sd" UBOOT_CONFIG[sd] = "${BOUNDARY_DEVICES_UBOOT_DEFCONFIG}_defconfig,sdcard" -# Set ATF platform name ATF_PLATFORM = "imx8mn" -IMXBOOT_TARGETS = "flash_evk" -IMX_BOOT_SOC_TARGET = "iMX8MN" - DDR_FIRMWARE_NAME = "\ lpddr4_pmu_train_1d_imem.bin \ lpddr4_pmu_train_1d_dmem.bin \ @@ -58,7 +52,7 @@ DDR_FIRMWARE_NAME = "\ IMAGE_BOOT_FILES:append = " \ boot.scr-${MACHINE};boot.scr \ upgrade.scr-${MACHINE};upgrade.scr \ - imx-boot;u-boot.${BOUNDARY_DEVICES_UBOOT_DEFCONFIG} \ + flash.bin-${MACHINE};u-boot.${BOUNDARY_DEVICES_UBOOT_DEFCONFIG} \ " # wic support From 48c863b8adc7ac87e009a72cda8fcd4a38e7e902 Mon Sep 17 00:00:00 2001 From: Chris Dimich Date: Wed, 19 Oct 2022 13:57:19 -0700 Subject: [PATCH 08/10] 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 From 2570ff2b266f34c1df2bf66e1403522528293125 Mon Sep 17 00:00:00 2001 From: Chris Dimich Date: Wed, 19 Oct 2022 13:57:34 -0700 Subject: [PATCH 09/10] nitrogen8mm: allow for all uboot defconfigs variants to be built Signed-off-by: Chris Dimich --- conf/machine/nitrogen8mm.conf | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/conf/machine/nitrogen8mm.conf b/conf/machine/nitrogen8mm.conf index 7b338ef..82276a0 100644 --- a/conf/machine/nitrogen8mm.conf +++ b/conf/machine/nitrogen8mm.conf @@ -34,16 +34,17 @@ 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 ?= "nitrogen8mm_rev2_2g" - -UBOOT_CONFIG ??= "sd" -UBOOT_CONFIG[sd] = "${BOUNDARY_DEVICES_UBOOT_DEFCONFIG}_defconfig,sdcard" +UBOOT_CONFIG ??= "2g 2gr0 4g rev2_2g rev2_2gr0 rev2_4g som_1gr0 som_2g som_2gr0 som_4g" +UBOOT_CONFIG[2g] = "${MACHINE}_2g_defconfig,sdcard" +UBOOT_CONFIG[2gr0] = "${MACHINE}_2gr0_defconfig,sdcard" +UBOOT_CONFIG[4g] = "${MACHINE}_4g_defconfig,sdcard" +UBOOT_CONFIG[rev2_2g] = "${MACHINE}_rev2_2g_defconfig,sdcard" +UBOOT_CONFIG[rev2_2gr0] = "${MACHINE}_rev2_4g_defconfig,sdcard" +UBOOT_CONFIG[rev2_4g] = "${MACHINE}_2gr0_defconfig,sdcard" +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" ATF_PLATFORM = "imx8mm" @@ -58,7 +59,16 @@ 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}-4g;u-boot.${MACHINE}_4g \ + flash.bin-${MACHINE}-rev2_2g;u-boot.${MACHINE}_rev2_2g \ + flash.bin-${MACHINE}-rev2_2gr0;u-boot.${MACHINE}_rev2_2gr0 \ + flash.bin-${MACHINE}-rev2_4g;u-boot.${MACHINE}_rev2_4g \ + flash.bin-${MACHINE}-som_1gr0;u-boot.${MACHINE}_som_1gr0 \ + 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 \ " # wic support From 531c13b79a976f2402ffdb1acfa55842e8f45fbb Mon Sep 17 00:00:00 2001 From: Chris Dimich Date: Wed, 19 Oct 2022 13:57:46 -0700 Subject: [PATCH 10/10] nitrogen8mn: allow for all uboot defconfigs variants to be built Signed-off-by: Chris Dimich --- conf/machine/nitrogen8mn.conf | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/conf/machine/nitrogen8mn.conf b/conf/machine/nitrogen8mn.conf index a3fd521..8c989a4 100644 --- a/conf/machine/nitrogen8mn.conf +++ b/conf/machine/nitrogen8mn.conf @@ -29,16 +29,9 @@ 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 ?= "nitrogen8_nano_8mn1gr0" - -UBOOT_CONFIG ??= "sd" -UBOOT_CONFIG[sd] = "${BOUNDARY_DEVICES_UBOOT_DEFCONFIG}_defconfig,sdcard" +UBOOT_CONFIG ??= "1g som_1g" +UBOOT_CONFIG[1g] = "${MACHINE}_1g_defconfig,sdcard" +UBOOT_CONFIG[som_1g] = "${MACHINE}_som_1g_defconfig,sdcard" ATF_PLATFORM = "imx8mn" @@ -52,7 +45,8 @@ 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}-1g;u-boot.${MACHINE}_1g \ + flash.bin-${MACHINE}-som_1g;u-boot.${MACHINE}_som_1g \ " # wic support