From 4590397b131c588b198abec902bb51b30ee683e8 Mon Sep 17 00:00:00 2001 From: Alex Gonzalez Date: Fri, 3 May 2013 17:31:33 +0200 Subject: [PATCH] meta-digi-arm: Change variant image naming to match u-boot's. Fixes https://jira.digi.com/browse/DEL-386 Signed-off-by: Alex Gonzalez --- meta-digi-arm/conf/machine/include/imx-digi-base.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-digi-arm/conf/machine/include/imx-digi-base.inc b/meta-digi-arm/conf/machine/include/imx-digi-base.inc index 097c0a594..4ffbd1f71 100644 --- a/meta-digi-arm/conf/machine/include/imx-digi-base.inc +++ b/meta-digi-arm/conf/machine/include/imx-digi-base.inc @@ -18,8 +18,8 @@ UBOOT_PADDING = "2" UBOOT_CONFIG_VARIANT ?= "" UBOOT_MACHINE = '${MACHINE}${@base_conditional( "UBOOT_CONFIG_VARIANT", "", "_", "_${UBOOT_CONFIG_VARIANT}_", d )}config' -UBOOT_IMAGE = 'u-boot-${MACHINE}${@base_conditional( "UBOOT_CONFIG_VARIANT", "", "-", "-${UBOOT_CONFIG_VARIANT}-", d )}${PV}-${PR}.${UBOOT_SUFFIX}' -UBOOT_SYMLINK = 'u-boot-${MACHINE}${@base_conditional( "UBOOT_CONFIG_VARIANT", "", "", "-${UBOOT_CONFIG_VARIANT}", d )}.${UBOOT_SUFFIX}' +UBOOT_IMAGE = 'u-boot-${MACHINE}${@base_conditional( "UBOOT_CONFIG_VARIANT", "", "-", "_${UBOOT_CONFIG_VARIANT}-", d )}${PV}-${PR}.${UBOOT_SUFFIX}' +UBOOT_SYMLINK = 'u-boot-${MACHINE}${@base_conditional( "UBOOT_CONFIG_VARIANT", "", "", "_${UBOOT_CONFIG_VARIANT}", d )}.${UBOOT_SUFFIX}' XSERVER = "xserver-xorg \ xf86-input-evdev \