diff options
| author | Tom Rini <[email protected]> | 2021-08-30 16:44:54 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2021-08-30 16:56:54 -0400 |
| commit | a85a8e63c5cf8ccb3905eb5982bf8bdcb2978557 (patch) | |
| tree | b9feab308105519bdac26729cee734ef49bb62f2 /include/asm-generic | |
| parent | 9b0583a839ab8b086b65b4762769abbe048a524d (diff) | |
| parent | 809c4f242f6c05f67a097ace0098c5bc1dfebdfb (diff) | |
Merge branch '2021-08-30-kconfig-migrations-part1' into next
- Begin merging some Kconfig migration, and CONFIG namespace cleanup
series in. This gives us:
- A number of I2C symbols migrated over
- DWC2, i8042, altera_spi and a few other areas updated to use CFG not
CONFIG for the concept of "configuration space" defines.
- Rename CONFIG_EXTRA_ENV_BOARD_SETTINGS to EXTRA_ENV_BOARD_SETTINGS
- Some dead code removal.
- Rename a number of CONFIG symbols that were only referenced within
the config header to not use CONFIG as a prefix.
Diffstat (limited to 'include/asm-generic')
| -rw-r--r-- | include/asm-generic/global_data.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-generic/global_data.h b/include/asm-generic/global_data.h index e55070303fe..a4cf7fd58cc 100644 --- a/include/asm-generic/global_data.h +++ b/include/asm-generic/global_data.h @@ -277,7 +277,7 @@ struct global_data { */ void *trace_buff; #endif -#if defined(CONFIG_SYS_I2C_LEGACY) +#if CONFIG_IS_ENABLED(SYS_I2C_LEGACY) /** * @cur_i2c_bus: currently used I2C bus */ |