diff options
| author | Tom Rini <[email protected]> | 2023-03-03 12:48:23 -0500 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2023-03-03 12:48:23 -0500 |
| commit | d1653548d29959a6ea6b4037a00b48a28257e6e6 (patch) | |
| tree | c5e53b262c5cfe2be50066b5b9c886c23a4ec3d6 /drivers/sysreset | |
| parent | f3384c6ddaab99a77895443b10d2034f17ca0014 (diff) | |
| parent | d99e6f78dedd473771d6dee1007a05b8574d5b5c (diff) | |
Merge branch '2023-03-02-kconfig-and-CONFIG-cleanups' into next
- Partial merge of a series of mine to select some framework options
that shouldn't be prompted for (and remove some unused code related to
that), and a partial merge of a series from Simon to remove some dead
code and address various CONFIG_IS_ENABLED/IS_ENABLED issues in code.
Diffstat (limited to 'drivers/sysreset')
| -rw-r--r-- | drivers/sysreset/sysreset_mpc83xx.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/sysreset/sysreset_mpc83xx.c b/drivers/sysreset/sysreset_mpc83xx.c index c9a03266595..ca48328f7b5 100644 --- a/drivers/sysreset/sysreset_mpc83xx.c +++ b/drivers/sysreset/sysreset_mpc83xx.c @@ -107,7 +107,7 @@ static int print_83xx_arb_event(bool force, char *buf, int size) if (!force && !gd->arch.arbiter_event_address) return 0; - if (CONFIG_IS_ENABLED(DISPLAY_AER_FULL)) { + if (IS_ENABLED(CONFIG_DISPLAY_AER_FULL)) { res = snprintf(buf, size, "Arbiter Event Status:\n" " %s: 0x%08lX\n" @@ -184,7 +184,7 @@ static int mpc83xx_sysreset_get_status(struct udevice *dev, char *buf, int size) * TODO([email protected]): Move this into a dedicated * arbiter driver */ - if (CONFIG_IS_ENABLED(DISPLAY_AER_FULL) || + if (IS_ENABLED(CONFIG_DISPLAY_AER_FULL) || IS_ENABLED(CONFIG_DISPLAY_AER_BRIEF)) { /* * If there was a bus monitor reset event, we force the arbiter |