summaryrefslogtreecommitdiffstats
path: root/software
diff options
context:
space:
mode:
authorJames <james.mckenzie@citrix.com>2013-10-10 11:40:39 +0100
committerJames <james.mckenzie@citrix.com>2013-10-10 11:40:39 +0100
commit4b7ba2f7366194608aac59b47d0f3c7cd9f21fb1 (patch)
tree0a7bb29847dd16cae644be4893039e577c106964 /software
parentd32c5f6d4713b445ee9f17df51abb25211ee52d6 (diff)
downloadpong-4b7ba2f7366194608aac59b47d0f3c7cd9f21fb1.tar.gz
pong-4b7ba2f7366194608aac59b47d0f3c7cd9f21fb1.tar.bz2
pong-4b7ba2f7366194608aac59b47d0f3c7cd9f21fb1.zip
remove-path
Diffstat (limited to 'software')
-rw-r--r--software/pong3/.cproject51
-rw-r--r--software/pong3/Makefile8
-rw-r--r--software/pong3/Nios II/makefile58
-rw-r--r--software/pong3/Nios II/objects.mk8
-rw-r--r--software/pong3/Nios II/sources.mk27
-rw-r--r--software/pong3/Nios II/subdir.mk41
-rwxr-xr-xsoftware/pong3/create-this-app16
-rw-r--r--software/pong3/readme.txt37
-rw-r--r--software/pong3_bsp/.cproject48
-rw-r--r--software/pong3_bsp/Makefile2
-rwxr-xr-xsoftware/pong3_bsp/create-this-bsp4
-rw-r--r--software/pong3_bsp/settings.bsp12
12 files changed, 81 insertions, 231 deletions
diff --git a/software/pong3/.cproject b/software/pong3/.cproject
index ff66346..ae6d1bc 100644
--- a/software/pong3/.cproject
+++ b/software/pong3/.cproject
@@ -3,19 +3,19 @@
<cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
<storageModule moduleId="org.eclipse.cdt.core.settings">
- <buildSystem id="preference.org.eclipse.cdt.managedbuilder.core.configurationDataProvider.598746873">
- <storageModule id="preference.org.eclipse.cdt.managedbuilder.core.configurationDataProvider.598746873" moduleId="org.eclipse.cdt.core.settings"/>
+ <buildSystem id="preference.org.eclipse.cdt.managedbuilder.core.configurationDataProvider.1609840763">
+ <storageModule id="preference.org.eclipse.cdt.managedbuilder.core.configurationDataProvider.1609840763" moduleId="org.eclipse.cdt.core.settings"/>
</buildSystem>
- <cconfiguration id="preference.org.eclipse.cdt.managedbuilder.core.configurationDataProvider.598746873">
+ <cconfiguration id="preference.org.eclipse.cdt.managedbuilder.core.configurationDataProvider.1609840763">
<storageModule moduleId="cdtBuildSystem" version="4.0.0">
- <configuration buildProperties="" description="" id="preference.org.eclipse.cdt.managedbuilder.core.configurationDataProvider.598746873" name="Nios II" parent="org.eclipse.cdt.build.core.prefbase.cfg">
- <folderInfo id="preference.org.eclipse.cdt.managedbuilder.core.configurationDataProvider.598746873." name="/" resourcePath="">
- <toolChain id="altera.nios2.linux.gcc4.720274351" name="Linux Nios II GCC4" superClass="altera.nios2.linux.gcc4">
- <targetPlatform id="altera.nios2.linux.gcc4.93770897" name="Nios II" superClass="altera.nios2.linux.gcc4"/>
- <builder buildPath="${workspace_loc://pong3}" id="cdt.managedbuild.target.gnu.builder.base.1970365285" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" superClass="cdt.managedbuild.target.gnu.builder.base"/>
- <tool id="cdt.managedbuild.tool.gnu.archiver.base.222430714" name="GCC Archiver" superClass="cdt.managedbuild.tool.gnu.archiver.base"/>
- <tool id="cdt.managedbuild.tool.gnu.cpp.compiler.base.534878258" name="GCC C++ Compiler" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.base">
- <option id="gnu.cpp.compiler.option.preprocessor.undef.1878126377" name="Undefined symbols (-U)" superClass="gnu.cpp.compiler.option.preprocessor.undef" valueType="undefDefinedSymbols">
+ <configuration buildProperties="" description="" id="preference.org.eclipse.cdt.managedbuilder.core.configurationDataProvider.1609840763" name="Nios II" parent="org.eclipse.cdt.build.core.prefbase.cfg">
+ <folderInfo id="preference.org.eclipse.cdt.managedbuilder.core.configurationDataProvider.1609840763." name="/" resourcePath="">
+ <toolChain id="altera.nios2.linux.gcc4.1592970977" name="Linux Nios II GCC4" superClass="altera.nios2.linux.gcc4">
+ <targetPlatform id="altera.nios2.linux.gcc4.988746646" name="Nios II" superClass="altera.nios2.linux.gcc4"/>
+ <builder buildPath="${workspace_loc://pong3}" id="cdt.managedbuild.target.gnu.builder.base.142418973" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" superClass="cdt.managedbuild.target.gnu.builder.base"/>
+ <tool id="cdt.managedbuild.tool.gnu.archiver.base.1625897181" name="GCC Archiver" superClass="cdt.managedbuild.tool.gnu.archiver.base"/>
+ <tool id="cdt.managedbuild.tool.gnu.cpp.compiler.base.1933293821" name="GCC C++ Compiler" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.base">
+ <option id="gnu.cpp.compiler.option.preprocessor.undef.710001009" name="Undefined symbols (-U)" superClass="gnu.cpp.compiler.option.preprocessor.undef" valueType="undefDefinedSymbols">
<listOptionValue builtIn="false" value="__FLT_EVAL_METHOD__"/>
<listOptionValue builtIn="false" value="__FLT_EPSILON__"/>
<listOptionValue builtIn="false" value="__DEC64_MANT_DIG__"/>
@@ -151,10 +151,10 @@
<listOptionValue builtIn="false" value="__CHAR16_TYPE__"/>
<listOptionValue builtIn="false" value="__cplusplus"/>
</option>
- <inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.523703832" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/>
+ <inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.579269023" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/>
</tool>
- <tool id="cdt.managedbuild.tool.gnu.c.compiler.base.26662476" name="GCC C Compiler" superClass="cdt.managedbuild.tool.gnu.c.compiler.base">
- <option id="gnu.c.compiler.option.preprocessor.undef.symbol.1827195407" name="Undefined symbols (-U)" superClass="gnu.c.compiler.option.preprocessor.undef.symbol" valueType="undefDefinedSymbols">
+ <tool id="cdt.managedbuild.tool.gnu.c.compiler.base.1403439131" name="GCC C Compiler" superClass="cdt.managedbuild.tool.gnu.c.compiler.base">
+ <option id="gnu.c.compiler.option.preprocessor.undef.symbol.1842834456" name="Undefined symbols (-U)" superClass="gnu.c.compiler.option.preprocessor.undef.symbol" valueType="undefDefinedSymbols">
<listOptionValue builtIn="false" value="__FLT_EVAL_METHOD__"/>
<listOptionValue builtIn="false" value="__FLT_EPSILON__"/>
<listOptionValue builtIn="false" value="__DEC64_MANT_DIG__"/>
@@ -282,23 +282,23 @@
<listOptionValue builtIn="false" value="unix"/>
<listOptionValue builtIn="false" value="__CHAR16_TYPE__"/>
</option>
- <inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.45571244" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
+ <inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.1504475877" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
</tool>
- <tool id="cdt.managedbuild.tool.gnu.c.linker.base.1255015602" name="GCC C Linker" superClass="cdt.managedbuild.tool.gnu.c.linker.base"/>
- <tool id="cdt.managedbuild.tool.gnu.cpp.linker.base.216021106" name="GCC C++ Linker" superClass="cdt.managedbuild.tool.gnu.cpp.linker.base">
- <inputType id="cdt.managedbuild.tool.gnu.cpp.linker.input.238307299" superClass="cdt.managedbuild.tool.gnu.cpp.linker.input">
+ <tool id="cdt.managedbuild.tool.gnu.c.linker.base.537533455" name="GCC C Linker" superClass="cdt.managedbuild.tool.gnu.c.linker.base"/>
+ <tool id="cdt.managedbuild.tool.gnu.cpp.linker.base.230683032" name="GCC C++ Linker" superClass="cdt.managedbuild.tool.gnu.cpp.linker.base">
+ <inputType id="cdt.managedbuild.tool.gnu.cpp.linker.input.1562487580" superClass="cdt.managedbuild.tool.gnu.cpp.linker.input">
<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
<additionalInput kind="additionalinput" paths="$(LIBS)"/>
</inputType>
</tool>
- <tool id="cdt.managedbuild.tool.gnu.assembler.base.140659789" name="GCC Assembler" superClass="cdt.managedbuild.tool.gnu.assembler.base">
- <inputType id="cdt.managedbuild.tool.gnu.assembler.input.1301015688" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
+ <tool id="cdt.managedbuild.tool.gnu.assembler.base.664604318" name="GCC Assembler" superClass="cdt.managedbuild.tool.gnu.assembler.base">
+ <inputType id="cdt.managedbuild.tool.gnu.assembler.input.455490736" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
</tool>
</toolChain>
</folderInfo>
</configuration>
</storageModule>
- <storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="preference.org.eclipse.cdt.managedbuilder.core.configurationDataProvider.598746873" moduleId="org.eclipse.cdt.core.settings" name="Nios II">
+ <storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="preference.org.eclipse.cdt.managedbuilder.core.configurationDataProvider.1609840763" moduleId="org.eclipse.cdt.core.settings" name="Nios II">
<externalSettings/>
<extensions>
<extension id="org.eclipse.cdt.core.GNU_ELF" point="org.eclipse.cdt.core.BinaryParser"/>
@@ -313,11 +313,11 @@
</cconfiguration>
</storageModule>
<storageModule moduleId="cdtBuildSystem" version="4.0.0">
- <project id="pong3.null.501539971" name="pong3"/>
+ <project id="pong3.null.495750362" name="pong3"/>
</storageModule>
<storageModule moduleId="scannerConfiguration">
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
- <scannerConfigBuildInfo instanceId="preference.org.eclipse.cdt.managedbuilder.core.configurationDataProvider.598746873;preference.org.eclipse.cdt.managedbuilder.core.configurationDataProvider.598746873.;cdt.managedbuild.tool.gnu.cpp.compiler.base.534878258;cdt.managedbuild.tool.gnu.cpp.compiler.input.523703832">
+ <scannerConfigBuildInfo instanceId="preference.org.eclipse.cdt.managedbuilder.core.configurationDataProvider.1609840763;preference.org.eclipse.cdt.managedbuilder.core.configurationDataProvider.1609840763.;cdt.managedbuild.tool.gnu.cpp.compiler.base.1933293821;cdt.managedbuild.tool.gnu.cpp.compiler.input.579269023">
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP"/>
<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP">
<buildOutputProvider>
@@ -330,7 +330,7 @@
</scannerInfoProvider>
</profile>
</scannerConfigBuildInfo>
- <scannerConfigBuildInfo instanceId="preference.org.eclipse.cdt.managedbuilder.core.configurationDataProvider.598746873;preference.org.eclipse.cdt.managedbuilder.core.configurationDataProvider.598746873.;cdt.managedbuild.tool.gnu.c.compiler.base.26662476;cdt.managedbuild.tool.gnu.c.compiler.input.45571244">
+ <scannerConfigBuildInfo instanceId="preference.org.eclipse.cdt.managedbuilder.core.configurationDataProvider.1609840763;preference.org.eclipse.cdt.managedbuilder.core.configurationDataProvider.1609840763.;cdt.managedbuild.tool.gnu.c.compiler.base.1403439131;cdt.managedbuild.tool.gnu.c.compiler.input.1504475877">
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC"/>
<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC">
<buildOutputProvider>
@@ -372,7 +372,4 @@
</target>
</buildTargets>
</storageModule>
- <storageModule moduleId="refreshScope" versionNumber="1">
- <resource resourceType="PROJECT" workspacePath="/pong3"/>
- </storageModule>
</cproject>
diff --git a/software/pong3/Makefile b/software/pong3/Makefile
index 1f3722c..0aeadd9 100644
--- a/software/pong3/Makefile
+++ b/software/pong3/Makefile
@@ -142,7 +142,9 @@ ACDS_VERSION := 13.0sp1
ELF := pong3.elf
# Paths to C, C++, and assembly source files.
-C_SRCS := pong3.c hello_led.c DM9000A.C
+C_SRCS += pong3.c
+C_SRCS += hello_led.c
+C_SRCS += DM9000A.C
CXX_SRCS :=
ASM_SRCS :=
@@ -177,7 +179,7 @@ CRT0 :=
SYS_LIB :=
# Define path to the root of the BSP.
-BSP_ROOT_DIR := /root/projects/pong3/software/pong3_bsp/
+BSP_ROOT_DIR := ../pong3_bsp/
# List of application specific include directories, library directories and library names
APP_INCLUDE_DIRS :=
@@ -188,7 +190,7 @@ APP_LIBRARY_NAMES :=
BUILD_PRE_PROCESS :=
BUILD_POST_PROCESS :=
-QUARTUS_PROJECT_DIR := /root/projects/pong3/hardware/
+QUARTUS_PROJECT_DIR := ../../
#END GENERATED
diff --git a/software/pong3/Nios II/makefile b/software/pong3/Nios II/makefile
deleted file mode 100644
index 32daa76..0000000
--- a/software/pong3/Nios II/makefile
+++ /dev/null
@@ -1,58 +0,0 @@
-################################################################################
-# Automatically-generated file. Do not edit!
-################################################################################
-
--include ../makefile.init
-
-RM := rm
-
-# All of the sources participating in the build are defined here
--include sources.mk
--include subdir.mk
--include objects.mk
-
-ifneq ($(MAKECMDGOALS),clean)
-ifneq ($(strip $(C++_DEPS)),)
--include $(C++_DEPS)
-endif
-ifneq ($(strip $(C_DEPS)),)
--include $(C_DEPS)
-endif
-ifneq ($(strip $(CC_DEPS)),)
--include $(CC_DEPS)
-endif
-ifneq ($(strip $(CPP_DEPS)),)
--include $(CPP_DEPS)
-endif
-ifneq ($(strip $(CXX_DEPS)),)
--include $(CXX_DEPS)
-endif
-ifneq ($(strip $(C_UPPER_DEPS)),)
--include $(C_UPPER_DEPS)
-endif
-endif
-
--include ../makefile.defs
-
-# Add inputs and outputs from these tool invocations to the build variables
-
-# All Target
-all:
-
-# Tool invocations
-: $(OBJS) $(USER_OBJS)
- @echo 'Building target: $@'
- @echo 'Invoking: GCC C++ Linker'
- g++ -o $(OBJS) $(USER_OBJS) $(LIBS)
- @echo 'Finished building target: $@'
- @echo ' '
-
-# Other Targets
-clean:
- -$(RM) $(OBJS)$(C++_DEPS)$(C_DEPS)$(CC_DEPS)$(CPP_DEPS)$(EXECUTABLES)$(CXX_DEPS)$(C_UPPER_DEPS)
- -@echo ' '
-
-.PHONY: all clean dependents
-.SECONDARY:
-
--include ../makefile.targets
diff --git a/software/pong3/Nios II/objects.mk b/software/pong3/Nios II/objects.mk
deleted file mode 100644
index 742c2da..0000000
--- a/software/pong3/Nios II/objects.mk
+++ /dev/null
@@ -1,8 +0,0 @@
-################################################################################
-# Automatically-generated file. Do not edit!
-################################################################################
-
-USER_OBJS :=
-
-LIBS :=
-
diff --git a/software/pong3/Nios II/sources.mk b/software/pong3/Nios II/sources.mk
deleted file mode 100644
index 5b37ead..0000000
--- a/software/pong3/Nios II/sources.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-################################################################################
-# Automatically-generated file. Do not edit!
-################################################################################
-
-O_SRCS :=
-CPP_SRCS :=
-C_UPPER_SRCS :=
-C_SRCS :=
-S_UPPER_SRCS :=
-OBJ_SRCS :=
-ASM_SRCS :=
-CXX_SRCS :=
-C++_SRCS :=
-CC_SRCS :=
-OBJS :=
-C++_DEPS :=
-C_DEPS :=
-CC_DEPS :=
-CPP_DEPS :=
-EXECUTABLES :=
-CXX_DEPS :=
-C_UPPER_DEPS :=
-
-# Every subdirectory with source files must be described here
-SUBDIRS := \
-. \
-
diff --git a/software/pong3/Nios II/subdir.mk b/software/pong3/Nios II/subdir.mk
deleted file mode 100644
index 813f2c3..0000000
--- a/software/pong3/Nios II/subdir.mk
+++ /dev/null
@@ -1,41 +0,0 @@
-################################################################################
-# Automatically-generated file. Do not edit!
-################################################################################
-
-# Add inputs and outputs from these tool invocations to the build variables
-C_UPPER_SRCS += \
-../DM9000A.C
-
-C_SRCS += \
-../hello_led.c \
-../pong3.c
-
-OBJS += \
-./DM9000A.o \
-./hello_led.o \
-./pong3.o
-
-C_DEPS += \
-./hello_led.d \
-./pong3.d
-
-C_UPPER_DEPS += \
-./DM9000A.d
-
-
-# Each subdirectory must supply rules for building sources it contributes
-%.o: ../%.C
- @echo 'Building file: $<'
- @echo 'Invoking: GCC C++ Compiler'
- g++ -U__FLT_EVAL_METHOD__ -U__FLT_EPSILON__ -U__DEC64_MANT_DIG__ -U__FLT_MAX_EXP__ -U__DBL_MIN__ -U__LDBL_EPSILON__ -U__DEC64_MIN__ -U__SCHAR_MAX__ -U__DEC128_MANT_DIG__ -U__DBL_MIN_10_EXP__ -U__unix__ -U__DBL_DENORM_MIN__ -U__REGISTER_PREFIX__ -U__SHRT_MAX__ -U__DBL_HAS_DENORM__ -U__SIZEOF_WCHAR_T__ -U__SIZEOF_PTRDIFF_T__ -U__DEC32_MAX__ -U__linux__ -U__SIZEOF_DOUBLE__ -U__LDBL_HAS_QUIET_NAN__ -U__FLT_MIN_EXP__ -U__LDBL_MANT_DIG__ -U__DEC32_EPSILON__ -U__FLT_DENORM_MIN__ -U__CHAR32_TYPE__ -U__LDBL_DIG__ -U__ELF__ -U__DEC128_MAX__ -U__DEC32_MIN_EXP__ -U__LDBL_DENORM_MIN__ -U__GCC_HAVE_SYNC_COMPARE_AND_SWAP_8 -Ui386 -U_GNU_SOURCE -U__FLT_MIN_10_EXP__ -U__WCHAR_MAX__ -U__LDBL_HAS_DENORM__ -U__GNUC_PATCHLEVEL__ -U__DEC32_SUBNORMAL_MIN__ -U__GXX_ABI_VERSION -U__SIZEOF_POINTER__ -U__DBL_MIN_EXP__ -U__FLT_MAX_10_EXP__ -U__GNUC_RH_RELEASE__ -U__LDBL_HAS_INFINITY__ -U__DEC64_MIN_EXP__ -U__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4 -U__SIZEOF_LONG_DOUBLE__ -U__GCC_HAVE_SYNC_COMPARE_AND_SWAP_1 -U__DEC32_MIN__ -U__GCC_HAVE_SYNC_COMPARE_AND_SWAP_2 -U__EXCEPTIONS -U__LDBL_MIN_10_EXP__ -U__i386 -U__SIZEOF_LONG_LONG__ -U__DEPRECATED -U__DEC64_MAX_EXP__ -U__FLT_MIN__ -U__DBL_EPSILON__ -U__GXX_RTTI -U__LDBL_MAX_EXP__ -U__DEC128_MAX_EXP__ -U__SIZEOF_SIZE_T__ -U__DBL_DIG__ -U__FLT_MANT_DIG__ -U__FLT_RADIX__ -U__GNUC_MINOR__ -U__DEC64_MAX__ -U__BIGGEST_ALIGNMENT__ -U__gnu_linux__ -U__INTMAX_TYPE__ -U__FLT_DIG__ -U__LDBL_MIN_EXP__ -U__DECIMAL_BID_FORMAT__ -U__pentiumpro__ -U__i686 -U__INT_MAX__ -U__DEC64_EPSILON__ -U__LONG_LONG_MAX__ -U__DBL_HAS_INFINITY__ -U__FLT_HAS_QUIET_NAN__ -U__DBL_MAX_10_EXP__ -U__FLT_HAS_DENORM__ -U__STDC__ -U__LDBL_MIN__ -U__NO_INLINE__ -U__DEC128_EPSILON__ -U__GNUC__ -U__SIZEOF_FLOAT__ -U__INTMAX_MAX__ -U__DEC32_MAX_EXP__ -U__unix -U__VERSION__ -U__DEC128_MIN_EXP__ -U__SIZEOF_WINT_T__ -U__SIZEOF_INT__ -U__USER_LABEL_PREFIX__ -U__LONG_MAX__ -U__pentiumpro -U__PTRDIFF_TYPE__ -U__CHAR_BIT__ -U__i386__ -U__DEC128_SUBNORMAL_MIN__ -U__DBL_HAS_QUIET_NAN__ -U__SIZEOF_SHORT__ -U__DBL_MAX_EXP__ -U__WINT_TYPE__ -U__DEC_EVAL_METHOD__ -U__DEC64_SUBNORMAL_MIN__ -U__DBL_MANT_DIG__ -U__FLT_MAX__ -U__linux -U__GNUC_GNU_INLINE__ -U__DEC128_MIN__ -U__SIZE_TYPE__ -U__FLT_HAS_INFINITY__ -U__DEC32_MANT_DIG__ -U__GCC_HAVE_DWARF2_CFI_ASM -U__STDC_HOSTED__ -Ulinux -U__DECIMAL_DIG__ -U__LDBL_MAX_10_EXP__ -U__GXX_WEAK__ -U__DBL_MAX__ -U__i686__ -U__SIZEOF_LONG__ -U__UINTMAX_TYPE__ -U__LDBL_MAX__ -U__FINITE_MATH_ONLY__ -U__WCHAR_TYPE__ -U__GNUG__ -Uunix -U__CHAR16_TYPE__ -U__cplusplus -O2 -g -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o "$@" "$<"
- @echo 'Finished building: $<'
- @echo ' '
-
-%.o: ../%.c
- @echo 'Building file: $<'
- @echo 'Invoking: GCC C Compiler'
- gcc -U__FLT_EVAL_METHOD__ -U__FLT_EPSILON__ -U__DEC64_MANT_DIG__ -U__FLT_MAX_EXP__ -U__DBL_MIN__ -U__LDBL_EPSILON__ -U__DEC64_MIN__ -U__SCHAR_MAX__ -U__DEC128_MANT_DIG__ -U__DBL_MIN_10_EXP__ -U__unix__ -U__DBL_DENORM_MIN__ -U__REGISTER_PREFIX__ -U__SHRT_MAX__ -U__DBL_HAS_DENORM__ -U__SIZEOF_WCHAR_T__ -U__SIZEOF_PTRDIFF_T__ -U__DEC32_MAX__ -U__linux__ -U__SIZEOF_DOUBLE__ -U__LDBL_HAS_QUIET_NAN__ -U__FLT_MIN_EXP__ -U__LDBL_MANT_DIG__ -U__DEC32_EPSILON__ -U__FLT_DENORM_MIN__ -U__CHAR32_TYPE__ -U__LDBL_DIG__ -U__ELF__ -U__DEC32_MIN_EXP__ -U__DEC128_MAX__ -U__LDBL_DENORM_MIN__ -U__GCC_HAVE_SYNC_COMPARE_AND_SWAP_8 -Ui386 -U__FLT_MIN_10_EXP__ -U__WCHAR_MAX__ -U__LDBL_HAS_DENORM__ -U__GNUC_PATCHLEVEL__ -U__DEC32_SUBNORMAL_MIN__ -U__GXX_ABI_VERSION -U__SIZEOF_POINTER__ -U__DBL_MIN_EXP__ -U__LDBL_HAS_INFINITY__ -U__GNUC_RH_RELEASE__ -U__FLT_MAX_10_EXP__ -U__DEC64_MIN_EXP__ -U__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4 -U__GCC_HAVE_SYNC_COMPARE_AND_SWAP_1 -U__SIZEOF_LONG_DOUBLE__ -U__DEC32_MIN__ -U__GCC_HAVE_SYNC_COMPARE_AND_SWAP_2 -U__LDBL_MIN_10_EXP__ -U__i386 -U__SIZEOF_LONG_LONG__ -U__DEC64_MAX_EXP__ -U__FLT_MIN__ -U__DBL_EPSILON__ -U__LDBL_MAX_EXP__ -U__DEC128_MAX_EXP__ -U__SIZEOF_SIZE_T__ -U__DBL_DIG__ -U__FLT_MANT_DIG__ -U__GNUC_MINOR__ -U__FLT_RADIX__ -U__DEC64_MAX__ -U__BIGGEST_ALIGNMENT__ -U__gnu_linux__ -U__INTMAX_TYPE__ -U__FLT_DIG__ -U__LDBL_MIN_EXP__ -U__DECIMAL_BID_FORMAT__ -U__pentiumpro__ -U__i686 -U__INT_MAX__ -U__DEC64_EPSILON__ -U__LONG_LONG_MAX__ -U__DBL_HAS_INFINITY__ -U__FLT_HAS_QUIET_NAN__ -U__DBL_MAX_10_EXP__ -U__STDC__ -U__FLT_HAS_DENORM__ -U__LDBL_MIN__ -U__NO_INLINE__ -U__DEC128_EPSILON__ -U__GNUC__ -U__SIZEOF_FLOAT__ -U__INTMAX_MAX__ -U__DEC32_MAX_EXP__ -U__unix -U__VERSION__ -U__DEC128_MIN_EXP__ -U__SIZEOF_WINT_T__ -U__USER_LABEL_PREFIX__ -U__SIZEOF_INT__ -U__LONG_MAX__ -U__pentiumpro -U__PTRDIFF_TYPE__ -U__i386__ -U__CHAR_BIT__ -U__DEC128_SUBNORMAL_MIN__ -U__DBL_HAS_QUIET_NAN__ -U__SIZEOF_SHORT__ -U__DBL_MAX_EXP__ -U__WINT_TYPE__ -U__DEC_EVAL_METHOD__ -U__DEC64_SUBNORMAL_MIN__ -U__DBL_MANT_DIG__ -U__FLT_MAX__ -U__linux -U__GNUC_GNU_INLINE__ -U__DEC128_MIN__ -U__SIZE_TYPE__ -U__FLT_HAS_INFINITY__ -U__DEC32_MANT_DIG__ -U__STDC_HOSTED__ -Ulinux -U__DECIMAL_DIG__ -U__LDBL_MAX_10_EXP__ -U__DBL_MAX__ -U__i686__ -U__SIZEOF_LONG__ -U__UINTMAX_TYPE__ -U__LDBL_MAX__ -U__FINITE_MATH_ONLY__ -U__WCHAR_TYPE__ -Uunix -U__CHAR16_TYPE__ -O2 -g -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o "$@" "$<"
- @echo 'Finished building: $<'
- @echo ' '
-
-
diff --git a/software/pong3/create-this-app b/software/pong3/create-this-app
index 99ab8a0..fe6b3f4 100755
--- a/software/pong3/create-this-app
+++ b/software/pong3/create-this-app
@@ -1,11 +1,11 @@
#!/bin/bash
#
-# This script creates the hello_world application in this directory.
+# This script creates the blank_project application in this directory.
-BSP_DIR=/root/projects/pong3/software/pong3_bsp/
-QUARTUS_PROJECT_DIR=/root/projects/pong3/hardware/
-NIOS2_APP_GEN_ARGS="--elf-name pong3.elf --set OBJDUMP_INCLUDE_SOURCE 1 --src-files hello_world.c"
+BSP_DIR=../pong3_bsp
+QUARTUS_PROJECT_DIR=../../
+NIOS2_APP_GEN_ARGS="--elf-name pong3.elf --no-src --set OBJDUMP_INCLUDE_SOURCE 1"
# First, check to see if $SOPC_KIT_NIOS2 environmental variable is set.
@@ -57,18 +57,18 @@ done
# Now we also need to go copy the sources for this application to the
# local directory.
-find "${SOPC_KIT_NIOS2}/examples/software/hello_world/" -name '*.c' -or -name '*.h' -or -name 'hostfs*' | xargs -i cp -L {} ./ || {
+find "${SOPC_KIT_NIOS2}/examples/software/blank_project/" -name '*.c' -or -name '*.h' -or -name 'hostfs*' | xargs -i cp -L {} ./ || {
echo "failed during copying example source files"
exit 1
}
-find "${SOPC_KIT_NIOS2}/examples/software/hello_world/" -name 'readme.txt' -or -name 'Readme.txt' | xargs -i cp -L {} ./ || {
+find "${SOPC_KIT_NIOS2}/examples/software/blank_project/" -name 'readme.txt' -or -name 'Readme.txt' | xargs -i cp -L {} ./ || {
echo "failed copying readme file"
}
-if [ -d "${SOPC_KIT_NIOS2}/examples/software/hello_world/system" ]
+if [ -d "${SOPC_KIT_NIOS2}/examples/software/blank_project/system" ]
then
- cp -RL "${SOPC_KIT_NIOS2}/examples/software/hello_world/system" . || {
+ cp -RL "${SOPC_KIT_NIOS2}/examples/software/blank_project/system" . || {
echo "failed during copying project support files"
exit 1
}
diff --git a/software/pong3/readme.txt b/software/pong3/readme.txt
index 7d0742f..57f6738 100644
--- a/software/pong3/readme.txt
+++ b/software/pong3/readme.txt
@@ -1,26 +1,11 @@
-Readme - Hello World Software Example
-
-DESCRIPTION:
-Simple program that prints "Hello from Nios II"
-
-The memory footprint of this hosted application is intended to be small (under 100 kbytes) by default
-using a standard reference deisgn.
-
-For an even smaller, reduced footprint version of this template, and an explanation of how
-to reduce the memory footprint for a given application, see the
-"small_hello_world" template.
-
-
-PERIPHERALS USED:
-This example exercises the following peripherals:
-- STDOUT device (UART or JTAG UART)
-
-SOFTWARE SOURCE FILES:
-This example includes the following software source files:
-- hello_world.c: Everyone needs a Hello World program, right?
-
-BOARD/HOST REQUIREMENTS:
-This example requires only a JTAG connection with a Nios Development board. If
-the host communication settings are changed from JTAG UART (default) to use a
-conventional UART, a serial cable between board DB-9 connector and the host is
-required.
+This template is starting point for creating a project based on your custom C code.
+It will provide you a default project to which you can add your software files. To
+add files to a project, manually copy the file into the application directory (e.g.
+using Windows Explorer), then right click on your application project and select
+refresh.
+
+You can also add files to the project using the Nios II Software Build Tools for Eclipse import function.
+Select File -> Import.
+Expand General and select File System in the Import Window and click Next.
+Identify the appropriate source and destination directories.
+Check the files you want to add and click Finish.
diff --git a/software/pong3_bsp/.cproject b/software/pong3_bsp/.cproject
index 7143698..e441cd1 100644
--- a/software/pong3_bsp/.cproject
+++ b/software/pong3_bsp/.cproject
@@ -3,19 +3,19 @@
<cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
<storageModule moduleId="org.eclipse.cdt.core.settings">
- <buildSystem id="preference.org.eclipse.cdt.managedbuilder.core.configurationDataProvider.2142518668">
- <storageModule id="preference.org.eclipse.cdt.managedbuilder.core.configurationDataProvider.2142518668" moduleId="org.eclipse.cdt.core.settings"/>
+ <buildSystem id="preference.org.eclipse.cdt.managedbuilder.core.configurationDataProvider.1952484250">
+ <storageModule id="preference.org.eclipse.cdt.managedbuilder.core.configurationDataProvider.1952484250" moduleId="org.eclipse.cdt.core.settings"/>
</buildSystem>
- <cconfiguration id="preference.org.eclipse.cdt.managedbuilder.core.configurationDataProvider.2142518668">
+ <cconfiguration id="preference.org.eclipse.cdt.managedbuilder.core.configurationDataProvider.1952484250">
<storageModule moduleId="cdtBuildSystem" version="4.0.0">
- <configuration buildProperties="" description="" id="preference.org.eclipse.cdt.managedbuilder.core.configurationDataProvider.2142518668" name="Nios II" parent="org.eclipse.cdt.build.core.prefbase.cfg">
- <folderInfo id="preference.org.eclipse.cdt.managedbuilder.core.configurationDataProvider.2142518668." name="/" resourcePath="">
- <toolChain id="altera.nios2.linux.gcc4.1030746425" name="Linux Nios II GCC4" superClass="altera.nios2.linux.gcc4">
- <targetPlatform id="altera.nios2.linux.gcc4.1533670435" name="Nios II" superClass="altera.nios2.linux.gcc4"/>
- <builder buildPath="${workspace_loc://pong3_bsp}" id="cdt.managedbuild.target.gnu.builder.base.518446427" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" superClass="cdt.managedbuild.target.gnu.builder.base"/>
- <tool id="cdt.managedbuild.tool.gnu.archiver.base.1480927458" name="GCC Archiver" superClass="cdt.managedbuild.tool.gnu.archiver.base"/>
- <tool id="cdt.managedbuild.tool.gnu.cpp.compiler.base.1551671047" name="GCC C++ Compiler" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.base">
- <option id="gnu.cpp.compiler.option.preprocessor.undef.1837047474" superClass="gnu.cpp.compiler.option.preprocessor.undef" valueType="undefDefinedSymbols">
+ <configuration buildProperties="" description="" id="preference.org.eclipse.cdt.managedbuilder.core.configurationDataProvider.1952484250" name="Nios II" parent="org.eclipse.cdt.build.core.prefbase.cfg">
+ <folderInfo id="preference.org.eclipse.cdt.managedbuilder.core.configurationDataProvider.1952484250." name="/" resourcePath="">
+ <toolChain id="altera.nios2.linux.gcc4.969570882" name="Linux Nios II GCC4" superClass="altera.nios2.linux.gcc4">
+ <targetPlatform id="altera.nios2.linux.gcc4.1644162213" name="Nios II" superClass="altera.nios2.linux.gcc4"/>
+ <builder buildPath="${workspace_loc://pong3_bsp}" id="cdt.managedbuild.target.gnu.builder.base.1453330656" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" superClass="cdt.managedbuild.target.gnu.builder.base"/>
+ <tool id="cdt.managedbuild.tool.gnu.archiver.base.808339627" name="GCC Archiver" superClass="cdt.managedbuild.tool.gnu.archiver.base"/>
+ <tool id="cdt.managedbuild.tool.gnu.cpp.compiler.base.138112948" name="GCC C++ Compiler" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.base">
+ <option id="gnu.cpp.compiler.option.preprocessor.undef.1763840519" superClass="gnu.cpp.compiler.option.preprocessor.undef" valueType="undefDefinedSymbols">
<listOptionValue builtIn="false" value="__FLT_EVAL_METHOD__"/>
<listOptionValue builtIn="false" value="__FLT_EPSILON__"/>
<listOptionValue builtIn="false" value="__DEC64_MANT_DIG__"/>
@@ -151,10 +151,10 @@
<listOptionValue builtIn="false" value="__CHAR16_TYPE__"/>
<listOptionValue builtIn="false" value="__cplusplus"/>
</option>
- <inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.1485241352" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/>
+ <inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.256968668" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/>
</tool>
- <tool id="cdt.managedbuild.tool.gnu.c.compiler.base.342189805" name="GCC C Compiler" superClass="cdt.managedbuild.tool.gnu.c.compiler.base">
- <option id="gnu.c.compiler.option.preprocessor.undef.symbol.833767536" superClass="gnu.c.compiler.option.preprocessor.undef.symbol" valueType="undefDefinedSymbols">
+ <tool id="cdt.managedbuild.tool.gnu.c.compiler.base.1593645278" name="GCC C Compiler" superClass="cdt.managedbuild.tool.gnu.c.compiler.base">
+ <option id="gnu.c.compiler.option.preprocessor.undef.symbol.1372297885" superClass="gnu.c.compiler.option.preprocessor.undef.symbol" valueType="undefDefinedSymbols">
<listOptionValue builtIn="false" value="__FLT_EVAL_METHOD__"/>
<listOptionValue builtIn="false" value="__FLT_EPSILON__"/>
<listOptionValue builtIn="false" value="__DEC64_MANT_DIG__"/>
@@ -282,23 +282,23 @@
<listOptionValue builtIn="false" value="unix"/>
<listOptionValue builtIn="false" value="__CHAR16_TYPE__"/>
</option>
- <inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.346544232" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
+ <inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.139874590" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
</tool>
- <tool id="cdt.managedbuild.tool.gnu.c.linker.base.36954766" name="GCC C Linker" superClass="cdt.managedbuild.tool.gnu.c.linker.base"/>
- <tool id="cdt.managedbuild.tool.gnu.cpp.linker.base.359128337" name="GCC C++ Linker" superClass="cdt.managedbuild.tool.gnu.cpp.linker.base">
- <inputType id="cdt.managedbuild.tool.gnu.cpp.linker.input.503804367" superClass="cdt.managedbuild.tool.gnu.cpp.linker.input">
+ <tool id="cdt.managedbuild.tool.gnu.c.linker.base.36652944" name="GCC C Linker" superClass="cdt.managedbuild.tool.gnu.c.linker.base"/>
+ <tool id="cdt.managedbuild.tool.gnu.cpp.linker.base.1390807603" name="GCC C++ Linker" superClass="cdt.managedbuild.tool.gnu.cpp.linker.base">
+ <inputType id="cdt.managedbuild.tool.gnu.cpp.linker.input.1978745604" superClass="cdt.managedbuild.tool.gnu.cpp.linker.input">
<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
<additionalInput kind="additionalinput" paths="$(LIBS)"/>
</inputType>
</tool>
- <tool id="cdt.managedbuild.tool.gnu.assembler.base.1101335296" name="GCC Assembler" superClass="cdt.managedbuild.tool.gnu.assembler.base">
- <inputType id="cdt.managedbuild.tool.gnu.assembler.input.205463206" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
+ <tool id="cdt.managedbuild.tool.gnu.assembler.base.177640405" name="GCC Assembler" superClass="cdt.managedbuild.tool.gnu.assembler.base">
+ <inputType id="cdt.managedbuild.tool.gnu.assembler.input.450088757" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
</tool>
</toolChain>
</folderInfo>
</configuration>
</storageModule>
- <storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="preference.org.eclipse.cdt.managedbuilder.core.configurationDataProvider.2142518668" moduleId="org.eclipse.cdt.core.settings" name="Nios II">
+ <storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="preference.org.eclipse.cdt.managedbuilder.core.configurationDataProvider.1952484250" moduleId="org.eclipse.cdt.core.settings" name="Nios II">
<externalSettings/>
<extensions>
<extension id="org.eclipse.cdt.core.GNU_ELF" point="org.eclipse.cdt.core.BinaryParser"/>
@@ -313,12 +313,12 @@
</cconfiguration>
</storageModule>
<storageModule moduleId="cdtBuildSystem" version="4.0.0">
- <project id="pong3_bsp.null.287222158" name="pong3_bsp"/>
+ <project id="pong3_bsp.null.1218264101" name="pong3_bsp"/>
</storageModule>
<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets"/>
<storageModule moduleId="scannerConfiguration">
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
- <scannerConfigBuildInfo instanceId="preference.org.eclipse.cdt.managedbuilder.core.configurationDataProvider.2142518668;preference.org.eclipse.cdt.managedbuilder.core.configurationDataProvider.2142518668.;cdt.managedbuild.tool.gnu.c.compiler.base.342189805;cdt.managedbuild.tool.gnu.c.compiler.input.346544232">
+ <scannerConfigBuildInfo instanceId="preference.org.eclipse.cdt.managedbuilder.core.configurationDataProvider.1952484250;preference.org.eclipse.cdt.managedbuilder.core.configurationDataProvider.1952484250.;cdt.managedbuild.tool.gnu.c.compiler.base.1593645278;cdt.managedbuild.tool.gnu.c.compiler.input.139874590">
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC"/>
<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC">
<buildOutputProvider>
@@ -331,7 +331,7 @@
</scannerInfoProvider>
</profile>
</scannerConfigBuildInfo>
- <scannerConfigBuildInfo instanceId="preference.org.eclipse.cdt.managedbuilder.core.configurationDataProvider.2142518668;preference.org.eclipse.cdt.managedbuilder.core.configurationDataProvider.2142518668.;cdt.managedbuild.tool.gnu.cpp.compiler.base.1551671047;cdt.managedbuild.tool.gnu.cpp.compiler.input.1485241352">
+ <scannerConfigBuildInfo instanceId="preference.org.eclipse.cdt.managedbuilder.core.configurationDataProvider.1952484250;preference.org.eclipse.cdt.managedbuilder.core.configurationDataProvider.1952484250.;cdt.managedbuild.tool.gnu.cpp.compiler.base.138112948;cdt.managedbuild.tool.gnu.cpp.compiler.input.256968668">
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP"/>
<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP">
<buildOutputProvider>
diff --git a/software/pong3_bsp/Makefile b/software/pong3_bsp/Makefile
index 55adf71..d40fcef 100644
--- a/software/pong3_bsp/Makefile
+++ b/software/pong3_bsp/Makefile
@@ -103,7 +103,7 @@ ACDS_VERSION := 13.0sp1
# BUILD_NUMBER: 232
SETTINGS_FILE := settings.bsp
-SOPC_FILE := /root/projects/altera/pong3/hardware/my_sys.sopcinfo
+SOPC_FILE := ../../my_sys.sopcinfo
#-------------------------------------------------------------------------------
# TOOL & COMMAND DEFINITIONS
diff --git a/software/pong3_bsp/create-this-bsp b/software/pong3_bsp/create-this-bsp
index 6359a3a..8574282 100755
--- a/software/pong3_bsp/create-this-bsp
+++ b/software/pong3_bsp/create-this-bsp
@@ -4,8 +4,8 @@
BSP_TYPE=hal
BSP_DIR=.
-SOPC_DIR=/root/projects/altera/pong3/hardware/
-SOPC_FILE=/root/projects/altera/pong3/hardware/my_sys.sopcinfo
+SOPC_DIR=../../
+SOPC_FILE=../../my_sys.sopcinfo
NIOS2_BSP_ARGS=""
CPU_NAME=
diff --git a/software/pong3_bsp/settings.bsp b/software/pong3_bsp/settings.bsp
index 770099f..9f884af 100644
--- a/software/pong3_bsp/settings.bsp
+++ b/software/pong3_bsp/settings.bsp
@@ -2,11 +2,11 @@
<sch:Settings xmlns:sch="http://www.altera.com/embeddedsw/bsp/schema">
<BspType>hal</BspType>
<BspVersion>default</BspVersion>
- <BspGeneratedTimeStamp>Oct 10, 2013 11:01:44 AM</BspGeneratedTimeStamp>
- <BspGeneratedUnixTimeStamp>1381399304153</BspGeneratedUnixTimeStamp>
- <BspGeneratedLocation>/root/projects/altera/pong3/software/pong3_bsp</BspGeneratedLocation>
- <BspSettingsFile>settings.bsp</BspSettingsFile>
- <SopcDesignFile>/root/projects/altera/pong3/hardware/my_sys.sopcinfo</SopcDesignFile>
+ <BspGeneratedTimeStamp>Oct 10, 2013 11:34:52 AM</BspGeneratedTimeStamp>
+ <BspGeneratedUnixTimeStamp>1381401292694</BspGeneratedUnixTimeStamp>
+ <BspGeneratedLocation>/home/root/projects/altera/pong3/hardware/software/pong3_bsp</BspGeneratedLocation>
+ <BspSettingsFile>./settings.bsp</BspSettingsFile>
+ <SopcDesignFile>../../my_sys.sopcinfo</SopcDesignFile>
<JdiFile>default</JdiFile>
<Cpu>nios2_qsys_0</Cpu>
<SchemaVersion>1.9</SchemaVersion>
@@ -934,4 +934,4 @@
<sectionName>.stack</sectionName>
<regionName>sdram_0</regionName>
</LinkerSection>
-</sch:Settings>
+</sch:Settings> \ No newline at end of file