From 856a4a3c7058dfd4891b870e1378a80d72ad551f Mon Sep 17 00:00:00 2001
From: Hector Palacios <hector.palacios@digi.com>
Date: Mon, 2 Jan 2023 16:59:43 +0100
Subject: [PATCH] ccmp1: remove existing common settings and move others to
 include file

Signed-off-by: Hector Palacios <hector.palacios@digi.com>
---
 meta-digi-arm/conf/machine/ccmp13-dvk.conf   | 5 -----
 meta-digi-arm/conf/machine/ccmp15-dvk.conf   | 5 -----
 meta-digi-arm/conf/machine/include/ccmp1.inc | 2 ++
 3 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/meta-digi-arm/conf/machine/ccmp13-dvk.conf b/meta-digi-arm/conf/machine/ccmp13-dvk.conf
index baa634121..354eebdb5 100644
--- a/meta-digi-arm/conf/machine/ccmp13-dvk.conf
+++ b/meta-digi-arm/conf/machine/ccmp13-dvk.conf
@@ -27,11 +27,6 @@ UBOOT_CONFIG[ccmp13-dvk] = "ccmp13-dvk_defconfig,,u-boot-dtb.${UBOOT_SUFFIX}"
 
 # Platform U-Boot settings
 UBOOT_DTB_NAME = "ccmp13-dvk.dtb"
-UBOOT_PREFIX = "u-boot"
-UBOOT_SUFFIX = "bin"
-
-# Set U-Boot FIP settings
-FIP_UBOOT_DTB = "u-boot"
 
 # =========================================================================
 # Machine settings
diff --git a/meta-digi-arm/conf/machine/ccmp15-dvk.conf b/meta-digi-arm/conf/machine/ccmp15-dvk.conf
index 5690510a2..8a76c33a5 100644
--- a/meta-digi-arm/conf/machine/ccmp15-dvk.conf
+++ b/meta-digi-arm/conf/machine/ccmp15-dvk.conf
@@ -27,11 +27,6 @@ UBOOT_CONFIG[ccmp15-dvk] = "ccmp15-dvk_defconfig,,u-boot-dtb.${UBOOT_SUFFIX}"
 
 # Platform U-Boot settings
 UBOOT_DTB_NAME = "ccmp15-dvk.dtb"
-UBOOT_PREFIX = "u-boot"
-UBOOT_SUFFIX = "bin"
-
-# Set U-Boot FIP settings
-FIP_UBOOT_DTB = "u-boot"
 
 # =========================================================================
 # Machine settings
diff --git a/meta-digi-arm/conf/machine/include/ccmp1.inc b/meta-digi-arm/conf/machine/include/ccmp1.inc
index ed3ae6a2d..babb10b4f 100644
--- a/meta-digi-arm/conf/machine/include/ccmp1.inc
+++ b/meta-digi-arm/conf/machine/include/ccmp1.inc
@@ -11,6 +11,8 @@ DIGI_FAMILY = "ccmp1"
 # Platform u-boot settings
 UBOOT_PREFIX = "u-boot"
 UBOOT_SUFFIX = "bin"
+# Set U-Boot FIP settings
+FIP_UBOOT_DTB = "u-boot"
 
 STORAGE_MEDIA = "mtd"