From 6082bf29b581750b1c9ad6dd80fca614d8fb1f29 Mon Sep 17 00:00:00 2001
From: Christophe Priouzeau <christophe.priouzeau@foss.st.com>
Date: Mon, 6 Jun 2022 15:32:04 +0200
Subject: [PATCH] CONF: change name of boot partition on bootfs

Signed-off-by: Christophe Priouzeau <christophe.priouzeau@foss.st.com>
Change-Id: Idc689b38c6b301c4eeb876a395fdee3c12356ae6
---
 conf/machine/include/st-machine-common-stm32mp.inc | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/conf/machine/include/st-machine-common-stm32mp.inc b/conf/machine/include/st-machine-common-stm32mp.inc
index a1e9bc0..cbc2f2b 100644
--- a/conf/machine/include/st-machine-common-stm32mp.inc
+++ b/conf/machine/include/st-machine-common-stm32mp.inc
@@ -236,7 +236,7 @@ PARTITIONS_IMAGES += "${@bb.utils.contains('ST_USERFS', '1', 'userfs', '', d)}"
 
 # Define image to use for extra partitions
 STM32MP_BOOTFS_IMAGE      ?= "st-image-bootfs"
-STM32MP_BOOTFS_LABEL      ?= "boot"
+STM32MP_BOOTFS_LABEL      ?= "bootfs"
 STM32MP_BOOTFS_MOUNTPOINT ?= "/boot"
 # Proposed value for bootfs is 64MB
 STM32MP_BOOTFS_SIZE       ?= "65536"
@@ -340,6 +340,9 @@ STM32MP_UBI_VOLUME:spinand_2_128:prepend = "\
     ${STM32MP_MULTIUBI_UENV2_LABEL}:${STM32MP_MULTIUBI_UENV2_SIZE}:empty \
     "
 
+# Manage specific override for UBI bootfs label name to 'boot' (hardcoded on U-Boot)
+UBI_VOLNAME:pn-${STM32MP_BOOTFS_IMAGE} = "boot"
+
 # Default FSTYPES requested
 WKS_IMAGE_FSTYPES ?= ""
 IMAGE_FSTYPES ?= "${WKS_IMAGE_FSTYPES} tar.xz"