diff options
| -rw-r--r-- | Makefile.inc | 12 | ||||
| -rw-r--r-- | src/Kconfig | 11 |
2 files changed, 21 insertions, 2 deletions
diff --git a/Makefile.inc b/Makefile.inc index b7c490473d..446e321313 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -25,6 +25,7 @@ endif CONFIG_CBFS_PREFIX:=$(call strip_quotes,$(CONFIG_CBFS_PREFIX)) CONFIG_FMDFILE:=$(call strip_quotes,$(CONFIG_FMDFILE)) CONFIG_DEVICETREE:=$(call strip_quotes, $(CONFIG_DEVICETREE)) +CONFIG_OVERRIDE_DEVICETREE:=$(call strip_quotes, $(CONFIG_OVERRIDE_DEVICETREE)) ####################################################################### # misleadingly named, this is the coreboot version @@ -558,12 +559,19 @@ $(obj)/config.h: $(objutil)/kconfig/conf # needed objects that every mainboard uses # Creation of these is architecture and mainboard independent DEVICETREE_FILE := $(src)/mainboard/$(MAINBOARDDIR)/$(CONFIG_DEVICETREE) + +ifneq ($(CONFIG_OVERRIDE_DEVICETREE),) + +OVERRIDE_DEVICETREE_FILE := $(src)/mainboard/$(MAINBOARDDIR)/$(CONFIG_OVERRIDE_DEVICETREE) + +endif + DEVICETREE_STATIC_C := $(obj)/mainboard/$(MAINBOARDDIR)/static.c -$(DEVICETREE_STATIC_C): $(DEVICETREE_FILE) $(objutil)/sconfig/sconfig +$(DEVICETREE_STATIC_C): $(DEVICETREE_FILE) $(OVERRIDE_DEVICETREE_FILE) $(objutil)/sconfig/sconfig @printf " SCONFIG $(subst $(src)/,,$(<))\n" mkdir -p $(dir $(DEVICETREE_STATIC_C)) - $(objutil)/sconfig/sconfig $(DEVICETREE_FILE) $(DEVICETREE_STATIC_C) + $(objutil)/sconfig/sconfig $(DEVICETREE_FILE) $(DEVICETREE_STATIC_C) $(OVERRIDE_DEVICETREE_FILE) ramstage-y+=$(DEVICETREE_STATIC_C) romstage-y+=$(DEVICETREE_STATIC_C) diff --git a/src/Kconfig b/src/Kconfig index fd0a4eb9a6..875c9d0790 100644 --- a/src/Kconfig +++ b/src/Kconfig @@ -295,6 +295,17 @@ config DEVICETREE Examples: "devicetree.variant.cb" "variant/devicetree.cb" +config OVERRIDE_DEVICETREE + string + default "" + help + This symbol allows variants to provide an override devicetree file to + override the registers and/or add new devices on top of the ones + provided by baseboard devicetree using CONFIG_DEVICETREE. + + Examples: "devicetree.variant-override.cb" + "variant/devicetree-override.cb" + config CBFS_SIZE hex "Size of CBFS filesystem in ROM" # Default value set at the end of the file |