Merge pull request #7 from sdgtt/jira-jenkins

Make carrier-daugther info consistent with board_table.yaml
sdgtt · May 10, 2022 · 796b5ef · 796b5ef
2 parents dda3ba2 + 7ea6c58
commit 796b5ef
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/sdg-nuc-01 b/sdg-nuc-01
@@ -1,8 +1,8 @@
 pluto:
   board-config:
   - board-name: pluto
-  - carrier:  xxx
-  - daughter: Pluto  
+  - carrier:  ADALM-PLUTO
+  - daughter: xxx  
   - reference-boot-folder: plutosdr-fw
   - monitoring-interface: uart
   driver-config:
@@ -135,8 +135,8 @@ zynq-zc702-adv7511-ad9361-fmcomms2-3:
 zynq-adrv9364-z7020-bob-vcmos:
   board-config:
   - board-name: zynq-adrv9364-z7020-bob-vcmos
-  - carrier: Z7020
-  - daughter: ADRV9364-BOB-CMOS  
+  - carrier: ADRV1CRR-BOB
+  - daughter: ADRV9364-BOB-CMOS
   - monitoring-interface: uart
   - allow-jtag: True
   downloader-config:
@@ -175,6 +175,8 @@ zynq-adrv9364-z7020-bob-vcmos:
 zynq-adrv9364-z7020-bob-vlvds:
   board-config:
   - board-name: zynq-adrv9364-z7020-bob-vlvds
+  - carrier: ADRV1CRR-BOB
+  - daughter: ADRV9364-BOB-LVDS  
   - monitoring-interface: uart
   - allow-jtag: True
   downloader-config:

diff --git a/sdg-nuc-02 b/sdg-nuc-02
@@ -1,6 +1,8 @@
 m2k:
   board-config:
   - board-name: m2k
+  - carrier: ADALM-2000
+  - daugther: xxx
   - reference-boot-folder: m2k-fw
   - monitoring-interface: uart
   driver-config:
@@ -166,7 +168,7 @@ zynq-zed-adv7511-ad9364-fmcomms4:
 zynq-adrv9361-z7035-fmc:
   board-config:
   - board-name: zynq-adrv9361-z7035-fmc
-  - carrier: xxx
+  - carrier: ADRV1CRR-FMC
   - daughter: ADRV9361-FMC
   - monitoring-interface: uart
   - allow-jtag: True
@@ -389,7 +391,7 @@ zynqmp-zcu102-rev10-adrv9002-rx2tx2-vcmos:
 zynqmp-zcu102-rev10-adrv9002-rx2tx2-vlvds:
   board-config:
   - board-name: zynqmp-zcu102-rev10-adrv9002-rx2tx2-vlvds
-  - carrier: ZED
+  - carrier: ZCU102
   - daughter: ADRV9002-RX2TX2-LVDS
   - monitoring-interface: uart
   - allow-jtag: True