summaryrefslogtreecommitdiffstats
path: root/Makefile.inc
diff options
context:
space:
mode:
authorVladimir Serbinenko <phcoder@gmail.com>2015-05-31 12:31:59 +0200
committerVladimir Serbinenko <phcoder@gmail.com>2015-06-02 21:01:55 +0200
commit36f8d27ea9f741e184b76b5f42d7f777f207edc0 (patch)
tree440971a6f3bcdb8ca2522e6659993d155ed8ecc2 /Makefile.inc
parent1cac2c9713a864fe90f40040cd1ede130983544c (diff)
downloadcoreboot-36f8d27ea9f741e184b76b5f42d7f777f207edc0.tar.gz
coreboot-36f8d27ea9f741e184b76b5f42d7f777f207edc0.tar.bz2
coreboot-36f8d27ea9f741e184b76b5f42d7f777f207edc0.zip
Make DSDT a file in CBFS rather than embedding it into ramstage.
Makes it cleaner by putting AML into separate file rather than having an array in C code. Change-Id: Ia5d6b50ad9dabdb97ed05c837dc3ccc48b8f490f Signed-off-by: Vladimir Serbinenko <phcoder@gmail.com> Reviewed-on: http://review.coreboot.org/10385 Tested-by: build bot (Jenkins) Reviewed-by: Patrick Georgi <pgeorgi@google.com>
Diffstat (limited to 'Makefile.inc')
-rw-r--r--Makefile.inc14
1 files changed, 7 insertions, 7 deletions
diff --git a/Makefile.inc b/Makefile.inc
index 0c688f7d4dce..d5ef301ade43 100644
--- a/Makefile.inc
+++ b/Makefile.inc
@@ -169,15 +169,15 @@ endef
#######################################################################
# Add handler to compile ACPI's ASL
-define ramstage-objs_asl_template
-$$(call src-to-obj,ramstage,$(1).asl): $(1).asl $(obj)/config.h
+define asl_template
+$(call strip_quotes,$(CONFIG_CBFS_PREFIX))/$(1).aml-file = $(obj)/$(1).aml
+$(call strip_quotes,$(CONFIG_CBFS_PREFIX))/$(1).aml-type = raw
+$(call strip_quotes,$(CONFIG_CBFS_PREFIX))/$(1).aml-compression = none
+cbfs-files-y += $(call strip_quotes,$(CONFIG_CBFS_PREFIX))/$(1).aml
+$(obj)/$(1).aml: $(src)/mainboard/$(MAINBOARDDIR)/$(1).asl $(obj)/config.h
@printf " IASL $$(subst $(top)/,,$$(@))\n"
$(CC_ramstage) -x assembler-with-cpp -E -MMD -MT $$(@) $$(CPPFLAGS_ramstage) -D__ACPI__ -P -include $(src)/include/kconfig.h -I$(obj) -I$(src) -I$(src)/include -I$(src)/arch/$(ARCHDIR-$(ARCH-ramstage-y))/include -I$(src)/mainboard/$(MAINBOARDDIR) $$< -o $$@
- cd $$(dir $$@); $(IASL) -p $$(notdir $$@) -tc $$(notdir $$@)
- mv $$(basename $$@).hex $$(basename $$@).c
- $(CC_ramstage) $$(CFLAGS_ramstage) $$(CPPFLAGS_ramstage) $$(if $$(subst dsdt,,$$(basename $$(notdir $(1)))), -DAmlCode=AmlCode_$$(basename $$(notdir $(1)))) -c -o $$@ $$(basename $$@).c
- # keep %.o: %.c rule from catching the temporary .c file after a make clean
- mv $$(basename $$@).c $$(basename $$@).hex
+ cd $$(dir $$@); $(IASL) -p $$(notdir $$@) $$(notdir $$@)
endef
#######################################################################