builder:rda8910:use rdautils for darwin system

Signed-off-by: Ajay Bhargav <[email protected]>

Author: ajaybhargav

builder/framework/rda8910/arduino.py

@@ -13,9 +13,9 @@
 http://arduino.cc/en/Reference/HomePage
 """
 
-from os.path import getsize, isdir, join
-import json
-from zlib import crc32
+from os.path import isdir, join
+from json import load
+from rdautils import mkimage, gen_fota_file
 from platformio.util import get_systype
 
 from SCons.Script import DefaultEnvironment
@@ -32,7 +32,7 @@
 
 # Load core configuration
 with open(join(LOGICROMSDK_DIR, "lib", "rda8910", "core_config.json")) as f:
-    core_config = json.load(f)
+    core_config = load(f)
     f.close()
 
 # RDA Tools
@@ -65,44 +65,14 @@
 env.Replace(LDSCRIPT_PATH="linkerscript_out.ld")
 
 
-def gen_img_file(target, source, env):
-    cmd = ["$OBJCOPY"]
-    (target_firm, ) = target
-    (source_elf, ) = source
-
-    target_img = join(env.subst("$BUILD_DIR"), env.subst("$PROGNAME") + '.img')
-
-    cmd.extend(["-O", "binary"])
-    cmd.append(source_elf.get_abspath())
-    cmd.append(target_img)
-    env.Execute(env.VerboseAction(" ".join(cmd), " "))
-
-    # fix bin size to 0x80 boundary
-    binsz = getsize(target_img)
-    f_binsz = (binsz + 0x7F) & ~0x7F
-    print("Binary size: %d" % binsz)
-    f = open(target_img, "rb")
-    f_bin = bytearray(f.read())
-    f.close()
-    f_bin += bytes(f_binsz - binsz)
-    # Fix header size
-    f_bin[4:8] = f_binsz.to_bytes(4, "little")
-    # Fix checksum
-    f_bin[8:0xC] = crc32(f_bin).to_bytes(4, "little")
-    # write final binary
-    f = open(target_img, "wb")
-    f.write(f_bin)
-    f.close()
-
-
 def gen_pac_file(target, source, env):
     (target_firm, ) = target
     (source_elf, ) = source
 
     # Generate image file
     if "darwin" in get_systype():
         print("Generating Firmware Image")
-        gen_img_file(target, source, env)
+        mkimage(target, source, env)
     else:
         env.Execute(
             env.VerboseAction("$MKIMAGE " + source_elf.get_abspath() + ' ' + join("$BUILD_DIR", env.subst("$PROGNAME") + '.img'),
@@ -240,10 +210,7 @@ def gen_pac_file(target, source, env):
 
 if "darwin" in get_systype():
     env["BUILDERS"]["BinToFOTA"] = Builder(
-        action=env.VerboseAction(" ".join([
-            'echo',
-            '"FOTA file generation is currently not supported. Please use Linux/Windows system."'
-        ]), "Generating FOTA firmware $TARGET"),
+        action=env.VerboseAction(gen_fota_file, "Generating FOTA firmware $TARGET"),
         suffix=".bin"
     )
 

builder/framework/rda8910/logicromsdk.py

@@ -3,10 +3,10 @@
 # SPDX-License-Identifier: MIT
 #
 
-from os.path import getsize, isdir, isfile, join
+from os.path import isdir, isfile, join
 from shutil import copyfile
-import json
-from zlib import crc32
+from json import load
+from rdautils import mkimage, gen_fota_file
 from platformio.util import get_systype
 
 from SCons.Script import DefaultEnvironment
@@ -20,7 +20,7 @@
 
 # Load core configuration
 with open(join(FRAMEWORK_DIR, "lib", "rda8910", "core_config.json")) as f:
-    core_config = json.load(f)
+    core_config = load(f)
     f.close()
 
 # RDA Tools
@@ -59,44 +59,14 @@
     copyfile(join(FRAMEWORK_DIR, "template", "main.c"), main_c)
 
 
-def gen_img_file(target, source, env):
-    cmd = ["$OBJCOPY"]
-    (target_firm, ) = target
-    (source_elf, ) = source
-
-    target_img = join(env.subst("$BUILD_DIR"), env.subst("$PROGNAME") + '.img')
-    
-    cmd.extend(["-O", "binary"])
-    cmd.append(source_elf.get_abspath())
-    cmd.append(target_img)
-    env.Execute(env.VerboseAction(" ".join(cmd), " "))
-
-    # fix bin size to 0x80 boundary
-    binsz = getsize(target_img)
-    f_binsz = (binsz + 0x7F) & ~0x7F
-    print("Binary size: %d" % binsz)
-    f = open(target_img, "rb")
-    f_bin = bytearray(f.read())
-    f.close()
-    f_bin += bytes(f_binsz - binsz)
-    # Fix header size
-    f_bin[4:8] = f_binsz.to_bytes(4, "little")
-    # Fix checksum
-    f_bin[8:0xC] = crc32(f_bin).to_bytes(4, "little")
-    # write final binary
-    f = open(target_img, "wb")
-    f.write(f_bin)
-    f.close()
-
-
 def gen_pac_file(target, source, env):
     (target_firm, ) = target
     (source_elf, ) = source
 
     # Generate image file
     if "darwin" in get_systype():
         print("Generating Firmware Image")
-        gen_img_file(target, source, env)
+        mkimage(target, source, env)
     else:
         env.Execute(
             env.VerboseAction("$MKIMAGE " + source_elf.get_abspath() + ' ' + join("$BUILD_DIR", env.subst('$PROGNAME') + '.img'),
@@ -138,6 +108,7 @@ def gen_pac_file(target, source, env):
     ]
     env.Execute(env.VerboseAction(" ".join(pac_cmd), " "))
 
+
 # Setup ENV
 env.Append(
     ASFLAGS=["-x", "assembler-with-cpp"],
@@ -226,10 +197,7 @@ def gen_pac_file(target, source, env):
 
 if "darwin" in get_systype():
     env["BUILDERS"]["BinToFOTA"] = Builder(
-        action=env.VerboseAction(" ".join([
-            'echo',
-            '"FOTA file generation is currently not supported. Please use Linux/Windows system."'
-        ]), "Generating FOTA firmware $TARGET"),
+        action=env.VerboseAction(gen_fota_file, "Generating FOTA firmware $TARGET"),
         suffix=".bin"
     )