demos: use Kconfig for fmc-svec-carrier builds

add fmc-svec-carrier to the default build of demos Signed-off-by: Adam Wujek <adam.wujek@cern.ch>

demos: use Kconfig for fmc-svec-carrier builds
add fmc-svec-carrier to the default build of demos Signed-off-by: Adam Wujek <adam.wujek@cern.ch>
7842875a · Adam Wujek · ed16990c · 7842875a · 7842875a · 7842875a
Commit 7842875a authored Apr 13, 2018 by Adam Wujek 💬
8 changed files
--- a/demos/Makefile
+++ b/demos/Makefile
@@ -3,7 +3,7 @@ DIRS := hello_world
 DIRS += hello_world_framework
 DIRS += alarm_clock
 DIRS += data_generator
-
+DIRS += fmc-svec-carrier/software

 all clean cleanall modules install modules_install: $(DIRS)


--- a/demos/fmc-svec-carrier/software/firmware/Makefile
+++ b/demos/fmc-svec-carrier/software/firmware/Makefile
@@ -10,8 +10,13 @@ modules: TARGET = modules
 install: TARGET = install
 modules_install: TARGET = modules_install

-$(DIRS):
+DOT-CONFIGS = $(addsuffix /.config,$(DIRS))
+
+$(DIRS): $(DOT-CONFIGS)
 	$(MAKE) -C $@ $(TARGET)

+$(DOT-CONFIGS):
+	$(MAKE) -C $(@D) defconfig
+
 .PHONY: all clean cleanall modules install modules_install
 .PHONY: $(DIRS)
--- a/demos/fmc-svec-carrier/software/firmware/fw-01/Kconfig
+++ b/demos/fmc-svec-carrier/software/firmware/fw-01/Kconfig
+
+mainmenu "fmc-svec-carrier fw-01 demo configuration"
+
+comment "Project specific configuration"
+
+# include Mock Turtle's Kconfig
+source "Kconfig.mt"
--- a/demos/fmc-svec-carrier/software/firmware/fw-01/Makefile
+++ b/demos/fmc-svec-carrier/software/firmware/fw-01/Makefile
 include ../../../project.mk

 OBJS = fw-svec.o
-OBJS += ../common/fw-svec-smem-code.o
+OBJS += common/fw-svec-smem-code.o
+OBJDIR += common
 OUTPUT = fw-svec-1
 TRTL ?= ../../../../../
 TRTL_SW = $(TRTL)/software
@@ -11,15 +12,6 @@ EXTRA_CFLAGS += -I../common
 EXTRA_CFLAGS += -DFPGA_APPLICATION_ID=APPLICATION_ID
 EXTRA_CFLAGS += -DRT_APPLICATION_ID=$(RT_APPLICATION_ID_CPU1)

-MOCKTURTLE_LIBRARY_PRINT_ENABLE := 1
-MOCKTURTLE_LIBRARY_PRINT_DEBUG_ENABLE := 1
-MOCKTURTLE_LIBRARY_PRINT_ERROR_ENABLE := 1
-
-# Firmware Libray configuration
-MOCKTURTLE_FRAMEWORK_ENABLE := 0
-MOCKTURTLE_FRAMEWORK_VARIABLE_ENABLE := 0
-MOCKTURTLE_FRAMEWORK_BUFFER_ENABLE := 0
-MOCKTURTLE_FRAMEWORK_DEBUG_ENABLE := 0
-MOCKTURTLE_FRAMEWORK_32BIT_ALIGN := 0
+vpath %.c ../

 include $(TRTL_SW)/rt/Makefile
--- a/demos/fmc-svec-carrier/software/firmware/fw-01/configs/mt_defconfig
+++ b/demos/fmc-svec-carrier/software/firmware/fw-01/configs/mt_defconfig
+#
+# Automatically generated file; DO NOT EDIT.
+# fmc-svec-carrier fw-01 demo configuration
+#
+
+#
+# Project specific configuration
+#
+
+#
+# Mock Turtle configuration
+#
+
+#
+# Mock Turtle framework configuration
+#
+# CONFIG_MOCKTURTLE_FRAMEWORK_ENABLE is not set
+
+#
+# Mock Turtle library configuration
+#
+CONFIG_MOCKTURTLE_LIBRARY_PRINT_ENABLE=y
+CONFIG_MOCKTURTLE_LIBRARY_PRINT_DEBUG_ENABLE=y
+CONFIG_MOCKTURTLE_LIBRARY_PRINT_ERROR_ENABLE=y
--- a/demos/fmc-svec-carrier/software/firmware/fw-02/Kconfig
+++ b/demos/fmc-svec-carrier/software/firmware/fw-02/Kconfig
+
+mainmenu "fmc-svec-carrier fw-02 demo configuration"
+
+comment "Project specific configuration"
+
+# include Mock Turtle's Kconfig
+source "Kconfig.mt"
--- a/demos/fmc-svec-carrier/software/firmware/fw-02/Makefile
+++ b/demos/fmc-svec-carrier/software/firmware/fw-02/Makefile
 include ../../../project.mk

 OBJS = fw-svec.o
-OBJS += ../common/fw-svec-smem-code.o
+OBJS += common/fw-svec-smem-code.o
+OBJDIR += common
 OUTPUT = fw-svec-2
 TRTL ?= ../../../../../
 TRTL_SW = $(TRTL)/software
@@ -12,15 +13,6 @@ EXTRA_CFLAGS += -DFPGA_APPLICATION_ID=$(APPLICATION_ID)
 EXTRA_CFLAGS += -DRT_APPLICATION_ID=$(RT_APPLICATION_ID_CPU2)
 EXTRA_CFLAGS += -DLIBRT_DEBUG_VERBOSE -DLIBRT_DEBUG

-MOCKTURTLE_LIBRARY_PRINT_ENABLE := 1
-MOCKTURTLE_LIBRARY_PRINT_DEBUG_ENABLE := 1
-MOCKTURTLE_LIBRARY_PRINT_ERROR_ENABLE := 1
-
-# Firmware Libray configuration
-MOCKTURTLE_FRAMEWORK_ENABLE := 1
-MOCKTURTLE_FRAMEWORK_VARIABLE_ENABLE := 1
-MOCKTURTLE_FRAMEWORK_BUFFER_ENABLE := 1
-MOCKTURTLE_FRAMEWORK_DEBUG_ENABLE := 1
-MOCKTURTLE_FRAMEWORK_32BIT_ALIGN := 0
+vpath %.c ../

 include $(TRTL_SW)/rt/Makefile
--- a/demos/fmc-svec-carrier/software/firmware/fw-02/configs/mt_defconfig
+++ b/demos/fmc-svec-carrier/software/firmware/fw-02/configs/mt_defconfig
+#
+# Automatically generated file; DO NOT EDIT.
+# fmc-svec-carrier fw-02 demo configuration
+#
+
+#
+# Project specific configuration
+#
+
+#
+# Mock Turtle configuration
+#
+
+#
+# Mock Turtle framework configuration
+#
+CONFIG_MOCKTURTLE_FRAMEWORK_ENABLE=y
+CONFIG_MOCKTURTLE_FRAMEWORK_DEBUG_ENABLE=y
+CONFIG_MOCKTURTLE_FRAMEWORK_VARIABLE_ENABLE=y
+CONFIG_MOCKTURTLE_FRAMEWORK_BUFFER_ENABLE=y
+# CONFIG_MOCKTURTLE_FRAMEWORK_32BIT_ALIGN is not set
+
+#
+# Mock Turtle library configuration
+#
+CONFIG_MOCKTURTLE_LIBRARY_PRINT_ENABLE=y
+CONFIG_MOCKTURTLE_LIBRARY_PRINT_DEBUG_ENABLE=y
+CONFIG_MOCKTURTLE_LIBRARY_PRINT_ERROR_ENABLE=y