n3xx: e320: Update documentation for E320 and N3XX targets

- Add e320 and n3xx in build_instructions
- Update maximum allowable blocks in image_builder scripts

Author: sugandhagupta

README.md

@@ -29,7 +29,7 @@ USRP devices.
 ### Generation 3
 
 - Directory: __usrp3__
-- Devices: USRP B2X0, USRP X Series, USRP E3X0
+- Devices: USRP B2X0, USRP X Series, USRP E3X0, USRP N3xx
 - Tools: Vivado from Xilinx, ISE from Xilinx, GNU make
 - [Build Instructions](http://files.ettus.com/manual/md_usrp3_build_instructions.html)
 - [Simulation](http://files.ettus.com/manual/md_usrp3_simulation.html)

docs/usrp3/build_instructions.md

@@ -22,6 +22,7 @@ The USRP FPGA build system requires a UNIX-like environment with the following d
 - USRP X300: Kintex 7 XC7K325T (7 Series)
 - USRP X310: Kintex 7 XC7K410T (7 Series)
 - USRP E310: Zynq-7000 XC7Z020 (7 Series)
+- USRP E320: Zynq-7000 XC7Z045 (7 Series)
 - USRP N310: Zynq-7100 XC7Z100 (7 Series)
 
 ### Requirements
@@ -79,6 +80,7 @@ The following additional packages are also required and can be selected in the G
 - Navigate to `usrp3/top/{project}` where project is:
   + x300: For USRP X300 and USRP X310
   + e300: For USRP E310
+  + e320: For USRP E320
 
 - To add vivado to the PATH and to setup up the Ettus Xilinx build environment run
   + `source setupenv.sh` (If Vivado is installed in the default path /opt/Xilinx/Vivado) _OR_
@@ -165,6 +167,21 @@ a list and usage information
 - `build/usrp_<product>_fpga.bin` : Configuration bitstream without header
 - `build/usrp_<product>_fpga.rpt` : System, utilization and timing summary report
 
+### E320 Targets and Outputs
+
+#### Supported Targets
+- E320_1G: 1GigE on SFP+ Port.
+- E320_XG: 10GigE on SFP+ Port.
+- E320_AA: Aurora on SFP+ Port.
+- E320_RFNOC_1G: 1GigE on SFP+ Port. RFNOC CEs enabled.
+- E320_RFNOC_XG: 10GigE on SFP+ Port. RFNOC CEs enabled.
+- E320_RFNOC_AA: Aurora on SFP+ Port. RFNOC CEs enabled.
+
+#### Outputs
+- `build/usrp_<product>_fpga.bit` : Configuration bitstream with header
+- `build/usrp_<product>_fpga.bin` : Configuration bitstream without header
+- `build/usrp_<product>_fpga.rpt` : System, utilization and timing summary report
+
 ### Additional Build Options
 
 It is possible to make a target and specific additional options in the form VAR=VALUE in

usrp3/tools/scripts/uhd_image_builder.py

@@ -102,7 +102,8 @@ def setup_parser():
     parser.add_argument(
         "-m", "--max-num-blocks", type=int,
         help="Maximum number of blocks (Max. Allowed for x310|x300: 10,\
-                for e300: 6)",
+                for e300: 14, for e320: 12, for n300: 11, \
+                for n310/n320: 10)",
         default=10)
     parser.add_argument(
         "--fill-with-fifos",
@@ -116,12 +117,12 @@ def setup_parser():
         default=None)
     parser.add_argument(
         "-d", "--device",
-        help="Device to be programmed [x300, x310, e310, n300, n310]",
+        help="Device to be programmed [x300, x310, e310, e320, n300, n310]",
         default="x310")
     parser.add_argument(
         "-t", "--target",
         help="Build target - image type [X3X0_RFNOC_HG, X3X0_RFNOC_XG,\
-                E310_RFNOC_sg3...]",
+                E310_RFNOC_sg3, E320_RFNOC_1G, N310_RFNOC_HG, ...]",
         default=None)
     parser.add_argument(
         "-g", "--GUI",
@@ -424,21 +425,23 @@ def device_dict(args):
         'x310':'x300',
         'e300':'e300',
         'e310':'e300',
+        'e320':'e320',
         'n300':'n3xx',
         'n310':'n3xx'
     }
     return build_dir[args]
 
 def dtarget(args):
     """
-    If no target specified,  selecs the default building target based on the
+    If no target specified,  selects the default building target based on the
     targeted device
     """
     if args.target is None:
         default_trgt = {
             'x300':'X300_RFNOC_HG',
             'x310':'X310_RFNOC_HG',
             'e310':'E310_RFNOC_HLS',
+            'e320':'E320_RFNOC_1G',
             'n300':'N300_RFNOC_HG',
             'n310':'N310_RFNOC_HG'
         }

usrp3/tools/scripts/uhd_image_builder_gui.py

@@ -147,6 +147,7 @@ def init_gui(self):
         self.targets.setModel(self.model_targets)
         self.populate_target('x300')
         self.populate_target('e300')
+        self.populate_target('e320')
         self.populate_target('n3xx')
         grid.addWidget(self.targets, 0, 0, 8, 1)
 
@@ -399,8 +400,14 @@ def ootlist(self):
             self.max_allowed_blocks = 10
         elif self.device == 'E310':
             self.target = 'e300'
-            self.max_allowed_blocks = 6
-        if self.device == 'N310' or self.device == 'N300':
+            self.max_allowed_blocks = 14
+        elif self.device == 'E320':
+            self.target = 'e320'
+            self.max_allowed_blocks = 12
+        elif self.device == 'N300':
+            self.target = 'n3xx'
+            self.max_allowed_blocks = 11
+        elif self.device == 'N310' or self.device == 'N320':
             self.target = 'n3xx'
             self.max_allowed_blocks = 10
         oot_sources = os.path.join(uhd_image_builder.get_scriptpath(), '..', '..', 'top',\