sw:tools:proj_creator: minor improvements

Signed-off-by: Adam Wujek <adam.wujek@cern.ch>

sw:tools:proj_creator: minor improvements
Signed-off-by: Adam Wujek <adam.wujek@cern.ch>
15102fb8 · Adam Wujek · a67f7b91 · 0844fb59 · 15102fb8 · 15102fb8
Commit 15102fb8 authored May 25, 2018 by Adam Wujek 💬
7 changed files
--- a/software/tools/compare_size.sh
+++ b/software/tools/compare_size.sh
 #!/bin/bash

-#LC_ALL= CROSS_COMPILE_TARGET=/acc/local/share/ht_tools/L866/toolchains/riscv/bin/riscv32-elf- WBGEN2=~/nfs_white_rabbit/ci/build_tools/wishbone-gen/wbgen2 REPO_PARENT=`pwd` ./all.sh
+# Author: Adam Wujek, CERN 2018
+#
+# This script compares the size of produced binaries of a current commit
+# (read from a file $size_db_file), with sizes of binaries produced for previous
+# commits (read from file $size_db_file).
+
 SIZE="$CROSS_COMPILE_TARGET""size"

 if ! [ -n "$size_info_file" ]; then
@@ -70,7 +75,7 @@ if [ "$GIT_HASH_CUR" = "$GIT_HASH_MASTER" ]; then
    exit 0
 fi

-#echo "Read size info file"
+# Read size info file
 while read git_hash text data bss dec hex filename
 do
    if [ "$git_hash" = "$GIT_HASH_CUR" ]; then
@@ -78,7 +83,7 @@ do
    fi
 done < "$size_info_file"

-#echo "Read size db file"
+# Read size db file
 while read git_hash text data bss dec hex filename
 do
    #echo "$git_hash $filename $dec"
@@ -99,7 +104,7 @@ do
 done


-#print header
+# print header
 for i in "${!curr_size_array[@]}"
 do
    echo -n "+--"

--- a/software/tools/trtl-project-creator/templates/software/.gitignore
+++ b/software/tools/trtl-project-creator/templates/software/.gitignore
@@ -19,3 +19,4 @@ GPATH
 *.aux
 .depend
 build/
+.config
--- a/software/tools/trtl-project-creator/templates/software/firmware/Makefile
+++ b/software/tools/trtl-project-creator/templates/software/firmware/Makefile
@@ -2,15 +2,21 @@
 DIRS := fw-01


-all clean modules install modules_install: $(DIRS)
+all clean cleanall modules install modules_install: $(DIRS)

 clean: TARGET = clean
+cleanall: TARGET = cleanall
 modules: TARGET = modules
 install: TARGET = install
 modules_install: TARGET = modules_install

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

-.PHONY: all clean modules install modules_install
+$(DOT-CONFIGS):
+	$(MAKE) -C $(@D) defconfig
+
+.PHONY: all clean cleanall modules install modules_install
 .PHONY: $(DIRS)
--- a/software/tools/trtl-project-creator/templates/software/firmware/fw-01/.config
+++ b/software/tools/trtl-project-creator/templates/software/firmware/fw-01/.config
-#
-# Automatically generated file; DO NOT EDIT.
-#
-
-#
-# Project specific configuration
-#
-CONFIG_FPGA_APPLICATION_ID=0
-CONFIG_RT_APPLICATION_ID=0
-
-#
-# Mock Turtle configuration
-#
-
-#
-# Mock Turtle framework configuration
-#
-CONFIG_MOCKTURTLE_FRAMEWORK_ENABLE=y
-CONFIG_MOCKTURTLE_FRAMEWORK_ACTION_ENABLE=y
-CONFIG_MOCKTURTLE_FRAMEWORK_PING_ENABLE=y
-CONFIG_MOCKTURTLE_FRAMEWORK_VERSION_ENABLE=y
-# CONFIG_MOCKTURTLE_FRAMEWORK_DEBUG_ENABLE is not set
-# CONFIG_MOCKTURTLE_FRAMEWORK_VARIABLE_ENABLE is not set
-# CONFIG_MOCKTURTLE_FRAMEWORK_BUFFER_ENABLE is not set
-# CONFIG_MOCKTURTLE_FRAMEWORK_VALUE_SEND_ENABLE is not set
-# CONFIG_MOCKTURTLE_FRAMEWORK_BUFFER_SEND_ENABLE is not set
-
-#
-# Mock Turtle library configuration
-#
-# CONFIG_MOCKTURTLE_LIBRARY_PRINT_ENABLE is not set
--- a/software/tools/trtl-project-creator/templates/software/firmware/fw-01/Kconfig
+++ b/software/tools/trtl-project-creator/templates/software/firmware/fw-01/Kconfig

-mainmenu "alarm_clock demo configuration"
+mainmenu "{{name}} configuration"

 comment "Project specific configuration"


--- a/software/tools/trtl-project-creator/templates/software/firmware/fw-01/configs/mt_defconfig
+++ b/software/tools/trtl-project-creator/templates/software/firmware/fw-01/configs/mt_defconfig
 #
 # Automatically generated file; DO NOT EDIT.
+# {{name}} configuration
 #

 #
@@ -17,11 +18,10 @@ CONFIG_RT_APPLICATION_ID=0
 #
 CONFIG_MOCKTURTLE_FRAMEWORK_ENABLE=y
 CONFIG_MOCKTURTLE_FRAMEWORK_ACTION_ENABLE=y
-CONFIG_MOCKTURTLE_FRAMEWORK_PING_ENABLE=y
-CONFIG_MOCKTURTLE_FRAMEWORK_VERSION_ENABLE=y
-# CONFIG_MOCKTURTLE_FRAMEWORK_DEBUG_ENABLE is not set
 # CONFIG_MOCKTURTLE_FRAMEWORK_VARIABLE_ENABLE is not set
 # CONFIG_MOCKTURTLE_FRAMEWORK_BUFFER_ENABLE is not set
+CONFIG_MOCKTURTLE_FRAMEWORK_PING_ENABLE=y
+CONFIG_MOCKTURTLE_FRAMEWORK_VERSION_ENABLE=y
 # CONFIG_MOCKTURTLE_FRAMEWORK_VALUE_SEND_ENABLE is not set
 # CONFIG_MOCKTURTLE_FRAMEWORK_BUFFER_SEND_ENABLE is not set


--- a/software/tools/trtl-project-creator/trtl-project-creator
+++ b/software/tools/trtl-project-creator/trtl-project-creator
@@ -73,7 +73,7 @@ def tpc_apply_value_to_template(directory, table):
    """It applys the values to the template files
    """

-    env = jinja2.Environment(loader=jinja2.FileSystemLoader(directory))
+    env = jinja2.Environment(loader=jinja2.FileSystemLoader(directory),keep_trailing_newline=True)

    # Adjust content and create new file
    for tmpl in ["CHANGELOG",
@@ -84,6 +84,8 @@ def tpc_apply_value_to_template(directory, table):
                 "software/lib/Makefile",
                 "software/firmware/Makefile",
                 "software/firmware/fw-01/Makefile",
+                 "software/firmware/fw-01/Kconfig",
+                 "software/firmware/fw-01/configs/mt_defconfig",
                 "doc/Makefile",
                 "doc/doxygen-project-config",
                 "doc/img/Makefile",
@@ -146,4 +148,4 @@ if __name__ == "__main__":
    if args.git:
        tpc_git_init(dst_dir)

-    print("An empty Mock Turtle project has been created at \"%s\"") % dst_dir
+    print("An empty Mock Turtle project has been created at \"" + dst_dir + "\"")