Most columns in the version table for E810 and E830 are the same, so
merge the two by renaming the "firmware" column to "E810 FW" and add a
new column for "E830 FW" with only the last two row populated.

Signed-off-by: Bruce Richardson <[email protected]>
---
 doc/guides/nics/ice.rst | 71 +++++++++++++++++------------------------
 1 file changed, 30 insertions(+), 41 deletions(-)

diff --git a/doc/guides/nics/ice.rst b/doc/guides/nics/ice.rst
index 216c79b6f2..bfd1514b39 100644
--- a/doc/guides/nics/ice.rst
+++ b/doc/guides/nics/ice.rst
@@ -58,47 +58,36 @@ The full list of in-tree and out-of-tree Linux kernel 
drivers from kernel.org
 and Linux distributions that were tested and verified
 are listed in the Tested Platforms section of the Release Notes for each 
release.
 
-For E810,
-
-   
+-----------+---------------+-----------------+-----------+--------------+-----------+
-   |    DPDK   | Kernel Driver | OS Default DDP  | COMMS DDP | Wireless DDP | 
Firmware  |
-   
+===========+===============+=================+===========+==============+===========+
-   |    21.11  |     1.7.16    |      1.3.27     |  1.3.31   |    1.3.7     |  
  3.1    |
-   
+-----------+---------------+-----------------+-----------+--------------+-----------+
-   |    22.03  |     1.8.3     |      1.3.28     |  1.3.35   |    1.3.8     |  
  3.2    |
-   
+-----------+---------------+-----------------+-----------+--------------+-----------+
-   |    22.07  |     1.9.11    |      1.3.30     |  1.3.37   |    1.3.10    |  
  4.0    |
-   
+-----------+---------------+-----------------+-----------+--------------+-----------+
-   |    22.11  |     1.10.1    |      1.3.30     |  1.3.37   |    1.3.10    |  
  4.1    |
-   
+-----------+---------------+-----------------+-----------+--------------+-----------+
-   |    23.03  |     1.11.1    |      1.3.30     |  1.3.40   |    1.3.10    |  
  4.2    |
-   
+-----------+---------------+-----------------+-----------+--------------+-----------+
-   |    23.07  |     1.12.6    |      1.3.35     |  1.3.45   |    1.3.13    |  
  4.3    |
-   
+-----------+---------------+-----------------+-----------+--------------+-----------+
-   |    23.11  |     1.13.7    |      1.3.36     |  1.3.46   |    1.3.14    |  
  4.4    |
-   
+-----------+---------------+-----------------+-----------+--------------+-----------+
-   |    24.03  |     1.13.7    |      1.3.35     |  1.3.45   |    1.3.13    |  
  4.4    |
-   
+-----------+---------------+-----------------+-----------+--------------+-----------+
-   |    24.07  |     1.14.11   |      1.3.36     |  1.3.46   |    1.3.14    |  
  4.5    |
-   
+-----------+---------------+-----------------+-----------+--------------+-----------+
-   |    24.11  |     1.15.4    |      1.3.36     |  1.3.46   |    1.3.14    |  
  4.6    |
-   
+-----------+---------------+-----------------+-----------+--------------+-----------+
-   |    25.03  |     1.16.3    |      1.3.39     |  1.3.53   |    1.3.14    |  
  4.7    |
-   
+-----------+---------------+-----------------+-----------+--------------+-----------+
-   |    25.07  |     2.2.8     |      1.3.43     |  1.3.55   |    1.3.23    |  
  4.8    |
-   
+-----------+---------------+-----------------+-----------+--------------+-----------+
-   |    25.11  |     2.3.14    |      1.3.43     |  1.3.55   |    1.3.25    |  
  4.9    |
-   
+-----------+---------------+-----------------+-----------+--------------+-----------+
-
-For E830,
-
-   
+-----------+---------------+-----------------+-----------+--------------+-----------+
-   |    DPDK   | Kernel Driver | OS Default DDP  | COMMS DDP | Wireless DDP | 
Firmware  |
-   
+===========+===============+=================+===========+==============+===========+
-   |    25.07  |     2.2.8     |      1.3.43     |  1.3.55   |    1.3.23    |  
  1.0    |
-   
+-----------+---------------+-----------------+-----------+--------------+-----------+
-   |    25.11  |     2.3.14    |      1.3.43     |  1.3.55   |    1.3.25    |  
  1.11   |
-   
+-----------+---------------+-----------------+-----------+--------------+-----------+
+   
+-----------+---------------+--------------+-----------+--------------+----------+----------+
+   |    DPDK   | Kernel Driver | Default DDP  | COMMS DDP | Wireless DDP |  
E810 FW |  E830 FW |
+   
+===========+===============+==============+===========+==============+==========+==========+
+   |    21.11  |     1.7.16    |   1.3.27     |  1.3.31   |    1.3.7     |    
3.1   |          |
+   
+-----------+---------------+--------------+-----------+--------------+----------+----------+
+   |    22.03  |     1.8.3     |   1.3.28     |  1.3.35   |    1.3.8     |    
3.2   |          |
+   
+-----------+---------------+--------------+-----------+--------------+----------+----------+
+   |    22.07  |     1.9.11    |   1.3.30     |  1.3.37   |    1.3.10    |    
4.0   |          |
+   
+-----------+---------------+--------------+-----------+--------------+----------+----------+
+   |    22.11  |     1.10.1    |   1.3.30     |  1.3.37   |    1.3.10    |    
4.1   |          |
+   
+-----------+---------------+--------------+-----------+--------------+----------+----------+
+   |    23.03  |     1.11.1    |   1.3.30     |  1.3.40   |    1.3.10    |    
4.2   |          |
+   
+-----------+---------------+--------------+-----------+--------------+----------+----------+
+   |    23.07  |     1.12.6    |   1.3.35     |  1.3.45   |    1.3.13    |    
4.3   |          |
+   
+-----------+---------------+--------------+-----------+--------------+----------+----------+
+   |    23.11  |     1.13.7    |   1.3.36     |  1.3.46   |    1.3.14    |    
4.4   |          |
+   
+-----------+---------------+--------------+-----------+--------------+----------+----------+
+   |    24.03  |     1.13.7    |   1.3.35     |  1.3.45   |    1.3.13    |    
4.4   |          |
+   
+-----------+---------------+--------------+-----------+--------------+----------+----------+
+   |    24.07  |     1.14.11   |   1.3.36     |  1.3.46   |    1.3.14    |    
4.5   |          |
+   
+-----------+---------------+--------------+-----------+--------------+----------+----------+
+   |    24.11  |     1.15.4    |   1.3.36     |  1.3.46   |    1.3.14    |    
4.6   |          |
+   
+-----------+---------------+--------------+-----------+--------------+----------+----------+
+   |    25.03  |     1.16.3    |   1.3.39     |  1.3.53   |    1.3.14    |    
4.7   |          |
+   
+-----------+---------------+--------------+-----------+--------------+----------+----------+
+   |    25.07  |     2.2.8     |   1.3.43     |  1.3.55   |    1.3.23    |    
4.8   |    1.0   |
+   
+-----------+---------------+--------------+-----------+--------------+----------+----------+
+   |    25.11  |     2.3.14    |   1.3.43     |  1.3.55   |    1.3.25    |    
4.9   |    1.11  |
+   
+-----------+---------------+--------------+-----------+--------------+----------+----------+
+
 
 Dynamic Device Personalization (DDP) package loading
 ----------------------------------------------------
-- 
2.51.0

Reply via email to