michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Makefile: Add dts config include file

Browse source 
This patch adds a dts config include file that is sourced during builds.
The config file contents are key value pairs derived from the DTS board
descriptions.

Jira: ZEP-2119

Change-Id: I4d50e795ba776645b56f0b83410cbb5b0a8fd4fa
Signed-off-by: Andy Gross <andy.gross@linaro.org>
This commit is contained in:
Andy Gross 2017-05-22 00:35:52 -05:00 • committed by Anas Nashif
commit 78114e2f8a
1 changed files with 29 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

31
Makefile
View file

@ -577,6 +577,17 @@ ifeq ($(dot-config),1)
# oldconfig if changes are detected. # oldconfig if changes are detected.
-include include/config/auto.conf.cmd -include include/config/auto.conf.cmd
# Read in DTS derived configuration, if it exists
#
# We check to see if the ARCH is correctly sourced before doing the -include
# The reason for this is due to implicit rules kicking in to create this file.
# If this occurs before the above auto.conf is sourced correctly, the build
# will iterate over the dts conf file 2-3 times before settling down to the
# correct output.
ifneq ($(ARCH),)
-include include/generated/generated_dts_board.conf
endif
# To avoid any implicit rule to kick in, define an empty command # To avoid any implicit rule to kick in, define an empty command
$(KCONFIG_CONFIG) include/config/auto.conf.cmd: ; $(KCONFIG_CONFIG) include/config/auto.conf.cmd: ;
@ -962,19 +973,34 @@ define filechk_generated_dts_board.h
fi; \ fi; \
) )
endef endef
define filechk_generated_dts_board.conf
(echo "# WARNING. THIS FILE IS AUTO-GENERATED. DO NOT MODIFY!"; \
$(ZEPHYR_BASE)/scripts/extract_dts_includes.py \
-d dts/$(ARCH)/$(BOARD_NAME).dts_compiled \
-y $(ZEPHYR_BASE)/dts/$(ARCH)/yaml -k; \
)
endef
else else
define filechk_generated_dts_board.h define filechk_generated_dts_board.h
(echo "/* WARNING. THIS FILE IS AUTO-GENERATED. DO NOT MODIFY! */";) (echo "/* WARNING. THIS FILE IS AUTO-GENERATED. DO NOT MODIFY! */";)
endef endef
define filechk_generated_dts_board.conf
(echo "# WARNING. THIS FILE IS AUTO-GENERATED. DO NOT MODIFY!";)
endef
endif endif
include/generated/generated_dts_board.h: include/config/auto.conf FORCE include/generated/generated_dts_board.h: include/config/auto.conf FORCE
ifeq ($(CONFIG_HAS_DTS),y) ifeq ($(CONFIG_HAS_DTS),y)
$(Q)$(MAKE) $(build)=dts/$(ARCH) $(Q)$(MAKE) $(build)=dts/$(ARCH)
endif endif
$(call filechk,generated_dts_board.h) $(call filechk,generated_dts_board.h)
include/generated/generated_dts_board.conf: include/config/auto.conf FORCE
ifeq ($(CONFIG_HAS_DTS),y)
$(Q)$(MAKE) $(build)=dts/$(ARCH)
endif
$(call filechk,generated_dts_board.conf)
dts: include/generated/generated_dts_board.h dts: include/generated/generated_dts_board.h
# The actual objects are generated when descending, # The actual objects are generated when descending,
@ -1091,7 +1117,8 @@ depend dep:
# Directories & files removed with 'make clean' # Directories & files removed with 'make clean'
CLEAN_DIRS += $(MODVERDIR) CLEAN_DIRS += $(MODVERDIR)
CLEAN_FILES += include/generated/generated_dts_board.h \ CLEAN_FILES += include/generated/generated_dts_board.conf \
include/generated/generated_dts_board.h \
.old_version .tmp_System.map .tmp_version \ .old_version .tmp_System.map .tmp_version \
.tmp_* System.map *.lnk *.map *.elf *.lst \ .tmp_* System.map *.lnk *.map *.elf *.lst \
*.bin *.hex *.stat *.strip staticIdt.o linker.cmd \ *.bin *.hex *.stat *.strip staticIdt.o linker.cmd \