Commit 7fd12195 authored by Adam Wujek's avatar Adam Wujek 💬

demos: move *_APPLICATION_ID to Kconfig

Signed-off-by: Adam Wujek's avatarAdam Wujek <adam.wujek@cern.ch>
parent 9bea7fc6
...@@ -3,4 +3,17 @@ mainmenu "alarm_clock demo configuration" ...@@ -3,4 +3,17 @@ mainmenu "alarm_clock demo configuration"
comment "Project specific configuration" comment "Project specific configuration"
config FPGA_APPLICATION_ID
int "FPGA application ID"
default 0
help
Help text
config RT_APPLICATION_ID
int "RT application ID"
default 0
help
Help text
# include Mock Turtle's Kconfig
source "Kconfig.mt" source "Kconfig.mt"
...@@ -4,7 +4,4 @@ OUTPUT = fw-ac ...@@ -4,7 +4,4 @@ OUTPUT = fw-ac
TRTL ?= ../../../../ TRTL ?= ../../../../
TRTL_SW = $(TRTL)/software TRTL_SW = $(TRTL)/software
EXTRA_CFLAGS += -DFPGA_APPLICATION_ID=0x0
EXTRA_CFLAGS += -DRT_APPLICATION_ID=0x0
include $(TRTL_SW)/rt/Makefile include $(TRTL_SW)/rt/Makefile
...@@ -6,6 +6,8 @@ ...@@ -6,6 +6,8 @@
# #
# Project specific configuration # Project specific configuration
# #
CONFIG_FPGA_APPLICATION_ID=0
CONFIG_RT_APPLICATION_ID=0
# #
# Mock Turtle configuration # Mock Turtle configuration
......
...@@ -75,8 +75,8 @@ static struct rt_variable variables[] = { ...@@ -75,8 +75,8 @@ static struct rt_variable variables[] = {
static struct rt_application app = { static struct rt_application app = {
.name = "alarm-clk", .name = "alarm-clk",
.version = { .version = {
.fpga_id = FPGA_APPLICATION_ID, .fpga_id = CONFIG_FPGA_APPLICATION_ID,
.rt_id = RT_APPLICATION_ID, .rt_id = CONFIG_RT_APPLICATION_ID,
.rt_version = RT_VERSION(0, 1), .rt_version = RT_VERSION(0, 1),
.git_version = GIT_VERSION .git_version = GIT_VERSION
}, },
......
...@@ -3,4 +3,17 @@ mainmenu "data_generator demo configuration" ...@@ -3,4 +3,17 @@ mainmenu "data_generator demo configuration"
comment "Project specific configuration" comment "Project specific configuration"
config FPGA_APPLICATION_ID
int "FPGA application ID"
default 0
help
Help text
config RT_APPLICATION_ID
int "RT application ID"
default 0
help
Help text
# include Mock Turtle's Kconfig
source "Kconfig.mt" source "Kconfig.mt"
...@@ -4,7 +4,4 @@ OUTPUT = fw-dg ...@@ -4,7 +4,4 @@ OUTPUT = fw-dg
TRTL ?= ../../../../ TRTL ?= ../../../../
TRTL_SW = $(TRTL)/software TRTL_SW = $(TRTL)/software
EXTRA_CFLAGS += -DFPGA_APPLICATION_ID=0x0
EXTRA_CFLAGS += -DRT_APPLICATION_ID=0x0
include $(TRTL_SW)/rt/Makefile include $(TRTL_SW)/rt/Makefile
...@@ -6,6 +6,8 @@ ...@@ -6,6 +6,8 @@
# #
# Project specific configuration # Project specific configuration
# #
CONFIG_FPGA_APPLICATION_ID=0
CONFIG_RT_APPLICATION_ID=0
# #
# Mock Turtle configuration # Mock Turtle configuration
......
...@@ -79,8 +79,8 @@ struct rt_buffer buffers[] = { ...@@ -79,8 +79,8 @@ struct rt_buffer buffers[] = {
static struct rt_application app = { static struct rt_application app = {
.name = "data-gen", .name = "data-gen",
.version = { .version = {
.fpga_id = FPGA_APPLICATION_ID, .fpga_id = CONFIG_FPGA_APPLICATION_ID,
.rt_id = RT_APPLICATION_ID, .rt_id = CONFIG_RT_APPLICATION_ID,
.rt_version = RT_VERSION(0, 1), .rt_version = RT_VERSION(0, 1),
.git_version = GIT_VERSION .git_version = GIT_VERSION
}, },
......
...@@ -4,7 +4,4 @@ OUTPUT = fw-hello ...@@ -4,7 +4,4 @@ OUTPUT = fw-hello
TRTL ?= ../../../../ TRTL ?= ../../../../
TRTL_SW = $(TRTL)/software TRTL_SW = $(TRTL)/software
EXTRA_CFLAGS += -DFPGA_APPLICATION_ID=0x0
EXTRA_CFLAGS += -DRT_APPLICATION_ID=0x0
include $(TRTL_SW)/rt/Makefile include $(TRTL_SW)/rt/Makefile
...@@ -3,4 +3,17 @@ mainmenu "hello_world_framework demo configuration" ...@@ -3,4 +3,17 @@ mainmenu "hello_world_framework demo configuration"
comment "Project specific configuration" comment "Project specific configuration"
config FPGA_APPLICATION_ID
int "FPGA application ID"
default 0
help
Help text
config RT_APPLICATION_ID
int "RT application ID"
default 0
help
Help text
# include Mock Turtle's Kconfig
source "Kconfig.mt" source "Kconfig.mt"
...@@ -4,7 +4,4 @@ OUTPUT = fw-hellofrm ...@@ -4,7 +4,4 @@ OUTPUT = fw-hellofrm
TRTL ?= ../../../../ TRTL ?= ../../../../
TRTL_SW = $(TRTL)/software TRTL_SW = $(TRTL)/software
EXTRA_CFLAGS += -DFPGA_APPLICATION_ID=0x0
EXTRA_CFLAGS += -DRT_APPLICATION_ID=0x0
include $(TRTL_SW)/rt/Makefile include $(TRTL_SW)/rt/Makefile
...@@ -6,6 +6,8 @@ ...@@ -6,6 +6,8 @@
# #
# Project specific configuration # Project specific configuration
# #
CONFIG_FPGA_APPLICATION_ID=0
CONFIG_RT_APPLICATION_ID=0
# #
# Mock Turtle configuration # Mock Turtle configuration
......
...@@ -25,8 +25,8 @@ static struct rt_mq mq[] = { ...@@ -25,8 +25,8 @@ static struct rt_mq mq[] = {
static struct rt_application app = { static struct rt_application app = {
.name = "hellofrm", .name = "hellofrm",
.version = { .version = {
.fpga_id = FPGA_APPLICATION_ID, .fpga_id = CONFIG_FPGA_APPLICATION_ID,
.rt_id = RT_APPLICATION_ID, .rt_id = CONFIG_RT_APPLICATION_ID,
.rt_version = RT_VERSION(0, 1), .rt_version = RT_VERSION(0, 1),
.git_version = GIT_VERSION .git_version = GIT_VERSION
}, },
......
...@@ -6,8 +6,4 @@ TRTL_SW = $(TRTL)/software ...@@ -6,8 +6,4 @@ TRTL_SW = $(TRTL)/software
CFLAGS_OPT = -O0 CFLAGS_OPT = -O0
EXTRA_CFLAGS += -DFPGA_APPLICATION_ID=0x0
EXTRA_CFLAGS += -DRT_APPLICATION_ID=0x0
include $(TRTL_SW)/rt/Makefile include $(TRTL_SW)/rt/Makefile
...@@ -6,7 +6,4 @@ TRTL_SW = $(TRTL)/software ...@@ -6,7 +6,4 @@ TRTL_SW = $(TRTL)/software
CFLAGS_OPT = -O0 CFLAGS_OPT = -O0
EXTRA_CFLAGS += -DFPGA_APPLICATION_ID=0x0
EXTRA_CFLAGS += -DRT_APPLICATION_ID=0x0
include $(TRTL_SW)/rt/Makefile include $(TRTL_SW)/rt/Makefile
...@@ -6,7 +6,4 @@ TRTL_SW = $(TRTL)/software ...@@ -6,7 +6,4 @@ TRTL_SW = $(TRTL)/software
CFLAGS_OPT = -O0 CFLAGS_OPT = -O0
EXTRA_CFLAGS += -DFPGA_APPLICATION_ID=0x0
EXTRA_CFLAGS += -DRT_APPLICATION_ID=0x0
include $(TRTL_SW)/rt/Makefile include $(TRTL_SW)/rt/Makefile
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment