mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-29 10:08:59 +00:00
b01b9244b4
Backport queued patches that
1. Fix CRC32 calculation for redundant images
2. Fix CRC32 on big-endian
3. Fix parting images with Broadcom header
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
(cherry picked from commit 797177ad85)
66 lines
2.3 KiB
Diff
66 lines
2.3 KiB
Diff
From 5b4eaafbeac472fc19049152f18e88aecb2b2829 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
|
|
Date: Mon, 17 Oct 2022 09:17:22 +0200
|
|
Subject: [PATCH] nvmem: u-boot-env: add Broadcom format support
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Broadcom uses U-Boot for a lot of their bcmbca familiy chipsets. They
|
|
decided to store U-Boot environment data inside U-Boot partition and to
|
|
use a custom header (with "uEnv" magic and env data length).
|
|
|
|
Add support for Broadcom's specific binding and their custom format.
|
|
|
|
Ref: 6b0584c19d87 ("dt-bindings: nvmem: u-boot,env: add Broadcom's variant binding")
|
|
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
|
|
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
|
|
---
|
|
drivers/nvmem/u-boot-env.c | 14 ++++++++++++++
|
|
1 file changed, 14 insertions(+)
|
|
|
|
--- a/drivers/nvmem/u-boot-env.c
|
|
+++ b/drivers/nvmem/u-boot-env.c
|
|
@@ -16,6 +16,7 @@
|
|
enum u_boot_env_format {
|
|
U_BOOT_FORMAT_SINGLE,
|
|
U_BOOT_FORMAT_REDUNDANT,
|
|
+ U_BOOT_FORMAT_BROADCOM,
|
|
};
|
|
|
|
struct u_boot_env {
|
|
@@ -40,6 +41,13 @@ struct u_boot_env_image_redundant {
|
|
uint8_t data[];
|
|
} __packed;
|
|
|
|
+struct u_boot_env_image_broadcom {
|
|
+ __le32 magic;
|
|
+ __le32 len;
|
|
+ __le32 crc32;
|
|
+ uint8_t data[0];
|
|
+} __packed;
|
|
+
|
|
static int u_boot_env_read(void *context, unsigned int offset, void *val,
|
|
size_t bytes)
|
|
{
|
|
@@ -138,6 +146,11 @@ static int u_boot_env_parse(struct u_boo
|
|
crc32_data_offset = offsetof(struct u_boot_env_image_redundant, data);
|
|
data_offset = offsetof(struct u_boot_env_image_redundant, data);
|
|
break;
|
|
+ case U_BOOT_FORMAT_BROADCOM:
|
|
+ crc32_offset = offsetof(struct u_boot_env_image_broadcom, crc32);
|
|
+ crc32_data_offset = offsetof(struct u_boot_env_image_broadcom, data);
|
|
+ data_offset = offsetof(struct u_boot_env_image_broadcom, data);
|
|
+ break;
|
|
}
|
|
crc32 = le32_to_cpu(*(__le32 *)(buf + crc32_offset));
|
|
crc32_data_len = priv->mtd->size - crc32_data_offset;
|
|
@@ -202,6 +215,7 @@ static const struct of_device_id u_boot_
|
|
{ .compatible = "u-boot,env", .data = (void *)U_BOOT_FORMAT_SINGLE, },
|
|
{ .compatible = "u-boot,env-redundant-bool", .data = (void *)U_BOOT_FORMAT_REDUNDANT, },
|
|
{ .compatible = "u-boot,env-redundant-count", .data = (void *)U_BOOT_FORMAT_REDUNDANT, },
|
|
+ { .compatible = "brcm,env", .data = (void *)U_BOOT_FORMAT_BROADCOM, },
|
|
{},
|
|
};
|
|
|