diff options
author | Tom Rini <trini@konsulko.com> | 2023-10-06 17:23:47 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2023-10-06 17:23:47 -0400 |
commit | 83aa0ed1e93e1ffac24888d98d37a5b04ed3fb07 (patch) | |
tree | fcabaf4a86164f385ede03b654bc69cbffb2a3ee /test/lib/kconfig.c | |
parent | be2abe73df58a35da9e8d5afb13fccdf1b0faa8e (diff) | |
parent | f69d3d6d10b15872a279aeb10b7c522627aff6c2 (diff) |
Merge branch '2023-10-06-spl-prepare-for-universal-payload'
To quote the author:
This series tidies up SPL a little and adds some core ofnode functions
needed to support Universal Payload. It also includes a few minor
fix-ups for sandbox.
For SPL the changes include CONFIG naming, removing various #ifdefs and
tidying up the FIT code.
One notable piece of the ofnode improvements is support for flattening a
livetree. This should be useful in future as we move FDT fixups to use
the ofnode API.
Diffstat (limited to 'test/lib/kconfig.c')
-rw-r--r-- | test/lib/kconfig.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/lib/kconfig.c b/test/lib/kconfig.c index 76225ba8ffa..3914f699659 100644 --- a/test/lib/kconfig.c +++ b/test/lib/kconfig.c @@ -22,9 +22,9 @@ static int lib_test_is_enabled(struct unit_test_state *uts) ut_asserteq(0, CONFIG_IS_ENABLED(OF_PLATDATA)); ut_asserteq(0, CONFIG_IS_ENABLED(_UNDEFINED)); - ut_asserteq(0xc000, + ut_asserteq(0xb000, IF_ENABLED_INT(CONFIG_BLOBLIST_FIXED, CONFIG_BLOBLIST_ADDR)); - ut_asserteq(0xc000, + ut_asserteq(0xb000, CONFIG_IF_ENABLED_INT(BLOBLIST_FIXED, BLOBLIST_ADDR)); /* |