From: Alex Kiernan <alex.kiernan@gmail.com>
Date: Fri, 7 Oct 2022 16:46:41 +0000 (+0100)
Subject: u-boot: Remove duplicate inherit of cml1
X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~2833
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=286f91f7659307bcdf0ba541b8d6b56db5604ceb;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

u-boot: Remove duplicate inherit of cml1

Splitting u-boot-configure.inc out of the base left duplicate
cml1.bbclass in the base include.

Fixes: fc9a17ad386c ("u-boot: Split do_configure logic into separate file")
Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/recipes-bsp/u-boot/u-boot.inc b/meta/recipes-bsp/u-boot/u-boot.inc
index f022aed732c..b2f33e38266 100644
--- a/meta/recipes-bsp/u-boot/u-boot.inc
+++ b/meta/recipes-bsp/u-boot/u-boot.inc
@@ -5,7 +5,7 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 DEPENDS += "${@bb.utils.contains('UBOOT_ENV_SUFFIX', 'scr', 'u-boot-mkimage-native', '', d)}"
 
-inherit uboot-config uboot-extlinux-config uboot-sign deploy cml1 python3native kernel-arch
+inherit uboot-config uboot-extlinux-config uboot-sign deploy python3native kernel-arch
 
 DEPENDS += "swig-native"