From fb2e7e37f49de4a6656110ae2d765f30ac00fa51 Mon Sep 17 00:00:00 2001 From: Hector Palacios Date: Tue, 5 May 2020 12:56:39 +0200 Subject: [PATCH] u-boot-fw-utils: consolidate common files by STORAGE_MEDIA Platform-based variable STORAGE_MEDIA, allows us to select the correct configuration file without needing to replicate it per platform. Signed-off-by: Hector Palacios --- .../u-boot/u-boot-fw-utils/ccimx8mn/fw_env.config | 7 ------- .../u-boot/u-boot-fw-utils/ccimx8x/fw_env.config | 7 ------- .../u-boot/u-boot-fw-utils/{ccimx6 => mmc}/fw_env.config | 0 .../u-boot/u-boot-fw-utils/{ccimx6ul => mtd}/fw_env.config | 0 .../recipes-bsp/u-boot/u-boot-fw-utils_%.bbappend | 4 ++-- 5 files changed, 2 insertions(+), 16 deletions(-) delete mode 100644 meta-digi-arm/recipes-bsp/u-boot/u-boot-fw-utils/ccimx8mn/fw_env.config delete mode 100644 meta-digi-arm/recipes-bsp/u-boot/u-boot-fw-utils/ccimx8x/fw_env.config rename meta-digi-arm/recipes-bsp/u-boot/u-boot-fw-utils/{ccimx6 => mmc}/fw_env.config (100%) rename meta-digi-arm/recipes-bsp/u-boot/u-boot-fw-utils/{ccimx6ul => mtd}/fw_env.config (100%) diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-fw-utils/ccimx8mn/fw_env.config b/meta-digi-arm/recipes-bsp/u-boot/u-boot-fw-utils/ccimx8mn/fw_env.config deleted file mode 100644 index 040cd8e30..000000000 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-fw-utils/ccimx8mn/fw_env.config +++ /dev/null @@ -1,7 +0,0 @@ -# Configuration file for fw_(printenv/setenv) utility. -# Up to two entries are valid, in this case the redundant -# environment sector is assumed present. - -# Device name Offset Size -/dev/mmcblk0boot1 0x1C0000 0x4000 -/dev/mmcblk0boot1 0x1E0000 0x4000 diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-fw-utils/ccimx8x/fw_env.config b/meta-digi-arm/recipes-bsp/u-boot/u-boot-fw-utils/ccimx8x/fw_env.config deleted file mode 100644 index 040cd8e30..000000000 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-fw-utils/ccimx8x/fw_env.config +++ /dev/null @@ -1,7 +0,0 @@ -# Configuration file for fw_(printenv/setenv) utility. -# Up to two entries are valid, in this case the redundant -# environment sector is assumed present. - -# Device name Offset Size -/dev/mmcblk0boot1 0x1C0000 0x4000 -/dev/mmcblk0boot1 0x1E0000 0x4000 diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-fw-utils/ccimx6/fw_env.config b/meta-digi-arm/recipes-bsp/u-boot/u-boot-fw-utils/mmc/fw_env.config similarity index 100% rename from meta-digi-arm/recipes-bsp/u-boot/u-boot-fw-utils/ccimx6/fw_env.config rename to meta-digi-arm/recipes-bsp/u-boot/u-boot-fw-utils/mmc/fw_env.config diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-fw-utils/ccimx6ul/fw_env.config b/meta-digi-arm/recipes-bsp/u-boot/u-boot-fw-utils/mtd/fw_env.config similarity index 100% rename from meta-digi-arm/recipes-bsp/u-boot/u-boot-fw-utils/ccimx6ul/fw_env.config rename to meta-digi-arm/recipes-bsp/u-boot/u-boot-fw-utils/mtd/fw_env.config diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-fw-utils_%.bbappend b/meta-digi-arm/recipes-bsp/u-boot/u-boot-fw-utils_%.bbappend index a6197e0f7..89808665f 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-fw-utils_%.bbappend +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-fw-utils_%.bbappend @@ -1,9 +1,9 @@ -# Copyright (C) 2015-2017 Digi International +# Copyright (C) 2015-2020 Digi International FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:" SRC_URI += " \ - file://fw_env.config \ + file://${STORAGE_MEDIA}/fw_env.config \ " UBOOT_FW_UTILS_PATCHES = " \