From 1f644592b3670aefc168c7911cadb35e58b5083d Mon Sep 17 00:00:00 2001 From: funshine Date: Mon, 5 Jan 2015 15:21:27 +0800 Subject: [PATCH] modify gen_misc and gen_appbin to support gcc toolchain --- app/gen_misc.bat | 22 ++++++++++++++++------ app/gen_misc.sh | 12 ++++++------ app/gen_misc_plus.bat | 15 +++++++++++---- app/gen_misc_plus.sh | 12 ++++++------ tools/gen_appbin.py | 10 ++++++++-- 5 files changed, 47 insertions(+), 24 deletions(-) diff --git a/app/gen_misc.bat b/app/gen_misc.bat index fb9c5d0e..9b83f542 100644 --- a/app/gen_misc.bat +++ b/app/gen_misc.bat @@ -7,13 +7,23 @@ del /F ..\bin\eagle.app.v6.flash.bin ..\bin\eagle.app.v6.irom0text.bin ..\bin\ea cd .output\eagle\debug\image -xt-objdump -x -s eagle.app.v6.out > ..\..\..\..\..\bin\eagle.app.v6.dump -xt-objdump -S eagle.app.v6.out > ..\..\..\..\..\bin\eagle.app.v6.S +if %XTENSA_CORE%==lx106 ( + xt-objdump -x -s eagle.app.v6.out > ..\..\..\..\..\bin\eagle.app.v6.dump + xt-objdump -S eagle.app.v6.out > ..\..\..\..\..\bin\eagle.app.v6.S -xt-objcopy --only-section .text -O binary eagle.app.v6.out eagle.app.v6.text.bin -xt-objcopy --only-section .data -O binary eagle.app.v6.out eagle.app.v6.data.bin -xt-objcopy --only-section .rodata -O binary eagle.app.v6.out eagle.app.v6.rodata.bin -xt-objcopy --only-section .irom0.text -O binary eagle.app.v6.out eagle.app.v6.irom0text.bin + xt-objcopy --only-section .text -O binary eagle.app.v6.out eagle.app.v6.text.bin + xt-objcopy --only-section .data -O binary eagle.app.v6.out eagle.app.v6.data.bin + xt-objcopy --only-section .rodata -O binary eagle.app.v6.out eagle.app.v6.rodata.bin + xt-objcopy --only-section .irom0.text -O binary eagle.app.v6.out eagle.app.v6.irom0text.bin +) else ( + xtensa-lx106-elf-objdump -x -s eagle.app.v6.out > ..\..\..\..\..\bin\eagle.app.v6.dump + xtensa-lx106-elf-objdump -S eagle.app.v6.out > ..\..\..\..\..\bin\eagle.app.v6.S + + xtensa-lx106-elf-objcopy --only-section .text -O binary eagle.app.v6.out eagle.app.v6.text.bin + xtensa-lx106-elf-objcopy --only-section .data -O binary eagle.app.v6.out eagle.app.v6.data.bin + xtensa-lx106-elf-objcopy --only-section .rodata -O binary eagle.app.v6.out eagle.app.v6.rodata.bin + xtensa-lx106-elf-objcopy --only-section .irom0.text -O binary eagle.app.v6.out eagle.app.v6.irom0text.bin +) gen_appbin.py eagle.app.v6.out v6 diff --git a/app/gen_misc.sh b/app/gen_misc.sh index eeada235..6ddf62af 100755 --- a/app/gen_misc.sh +++ b/app/gen_misc.sh @@ -5,13 +5,13 @@ rm ../bin/eagle.app.v6.flash.bin ../bin/eagle.app.v6.irom0text.bin ../bin/eagle. cd .output/eagle/debug/image -xt-objdump -x -s eagle.app.v6.out > ../../../../../bin/eagle.app.v6.dump -xt-objdump -S eagle.app.v6.out > ../../../../../bin/eagle.app.v6.S +xtensa-lx106-elf-objdump -x -s eagle.app.v6.out > ../../../../../bin/eagle.app.v6.dump +xtensa-lx106-elf-objdump -S eagle.app.v6.out > ../../../../../bin/eagle.app.v6.S -xt-objcopy --only-section .text -O binary eagle.app.v6.out eagle.app.v6.text.bin -xt-objcopy --only-section .data -O binary eagle.app.v6.out eagle.app.v6.data.bin -xt-objcopy --only-section .rodata -O binary eagle.app.v6.out eagle.app.v6.rodata.bin -xt-objcopy --only-section .irom0.text -O binary eagle.app.v6.out eagle.app.v6.irom0text.bin +xtensa-lx106-elf-objcopy --only-section .text -O binary eagle.app.v6.out eagle.app.v6.text.bin +xtensa-lx106-elf-objcopy --only-section .data -O binary eagle.app.v6.out eagle.app.v6.data.bin +xtensa-lx106-elf-objcopy --only-section .rodata -O binary eagle.app.v6.out eagle.app.v6.rodata.bin +xtensa-lx106-elf-objcopy --only-section .irom0.text -O binary eagle.app.v6.out eagle.app.v6.irom0text.bin ../../../../../tools/gen_appbin.py eagle.app.v6.out v6 diff --git a/app/gen_misc_plus.bat b/app/gen_misc_plus.bat index 3aaea129..1b690875 100644 --- a/app/gen_misc_plus.bat +++ b/app/gen_misc_plus.bat @@ -7,10 +7,17 @@ rm ..\bin\upgrade\%1.bin cd .output\eagle\debug\image\ -xt-objcopy --only-section .text -O binary eagle.app.v6.out eagle.app.v6.text.bin -xt-objcopy --only-section .data -O binary eagle.app.v6.out eagle.app.v6.data.bin -xt-objcopy --only-section .rodata -O binary eagle.app.v6.out eagle.app.v6.rodata.bin -xt-objcopy --only-section .irom0.text -O binary eagle.app.v6.out eagle.app.v6.irom0text.bin +if %XTENSA_CORE%==lx106 ( + xt-objcopy --only-section .text -O binary eagle.app.v6.out eagle.app.v6.text.bin + xt-objcopy --only-section .data -O binary eagle.app.v6.out eagle.app.v6.data.bin + xt-objcopy --only-section .rodata -O binary eagle.app.v6.out eagle.app.v6.rodata.bin + xt-objcopy --only-section .irom0.text -O binary eagle.app.v6.out eagle.app.v6.irom0text.bin +) else ( + xtensa-lx106-elf-objcopy --only-section .text -O binary eagle.app.v6.out eagle.app.v6.text.bin + xtensa-lx106-elf-objcopy --only-section .data -O binary eagle.app.v6.out eagle.app.v6.data.bin + xtensa-lx106-elf-objcopy --only-section .rodata -O binary eagle.app.v6.out eagle.app.v6.rodata.bin + xtensa-lx106-elf-objcopy --only-section .irom0.text -O binary eagle.app.v6.out eagle.app.v6.irom0text.bin +) gen_appbin.py eagle.app.v6.out v6 diff --git a/app/gen_misc_plus.sh b/app/gen_misc_plus.sh index 7c4cb42e..8e1c5b43 100755 --- a/app/gen_misc_plus.sh +++ b/app/gen_misc_plus.sh @@ -6,13 +6,13 @@ rm ../bin/upgrade/user$1.bin ../bin/upgrade/user$1.dump ../bin/upgrade/user$1.S cd .output/eagle/debug/image/ -xt-objdump -x -s eagle.app.v6.out > ../../../../../bin/upgrade/user$1.dump -xt-objdump -S eagle.app.v6.out > ../../../../../bin/upgrade/user$1.S +xtensa-lx106-elf-objdump -x -s eagle.app.v6.out > ../../../../../bin/upgrade/user$1.dump +xtensa-lx106-elf-objdump -S eagle.app.v6.out > ../../../../../bin/upgrade/user$1.S -xt-objcopy --only-section .text -O binary eagle.app.v6.out eagle.app.v6.text.bin -xt-objcopy --only-section .data -O binary eagle.app.v6.out eagle.app.v6.data.bin -xt-objcopy --only-section .rodata -O binary eagle.app.v6.out eagle.app.v6.rodata.bin -xt-objcopy --only-section .irom0.text -O binary eagle.app.v6.out eagle.app.v6.irom0text.bin +xtensa-lx106-elf-objcopy --only-section .text -O binary eagle.app.v6.out eagle.app.v6.text.bin +xtensa-lx106-elf-objcopy --only-section .data -O binary eagle.app.v6.out eagle.app.v6.data.bin +xtensa-lx106-elf-objcopy --only-section .rodata -O binary eagle.app.v6.out eagle.app.v6.rodata.bin +xtensa-lx106-elf-objcopy --only-section .irom0.text -O binary eagle.app.v6.out eagle.app.v6.irom0text.bin ../../../../../tools/gen_appbin.py eagle.app.v6.out v6 diff --git a/tools/gen_appbin.py b/tools/gen_appbin.py index 66019d15..f3820c09 100755 --- a/tools/gen_appbin.py +++ b/tools/gen_appbin.py @@ -18,7 +18,10 @@ elf_file = sys.argv[1] ver = sys.argv[2] #print elf_file -cmd = 'xt-nm -g ' + elf_file + ' > eagle.app.sym' +if os.getenv('XTENSA_CORE')=='lx106': + cmd = 'xt-nm -g ' + elf_file + ' > eagle.app.sym' +else: + cmd = 'xtensa-lx106-elf-nm -g ' + elf_file + ' > eagle.app.sym' #print cmd os.system(cmd) @@ -60,7 +63,10 @@ for line in lines: rodata_start_addr = m.group(1) print rodata_start_addr -cmd = 'genflashbin%s eagle.app.%s.text.bin '%(ver, ver)+entry_addr+' eagle.app.%s.data.bin '%(ver)+ data_start_addr+' eagle.app.%s.rodata.bin '%(ver)+rodata_start_addr +if os.getenv('XTENSA_CORE')=='lx106': + cmd = 'genflashbin%s eagle.app.%s.text.bin '%(ver, ver)+entry_addr+' eagle.app.%s.data.bin '%(ver)+ data_start_addr+' eagle.app.%s.rodata.bin '%(ver)+rodata_start_addr +else: + cmd = 'genflashbin%s eagle.app.%s.text.bin '%(ver, ver)+entry_addr+' eagle.app.%s.data.bin '%(ver)+ data_start_addr+' eagle.app.%s.rodata.bin '%(ver)+rodata_start_addr print cmd os.system(cmd)