Commit f7307a1b authored by Daniel Silveira's avatar Daniel Silveira

Removed RTEMS checkout feature

It seems unecessary to do the git checkout of RTEMS and can cause git
problems.

Also added LDFLAGS to support prints in RTEMS
parent 01155d71
......@@ -387,24 +387,15 @@ class Configuration(object):
return input_file, output_file
##
# @brief Execute POS git checkout and the\n patchit
# @brief Execute POS git checkout
# @param pos_name Name of the pos
# @return Path to the makefile template
def pos_checkout_and_patch(self, pos_name, logger):
if self.supported_pos[pos_name].git_id is not "":
logger.information(1, 'Checking out ' + pos_name + ' from GIT')
FNULL = open(os.devnull, 'w')
# git stash current files to merge ahead and patch on pos checkout
subprocess.call(['git','stash'], cwd="pos", stdout=FNULL, stderr=subprocess.STDOUT)
# git checkout call
subprocess.call(['git','checkout', self.supported_pos[pos_name].git_id], cwd="pos/" + pos_name+ "/" + pos_name, stdout=FNULL, stderr=subprocess.STDOUT)
# patch pos by doing git stash pop
subprocess.call(['git','stash', 'pop'], cwd="pos", stdout=FNULL, stderr=subprocess.STDOUT)
#def git_pos_checkout(self, pos_name, logger):
# if self.supported_pos[pos_name].git_id is not "":
# logger.information(1, 'Checking out ' + pos_name + ' from GIT')
# FNULL = open(os.devnull, 'w')
# subprocess.call(['git','checkout', self.supported_pos[pos_name].git_id], cwd="pos/" + pos_name+ "/" + pos_name, stdout=FNULL, stderr=subprocess.STDOUT)
# if self.supported_pos[pos_name].makefile is None:
# return os.path.join(air.AIR_TEMPLATES_DIRECTORY, 'pos_makefile.mako')
# return self.supported_pos[pos_name].makefile
##
# @brief Gets the Partition complete library list
......
......@@ -60,6 +60,9 @@ CPPFLAGS+=${'\\'}
-B../common/${'\\'}
${template.LibraryIncludes(partition.libraries)}\
# build LD falgs
LDFLAGS += -Wl,--gc-sections -Wl,--wrap=printf -Wl,--wrap=puts -Wl,--wrap=putchar
OBJS = $(COBJS) $(ASOBJS)
all: $(ARCH) $(PGM)
......
......@@ -32,7 +32,7 @@ kernel_compiler = dict(
CFLAGS="",
CPPFLAGS="-mcpu=leon3 -mflat -fno-builtin -nodefaultlibs -O2 -Wall",
CXXFLAGS="",
LDFLAGS="",
LDFLAGS="-Wl,--gc-sections -Wl,--wrap=printf -Wl,--wrap=puts -Wl,--wrap=putchar",
ARFLAGS="ruv"
)
......
......@@ -32,7 +32,7 @@ kernel_compiler = dict(
CFLAGS="",
CPPFLAGS="-mcpu=leon3 -mflat -fno-builtin -nodefaultlibs -O2 -Wall",
CXXFLAGS="",
LDFLAGS="",
LDFLAGS="-Wl,--gc-sections -Wl,--wrap=printf -Wl,--wrap=puts -Wl,--wrap=putchar",
ARFLAGS="ruv"
)
......@@ -46,7 +46,7 @@ kernel_compiler_no_fpu = dict(
CFLAGS="",
CPPFLAGS="-mcpu=leon3 -mflat -fno-builtin -nodefaultlibs -O2 -Wall",
CXXFLAGS="",
LDFLAGS="",
LDFLAGS="-Wl,--gc-sections -Wl,--wrap=printf -Wl,--wrap=puts -Wl,--wrap=putchar",
ARFLAGS="ruv"
)
......
......@@ -3,14 +3,13 @@
# @author pfnf
# @brief Tool to configuration a AIR OS instalation
__author__ = "pfnf,dtms"
__author__ = "pfnf"
import os
import air
import sys
import utils.templates as makoutils
import utils.terminal as terminalutils
import utils.file as fileutils
import air.configurations as air_configuration
......@@ -49,9 +48,6 @@ def Run(args, logger):
# show info
if args.info: ShowInstallInfo(logger)
#check hardcoded files to replace generated
fileutils.setHardcodedFiles()
# parse input args or prompt the user for configuration
if args.target is None:
arch, bsp, fpu_enabled = prompt_configuration(logger)
......@@ -110,8 +106,8 @@ def Run(args, logger):
pos = os_configuration.get_pos_config(pos_name)
#Git checkout of pos and patchit
os_configuration.pos_checkout_and_patch(pos_name, logger)
#Git checkout of pos
#os_configuration.git_pos_checkout(pos_name, logger)
# check if it is an alias
# if pos.alias is not None and pos_name in pos.alias:
......
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