Skip to content

Commit c8c35f7

Browse files
galaknashif
authored andcommitted
scripts: dts: Remove deprecated extract_dts_includes.py script
We now use EDTS and gen_defines.py to generate DTS defines. We deprecated the old script and defines several releases ago, so lets now remove them. Signed-off-by: Kumar Gala <[email protected]>
1 parent e1fa728 commit c8c35f7

File tree

13 files changed

+1
-2423
lines changed

13 files changed

+1
-2423
lines changed

cmake/dts.cmake

Lines changed: 1 addition & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ file(MAKE_DIRECTORY ${PROJECT_BINARY_DIR}/include/generated)
88
# encoded in DTS.
99
#
1010
# Here we call on dtc, the gcc preprocessor, and
11-
# scripts/dts/extract_dts_includes.py to generate this header file at
11+
# scripts/dts/gen_defines.py to generate this header file at
1212
# CMake configure-time.
1313
#
1414
# See ~/zephyr/doc/dts
@@ -198,29 +198,6 @@ if(SUPPORTS_DTS)
198198
message(FATAL_ERROR "new extractor failed with return code: ${ret}")
199199
endif()
200200

201-
#
202-
# Run extract_dts_includes.py (the older DT/binding parser) to generate some
203-
# legacy identifiers (via --deprecated-only). This will go away later.
204-
#
205-
206-
set(CMD_EXTRACT_DTS_INCLUDES ${PYTHON_EXECUTABLE} ${ZEPHYR_BASE}/scripts/dts/extract_dts_includes.py
207-
--deprecated-only
208-
--dts ${BOARD}.dts_compiled
209-
--yaml ${DTS_ROOT_BINDINGS}
210-
--include ${GENERATED_DTS_BOARD_UNFIXED_H}.deprecated
211-
--old-alias-names
212-
)
213-
214-
execute_process(
215-
COMMAND ${CMD_EXTRACT_DTS_INCLUDES}
216-
WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
217-
RESULT_VARIABLE ret
218-
)
219-
if(NOT "${ret}" STREQUAL "0")
220-
message(FATAL_ERROR "command failed with return code: ${ret}")
221-
endif()
222-
223201
else()
224202
file(WRITE ${GENERATED_DTS_BOARD_UNFIXED_H} "/* WARNING. THIS FILE IS AUTO-GENERATED. DO NOT MODIFY! */")
225-
file(WRITE ${GENERATED_DTS_BOARD_UNFIXED_H}.deprecated "/* WARNING. THIS FILE IS AUTO-GENERATED. DO NOT MODIFY! */")
226203
endif(SUPPORTS_DTS)

include/generated_dts_board.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@
1313

1414
#include <generated_dts_board_unfixed.h>
1515

16-
#include <generated_dts_board_unfixed.h.deprecated>
17-
1816
/* The following definitions fixup the generated include */
1917

2018
#include <generated_dts_board_fixups.h>

scripts/dts/devicetree.py

Lines changed: 0 additions & 309 deletions
This file was deleted.

scripts/dts/extract/__init__.py

Lines changed: 0 additions & 7 deletions
This file was deleted.

0 commit comments

Comments
 (0)