Skip to content

Commit c2d5e7b

Browse files
committed
kconfig: Don't load env var if in doc mode
Do not load the GENERATED_DTS_BOARD_CONF if in doc mode, since it will not defined as it doesn't apply. No need to defined it to a dummy value. Signed-off-by: Carles Cufi <carles.cufi@nordicsemi.no>
1 parent b1a7e71 commit c2d5e7b

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

doc/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,6 @@ add_custom_target(
182182
SOC_DIR=soc/
183183
SRCARCH=x86
184184
PROJECT_BINARY_DIR=${CMAKE_CURRENT_BINARY_DIR}
185-
GENERATED_DTS_BOARD_CONF=not_applicable
186185
KCONFIG_TURBO_MODE=${KCONFIG_TURBO_MODE}
187186
KCONFIG_DOC_MODE=1
188187
${PYTHON_EXECUTABLE} scripts/genrest.py Kconfig ${RST_OUT}/doc/reference/kconfig/

scripts/kconfig/kconfigfunctions.py

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,17 @@
1111

1212
doc_mode = os.environ.get('KCONFIG_DOC_MODE') == "1"
1313

14-
# The env var 'GENERATED_DTS_BOARD_CONF' must be set
15-
GENERATED_DTS_BOARD_CONF = os.environ['GENERATED_DTS_BOARD_CONF']
16-
1714
dt_defines = {}
18-
if (not doc_mode) and os.path.isfile(GENERATED_DTS_BOARD_CONF):
19-
with open(GENERATED_DTS_BOARD_CONF, 'r', encoding='utf-8') as fd:
20-
for line in fd:
21-
if '=' in line:
22-
define, val = line.split('=')
23-
dt_defines[define] = val.strip()
15+
if (not doc_mode):
16+
# The env var 'GENERATED_DTS_BOARD_CONF' must be set unless we are in
17+
# doc mode
18+
GENERATED_DTS_BOARD_CONF = os.environ['GENERATED_DTS_BOARD_CONF']
19+
if os.path.isfile(GENERATED_DTS_BOARD_CONF):
20+
with open(GENERATED_DTS_BOARD_CONF, 'r', encoding='utf-8') as fd:
21+
for line in fd:
22+
if '=' in line:
23+
define, val = line.split('=')
24+
dt_defines[define] = val.strip()
2425

2526
def _dt_units_to_scale(unit):
2627
if not unit:

0 commit comments

Comments
 (0)