diff options
| author | Tom Rini <trini@konsulko.com> | 2025-04-01 16:55:23 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2025-04-11 12:16:44 -0600 |
| commit | 302b41d5397e9f821d360a74335e8821d4513970 (patch) | |
| tree | 19049ec9e7f728d7de31fea0fbb39ea47836034f /tools/qconfig.py | |
| parent | 3703298e57c8d749b3c06798f5873562754fb84c (diff) | |
Kbuild: Always use $(PHASE_)
It is confusing to have both "$(PHASE_)" and "$(XPL_)" be used in our
Makefiles as part of the macros to determine when to do something in our
Makefiles based on what phase of the build we are in. For consistency,
bring this down to a single macro and use "$(PHASE_)" only.
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'tools/qconfig.py')
| -rwxr-xr-x | tools/qconfig.py | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/tools/qconfig.py b/tools/qconfig.py index c96a305a48f..5b85f9d22c3 100755 --- a/tools/qconfig.py +++ b/tools/qconfig.py @@ -1175,7 +1175,7 @@ def prefix_config(cfg): return oper + cfg -RE_MK_CONFIGS = re.compile(r'CONFIG_(\$\(XPL_\)|\$\(PHASE_\))?([A-Za-z0-9_]*)') +RE_MK_CONFIGS = re.compile(r'CONFIG_(\$\(PHASE_\))?([A-Za-z0-9_]*)') RE_IFDEF = re.compile(r'(ifdef|ifndef)') RE_C_CONFIGS = re.compile(r'CONFIG_([A-Za-z0-9_]*)') RE_CONFIG_IS = re.compile(r'CONFIG_IS_ENABLED\(([A-Za-z0-9_]*)\)') @@ -1220,8 +1220,6 @@ def scan_makefiles(fnames): >>> RE_MK_CONFIGS.search('CONFIG_FRED').groups() (None, 'FRED') - >>> RE_MK_CONFIGS.search('CONFIG_$(XPL_)MARY').groups() - ('$(XPL_)', 'MARY') >>> RE_MK_CONFIGS.search('CONFIG_$(PHASE_)MARY').groups() ('$(PHASE_)', 'MARY') """ @@ -1321,8 +1319,8 @@ def do_scan_source(path, do_update): spl_mode (int): If MODE_SPL, look at source code which implies an xPL_ option, but for which there is none; for MOD_PROPER, look at source code which implies a Proper - option (i.e. use of CONFIG_IS_ENABLED() or $(XPL_) or - $(PHASE_) but for which there none; + option (i.e. use of CONFIG_IS_ENABLED() or $(PHASE_) but for + which there none; if MODE_NORMAL, ignore SPL Returns: |