Unified Firmware Redux²

.github/workflows/build.yml

@@ -159,7 +159,7 @@ jobs:
     strategy:
       matrix:
         os: ['macos', 'ubuntu', 'windows']
-        board: ['HACKRF_ONE', 'JAWBREAKER', 'RAD1O', 'PRALINE']
+        board: ['HACKRF_ONE', 'JAWBREAKER', 'RAD1O', 'PRALINE', 'UNIVERSAL']
         cmake: ['3.10.0', 'latest']
         exclude:
           - os: 'windows'

.github/workflows/includes-check.yml

@@ -13,7 +13,7 @@ jobs:
       options: --user 0
     strategy:
       matrix:
-        board: ['HACKRF_ONE', 'JAWBREAKER', 'RAD1O', 'PRALINE']
+        board: ['HACKRF_ONE', 'JAWBREAKER', 'RAD1O', 'PRALINE', 'UNIVERSAL']
         cmake: ['3.10.0', 'latest']
 
       # Don't cancel all builds when one fails

Jenkinsfile

@@ -67,6 +67,46 @@ pipeline {
                 }
             }
         }
+        stage('Test HackRF One with BOARD=UNIVERSAL') {
+            agent {
+                docker {
+                    image 'hackrf'
+                    reuseNode true
+                    args docker_args
+                }
+            }
+            options {
+                timeout(time: 20, unit: 'MINUTES')
+            }
+            steps {
+                sh './ci-scripts/install_host.sh'
+                sh './ci-scripts/build_firmware.sh UNIVERSAL'
+                script {
+                    allOff()
+                    reset('h1_eut')
+                }
+                sh 'sleep 1s'
+                retry(3) {
+                    sh './ci-scripts/test_host.sh'
+                }
+                script {
+                    reset('h1_tester h1_eut')
+                }
+                sh 'sleep 1s'
+                script {
+                    // Allow up to 3 retries 5 minutes each for the HIL test
+                    runCommand(3, 5, 'MINUTES', "HackRF One Test", h1_test)
+                }
+                script {
+                    allOff()
+                    reset('h1_eut')
+                }
+                sh 'sleep 1s'
+                retry(3) {
+                    sh 'python3 ci-scripts/test_sgpio_debug.py'
+                }
+            }
+        }
         stage('Test HackRF Pro with BOARD=PRALINE') {
             agent {
                 docker {
@@ -99,6 +139,38 @@ pipeline {
                 }
             }
         }
+        stage('Test HackRF Pro with BOARD=UNIVERSAL') {
+            agent {
+                docker {
+                    image 'hackrf'
+                    reuseNode true
+                    args "$docker_args"
+                }
+            }
+            options {
+                timeout(time: 20, unit: 'MINUTES')
+            }
+            steps {
+                sh './ci-scripts/install_host.sh'
+                sh './ci-scripts/build_firmware.sh UNIVERSAL'
+                script {
+                    allOff()
+                    reset('hpro_eut')
+                }
+                sh 'sleep 1s'
+                retry(3) {
+                    sh './ci-scripts/test_host.sh'
+                }
+                script {
+                    reset('hpro_tester hpro_eut')
+                }
+                sh 'sleep 1s'
+                script {
+                    // Allow up to 3 retries 5 minutes each for the HIL test
+                    runCommand(3, 5, 'MINUTES', "HackRF Pro Test", hpro_test)
+                }
+            }
+        }
     }
     post {
         always {

firmware/common/cpld_jtag.c

@@ -19,16 +19,16 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#if !defined(PRALINE)
-	#include <stdint.h>
-#endif
-
 #include "cpld_jtag.h"
-#if !defined(PRALINE)
+
+#include "platform_detect.h"
+
+#ifdef IS_NOT_PRALINE
+	#include <stdint.h>
 	#include "xapp058/micro.h"
 #endif
 
-#ifndef PRALINE
+#ifdef IS_NOT_PRALINE
 static refill_buffer_cb refill_buffer;
 static uint32_t xsvf_buffer_len, xsvf_pos;
 static unsigned char* xsvf_buffer;
@@ -41,25 +41,37 @@ void cpld_jtag_take(jtag_t* const jtag)
 	/* Set initial GPIO state to the voltages of the internal or external pull-ups/downs,
 	 * to avoid any glitches.
 	 */
-#if (defined HACKRF_ONE || defined PRALINE)
-	gpio_set(gpio->gpio_pp_tms);
+#ifdef IS_EXPANSION_COMPATIBLE
+	if (IS_EXPANSION_COMPATIBLE) {
+		gpio_set(gpio->gpio_pp_tms);
+	}
 #endif
+
 	gpio_clear(gpio->gpio_tck);
-#ifndef PRALINE
-	gpio_set(gpio->gpio_tms);
-	gpio_set(gpio->gpio_tdi);
+
+#ifdef IS_NOT_PRALINE
+	if (IS_NOT_PRALINE) {
+		gpio_set(gpio->gpio_tms);
+		gpio_set(gpio->gpio_tdi);
+	}
 #endif
 
-#if (defined HACKRF_ONE || defined PRALINE)
-	/* Do not drive PortaPack-specific TMS pin initially, just to be cautious. */
-	gpio_input(gpio->gpio_pp_tms);
-	gpio_input(gpio->gpio_pp_tdo);
+#ifdef IS_EXPANSION_COMPATIBLE
+	if (IS_EXPANSION_COMPATIBLE) {
+		/* Do not drive PortaPack-specific TMS pin initially, just to be cautious. */
+		gpio_input(gpio->gpio_pp_tms);
+		gpio_input(gpio->gpio_pp_tdo);
+	}
 #endif
+
 	gpio_output(gpio->gpio_tck);
-#ifndef PRALINE
-	gpio_output(gpio->gpio_tms);
-	gpio_output(gpio->gpio_tdi);
-	gpio_input(gpio->gpio_tdo);
+
+#ifdef IS_NOT_PRALINE
+	if (IS_NOT_PRALINE) {
+		gpio_output(gpio->gpio_tms);
+		gpio_output(gpio->gpio_tdi);
+		gpio_input(gpio->gpio_tdo);
+	}
 #endif
 }
 
@@ -70,20 +82,26 @@ void cpld_jtag_release(jtag_t* const jtag)
 	/* Make all pins inputs when JTAG interface not active.
 	 * Let the pull-ups/downs do the work.
 	 */
-#if (defined HACKRF_ONE || defined PRALINE)
-	/* Do not drive PortaPack-specific pins, initially, just to be cautious. */
-	gpio_input(gpio->gpio_pp_tms);
-	gpio_input(gpio->gpio_pp_tdo);
+#ifdef IS_EXPANSION_COMPATIBLE
+	if (IS_EXPANSION_COMPATIBLE) {
+		/* Do not drive PortaPack-specific pins, initially, just to be cautious. */
+		gpio_input(gpio->gpio_pp_tms);
+		gpio_input(gpio->gpio_pp_tdo);
+	}
 #endif
+
 	gpio_input(gpio->gpio_tck);
-#ifndef PRALINE
-	gpio_input(gpio->gpio_tms);
-	gpio_input(gpio->gpio_tdi);
-	gpio_input(gpio->gpio_tdo);
+
+#ifdef IS_NOT_PRALINE
+	if (IS_NOT_PRALINE) {
+		gpio_input(gpio->gpio_tms);
+		gpio_input(gpio->gpio_tdi);
+		gpio_input(gpio->gpio_tdo);
+	}
 #endif
 }
 
-#ifndef PRALINE
+#ifdef IS_NOT_PRALINE
 /* return 0 if success else return error code see xsvfExecute() */
 int cpld_jtag_program(
 	jtag_t* const jtag,

firmware/common/cpld_jtag.h

@@ -24,15 +24,16 @@
 #include <stdint.h>
 
 #include "gpio.h"
+#include "platform_detect.h"
 
 typedef struct {
 	gpio_t gpio_tck;
-#ifndef PRALINE
+#ifdef IS_NOT_PRALINE
 	gpio_t gpio_tms;
 	gpio_t gpio_tdi;
 	gpio_t gpio_tdo;
 #endif
-#if (defined HACKRF_ONE || defined PRALINE)
+#ifdef IS_EXPANSION_COMPATIBLE
 	gpio_t gpio_pp_tms;
 	gpio_t gpio_pp_tdo;
 #endif

firmware/common/firmware_info.c

@@ -30,6 +30,9 @@
 	#define SUPPORTED_PLATFORM PLATFORM_RAD1O
 #elif PRALINE
 	#define SUPPORTED_PLATFORM PLATFORM_PRALINE
+#elif UNIVERSAL
+	#define SUPPORTED_PLATFORM \
+		(PLATFORM_PRALINE | PLATFORM_HACKRF1_OG | PLATFORM_HACKRF1_R9)
 #else
 	#define SUPPORTED_PLATFORM 0
 #endif