mirror/openwrt
1
0
Fork 1
mirror of https://git.openwrt.org/openwrt/openwrt.git synced 2026-01-28 03:37:17 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

realtek: rt-loader: allow piggy-backed uimage

Browse source 
Until now rt-loader expects a piggy-backed lzma compressed data
stream. Be more flexible and allow a piggy-backed uimage as well.

Signed-off-by: Markus Stockhausen <markus.stockhausen@gmx.de>
Link: https://github.com/openwrt/openwrt/pull/21332
Signed-off-by: Robert Marko <robimarko@gmail.com>
This commit is contained in:
Markus Stockhausen 2025-12-30 17:34:41 +01:00 • committed by Robert Marko
parent 4491f1d233
commit cd13ed6fcf
1 changed files with 22 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
target/linux/realtek/image/rt-loader/src/main.c
View file

@ -170,6 +170,27 @@ void load_uimage_from_flash(void *flash_start)
memcpy(_kernel_data_addr, flash_addr + UIMAGE_HDR_SIZE, _kernel_data_size);
}
bool search_piggy_backed_uimage(void)
{
void *addr = _kernel_data_addr;
/*
* Piggy-backed data might be an uImage or not. Run a lazy uImage check.
* In case it fails it should be safe to assume an lzma data stream.
*/
search_image(&addr, &_kernel_data_size, &_kernel_load_addr);
if (!addr)
return false;
printf("piggy-backed uImage '%s' found at 0x%08x with load address 0x%08x\n",
(char *)(addr + 32), addr, _kernel_load_addr);
_kernel_data_addr = addr + UIMAGE_HDR_SIZE;
return true;
}
void main(unsigned long reg_a0, unsigned long reg_a1,
unsigned long reg_a2, unsigned long reg_a3)
{
@ -195,7 +216,7 @@ void main(unsigned long reg_a0, unsigned long reg_a1,
*/
if (flash_start)
load_uimage_from_flash(flash_start);
else if (kernel_addr)
else if (!search_piggy_backed_uimage() && kernel_addr)
_kernel_load_addr = kernel_addr;
/*