Browse Source

[bluetrum] add --dist

greedyhao 4 years ago
parent
commit
ec060312b7

+ 1 - 0
bsp/bluetrum/ab32vg1-ab-prougen/.gitignore

@@ -7,3 +7,4 @@
 *.old
 
 build
+dist

+ 1 - 1
bsp/bluetrum/ab32vg1-ab-prougen/README.md

@@ -102,7 +102,7 @@ msh >
 
 ## 注意事项
 
-目前的 `cconfig.h` 的生成脚本对 riscv 的工具链识别有问题,可能需要在 `cconfig.h` 中手动添加以下配置
+编译报错的时候,如果出现重复定义的报错,可能需要在 `cconfig.h` 中手动添加以下配置
 
 ```
 #define HAVE_SIGEVENT 1

+ 1 - 1
bsp/bluetrum/ab32vg1-ab-prougen/SConstruct

@@ -55,7 +55,7 @@ objs.extend(SConscript(os.path.join(libraries_path_prefix, bsp_library_type, 'SC
 objs.extend(SConscript(os.path.join(libraries_path_prefix, 'hal_drivers', 'SConscript')))
 
 # include drivers
-objs.extend(SConscript(os.path.join(libcpu_path_prefix, 'SConscript')))
+objs.extend(SConscript(os.path.join(libcpu_path_prefix, 'cpu', 'SConscript')))
 
 # make a building
 DoBuilding(TARGET, objs)

+ 10 - 1
bsp/bluetrum/ab32vg1-ab-prougen/cconfig.h

@@ -3,10 +3,19 @@
 /* Automatically generated file; DO NOT EDIT. */
 /* compiler configure file for RT-Thread in GCC*/
 
+#define HAVE_NEWLIB_H 1
+#define LIBC_VERSION "newlib 3.2.0"
 
-#define STDC "1989"
+#define HAVE_SYS_SIGNAL_H 1
+#define HAVE_SYS_SELECT_H 1
+#define HAVE_PTHREAD_H 1
+
+#define HAVE_FDSET 1
+#define HAVE_SIGACTION 1
 #define HAVE_SIGEVENT 1
 #define HAVE_SIGINFO 1
 #define HAVE_SIGVAL 1
+#define GCC_VERSION_STR "10.1.0"
+#define STDC "2011"
 
 #endif

+ 8 - 1
bsp/bluetrum/ab32vg1-ab-prougen/rtconfig.py

@@ -57,4 +57,11 @@ if PLATFORM == 'gcc':
 
 DUMP_ACTION = OBJDUMP + ' -D -S $TARGET > rtt.asm\n'
 POST_ACTION = OBJCPY + ' -O binary $TARGET rtthread.bin\n' + SIZE + ' $TARGET \n'
-POST_ACTION += './riscv32-elf-xmaker -b rtthread.xm\n'
+POST_ACTION += './riscv32-elf-xmaker -b rtthread.xm\n'
+
+def dist_handle(BSP_ROOT, dist_dir):
+    import sys
+    cwd_path = os.getcwd()
+    sys.path.append(os.path.join(os.path.dirname(BSP_ROOT), 'tools'))
+    from sdk_dist import dist_do_building
+    dist_do_building(BSP_ROOT, dist_dir)

+ 0 - 0
bsp/bluetrum/libcpu/SConscript → bsp/bluetrum/libcpu/cpu/SConscript


+ 0 - 0
bsp/bluetrum/libcpu/context_gcc.S → bsp/bluetrum/libcpu/cpu/context_gcc.S


+ 0 - 0
bsp/bluetrum/libcpu/cpuport.c → bsp/bluetrum/libcpu/cpu/cpuport.c


+ 0 - 0
bsp/bluetrum/libcpu/interrupt.c → bsp/bluetrum/libcpu/cpu/interrupt.c


+ 24 - 0
bsp/bluetrum/tools/sdk_dist.py

@@ -0,0 +1,24 @@
+import os
+import sys
+import shutil
+cwd_path = os.getcwd()
+sys.path.append(os.path.join(os.path.dirname(cwd_path), 'rt-thread', 'tools'))
+
+# BSP dist function
+def dist_do_building(BSP_ROOT, dist_dir):
+    from mkdist import bsp_copy_files
+    import rtconfig
+
+    library_dir  = os.path.join(dist_dir, 'libraries')
+
+    print("=> copy bluetrum bsp library")
+    library_path = os.path.join(os.path.dirname(BSP_ROOT), 'libraries')
+    library_dir  = os.path.join(dist_dir, 'libraries')
+    bsp_copy_files(os.path.join(library_path, rtconfig.BSP_LIBRARY_TYPE), os.path.join(library_dir, rtconfig.BSP_LIBRARY_TYPE))
+
+    print("=> copy bsp drivers")
+    bsp_copy_files(os.path.join(library_path, 'hal_drivers'), os.path.join(library_dir, 'hal_drivers'))
+    # shutil.copyfile(os.path.join(library_path, 'Kconfig'), os.path.join(library_dir, 'Kconfig'))
+
+    print("=> copy libcpu")
+    bsp_copy_files(os.path.join(os.path.dirname(BSP_ROOT), 'libcpu'), os.path.join(dist_dir, 'libcpu'))