From 5a6099a6346c59b119b4b2d0945eef73ce0660f1 Mon Sep 17 00:00:00 2001
From: Christophe Priouzeau <christophe.priouzeau@foss.st.com>
Date: Mon, 2 May 2022 11:57:00 +0200
Subject: [PATCH] EXTLINUX: rename recipes

Signed-off-by: Christophe Priouzeau <christophe.priouzeau@foss.st.com>
---
 .../{u-boot-stm32mp-extlinux.bb => stm32mp-extlinux.bb}       | 4 ++--
 .../boot.scr.cmd                                              | 4 +---
 2 files changed, 3 insertions(+), 5 deletions(-)
 rename recipes-bsp/u-boot/{u-boot-stm32mp-extlinux.bb => stm32mp-extlinux.bb} (97%)
 rename recipes-bsp/u-boot/{u-boot-stm32mp-extlinux => stm32mp-extlinux}/boot.scr.cmd (81%)

diff --git a/recipes-bsp/u-boot/u-boot-stm32mp-extlinux.bb b/recipes-bsp/u-boot/stm32mp-extlinux.bb
similarity index 97%
rename from recipes-bsp/u-boot/u-boot-stm32mp-extlinux.bb
rename to recipes-bsp/u-boot/stm32mp-extlinux.bb
index 8513d64..2d973db 100644
--- a/recipes-bsp/u-boot/u-boot-stm32mp-extlinux.bb
+++ b/recipes-bsp/u-boot/stm32mp-extlinux.bb
@@ -8,7 +8,7 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 SRC_URI = "file://boot.scr.cmd"
 
-PV = "3.1.1"
+PV = "3.1"
 
 inherit kernel-arch extlinuxconf-stm32mp
 
@@ -57,4 +57,4 @@ do_install() {
         cp -r ${B}/* ${D}/${UBOOT_EXTLINUX_INSTALL_DIR}
     fi
 }
-FILES_${PN} = "${UBOOT_EXTLINUX_INSTALL_DIR}"
+FILES:${PN} = "${UBOOT_EXTLINUX_INSTALL_DIR}"
diff --git a/recipes-bsp/u-boot/u-boot-stm32mp-extlinux/boot.scr.cmd b/recipes-bsp/u-boot/stm32mp-extlinux/boot.scr.cmd
similarity index 81%
rename from recipes-bsp/u-boot/u-boot-stm32mp-extlinux/boot.scr.cmd
rename to recipes-bsp/u-boot/stm32mp-extlinux/boot.scr.cmd
index f6328eb..eeedb2e 100644
--- a/recipes-bsp/u-boot/u-boot-stm32mp-extlinux/boot.scr.cmd
+++ b/recipes-bsp/u-boot/stm32mp-extlinux/boot.scr.cmd
@@ -23,9 +23,7 @@ env set boot_m4fw 'rproc init; rproc load 0 ${m4fw_addr} ${filesize}; rproc star
 env set scan_m4fw 'if test -e ${devtype} ${devnum}:${distro_bootpart} ${m4fw_name};then echo Found M4 FW $m4fw_name; if load ${devtype} ${devnum}:${distro_bootpart} ${m4fw_addr} ${m4fw_name}; then run boot_m4fw; fi; fi;'
 
 # management of overlay
-env set ov_init 'load ${devtype} ${devnum}:${distro_bootpart} ${fdt_addr_r} ${fdtfile} && env set fdt_addr ${fdt_addr_r} && fdt addr ${fdt_addr} && setexpr fdtovaddr ${fdt_addr} + C0000'
-env set ov_apply 'test -n ${fdtovaddr} && test -n ${overlay} && for ov in ${overlay}; do echo overlaying ${ov}...; load ${devtype} ${devnum}:${distro_bootpart} ${fdtovaddr} /overlays/${ov}.dtbo && fdt resize ${filesize} && fdt apply ${fdtovaddr}; done'
-env set scan_overlays 'if test -e ${devtype} ${devnum}:${distro_bootpart} /overlays/overlays.txt && load ${devtype} ${devnum}:${distro_bootpart} ${loadaddr} /overlays/overlays.txt && env import -t ${loadaddr} ${filesize}; then echo loaded overlay.txt: ${overlay}; run ov_init; run ov_apply; fi'
+env set scan_overlays 'if test -e ${devtype} ${devnum}:${distro_bootpart} /overlays/overlays.txt; then env set fdt_addr ${fdt_addr_r}; if load ${devtype} ${devnum}:${distro_bootpart} ${fdt_addr} ${fdtfile}; then fdt addr ${fdt_addr}; fdt resize; setexpr fdtovaddr ${fdt_addr} + C0000; if load ${devtype} ${devnum}:${distro_bootpart} ${fdtovaddr} /overlays/overlays.txt && env import -t ${fdtovaddr} ${filesize} && test -n ${overlay}; then echo loaded overlay.txt: ${overlay}; for ov in ${overlay}; do echo overlaying ${ov}...; load ${devtype} ${devnum}:${distro_bootpart} ${fdtovaddr} /overlays/${ov}.dtbo && fdt apply ${fdtovaddr}; done; fi; fi; fi;'
 
 # Update the DISTRO command to search in sub-directory and load M4 firmware
 env set boot_prefixes "/${boot_device}${boot_instance}_"