Fix BSP dist packaging

Author: CYFS3

bsp/ESP/ESP32_C3/rtconfig.py

@@ -42,3 +42,9 @@
     CXXFLAGS = CFLAGS 
 
     POST_ACTION = OBJCPY + ' -Oihex $TARGET rtthread.hex\n' + SIZE + ' $TARGET \n'
+
+def dist_handle(BSP_ROOT, dist_dir):
+    import sys
+    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)

bsp/ESP/tools/sdk_dist.py

@@ -9,9 +9,12 @@
 # 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')
+    library_path = os.path.join(os.path.dirname(BSP_ROOT), 'libraries')
 
     print("=> copy bsp drivers")
     bsp_copy_files(os.path.join(library_path, 'drivers'), os.path.join(library_dir, 'drivers'))
-    shutil.copyfile(os.path.join(library_path, 'Kconfig'), os.path.join(library_dir, 'Kconfig'))
+    kconfig = os.path.join(library_path, 'Kconfig')
+    if os.path.exists(kconfig):
+        shutil.copyfile(kconfig, os.path.join(library_dir, 'Kconfig'))

bsp/Infineon/tools/sdk_dist.py

@@ -13,10 +13,16 @@ def dist_do_building(BSP_ROOT, dist_dir):
 
     print("=> copy ifx bsp library")
     library_dir = os.path.join(dist_dir, 'libraries')
+    sibling_library_dir = os.path.join(os.path.dirname(dist_dir), 'libraries')
     library_path = os.path.join(os.path.dirname(BSP_ROOT), 'libraries')
-    bsp_copy_files(os.path.join(library_path, rtconfig.BSP_LIBRARY_TYPE),
-                   os.path.join(library_dir, rtconfig.BSP_LIBRARY_TYPE))
+    if rtconfig.BSP_LIBRARY_TYPE is not None:
+        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 sibling bsp drivers")
+    bsp_copy_files(os.path.join(library_path, 'HAL_Drivers'), os.path.join(sibling_library_dir, 'HAL_Drivers'))
+    shutil.copyfile(os.path.join(library_path, 'Kconfig'), os.path.join(sibling_library_dir, 'Kconfig'))

bsp/allwinner/d1s/rtconfig.py

@@ -54,3 +54,9 @@
 
 DUMP_ACTION = OBJDUMP + ' -D -S $TARGET > rtthread.asm\n'
 POST_ACTION = OBJCPY + ' -O binary $TARGET rtthread.bin\n' + SIZE + ' $TARGET \n' + './mksdimg.sh\n'
+
+def dist_handle(BSP_ROOT, dist_dir):
+    import sys
+    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)

bsp/allwinner/tools/sdk_dist.py

@@ -6,6 +6,27 @@
 sys.path.append(os.path.join(os.path.dirname(cwd_path), 'rt-thread', 'tools'))
 
 
+def update_kconfig_library_path(dist_dir):
+    library_dir = os.path.join(dist_dir, 'libraries')
+    if not os.path.isdir(library_dir):
+        return
+
+    for root, dirs, files in os.walk(library_dir):
+        if 'Kconfig' not in files:
+            continue
+
+        kconfig_path = os.path.join(root, 'Kconfig')
+        with open(kconfig_path, 'r') as f:
+            data = f.read()
+
+        data = data.replace('$(BSP_DIR)/../libraries', 'libraries')
+        data = data.replace('$BSP_DIR/../libraries', 'libraries')
+        data = data.replace('../libraries', 'libraries')
+
+        with open(kconfig_path, 'w') as f:
+            f.write(data)
+
+
 # BSP dist function
 def dist_do_building(BSP_ROOT, dist_dir):
     from mkdist import bsp_copy_files
@@ -19,4 +40,9 @@ def dist_do_building(BSP_ROOT, dist_dir):
 
     print("=> copy bsp drivers")
     bsp_copy_files(os.path.join(library_path, 'drivers'), os.path.join(library_dir, 'drivers'))
+
+    print("=> copy bsp libos")
+    bsp_copy_files(os.path.join(library_path, 'libos'), os.path.join(library_dir, 'libos'))
+
     shutil.copyfile(os.path.join(library_path, 'Kconfig'), os.path.join(library_dir, 'Kconfig'))
+    update_kconfig_library_path(dist_dir)

bsp/at32/at32f421-start/board/Kconfig

@@ -115,6 +115,7 @@ menu "On-chip Peripheral Drivers"
                         depends on RT_USING_SERIAL_V2 && BSP_UART2_RX_USING_DMA
                         default 64
                 endif
+        endif
 
     menuconfig BSP_USING_PWM
         bool "Enable PWM"

bsp/at32/at32m412-start/board/Kconfig

@@ -115,6 +115,7 @@ menu "On-chip Peripheral Drivers"
                         depends on RT_USING_SERIAL_V2 && BSP_UART2_RX_USING_DMA
                         default 64
                 endif
+        endif
 
     menuconfig BSP_USING_PWM
         bool "Enable PWM"

bsp/at32/at32m416-start/board/Kconfig

@@ -115,6 +115,7 @@ menu "On-chip Peripheral Drivers"
                         depends on RT_USING_SERIAL_V2 && BSP_UART2_RX_USING_DMA
                         default 64
                 endif
+        endif
 
     menuconfig BSP_USING_PWM
         bool "Enable PWM"

bsp/essemi/es32f365x/rtconfig.py

@@ -133,3 +133,9 @@
     LFLAGS += ' --entry __iar_program_start'
     EXEC_PATH = EXEC_PATH + '/arm/bin/'
     POST_ACTION = ''
+
+def dist_handle(BSP_ROOT, dist_dir):
+    import sys
+    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)

bsp/essemi/tools/sdk_dist.py

@@ -0,0 +1,11 @@
+import os
+
+
+def dist_do_building(BSP_ROOT, dist_dir):
+    from mkdist import bsp_copy_files
+
+    print("=> copy es32f369x libraries")
+    bsp_copy_files(
+        os.path.join(os.path.dirname(BSP_ROOT), 'es32f369x'),
+        os.path.join(os.path.dirname(dist_dir), 'es32f369x'),
+    )