From 58ae19468fd4b2d9dbb54c9a46baad174fc46129 Mon Sep 17 00:00:00 2001 From: Chris Dimich Date: Mon, 17 Oct 2022 12:09:24 -0700 Subject: [PATCH] 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"