From c5b7d77a70923fd5842d8210864616dea715f886 Mon Sep 17 00:00:00 2001 From: Christophe Priouzeau Date: Mon, 6 Jun 2022 15:29:18 +0200 Subject: [PATCH] U-BOOT-fw-config: adapt to fwupdate Signed-off-by: Christophe Priouzeau Change-Id: I39a00bee11e39cb4e6a688839dc66e92fb277dd2 --- .../u-boot/u-boot-fw-config-stm32mp/fw_env.config.mmc | 4 ++-- .../u-boot/u-boot-fw-config-stm32mp/fw_env.config.nand | 4 ++-- .../u-boot/u-boot-fw-config-stm32mp/fw_env.config.nor | 4 ++-- ...tm32mp_2020.10.bb => u-boot-fw-config-stm32mp_2021.10.bb} | 5 ----- 4 files changed, 6 insertions(+), 11 deletions(-) rename recipes-bsp/u-boot/{u-boot-fw-config-stm32mp_2020.10.bb => u-boot-fw-config-stm32mp_2021.10.bb} (62%) diff --git a/recipes-bsp/u-boot/u-boot-fw-config-stm32mp/fw_env.config.mmc b/recipes-bsp/u-boot/u-boot-fw-config-stm32mp/fw_env.config.mmc index 6a1575b..a2811c8 100644 --- a/recipes-bsp/u-boot/u-boot-fw-config-stm32mp/fw_env.config.mmc +++ b/recipes-bsp/u-boot/u-boot-fw-config-stm32mp/fw_env.config.mmc @@ -10,6 +10,6 @@ # end of the device/partition, rather than a forwards offset from the start. # Block device example -/dev/disk/by-partlabel/ssbl -0x2000 0x2000 -/dev/disk/by-partlabel/ssbl -0x4000 0x2000 +/dev/disk/by-partlabel/u-boot-env -0x2000 0x2000 +/dev/disk/by-partlabel/u-boot-env -0x2000 0x2000 diff --git a/recipes-bsp/u-boot/u-boot-fw-config-stm32mp/fw_env.config.nand b/recipes-bsp/u-boot/u-boot-fw-config-stm32mp/fw_env.config.nand index b6da8ff..130352d 100644 --- a/recipes-bsp/u-boot/u-boot-fw-config-stm32mp/fw_env.config.nand +++ b/recipes-bsp/u-boot/u-boot-fw-config-stm32mp/fw_env.config.nand @@ -7,5 +7,5 @@ # Device offset must be prefixed with 0x to be parsed as a hexadecimal value. # UBI volume by name -/dev/ubi0:uboot_config 0x0 0x4000 0x40000 -/dev/ubi0:uboot_config_r 0x0 0x4000 0x40000 +/dev/ubi0:uboot_config 0x0 0x2000 0x40000 +/dev/ubi0:uboot_config_r 0x0 0x2000 0x40000 diff --git a/recipes-bsp/u-boot/u-boot-fw-config-stm32mp/fw_env.config.nor b/recipes-bsp/u-boot/u-boot-fw-config-stm32mp/fw_env.config.nor index f9f4e6e..c1fbc84 100644 --- a/recipes-bsp/u-boot/u-boot-fw-config-stm32mp/fw_env.config.nor +++ b/recipes-bsp/u-boot/u-boot-fw-config-stm32mp/fw_env.config.nor @@ -8,5 +8,5 @@ # NOR example # MTD device name Device offset Env. size Flash sector size Number of sectors -/dev/mtd4 0x280000 0x2000 0x10000 -/dev/mtd4 0x2C0000 0x2000 0x10000 +/dev/mtd7 0x900000 0x2000 0x10000 +/dev/mtd7 0x940000 0x2000 0x10000 diff --git a/recipes-bsp/u-boot/u-boot-fw-config-stm32mp_2020.10.bb b/recipes-bsp/u-boot/u-boot-fw-config-stm32mp_2021.10.bb similarity index 62% rename from recipes-bsp/u-boot/u-boot-fw-config-stm32mp_2020.10.bb rename to recipes-bsp/u-boot/u-boot-fw-config-stm32mp_2021.10.bb index 08bf9ac..a67a2e7 100644 --- a/recipes-bsp/u-boot/u-boot-fw-config-stm32mp_2020.10.bb +++ b/recipes-bsp/u-boot/u-boot-fw-config-stm32mp_2021.10.bb @@ -13,11 +13,6 @@ DEPENDS += "u-boot-fw-utils" do_install () { install -d ${D}${sysconfdir} install -m 0644 ${WORKDIR}/fw_env.config.* ${D}${sysconfdir}/ - if ${@bb.utils.contains('MACHINE_FEATURES','fip','true','false',d)}; then - sed -i 's/ssbl/fip/g' ${D}${sysconfdir}/fw_env.config.mmc - sed -i 's/0x280000/0x480000/g' ${D}${sysconfdir}/fw_env.config.nor - sed -i 's/0x2C0000/0x4C0000/g' ${D}${sysconfdir}/fw_env.config.nor - fi } FILES:${PN} += "${sysconfdir}/"