Browse Source

arm-bsp/u-boot: update CS1K append to use the _config functions

The u-boot recipe now uses unique build directories per config that is
being built, to ensure that there is no cross-contamination.

Handle this by moving the do_configure and do_install appends to
uboot_configure_config and uboot_install_config so that we can simply
use $builddir.

[1] oe-core 22e96b32b0b ("u-boot: Make sure the build dir is unique for each UBOOT_CONFIG")

Signed-off-by: Ross Burton <ross.burton@arm.com>
Ross Burton 5 days ago
parent
commit
40a5aac50c
1 changed files with 4 additions and 4 deletions
  1. 4 4
      meta-arm-bsp/recipes-bsp/u-boot/u-boot-corstone1000.inc

+ 4 - 4
meta-arm-bsp/recipes-bsp/u-boot/u-boot-corstone1000.inc

@@ -69,13 +69,13 @@ SRC_URI:append = " \
     file://0038-corstone1000-enable-OF_UPSTREAM-device-tree-support.patch \
 "
 
-do_configure:append() {
-   openssl req -x509 -sha256 -newkey rsa:2048 -subj /CN=CRT/ -keyout ${B}/CRT.key -out ${B}/corstone1000_defconfig/CRT.crt -nodes -days 365
+uboot_configure_config:append() {
+   openssl req -x509 -sha256 -newkey rsa:2048 -subj /CN=CRT/ -keyout ${B}/CRT.key -out $builddir/CRT.crt -nodes -days 365
 }
 
 FILES:${PN} += "/corstone1000_capsule_*"
-do_install:append() {
-   install -D -p -m 0644 ${B}/corstone1000_defconfig/CRT.crt ${D}/corstone1000_capsule_cert.crt
+uboot_install_config:append() {
+   install -D -p -m 0644 $builddir/CRT.crt ${D}/corstone1000_capsule_cert.crt
    install -D -p -m 0644 ${B}/CRT.key ${D}/corstone1000_capsule_key.key
 }