Skip to contentSkip to conversation

u-boot: Remove duplicate inherit of cml1

PATCH In review Alex Kiernan 2 participants 4 messages Oct 7, 2022 – Oct 8, 2022

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 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")
---
 meta/recipes-bsp/u-boot/u-boot.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-bsp/u-boot/u-boot.inc +1 -1
index f022aed732ce..b2f33e382664 100644
@@ -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"
 
Signature · 1 line
2.35.1
#1 lore raw

PATCH 2/2 u-boot: Add savedefconfig task

Add savedefconfig task which U-Boot supports (unfortunately not all consumers of cml1 support this).

---
 meta/recipes-bsp/u-boot/u-boot.inc | 7 +++++++
 1 file changed, 7 insertions(+)
meta/recipes-bsp/u-boot/u-boot.inc +7 -0
index b2f33e382664..5705e5835b21 100644
@@ -26,6 +26,13 @@ UBOOT_LOCALVERSION ?= ""
 
 require u-boot-configure.inc
 
+do_savedefconfig() {
+	bbplain "Saving defconfig to:\n${B}/defconfig"
+	oe_runmake -C ${B} savedefconfig
+}
+do_savedefconfig[nostamp] = "1"
+addtask savedefconfig after do_configure
+
 do_compile () {
     if [ "${@bb.utils.filter('DISTRO_FEATURES', 'ld-is-gold', d)}" ]; then
         sed -i 's/$(CROSS_COMPILE)ld$/$(CROSS_COMPILE)ld.bfd/g' ${S}/config.mk
Signature · 1 line
2.35.1
#2 lore raw

Re: [OE-Core][PATCH 2/2] u-boot: Add savedefconfig task

Em sex., 7 de out. de 2022 às 13:47, Alex Kiernan <[email protected]> escreveu:

Quoted 5 lines

Add savedefconfig task which U-Boot supports (unfortunately not all consumers of cml1 support this).

Kernel also does, so might be nice to add it to a specific class and reuse.

Signature · 3 lines
Otavio Salvador                             O.S. Systems
http://www.ossystems.com.br        http://code.ossystems.com.br
Mobile: +55 (53) 9 9981-7854          Mobile: +1 (347) 903-9750
#3 lore raw

Re: [OE-Core][PATCH 2/2] u-boot: Add savedefconfig task

That was my other thought... this was basically a cut and paste from the kernel...

Happy to redo like that!

Quoted 18 lines · On Sat, 8 Oct 2022, 20:01 Otavio Salvador, <[email protected]>…

Em sex., 7 de out. de 2022 às 13:47, Alex Kiernan <[email protected]> escreveu:

Quoted 5 lines

Add savedefconfig task which U-Boot supports (unfortunately not all consumers of cml1 support this).

Kernel also does, so might be nice to add it to a specific class and reuse.

--
Otavio Salvador O.S. Systems
http://www.ossystems.com.br http://code.ossystems.com.br
Mobile: +55 (53) 9 9981-7854 Mobile: +1 (347) 903-9750