DT: Rename from dts.fixup to dts_fixup.h

The Zephyr configuration system uses many different files in many
different formats. It makes it a lot easier for users to understand
what these files do if when we use the correct file extensions.

To this end we rename the dts.fixup files to the correct file
extension '.h'.

This is a breaking change for out-of-tree fixup files. Such files will
be detected and given an appropriate error message.

Signed-off-by: Sebastian Bøe <sebastian.boe@nordicsemi.no>
This commit is contained in:
Sebastian Bøe 2018-10-08 10:55:43 +02:00 committed by Anas Nashif
commit 8eb734cd82
73 changed files with 10 additions and 10 deletions

View file

@ -42,14 +42,14 @@ foreach(shield_path ${shields_refs_list})
if(${shield_config}) if(${shield_config})
# if shield config flag is on, add shield overlay to the shield overlays # if shield config flag is on, add shield overlay to the shield overlays
# list and dts.fixup file to the shield fixup file # list and dts_fixup file to the shield fixup file
list(APPEND list(APPEND
dts_files dts_files
${shield_dir}/${shield_path} ${shield_dir}/${shield_path}
) )
list(APPEND list(APPEND
dts_fixups dts_fixups
${shield_dir}/${shield}/dts.fixup ${shield_dir}/${shield}/dts_fixup.h
) )
endif() endif()
endforeach() endforeach()
@ -121,13 +121,13 @@ if(CONFIG_HAS_DTS)
# Run extract_dts_includes.py for the header file # Run extract_dts_includes.py for the header file
# generated_dts_board.h # generated_dts_board.h
set_ifndef(DTS_BOARD_FIXUP_FILE ${BOARD_DIR}/dts.fixup) set_ifndef(DTS_BOARD_FIXUP_FILE ${BOARD_DIR}/dts_fixup.h)
set_ifndef(DTS_SOC_FIXUP_FILE ${PROJECT_SOURCE_DIR}/soc/${ARCH}/${SOC_PATH}/dts.fixup) set_ifndef(DTS_SOC_FIXUP_FILE ${PROJECT_SOURCE_DIR}/soc/${ARCH}/${SOC_PATH}/dts_fixup.h)
list(APPEND dts_fixups list(APPEND dts_fixups
${DTS_BOARD_FIXUP_FILE} ${DTS_BOARD_FIXUP_FILE}
${DTS_SOC_FIXUP_FILE} ${DTS_SOC_FIXUP_FILE}
${APPLICATION_SOURCE_DIR}/dts.fixup ${APPLICATION_SOURCE_DIR}/dts_fixup.h
) )
foreach(fixup ${dts_fixups}) foreach(fixup ${dts_fixups})

View file

@ -447,7 +447,7 @@ Zephyr board, and provide the following files::
board.h board.h
CMakeLists.txt CMakeLists.txt
doc/ doc/
dts.fixup dts_fixup.h
Kconfig.board Kconfig.board
Kconfig.defconfig Kconfig.defconfig
pinmux.c pinmux.c

View file

@ -71,8 +71,8 @@ information is placed in a header file that is used by the rest of the code as
the project is compiled. the project is compiled.
A temporary fixup file is required for device tree support on most devices. A temporary fixup file is required for device tree support on most devices.
This .fixup file by default resides in the board directory and is named This fixup file by default resides in the board directory and is named
dts.fixup. This fixup file maps the generated include information to the dts_fixup.h. This fixup file maps the generated include information to the
current driver/source usage. current driver/source usage.
.. _dt_vs_kconfig: .. _dt_vs_kconfig:

View file

@ -20,7 +20,7 @@ under :file:`/boards/shields`:
├── Kconfig.shield ├── Kconfig.shield
├── Kconfig.defconfig ├── Kconfig.defconfig
├── <shield>.overlay ├── <shield>.overlay
└── dts.fixup └── dts_fixup.h
These files provides shield configuration as follows: These files provides shield configuration as follows:
@ -37,7 +37,7 @@ These files provides shield configuration as follows:
format that is merged with the board's device tree information before format that is merged with the board's device tree information before
compilation. compilation.
* **dts.fixup**: This is a fixup file to bind board components definitions with * **dts_fixup.h**: This is a fixup file to bind board components definitions with
application in a generic fashion to enable shield compatibility across boards application in a generic fashion to enable shield compatibility across boards
Board compatibility Board compatibility