[widgetii]

No separate cases are left for hi3516cv6xx or hi3519dv500 in how the
firmware is packed, upgraded or assembled; what differs is data.

The image. One post-image script for every board on the split NOR
layout, general/scripts/post-image-split.sh, in place of the gk7205v200,
hi3516cv6xx and hi3519dv500 post-image.sh and both fit-image.its:
firmware.bin is a legacy uImage, then the squashfs at the next 64 KiB.
32-bit ARM takes the kernel's own uImage (the zImage with its DTB
appended, CONFIG_BUILD_ARM_APPENDED_DTB_IMAGE_NAMES); arm64 cannot append
a DTB, so there it is a legacy multi-file uImage -- Image.gz, a
trailer-only initramfs, the DTB -- which bootm unpacks the same way. The
kernels (OpenIPC/linux #101-#109) find the layout from their device tree
and divide "firmware" into kernel, rootfs and rootfs_data at boot.

• Config.in: BR2_OPENIPC_NOR_FIRMWARE_OFFSET (0x50000; 0xC0000 on
  hi3519dv500, whose signed boot image needs 512k boot + 256k env) and
  BR2_OPENIPC_NOR_FIXED_PACKAGE (the Goke boards, which also publish the
  fixed-slot package). The Makefile's cv6xx and dv500 branches go; one
  branch packs every board that builds firmware.bin, checks it against
  the chip less the offset and an overlay, and publishes -split.
• hi3516cv6xx/hi3519dv500 kernel configs: MTD_SPLIT_*, root from the
  split; cv6xx UIMAGE with its DTB appended, CMA; dv500 drops mem=128M and
  gains OVERLAY_FS, which it never had (its overlay stayed read-only).
• The cv6xx memory userspace held back from hi3519dv500: load the media zone the kernel laid out #2632 (its lite rootfs was
  full on the FIT layout): load_hisilicon from hisi_mem, set_allocator
  installed.

Upgrades. sysupgrade knows the split layout without a SoC list: a camera
is split when its "firmware" partition holds the kernel's own partitions,
the offset is read from /proc/mtd, and the -split package is fetched
wherever the release publishes one. The FIT combined path, used by
nobody else, is gone. Boards that publish only the split package are
listed in the manifest under a new flash key, nor_split (consumers match
the column exactly, so one asking for "nor" never takes it), and
--build/--channel/--list fall back to it. Older scripts asking for the
plain cv6xx package get a 404 and stop -- they cut firmware.bin at its
4th-7th bytes as a FIT size, and a uImage's header CRC sits there --
while every -k/-r run fetches this script first.

CI. image.yml assembles the cv6xx (lite on 8 MiB, ultimate on 16 MiB)
and hi3519dv500 (dmeb, dmebpro, 16 MiB) full images with one
create_split: the boot image at 0, firmware.bin where the boot area ends,
the rest erased; split_layout holds each board's boot and env sizes, and
nothing else differs. hisi_layout/create_hisi and the withdrawal step go
(#2460). build.yml and build-one.yml take the -split package as the NOR
one where there is no plain one.

Tested in qemu-hisilicon with the published boot images (OpenIPC/u-boot
f8747f7b): full images from create_split -- hi3516cv610 DDR3-128M lite,
rootfs_data at 7552 KiB as create_split reports, login; hi3519dv500 dmeb
ultimate at 1G, cma 888M, rootfs_data at 14976 KiB. Packages: cv6xx lite
at 64M/128M/256M/512M, dv500 at 128M-2G, overlay kept across a reboot.
gk7205v200's firmware.bin and packages unchanged by the shared script
(only the uImage header's time and CRC). Shell suites, lint, ci-matrix
self-test pass. Not run on hardware: no hi3516cv6xx or hi3519dv500 board
in the lab.

Closes #2460.

[qodo-free-for-open-source-projects]

PR Summary by Qodo

Unify HiSilicon and Goke split NOR firmware builds and upgrades

✨ Enhancement 🐞 Bug fix ⚙️ Configuration changes 🧪 Tests 🕐 40+ Minutes

AI Description

• Package hi3516cv6xx and hi3519dv500 firmware using the shared split NOR layout instead of FIT
 images.
• Upgrade split-layout cameras using detected flash partitions and publish full images for both
 HiSilicon families.
• Restore cv6xx memory controls and writable dv500 overlays, with expanded upgrade tests.

Diagram

graph TD
  C["Board configuration"] --> P["Split image packer"] --> A["Split package"] --> M[("Release manifest")] --> U["sysupgrade"] --> K["Kernel MTD split"]
  A --> I["Full image assembly"] --> K
  A --> U

Loading

High-Level Assessment

The following are alternative approaches to this PR:

1. Declare split-package capability in release metadata

• ➕ Avoids a per-upgrade HTTP existence probe.
• ➕ Makes package selection explicit rather than URL-derived.
• ➖ Requires metadata for default latest-release downloads as well as manifest-based selection.
• ➖ Older releases or clients may lack the new metadata.

Recommendation: The shared image format and partition-derived upgrade path are preferable to retaining SoC-specific FIT handling. The URL probe is pragmatic for releases carrying both package types; explicit release capability metadata would be worth considering if probe latency or availability becomes a problem.

Files changed (25) +566 / -581

Enhancement (6) +329 / -301

enrich_manifest.pyIndex split NOR archives separately +10/-2

Index split NOR archives separately

• Recognizes -split NOR assets and records them under the nor_split flash key. Rejects split-suffixed NAND assets.

.github/scripts/enrich_manifest.py

image.ymlAssemble HiSilicon full NOR images from split packages +81/-142

Assemble HiSilicon full NOR images from split packages

• Replaces FIT-slot assembly with one split-layout assembler that validates the uImage, squashfs, boot area, and remaining settings space. Adds hi3519dv500 board images and removes the step that withdrew them.

.github/workflows/image.yml

sysupgradeUpgrade split NOR firmware without a SoC allowlist +79/-150

Upgrade split NOR firmware without a SoC allowlist

• Derives the firmware location from flash partitions, selects published split packages, and supports nor_split manifest entries. Removes FIT-combined flashing and refuses incompatible firmware.bin images before writing.

general/overlay/usr/sbin/sysupgrade

set_allocatorSupport cv6xx allocator overrides and automatic memory layout +93/-7

Support cv6xx allocator overrides and automatic memory layout

• Adds kernel-aware ot, cma, and auto controls with memory-size validation and an MMZ query. Preserves a legacy path and can infer DRAM size from the device tree when the environment lacks it.

general/package/hisilicon-osdrv-hi3516cv6xx/files/script/set_allocator

hisilicon-osdrv-hi3516cv6xx.mkInstall the cv6xx allocator control +1/-0

Install the cv6xx allocator control

• Installs set_allocator alongside the HiSilicon loading scripts so users can apply allocator overrides.

general/package/hisilicon-osdrv-hi3516cv6xx/hisilicon-osdrv-hi3516cv6xx.mk

post-image-split.shCreate split NOR firmware for ARM and arm64 +65/-0

Create split NOR firmware for ARM and arm64

• Combines a legacy uImage and squashfs into 64 KiB-aligned firmware.bin. Uses the kernel's uImage on 32-bit ARM and constructs a multi-file uImage containing compressed kernel, empty initramfs, and DTB on arm64.

general/scripts/post-image-split.sh

Bug fix (2) +55 / -41

hi3519dv500.generic.configEnable dv500 split partitions and writable overlay +13/-2

Enable dv500 split partitions and writable overlay

• Removes the fixed 128 MiB kernel memory limit, enables MTD firmware splitting, and builds overlayfs for persistent writable settings.

br-ext-chip-hisilicon/board/hi3519dv500/hi3519dv500.generic.config

load_hisiliconLoad cv6xx media memory from the kernel's layout +42/-39

Load cv6xx media memory from the kernel's layout

• Uses hisi_mem parameters for DRAM, OS memory, allocator, and MMZ when available, without rewriting U-Boot settings. Retains a legacy calculation path otherwise.

general/package/hisilicon-osdrv-hi3516cv6xx/files/script/load_hisilicon

Refactor (1) +17 / -30

MakefileUnify split NOR repacking and size checks +17/-30

Unify split NOR repacking and size checks

• Routes every generated firmware.bin through the split-package path, budgeting for the configured firmware offset and overlay. Builds a plain fixed-slot package only when the board requests one.

Makefile

Tests (2) +104 / -189

test_load_hisilicon_layout.shCover cv6xx kernel-managed memory +3/-1

Cover cv6xx kernel-managed memory

• Adds hi3516cv6xx checks for media-memory loading and set_allocator behavior.

.github/scripts/test_load_hisilicon_layout.sh

test_sysupgrade.shExercise split-package selection and variable flash offsets +101/-188

Exercise split-package selection and variable flash offsets

• Replaces obsolete FIT-combined cases with split-layout upgrade coverage, including failed writes, reboot behavior, 0xC0000 firmware offsets, and manifest resolution. Extends the curl stub to model whether a split package exists.

.github/scripts/test_sysupgrade.sh

Other (14) +61 / -20

build-one.ymlUpload split-only NOR packages in single-board builds +3/-0

Upload split-only NOR packages in single-board builds

• Uses the -split archive as the NOR package when no plain archive was produced.

.github/workflows/build-one.yml

build.ymlUpload split-only NOR packages in bulk builds +3/-0

Upload split-only NOR packages in bulk builds

• Falls back to a -split archive when selecting the NOR package for workflow output.

.github/workflows/build.yml

gk7202v300_lite_defconfigUse shared packer for gk7202v300 lite +2/-1

Use shared packer for gk7202v300 lite

• Selects the common split-image script while retaining a fixed-slot package for older upgrades.

br-ext-chip-goke/configs/gk7202v300_lite_defconfig

gk7202v300_ultimate_defconfigUse shared packer for gk7202v300 ultimate +2/-1

Use shared packer for gk7202v300 ultimate

• Selects the common split-image script and requests the companion fixed-slot package.

br-ext-chip-goke/configs/gk7202v300_ultimate_defconfig

gk7205v200_lite_defconfigMove gk7205v200 lite to shared packaging +2/-1

Move gk7205v200 lite to shared packaging

• Replaces the board-specific image script with the shared script and preserves fixed-slot package publication.

br-ext-chip-goke/configs/gk7205v200_lite_defconfig

gk7205v200_ultimate_defconfigMove gk7205v200 ultimate to shared packaging +2/-1

Move gk7205v200 ultimate to shared packaging

• Selects the shared split-image script and continues producing a fixed-slot package.

br-ext-chip-goke/configs/gk7205v200_ultimate_defconfig

gk7205v300_lite_defconfigMove gk7205v300 lite to shared packaging +2/-1

Move gk7205v300 lite to shared packaging

• Uses the common split-image script and explicitly enables fixed-slot package publication.

br-ext-chip-goke/configs/gk7205v300_lite_defconfig

gk7205v300_ultimate_defconfigMove gk7205v300 ultimate to shared packaging +2/-1

Move gk7205v300 ultimate to shared packaging

• Uses the common split-image script while retaining its plain fixed-slot archive.

br-ext-chip-goke/configs/gk7205v300_ultimate_defconfig

gk7605v100_lite_defconfigMove gk7605v100 lite to shared packaging +2/-1

Move gk7605v100 lite to shared packaging

• Selects the shared split-image script and enables its companion fixed-slot package.

br-ext-chip-goke/configs/gk7605v100_lite_defconfig

hi3516cv6xx.generic.configEnable appended-DTB uImage and MTD splitting on cv6xx +17/-2

Enable appended-DTB uImage and MTD splitting on cv6xx

• Configures the kernel to build an appended-DTB image, discover split firmware partitions, and start /init. Enables CMA support for media-memory allocation.

br-ext-chip-hisilicon/board/hi3516cv6xx/hi3516cv6xx.generic.config

hi3516cv6xx_lite_defconfigBuild cv6xx lite as a split NOR uImage +2/-5

Build cv6xx lite as a split NOR uImage

• Switches from a board-generated FIT to the kernel uImage and shared split-image script, with the DTB appended by the kernel build.

br-ext-chip-hisilicon/configs/hi3516cv6xx_lite_defconfig

hi3516cv6xx_ultimate_defconfigBuild cv6xx ultimate as a split NOR uImage +2/-5

Build cv6xx ultimate as a split NOR uImage

• Selects the kernel uImage and common split-image script in place of the FIT packaging path.

br-ext-chip-hisilicon/configs/hi3516cv6xx_ultimate_defconfig

hi3519dv500_ultimate_defconfigSet dv500 split-image script and firmware offset +2/-1

Set dv500 split-image script and firmware offset

• Selects the shared split-image script and places firmware after the board's 512 KiB boot and 256 KiB environment areas.

br-ext-chip-hisilicon/configs/hi3519dv500_ultimate_defconfig

Config.inExpose split NOR offset and fixed-package options +18/-0

Expose split NOR offset and fixed-package options

• Adds a configurable firmware start offset and an option to publish a companion fixed-slot archive.

general/Config.in

[qodo-free-for-open-source-projects]

Code Review by Qodo

🐞 Bugs (0) 📘 Rule violations (0) 📎 Requirement gaps (0) 🎨 UX issues (0) 🔗 Cross-repo conflicts (0) 📜 Skill insights (0)

1. A cv6xx kernel over 2 MiB can brick cameras ✓ Resolved

Description

The PR drops the 8 MiB hi3516cv6xx check CHECK_SIZE,fitImage,2048. The new split branch bounds
only the whole firmware.bin (chip size less the offset and 256K), and create_split in image.yml no
longer compares the kernel to the kernel slot. The published cv610/cv608 U-Boot still boots with `sf
read ${kernaddr} 0x50000 ${kernsize}=0x200000, so a uImage past 2 MiB is cut short and bootm`
fails its data CRC. Nothing in the build, the image assembly or sysupgrade's check_combined_fits
would catch this. The cv6xx kernel was already right at 2048/2048 KiB (issue #2460), and this PR
adds CMA and the MTD split parsers to its config.

Code

Makefile[L174-177]

-ifeq ($(BR2_OPENIPC_FLASH_SIZE),"8")
-	@$(call CHECK_SIZE,fitImage,2048)
-	@$(call CHECK_SIZE,rootfs.squashfs,5120)
-endif

Evidence

Issue #2460 decodes the cv610 boot binary: `bootnor: sf read ${kernaddr}=0x50000
${kernsize}=0x200000` (the removed image.yml comment says the same), and it measures the cv6xx FIT
at 2048/2048 KiB. The new Makefile branch keeps the 1983K uImage limit only under
BR2_OPENIPC_NOR_FIXED_PACKAGE, which only the Goke boards set. hi3516cv6xx gets nothing but the
whole-image CHECK_SIZE,firmware.bin,.... In image.yml, create_split checks only ub_kib,
fw_kib against end_kib, and the total against $nor. The old fit_kib -gt kern_kib refusal was
removed. sysupgrade's check_combined_fits checks only the SoC, the squashfs end, and room for the
settings. So every place that used to stop an oversized kernel has lost that check, while U-Boot
still reads only 2 MiB.

Makefile[166-190]
.github/workflows/image.yml[179-202]
general/overlay/usr/sbin/sysupgrade[333-346]

Agent prompt

The issue below was found during a code review. Follow the provided context and guidance below and implement a solution

## Issue description
The hi3516cv6xx U-Boot reads only `kernsize` = 0x200000 bytes from 0x50000 before `bootm`. The split-layout change removed the only kernel-size check for cv6xx, so an oversized uImage would build, publish, assemble into the full image and be written by sysupgrade, then fail to boot.
## Fix Focus Areas
- Makefile[182-190]
- general/Config.in[29-46]
- .github/workflows/image.yml[132-202]
## Recommended Fix
Add a hex option, for example `BR2_OPENIPC_NOR_KERNEL_READ_SIZE`: the bytes the board's U-Boot reads from the firmware offset. Use 0x200000 by default and set 0x600000 on hi3519dv500. In the Makefile's split branch, always run `CHECK_SIZE,uImage,<size/1024 - 1>`, not only when `BR2_OPENIPC_NOR_FIXED_PACKAGE` is set. In image.yml's `split_layout`, add a `kern_kib` per SoC (2048 for hi3516cv6xx, 6144 for hi3519dv500). Refuse in `create_split` when `64 + ksz` is larger than that.

ⓘ Copy this prompt and use it to remediate the issue with your preferred AI generation tools

---

Tip of the day

💡 Did you know, you can import rules and skills only from the repositories your team follows

More tips ↗ | Customize Qodo ↗ | Qodo docs ↗

[widgetii]

The Goke split builds and GCC rows failed in the new kernel-read check: it stat'ed images/uImage, which the fixed-slot repack had already renamed to uImage.. Fixed in 27da5cd: it now reads the size from firmware.bin's uImage header, as a bootloader does. A full gk7205v200_lite build passes locally, as do the cv6xx and dv500 repacks.