michael/u-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge tag 'u-boot-dfu-next-20251211' of https://source.denx.de/u-boot/custodians/u-boot-dfu into next

Browse Source 
u-boot-dfu-next-20251211:

CI: https://source.denx.de/u-boot/custodians/u-boot-dfu/-/pipelines/28724

Android:
* Fix 8-byte alignment for newer versions of libfdt
This commit is contained in:
Tom Rini
2025-12-11 07:52:55 -06:00
parent 66be03b7ee 42ee514ed0
commit 386f22e117
2 changed files with 53 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
boot/image-android.c
View File

@@ -721,17 +721,19 @@ bool android_image_get_dtb_by_index(ulong hdr_addr, ulong vendor_boot_img,
dtb_addr = dtb_img_addr;
while (dtb_addr < dtb_img_addr + dtb_img_size) {
const struct fdt_header *fdt;
struct fdt_header fdth __aligned(8);
u32 dtb_size;
fdt = map_sysmem(dtb_addr, sizeof(*fdt));
if (fdt_check_header(fdt) != 0) {
unmap_sysmem(fdt);
memcpy(&fdth, fdt, sizeof(*fdt));
unmap_sysmem(fdt);
if (fdt_check_header(&fdth) != 0) {
printf("Error: Invalid FDT header for index %u\n", i);
return false;
}
dtb_size = fdt_totalsize(fdt);
unmap_sysmem(fdt);
dtb_size = fdt_totalsize(&fdth);
if (i == index) {
if (size)
@@ -885,23 +887,41 @@ bool android_image_print_dtb_contents(ulong hdr_addr)
dtb_addr = dtb_img_addr;
while (dtb_addr < dtb_img_addr + dtb_img_size) {
const struct fdt_header *fdt;
struct fdt_header *fulldt;
struct fdt_header fdth __aligned(8);
u32 dtb_size;
fdt = map_sysmem(dtb_addr, sizeof(*fdt));
if (fdt_check_header(fdt) != 0) {
unmap_sysmem(fdt);
memcpy(&fdth, fdt, sizeof(*fdt));
unmap_sysmem(fdt);
if (fdt_check_header(&fdth) != 0) {
printf("Error: Invalid FDT header for index %u\n", i);
return false;
}
res = android_image_print_dtb_info(fdt, i);
if (!res) {
dtb_size = fdt_totalsize(&fdth);
/* The device tree must be at an 8-byte aligned address */
if (!IS_ALIGNED((uintptr_t)fdt, 8)) {
fulldt = memalign(8, dtb_size);
if (!fulldt)
return false;
fdt = map_sysmem(dtb_addr, dtb_size);
memcpy(fulldt, fdt, dtb_size);
unmap_sysmem(fdt);
return false;
res = android_image_print_dtb_info(fulldt, i);
free(fulldt);
} else {
fulldt = map_sysmem(dtb_addr, dtb_size);
res = android_image_print_dtb_info(fulldt, i);
unmap_sysmem(fulldt);
}
dtb_size = fdt_totalsize(fdt);
unmap_sysmem(fdt);
if (!res)
return false;
dtb_addr += dtb_size;
++i;
}

28
test/py/tests/test_android/test_abootimg.py
View File

@@ -93,10 +93,16 @@ dtb_dump_resp="""## DTB area contents (concat format):
loadaddr = 0x1000
# Address in RAM where to load the vendor boot image ('abootimg' looks in $vloadaddr)
vloadaddr= 0x10000
# Expected DTB #1 size
dtb1_size = 0x7d
# Expected DTB #2 size
dtb2_size = 0x7d
# Expected DTB #1 offset from the boot image start address
dtb1_offset = 0x187d
dtb1_offset = 0x1800 + dtb1_size
# Expected DTB offset from the vendor boot image start address
dtb2_offset = 0x207d
dtb2_offset = 0x2000 + dtb2_size
# Expected DTB aligned offset
dtba_offset = 0x4000
# DTB #1 start address in RAM
dtb1_addr = loadaddr + dtb1_offset
# DTB #2 start address in RAM
@@ -214,11 +220,16 @@ def test_abootimg(abootimg_disk_image, ubman):
assert response == 'a=11f00000'
ubman.log.action('Testing \'abootimg get dtb --index\'...')
ubman.run_command('abootimg get dtb --index=1 dtb1_start')
ubman.run_command('abootimg get dtb --index=1 dtb1_start dtb1_size')
response = ubman.run_command('env print dtb1_start')
correct_str = "dtb1_start=%x" % (dtb1_addr)
assert response == correct_str
ubman.run_command('fdt addr $dtb1_start')
response = ubman.run_command('env print dtb1_size')
correct_str = "dtb1_size=%x" % (dtb1_size)
assert response == correct_str
ubman.run_command('setenv dtbaaddr 0x%x' % (dtba_offset))
ubman.run_command('cp.b $dtb1_start $dtbaaddr $dtb1_size')
ubman.run_command('fdt addr $dtbaaddr')
ubman.run_command('fdt get value v / model')
response = ubman.run_command('env print v')
assert response == 'v=x2'
@@ -257,12 +268,17 @@ def test_abootimgv4(abootimgv4_disk_image_vboot, abootimgv4_disk_image_boot, ubm
assert response == 'a=11f00000'
ubman.log.action('Testing \'abootimg get dtb --index\'...')
ubman.run_command('abootimg get dtb --index=1 dtb2_start')
ubman.run_command('abootimg get dtb --index=1 dtb2_start dtb2_size')
response = ubman.run_command('env print dtb2_start')
correct_str = "dtb2_start=%x" % (dtb2_addr)
assert response == correct_str
response = ubman.run_command('env print dtb2_size')
correct_str = "dtb2_size=%x" % (dtb2_size)
assert response == correct_str
ubman.run_command('fdt addr $dtb2_start')
ubman.run_command('setenv dtbaaddr 0x%x' % (dtba_offset))
ubman.run_command('cp.b $dtb2_start $dtbaaddr $dtb2_size')
ubman.run_command('fdt addr $dtbaaddr')
ubman.run_command('fdt get value v / model')
response = ubman.run_command('env print v')
assert response == 'v=x2'