From d0a428a6556ea5a006e22e28b0b1cd037885fe20 Mon Sep 17 00:00:00 2001 From: hc <hc@nodka.com> Date: Wed, 22 Nov 2023 01:07:12 +0000 Subject: [PATCH] add gmac0 read mac form eeprom,pcie30x1 --- u-boot/arch/arm/mach-rockchip/rk_meta.c | 25 +++++++++++++------------ 1 files changed, 13 insertions(+), 12 deletions(-) diff --git a/u-boot/arch/arm/mach-rockchip/rk_meta.c b/u-boot/arch/arm/mach-rockchip/rk_meta.c index e35391f..8c0cce9 100644 --- a/u-boot/arch/arm/mach-rockchip/rk_meta.c +++ b/u-boot/arch/arm/mach-rockchip/rk_meta.c @@ -50,6 +50,7 @@ ulong sector; char *data; u64 len; + int meta_iq_item_size = 0; if (part_get_info_by_name(info->dev, part_name, &part_info) <= 0) { debug("%s: no partition\n", __func__); @@ -91,32 +92,31 @@ /* load compress data */ data = (char *)COMPRESS_LOAD_ADDR; + meta_iq_item_size = meta_p->iq_item_size + meta.comp_size; if (meta_p->comp_type == META_COMPRESS_TYPE_GZ) { if (info->read(info, sector + (MAX_META_SEGMENT_SIZE / info->bl_len), - DIV_ROUND_UP(meta.comp_size, info->bl_len), data) - != DIV_ROUND_UP(meta.comp_size, info->bl_len)) { - debug("%s: Failed to read compress data.\n", __func__); + DIV_ROUND_UP(meta_iq_item_size, info->bl_len), data) + != DIV_ROUND_UP(meta_iq_item_size, info->bl_len)) { + printf("%s: Failed to read compress data.\n", __func__); return -EIO; } + + memcpy((void *)(meta_p->load + SENSOR_IQ_BIN_OFFSET), data, meta_p->iq_item_size); if (rk_meta_iq_decom((meta_p->load + meta_p->comp_off), (unsigned long)(data + meta_p->comp_off - MAX_META_SEGMENT_SIZE), meta.comp_size, &len)) { - debug("%s: Failed to decompress.\n", __func__); + printf("%s: Failed to decompress.\n", __func__); return -EIO; } - /* update decompress gz's file size */ - unsigned int *p_len = (unsigned int *) - (meta_p->load + MAX_META_SEGMENT_SIZE + MAX_HEAD_SIZE); - *p_len = (u32)len; - /* TODO: update decompress gz's file crc32 */ + } else { if (info->read(info, sector + (MAX_META_SEGMENT_SIZE / info->bl_len), - DIV_ROUND_UP(meta.comp_size, info->bl_len), + DIV_ROUND_UP(meta_iq_item_size, info->bl_len), (void *)(meta_p->load + MAX_META_SEGMENT_SIZE)) - != DIV_ROUND_UP(meta.comp_size, info->bl_len)) { - debug("%s: Failed to read\n", __func__); + != DIV_ROUND_UP(meta_iq_item_size, info->bl_len)) { + printf("%s: Failed to read\n", __func__); return -EIO; } } @@ -125,6 +125,7 @@ flush_cache(meta_p->load, meta_p->size); rk_meta_process(); + printf("\nMeta: ok\n"); return 0; } -- Gitblit v1.6.2