Move carrier-daughter names to board-config

Signed-off-by: Julia Pineda <[email protected]>
sdgtt · Jan 11, 2022 · da542a4 · da542a4
1 parent 2188deb
commit da542a4
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 54 deletions.
diff --git a/sdg-nuc-01 b/sdg-nuc-01
@@ -1,6 +1,8 @@
 pluto:
   board-config:
   - board-name: pluto
+  - carrier:  xxx
+  - daughter: Pluto  
   - reference-boot-folder: plutosdr-fw
   - monitoring-interface: uart
   driver-config:
@@ -15,9 +17,6 @@ pluto:
   - netbox_api_token: 0123456789abcdef0123456789abcdef01234567
   network-config:
   - dutip: 192.168.2.1
-  jira-config:
-  - carrier:  xxx
-  - daughter: Pluto
   system-config:
   - tftpserverip: 192.168.10.1
   - tftpserverroot: /tftpboot
@@ -28,6 +27,8 @@ pluto:
 zynq-zc706-adv7511-fmcomms11:
   board-config:
   - board-name: zynq-zc706-adv7511-fmcomms11
+  - carrier: ZC706
+  - daughter: FMCOMSS11
   - monitoring-interface: uart
   - allow-jtag: True
   downloader-config:
@@ -48,9 +49,6 @@ zynq-zc706-adv7511-fmcomms11:
   network-config:
   - dutip: 192.168.10.61
   - dhcp: False
-  jira-config:
-  - carrier: ZC706
-  - daughter: FMCOMSS11
   pdu-config:
   - pdu_type: cyberpower
   - pduip: 192.168.10.136
@@ -68,6 +66,8 @@ zynq-zc706-adv7511-fmcomms11:
 zynq-zed-adv7511-ad7768-1-evb:
   board-config:
   - board-name: zynq-zed-adv7511-ad7768-1-evb
+  - carrier: ZED
+  - daughter: AD7768-1-EVB
   - monitoring-interface: uart
   - allow-jtag: True
   downloader-config:
@@ -83,9 +83,6 @@ zynq-zed-adv7511-ad7768-1-evb:
   network-config:
   - dutip: 192.168.10.62
   - dhcp: False
-  jira-config:
-  - carrier: ZED
-  - daughter: AD7768-1-EVB
   pdu-config:
   - pdu_type: cyberpower
   - pduip: 192.168.10.136
@@ -103,6 +100,8 @@ zynq-zed-adv7511-ad7768-1-evb:
 zynq-zc702-adv7511-ad9361-fmcomms2-3:
   board-config:
   - board-name: zynq-zc702-adv7511-ad9361-fmcomms2-3
+  - carrier: ZC702
+  - daughter: FMCOMMS2-3
   - monitoring-interface: uart
   - allow-jtag: True
   downloader-config:
@@ -124,9 +123,6 @@ zynq-zc702-adv7511-ad9361-fmcomms2-3:
   network-config:
   - dutip: 192.168.10.69
   - dhcp: True
-  jira-config:
-  - carrier: ZC702
-  - daughter: FMCOMMS2-3
   pdu-config:
   - pdu_type: cyberpower
   - pduip: 192.168.10.136
@@ -141,6 +137,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  
   - monitoring-interface: uart
   - allow-jtag: True
   downloader-config:
@@ -160,9 +158,6 @@ zynq-adrv9364-z7020-bob-vcmos:
   network-config:
   - dutip: 192.168.10.70
   - dhcp: False
-  jira-config:
-  - carrier: Z7020
-  - daughter: ADRV9364-BOB-CMOS
   pdu-config:
   - pdu_type: cyberpower
   - pduip: 192.168.10.136
@@ -180,6 +175,8 @@ zynq-adrv9364-z7020-bob-vcmos:
 zynqmp-zcu102-rev10-ad9172-fmc-ebz-mode4:
   board-config:
   - board-name: zynqmp-zcu102-rev10-ad9172-fmc-ebz-mode4
+  - carrier: ZCU102
+  - daughter: AD9172-FMC-EVB  
   - monitoring-interface: uart
   - allow-jtag: True
   downloader-config:
@@ -196,9 +193,6 @@ zynqmp-zcu102-rev10-ad9172-fmc-ebz-mode4:
   network-config:
   - dutip: 192.168.10.81
   - dhcp: True
-  jira-config:
-  - carrier: ZCU102
-  - daughter: AD9172-FMC-EVB
   pdu-config:
   - pdu_type: cyberpower
   - pduip: 192.168.10.136
@@ -213,6 +207,8 @@ zynqmp-zcu102-rev10-ad9172-fmc-ebz-mode4:
 zynqmp-zcu102-rev10-fmcdaq3:
   board-config:
   - board-name: zynqmp-zcu102-rev10-fmcdaq3
+  - carrier: ZCU102
+  - daughter: FMCDAQ3
   - monitoring-interface: uart
   - allow-jtag: True
   downloader-config:
@@ -228,9 +224,6 @@ zynqmp-zcu102-rev10-fmcdaq3:
   network-config:
   - dutip: 192.168.10.139
   - dhcp: True
-  jira-config:
-  - carrier: ZCU102
-  - daughter: FMCDAQ3
   pdu-config:
   - pdu_type: cyberpower
   - pduip: 192.168.10.136

diff --git a/sdg-nuc-02 b/sdg-nuc-02
@@ -22,6 +22,8 @@ m2k:
 zynq-zed-adv7511-adrv9002-vcmos:
   board-config:
   - board-name: zynq-zed-adv7511-adrv9002-vcmos
+  - carrier: ZED
+  - daughter: ADRV9002-CMOS
   - monitoring-interface: uart
   - allow-jtag: True
   downloader-config:
@@ -44,9 +46,6 @@ zynq-zed-adv7511-adrv9002-vcmos:
   network-config:
   - dutip: 192.168.10.57
   - dhcp: True
-  jira-config:
-  - carrier: ZED
-  - daughter: ADRV9002-CMOS
   pdu-config:
   - pdu_type: cyberpower
   - pduip: 192.168.10.253
@@ -61,6 +60,8 @@ zynq-zed-adv7511-adrv9002-vcmos:
 zynq-zed-adv7511-adrv9002-rx2tx2-vcmos:
   board-config:
   - board-name: zynq-zed-adv7511-adrv9002-rx2tx2-vcmos
+  - carrier: ZED
+  - daughter: ADRV9002-RX2TX2
   - monitoring-interface: uart
   - allow-jtag: True
   downloader-config:
@@ -80,9 +81,6 @@ zynq-zed-adv7511-adrv9002-rx2tx2-vcmos:
   network-config:
   - dutip: 192.168.10.57
   - dhcp: True
-  jira-config:
-  - carrier: ZED
-  - daughter: ADRV9002-RX2TX2
   pdu-config:
   - pdu_type: cyberpower
   - pduip: 192.168.10.253
@@ -97,6 +95,8 @@ zynq-zed-adv7511-adrv9002-rx2tx2-vcmos:
 zynq-zed-adv7511-ad9361-fmcomms2-3:
   board-config:
   - board-name: zynq-zed-adv7511-ad9361-fmcomms2-3
+  - carrier: ZED
+  - daughter: FMCOMMS2-3
   - monitoring-interface: uart
   - allow-jtag: True
   downloader-config:
@@ -118,9 +118,6 @@ zynq-zed-adv7511-ad9361-fmcomms2-3:
   network-config:
   - dutip: 192.168.10.108
   - dhcp: True
-  jira-config:
-  - carrier: ZED
-  - daughter: FMCOMMS2-3
   pdu-config:
   - pdu_type: cyberpower
   - pduip: 192.168.10.253
@@ -135,6 +132,8 @@ zynq-zed-adv7511-ad9361-fmcomms2-3:
 zynq-zed-adv7511-ad9364-fmcomms4:
   board-config:
   - board-name: zynq-zed-adv7511-ad9364-fmcomms4
+  - carrier: ZED
+  - daughter: FMCOMMS4
   - monitoring-interface: uart
   - allow-jtag: True
   downloader-config:
@@ -157,9 +156,6 @@ zynq-zed-adv7511-ad9364-fmcomms4:
   network-config:
   - dutip: 192.168.10.109
   - dhcp: True
-  jira-config:
-  - carrier: ZED
-  - daughter: FMCOMMS4
   pdu-config:
   - pdu_type: cyberpower
   - pduip: 192.168.10.253
@@ -174,6 +170,8 @@ zynq-zed-adv7511-ad9364-fmcomms4:
 zynq-adrv9361-z7035-fmc:
   board-config:
   - board-name: zynq-adrv9361-z7035-fmc
+  - carrier: xxx
+  - daughter: ADRV9361-FMC
   - monitoring-interface: uart
   - allow-jtag: True
   downloader-config:
@@ -193,9 +191,6 @@ zynq-adrv9361-z7035-fmc:
   network-config:
   - dutip: 192.168.10.110
   - dhcp: False
-  jira-config:
-  - carrier: xxx
-  - daughter: ADRV9361-FMC
   pdu-config:
   - pdu_type: cyberpower
   - pduip: 192.168.10.253
@@ -213,6 +208,8 @@ zynq-adrv9361-z7035-fmc:
 zynq-zc706-adv7511-fmcdaq2:
   board-config:
   - board-name: zynq-zc706-adv7511-fmcdaq2
+  - carrier: ZC706
+  - daughter: FMCDAQ2
   - monitoring-interface: uart
   - allow-jtag: True
   downloader-config:
@@ -231,9 +228,6 @@ zynq-zc706-adv7511-fmcdaq2:
   network-config:
   - dutip: 192.168.10.54
   - dhcp: True
-  jira-config:
-  - carrier: ZC706
-  - daughter: FMCDAQ2
   pdu-config:
   - pdu_type: cyberpower
   - pduip: 192.168.10.253
@@ -248,6 +242,8 @@ zynq-zc706-adv7511-fmcdaq2:
 zynq-zc706-adv7511-ad9361-fmcomms5:
   board-config:
   - board-name: zynq-zc706-adv7511-ad9361-fmcomms5
+  - carrier: ZC706
+  - daughter: FMCOMMS5
   - monitoring-interface: uart
   - allow-jtag: False
   downloader-config:
@@ -269,9 +265,6 @@ zynq-zc706-adv7511-ad9361-fmcomms5:
   network-config:
   - dutip: 192.168.10.111
   - dhcp: True
-  jira-config:
-  - carrier: ZC706
-  - daughter: FMCOMMS5
   pdu-config:
   - pdu_type: cyberpower
   - pduip: 192.168.10.253
@@ -286,6 +279,8 @@ zynq-zc706-adv7511-ad9361-fmcomms5:
 zynqmp-zcu102-rev10-adrv9002-vcmos:
   board-config:
   - board-name: zynqmp-zcu102-rev10-adrv9002-vcmos
+  - carrier: ZCU102
+  - daughter: ADRV9002-CMOS
   - monitoring-interface: uart
   - allow-jtag: True
   downloader-config:
@@ -309,9 +304,6 @@ zynqmp-zcu102-rev10-adrv9002-vcmos:
   network-config:
   - dutip: 192.168.10.60
   - dhcp: True
-  jira-config:
-  - carrier: ZCU102
-  - daughter: ADRV9002-CMOS
   pdu-config:
   - pdu_type: cyberpower
   - pduip: 192.168.10.253
@@ -326,6 +318,8 @@ zynqmp-zcu102-rev10-adrv9002-vcmos:
 zynqmp-zcu102-rev10-adrv9002-vlvds:
   board-config:
   - board-name: zynqmp-zcu102-rev10-adrv9002-vlvds
+  - carrier: ZCU102
+  - daughter: ADRV9002-LVDS
   - monitoring-interface: uart
   - allow-jtag: True
   downloader-config:
@@ -349,9 +343,6 @@ zynqmp-zcu102-rev10-adrv9002-vlvds:
   network-config:
   - dutip: 192.168.10.60
   - dhcp: True
-  jira-config:
-  - carrier: ZCU102
-  - daughter: ADRV9002-LVDS
   pdu-config:
   - pdu_type: cyberpower
   - pduip: 192.168.10.253
@@ -366,6 +357,8 @@ zynqmp-zcu102-rev10-adrv9002-vlvds:
 zynqmp-zcu102-rev10-adrv9002-rx2tx2-vcmos:
   board-config:
   - board-name: zynqmp-zcu102-rev10-adrv9002-rx2tx2-vcmos
+  - carrier: ZCU102
+  - daughter: ADRV9002-RX2TX2-CMOS
   - monitoring-interface: uart
   - allow-jtag: True
   downloader-config:
@@ -386,9 +379,6 @@ zynqmp-zcu102-rev10-adrv9002-rx2tx2-vcmos:
   network-config:
   - dutip: 192.168.10.60
   - dhcp: True
-  jira-config:
-  - carrier: ZCU102
-  - daughter: ADRV9002-RX2TX2-CMOS
   pdu-config:
   - pdu_type: cyberpower
   - pduip: 192.168.10.253
@@ -403,6 +393,8 @@ zynqmp-zcu102-rev10-adrv9002-rx2tx2-vcmos:
 zynqmp-zcu102-rev10-adrv9002-rx2tx2-vlvds:
   board-config:
   - board-name: zynqmp-zcu102-rev10-adrv9002-rx2tx2-vlvds
+  - carrier: ZED
+  - daughter: ADRV9002-RX2TX2-LVDS
   - monitoring-interface: uart
   - allow-jtag: True
   downloader-config:
@@ -423,9 +415,6 @@ zynqmp-zcu102-rev10-adrv9002-rx2tx2-vlvds:
   network-config:
   - dutip: 192.168.10.60
   - dhcp: True
-  jira-config:
-  - carrier: ZED
-  - daughter: ADRV9002-RX2TX2-LVDS
   pdu-config:
   - pdu_type: cyberpower
   - pduip: 192.168.10.253