From 396701808d83d21f9b292dd752daa2495ba90acb Mon Sep 17 00:00:00 2001 From: George Jiglau Date: Tue, 21 Nov 2017 02:11:51 +0000 Subject: genlink: Rewrite genlink script from awk to python This removes the dependency on awk and should fix #732 python was already a dependency, for the irq generation --- mk/genlink-config.mk | 10 +++++----- mk/genlink-rules.mk | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'mk') diff --git a/mk/genlink-config.mk b/mk/genlink-config.mk index ae480513..b2dfb3c6 100644 --- a/mk/genlink-config.mk +++ b/mk/genlink-config.mk @@ -24,11 +24,11 @@ endif LDSCRIPT = generated.$(DEVICE).ld DEVICES_DATA = $(OPENCM3_DIR)/ld/devices.data -genlink_family :=$(shell gawk -v PAT="$(DEVICE)" -v MODE="FAMILY" -f $(OPENCM3_DIR)/scripts/genlink.awk $(DEVICES_DATA)) -genlink_subfamily :=$(shell gawk -v PAT="$(DEVICE)" -v MODE="SUBFAMILY" -f $(OPENCM3_DIR)/scripts/genlink.awk $(DEVICES_DATA)) -genlink_cpu :=$(shell gawk -v PAT="$(DEVICE)" -v MODE="CPU" -f $(OPENCM3_DIR)/scripts/genlink.awk $(DEVICES_DATA)) -genlink_fpu :=$(shell gawk -v PAT="$(DEVICE)" -v MODE="FPU" -f $(OPENCM3_DIR)/scripts/genlink.awk $(DEVICES_DATA)) -genlink_cppflags :=$(shell gawk -v PAT="$(DEVICE)" -v MODE="CPPFLAGS" -f $(OPENCM3_DIR)/scripts/genlink.awk $(DEVICES_DATA)) +genlink_family :=$(shell $(OPENCM3_DIR)/scripts/genlink.py $(DEVICES_DATA) $(DEVICE) FAMILY) +genlink_subfamily :=$(shell $(OPENCM3_DIR)/scripts/genlink.py $(DEVICES_DATA) $(DEVICE) SUBFAMILY) +genlink_cpu :=$(shell $(OPENCM3_DIR)/scripts/genlink.py $(DEVICES_DATA) $(DEVICE) CPU) +genlink_fpu :=$(shell $(OPENCM3_DIR)/scripts/genlink.py $(DEVICES_DATA) $(DEVICE) FPU) +genlink_cppflags :=$(shell $(OPENCM3_DIR)/scripts/genlink.py $(DEVICES_DATA) $(DEVICE) CPPFLAGS) CPPFLAGS += $(genlink_cppflags) diff --git a/mk/genlink-rules.mk b/mk/genlink-rules.mk index 64b37be0..0136c6f8 100644 --- a/mk/genlink-rules.mk +++ b/mk/genlink-rules.mk @@ -19,4 +19,4 @@ $(LDSCRIPT): $(OPENCM3_DIR)/ld/linker.ld.S $(OPENCM3_DIR)/ld/devices.data @printf " GENLNK $(DEVICE)\n" - $(Q)$(CPP) $(ARCH_FLAGS) $(shell gawk -v PAT="$(DEVICE)" -v MODE="DEFS" -f $(OPENCM3_DIR)/scripts/genlink.awk $(OPENCM3_DIR)/ld/devices.data 2>/dev/null) -P -E $< > $@ + $(Q)$(CPP) $(ARCH_FLAGS) $(shell $(OPENCM3_DIR)/scripts/genlink.py $(DEVICES_DATA) $(DEVICE) DEFS) -P -E $< > $@ -- cgit v1.2.3