]> rtime.felk.cvut.cz Git - pes-rpp/rpp-lib.git/commit
Merge branches 'master' and 'rm48/master'
authorMichal Sojka <sojkam1@fel.cvut.cz>
Mon, 6 Jul 2015 14:31:30 +0000 (16:31 +0200)
committerMichal Sojka <sojkam1@fel.cvut.cz>
Tue, 7 Jul 2015 09:01:49 +0000 (11:01 +0200)
commit1dc5df1a4c40ced98aa8751bc2e5df6872a67ebb
tree3daca29c732413bc453445ebf5eb5420d23b7e27
parent5f5cb285cd0a3a9bb79a72f5a91d84fff6c48ebc
parentbd0f31e2adaa80d99e699a92001c8b296e8d1af3
Merge branches 'master' and 'rm48/master'

I.e. merge RPP target with all Eaton targets.

Conflicts:
Debug/GNUmakefile
Makefile
Makefile.var
POSIX/GNUmakefile
apps/rpp-test-suite/Debug/GNUmakefile
apps/rpp-test-suite/Makefile.var
apps/rpp-test-suite/POSIX/GNUmakefile
apps/rpp-test-suite/main.c
apps/rpp-test-suite/src/_tms570_rpp/main.c
apps/rpp-test-suite/src/aout.c
apps/rpp-test-suite/src/din.c
apps/rpp-test-suite/src/hbr.c
apps/rpp-test-suite/src/lout.c
apps/rpp-test-suite/src/main.c
apps/rpp-test-suite/src/mout.c
apps/rpp-test-suite/src/sdr.c
common.mk
rpp/include/drv/_rm48_hdk/adc.h
rpp/include/drv/_tms570_rpp/adc.h
rpp/include/drv/adc.h
rpp/include/drv/drv.h
rpp/include/drv/fr_tms570.h
rpp/include/hal/_tms570_rpp/gpio_def.h
rpp/include/hal/_tms570_rpp/port_def.h
rpp/include/hal/hal.h
rpp/include/rpp/_rm48_hdk/adc.h
rpp/include/rpp/_tms570_rpp/adc.h
rpp/include/rpp/adc.h
rpp/include/rpp/rpp.h
rpp/include/sys/sys.h
rpp/src/drv/_rm48_hdk/adc.c
rpp/src/drv/_tms570_rpp/adc.c
rpp/src/drv/adc.c
rpp/src/drv/fr_tms570.c
rpp/src/hal/_tms570_rpp/gpio_def.c
rpp/src/hal/_tms570_rpp/port_def.c
rpp/src/rpp/_rm48_hdk/adc.c
rpp/src/rpp/_tms570_rpp/adc.c
rpp/src/rpp/adc.c
rpp/src/rpp/irc.c
rpp/src/sys/_rm48_hdk/ti_drv_adc.c
rpp/src/sys/_tms570_hdk/sys_startup.c
rpp/src/sys/_tms570_rpp/notification.c
rpp/src/sys/_tms570_rpp/sys_startup.c
rpp/src/sys/_tms570_rpp/ti_drv_adc.c
rpp/src/sys/sys_startup.c
rpp/src/sys/ti_drv_adc.c
31 files changed:
Makefile.var
apps/rpp-test-suite/aout.c
apps/rpp-test-suite/din.c
apps/rpp-test-suite/hbr.c
apps/rpp-test-suite/lout.c
apps/rpp-test-suite/mout.c
apps/rpp-test-suite/sdr.c
apps/rpp-test-suite/src/_tms570_rpp/main.c
build/tms570_rpp/.ccsproject
build/tms570_rpp/.cproject
build/tms570_rpp/.project
build/tms570_rpp/Debug/GNUmakefile
build/tms570_rpp/Makefile.config
build/tms570_rpp/Release/GNUmakefile
build/tms570_rpp/TMS570LS3137.ccxml
build/tms570_rpp/TMS570LS313xFlashLnk.cmd
build/tms570_rpp/TMS570LS313xSDRAMLnk.cmd
build/tms570_rpp/apps/helloworld/.ccsproject
build/tms570_rpp/apps/helloworld/.cproject
build/tms570_rpp/apps/helloworld/.gitignore
build/tms570_rpp/apps/helloworld/.project
build/tms570_rpp/apps/helloworld/Makefile
build/tms570_rpp/apps/helloworld/targetConfigs/TMS570LS3137.ccxml
build/tms570_rpp/apps/helloworld/targetConfigs/readme.txt
build/tms570_rpp/apps/rpp-test-suite/.gitignore
build/tms570_rpp/apps/rpp-test-suite/Makefile
rpp/include/drv/drv.h
rpp/include/hal/hal.h
rpp/include/rpp/rpp.h
rpp/include/sys/sys.h
rpp/src/sys/_tms570_rpp/sys_startup.c