sw:rt: become sw:fw

Signed-off-by: Federico Vaga <federico.vaga@cern.ch>

sw:rt: become sw:fw
Signed-off-by: Federico Vaga <federico.vaga@cern.ch>
15993068 · Federico Vaga · c3685082 · 15993068 · 15993068 · 15993068
Commit 15993068 authored Apr 27, 2018 by Federico Vaga
89 changed files
--- a/demos/alarm_clock/firmware/fw-01/Makefile
+++ b/demos/alarm_clock/firmware/fw-01/Makefile
@@ -4,4 +4,4 @@ OUTPUT = fw-ac
 TRTL ?= ../../../../
 TRTL_SW = $(TRTL)/software

-include $(TRTL_SW)/rt/Makefile
+include $(TRTL_SW)/firmware/Makefile
--- a/demos/data_generator/firmware/fw-01/Makefile
+++ b/demos/data_generator/firmware/fw-01/Makefile
@@ -4,4 +4,4 @@ OUTPUT = fw-dg
 TRTL ?= ../../../../
 TRTL_SW = $(TRTL)/software

-include $(TRTL_SW)/rt/Makefile
+include $(TRTL_SW)/firmware/Makefile
--- a/demos/fmc-svec-carrier/software/firmware/fw-01/Makefile
+++ b/demos/fmc-svec-carrier/software/firmware/fw-01/Makefile
@@ -14,4 +14,4 @@ EXTRA_CFLAGS += -DRT_APPLICATION_ID=$(RT_APPLICATION_ID_CPU1)

 vpath %.c ../

-include $(TRTL_SW)/rt/Makefile
+include $(TRTL_SW)/firmware/Makefile
--- a/demos/fmc-svec-carrier/software/firmware/fw-02/Makefile
+++ b/demos/fmc-svec-carrier/software/firmware/fw-02/Makefile
@@ -15,4 +15,4 @@ EXTRA_CFLAGS += -DLIBRT_DEBUG_VERBOSE -DLIBRT_DEBUG

 vpath %.c ../

-include $(TRTL_SW)/rt/Makefile
+include $(TRTL_SW)/firmware/Makefile
--- a/demos/hello_world/firmware/fw-01/Makefile
+++ b/demos/hello_world/firmware/fw-01/Makefile
@@ -4,4 +4,4 @@ OUTPUT = fw-hello
 TRTL ?= ../../../../
 TRTL_SW = $(TRTL)/software

-include $(TRTL_SW)/rt/Makefile
+include $(TRTL_SW)/firmware/Makefile
--- a/demos/hello_world_framework/firmware/fw-01/Makefile
+++ b/demos/hello_world_framework/firmware/fw-01/Makefile
@@ -4,4 +4,4 @@ OUTPUT = fw-hellofrm
 TRTL ?= ../../../../
 TRTL_SW = $(TRTL)/software

-include $(TRTL_SW)/rt/Makefile
+include $(TRTL_SW)/firmware/Makefile
--- a/demos/profiling/firmware/fw-01/Makefile
+++ b/demos/profiling/firmware/fw-01/Makefile
@@ -6,4 +6,4 @@ TRTL_SW = $(TRTL)/software

 CFLAGS_OPT = -O0

-include $(TRTL_SW)/rt/Makefile
+include $(TRTL_SW)/firmware/Makefile
--- a/demos/profiling/firmware/fw-02/Makefile
+++ b/demos/profiling/firmware/fw-02/Makefile
@@ -6,4 +6,4 @@ TRTL_SW = $(TRTL)/software

 CFLAGS_OPT = -O0

-include $(TRTL_SW)/rt/Makefile
+include $(TRTL_SW)/firmware/Makefile
--- a/demos/profiling/firmware/fw-03/Makefile
+++ b/demos/profiling/firmware/fw-03/Makefile
@@ -6,4 +6,4 @@ TRTL_SW = $(TRTL)/software

 CFLAGS_OPT = -O0

-include $(TRTL_SW)/rt/Makefile
+include $(TRTL_SW)/firmware/Makefile
--- a/doc/doxygen-trtl-config
+++ b/doc/doxygen-trtl-config
@@ -12,9 +12,9 @@ CASE_SENSE_NAMES       = YES

 WARN_NO_PARAMDOC       = YES

-INPUT                  = ../software/lib ../software/rt ../software/include
+INPUT                  = ../software/lib ../software/firmware ../software/include
 RECURSIVE              = YES
-EXCLUDE                = ../software/rt/scripts ../software/lib/PyMockTurtle ../software/kernel
+EXCLUDE                = ../software/firmware/scripts ../software/lib/PyMockTurtle ../software/kernel

 GENERATE_HTML          = NO
 GENERATE_LATEX         = NO

--- a/doc/software/index.rst
+++ b/doc/software/index.rst
@@ -124,7 +124,7 @@ The framework usage, rather than precluding the user to use library
 functions, is complementary to the library.

 All the Mock Turtle firmware source code can be found in the directory
-``/path/to/mockturtle/software/rt/``.
+``/path/to/mockturtle/software/firmware/``.

 .. toctree::
   :maxdepth: 2
@@ -155,7 +155,7 @@ Mock Turtle has a generic ``Makefile`` that you should include in your
    MOCKTURTLE_LDSCRIPT := myfirmware.ld

    # INCLUDE GENERIC Makefile
-    include $(TRTL_SW)/rt/Makefile
+    include $(TRTL_SW)/firmware/Makefile

 Here the list of supported Makefile environment variables


--- a/software/rt/.gitignore
+++ b/software/rt/.gitignore
--- a/software/rt/Kconfig.mt
+++ b/software/rt/Kconfig.mt
--- a/software/rt/Makefile
+++ b/software/rt/Makefile
@@ -21,8 +21,8 @@ CFLAGS += -mabi=ilp32 -march=rv32i -ffunction-sections -fdata-sections
 LDFLAGS += -lgcc -lc -Wl,--gc-sections

 # provide search patch for sources
-vpath %.c $(TRTL)/software/rt
-vpath %.S $(TRTL)/software/rt
+vpath %.c $(TRTL)/software/firmware
+vpath %.S $(TRTL)/software/firmware

 BUILDDIR := build

@@ -47,9 +47,9 @@ CFLAGS += $(CFLAGS_DBG)
 CFLAGS += -Wall -D__TRTL_FIRMWARE__ -DARCH=urv
 CFLAGS += -I.
 CFLAGS += -I$(BUILDDIR)/include
-CFLAGS += -I$(TRTL)/software/rt
-CFLAGS += -I$(TRTL)/software/rt/lib
-CFLAGS += -I$(TRTL)/software/rt/framework
+CFLAGS += -I$(TRTL)/software/firmware
+CFLAGS += -I$(TRTL)/software/firmware/lib
+CFLAGS += -I$(TRTL)/software/firmware/framework
 CFLAGS += -I$(TRTL)/software/include
 CFLAGS += -DGIT_VERSION=$(RT_GIT_VERSION)

@@ -77,7 +77,7 @@ OBJS_BUILD = $(addprefix $(BUILDDIR)/, $(OBJS))
 OBJDIR_BUILD = $(addprefix $(BUILDDIR)/, $(OBJDIR))
 OBJDIR_BUILD += $(BUILDDIR)

-MOCKTURTLE_LDSCRIPT ?= $(TRTL)/software/rt/urv/mockturtle.ld
+MOCKTURTLE_LDSCRIPT ?= $(TRTL)/software/firmware/urv/mockturtle.ld

 .PHONY: all clean cleanall check-def

@@ -152,16 +152,16 @@ include $(wildcard $(patsubst %,%/.d/*.d,$(basename $(OBJDIR_BUILD))))
 # this one is used to generate autoconf.h file
 $(AUTOCONF) silentoldconfig: .config | $(BUILDDIR)
 	export KCONFIG_CONFIG=$(CURDIR)/.config; \
-	$(MAKE) quiet=quiet_ KBUILD_KCONFIG=$(CURDIR)/Kconfig projtree=$(CURDIR)/$(BUILDDIR) -C $(TRTL)/software/rt -f Makefile.kconfig silentoldconfig
+	$(MAKE) quiet=quiet_ KBUILD_KCONFIG=$(CURDIR)/Kconfig projtree=$(CURDIR)/$(BUILDDIR) -C $(TRTL)/software/firmware -f Makefile.kconfig silentoldconfig

 scripts_basic config:
-	$(MAKE) quiet=quiet_ KBUILD_KCONFIG=$(CURDIR)/Kconfig projtree=$(CURDIR) -C $(TRTL)/software/rt -f Makefile.kconfig $@
+	$(MAKE) quiet=quiet_ KBUILD_KCONFIG=$(CURDIR)/Kconfig projtree=$(CURDIR) -C $(TRTL)/software/firmware -f Makefile.kconfig $@

 %config:
-	$(MAKE) quiet=quiet_ KBUILD_KCONFIG=$(CURDIR)/Kconfig projtree=$(CURDIR) -C $(TRTL)/software/rt -f Makefile.kconfig $@
+	$(MAKE) quiet=quiet_ KBUILD_KCONFIG=$(CURDIR)/Kconfig projtree=$(CURDIR) -C $(TRTL)/software/firmware -f Makefile.kconfig $@

 defconfig:
-	$(MAKE) quiet=quiet_ KBUILD_KCONFIG=$(CURDIR)/Kconfig projtree=$(CURDIR) -C $(TRTL)/software/rt -f Makefile.kconfig mt_defconfig
+	$(MAKE) quiet=quiet_ KBUILD_KCONFIG=$(CURDIR)/Kconfig projtree=$(CURDIR) -C $(TRTL)/software/firmware -f Makefile.kconfig mt_defconfig

 .config: ;


--- a/software/rt/Makefile.kconfig
+++ b/software/rt/Makefile.kconfig
--- a/software/rt/framework/mockturtle-framework.c
+++ b/software/rt/framework/mockturtle-framework.c
--- a/software/rt/framework/mockturtle-framework.h
+++ b/software/rt/framework/mockturtle-framework.h
--- a/software/rt/lib/mockturtle-rt-common.c
+++ b/software/rt/lib/mockturtle-rt-common.c
--- a/software/rt/lib/mockturtle-rt.h
+++ b/software/rt/lib/mockturtle-rt.h
--- a/software/rt/lib/printf.c
+++ b/software/rt/lib/printf.c
--- a/software/rt/lib/vsprintf-xint.c
+++ b/software/rt/lib/vsprintf-xint.c
--- a/software/rt/scripts/Kbuild.include
+++ b/software/rt/scripts/Kbuild.include
--- a/software/rt/scripts/Lindent
+++ b/software/rt/scripts/Lindent
--- a/software/rt/scripts/Makefile
+++ b/software/rt/scripts/Makefile
--- a/software/rt/scripts/Makefile.build
+++ b/software/rt/scripts/Makefile.build
--- a/software/rt/scripts/Makefile.host
+++ b/software/rt/scripts/Makefile.host
--- a/software/rt/scripts/Makefile.lib
+++ b/software/rt/scripts/Makefile.lib
--- a/software/rt/scripts/basic/.gitignore
+++ b/software/rt/scripts/basic/.gitignore
--- a/software/rt/scripts/basic/Makefile
+++ b/software/rt/scripts/basic/Makefile
--- a/software/rt/scripts/basic/docproc.c
+++ b/software/rt/scripts/basic/docproc.c
--- a/software/rt/scripts/basic/fixdep.c
+++ b/software/rt/scripts/basic/fixdep.c
--- a/software/rt/scripts/basic/hash.c
+++ b/software/rt/scripts/basic/hash.c
--- a/software/rt/scripts/checkpatch.pl
+++ b/software/rt/scripts/checkpatch.pl
--- a/software/rt/scripts/kconfig/.gitignore
+++ b/software/rt/scripts/kconfig/.gitignore
--- a/software/rt/scripts/kconfig/Makefile
+++ b/software/rt/scripts/kconfig/Makefile
--- a/software/rt/scripts/kconfig/POTFILES.in
+++ b/software/rt/scripts/kconfig/POTFILES.in
--- a/software/rt/scripts/kconfig/check.sh
+++ b/software/rt/scripts/kconfig/check.sh
--- a/software/rt/scripts/kconfig/conf.c
+++ b/software/rt/scripts/kconfig/conf.c
--- a/software/rt/scripts/kconfig/confdata.c
+++ b/software/rt/scripts/kconfig/confdata.c
--- a/software/rt/scripts/kconfig/expr.c
+++ b/software/rt/scripts/kconfig/expr.c
--- a/software/rt/scripts/kconfig/expr.h
+++ b/software/rt/scripts/kconfig/expr.h
--- a/software/rt/scripts/kconfig/gconf.c
+++ b/software/rt/scripts/kconfig/gconf.c
--- a/software/rt/scripts/kconfig/gconf.glade
+++ b/software/rt/scripts/kconfig/gconf.glade
--- a/software/rt/scripts/kconfig/images.c
+++ b/software/rt/scripts/kconfig/images.c
--- a/software/rt/scripts/kconfig/kconf_id.c
+++ b/software/rt/scripts/kconfig/kconf_id.c
--- a/software/rt/scripts/kconfig/kxgettext.c
+++ b/software/rt/scripts/kconfig/kxgettext.c
--- a/software/rt/scripts/kconfig/list.h
+++ b/software/rt/scripts/kconfig/list.h
--- a/software/rt/scripts/kconfig/lkc.h
+++ b/software/rt/scripts/kconfig/lkc.h
--- a/software/rt/scripts/kconfig/lkc_proto.h
+++ b/software/rt/scripts/kconfig/lkc_proto.h
--- a/software/rt/scripts/kconfig/lxdialog/.gitignore
+++ b/software/rt/scripts/kconfig/lxdialog/.gitignore
--- a/software/rt/scripts/kconfig/lxdialog/BIG.FAT.WARNING
+++ b/software/rt/scripts/kconfig/lxdialog/BIG.FAT.WARNING
--- a/software/rt/scripts/kconfig/lxdialog/check-lxdialog.sh
+++ b/software/rt/scripts/kconfig/lxdialog/check-lxdialog.sh
--- a/software/rt/scripts/kconfig/lxdialog/checklist.c
+++ b/software/rt/scripts/kconfig/lxdialog/checklist.c
--- a/software/rt/scripts/kconfig/lxdialog/dialog.h
+++ b/software/rt/scripts/kconfig/lxdialog/dialog.h
--- a/software/rt/scripts/kconfig/lxdialog/inputbox.c
+++ b/software/rt/scripts/kconfig/lxdialog/inputbox.c
--- a/software/rt/scripts/kconfig/lxdialog/menubox.c
+++ b/software/rt/scripts/kconfig/lxdialog/menubox.c
--- a/software/rt/scripts/kconfig/lxdialog/textbox.c
+++ b/software/rt/scripts/kconfig/lxdialog/textbox.c
--- a/software/rt/scripts/kconfig/lxdialog/util.c
+++ b/software/rt/scripts/kconfig/lxdialog/util.c
--- a/software/rt/scripts/kconfig/lxdialog/yesno.c
+++ b/software/rt/scripts/kconfig/lxdialog/yesno.c
--- a/software/rt/scripts/kconfig/mconf.c
+++ b/software/rt/scripts/kconfig/mconf.c
--- a/software/rt/scripts/kconfig/menu.c
+++ b/software/rt/scripts/kconfig/menu.c
--- a/software/rt/scripts/kconfig/merge_config.sh
+++ b/software/rt/scripts/kconfig/merge_config.sh
--- a/software/rt/scripts/kconfig/nconf.c
+++ b/software/rt/scripts/kconfig/nconf.c
--- a/software/rt/scripts/kconfig/nconf.gui.c
+++ b/software/rt/scripts/kconfig/nconf.gui.c
--- a/software/rt/scripts/kconfig/nconf.h
+++ b/software/rt/scripts/kconfig/nconf.h
--- a/software/rt/scripts/kconfig/qconf.cc
+++ b/software/rt/scripts/kconfig/qconf.cc
--- a/software/rt/scripts/kconfig/qconf.h
+++ b/software/rt/scripts/kconfig/qconf.h
--- a/software/rt/scripts/kconfig/streamline_config.pl
+++ b/software/rt/scripts/kconfig/streamline_config.pl
--- a/software/rt/scripts/kconfig/symbol.c
+++ b/software/rt/scripts/kconfig/symbol.c
--- a/software/rt/scripts/kconfig/util.c
+++ b/software/rt/scripts/kconfig/util.c
--- a/software/rt/scripts/kconfig/zconf.l
+++ b/software/rt/scripts/kconfig/zconf.l
--- a/software/rt/scripts/kconfig/zconf.y
+++ b/software/rt/scripts/kconfig/zconf.y
--- a/software/rt/urv/crt0.S
+++ b/software/rt/urv/crt0.S
--- a/software/rt/urv/emulate.c
+++ b/software/rt/urv/emulate.c
--- a/software/rt/urv/irq.S
+++ b/software/rt/urv/irq.S
--- a/software/rt/urv/mockturtle.ld
+++ b/software/rt/urv/mockturtle.ld
--- a/software/rt/urv/riscv.h
+++ b/software/rt/urv/riscv.h
--- a/software/tools/trtl-project-creator/templates/software/firmware/fw-01/Makefile
+++ b/software/tools/trtl-project-creator/templates/software/firmware/fw-01/Makefile
@@ -18,4 +18,4 @@ MOCKTURTLE_FRAMEWORK_BUFFER_ENABLE := 0
 MOCKTURTLE_FRAMEWORK_DEBUG_ENABLE := 0
 MOCKTURTLE_FRAMEWORK_32BIT_ALIGN := 1

-include $(TRTL_SW)/rt/Makefile
+include $(TRTL_SW)/firmware/Makefile
--- a/tests/firmware/config_rom/Makefile
+++ b/tests/firmware/config_rom/Makefile
@@ -6,4 +6,4 @@ TRTL_SW = $(TRTL)/software

 CFLAGS_OPT = -O0  # disable optimization

-include $(TRTL_SW)/rt/Makefile
+include $(TRTL_SW)/firmware/Makefile
--- a/tests/firmware/cpu-byte-addressing/Makefile
+++ b/tests/firmware/cpu-byte-addressing/Makefile
@@ -6,4 +6,4 @@ TRTL_SW = $(TRTL)/software

 CFLAGS_OPT = -O0  # disable optimization

-include $(TRTL_SW)/rt/Makefile
+include $(TRTL_SW)/firmware/Makefile
--- a/tests/firmware/cpu-loop/Makefile
+++ b/tests/firmware/cpu-loop/Makefile
@@ -6,4 +6,4 @@ TRTL_SW = $(TRTL)/software

 CFLAGS_OPT = -O0  # disable optimization

-include $(TRTL_SW)/rt/Makefile
+include $(TRTL_SW)/firmware/Makefile
--- a/tests/firmware/cpu-notify/Makefile
+++ b/tests/firmware/cpu-notify/Makefile
@@ -6,4 +6,4 @@ TRTL_SW = $(TRTL)/software

 CFLAGS_OPT = -O0  # disable optimization

-include $(TRTL_SW)/rt/Makefile
+include $(TRTL_SW)/firmware/Makefile
--- a/tests/firmware/hmq-async-recv/Makefile
+++ b/tests/firmware/hmq-async-recv/Makefile
@@ -6,4 +6,4 @@ TRTL_SW = $(TRTL)/software

 CFLAGS_OPT = -O0  # disable optimization

-include $(TRTL_SW)/rt/Makefile
+include $(TRTL_SW)/firmware/Makefile
--- a/tests/firmware/hmq-async-send/Makefile
+++ b/tests/firmware/hmq-async-send/Makefile
@@ -6,4 +6,4 @@ TRTL_SW = $(TRTL)/software

 CFLAGS_OPT = -O0  # disable optimization

-include $(TRTL_SW)/rt/Makefile
+include $(TRTL_SW)/firmware/Makefile
--- a/tests/firmware/hmq-purge/Makefile
+++ b/tests/firmware/hmq-purge/Makefile
@@ -6,4 +6,4 @@ TRTL_SW = $(TRTL)/software

 CFLAGS_OPT = -O0  # disable optimization

-include $(TRTL_SW)/rt/Makefile
+include $(TRTL_SW)/firmware/Makefile
--- a/tests/firmware/hmq-sync/Makefile
+++ b/tests/firmware/hmq-sync/Makefile
@@ -6,4 +6,4 @@ TRTL_SW = $(TRTL)/software

 CFLAGS_OPT = -O0  # disable optimization

-include $(TRTL_SW)/rt/Makefile
+include $(TRTL_SW)/firmware/Makefile
--- a/tests/firmware/rt-frm-ping/Makefile
+++ b/tests/firmware/rt-frm-ping/Makefile
@@ -6,4 +6,4 @@ TRTL_SW = $(TRTL)/software

 CFLAGS_OPT = -O0  # disable optimization

-include $(TRTL_SW)/rt/Makefile
+include $(TRTL_SW)/firmware/Makefile
--- a/tests/firmware/serial/Makefile
+++ b/tests/firmware/serial/Makefile
@@ -4,4 +4,4 @@ OUTPUT = fw-serial
 TRTL ?= ../../../
 TRTL_SW = $(TRTL)/software

-include $(TRTL_SW)/rt/Makefile
+include $(TRTL_SW)/firmware/Makefile
--- a/tests/firmware/sim-verif/Makefile
+++ b/tests/firmware/sim-verif/Makefile
@@ -4,4 +4,4 @@ OUTPUT = sim-verif
 TRTL ?= ../../../
 TRTL_SW = $(TRTL)/software

-include $(TRTL_SW)/rt/Makefile
+include $(TRTL_SW)/firmware/Makefile