diff options
| author | Tom Rini <[email protected]> | 2019-09-20 10:47:03 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2019-09-20 10:48:53 -0400 |
| commit | aa8c6294ed32b4fcf7a9a27526c7346325d8c928 (patch) | |
| tree | dd72430a1424d345ca17c2f6277707160dc23ab4 /include/linux | |
| parent | a9fa70b7b7167487affc5d919e541872c99e814b (diff) | |
| parent | 282ed24fb3ca8ddb37e9fb465452267e6a658233 (diff) | |
Merge branch '2019-09-19-master-imports'
- Coding style corrections in some RTC drivers.
- Small doc updates.
- Regression fix in part_test_dos()
- Regression fix on TI OMAP WDTs.
- Document deadline for CONFIG_DM migration.
- Switch Travis-CI to "xenial" release.
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/kconfig.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/kconfig.h b/include/linux/kconfig.h index fbfc7188b8f..3a2da738c4f 100644 --- a/include/linux/kconfig.h +++ b/include/linux/kconfig.h @@ -75,6 +75,7 @@ * CONFIG_VAL(FOO) evaluates to the value of * CONFIG_FOO if CONFIG_SPL_BUILD is undefined, * CONFIG_SPL_FOO if CONFIG_SPL_BUILD is defined. + * CONFIG_TPL_FOO if CONFIG_TPL_BUILD is defined. */ #define CONFIG_VAL(option) config_val(option) @@ -82,6 +83,7 @@ * CONFIG_IS_ENABLED(FOO) evaluates to * 1 if CONFIG_SPL_BUILD is undefined and CONFIG_FOO is set to 'y' or 'm', * 1 if CONFIG_SPL_BUILD is defined and CONFIG_SPL_FOO is set to 'y' or 'm', + * 1 if CONFIG_TPL_BUILD is defined and CONFIG_TPL_FOO is set to 'y' or 'm', * 0 otherwise. */ #define CONFIG_IS_ENABLED(option) \ |