dany/u-boot-megous
1
0
Fork 0
mirror of https://xff.cz/git/u-boot/ synced 2025-09-24 03:52:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge tag 'v2023.10-rc4' into next

Browse Source 
Prepare v2023.10-rc4
This commit is contained in:
Tom Rini
2023-09-04 10:51:58 -04:00
parent f2bb6d9ffd b27eeca112
commit ddec4cae62
72 changed files with 1218 additions and 455 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
test/boot/bootflow.c
View File

@@ -28,7 +28,7 @@
DECLARE_GLOBAL_DATA_PTR;
extern U_BOOT_DRIVER(bootmeth_cros);
extern U_BOOT_DRIVER(bootmeth_script);
extern U_BOOT_DRIVER(bootmeth_2script);
static int inject_response(struct unit_test_state *uts)
{
@@ -532,7 +532,7 @@ static int prep_mmc_bootdev(struct unit_test_state *uts, const char *mmc_dev,
/* Enable the script bootmeth too */
ut_assertok(uclass_first_device_err(UCLASS_BOOTSTD, &bootstd));
ut_assertok(device_bind(bootstd, DM_DRIVER_REF(bootmeth_script),
ut_assertok(device_bind(bootstd, DM_DRIVER_REF(bootmeth_2script),
"bootmeth_script", 0, ofnode_null(), &dev));
/* Enable the cros bootmeth if needed */