From a799250b7756df6a66072a0e441263d212273dd3 Mon Sep 17 00:00:00 2001 From: Josep Orga Date: Mon, 15 Nov 2021 13:29:21 +0100 Subject: [PATCH] meta-somdevices: Changed from evk to somdevices names. Signed-off-by: Josep Orga --- conf/layer.conf | 3 --- conf/machine/imx8mmsomdevices.conf | 15 ++++++++------- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/conf/layer.conf b/conf/layer.conf index acb3c60..e446f8b 100644 --- a/conf/layer.conf +++ b/conf/layer.conf @@ -10,8 +10,5 @@ BBFILE_PATTERN_somdevices = "^${LAYERDIR}/" BBFILE_PRIORITY_somdevices = "9" LAYERSERIES_COMPAT_somdevices = "hardknott" -UBOOT_DTB_NAME_imx8mmsomdevices = "imx8mm-evk.dtb" -KERNEL_DEVICETREE_imx8mmsomdevices = "freescale/imx8mm-somdevices-c0p1.dtb" - # Avoid multiple runtime providers for u-boot-default-env PREFERRED_RPROVIDER_u-boot-default-env ??= "${IMX_DEFAULT_BOOTLOADER}" diff --git a/conf/machine/imx8mmsomdevices.conf b/conf/machine/imx8mmsomdevices.conf index 257984a..b6a6330 100644 --- a/conf/machine/imx8mmsomdevices.conf +++ b/conf/machine/imx8mmsomdevices.conf @@ -1,7 +1,7 @@ #@TYPE: Machine -#@NAME: NXP i.MX8MM LPDDR4 SomDevices SMARC +#@NAME: NXP i.MX8MM LPDDR4 SomDevices µSMARC #@SOC: i.MX8MM -#@DESCRIPTION: Machine configuration for SomDevices SMARC imx8mm +#@DESCRIPTION: Machine configuration for SomDevices µSMARC imx8mm #@MAINTAINER: SomDevices MACHINEOVERRIDES =. "mx8:mx8m:mx8mm:" @@ -10,19 +10,20 @@ require conf/machine/include/imx-base.inc require conf/machine/include/tune-cortexa53.inc MACHINE_FEATURES += " pci wifi bluetooth optee" -KERNEL_DEVICETREE = "freescale/imx8mm-somdevices-c0p1.dtb" +KERNEL_DEVICETREE_BASENAME = "imx8mm-somdevices-C0P1" +KERNEL_DEVICETREE = "freescale/${KERNEL_DEVICETREE_BASENAME}.dtb" UBOOT_CONFIG ??= "sd" -UBOOT_CONFIG[sd] = "imx8mm_evk_config,sdcard" -UBOOT_CONFIG[fspi] = "imx8mm_evk_fspi_defconfig" -UBOOT_CONFIG[mfgtool] = "imx8mm_evk_config" +UBOOT_CONFIG[sd] = "imx8mm_somdevices_config,sdcard" +UBOOT_CONFIG[fspi] = "imx8mm_somdevices_fspi_defconfig" +UBOOT_CONFIG[mfgtool] = "imx8mm_somdevices_config" SPL_BINARY = "spl/u-boot-spl.bin" # Set DDR FIRMWARE DDR_FIRMWARE_NAME = "lpddr4_pmu_train_1d_imem.bin lpddr4_pmu_train_1d_dmem.bin lpddr4_pmu_train_2d_imem.bin lpddr4_pmu_train_2d_dmem.bin" # Set u-boot DTB -UBOOT_DTB_NAME = "fsl-imx8mm-evk.dtb" +UBOOT_DTB_NAME = "imx8mm-somdevices.dtb" # Set imx-mkimage boot target IMXBOOT_TARGETS = "${@bb.utils.contains('UBOOT_CONFIG', 'fspi', 'flash_evk_flexspi', 'flash_evk', d)}" -- 2.17.1