Merge branch 'release/v1.1.0'

.github/workflows/examples.yml

@@ -13,6 +13,7 @@ jobs:
           - "examples/shakti-sdk_gpio-keypad"
           - "examples/shakti-sdk_i2c-lm75"
           - "examples/shakti-sdk_uart-hello"
+          - "examples/shakti-sdk_weatherstation"
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v2

boards/parashu.json

@@ -0,0 +1,40 @@
+{
+  "build": {
+    "extra_flags": "-D parashu",
+    "f_cpu": "50000000L",
+    "hwids": [
+      [
+        "0x002a",
+        "0x15ba"
+      ]
+    ],
+    "mabi": "ilp32",
+    "march": "rv32imac",
+    "mcmodel": "medany",
+    "mcu": "E-Class",
+    "shakti-sdk":{
+      "ldscript": "link.ld"
+    }
+  },
+  "debug": {
+    "onboard_tools": [
+      "ftdi"
+    ],
+    "svd_path": "parashu.svd"
+  },
+  "frameworks": [
+    "shakti-sdk"
+  ],
+  "name": "Parashu on Artix-7 100T Arty FPGA Evaluation Kit",
+  "upload": {
+    "maximum_ram_size": 131072,
+    "maximum_size": 0,
+    "protocol": "ftdi",
+    "protocols": [
+      "ftdi",
+      "jlink"
+    ]
+  },
+  "url": "https://www.xilinx.com/products/boards-and-kits/arty.html",
+  "vendor": "Xilinx"
+}

boards/pinaka.json

@@ -0,0 +1,40 @@
+{
+  "build": {
+    "extra_flags": "-D pinaka",
+    "f_cpu": "50000000L",
+    "hwids": [
+      [
+        "0x002a",
+        "0x15ba"
+      ]
+    ],
+    "mabi": "ilp32",
+    "march": "rv32imac",
+    "mcmodel": "medany",
+    "mcu": "E-Class",
+    "shakti-sdk":{
+      "ldscript": "link.ld"
+    }
+  },
+  "debug": {
+    "onboard_tools": [
+      "ftdi"
+    ],
+    "svd_path": "pinaka.svd"
+  },
+  "frameworks": [
+    "shakti-sdk"
+  ],
+  "name": "Pinaka on Artix-7 35T Arty FPGA Evaluation Kit",
+  "upload": {
+    "maximum_ram_size": 131072,
+    "maximum_size": 0,
+    "protocol": "ftdi",
+    "protocols": [
+      "ftdi",
+      "jlink"
+    ]
+  },
+  "url": "https://www.xilinx.com/products/boards-and-kits/arty.html",
+  "vendor": "Xilinx"
+}

boards/vajra.json

@@ -0,0 +1,40 @@
+{
+  "build": {
+    "extra_flags": "-D vajra",
+    "f_cpu": "50000000L",
+    "hwids": [
+      [
+        "0x002a",
+        "0x15ba"
+      ]
+    ],
+    "mabi": "lp64",
+    "march": "rv64imac",
+    "mcmodel": "medany",
+    "mcu": "C-Class",
+    "shakti-sdk":{
+      "ldscript": "link.ld"
+    }
+  },
+  "debug": {
+    "onboard_tools": [
+      "ftdi"
+    ],
+    "svd_path": "vajra.svd"
+  },
+  "frameworks": [
+    "shakti-sdk"
+  ],
+  "name": "Vajra on Arty A7-100: Artix-7 FPGA Development Board",
+  "upload": {
+    "maximum_ram_size": 134217728,
+    "maximum_size": 0,
+    "protocol": "ftdi",
+    "protocols": [
+      "ftdi",
+      "jlink"
+    ]
+  },
+  "url": "https://www.xilinx.com/products/boards-and-kits/1-w51quh.html",
+  "vendor": "Xilinx"
+}

builder/frameworks/_bare.py

@@ -37,7 +37,7 @@
         "-mcmodel=%s" % board_config.get("build.mcmodel")
     ],
 
-    LIBS=["c", "m", "gcc"]
+    LIBS=["m", "gcc"]
 )
 
 # copy CCFLAGS to ASFLAGS (-x assembler-with-cpp mode)

builder/frameworks/shakti-sdk.py

@@ -42,15 +42,16 @@ def is_valid_target(target):
 
 env.Append(
     ASFLAGS=[
-        ("-D__ASSEMBLY__=1")
+        ("-D__ASSEMBLY__=1"),
+        "-fno-common"
     ],
 
     CFLAGS=[
+        "-static",
         "-std=gnu99"
     ],
 
     CCFLAGS=[
-        "-fno-common",
         "-fno-builtin-printf"
     ],
 
@@ -61,7 +62,11 @@ def is_valid_target(target):
 
     LIBPATH=[
         join(FRAMEWORK_DIR, "bsp", "third_party", target)
-    ]
+    ],
+
+    LINKFLAGS=[
+        "-static"
+    ],
 )
 
 if not is_valid_target(target):
@@ -75,14 +80,9 @@ def is_valid_target(target):
 # Target: Build core BSP libraries
 #
 
-unsupported_drivers = ("plic", "timer")
-
 libs = []
 
 for driver in listdir(join(FRAMEWORK_DIR, "bsp", "drivers")):
-    if driver in unsupported_drivers:
-        continue
-
     libs.append(
         env.BuildLibrary(
             join("$BUILD_DIR", "bsp", "drivers", driver),
@@ -91,14 +91,16 @@ def is_valid_target(target):
 
 libs.append(
     env.BuildLibrary(
-        join("$BUILD_DIR", "bsp", "libwrap"),
-        join(FRAMEWORK_DIR, "bsp", "libwrap"))
+        join("$BUILD_DIR", "bsp", "core"),
+        join(FRAMEWORK_DIR, "bsp", "core")
+    )
 )
 
 libs.append(
     env.BuildLibrary(
-        join("$BUILD_DIR", "bsp", "include"),
-        join(FRAMEWORK_DIR, "bsp", "include"))
+        join("$BUILD_DIR", "bsp", "libs"),
+        join(FRAMEWORK_DIR, "bsp", "libs")
+    )
 )
 
 libs.append(

builder/main.py

@@ -35,7 +35,7 @@
     RANLIB="riscv64-unknown-elf-gcc-ranlib",
     SIZETOOL="riscv64-unknown-elf-size",
 
-    ARFLAGS=["rc"],
+    ARFLAGS=["rcs"],
 
     SIZEPRINTCMD='$SIZETOOL -d $SOURCES',
 
@@ -85,8 +85,8 @@
     target_elf = env.BuildProgram()
     target_hex = env.ElfToHex(join("$BUILD_DIR", "${PROGNAME}"), target_elf)
 
-AlwaysBuild(env.Alias("nobuild", target_elf))
-target_buildprog = env.Alias("buildprog", target_elf, target_elf)
+AlwaysBuild(env.Alias("nobuild", target_hex))
+target_buildprog = env.Alias("buildprog", target_hex, target_hex)
 
 #
 # Target: Print binary size
@@ -147,7 +147,7 @@ def _jlink_cmd_script(env, source):
     openocd_args.extend(
         debug_tools.get(upload_protocol).get("server").get("arguments", []))
     openocd_args.extend([
-        "-c", "init; load_image {$SOURCE} %s; shutdown;" %
+        "-c", "init; load_image {$SOURCE} %s;resume 0x80000000;shutdown" %
         board_config.get("upload").get("flash_start", "")
     ])
     env.Replace(

examples/shakti-sdk_gpio-keypad/platformio.ini

@@ -23,3 +23,20 @@ framework = shakti-sdk
 board = artix7_100t
 monitor_speed = 19200
 
+[env:parashu]
+platform = shakti
+framework = shakti-sdk
+board = parashu
+monitor_speed = 19200
+
+[env:pinaka]
+platform = shakti
+framework = shakti-sdk
+board = pinaka
+monitor_speed = 19200
+
+[env:vajra]
+platform = shakti
+framework = shakti-sdk
+board = vajra
+monitor_speed = 19200