Merge pull request #64 from vaishnav98/master

.github/workflows/firmware.yml

@@ -107,14 +107,28 @@ jobs:
 
       - uses: actions/upload-artifact@v2
         with:
-          name: zephyr
+          name: bcf-firmware-bin
           path: |
-            sw/zephyrproject/zephyr/build
-            sw/cc2538-bsl.py
+            sw/bcf-zephyr-fw/*
 
       - uses: actions/upload-artifact@v2
         with:
           name: usb-uart-bridge
           path: |
             sw/usb_uart_bridge/usb_uart_bridge*.*
 
+      - name: Prepare Release
+        if: startsWith(github.ref, 'refs/tags/')
+        run: |
+          cd sw/
+          mkdir -p bcf-firmware-release
+          cp bcf-zephyr-fw/* bcf-firmware-release/
+          cp usb_uart_bridge/usb_uart_bridge*.* bcf-firmware-release/
+          zip -r bcf-firmware-release.zip bcf-firmware-release
+
+      - name: Create Release
+        uses: softprops/action-gh-release@v1
+        if: startsWith(github.ref, 'refs/tags/')
+        with:
+          files: |
+            sw/bcf-firmware-release.zip

.gitmodules

@@ -30,7 +30,7 @@
 	url = https://github.com/jadonk/greybus-for-zephyr
 [submodule "sw/zephyrproject/greybus-for-zephyr-mikrobus"]
 	path = sw/zephyrproject/greybus-for-zephyr-mikrobus
-	url = https://github.com/jadonk/greybus-for-zephyr
+	url = https://github.com/vaishnav98/greybus-for-zephyr
 [submodule "sw/zephyrproject/mikrobus-clickid-flasher"]
 	path = sw/zephyrproject/mikrobus-clickid-flasher
 	url = https://github.com/vaishnav98/mikrobus-clickid-flasher.git

sw/build-firmware.sh

@@ -21,4 +21,18 @@ west build -p always -b beagleconnect_freedom $ZPRJ/greybus-for-zephyr-mikrobus/
 # WPANUSB Gateway SubG
 west build -p always -b beagleconnect_freedom $ZPRJ/wpanusb_bc -d $ZEPHYR_BASE/build/wpanusb_beagleconnect -- -DOVERLAY_CONFIG=overlay-subghz.conf -DBOARD_ROOT=$ZPRJ/wpanusb_bc -DCONFIG_NET_CONFIG_IEEE802154_RADIO_TX_POWER=14 -DCONFIG_IEEE802154_CC13XX_CC26XX_SUB_GHZ_DIV_SETUP_PA=1 -DCONFIG_IEEE802154_CC13XX_CC26XX_SUB_GHZ_CS_THRESHOLD=-20
 
-
+# make a FW release directory with the FW binaries and relevant debug info
+mkdir -p $SWDIR/bcf-zephyr-fw
+cp $SWDIR/cc2538-bsl.py  $SWDIR/bcf-zephyr-fw/
+
+copy_fwbin () {
+		if [ -f $ZEPHYR_BASE/build/$1/zephyr/zephyr.bin ] ; then
+			cp $ZEPHYR_BASE/build/$1/zephyr/zephyr.bin $SWDIR/bcf-zephyr-fw/$1.bin
+			cp $ZEPHYR_BASE//build/$1/zephyr/zephyr.dts $SWDIR/bcf-zephyr-fw/$1.dts
+			cp $ZEPHYR_BASE/build/$1/zephyr/.config $SWDIR/bcf-zephyr-fw/$1.config
+		fi
+}
+
+copy_fwbin sensortest_beagleconnect
+copy_fwbin greybus_mikrobus_beagleconnect
+copy_fwbin wpanusb_beagleconnect

sw/cc2538-bsl.py

@@ -1120,7 +1120,9 @@ def main(file, port=None, erase=1, write=1, verify=1, baud=50000):
     # print("RUN CC2535-BSL!")
     # print(sys.argv[1:])
     port = None
-    file = sys.argv[1] + '/zephyr/zephyr.bin'
+    file = sys.argv[1]
+    if not sys.argv[1].endswith(".bin"):
+        file += '/zephyr/zephyr.bin'
     if len(sys.argv) > 2:
         port = sys.argv[2]
     main(file, port)