diff options
| author | Tom Rini <[email protected]> | 2025-06-23 14:49:16 -0600 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2025-06-23 16:15:23 -0600 |
| commit | 184e7d0bb211b8885f6715fdd6149ce96a4d1037 (patch) | |
| tree | 271f9ebbfa6f0d2776054bbf07c396ebe1f663e8 /test/common | |
| parent | dbf7fd557a73ded3141db3c2cf5c572989378825 (diff) | |
| parent | fb4a488eb91b089912ffbc9a74d0527f0f2c79ac (diff) | |
Merge tag 'v2025.07-rc5' into next
Prepare v2025.07-rc5
With this merge, tighten up the LTO_FLAGS removal we added to not
trigger on ARMv7 (which is Thumb-2 and should be fine).
Diffstat (limited to 'test/common')
| -rw-r--r-- | test/common/print.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/test/common/print.c b/test/common/print.c index c48efc2783f..76ee851fe6a 100644 --- a/test/common/print.c +++ b/test/common/print.c @@ -45,8 +45,7 @@ static int print_guid(struct unit_test_state *uts) sprintf(str, "%pUL", guid); ut_asserteq_str("04030201-0605-0807-090A-0B0C0D0E0F10", str); sprintf(str, "%pUs", guid_esp); - if (IS_ENABLED(CONFIG_PARTITION_TYPE_GUID) || - IS_ENABLED(CONFIG_CMD_EFIDEBUG) || IS_ENABLED(CONFIG_EFI)) + if (IS_ENABLED(CONFIG_EFI_PARTITION)) ut_asserteq_str("EFI System Partition", str); else ut_asserteq_str("c12a7328-f81f-11d2-ba4b-00a0c93ec93b", str); |