From bde47018b8327fb8106c68e84a719a97243a1653 Mon Sep 17 00:00:00 2001 From: Bernard Xiong Date: Mon, 7 Jan 2019 06:09:45 +0800 Subject: [libcpu] Add SConscript in libcpu. --- libcpu/SConscript | 41 +++++++++-------------------------------- 1 file changed, 9 insertions(+), 32 deletions(-) (limited to 'libcpu/SConscript') diff --git a/libcpu/SConscript b/libcpu/SConscript index 568da67cc9..774e7f4043 100644 --- a/libcpu/SConscript +++ b/libcpu/SConscript @@ -1,38 +1,15 @@ -Import('RTT_ROOT') -Import('rtconfig') -from building import * - -arch = rtconfig.ARCH -comm = rtconfig.ARCH + '/common' -path = rtconfig.ARCH + '/' + rtconfig.CPU -src = [] -ASFLAGS = '' - -# The set of source files associated with this SConscript file. -if rtconfig.PLATFORM == 'armcc': - src += Glob(path + '/*.c') + Glob(path + '/*_rvds.S') - src += Glob(comm + '/*.c') + Glob(comm + '/*_rvds.S') - -if rtconfig.PLATFORM == 'gcc': - src += Glob(path + '/*_init.S') - src += Glob(path + '/*.c') + Glob(path + '/*_gcc.S') - src += Glob(comm + '/*.c') + Glob(comm + '/*_gcc.S') +# RT-Thread building script for bridge -if rtconfig.PLATFORM == 'iar': - src += Glob(path + '/*.c') + Glob(path + '/*_iar.S') - src += Glob(comm + '/*.c') + Glob(comm + '/*_iar.S') - -if rtconfig.PLATFORM == 'cl': - src = Glob(path + '/*.c') - -if rtconfig.PLATFORM == 'mingw': - src = Glob(path + '/*.c') +import os +from building import * -if rtconfig.PLATFORM == 'armcc' and rtconfig.ARCH == 'arm' and rtconfig.CPU == 'arm926': - ASFLAGS = ' --cpreproc' +Import('rtconfig') -CPPPATH = [RTT_ROOT + '/libcpu/' + arch + '/' + rtconfig.CPU, RTT_ROOT + '/libcpu/' + arch + '/common'] +cwd = GetCurrentDir() +group = [] +list = os.listdir(cwd) -group = DefineGroup(rtconfig.CPU.upper(), src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS) +if rtconfig.ARCH in list: + group = group + SConscript(os.path.join(cwd, rtconfig.ARCH, 'SConscript')) Return('group') -- cgit v1.3.1 From bd8f0d04232b5725ed8965bf528946906775f8cf Mon Sep 17 00:00:00 2001 From: BernardXiong Date: Tue, 26 Mar 2019 13:36:01 +0000 Subject: [libcpu] Fix the build directory issue --- libcpu/SConscript | 2 +- libcpu/arc/SConscript | 4 ++-- libcpu/arm/SConscript | 8 +++----- libcpu/avr32/SConscript | 2 +- libcpu/blackfin/SConscript | 2 +- libcpu/c-sky/SConscript | 4 ++-- libcpu/m16c/SConscript | 2 +- libcpu/mips/SConscript | 4 ++-- libcpu/nios/SConscript | 2 +- libcpu/ppc/SConscript | 4 ++-- libcpu/risc-v/SConscript | 4 ++-- libcpu/sim/SConscript | 2 +- libcpu/ti-dsp/SConscript | 2 +- libcpu/unicore32/SConscript | 2 +- libcpu/v850/SConscript | 2 +- libcpu/xilinx/SConscript | 2 +- 16 files changed, 23 insertions(+), 25 deletions(-) (limited to 'libcpu/SConscript') diff --git a/libcpu/SConscript b/libcpu/SConscript index 774e7f4043..6092707e6d 100644 --- a/libcpu/SConscript +++ b/libcpu/SConscript @@ -10,6 +10,6 @@ group = [] list = os.listdir(cwd) if rtconfig.ARCH in list: - group = group + SConscript(os.path.join(cwd, rtconfig.ARCH, 'SConscript')) + group = group + SConscript(os.path.join(rtconfig.ARCH, 'SConscript')) Return('group') diff --git a/libcpu/arc/SConscript b/libcpu/arc/SConscript index cbec0b5ec1..3c69b578fa 100644 --- a/libcpu/arc/SConscript +++ b/libcpu/arc/SConscript @@ -9,9 +9,9 @@ cwd = GetCurrentDir() group = [] # add common code files -group = group + SConscript(os.path.join(cwd, 'common', 'SConscript')) +group = group + SConscript(os.path.join('common', 'SConscript')) # cpu porting code files -group = group + SConscript(os.path.join(cwd, rtconfig.CPU, 'SConscript')) +group = group + SConscript(os.path.join(rtconfig.CPU, 'SConscript')) Return('group') diff --git a/libcpu/arm/SConscript b/libcpu/arm/SConscript index 36a214327b..f6ea13fb91 100644 --- a/libcpu/arm/SConscript +++ b/libcpu/arm/SConscript @@ -5,14 +5,12 @@ from building import * Import('rtconfig') -cwd = GetCurrentDir() -group = [] -list = os.listdir(cwd) +cwd = GetCurrentDir() # add common code files -group = group + SConscript(os.path.join(cwd, 'common', 'SConscript')) +group = SConscript(os.path.join('common', 'SConscript')) # cpu porting code files -group = group + SConscript(os.path.join(cwd, rtconfig.CPU, 'SConscript')) +group = group + SConscript(os.path.join(rtconfig.CPU, 'SConscript')) Return('group') diff --git a/libcpu/avr32/SConscript b/libcpu/avr32/SConscript index ebdd1357ee..4f1441895c 100644 --- a/libcpu/avr32/SConscript +++ b/libcpu/avr32/SConscript @@ -10,6 +10,6 @@ group = [] list = os.listdir(cwd) # cpu porting code files -group = group + SConscript(os.path.join(cwd, rtconfig.CPU, 'SConscript')) +group = group + SConscript(os.path.join(rtconfig.CPU, 'SConscript')) Return('group') diff --git a/libcpu/blackfin/SConscript b/libcpu/blackfin/SConscript index ebdd1357ee..4f1441895c 100644 --- a/libcpu/blackfin/SConscript +++ b/libcpu/blackfin/SConscript @@ -10,6 +10,6 @@ group = [] list = os.listdir(cwd) # cpu porting code files -group = group + SConscript(os.path.join(cwd, rtconfig.CPU, 'SConscript')) +group = group + SConscript(os.path.join(rtconfig.CPU, 'SConscript')) Return('group') diff --git a/libcpu/c-sky/SConscript b/libcpu/c-sky/SConscript index 36a214327b..640e46a4fb 100644 --- a/libcpu/c-sky/SConscript +++ b/libcpu/c-sky/SConscript @@ -10,9 +10,9 @@ group = [] list = os.listdir(cwd) # add common code files -group = group + SConscript(os.path.join(cwd, 'common', 'SConscript')) +group = group + SConscript(os.path.join('common', 'SConscript')) # cpu porting code files -group = group + SConscript(os.path.join(cwd, rtconfig.CPU, 'SConscript')) +group = group + SConscript(os.path.join(rtconfig.CPU, 'SConscript')) Return('group') diff --git a/libcpu/m16c/SConscript b/libcpu/m16c/SConscript index ebdd1357ee..4f1441895c 100644 --- a/libcpu/m16c/SConscript +++ b/libcpu/m16c/SConscript @@ -10,6 +10,6 @@ group = [] list = os.listdir(cwd) # cpu porting code files -group = group + SConscript(os.path.join(cwd, rtconfig.CPU, 'SConscript')) +group = group + SConscript(os.path.join(rtconfig.CPU, 'SConscript')) Return('group') diff --git a/libcpu/mips/SConscript b/libcpu/mips/SConscript index 36a214327b..640e46a4fb 100644 --- a/libcpu/mips/SConscript +++ b/libcpu/mips/SConscript @@ -10,9 +10,9 @@ group = [] list = os.listdir(cwd) # add common code files -group = group + SConscript(os.path.join(cwd, 'common', 'SConscript')) +group = group + SConscript(os.path.join('common', 'SConscript')) # cpu porting code files -group = group + SConscript(os.path.join(cwd, rtconfig.CPU, 'SConscript')) +group = group + SConscript(os.path.join(rtconfig.CPU, 'SConscript')) Return('group') diff --git a/libcpu/nios/SConscript b/libcpu/nios/SConscript index ebdd1357ee..4f1441895c 100644 --- a/libcpu/nios/SConscript +++ b/libcpu/nios/SConscript @@ -10,6 +10,6 @@ group = [] list = os.listdir(cwd) # cpu porting code files -group = group + SConscript(os.path.join(cwd, rtconfig.CPU, 'SConscript')) +group = group + SConscript(os.path.join(rtconfig.CPU, 'SConscript')) Return('group') diff --git a/libcpu/ppc/SConscript b/libcpu/ppc/SConscript index 36a214327b..640e46a4fb 100644 --- a/libcpu/ppc/SConscript +++ b/libcpu/ppc/SConscript @@ -10,9 +10,9 @@ group = [] list = os.listdir(cwd) # add common code files -group = group + SConscript(os.path.join(cwd, 'common', 'SConscript')) +group = group + SConscript(os.path.join('common', 'SConscript')) # cpu porting code files -group = group + SConscript(os.path.join(cwd, rtconfig.CPU, 'SConscript')) +group = group + SConscript(os.path.join(rtconfig.CPU, 'SConscript')) Return('group') diff --git a/libcpu/risc-v/SConscript b/libcpu/risc-v/SConscript index 36a214327b..640e46a4fb 100644 --- a/libcpu/risc-v/SConscript +++ b/libcpu/risc-v/SConscript @@ -10,9 +10,9 @@ group = [] list = os.listdir(cwd) # add common code files -group = group + SConscript(os.path.join(cwd, 'common', 'SConscript')) +group = group + SConscript(os.path.join('common', 'SConscript')) # cpu porting code files -group = group + SConscript(os.path.join(cwd, rtconfig.CPU, 'SConscript')) +group = group + SConscript(os.path.join(rtconfig.CPU, 'SConscript')) Return('group') diff --git a/libcpu/sim/SConscript b/libcpu/sim/SConscript index ebdd1357ee..4f1441895c 100644 --- a/libcpu/sim/SConscript +++ b/libcpu/sim/SConscript @@ -10,6 +10,6 @@ group = [] list = os.listdir(cwd) # cpu porting code files -group = group + SConscript(os.path.join(cwd, rtconfig.CPU, 'SConscript')) +group = group + SConscript(os.path.join(rtconfig.CPU, 'SConscript')) Return('group') diff --git a/libcpu/ti-dsp/SConscript b/libcpu/ti-dsp/SConscript index ebdd1357ee..4f1441895c 100644 --- a/libcpu/ti-dsp/SConscript +++ b/libcpu/ti-dsp/SConscript @@ -10,6 +10,6 @@ group = [] list = os.listdir(cwd) # cpu porting code files -group = group + SConscript(os.path.join(cwd, rtconfig.CPU, 'SConscript')) +group = group + SConscript(os.path.join(rtconfig.CPU, 'SConscript')) Return('group') diff --git a/libcpu/unicore32/SConscript b/libcpu/unicore32/SConscript index ebdd1357ee..4f1441895c 100644 --- a/libcpu/unicore32/SConscript +++ b/libcpu/unicore32/SConscript @@ -10,6 +10,6 @@ group = [] list = os.listdir(cwd) # cpu porting code files -group = group + SConscript(os.path.join(cwd, rtconfig.CPU, 'SConscript')) +group = group + SConscript(os.path.join(rtconfig.CPU, 'SConscript')) Return('group') diff --git a/libcpu/v850/SConscript b/libcpu/v850/SConscript index ebdd1357ee..4f1441895c 100644 --- a/libcpu/v850/SConscript +++ b/libcpu/v850/SConscript @@ -10,6 +10,6 @@ group = [] list = os.listdir(cwd) # cpu porting code files -group = group + SConscript(os.path.join(cwd, rtconfig.CPU, 'SConscript')) +group = group + SConscript(os.path.join(rtconfig.CPU, 'SConscript')) Return('group') diff --git a/libcpu/xilinx/SConscript b/libcpu/xilinx/SConscript index ebdd1357ee..4f1441895c 100644 --- a/libcpu/xilinx/SConscript +++ b/libcpu/xilinx/SConscript @@ -10,6 +10,6 @@ group = [] list = os.listdir(cwd) # cpu porting code files -group = group + SConscript(os.path.join(cwd, rtconfig.CPU, 'SConscript')) +group = group + SConscript(os.path.join(rtconfig.CPU, 'SConscript')) Return('group') -- cgit v1.3.1