From 887bcbbad85f2bb1a241cb295e9227d6d8c31f89 Mon Sep 17 00:00:00 2001 From: "dzzxzz@gmail.com" Date: Mon, 5 Mar 2012 01:13:30 +0000 Subject: [PATCH] update Fujistu FM3 porting git-svn-id: https://rt-thread.googlecode.com/svn/trunk@1990 bbd45198-f89e-11dd-88c7-29a3b14d5316 --- bsp/mb9bf500r/CMSIS/SConscript | 19 + bsp/{fm3 => mb9bf500r}/CMSIS/core_cm3.c | 0 bsp/{fm3 => mb9bf500r}/CMSIS/core_cm3.h | 0 bsp/{fm3 => mb9bf500r}/CMSIS/core_cmFunc.h | 0 bsp/{fm3 => mb9bf500r}/CMSIS/core_cmInstr.h | 0 bsp/{fm3 => mb9bf500r}/CMSIS/mb9bf506r.h | 0 bsp/{fm3 => mb9bf500r}/CMSIS/start_gcc.S | 0 bsp/{fm3 => mb9bf500r}/CMSIS/start_iar.S | 0 bsp/{fm3 => mb9bf500r}/CMSIS/start_rvds.S | 0 .../CMSIS/system_mb9bf50x.c | 0 .../CMSIS/system_mb9bf50x.h | 0 bsp/{fm3 => }/mb9bf500r/SConscript | 0 bsp/{fm3 => }/mb9bf500r/SConstruct | 4 +- bsp/{fm3 => }/mb9bf500r/adc.c | 0 bsp/{fm3 => }/mb9bf500r/adc.h | 0 bsp/{fm3 => }/mb9bf500r/application.c | 0 bsp/{fm3 => }/mb9bf500r/board.c | 0 bsp/{fm3 => }/mb9bf500r/board.h | 0 bsp/{fm3 => }/mb9bf500r/cpuusage.c | 0 bsp/{fm3 => }/mb9bf500r/cpuusage.h | 0 bsp/{fm3 => }/mb9bf500r/fm3_easy_kit.ewp | 170 +- bsp/{fm3 => }/mb9bf500r/fm3_easy_kit.eww | 0 bsp/{fm3 => }/mb9bf500r/fm3_rom.ld | 0 bsp/{fm3 => }/mb9bf500r/fm3_rom.sct | 0 bsp/{fm3 => }/mb9bf500r/font.h | 0 bsp/{fm3 => }/mb9bf500r/info.c | 0 bsp/{fm3 => }/mb9bf500r/key.c | 0 bsp/{fm3 => }/mb9bf500r/key.h | 0 bsp/{fm3 => }/mb9bf500r/lcd.c | 0 bsp/{fm3 => }/mb9bf500r/lcd.h | 0 bsp/{fm3 => }/mb9bf500r/led.c | 0 bsp/{fm3 => }/mb9bf500r/led.h | 0 bsp/{fm3 => }/mb9bf500r/mb9bf500r.icf | 0 bsp/{fm3 => }/mb9bf500r/project.uvopt | 84 +- bsp/{fm3 => }/mb9bf500r/project.uvproj | 50 +- bsp/{fm3 => }/mb9bf500r/rtconfig.h | 2 +- bsp/{fm3 => }/mb9bf500r/rtconfig.py | 4 +- bsp/{fm3 => }/mb9bf500r/startup.c | 0 bsp/{fm3 => mb9bf506r}/CMSIS/SConscript | 0 bsp/mb9bf506r/CMSIS/core_cm3.c | 359 + bsp/mb9bf506r/CMSIS/core_cm3.h | 1166 ++ bsp/mb9bf506r/CMSIS/core_cmFunc.h | 912 ++ bsp/mb9bf506r/CMSIS/core_cmInstr.h | 684 ++ bsp/mb9bf506r/CMSIS/mb9bf506r.h | 9739 +++++++++++++++++ bsp/mb9bf506r/CMSIS/start_gcc.S | 360 + bsp/mb9bf506r/CMSIS/start_iar.S | 363 + bsp/mb9bf506r/CMSIS/start_rvds.S | 291 + bsp/mb9bf506r/CMSIS/system_mb9bf50x.c | 111 + bsp/mb9bf506r/CMSIS/system_mb9bf50x.h | 71 + bsp/{fm3 => }/mb9bf506r/SConscript | 0 bsp/{fm3 => }/mb9bf506r/SConstruct | 4 +- bsp/{fm3 => }/mb9bf506r/application.c | 0 bsp/{fm3 => }/mb9bf506r/board.c | 128 +- bsp/{fm3 => }/mb9bf506r/board.h | 0 bsp/{fm3 => }/mb9bf506r/console.c | 0 bsp/{fm3 => }/mb9bf506r/fm3_easy_kit.ewp | 89 +- bsp/{fm3 => }/mb9bf506r/fm3_easy_kit.eww | 0 bsp/{fm3 => }/mb9bf506r/fm3_rom.ld | 0 bsp/{fm3 => }/mb9bf506r/led.c | 0 bsp/{fm3 => }/mb9bf506r/led.h | 0 bsp/{fm3 => }/mb9bf506r/mb9bf506.icf | 0 bsp/{fm3 => }/mb9bf506r/nand.c | 0 bsp/{fm3 => }/mb9bf506r/nand.h | 0 bsp/{fm3 => }/mb9bf506r/rtconfig.h | 4 +- bsp/{fm3 => }/mb9bf506r/rtconfig.py | 4 +- bsp/{fm3 => }/mb9bf506r/serial.c | 0 bsp/{fm3 => }/mb9bf506r/serial.h | 0 bsp/{fm3 => }/mb9bf506r/startup.c | 0 68 files changed, 14345 insertions(+), 273 deletions(-) create mode 100644 bsp/mb9bf500r/CMSIS/SConscript rename bsp/{fm3 => mb9bf500r}/CMSIS/core_cm3.c (100%) rename bsp/{fm3 => mb9bf500r}/CMSIS/core_cm3.h (100%) rename bsp/{fm3 => mb9bf500r}/CMSIS/core_cmFunc.h (100%) rename bsp/{fm3 => mb9bf500r}/CMSIS/core_cmInstr.h (100%) rename bsp/{fm3 => mb9bf500r}/CMSIS/mb9bf506r.h (100%) rename bsp/{fm3 => mb9bf500r}/CMSIS/start_gcc.S (100%) rename bsp/{fm3 => mb9bf500r}/CMSIS/start_iar.S (100%) rename bsp/{fm3 => mb9bf500r}/CMSIS/start_rvds.S (100%) rename bsp/{fm3 => mb9bf500r}/CMSIS/system_mb9bf50x.c (100%) rename bsp/{fm3 => mb9bf500r}/CMSIS/system_mb9bf50x.h (100%) rename bsp/{fm3 => }/mb9bf500r/SConscript (100%) rename bsp/{fm3 => }/mb9bf500r/SConstruct (82%) rename bsp/{fm3 => }/mb9bf500r/adc.c (100%) rename bsp/{fm3 => }/mb9bf500r/adc.h (100%) rename bsp/{fm3 => }/mb9bf500r/application.c (100%) rename bsp/{fm3 => }/mb9bf500r/board.c (100%) rename bsp/{fm3 => }/mb9bf500r/board.h (100%) rename bsp/{fm3 => }/mb9bf500r/cpuusage.c (100%) rename bsp/{fm3 => }/mb9bf500r/cpuusage.h (100%) rename bsp/{fm3 => }/mb9bf500r/fm3_easy_kit.ewp (86%) rename bsp/{fm3 => }/mb9bf500r/fm3_easy_kit.eww (100%) rename bsp/{fm3 => }/mb9bf500r/fm3_rom.ld (100%) rename bsp/{fm3 => }/mb9bf500r/fm3_rom.sct (100%) rename bsp/{fm3 => }/mb9bf500r/font.h (100%) rename bsp/{fm3 => }/mb9bf500r/info.c (100%) rename bsp/{fm3 => }/mb9bf500r/key.c (100%) rename bsp/{fm3 => }/mb9bf500r/key.h (100%) rename bsp/{fm3 => }/mb9bf500r/lcd.c (100%) rename bsp/{fm3 => }/mb9bf500r/lcd.h (100%) rename bsp/{fm3 => }/mb9bf500r/led.c (100%) rename bsp/{fm3 => }/mb9bf500r/led.h (100%) rename bsp/{fm3 => }/mb9bf500r/mb9bf500r.icf (100%) rename bsp/{fm3 => }/mb9bf500r/project.uvopt (90%) rename bsp/{fm3 => }/mb9bf500r/project.uvproj (93%) rename bsp/{fm3 => }/mb9bf500r/rtconfig.h (94%) rename bsp/{fm3 => }/mb9bf500r/rtconfig.py (94%) rename bsp/{fm3 => }/mb9bf500r/startup.c (100%) rename bsp/{fm3 => mb9bf506r}/CMSIS/SConscript (100%) create mode 100644 bsp/mb9bf506r/CMSIS/core_cm3.c create mode 100644 bsp/mb9bf506r/CMSIS/core_cm3.h create mode 100644 bsp/mb9bf506r/CMSIS/core_cmFunc.h create mode 100644 bsp/mb9bf506r/CMSIS/core_cmInstr.h create mode 100644 bsp/mb9bf506r/CMSIS/mb9bf506r.h create mode 100644 bsp/mb9bf506r/CMSIS/start_gcc.S create mode 100644 bsp/mb9bf506r/CMSIS/start_iar.S create mode 100644 bsp/mb9bf506r/CMSIS/start_rvds.S create mode 100644 bsp/mb9bf506r/CMSIS/system_mb9bf50x.c create mode 100644 bsp/mb9bf506r/CMSIS/system_mb9bf50x.h rename bsp/{fm3 => }/mb9bf506r/SConscript (100%) rename bsp/{fm3 => }/mb9bf506r/SConstruct (85%) rename bsp/{fm3 => }/mb9bf506r/application.c (100%) rename bsp/{fm3 => }/mb9bf506r/board.c (92%) rename bsp/{fm3 => }/mb9bf506r/board.h (100%) rename bsp/{fm3 => }/mb9bf506r/console.c (100%) rename bsp/{fm3 => }/mb9bf506r/fm3_easy_kit.ewp (91%) rename bsp/{fm3 => }/mb9bf506r/fm3_easy_kit.eww (100%) rename bsp/{fm3 => }/mb9bf506r/fm3_rom.ld (100%) rename bsp/{fm3 => }/mb9bf506r/led.c (100%) rename bsp/{fm3 => }/mb9bf506r/led.h (100%) rename bsp/{fm3 => }/mb9bf506r/mb9bf506.icf (100%) rename bsp/{fm3 => }/mb9bf506r/nand.c (100%) rename bsp/{fm3 => }/mb9bf506r/nand.h (100%) rename bsp/{fm3 => }/mb9bf506r/rtconfig.h (92%) rename bsp/{fm3 => }/mb9bf506r/rtconfig.py (95%) rename bsp/{fm3 => }/mb9bf506r/serial.c (100%) rename bsp/{fm3 => }/mb9bf506r/serial.h (100%) rename bsp/{fm3 => }/mb9bf506r/startup.c (100%) diff --git a/bsp/mb9bf500r/CMSIS/SConscript b/bsp/mb9bf500r/CMSIS/SConscript new file mode 100644 index 0000000000..05e39c54d8 --- /dev/null +++ b/bsp/mb9bf500r/CMSIS/SConscript @@ -0,0 +1,19 @@ +Import('RTT_ROOT') +Import('rtconfig') +from building import * + +src = Glob('*.c') + +# add for startup script +if rtconfig.CROSS_TOOL == 'gcc': + src = src + ['start_gcc.S'] +elif rtconfig.CROSS_TOOL == 'keil': + src = src + ['start_rvds.S'] +elif rtconfig.CROSS_TOOL == 'iar': + src = src + ['start_iar.S'] + +CPPPATH = [GetCurrentDir()] + +group = DefineGroup('CMSIS', src, depend = [''], CPPPATH = CPPPATH, LIBRARY = '') + +Return('group') diff --git a/bsp/fm3/CMSIS/core_cm3.c b/bsp/mb9bf500r/CMSIS/core_cm3.c similarity index 100% rename from bsp/fm3/CMSIS/core_cm3.c rename to bsp/mb9bf500r/CMSIS/core_cm3.c diff --git a/bsp/fm3/CMSIS/core_cm3.h b/bsp/mb9bf500r/CMSIS/core_cm3.h similarity index 100% rename from bsp/fm3/CMSIS/core_cm3.h rename to bsp/mb9bf500r/CMSIS/core_cm3.h diff --git a/bsp/fm3/CMSIS/core_cmFunc.h b/bsp/mb9bf500r/CMSIS/core_cmFunc.h similarity index 100% rename from bsp/fm3/CMSIS/core_cmFunc.h rename to bsp/mb9bf500r/CMSIS/core_cmFunc.h diff --git a/bsp/fm3/CMSIS/core_cmInstr.h b/bsp/mb9bf500r/CMSIS/core_cmInstr.h similarity index 100% rename from bsp/fm3/CMSIS/core_cmInstr.h rename to bsp/mb9bf500r/CMSIS/core_cmInstr.h diff --git a/bsp/fm3/CMSIS/mb9bf506r.h b/bsp/mb9bf500r/CMSIS/mb9bf506r.h similarity index 100% rename from bsp/fm3/CMSIS/mb9bf506r.h rename to bsp/mb9bf500r/CMSIS/mb9bf506r.h diff --git a/bsp/fm3/CMSIS/start_gcc.S b/bsp/mb9bf500r/CMSIS/start_gcc.S similarity index 100% rename from bsp/fm3/CMSIS/start_gcc.S rename to bsp/mb9bf500r/CMSIS/start_gcc.S diff --git a/bsp/fm3/CMSIS/start_iar.S b/bsp/mb9bf500r/CMSIS/start_iar.S similarity index 100% rename from bsp/fm3/CMSIS/start_iar.S rename to bsp/mb9bf500r/CMSIS/start_iar.S diff --git a/bsp/fm3/CMSIS/start_rvds.S b/bsp/mb9bf500r/CMSIS/start_rvds.S similarity index 100% rename from bsp/fm3/CMSIS/start_rvds.S rename to bsp/mb9bf500r/CMSIS/start_rvds.S diff --git a/bsp/fm3/CMSIS/system_mb9bf50x.c b/bsp/mb9bf500r/CMSIS/system_mb9bf50x.c similarity index 100% rename from bsp/fm3/CMSIS/system_mb9bf50x.c rename to bsp/mb9bf500r/CMSIS/system_mb9bf50x.c diff --git a/bsp/fm3/CMSIS/system_mb9bf50x.h b/bsp/mb9bf500r/CMSIS/system_mb9bf50x.h similarity index 100% rename from bsp/fm3/CMSIS/system_mb9bf50x.h rename to bsp/mb9bf500r/CMSIS/system_mb9bf50x.h diff --git a/bsp/fm3/mb9bf500r/SConscript b/bsp/mb9bf500r/SConscript similarity index 100% rename from bsp/fm3/mb9bf500r/SConscript rename to bsp/mb9bf500r/SConscript diff --git a/bsp/fm3/mb9bf500r/SConstruct b/bsp/mb9bf500r/SConstruct similarity index 82% rename from bsp/fm3/mb9bf500r/SConstruct rename to bsp/mb9bf500r/SConstruct index 5289674c12..b297c2cd74 100644 --- a/bsp/fm3/mb9bf500r/SConstruct +++ b/bsp/mb9bf500r/SConstruct @@ -5,7 +5,7 @@ import rtconfig if os.getenv('RTT_ROOT'): RTT_ROOT = os.getenv('RTT_ROOT') else: - RTT_ROOT = os.path.normpath(os.getcwd() + '/../../..') + RTT_ROOT = os.path.normpath(os.getcwd() + '/../..') sys.path = sys.path + [os.path.join(RTT_ROOT, 'tools')] from building import * @@ -30,7 +30,7 @@ Export('rtconfig') # prepare building environment objs = PrepareBuilding(env, RTT_ROOT) -objs = objs + SConscript('../CMSIS/SConscript', variant_dir='build/bsp/Libraries', duplicate=0) +objs = objs + SConscript('CMSIS/SConscript', variant_dir='build/bsp/CMSIS', duplicate=0) # build program env.Program(TARGET, objs) diff --git a/bsp/fm3/mb9bf500r/adc.c b/bsp/mb9bf500r/adc.c similarity index 100% rename from bsp/fm3/mb9bf500r/adc.c rename to bsp/mb9bf500r/adc.c diff --git a/bsp/fm3/mb9bf500r/adc.h b/bsp/mb9bf500r/adc.h similarity index 100% rename from bsp/fm3/mb9bf500r/adc.h rename to bsp/mb9bf500r/adc.h diff --git a/bsp/fm3/mb9bf500r/application.c b/bsp/mb9bf500r/application.c similarity index 100% rename from bsp/fm3/mb9bf500r/application.c rename to bsp/mb9bf500r/application.c diff --git a/bsp/fm3/mb9bf500r/board.c b/bsp/mb9bf500r/board.c similarity index 100% rename from bsp/fm3/mb9bf500r/board.c rename to bsp/mb9bf500r/board.c diff --git a/bsp/fm3/mb9bf500r/board.h b/bsp/mb9bf500r/board.h similarity index 100% rename from bsp/fm3/mb9bf500r/board.h rename to bsp/mb9bf500r/board.h diff --git a/bsp/fm3/mb9bf500r/cpuusage.c b/bsp/mb9bf500r/cpuusage.c similarity index 100% rename from bsp/fm3/mb9bf500r/cpuusage.c rename to bsp/mb9bf500r/cpuusage.c diff --git a/bsp/fm3/mb9bf500r/cpuusage.h b/bsp/mb9bf500r/cpuusage.h similarity index 100% rename from bsp/fm3/mb9bf500r/cpuusage.h rename to bsp/mb9bf500r/cpuusage.h diff --git a/bsp/fm3/mb9bf500r/fm3_easy_kit.ewp b/bsp/mb9bf500r/fm3_easy_kit.ewp similarity index 86% rename from bsp/fm3/mb9bf500r/fm3_easy_kit.ewp rename to bsp/mb9bf500r/fm3_easy_kit.ewp index b769dd1877..413df3c022 100644 --- a/bsp/fm3/mb9bf500r/fm3_easy_kit.ewp +++ b/bsp/mb9bf500r/fm3_easy_kit.ewp @@ -286,9 +286,9 @@