diff --git a/libcpu/SConscript b/libcpu/SConscript index 7ac8e79e53..d295c7d2ae 100644 --- a/libcpu/SConscript +++ b/libcpu/SConscript @@ -1,21 +1,21 @@ -Import('env') -Import('rtconfig') -Import('RTT_ROOT') - -comm = rtconfig.ARCH + '/common' -path = rtconfig.ARCH + '/' + rtconfig.CPU - -# The set of source files associated with this SConscript file. -if rtconfig.PLATFORM == 'armcc': - src_local = Glob(path + '/*.c') + Glob(path + '/*_rvds.s') + Glob(comm + '/*.c') - -if rtconfig.PLATFORM == 'gcc': - src_local = Glob(path + '/*.c') + Glob(path + '/*_gcc.s') + Glob(comm + '/*.c') + Glob(path + '/*_init.S') - -if rtconfig.PLATFORM == 'iar': - src_local = Glob(path + '/*.c') + Glob(path + '/*_iar.s') + Glob(comm + '/*.c') - -env.Append(CPPPATH = [RTT_ROOT + '/libcpu/' + rtconfig.ARCH + '/' + rtconfig.CPU]) -obj = env.Object(src_local) - -Return('obj') +Import('env') +Import('rtconfig') +Import('RTT_ROOT') + +comm = rtconfig.ARCH + '/common' +path = rtconfig.ARCH + '/' + rtconfig.CPU + +# The set of source files associated with this SConscript file. +if rtconfig.PLATFORM == 'armcc': + src_local = Glob(path + '/*.c') + Glob(path + '/*_rvds.S') + Glob(comm + '/*.c') + +if rtconfig.PLATFORM == 'gcc': + src_local = Glob(path + '/*.c') + Glob(path + '/*_gcc.S') + Glob(comm + '/*.c') + Glob(path + '/*_init.S') + +if rtconfig.PLATFORM == 'iar': + src_local = Glob(path + '/*.c') + Glob(path + '/*_iar.S') + Glob(comm + '/*.c') + +env.Append(CPPPATH = [RTT_ROOT + '/libcpu/' + rtconfig.ARCH + '/' + rtconfig.CPU]) +obj = env.Object(src_local) + +Return('obj') diff --git a/libcpu/arm/lm3s/start_gcc.s b/libcpu/arm/lm3s/start_gcc.S similarity index 100% rename from libcpu/arm/lm3s/start_gcc.s rename to libcpu/arm/lm3s/start_gcc.S diff --git a/libcpu/arm/lpc214x/context_rvds.s b/libcpu/arm/lpc214x/context_rvds.S similarity index 100% rename from libcpu/arm/lpc214x/context_rvds.s rename to libcpu/arm/lpc214x/context_rvds.S diff --git a/libcpu/arm/lpc214x/start_rvds.s b/libcpu/arm/lpc214x/start_rvds.S similarity index 100% rename from libcpu/arm/lpc214x/start_rvds.s rename to libcpu/arm/lpc214x/start_rvds.S diff --git a/libcpu/arm/lpc24xx/context_rvds.s b/libcpu/arm/lpc24xx/context_rvds.S similarity index 100% rename from libcpu/arm/lpc24xx/context_rvds.s rename to libcpu/arm/lpc24xx/context_rvds.S diff --git a/libcpu/arm/lpc24xx/start_rvds.s b/libcpu/arm/lpc24xx/start_rvds.S similarity index 100% rename from libcpu/arm/lpc24xx/start_rvds.s rename to libcpu/arm/lpc24xx/start_rvds.S diff --git a/libcpu/arm/s3c24x0/context_rvds.s b/libcpu/arm/s3c24x0/context_rvds.S similarity index 100% rename from libcpu/arm/s3c24x0/context_rvds.s rename to libcpu/arm/s3c24x0/context_rvds.S diff --git a/libcpu/arm/s3c24x0/start_gcc.s b/libcpu/arm/s3c24x0/start_gcc.S similarity index 100% rename from libcpu/arm/s3c24x0/start_gcc.s rename to libcpu/arm/s3c24x0/start_gcc.S diff --git a/libcpu/arm/s3c24x0/start_rvds.s b/libcpu/arm/s3c24x0/start_rvds.S similarity index 100% rename from libcpu/arm/s3c24x0/start_rvds.s rename to libcpu/arm/s3c24x0/start_rvds.S diff --git a/libcpu/arm/s3c44b0/context_rvds.s b/libcpu/arm/s3c44b0/context_rvds.S similarity index 100% rename from libcpu/arm/s3c44b0/context_rvds.s rename to libcpu/arm/s3c44b0/context_rvds.S diff --git a/libcpu/arm/s3c44b0/start_rvds.s b/libcpu/arm/s3c44b0/start_rvds.S similarity index 100% rename from libcpu/arm/s3c44b0/start_rvds.s rename to libcpu/arm/s3c44b0/start_rvds.S diff --git a/libcpu/arm/stm32/start_gcc.s b/libcpu/arm/stm32/start_gcc.S similarity index 100% rename from libcpu/arm/stm32/start_gcc.s rename to libcpu/arm/stm32/start_gcc.S diff --git a/libcpu/arm/stm32/start_iar.s b/libcpu/arm/stm32/start_iar.S similarity index 100% rename from libcpu/arm/stm32/start_iar.s rename to libcpu/arm/stm32/start_iar.S diff --git a/libcpu/arm/stm32/start_rvds.s b/libcpu/arm/stm32/start_rvds.S similarity index 100% rename from libcpu/arm/stm32/start_rvds.s rename to libcpu/arm/stm32/start_rvds.S