summaryrefslogtreecommitdiffstatsabout
diff options
context:
space:
mode:
authorJiaojinxing <jiaojinxing1987@gmail.com>2015-05-11 06:43:26 (GMT)
committer Jiaojinxing <jiaojinxing1987@gmail.com>2015-05-11 06:43:26 (GMT)
commitb056866fdc08f8cf6351f4cd61c8dc0305f6ddeb (patch)
tree8adee98f4359b70efd738641e9ce59f9afbe39f3
parentd86ab38fe7795eb7e965f0cfd37cc2ca733e5742 (diff)
downloadbspam335x-b056866fdc08f8cf6351f4cd61c8dc0305f6ddeb.zip
bspam335x-b056866fdc08f8cf6351f4cd61c8dc0305f6ddeb.tar.gz
bspam335x-b056866fdc08f8cf6351f4cd61c8dc0305f6ddeb.tar.bz2
Add config.mk and update Makefile fix to RealCoder.
-rw-r--r--.cproject33
-rw-r--r--.gitignore2
-rw-r--r--.project6
-rw-r--r--.rcsetting5
-rw-r--r--Makefile34
-rw-r--r--config.mk16
6 files changed, 61 insertions, 35 deletions
diff --git a/.cproject b/.cproject
index 855a525..316b8ae 100644
--- a/.cproject
+++ b/.cproject
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?fileVersion 4.0.0?><cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
<storageModule moduleId="org.eclipse.cdt.core.settings">
- <cconfiguration id="com.sylixos.realcoder.toolChain.armsylixeabi.2044917939">
- <storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.sylixos.realcoder.toolChain.armsylixeabi.2044917939" moduleId="org.eclipse.cdt.core.settings" name="Default">
+ <cconfiguration id="com.sylixos.realcoder.toolChain.armsylixeabi.783133971">
+ <storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.sylixos.realcoder.toolChain.armsylixeabi.783133971" moduleId="org.eclipse.cdt.core.settings" name="Default">
<macros>
<stringMacro name="SYLIXOS_TOOLCHAIN_PREFIX" type="VALUE_TEXT" value="arm-sylixos-eabi-"/>
- <stringMacro name="SYLIXOS_BASE_PATH" type="VALUE_PATH_DIR" value="D:\workspace_bsp\base_a8"/>
+ <stringMacro name="SYLIXOS_BASE_PATH" type="VALUE_PATH_DIR" value="D:\workspace\SylixOS_Base"/>
</macros>
<externalSettings/>
<extensions>
@@ -20,30 +20,25 @@
</extensions>
</storageModule>
<storageModule moduleId="cdtBuildSystem" version="4.0.0">
- <configuration artifactName="${ProjName}" buildProperties="" description="" id="com.sylixos.realcoder.toolChain.armsylixeabi.2044917939" name="Default" parent="org.eclipse.cdt.build.core.emptycfg">
- <folderInfo id="com.sylixos.realcoder.toolChain.armsylixeabi.2044917939.230200914" name="/" resourcePath="">
- <toolChain id="com.sylixos.realcoder.toolChain.armsylixeabi.680397821" name="arm-sylixos-toolchain" superClass="com.sylixos.realcoder.toolChain.armsylixeabi">
- <targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.GNU_ELF" id="com.sylixos.realcoder.targetPlatform.armsylixoseabi.981171852" isAbstract="false" name="SylixOS TagetPlagform" osList="win32" superClass="com.sylixos.realcoder.targetPlatform.armsylixoseabi"/>
- <builder id="com.sylixos.realcoder.builder.armsylixeabi.1662223933" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="SylixOS Builder" superClass="com.sylixos.realcoder.builder.armsylixeabi"/>
- <tool id="com.sylixos.realcoder.tool.armsylixeabi.1776629329" name="arm-sylixos-eabi-gcc" superClass="com.sylixos.realcoder.tool.armsylixeabi">
- <option id="com.sylixos.realcoder.option.armsylixoseabi.include.1155626262" name="Include paths (-I)" superClass="com.sylixos.realcoder.option.armsylixoseabi.include" valueType="includePath">
+ <configuration artifactName="${ProjName}" buildProperties="" description="" id="com.sylixos.realcoder.toolChain.armsylixeabi.783133971" name="Default" parent="org.eclipse.cdt.build.core.emptycfg">
+ <folderInfo id="com.sylixos.realcoder.toolChain.armsylixeabi.783133971.2060133264" name="/" resourcePath="">
+ <toolChain id="com.sylixos.realcoder.toolChain.armsylixeabi.32415642" name="arm-sylixos-toolchain" superClass="com.sylixos.realcoder.toolChain.armsylixeabi">
+ <targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.GNU_ELF" id="com.sylixos.realcoder.targetPlatform.armsylixoseabi.1632066583" isAbstract="false" name="SylixOS TagetPlagform" osList="win32" superClass="com.sylixos.realcoder.targetPlatform.armsylixoseabi"/>
+ <builder id="com.sylixos.realcoder.builder.armsylixeabi.2147356729" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="SylixOS Builder" superClass="com.sylixos.realcoder.builder.armsylixeabi"/>
+ <tool id="com.sylixos.realcoder.tool.armsylixeabi.2123399133" name="arm-sylixos-eabi-gcc" superClass="com.sylixos.realcoder.tool.armsylixeabi">
+ <option id="com.sylixos.realcoder.option.armsylixoseabi.include.592664854" name="Include paths (-I)" superClass="com.sylixos.realcoder.option.armsylixoseabi.include" valueType="includePath">
<listOptionValue builtIn="false" value="&quot;${SYLIXOS_BASE_PATH}/libsylixos/SylixOS&quot;"/>
<listOptionValue builtIn="false" value="&quot;${SYLIXOS_BASE_PATH}/libsylixos/SylixOS/include&quot;"/>
<listOptionValue builtIn="false" value="&quot;${SYLIXOS_BASE_PATH}/libsylixos/SylixOS/include/inet&quot;"/>
<listOptionValue builtIn="false" value="&quot;D:\ZTHSOFT\arm-sylixos-toolchain/arm-sylixos-eabi/include&quot;"/>
<listOptionValue builtIn="false" value="&quot;D:\ZTHSOFT\arm-sylixos-toolchain/lib/gcc/arm-sylixos-eabi/4.9.3/include&quot;"/>
</option>
- <option id="com.sylixos.realcoder.option.armsylixoseabi.DefinedSymbols.2122107266" name="Defined symbols(-D)" superClass="com.sylixos.realcoder.option.armsylixoseabi.DefinedSymbols" valueType="definedSymbols">
+ <option id="com.sylixos.realcoder.option.armsylixoseabi.DefinedSymbols.1408416282" name="Defined symbols(-D)" superClass="com.sylixos.realcoder.option.armsylixoseabi.DefinedSymbols" valueType="definedSymbols">
<listOptionValue builtIn="false" value="__GNUC__=4"/>
<listOptionValue builtIn="false" value="SYLIXOS"/>
- <listOptionValue builtIn="false" value="DMA_MODE"/>
- <listOptionValue builtIn="false" value="gcc"/>
- <listOptionValue builtIn="false" value="am335x"/>
- <listOptionValue builtIn="false" value="LINK_STATS"/>
- <listOptionValue builtIn="false" value="ok335xs"/>
</option>
- <inputType id="com.sylixos.realcoder.inputType.armnsylixeabic.1396598415" name="SylixOS Input C" superClass="com.sylixos.realcoder.inputType.armnsylixeabic"/>
- <inputType id="com.sylixos.realcoder.inputType.armnsylixeabicpp.1230559761" name="SylixOS Input CPP" superClass="com.sylixos.realcoder.inputType.armnsylixeabicpp"/>
+ <inputType id="com.sylixos.realcoder.inputType.armnsylixeabic.231369310" name="SylixOS Input C" superClass="com.sylixos.realcoder.inputType.armnsylixeabic"/>
+ <inputType id="com.sylixos.realcoder.inputType.armnsylixeabicpp.2017416729" name="SylixOS Input CPP" superClass="com.sylixos.realcoder.inputType.armnsylixeabicpp"/>
</tool>
</toolChain>
</folderInfo>
@@ -53,7 +48,7 @@
</cconfiguration>
</storageModule>
<storageModule moduleId="cdtBuildSystem" version="4.0.0">
- <project id="bspam335x.null.904566283" name="bspam335x"/>
+ <project id="bspam335x.null.1743349296" name="bspam335x"/>
</storageModule>
<storageModule moduleId="scannerConfiguration">
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
diff --git a/.gitignore b/.gitignore
index a5c24f6..1fcac3a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,5 @@
/SylixOS/bsp/symbol.c
/Debug
/Release
+/.rcsetting
+/.settings
diff --git a/.project b/.project
index d050880..5910fbd 100644
--- a/.project
+++ b/.project
@@ -17,10 +17,16 @@
<arguments>
</arguments>
</buildCommand>
+ <buildCommand>
+ <name>com.sylixos.realcoder.SylixOSBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.cdt.core.cnature</nature>
<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
+ <nature>com.sylixos.realcoder.SylixOSProject</nature>
</natures>
</projectDescription>
diff --git a/.rcsetting b/.rcsetting
deleted file mode 100644
index e9717b8..0000000
--- a/.rcsetting
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="GB2312" standalone="no"?>
-<SylixOSSetting>
-<UploadSetting HostName="" Password="root" UserName="root"/>
-<BaseSetting BasePrjectPath="D:\workspace_bsp\base_a8"/>
-</SylixOSSetting>
diff --git a/Makefile b/Makefile
index de39d72..2a1af5c 100644
--- a/Makefile
+++ b/Makefile
@@ -5,14 +5,34 @@
#*********************************************************************************************************
#*********************************************************************************************************
-# configuration genrated by realcoder
+# include config.mk
#*********************************************************************************************************
+CONFIG_MK_EXIST = $(shell if [ -f ../config.mk ]; then echo exist; else echo notexist; fi;)
+ifeq ($(CONFIG_MK_EXIST), exist)
+include ../config.mk
+else
+CONFIG_MK_EXIST = $(shell if [ -f config.mk ]; then echo exist; else echo notexist; fi;)
+ifeq ($(CONFIG_MK_EXIST), exist)
include config.mk
+else
+CONFIG_MK_EXIST =
+endif
+endif
#*********************************************************************************************************
-# toolchain setting
+# check configure
#*********************************************************************************************************
-TOOLCHAIN_PREFIX = arm-sylixos-eabi-
+check_defined = \
+ $(foreach 1,$1,$(__check_defined))
+__check_defined = \
+ $(if $(value $1),, \
+ $(error Undefined $1$(if $(value 2), ($(strip $2)))))
+
+$(call check_defined, CONFIG_MK_EXIST, Please configure this project in RealCoder or \
+create a config.mk file!)
+$(call check_defined, SYLIXOS_BASE_PATH, SylixOS base project path)
+$(call check_defined, TOOLCHAIN_PREFIX, the prefix name of toolchain)
+$(call check_defined, DEBUG_LEVEL, debug level(debug or release))
#*********************************************************************************************************
# configure area you can set the following config to you own system
@@ -23,6 +43,9 @@ TOOLCHAIN_PREFIX = arm-sylixos-eabi-
FPUFLAGS =
CPUFLAGS = -mcpu=cortex-a8
+#*********************************************************************************************************
+# toolchain select
+#*********************************************************************************************************
CC = $(TOOLCHAIN_PREFIX)gcc
CXX = $(TOOLCHAIN_PREFIX)g++
AS = $(TOOLCHAIN_PREFIX)gcc
@@ -32,11 +55,6 @@ OC = $(TOOLCHAIN_PREFIX)objcopy
SZ = $(TOOLCHAIN_PREFIX)size
#*********************************************************************************************************
-# debug options (debug or release)
-#*********************************************************************************************************
-DEBUG_LEVEL = debug
-
-#*********************************************************************************************************
# platform, can use: evmAM335x evmskAM335x beaglebone ok335xd ok335xs ok335xs2
#*********************************************************************************************************
PLATFORM = ok335xs
diff --git a/config.mk b/config.mk
index 555ef2f..d61ed2f 100644
--- a/config.mk
+++ b/config.mk
@@ -14,11 +14,21 @@
#
# 创 建 人: RealCoder
#
-# 文件创建日期: 2015 年 04 月 19 日
+# 文件创建日期: 2015 年 05 月 11 日
#
# 描 述: 本文由RealCoder生成,用于配置Makefile功能,请勿手动修改
#*********************************************************************************************************
#*********************************************************************************************************
-# SylixOS Base Project 路径
+# SylixOS Base Project path
#*********************************************************************************************************
-SYLIXOS_BASE_PATH = D:\workspace_bsp\base_a8 \ No newline at end of file
+SYLIXOS_BASE_PATH = D:\workspace\SylixOS_Base
+
+#*********************************************************************************************************
+# Toolchain prefix
+#*********************************************************************************************************
+TOOLCHAIN_PREFIX = arm-sylixos-eabi-
+
+#*********************************************************************************************************
+# Debug options (debug or release)
+#*********************************************************************************************************
+DEBUG_LEVEL = debug \ No newline at end of file