initCompiler updates

Fixes to handle when spys move locations within
scom registers.

Change-Id: Iadf2c44c27f68f82ed9bc590f22155e0749a37f6
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/66943
Tested-by: HWSV CI <hwsv-ci+hostboot@us.ibm.com>
Tested-by: Hostboot CI <hostboot-ci+hostboot@us.ibm.com>
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Reviewed-by: Joseph J. McGill <jmcgill@us.ibm.com>
Reviewed-by: Benjamin Gass <bgass@us.ibm.com>
Reviewed-by: Claus M. Olsen <cmolsen@us.ibm.com>
Reviewed-by: Jennifer A. Stofer <stofer@us.ibm.com>
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/66953
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Christian R. Geddes <crgeddes@us.ibm.com>

8 files changed, 2049 insertions, 851 deletions

diff --git a/src/import/chips/p9/procedures/hwp/initfiles/p9_cxa_scom.C b/src/import/chips/p9/procedures/hwp/initfiles/p9_cxa_scom.C
index 58c7b19f4..2014227f2 100644
--- a/src/import/chips/p9/procedures/hwp/initfiles/p9_cxa_scom.C
+++ b/src/import/chips/p9/procedures/hwp/initfiles/p9_cxa_scom.C
@@ -63,13 +63,31 @@ fapi2::ReturnCode p9_cxa_scom(const fapi2::Target<fapi2::TARGET_TYPE_CAPP>& TGT0
         {
             FAPI_TRY(fapi2::getScom( TGT0, 0x2010803ull, l_scom_buffer ));
 
-            if ((l_TGT2_ATTR_CHIP_EC_FEATURE_HW414700 != literal_0))
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5)
+                    && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10))
+                || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12)) || ((l_chip_id == 0x6)
+                        && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
             {
-                l_scom_buffer.insert<0, 53, 0, uint64_t>(literal_0x801B1F98C8717000 );
+                if ((l_TGT2_ATTR_CHIP_EC_FEATURE_HW414700 != literal_0))
+                {
+                    l_scom_buffer.insert<0, 53, 0, uint64_t>(literal_0x801B1F98C8717000 );
+                }
+                else if (literal_1)
+                {
+                    l_scom_buffer.insert<0, 53, 0, uint64_t>(literal_0x801B1F98D8717000 );
+                }
             }
-            else if (literal_1)
+
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
             {
-                l_scom_buffer.insert<0, 53, 0, uint64_t>(literal_0x801B1F98D8717000 );
+                if ((l_TGT2_ATTR_CHIP_EC_FEATURE_HW414700 != literal_0))
+                {
+                    l_scom_buffer.insert<0, 52, 0, uint64_t>(literal_0x801B1F98C8717000 );
+                }
+                else if (literal_1)
+                {
+                    l_scom_buffer.insert<0, 52, 0, uint64_t>(literal_0x801B1F98D8717000 );
+                }
             }
 
             FAPI_TRY(fapi2::putScom(TGT0, 0x2010803ull, l_scom_buffer));
@@ -77,16 +95,17 @@ fapi2::ReturnCode p9_cxa_scom(const fapi2::Target<fapi2::TARGET_TYPE_CAPP>& TGT0
         {
             FAPI_TRY(fapi2::getScom( TGT0, 0x2010806ull, l_scom_buffer ));
 
-            if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5)
+                    && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10))
+                || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12)) || ((l_chip_id == 0x6)
+                        && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
             {
-                l_scom_buffer.insert<0, 52, 12, uint64_t>(literal_0x0000000000000 );
+                l_scom_buffer.insert<0, 53, 11, uint64_t>(literal_0x0000000000000 );
             }
-            else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21))
-                     || ((l_chip_id == 0x5) && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6)
-                             && (l_chip_ec == 0x10)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12))
-                     || ((l_chip_id == 0x6) && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
             {
-                l_scom_buffer.insert<0, 53, 11, uint64_t>(literal_0x0000000000000 );
+                l_scom_buffer.insert<0, 52, 12, uint64_t>(literal_0x0000000000000 );
             }
 
             FAPI_TRY(fapi2::putScom(TGT0, 0x2010806ull, l_scom_buffer));
@@ -94,17 +113,18 @@ fapi2::ReturnCode p9_cxa_scom(const fapi2::Target<fapi2::TARGET_TYPE_CAPP>& TGT0
         {
             FAPI_TRY(fapi2::getScom( TGT0, 0x2010807ull, l_scom_buffer ));
 
-            if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5)
+                    && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10))
+                || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12)) || ((l_chip_id == 0x6)
+                        && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
             {
                 l_scom_buffer.insert<2, 1, 63, uint64_t>(literal_0b1 );
                 l_scom_buffer.insert<34, 1, 63, uint64_t>(literal_0b1 );
                 l_scom_buffer.insert<44, 1, 63, uint64_t>(literal_0b1 );
                 l_scom_buffer.insert<8, 1, 63, uint64_t>(literal_0b1 );
             }
-            else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21))
-                     || ((l_chip_id == 0x5) && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6)
-                             && (l_chip_ec == 0x10)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12))
-                     || ((l_chip_id == 0x6) && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
             {
                 l_scom_buffer.insert<2, 1, 63, uint64_t>(literal_0b1 );
                 l_scom_buffer.insert<34, 1, 63, uint64_t>(literal_0b1 );
diff --git a/src/import/chips/p9/procedures/hwp/initfiles/p9_fbc_ioe_dl_scom.C b/src/import/chips/p9/procedures/hwp/initfiles/p9_fbc_ioe_dl_scom.C
index c90f0d40a..43abf31e0 100644
--- a/src/import/chips/p9/procedures/hwp/initfiles/p9_fbc_ioe_dl_scom.C
+++ b/src/import/chips/p9/procedures/hwp/initfiles/p9_fbc_ioe_dl_scom.C
@@ -64,16 +64,17 @@ fapi2::ReturnCode p9_fbc_ioe_dl_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS
             constexpr auto l_PB_IOE_LL1_CONFIG_CRC_LANE_ID_ON = 0x1;
             l_scom_buffer.insert<2, 1, 63, uint64_t>(l_PB_IOE_LL1_CONFIG_CRC_LANE_ID_ON );
 
-            if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5)
+                    && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10))
+                || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12)) || ((l_chip_id == 0x6)
+                        && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
             {
-                l_scom_buffer.insert<12, 4, 60, uint64_t>(literal_0x0B );
+                l_scom_buffer.insert<11, 5, 59, uint64_t>(literal_0x0B );
             }
-            else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21))
-                     || ((l_chip_id == 0x5) && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6)
-                             && (l_chip_ec == 0x10)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12))
-                     || ((l_chip_id == 0x6) && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
             {
-                l_scom_buffer.insert<11, 5, 59, uint64_t>(literal_0x0B );
+                l_scom_buffer.insert<12, 4, 60, uint64_t>(literal_0x0B );
             }
 
             l_scom_buffer.insert<28, 4, 60, uint64_t>(literal_0xF );
@@ -92,16 +93,17 @@ fapi2::ReturnCode p9_fbc_ioe_dl_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS
         {
             FAPI_TRY(fapi2::getScom( TGT0, 0x6011819ull, l_scom_buffer ));
 
-            if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5)
+                    && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10))
+                || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12)) || ((l_chip_id == 0x6)
+                        && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
             {
-                l_scom_buffer.insert<8, 2, 62, uint64_t>(literal_0b111 );
+                l_scom_buffer.insert<8, 3, 61, uint64_t>(literal_0b111 );
             }
-            else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21))
-                     || ((l_chip_id == 0x5) && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6)
-                             && (l_chip_ec == 0x10)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12))
-                     || ((l_chip_id == 0x6) && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
             {
-                l_scom_buffer.insert<8, 3, 61, uint64_t>(literal_0b111 );
+                l_scom_buffer.insert<8, 2, 62, uint64_t>(literal_0b111 );
             }
 
             l_scom_buffer.insert<4, 4, 60, uint64_t>(literal_0xF );
diff --git a/src/import/chips/p9/procedures/hwp/initfiles/p9_fbc_ioe_tl_scom.C b/src/import/chips/p9/procedures/hwp/initfiles/p9_fbc_ioe_tl_scom.C
index 75e58ce9d..6b4077578 100644
--- a/src/import/chips/p9/procedures/hwp/initfiles/p9_fbc_ioe_tl_scom.C
+++ b/src/import/chips/p9/procedures/hwp/initfiles/p9_fbc_ioe_tl_scom.C
@@ -440,23 +440,38 @@ fapi2::ReturnCode p9_fbc_ioe_tl_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC
             if ((l_def_X0_ENABLED && (l_TGT0_ATTR_CHIP_EC_FEATURE_HW384245 != literal_0)))
             {
                 l_scom_buffer.insert<1, 7, 57, uint64_t>(literal_0x3F );
-                l_scom_buffer.insert<33, 7, 57, uint64_t>(literal_0x3F );
             }
             else if (l_def_X0_ENABLED)
             {
                 l_scom_buffer.insert<1, 7, 57, uint64_t>(literal_0x40 );
+            }
+
+            if ((l_def_X0_ENABLED && (l_TGT0_ATTR_CHIP_EC_FEATURE_HW384245 != literal_0)))
+            {
+                l_scom_buffer.insert<33, 7, 57, uint64_t>(literal_0x3F );
+            }
+            else if (l_def_X0_ENABLED)
+            {
                 l_scom_buffer.insert<33, 7, 57, uint64_t>(literal_0x40 );
             }
 
             if (l_def_X0_ENABLED)
             {
                 l_scom_buffer.insert<9, 7, 57, uint64_t>(literal_0x3C );
+            }
+
+            if (l_def_X0_ENABLED)
+            {
                 l_scom_buffer.insert<41, 7, 57, uint64_t>(literal_0x3C );
             }
 
             if (l_def_X0_ENABLED)
             {
                 l_scom_buffer.insert<17, 7, 57, uint64_t>(literal_0x3C );
+            }
+
+            if (l_def_X0_ENABLED)
+            {
                 l_scom_buffer.insert<49, 7, 57, uint64_t>(literal_0x3C );
             }
 
@@ -477,23 +492,38 @@ fapi2::ReturnCode p9_fbc_ioe_tl_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC
             if ((l_def_X1_ENABLED && (l_TGT0_ATTR_CHIP_EC_FEATURE_HW384245 != literal_0)))
             {
                 l_scom_buffer.insert<1, 7, 57, uint64_t>(literal_0x3F );
-                l_scom_buffer.insert<33, 7, 57, uint64_t>(literal_0x3F );
             }
             else if (l_def_X1_ENABLED)
             {
                 l_scom_buffer.insert<1, 7, 57, uint64_t>(literal_0x40 );
+            }
+
+            if ((l_def_X1_ENABLED && (l_TGT0_ATTR_CHIP_EC_FEATURE_HW384245 != literal_0)))
+            {
+                l_scom_buffer.insert<33, 7, 57, uint64_t>(literal_0x3F );
+            }
+            else if (l_def_X1_ENABLED)
+            {
                 l_scom_buffer.insert<33, 7, 57, uint64_t>(literal_0x40 );
             }
 
             if (l_def_X1_ENABLED)
             {
                 l_scom_buffer.insert<9, 7, 57, uint64_t>(literal_0x3C );
+            }
+
+            if (l_def_X1_ENABLED)
+            {
                 l_scom_buffer.insert<41, 7, 57, uint64_t>(literal_0x3C );
             }
 
             if (l_def_X1_ENABLED)
             {
                 l_scom_buffer.insert<17, 7, 57, uint64_t>(literal_0x3C );
+            }
+
+            if (l_def_X1_ENABLED)
+            {
                 l_scom_buffer.insert<49, 7, 57, uint64_t>(literal_0x3C );
             }
 
@@ -514,23 +544,38 @@ fapi2::ReturnCode p9_fbc_ioe_tl_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC
             if ((l_def_X2_ENABLED && (l_TGT0_ATTR_CHIP_EC_FEATURE_HW384245 != literal_0)))
             {
                 l_scom_buffer.insert<1, 7, 57, uint64_t>(literal_0x3F );
-                l_scom_buffer.insert<33, 7, 57, uint64_t>(literal_0x3F );
             }
             else if (l_def_X2_ENABLED)
             {
                 l_scom_buffer.insert<1, 7, 57, uint64_t>(literal_0x40 );
+            }
+
+            if ((l_def_X2_ENABLED && (l_TGT0_ATTR_CHIP_EC_FEATURE_HW384245 != literal_0)))
+            {
+                l_scom_buffer.insert<33, 7, 57, uint64_t>(literal_0x3F );
+            }
+            else if (l_def_X2_ENABLED)
+            {
                 l_scom_buffer.insert<33, 7, 57, uint64_t>(literal_0x40 );
             }
 
             if (l_def_X2_ENABLED)
             {
                 l_scom_buffer.insert<9, 7, 57, uint64_t>(literal_0x3C );
+            }
+
+            if (l_def_X2_ENABLED)
+            {
                 l_scom_buffer.insert<41, 7, 57, uint64_t>(literal_0x3C );
             }
 
             if (l_def_X2_ENABLED)
             {
                 l_scom_buffer.insert<17, 7, 57, uint64_t>(literal_0x3C );
+            }
+
+            if (l_def_X2_ENABLED)
+            {
                 l_scom_buffer.insert<49, 7, 57, uint64_t>(literal_0x3C );
             }
 
@@ -580,36 +625,60 @@ fapi2::ReturnCode p9_fbc_ioe_tl_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC
             if (l_def_X0_ENABLED)
             {
                 l_scom_buffer.insert<0, 4, 60, uint64_t>(literal_0b0100 );
+            }
+
+            if (l_def_X0_ENABLED)
+            {
                 l_scom_buffer.insert<8, 4, 60, uint64_t>(literal_0b0100 );
             }
 
             if (l_def_X0_ENABLED)
             {
                 l_scom_buffer.insert<4, 4, 60, uint64_t>(literal_0b0001 );
+            }
+
+            if (l_def_X0_ENABLED)
+            {
                 l_scom_buffer.insert<12, 4, 60, uint64_t>(literal_0b0001 );
             }
 
             if ((( ! l_def_X0_ENABLED) && l_def_X1_ENABLED))
             {
                 l_scom_buffer.insert<16, 4, 60, uint64_t>(literal_0b0100 );
+            }
+
+            if ((( ! l_def_X0_ENABLED) && l_def_X1_ENABLED))
+            {
                 l_scom_buffer.insert<24, 4, 60, uint64_t>(literal_0b0100 );
             }
 
             if ((( ! l_def_X0_ENABLED) && l_def_X1_ENABLED))
             {
                 l_scom_buffer.insert<20, 4, 60, uint64_t>(literal_0b0001 );
+            }
+
+            if ((( ! l_def_X0_ENABLED) && l_def_X1_ENABLED))
+            {
                 l_scom_buffer.insert<28, 4, 60, uint64_t>(literal_0b0001 );
             }
 
             if (((( ! l_def_X0_ENABLED) && ( ! l_def_X1_ENABLED)) && l_def_X2_ENABLED))
             {
                 l_scom_buffer.insert<32, 4, 60, uint64_t>(literal_0b0100 );
+            }
+
+            if (((( ! l_def_X0_ENABLED) && ( ! l_def_X1_ENABLED)) && l_def_X2_ENABLED))
+            {
                 l_scom_buffer.insert<40, 4, 60, uint64_t>(literal_0b0100 );
             }
 
             if (((( ! l_def_X0_ENABLED) && ( ! l_def_X1_ENABLED)) && l_def_X2_ENABLED))
             {
                 l_scom_buffer.insert<36, 4, 60, uint64_t>(literal_0b0001 );
+            }
+
+            if (((( ! l_def_X0_ENABLED) && ( ! l_def_X1_ENABLED)) && l_def_X2_ENABLED))
+            {
                 l_scom_buffer.insert<44, 4, 60, uint64_t>(literal_0b0001 );
             }
 
diff --git a/src/import/chips/p9/procedures/hwp/initfiles/p9_fbc_ioo_dl_scom.C b/src/import/chips/p9/procedures/hwp/initfiles/p9_fbc_ioo_dl_scom.C
index 00982c92b..2b11d4600 100644
--- a/src/import/chips/p9/procedures/hwp/initfiles/p9_fbc_ioo_dl_scom.C
+++ b/src/import/chips/p9/procedures/hwp/initfiles/p9_fbc_ioo_dl_scom.C
@@ -88,16 +88,17 @@ fapi2::ReturnCode p9_fbc_ioo_dl_scom(const fapi2::Target<fapi2::TARGET_TYPE_OBUS
                     l_scom_buffer.insert<0, 1, 63, uint64_t>(l_PB_IOO_LL0_CONFIG_LINK_PAIR_OFF );
                 }
 
-                if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
+                if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5)
+                        && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10))
+                    || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12)) || ((l_chip_id == 0x6)
+                            && (l_chip_ec == 0x13)) )
                 {
-                    l_scom_buffer.insert<12, 4, 60, uint64_t>(literal_0x0F );
+                    l_scom_buffer.insert<11, 5, 59, uint64_t>(literal_0x0F );
                 }
-                else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21))
-                         || ((l_chip_id == 0x5) && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6)
-                                 && (l_chip_ec == 0x10)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12))
-                         || ((l_chip_id == 0x6) && (l_chip_ec == 0x13)) )
+
+                if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
                 {
-                    l_scom_buffer.insert<11, 5, 59, uint64_t>(literal_0x0F );
+                    l_scom_buffer.insert<12, 4, 60, uint64_t>(literal_0x0F );
                 }
 
                 l_scom_buffer.insert<28, 4, 60, uint64_t>(literal_0xF );
@@ -121,20 +122,46 @@ fapi2::ReturnCode p9_fbc_ioo_dl_scom(const fapi2::Target<fapi2::TARGET_TYPE_OBUS
         {
             FAPI_TRY(fapi2::getScom( TGT0, 0x901080cull, l_scom_buffer ));
 
-            if (l_def_OBUS_NV_ENABLED)
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5)
+                    && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10))
+                || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12)) || ((l_chip_id == 0x6)
+                        && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
             {
-                constexpr auto l_PB_IOO_LL0_CONFIG_NV0_NPU_ENABLED_ON = 0x1;
-                l_scom_buffer.insert<61, 1, 63, uint64_t>(l_PB_IOO_LL0_CONFIG_NV0_NPU_ENABLED_ON );
-                constexpr auto l_PB_IOO_LL0_CONFIG_NV1_NPU_ENABLED_ON = 0x1;
-                l_scom_buffer.insert<62, 1, 63, uint64_t>(l_PB_IOO_LL0_CONFIG_NV1_NPU_ENABLED_ON );
-                constexpr auto l_PB_IOO_LL0_CONFIG_NV2_NPU_ENABLED_ON = 0x1;
-                l_scom_buffer.insert<63, 1, 63, uint64_t>(l_PB_IOO_LL0_CONFIG_NV2_NPU_ENABLED_ON );
+                if (l_def_OBUS_NV_ENABLED)
+                {
+                    constexpr auto l_PB_IOO_LL0_CONFIG_NV0_NPU_ENABLED_ON = 0x1;
+                    l_scom_buffer.insert<61, 1, 63, uint64_t>(l_PB_IOO_LL0_CONFIG_NV0_NPU_ENABLED_ON );
+                }
             }
 
-            if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5)
-                    && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23))
-                || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6)
-                        && (l_chip_ec == 0x12)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x13)) )
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5)
+                    && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10))
+                || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12)) || ((l_chip_id == 0x6)
+                        && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+            {
+                if (l_def_OBUS_NV_ENABLED)
+                {
+                    constexpr auto l_PB_IOO_LL0_CONFIG_NV1_NPU_ENABLED_ON = 0x1;
+                    l_scom_buffer.insert<62, 1, 63, uint64_t>(l_PB_IOO_LL0_CONFIG_NV1_NPU_ENABLED_ON );
+                }
+            }
+
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5)
+                    && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10))
+                || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12)) || ((l_chip_id == 0x6)
+                        && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+            {
+                if (l_def_OBUS_NV_ENABLED)
+                {
+                    constexpr auto l_PB_IOO_LL0_CONFIG_NV2_NPU_ENABLED_ON = 0x1;
+                    l_scom_buffer.insert<63, 1, 63, uint64_t>(l_PB_IOO_LL0_CONFIG_NV2_NPU_ENABLED_ON );
+                }
+            }
+
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5)
+                    && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10))
+                || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12)) || ((l_chip_id == 0x6)
+                        && (l_chip_ec == 0x13)) )
             {
                 if ((l_def_OBUS_FBC_ENABLED && (l_TGT0_ATTR_LINK_TRAIN != fapi2::ENUM_ATTR_LINK_TRAIN_ODD_ONLY)))
                 {
@@ -148,10 +175,10 @@ fapi2::ReturnCode p9_fbc_ioo_dl_scom(const fapi2::Target<fapi2::TARGET_TYPE_OBUS
                 }
             }
 
-            if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5)
-                    && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23))
-                || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6)
-                        && (l_chip_ec == 0x12)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x13)) )
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5)
+                    && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10))
+                || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12)) || ((l_chip_id == 0x6)
+                        && (l_chip_ec == 0x13)) )
             {
                 if ((l_def_OBUS_FBC_ENABLED && (l_TGT0_ATTR_LINK_TRAIN != fapi2::ENUM_ATTR_LINK_TRAIN_EVEN_ONLY)))
                 {
@@ -219,46 +246,65 @@ fapi2::ReturnCode p9_fbc_ioo_dl_scom(const fapi2::Target<fapi2::TARGET_TYPE_OBUS
         {
             FAPI_TRY(fapi2::getScom( TGT0, 0x901080full, l_scom_buffer ));
 
-            if (l_def_OBUS_NV_ENABLED)
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
+            {
+                if (l_def_OBUS_NV_ENABLED)
+                {
+                    constexpr auto l_PB_IOO_LL0_CONFIG_NV0_NPU_ENABLED_ON = 0x1;
+                    l_scom_buffer.insert<61, 1, 63, uint64_t>(l_PB_IOO_LL0_CONFIG_NV0_NPU_ENABLED_ON );
+                }
+            }
+
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
             {
-                constexpr auto l_PB_IOO_LL0_CONFIG_NV0_NPU_ENABLED_ON = 0x1;
-                l_scom_buffer.insert<61, 1, 63, uint64_t>(l_PB_IOO_LL0_CONFIG_NV0_NPU_ENABLED_ON );
-                constexpr auto l_PB_IOO_LL0_CONFIG_NV1_NPU_ENABLED_ON = 0x1;
-                l_scom_buffer.insert<62, 1, 63, uint64_t>(l_PB_IOO_LL0_CONFIG_NV1_NPU_ENABLED_ON );
-                constexpr auto l_PB_IOO_LL0_CONFIG_NV2_NPU_ENABLED_ON = 0x1;
-                l_scom_buffer.insert<63, 1, 63, uint64_t>(l_PB_IOO_LL0_CONFIG_NV2_NPU_ENABLED_ON );
+                if (l_def_OBUS_NV_ENABLED)
+                {
+                    constexpr auto l_PB_IOO_LL0_CONFIG_NV1_NPU_ENABLED_ON = 0x1;
+                    l_scom_buffer.insert<62, 1, 63, uint64_t>(l_PB_IOO_LL0_CONFIG_NV1_NPU_ENABLED_ON );
+                }
             }
 
-            if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5)
-                    && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23))
-                || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6)
-                        && (l_chip_ec == 0x12)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x13)) )
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
+            {
+                if (l_def_OBUS_NV_ENABLED)
+                {
+                    constexpr auto l_PB_IOO_LL0_CONFIG_NV2_NPU_ENABLED_ON = 0x1;
+                    l_scom_buffer.insert<63, 1, 63, uint64_t>(l_PB_IOO_LL0_CONFIG_NV2_NPU_ENABLED_ON );
+                }
+            }
+
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
             {
                 if ((l_def_OBUS_FBC_ENABLED && (l_TGT0_ATTR_LINK_TRAIN != fapi2::ENUM_ATTR_LINK_TRAIN_ODD_ONLY)))
                 {
+                    constexpr auto l_PB_IOO_LL0_CONFIG_LINK0_OLL_ENABLED_ON = 0x1;
+                    l_scom_buffer.insert<58, 1, 63, uint64_t>(l_PB_IOO_LL0_CONFIG_LINK0_OLL_ENABLED_ON );
                 }
                 else if (literal_1)
                 {
+                    constexpr auto l_PB_IOO_LL0_CONFIG_LINK0_OLL_ENABLED_OFF = 0x0;
+                    l_scom_buffer.insert<58, 1, 63, uint64_t>(l_PB_IOO_LL0_CONFIG_LINK0_OLL_ENABLED_OFF );
                 }
-            } if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5)
-
-                    && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23))
-                  || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6)
-                          && (l_chip_ec == 0x12)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x13)) )
+            }
 
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
             {
                 if ((l_def_OBUS_FBC_ENABLED && (l_TGT0_ATTR_LINK_TRAIN != fapi2::ENUM_ATTR_LINK_TRAIN_EVEN_ONLY)))
                 {
+                    constexpr auto l_PB_IOO_LL0_CONFIG_LINK1_OLL_ENABLED_ON = 0x1;
+                    l_scom_buffer.insert<59, 1, 63, uint64_t>(l_PB_IOO_LL0_CONFIG_LINK1_OLL_ENABLED_ON );
                 }
                 else if (literal_1)
                 {
+                    constexpr auto l_PB_IOO_LL0_CONFIG_LINK1_OLL_ENABLED_OFF = 0x0;
+                    l_scom_buffer.insert<59, 1, 63, uint64_t>(l_PB_IOO_LL0_CONFIG_LINK1_OLL_ENABLED_OFF );
                 }
-            } if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5)
+            }
 
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5)
                     && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23))
-                  || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6)
-                          && (l_chip_ec == 0x12)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x13)) )
-
+                || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6)
+                        && (l_chip_ec == 0x12)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x13)) )
             {
                 l_scom_buffer.insert<4, 4, 60, uint64_t>(literal_0x5 );
             }
diff --git a/src/import/chips/p9/procedures/hwp/initfiles/p9_fbc_ioo_tl_scom.C b/src/import/chips/p9/procedures/hwp/initfiles/p9_fbc_ioo_tl_scom.C
index 5bd6b7865..3dbe9c32c 100644
--- a/src/import/chips/p9/procedures/hwp/initfiles/p9_fbc_ioo_tl_scom.C
+++ b/src/import/chips/p9/procedures/hwp/initfiles/p9_fbc_ioo_tl_scom.C
@@ -399,7 +399,8 @@ fapi2::ReturnCode p9_fbc_ioo_tl_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC
                         l_scom_buffer.insert<9, 7, 57, uint64_t>(literal_0x3C );
                     }
                 }
-                else if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
+
+                if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
                 {
                     if (l_def_OBUS0_FBC_ENABLED)
                     {
@@ -417,7 +418,8 @@ fapi2::ReturnCode p9_fbc_ioo_tl_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC
                         l_scom_buffer.insert<17, 7, 57, uint64_t>(literal_0x3C );
                     }
                 }
-                else if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
+
+                if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
                 {
                     if (l_def_OBUS0_FBC_ENABLED)
                     {
@@ -435,7 +437,8 @@ fapi2::ReturnCode p9_fbc_ioo_tl_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC
                         l_scom_buffer.insert<41, 7, 57, uint64_t>(literal_0x3C );
                     }
                 }
-                else if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
+
+                if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
                 {
                     if (l_def_OBUS0_FBC_ENABLED)
                     {
@@ -453,7 +456,8 @@ fapi2::ReturnCode p9_fbc_ioo_tl_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC
                         l_scom_buffer.insert<49, 7, 57, uint64_t>(literal_0x3C );
                     }
                 }
-                else if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
+
+                if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
                 {
                     if (l_def_OBUS0_FBC_ENABLED)
                     {
@@ -591,7 +595,8 @@ fapi2::ReturnCode p9_fbc_ioo_tl_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC
                         l_scom_buffer.insert<9, 7, 57, uint64_t>(literal_0x3C );
                     }
                 }
-                else if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
+
+                if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
                 {
                     if (l_def_OBUS3_FBC_ENABLED)
                     {
@@ -609,7 +614,8 @@ fapi2::ReturnCode p9_fbc_ioo_tl_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC
                         l_scom_buffer.insert<17, 7, 57, uint64_t>(literal_0x3C );
                     }
                 }
-                else if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
+
+                if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
                 {
                     if (l_def_OBUS3_FBC_ENABLED)
                     {
@@ -627,7 +633,8 @@ fapi2::ReturnCode p9_fbc_ioo_tl_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC
                         l_scom_buffer.insert<41, 7, 57, uint64_t>(literal_0x3C );
                     }
                 }
-                else if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
+
+                if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
                 {
                     if (l_def_OBUS3_FBC_ENABLED)
                     {
@@ -645,7 +652,8 @@ fapi2::ReturnCode p9_fbc_ioo_tl_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC
                         l_scom_buffer.insert<49, 7, 57, uint64_t>(literal_0x3C );
                     }
                 }
-                else if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
+
+                if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
                 {
                     if (l_def_OBUS3_FBC_ENABLED)
                     {
@@ -784,36 +792,60 @@ fapi2::ReturnCode p9_fbc_ioo_tl_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC
                 if (l_def_OBUS0_FBC_ENABLED)
                 {
                     l_scom_buffer.insert<0, 4, 60, uint64_t>(literal_0b0001 );
+                }
+
+                if (l_def_OBUS0_FBC_ENABLED)
+                {
                     l_scom_buffer.insert<8, 4, 60, uint64_t>(literal_0b0001 );
                 }
 
                 if (l_def_OBUS0_FBC_ENABLED)
                 {
                     l_scom_buffer.insert<4, 4, 60, uint64_t>(literal_0b0100 );
+                }
+
+                if (l_def_OBUS0_FBC_ENABLED)
+                {
                     l_scom_buffer.insert<12, 4, 60, uint64_t>(literal_0b0100 );
                 }
 
                 if ((( ! l_def_OBUS0_FBC_ENABLED) && l_def_OBUS1_FBC_ENABLED))
                 {
                     l_scom_buffer.insert<16, 4, 60, uint64_t>(literal_0b0001 );
+                }
+
+                if ((( ! l_def_OBUS0_FBC_ENABLED) && l_def_OBUS1_FBC_ENABLED))
+                {
                     l_scom_buffer.insert<24, 4, 60, uint64_t>(literal_0b0001 );
                 }
 
                 if ((( ! l_def_OBUS0_FBC_ENABLED) && l_def_OBUS1_FBC_ENABLED))
                 {
                     l_scom_buffer.insert<20, 4, 60, uint64_t>(literal_0b0100 );
+                }
+
+                if ((( ! l_def_OBUS0_FBC_ENABLED) && l_def_OBUS1_FBC_ENABLED))
+                {
                     l_scom_buffer.insert<28, 4, 60, uint64_t>(literal_0b0100 );
                 }
 
                 if (((( ! l_def_OBUS0_FBC_ENABLED) && ( ! l_def_OBUS1_FBC_ENABLED)) && l_def_OBUS2_FBC_ENABLED))
                 {
                     l_scom_buffer.insert<32, 4, 60, uint64_t>(literal_0b0001 );
+                }
+
+                if (((( ! l_def_OBUS0_FBC_ENABLED) && ( ! l_def_OBUS1_FBC_ENABLED)) && l_def_OBUS2_FBC_ENABLED))
+                {
                     l_scom_buffer.insert<40, 4, 60, uint64_t>(literal_0b0001 );
                 }
 
                 if (((( ! l_def_OBUS0_FBC_ENABLED) && ( ! l_def_OBUS1_FBC_ENABLED)) && l_def_OBUS2_FBC_ENABLED))
                 {
                     l_scom_buffer.insert<36, 4, 60, uint64_t>(literal_0b0100 );
+                }
+
+                if (((( ! l_def_OBUS0_FBC_ENABLED) && ( ! l_def_OBUS1_FBC_ENABLED)) && l_def_OBUS2_FBC_ENABLED))
+                {
                     l_scom_buffer.insert<44, 4, 60, uint64_t>(literal_0b0100 );
                 }
 
@@ -821,6 +853,11 @@ fapi2::ReturnCode p9_fbc_ioo_tl_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC
                      && l_def_OBUS3_FBC_ENABLED))
                 {
                     l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0001 );
+                }
+
+                if ((((( ! l_def_OBUS0_FBC_ENABLED) && ( ! l_def_OBUS1_FBC_ENABLED)) && ( ! l_def_OBUS2_FBC_ENABLED))
+                     && l_def_OBUS3_FBC_ENABLED))
+                {
                     l_scom_buffer.insert<56, 4, 60, uint64_t>(literal_0b0001 );
                 }
 
@@ -828,6 +865,11 @@ fapi2::ReturnCode p9_fbc_ioo_tl_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC
                      && l_def_OBUS3_FBC_ENABLED))
                 {
                     l_scom_buffer.insert<52, 4, 60, uint64_t>(literal_0b0100 );
+                }
+
+                if ((((( ! l_def_OBUS0_FBC_ENABLED) && ( ! l_def_OBUS1_FBC_ENABLED)) && ( ! l_def_OBUS2_FBC_ENABLED))
+                     && l_def_OBUS3_FBC_ENABLED))
+                {
                     l_scom_buffer.insert<60, 4, 60, uint64_t>(literal_0b0100 );
                 }
 
diff --git a/src/import/chips/p9/procedures/hwp/initfiles/p9_npu_scom.C b/src/import/chips/p9/procedures/hwp/initfiles/p9_npu_scom.C
index bab88484a..61b8d6814 100644
--- a/src/import/chips/p9/procedures/hwp/initfiles/p9_npu_scom.C
+++ b/src/import/chips/p9/procedures/hwp/initfiles/p9_npu_scom.C
@@ -470,7 +470,19 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>&
             {
                 FAPI_TRY(fapi2::getScom( TGT0, 0x501101aull, l_scom_buffer ));
 
-                l_scom_buffer.insert<40, 1, 63, uint64_t>(literal_1 );
+                if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5)
+                        && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10))
+                    || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12)) || ((l_chip_id == 0x6)
+                            && (l_chip_ec == 0x13)) )
+                {
+                    l_scom_buffer.insert<40, 1, 63, uint64_t>(literal_1 );
+                }
+
+                if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
+                {
+                    l_scom_buffer.insert<48, 1, 63, uint64_t>(literal_1 );
+                }
+
                 l_scom_buffer.insert<0, 1, 63, uint64_t>(literal_1 );
                 l_scom_buffer.insert<1, 1, 63, uint64_t>(literal_1 );
                 FAPI_TRY(fapi2::putScom(TGT0, 0x501101aull, l_scom_buffer));
@@ -1129,10 +1141,34 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>&
                 l_scom_buffer.insert<4, 1, 63, uint64_t>(literal_0b0 );
             }
 
-            if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5)
-                    && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23))
-                || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6)
-                        && (l_chip_ec == 0x12)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x13)) )
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5)
+                    && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10))
+                || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12)) || ((l_chip_id == 0x6)
+                        && (l_chip_ec == 0x13)) )
+            {
+                if ((l_def_NVLINK_ACTIVE == literal_1))
+                {
+                    l_scom_buffer.insert<38, 1, 63, uint64_t>(literal_0x1 );
+                }
+
+                if ((l_TGT0_ATTR_CHIP_EC_FEATURE_HW372457 != literal_0))
+                {
+                    l_scom_buffer.insert<50, 1, 63, uint64_t>(literal_0b0 );
+                }
+
+                if (((l_TGT0_ATTR_CHIP_EC_FEATURE_HW410625 != literal_0)
+                     || (l_TGT0_ATTR_CHIP_EC_FEATURE_HW423589_OPTION1 != literal_0)))
+                {
+                    l_scom_buffer.insert<6, 1, 63, uint64_t>(literal_0x1 );
+                }
+
+                if ((l_TGT0_ATTR_CHIP_EC_FEATURE_HW423589_OPTION1 != literal_0))
+                {
+                    l_scom_buffer.insert<7, 1, 63, uint64_t>(literal_0x1 );
+                }
+            }
+
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
             {
                 if ((l_def_NVLINK_ACTIVE == literal_1))
                 {
@@ -1220,9 +1256,23 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>&
             {
                 FAPI_TRY(fapi2::getScom( TGT0, 0x5011061ull, l_scom_buffer ));
 
-                if ((l_TGT0_ATTR_CHIP_EC_FEATURE_HW364887 != literal_0))
+                if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5)
+                        && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10))
+                    || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12)) || ((l_chip_id == 0x6)
+                            && (l_chip_ec == 0x13)) )
                 {
-                    l_scom_buffer.insert<12, 4, 60, uint64_t>(literal_0xF );
+                    if ((l_TGT0_ATTR_CHIP_EC_FEATURE_HW364887 != literal_0))
+                    {
+                        l_scom_buffer.insert<12, 4, 60, uint64_t>(literal_0xF );
+                    }
+                }
+
+                if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
+                {
+                    if ((l_TGT0_ATTR_CHIP_EC_FEATURE_HW364887 != literal_0))
+                    {
+                        l_scom_buffer.insert<12, 4, 60, uint64_t>(literal_0xF );
+                    }
                 }
 
                 FAPI_TRY(fapi2::putScom(TGT0, 0x5011061ull, l_scom_buffer));
@@ -1336,18 +1386,41 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>&
             {
                 FAPI_TRY(fapi2::getScom( TGT0, 0x5011063ull, l_scom_buffer ));
 
-                if ((l_TGT0_ATTR_CHIP_EC_FEATURE_HW372457 != literal_0))
-                {
-                    l_scom_buffer.insert<26, 6, 58, uint64_t>(literal_0b001000 );
-                }
-                else if ((l_TGT0_ATTR_CHIP_EC_FEATURE_HW426816 != literal_0))
+                if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5)
+                        && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10))
+                    || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12)) || ((l_chip_id == 0x6)
+                            && (l_chip_ec == 0x13)) )
                 {
-                    l_scom_buffer.insert<26, 6, 58, uint64_t>(literal_0b000001 );
+                    if ((l_TGT0_ATTR_CHIP_EC_FEATURE_HW372457 != literal_0))
+                    {
+                        l_scom_buffer.insert<26, 6, 58, uint64_t>(literal_0b001000 );
+                    }
+                    else if ((l_TGT0_ATTR_CHIP_EC_FEATURE_HW426816 != literal_0))
+                    {
+                        l_scom_buffer.insert<26, 6, 58, uint64_t>(literal_0b000001 );
+                    }
+
+                    if ((l_TGT0_ATTR_CHIP_EC_FEATURE_HW426816 != literal_0))
+                    {
+                        l_scom_buffer.insert<32, 6, 58, uint64_t>(literal_0b000001 );
+                    }
                 }
 
-                if ((l_TGT0_ATTR_CHIP_EC_FEATURE_HW426816 != literal_0))
+                if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
                 {
-                    l_scom_buffer.insert<32, 6, 58, uint64_t>(literal_0b000001 );
+                    if ((l_TGT0_ATTR_CHIP_EC_FEATURE_HW372457 != literal_0))
+                    {
+                        l_scom_buffer.insert<26, 6, 58, uint64_t>(literal_0b001000 );
+                    }
+                    else if ((l_TGT0_ATTR_CHIP_EC_FEATURE_HW426816 != literal_0))
+                    {
+                        l_scom_buffer.insert<26, 6, 58, uint64_t>(literal_0b000001 );
+                    }
+
+                    if ((l_TGT0_ATTR_CHIP_EC_FEATURE_HW426816 != literal_0))
+                    {
+                        l_scom_buffer.insert<32, 6, 58, uint64_t>(literal_0b000001 );
+                    }
                 }
 
                 FAPI_TRY(fapi2::putScom(TGT0, 0x5011063ull, l_scom_buffer));
@@ -1377,23 +1450,51 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>&
             {
                 FAPI_TRY(fapi2::getScom( TGT0, 0x5011070ull, l_scom_buffer ));
 
-                if ((l_TGT0_ATTR_CHIP_EC_FEATURE_HW426816 != literal_0))
+                if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5)
+                        && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10))
+                    || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12)) || ((l_chip_id == 0x6)
+                            && (l_chip_ec == 0x13)) )
                 {
-                    l_scom_buffer.insert<24, 8, 56, uint64_t>(literal_0x66 );
-                }
+                    if ((l_TGT0_ATTR_CHIP_EC_FEATURE_HW426816 != literal_0))
+                    {
+                        l_scom_buffer.insert<24, 8, 56, uint64_t>(literal_0x66 );
+                    }
 
-                if ((l_TGT0_ATTR_CHIP_EC_FEATURE_HW372457 != literal_0))
-                {
-                    l_scom_buffer.insert<4, 2, 62, uint64_t>(literal_0b01 );
-                }
+                    if ((l_TGT0_ATTR_CHIP_EC_FEATURE_HW372457 != literal_0))
+                    {
+                        l_scom_buffer.insert<4, 2, 62, uint64_t>(literal_0b01 );
+                    }
 
-                if ((l_TGT0_ATTR_CHIP_EC_FEATURE_HW372457 != literal_0))
-                {
-                    l_scom_buffer.insert<8, 8, 56, uint64_t>(literal_0x67 );
+                    if ((l_TGT0_ATTR_CHIP_EC_FEATURE_HW372457 != literal_0))
+                    {
+                        l_scom_buffer.insert<8, 8, 56, uint64_t>(literal_0x67 );
+                    }
+                    else if ((l_TGT0_ATTR_CHIP_EC_FEATURE_HW426816 != literal_0))
+                    {
+                        l_scom_buffer.insert<8, 8, 56, uint64_t>(literal_0x4B );
+                    }
                 }
-                else if ((l_TGT0_ATTR_CHIP_EC_FEATURE_HW426816 != literal_0))
+
+                if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
                 {
-                    l_scom_buffer.insert<8, 8, 56, uint64_t>(literal_0x4B );
+                    if ((l_TGT0_ATTR_CHIP_EC_FEATURE_HW426816 != literal_0))
+                    {
+                        l_scom_buffer.insert<24, 8, 56, uint64_t>(literal_0x66 );
+                    }
+
+                    if ((l_TGT0_ATTR_CHIP_EC_FEATURE_HW372457 != literal_0))
+                    {
+                        l_scom_buffer.insert<4, 2, 62, uint64_t>(literal_0b01 );
+                    }
+
+                    if ((l_TGT0_ATTR_CHIP_EC_FEATURE_HW372457 != literal_0))
+                    {
+                        l_scom_buffer.insert<8, 8, 56, uint64_t>(literal_0x67 );
+                    }
+                    else if ((l_TGT0_ATTR_CHIP_EC_FEATURE_HW426816 != literal_0))
+                    {
+                        l_scom_buffer.insert<8, 8, 56, uint64_t>(literal_0x4B );
+                    }
                 }
 
                 FAPI_TRY(fapi2::putScom(TGT0, 0x5011070ull, l_scom_buffer));
@@ -1417,7 +1518,19 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>&
             {
                 FAPI_TRY(fapi2::getScom( TGT0, 0x501107aull, l_scom_buffer ));
 
-                l_scom_buffer.insert<40, 1, 63, uint64_t>(literal_1 );
+                if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5)
+                        && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10))
+                    || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12)) || ((l_chip_id == 0x6)
+                            && (l_chip_ec == 0x13)) )
+                {
+                    l_scom_buffer.insert<40, 1, 63, uint64_t>(literal_1 );
+                }
+
+                if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
+                {
+                    l_scom_buffer.insert<48, 1, 63, uint64_t>(literal_1 );
+                }
+
                 l_scom_buffer.insert<0, 1, 63, uint64_t>(literal_1 );
                 l_scom_buffer.insert<1, 1, 63, uint64_t>(literal_1 );
                 FAPI_TRY(fapi2::putScom(TGT0, 0x501107aull, l_scom_buffer));
@@ -3166,7 +3279,19 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>&
             {
                 FAPI_TRY(fapi2::getScom( TGT0, 0x501121aull, l_scom_buffer ));
 
-                l_scom_buffer.insert<40, 1, 63, uint64_t>(literal_1 );
+                if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5)
+                        && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10))
+                    || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12)) || ((l_chip_id == 0x6)
+                            && (l_chip_ec == 0x13)) )
+                {
+                    l_scom_buffer.insert<40, 1, 63, uint64_t>(literal_1 );
+                }
+
+                if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
+                {
+                    l_scom_buffer.insert<48, 1, 63, uint64_t>(literal_1 );
+                }
+
                 l_scom_buffer.insert<0, 1, 63, uint64_t>(literal_1 );
                 l_scom_buffer.insert<1, 1, 63, uint64_t>(literal_1 );
                 FAPI_TRY(fapi2::putScom(TGT0, 0x501121aull, l_scom_buffer));
@@ -4072,7 +4197,19 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>&
             {
                 FAPI_TRY(fapi2::getScom( TGT0, 0x501127aull, l_scom_buffer ));
 
-                l_scom_buffer.insert<40, 1, 63, uint64_t>(literal_1 );
+                if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5)
+                        && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10))
+                    || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12)) || ((l_chip_id == 0x6)
+                            && (l_chip_ec == 0x13)) )
+                {
+                    l_scom_buffer.insert<40, 1, 63, uint64_t>(literal_1 );
+                }
+
+                if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
+                {
+                    l_scom_buffer.insert<48, 1, 63, uint64_t>(literal_1 );
+                }
+
                 l_scom_buffer.insert<0, 1, 63, uint64_t>(literal_1 );
                 l_scom_buffer.insert<1, 1, 63, uint64_t>(literal_1 );
                 FAPI_TRY(fapi2::putScom(TGT0, 0x501127aull, l_scom_buffer));
diff --git a/src/import/chips/p9/procedures/hwp/initfiles/p9_obus_scom.C b/src/import/chips/p9/procedures/hwp/initfiles/p9_obus_scom.C
index d7701288b..7a22f8f29 100644
--- a/src/import/chips/p9/procedures/hwp/initfiles/p9_obus_scom.C
+++ b/src/import/chips/p9/procedures/hwp/initfiles/p9_obus_scom.C
@@ -1390,29 +1390,30 @@ fapi2::ReturnCode p9_obus_scom(const fapi2::Target<fapi2::TARGET_TYPE_OBUS>& TGT
 
             l_scom_buffer.insert<53, 4, 60, uint64_t>(literal_0b1010 );
 
-            if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5)
+                    && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10))
+                || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12)) || ((l_chip_id == 0x6)
+                        && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
             {
                 if (l_TGT2_ATTR_CHIP_EC_FEATURE_OBUS_P9NDD1_SPY_NAMES)
                 {
-                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 );
+                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 );
                 }
                 else if (( true ))
                 {
-                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b00011 );
+                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b00011 );
                 }
             }
-            else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21))
-                     || ((l_chip_id == 0x5) && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6)
-                             && (l_chip_ec == 0x10)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12))
-                     || ((l_chip_id == 0x6) && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
             {
                 if (l_TGT2_ATTR_CHIP_EC_FEATURE_OBUS_P9NDD1_SPY_NAMES)
                 {
-                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 );
+                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 );
                 }
                 else if (( true ))
                 {
-                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b00011 );
+                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b00011 );
                 }
             }
 
@@ -1423,29 +1424,30 @@ fapi2::ReturnCode p9_obus_scom(const fapi2::Target<fapi2::TARGET_TYPE_OBUS>& TGT
 
             l_scom_buffer.insert<53, 4, 60, uint64_t>(literal_0b1010 );
 
-            if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5)
+                    && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10))
+                || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12)) || ((l_chip_id == 0x6)
+                        && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
             {
                 if (l_TGT2_ATTR_CHIP_EC_FEATURE_OBUS_P9NDD1_SPY_NAMES)
                 {
-                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 );
+                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 );
                 }
                 else if (( true ))
                 {
-                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b00011 );
+                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b00011 );
                 }
             }
-            else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21))
-                     || ((l_chip_id == 0x5) && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6)
-                             && (l_chip_ec == 0x10)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12))
-                     || ((l_chip_id == 0x6) && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
             {
                 if (l_TGT2_ATTR_CHIP_EC_FEATURE_OBUS_P9NDD1_SPY_NAMES)
                 {
-                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 );
+                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 );
                 }
                 else if (( true ))
                 {
-                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b00011 );
+                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b00011 );
                 }
             }
 
@@ -1456,29 +1458,30 @@ fapi2::ReturnCode p9_obus_scom(const fapi2::Target<fapi2::TARGET_TYPE_OBUS>& TGT
 
             l_scom_buffer.insert<53, 4, 60, uint64_t>(literal_0b1010 );
 
-            if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5)
+                    && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10))
+                || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12)) || ((l_chip_id == 0x6)
+                        && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
             {
                 if (l_TGT2_ATTR_CHIP_EC_FEATURE_OBUS_P9NDD1_SPY_NAMES)
                 {
-                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 );
+                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 );
                 }
                 else if (( true ))
                 {
-                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b00011 );
+                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b00011 );
                 }
             }
-            else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21))
-                     || ((l_chip_id == 0x5) && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6)
-                             && (l_chip_ec == 0x10)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12))
-                     || ((l_chip_id == 0x6) && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
             {
                 if (l_TGT2_ATTR_CHIP_EC_FEATURE_OBUS_P9NDD1_SPY_NAMES)
                 {
-                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 );
+                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 );
                 }
                 else if (( true ))
                 {
-                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b00011 );
+                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b00011 );
                 }
             }
 
@@ -1489,37 +1492,38 @@ fapi2::ReturnCode p9_obus_scom(const fapi2::Target<fapi2::TARGET_TYPE_OBUS>& TGT
 
             l_scom_buffer.insert<53, 4, 60, uint64_t>(literal_0b1010 );
 
-            if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5)
+                    && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10))
+                || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12)) || ((l_chip_id == 0x6)
+                        && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
             {
                 if (l_TGT2_ATTR_CHIP_EC_FEATURE_OBUS_P9NDD1_SPY_NAMES)
                 {
-                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 );
+                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 );
                 }
                 else if ((l_TGT0_ATTR_OPTICS_CONFIG_MODE == fapi2::ENUM_ATTR_OPTICS_CONFIG_MODE_SMP))
                 {
-                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b10100 );
+                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b10100 );
                 }
                 else if (( true ))
                 {
-                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b00011 );
+                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b00011 );
                 }
             }
-            else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21))
-                     || ((l_chip_id == 0x5) && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6)
-                             && (l_chip_ec == 0x10)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12))
-                     || ((l_chip_id == 0x6) && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
             {
                 if (l_TGT2_ATTR_CHIP_EC_FEATURE_OBUS_P9NDD1_SPY_NAMES)
                 {
-                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 );
+                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 );
                 }
                 else if ((l_TGT0_ATTR_OPTICS_CONFIG_MODE == fapi2::ENUM_ATTR_OPTICS_CONFIG_MODE_SMP))
                 {
-                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b10100 );
+                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b10100 );
                 }
                 else if (( true ))
                 {
-                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b00011 );
+                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b00011 );
                 }
             }
 
@@ -1530,29 +1534,30 @@ fapi2::ReturnCode p9_obus_scom(const fapi2::Target<fapi2::TARGET_TYPE_OBUS>& TGT
 
             l_scom_buffer.insert<53, 4, 60, uint64_t>(literal_0b1010 );
 
-            if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5)
+                    && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10))
+                || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12)) || ((l_chip_id == 0x6)
+                        && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
             {
                 if (l_TGT2_ATTR_CHIP_EC_FEATURE_OBUS_P9NDD1_SPY_NAMES)
                 {
-                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 );
+                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 );
                 }
                 else if (( true ))
                 {
-                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b00011 );
+                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b00011 );
                 }
             }
-            else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21))
-                     || ((l_chip_id == 0x5) && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6)
-                             && (l_chip_ec == 0x10)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12))
-                     || ((l_chip_id == 0x6) && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
             {
                 if (l_TGT2_ATTR_CHIP_EC_FEATURE_OBUS_P9NDD1_SPY_NAMES)
                 {
-                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 );
+                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 );
                 }
                 else if (( true ))
                 {
-                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b00011 );
+                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b00011 );
                 }
             }
 
@@ -1563,37 +1568,38 @@ fapi2::ReturnCode p9_obus_scom(const fapi2::Target<fapi2::TARGET_TYPE_OBUS>& TGT
 
             l_scom_buffer.insert<53, 4, 60, uint64_t>(literal_0b1010 );
 
-            if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5)
+                    && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10))
+                || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12)) || ((l_chip_id == 0x6)
+                        && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
             {
                 if (l_TGT2_ATTR_CHIP_EC_FEATURE_OBUS_P9NDD1_SPY_NAMES)
                 {
-                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 );
+                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 );
                 }
                 else if ((l_TGT0_ATTR_OPTICS_CONFIG_MODE == fapi2::ENUM_ATTR_OPTICS_CONFIG_MODE_SMP))
                 {
-                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b10100 );
+                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b10100 );
                 }
                 else if (( true ))
                 {
-                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b00011 );
+                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b00011 );
                 }
             }
-            else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21))
-                     || ((l_chip_id == 0x5) && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6)
-                             && (l_chip_ec == 0x10)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12))
-                     || ((l_chip_id == 0x6) && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
             {
                 if (l_TGT2_ATTR_CHIP_EC_FEATURE_OBUS_P9NDD1_SPY_NAMES)
                 {
-                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 );
+                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 );
                 }
                 else if ((l_TGT0_ATTR_OPTICS_CONFIG_MODE == fapi2::ENUM_ATTR_OPTICS_CONFIG_MODE_SMP))
                 {
-                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b10100 );
+                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b10100 );
                 }
                 else if (( true ))
                 {
-                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b00011 );
+                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b00011 );
                 }
             }
 
@@ -1604,29 +1610,30 @@ fapi2::ReturnCode p9_obus_scom(const fapi2::Target<fapi2::TARGET_TYPE_OBUS>& TGT
 
             l_scom_buffer.insert<53, 4, 60, uint64_t>(literal_0b1010 );
 
-            if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5)
+                    && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10))
+                || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12)) || ((l_chip_id == 0x6)
+                        && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
             {
                 if (l_TGT2_ATTR_CHIP_EC_FEATURE_OBUS_P9NDD1_SPY_NAMES)
                 {
-                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 );
+                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 );
                 }
                 else if (( true ))
                 {
-                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b00011 );
+                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b00011 );
                 }
             }
-            else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21))
-                     || ((l_chip_id == 0x5) && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6)
-                             && (l_chip_ec == 0x10)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12))
-                     || ((l_chip_id == 0x6) && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
             {
                 if (l_TGT2_ATTR_CHIP_EC_FEATURE_OBUS_P9NDD1_SPY_NAMES)
                 {
-                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 );
+                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 );
                 }
                 else if (( true ))
                 {
-                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b00011 );
+                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b00011 );
                 }
             }
 
@@ -1637,29 +1644,30 @@ fapi2::ReturnCode p9_obus_scom(const fapi2::Target<fapi2::TARGET_TYPE_OBUS>& TGT
 
             l_scom_buffer.insert<53, 4, 60, uint64_t>(literal_0b1010 );
 
-            if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5)
+                    && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10))
+                || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12)) || ((l_chip_id == 0x6)
+                        && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
             {
                 if (l_TGT2_ATTR_CHIP_EC_FEATURE_OBUS_P9NDD1_SPY_NAMES)
                 {
-                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 );
+                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 );
                 }
                 else if (( true ))
                 {
-                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b00011 );
+                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b00011 );
                 }
             }
-            else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21))
-                     || ((l_chip_id == 0x5) && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6)
-                             && (l_chip_ec == 0x10)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12))
-                     || ((l_chip_id == 0x6) && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
             {
                 if (l_TGT2_ATTR_CHIP_EC_FEATURE_OBUS_P9NDD1_SPY_NAMES)
                 {
-                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 );
+                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 );
                 }
                 else if (( true ))
                 {
-                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b00011 );
+                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b00011 );
                 }
             }
 
@@ -1670,29 +1678,30 @@ fapi2::ReturnCode p9_obus_scom(const fapi2::Target<fapi2::TARGET_TYPE_OBUS>& TGT
 
             l_scom_buffer.insert<53, 4, 60, uint64_t>(literal_0b1010 );
 
-            if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5)
+                    && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10))
+                || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12)) || ((l_chip_id == 0x6)
+                        && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
             {
                 if (l_TGT2_ATTR_CHIP_EC_FEATURE_OBUS_P9NDD1_SPY_NAMES)
                 {
-                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 );
+                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 );
                 }
                 else if (( true ))
                 {
-                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b00011 );
+                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b00011 );
                 }
             }
-            else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21))
-                     || ((l_chip_id == 0x5) && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6)
-                             && (l_chip_ec == 0x10)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12))
-                     || ((l_chip_id == 0x6) && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
             {
                 if (l_TGT2_ATTR_CHIP_EC_FEATURE_OBUS_P9NDD1_SPY_NAMES)
                 {
-                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 );
+                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 );
                 }
                 else if (( true ))
                 {
-                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b00011 );
+                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b00011 );
                 }
             }
 
@@ -1703,37 +1712,38 @@ fapi2::ReturnCode p9_obus_scom(const fapi2::Target<fapi2::TARGET_TYPE_OBUS>& TGT
 
             l_scom_buffer.insert<53, 4, 60, uint64_t>(literal_0b1010 );
 
-            if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5)
+                    && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10))
+                || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12)) || ((l_chip_id == 0x6)
+                        && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
             {
                 if (l_TGT2_ATTR_CHIP_EC_FEATURE_OBUS_P9NDD1_SPY_NAMES)
                 {
-                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 );
+                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 );
                 }
                 else if ((l_TGT0_ATTR_OPTICS_CONFIG_MODE == fapi2::ENUM_ATTR_OPTICS_CONFIG_MODE_SMP))
                 {
-                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b10100 );
+                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b10100 );
                 }
                 else if (( true ))
                 {
-                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b00011 );
+                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b00011 );
                 }
             }
-            else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21))
-                     || ((l_chip_id == 0x5) && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6)
-                             && (l_chip_ec == 0x10)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12))
-                     || ((l_chip_id == 0x6) && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
             {
                 if (l_TGT2_ATTR_CHIP_EC_FEATURE_OBUS_P9NDD1_SPY_NAMES)
                 {
-                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 );
+                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 );
                 }
                 else if ((l_TGT0_ATTR_OPTICS_CONFIG_MODE == fapi2::ENUM_ATTR_OPTICS_CONFIG_MODE_SMP))
                 {
-                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b10100 );
+                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b10100 );
                 }
                 else if (( true ))
                 {
-                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b00011 );
+                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b00011 );
                 }
             }
 
@@ -1744,29 +1754,30 @@ fapi2::ReturnCode p9_obus_scom(const fapi2::Target<fapi2::TARGET_TYPE_OBUS>& TGT
 
             l_scom_buffer.insert<53, 4, 60, uint64_t>(literal_0b1010 );
 
-            if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5)
+                    && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10))
+                || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12)) || ((l_chip_id == 0x6)
+                        && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
             {
                 if (l_TGT2_ATTR_CHIP_EC_FEATURE_OBUS_P9NDD1_SPY_NAMES)
                 {
-                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 );
+                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 );
                 }
                 else if (( true ))
                 {
-                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b00011 );
+                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b00011 );
                 }
             }
-            else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21))
-                     || ((l_chip_id == 0x5) && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6)
-                             && (l_chip_ec == 0x10)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12))
-                     || ((l_chip_id == 0x6) && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
             {
                 if (l_TGT2_ATTR_CHIP_EC_FEATURE_OBUS_P9NDD1_SPY_NAMES)
                 {
-                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 );
+                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 );
                 }
                 else if (( true ))
                 {
-                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b00011 );
+                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b00011 );
                 }
             }
 
@@ -1777,29 +1788,30 @@ fapi2::ReturnCode p9_obus_scom(const fapi2::Target<fapi2::TARGET_TYPE_OBUS>& TGT
 
             l_scom_buffer.insert<53, 4, 60, uint64_t>(literal_0b1010 );
 
-            if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5)
+                    && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10))
+                || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12)) || ((l_chip_id == 0x6)
+                        && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
             {
                 if (l_TGT2_ATTR_CHIP_EC_FEATURE_OBUS_P9NDD1_SPY_NAMES)
                 {
-                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 );
+                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 );
                 }
                 else if (( true ))
                 {
-                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b00011 );
+                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b00011 );
                 }
             }
-            else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21))
-                     || ((l_chip_id == 0x5) && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6)
-                             && (l_chip_ec == 0x10)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12))
-                     || ((l_chip_id == 0x6) && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
             {
                 if (l_TGT2_ATTR_CHIP_EC_FEATURE_OBUS_P9NDD1_SPY_NAMES)
                 {
-                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 );
+                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 );
                 }
                 else if (( true ))
                 {
-                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b00011 );
+                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b00011 );
                 }
             }
 
@@ -1810,29 +1822,30 @@ fapi2::ReturnCode p9_obus_scom(const fapi2::Target<fapi2::TARGET_TYPE_OBUS>& TGT
 
             l_scom_buffer.insert<53, 4, 60, uint64_t>(literal_0b1010 );
 
-            if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5)
+                    && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10))
+                || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12)) || ((l_chip_id == 0x6)
+                        && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
             {
                 if (l_TGT2_ATTR_CHIP_EC_FEATURE_OBUS_P9NDD1_SPY_NAMES)
                 {
-                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 );
+                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 );
                 }
                 else if (( true ))
                 {
-                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b00011 );
+                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b00011 );
                 }
             }
-            else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21))
-                     || ((l_chip_id == 0x5) && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6)
-                             && (l_chip_ec == 0x10)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12))
-                     || ((l_chip_id == 0x6) && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
             {
                 if (l_TGT2_ATTR_CHIP_EC_FEATURE_OBUS_P9NDD1_SPY_NAMES)
                 {
-                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 );
+                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 );
                 }
                 else if (( true ))
                 {
-                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b00011 );
+                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b00011 );
                 }
             }
 
@@ -1843,29 +1856,30 @@ fapi2::ReturnCode p9_obus_scom(const fapi2::Target<fapi2::TARGET_TYPE_OBUS>& TGT
 
             l_scom_buffer.insert<53, 4, 60, uint64_t>(literal_0b1010 );
 
-            if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5)
+                    && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10))
+                || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12)) || ((l_chip_id == 0x6)
+                        && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
             {
                 if (l_TGT2_ATTR_CHIP_EC_FEATURE_OBUS_P9NDD1_SPY_NAMES)
                 {
-                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 );
+                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 );
                 }
                 else if (( true ))
                 {
-                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b00011 );
+                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b00011 );
                 }
             }
-            else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21))
-                     || ((l_chip_id == 0x5) && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6)
-                             && (l_chip_ec == 0x10)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12))
-                     || ((l_chip_id == 0x6) && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
             {
                 if (l_TGT2_ATTR_CHIP_EC_FEATURE_OBUS_P9NDD1_SPY_NAMES)
                 {
-                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 );
+                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 );
                 }
                 else if (( true ))
                 {
-                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b00011 );
+                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b00011 );
                 }
             }
 
@@ -1876,29 +1890,30 @@ fapi2::ReturnCode p9_obus_scom(const fapi2::Target<fapi2::TARGET_TYPE_OBUS>& TGT
 
             l_scom_buffer.insert<53, 4, 60, uint64_t>(literal_0b1010 );
 
-            if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5)
+                    && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10))
+                || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12)) || ((l_chip_id == 0x6)
+                        && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
             {
                 if (l_TGT2_ATTR_CHIP_EC_FEATURE_OBUS_P9NDD1_SPY_NAMES)
                 {
-                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 );
+                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 );
                 }
                 else if (( true ))
                 {
-                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b00011 );
+                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b00011 );
                 }
             }
-            else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21))
-                     || ((l_chip_id == 0x5) && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6)
-                             && (l_chip_ec == 0x10)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12))
-                     || ((l_chip_id == 0x6) && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
             {
                 if (l_TGT2_ATTR_CHIP_EC_FEATURE_OBUS_P9NDD1_SPY_NAMES)
                 {
-                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 );
+                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 );
                 }
                 else if (( true ))
                 {
-                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b00011 );
+                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b00011 );
                 }
             }
 
@@ -1909,29 +1924,30 @@ fapi2::ReturnCode p9_obus_scom(const fapi2::Target<fapi2::TARGET_TYPE_OBUS>& TGT
 
             l_scom_buffer.insert<53, 4, 60, uint64_t>(literal_0b1010 );
 
-            if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5)
+                    && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10))
+                || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12)) || ((l_chip_id == 0x6)
+                        && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
             {
                 if (l_TGT2_ATTR_CHIP_EC_FEATURE_OBUS_P9NDD1_SPY_NAMES)
                 {
-                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 );
+                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 );
                 }
                 else if (( true ))
                 {
-                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b00011 );
+                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b00011 );
                 }
             }
-            else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21))
-                     || ((l_chip_id == 0x5) && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6)
-                             && (l_chip_ec == 0x10)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12))
-                     || ((l_chip_id == 0x6) && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
             {
                 if (l_TGT2_ATTR_CHIP_EC_FEATURE_OBUS_P9NDD1_SPY_NAMES)
                 {
-                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 );
+                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 );
                 }
                 else if (( true ))
                 {
-                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b00011 );
+                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b00011 );
                 }
             }
 
@@ -1942,29 +1958,30 @@ fapi2::ReturnCode p9_obus_scom(const fapi2::Target<fapi2::TARGET_TYPE_OBUS>& TGT
 
             l_scom_buffer.insert<53, 4, 60, uint64_t>(literal_0b1010 );
 
-            if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5)
+                    && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10))
+                || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12)) || ((l_chip_id == 0x6)
+                        && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
             {
                 if (l_TGT2_ATTR_CHIP_EC_FEATURE_OBUS_P9NDD1_SPY_NAMES)
                 {
-                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 );
+                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 );
                 }
                 else if (( true ))
                 {
-                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b00011 );
+                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b00011 );
                 }
             }
-            else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21))
-                     || ((l_chip_id == 0x5) && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6)
-                             && (l_chip_ec == 0x10)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12))
-                     || ((l_chip_id == 0x6) && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
             {
                 if (l_TGT2_ATTR_CHIP_EC_FEATURE_OBUS_P9NDD1_SPY_NAMES)
                 {
-                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 );
+                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 );
                 }
                 else if (( true ))
                 {
-                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b00011 );
+                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b00011 );
                 }
             }
 
@@ -1975,29 +1992,30 @@ fapi2::ReturnCode p9_obus_scom(const fapi2::Target<fapi2::TARGET_TYPE_OBUS>& TGT
 
             l_scom_buffer.insert<53, 4, 60, uint64_t>(literal_0b1010 );
 
-            if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5)
+                    && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10))
+                || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12)) || ((l_chip_id == 0x6)
+                        && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
             {
                 if (l_TGT2_ATTR_CHIP_EC_FEATURE_OBUS_P9NDD1_SPY_NAMES)
                 {
-                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 );
+                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 );
                 }
                 else if (( true ))
                 {
-                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b00011 );
+                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b00011 );
                 }
             }
-            else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21))
-                     || ((l_chip_id == 0x5) && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6)
-                             && (l_chip_ec == 0x10)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12))
-                     || ((l_chip_id == 0x6) && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
             {
                 if (l_TGT2_ATTR_CHIP_EC_FEATURE_OBUS_P9NDD1_SPY_NAMES)
                 {
-                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 );
+                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 );
                 }
                 else if (( true ))
                 {
-                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b00011 );
+                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b00011 );
                 }
             }
 
@@ -2008,29 +2026,30 @@ fapi2::ReturnCode p9_obus_scom(const fapi2::Target<fapi2::TARGET_TYPE_OBUS>& TGT
 
             l_scom_buffer.insert<53, 4, 60, uint64_t>(literal_0b1010 );
 
-            if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5)
+                    && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10))
+                || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12)) || ((l_chip_id == 0x6)
+                        && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
             {
                 if (l_TGT2_ATTR_CHIP_EC_FEATURE_OBUS_P9NDD1_SPY_NAMES)
                 {
-                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 );
+                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 );
                 }
                 else if (( true ))
                 {
-                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b00011 );
+                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b00011 );
                 }
             }
-            else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21))
-                     || ((l_chip_id == 0x5) && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6)
-                             && (l_chip_ec == 0x10)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12))
-                     || ((l_chip_id == 0x6) && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
             {
                 if (l_TGT2_ATTR_CHIP_EC_FEATURE_OBUS_P9NDD1_SPY_NAMES)
                 {
-                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 );
+                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 );
                 }
                 else if (( true ))
                 {
-                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b00011 );
+                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b00011 );
                 }
             }
 
@@ -2041,29 +2060,30 @@ fapi2::ReturnCode p9_obus_scom(const fapi2::Target<fapi2::TARGET_TYPE_OBUS>& TGT
 
             l_scom_buffer.insert<53, 4, 60, uint64_t>(literal_0b1010 );
 
-            if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5)
+                    && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10))
+                || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12)) || ((l_chip_id == 0x6)
+                        && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
             {
                 if (l_TGT2_ATTR_CHIP_EC_FEATURE_OBUS_P9NDD1_SPY_NAMES)
                 {
-                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 );
+                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 );
                 }
                 else if (( true ))
                 {
-                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b00011 );
+                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b00011 );
                 }
             }
-            else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21))
-                     || ((l_chip_id == 0x5) && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6)
-                             && (l_chip_ec == 0x10)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12))
-                     || ((l_chip_id == 0x6) && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
             {
                 if (l_TGT2_ATTR_CHIP_EC_FEATURE_OBUS_P9NDD1_SPY_NAMES)
                 {
-                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 );
+                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 );
                 }
                 else if (( true ))
                 {
-                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b00011 );
+                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b00011 );
                 }
             }
 
@@ -2074,29 +2094,30 @@ fapi2::ReturnCode p9_obus_scom(const fapi2::Target<fapi2::TARGET_TYPE_OBUS>& TGT
 
             l_scom_buffer.insert<53, 4, 60, uint64_t>(literal_0b1010 );
 
-            if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5)
+                    && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10))
+                || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12)) || ((l_chip_id == 0x6)
+                        && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
             {
                 if (l_TGT2_ATTR_CHIP_EC_FEATURE_OBUS_P9NDD1_SPY_NAMES)
                 {
-                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 );
+                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 );
                 }
                 else if (( true ))
                 {
-                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b00011 );
+                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b00011 );
                 }
             }
-            else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21))
-                     || ((l_chip_id == 0x5) && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6)
-                             && (l_chip_ec == 0x10)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12))
-                     || ((l_chip_id == 0x6) && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
             {
                 if (l_TGT2_ATTR_CHIP_EC_FEATURE_OBUS_P9NDD1_SPY_NAMES)
                 {
-                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 );
+                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 );
                 }
                 else if (( true ))
                 {
-                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b00011 );
+                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b00011 );
                 }
             }
 
@@ -2107,29 +2128,30 @@ fapi2::ReturnCode p9_obus_scom(const fapi2::Target<fapi2::TARGET_TYPE_OBUS>& TGT
 
             l_scom_buffer.insert<53, 4, 60, uint64_t>(literal_0b1010 );
 
-            if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5)
+                    && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10))
+                || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12)) || ((l_chip_id == 0x6)
+                        && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
             {
                 if (l_TGT2_ATTR_CHIP_EC_FEATURE_OBUS_P9NDD1_SPY_NAMES)
                 {
-                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 );
+                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 );
                 }
                 else if (( true ))
                 {
-                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b00011 );
+                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b00011 );
                 }
             }
-            else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21))
-                     || ((l_chip_id == 0x5) && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6)
-                             && (l_chip_ec == 0x10)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12))
-                     || ((l_chip_id == 0x6) && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
             {
                 if (l_TGT2_ATTR_CHIP_EC_FEATURE_OBUS_P9NDD1_SPY_NAMES)
                 {
-                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 );
+                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 );
                 }
                 else if (( true ))
                 {
-                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b00011 );
+                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b00011 );
                 }
             }
 
@@ -2140,29 +2162,30 @@ fapi2::ReturnCode p9_obus_scom(const fapi2::Target<fapi2::TARGET_TYPE_OBUS>& TGT
 
             l_scom_buffer.insert<53, 4, 60, uint64_t>(literal_0b1010 );
 
-            if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5)
+                    && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10))
+                || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12)) || ((l_chip_id == 0x6)
+                        && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
             {
                 if (l_TGT2_ATTR_CHIP_EC_FEATURE_OBUS_P9NDD1_SPY_NAMES)
                 {
-                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 );
+                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 );
                 }
                 else if (( true ))
                 {
-                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b00011 );
+                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b00011 );
                 }
             }
-            else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21))
-                     || ((l_chip_id == 0x5) && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6)
-                             && (l_chip_ec == 0x10)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12))
-                     || ((l_chip_id == 0x6) && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
             {
                 if (l_TGT2_ATTR_CHIP_EC_FEATURE_OBUS_P9NDD1_SPY_NAMES)
                 {
-                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 );
+                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 );
                 }
                 else if (( true ))
                 {
-                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b00011 );
+                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b00011 );
                 }
             }
 
@@ -2173,29 +2196,30 @@ fapi2::ReturnCode p9_obus_scom(const fapi2::Target<fapi2::TARGET_TYPE_OBUS>& TGT
 
             l_scom_buffer.insert<53, 4, 60, uint64_t>(literal_0b1010 );
 
-            if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5)
+                    && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10))
+                || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12)) || ((l_chip_id == 0x6)
+                        && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
             {
                 if (l_TGT2_ATTR_CHIP_EC_FEATURE_OBUS_P9NDD1_SPY_NAMES)
                 {
-                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 );
+                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 );
                 }
                 else if (( true ))
                 {
-                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b00011 );
+                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b00011 );
                 }
             }
-            else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21))
-                     || ((l_chip_id == 0x5) && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6)
-                             && (l_chip_ec == 0x10)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12))
-                     || ((l_chip_id == 0x6) && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
             {
                 if (l_TGT2_ATTR_CHIP_EC_FEATURE_OBUS_P9NDD1_SPY_NAMES)
                 {
-                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 );
+                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 );
                 }
                 else if (( true ))
                 {
-                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b00011 );
+                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b00011 );
                 }
             }
 
@@ -2612,31 +2636,43 @@ fapi2::ReturnCode p9_obus_scom(const fapi2::Target<fapi2::TARGET_TYPE_OBUS>& TGT
         {
             FAPI_TRY(fapi2::getScom( TGT0, 0x8000a00009010c3full, l_scom_buffer ));
 
-            l_scom_buffer.insert<53, 4, 60, uint64_t>(literal_0b1010 );
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5)
+                    && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10))
+                || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12)) || ((l_chip_id == 0x6)
+                        && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+            {
+                l_scom_buffer.insert<53, 4, 60, uint64_t>(literal_0b1010 );
+            }
 
             if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
             {
+                l_scom_buffer.insert<52, 4, 60, uint64_t>(literal_0b1010 );
+            }
+
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5)
+                    && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10))
+                || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12)) || ((l_chip_id == 0x6)
+                        && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+            {
                 if (l_TGT2_ATTR_CHIP_EC_FEATURE_OBUS_P9NDD1_SPY_NAMES)
                 {
-                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 );
+                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 );
                 }
                 else if (( true ))
                 {
-                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b00011 );
+                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b00011 );
                 }
             }
-            else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21))
-                     || ((l_chip_id == 0x5) && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6)
-                             && (l_chip_ec == 0x10)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12))
-                     || ((l_chip_id == 0x6) && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
             {
                 if (l_TGT2_ATTR_CHIP_EC_FEATURE_OBUS_P9NDD1_SPY_NAMES)
                 {
-                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 );
+                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 );
                 }
                 else if (( true ))
                 {
-                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b00011 );
+                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b00011 );
                 }
             }
 
@@ -2645,31 +2681,43 @@ fapi2::ReturnCode p9_obus_scom(const fapi2::Target<fapi2::TARGET_TYPE_OBUS>& TGT
         {
             FAPI_TRY(fapi2::getScom( TGT0, 0x8000a00109010c3full, l_scom_buffer ));
 
-            l_scom_buffer.insert<53, 4, 60, uint64_t>(literal_0b1010 );
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5)
+                    && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10))
+                || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12)) || ((l_chip_id == 0x6)
+                        && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+            {
+                l_scom_buffer.insert<53, 4, 60, uint64_t>(literal_0b1010 );
+            }
 
             if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
             {
+                l_scom_buffer.insert<52, 4, 60, uint64_t>(literal_0b1010 );
+            }
+
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5)
+                    && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10))
+                || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12)) || ((l_chip_id == 0x6)
+                        && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+            {
                 if (l_TGT2_ATTR_CHIP_EC_FEATURE_OBUS_P9NDD1_SPY_NAMES)
                 {
-                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 );
+                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 );
                 }
                 else if (( true ))
                 {
-                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b00011 );
+                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b00011 );
                 }
             }
-            else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21))
-                     || ((l_chip_id == 0x5) && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6)
-                             && (l_chip_ec == 0x10)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12))
-                     || ((l_chip_id == 0x6) && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
             {
                 if (l_TGT2_ATTR_CHIP_EC_FEATURE_OBUS_P9NDD1_SPY_NAMES)
                 {
-                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 );
+                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 );
                 }
                 else if (( true ))
                 {
-                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b00011 );
+                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b00011 );
                 }
             }
 
@@ -2678,31 +2726,43 @@ fapi2::ReturnCode p9_obus_scom(const fapi2::Target<fapi2::TARGET_TYPE_OBUS>& TGT
         {
             FAPI_TRY(fapi2::getScom( TGT0, 0x8000a00209010c3full, l_scom_buffer ));
 
-            l_scom_buffer.insert<53, 4, 60, uint64_t>(literal_0b1010 );
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5)
+                    && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10))
+                || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12)) || ((l_chip_id == 0x6)
+                        && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+            {
+                l_scom_buffer.insert<53, 4, 60, uint64_t>(literal_0b1010 );
+            }
 
             if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
             {
+                l_scom_buffer.insert<52, 4, 60, uint64_t>(literal_0b1010 );
+            }
+
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5)
+                    && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10))
+                || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12)) || ((l_chip_id == 0x6)
+                        && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+            {
                 if (l_TGT2_ATTR_CHIP_EC_FEATURE_OBUS_P9NDD1_SPY_NAMES)
                 {
-                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 );
+                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 );
                 }
                 else if (( true ))
                 {
-                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b00011 );
+                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b00011 );
                 }
             }
-            else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21))
-                     || ((l_chip_id == 0x5) && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6)
-                             && (l_chip_ec == 0x10)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12))
-                     || ((l_chip_id == 0x6) && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
             {
                 if (l_TGT2_ATTR_CHIP_EC_FEATURE_OBUS_P9NDD1_SPY_NAMES)
                 {
-                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 );
+                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 );
                 }
                 else if (( true ))
                 {
-                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b00011 );
+                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b00011 );
                 }
             }
 
@@ -2711,39 +2771,51 @@ fapi2::ReturnCode p9_obus_scom(const fapi2::Target<fapi2::TARGET_TYPE_OBUS>& TGT
         {
             FAPI_TRY(fapi2::getScom( TGT0, 0x8000a00309010c3full, l_scom_buffer ));
 
-            l_scom_buffer.insert<53, 4, 60, uint64_t>(literal_0b1010 );
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5)
+                    && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10))
+                || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12)) || ((l_chip_id == 0x6)
+                        && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+            {
+                l_scom_buffer.insert<53, 4, 60, uint64_t>(literal_0b1010 );
+            }
 
             if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
             {
+                l_scom_buffer.insert<52, 4, 60, uint64_t>(literal_0b1010 );
+            }
+
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5)
+                    && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10))
+                || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12)) || ((l_chip_id == 0x6)
+                        && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+            {
                 if (l_TGT2_ATTR_CHIP_EC_FEATURE_OBUS_P9NDD1_SPY_NAMES)
                 {
-                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 );
+                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 );
                 }
                 else if ((l_TGT0_ATTR_OPTICS_CONFIG_MODE == fapi2::ENUM_ATTR_OPTICS_CONFIG_MODE_SMP))
                 {
-                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b10100 );
+                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b10100 );
                 }
                 else if (( true ))
                 {
-                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b00011 );
+                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b00011 );
                 }
             }
-            else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21))
-                     || ((l_chip_id == 0x5) && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6)
-                             && (l_chip_ec == 0x10)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12))
-                     || ((l_chip_id == 0x6) && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
             {
                 if (l_TGT2_ATTR_CHIP_EC_FEATURE_OBUS_P9NDD1_SPY_NAMES)
                 {
-                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 );
+                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 );
                 }
                 else if ((l_TGT0_ATTR_OPTICS_CONFIG_MODE == fapi2::ENUM_ATTR_OPTICS_CONFIG_MODE_SMP))
                 {
-                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b10100 );
+                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b10100 );
                 }
                 else if (( true ))
                 {
-                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b00011 );
+                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b00011 );
                 }
             }
 
@@ -2752,31 +2824,43 @@ fapi2::ReturnCode p9_obus_scom(const fapi2::Target<fapi2::TARGET_TYPE_OBUS>& TGT
         {
             FAPI_TRY(fapi2::getScom( TGT0, 0x8000a00409010c3full, l_scom_buffer ));
 
-            l_scom_buffer.insert<53, 4, 60, uint64_t>(literal_0b1010 );
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5)
+                    && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10))
+                || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12)) || ((l_chip_id == 0x6)
+                        && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+            {
+                l_scom_buffer.insert<53, 4, 60, uint64_t>(literal_0b1010 );
+            }
 
             if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
             {
+                l_scom_buffer.insert<52, 4, 60, uint64_t>(literal_0b1010 );
+            }
+
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5)
+                    && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10))
+                || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12)) || ((l_chip_id == 0x6)
+                        && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+            {
                 if (l_TGT2_ATTR_CHIP_EC_FEATURE_OBUS_P9NDD1_SPY_NAMES)
                 {
-                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 );
+                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 );
                 }
                 else if (( true ))
                 {
-                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b00011 );
+                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b00011 );
                 }
             }
-            else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21))
-                     || ((l_chip_id == 0x5) && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6)
-                             && (l_chip_ec == 0x10)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12))
-                     || ((l_chip_id == 0x6) && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
             {
                 if (l_TGT2_ATTR_CHIP_EC_FEATURE_OBUS_P9NDD1_SPY_NAMES)
                 {
-                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 );
+                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 );
                 }
                 else if (( true ))
                 {
-                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b00011 );
+                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b00011 );
                 }
             }
 
@@ -2785,39 +2869,51 @@ fapi2::ReturnCode p9_obus_scom(const fapi2::Target<fapi2::TARGET_TYPE_OBUS>& TGT
         {
             FAPI_TRY(fapi2::getScom( TGT0, 0x8000a00509010c3full, l_scom_buffer ));
 
-            l_scom_buffer.insert<53, 4, 60, uint64_t>(literal_0b1010 );
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5)
+                    && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10))
+                || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12)) || ((l_chip_id == 0x6)
+                        && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+            {
+                l_scom_buffer.insert<53, 4, 60, uint64_t>(literal_0b1010 );
+            }
 
             if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
             {
+                l_scom_buffer.insert<52, 4, 60, uint64_t>(literal_0b1010 );
+            }
+
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5)
+                    && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10))
+                || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12)) || ((l_chip_id == 0x6)
+                        && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+            {
                 if (l_TGT2_ATTR_CHIP_EC_FEATURE_OBUS_P9NDD1_SPY_NAMES)
                 {
-                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 );
+                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 );
                 }
                 else if ((l_TGT0_ATTR_OPTICS_CONFIG_MODE == fapi2::ENUM_ATTR_OPTICS_CONFIG_MODE_SMP))
                 {
-                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b10100 );
+                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b10100 );
                 }
                 else if (( true ))
                 {
-                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b00011 );
+                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b00011 );
                 }
             }
-            else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21))
-                     || ((l_chip_id == 0x5) && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6)
-                             && (l_chip_ec == 0x10)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12))
-                     || ((l_chip_id == 0x6) && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
             {
                 if (l_TGT2_ATTR_CHIP_EC_FEATURE_OBUS_P9NDD1_SPY_NAMES)
                 {
-                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 );
+                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 );
                 }
                 else if ((l_TGT0_ATTR_OPTICS_CONFIG_MODE == fapi2::ENUM_ATTR_OPTICS_CONFIG_MODE_SMP))
                 {
-                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b10100 );
+                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b10100 );
                 }
                 else if (( true ))
                 {
-                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b00011 );
+                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b00011 );
                 }
             }
 
@@ -2826,31 +2922,43 @@ fapi2::ReturnCode p9_obus_scom(const fapi2::Target<fapi2::TARGET_TYPE_OBUS>& TGT
         {
             FAPI_TRY(fapi2::getScom( TGT0, 0x8000a00609010c3full, l_scom_buffer ));
 
-            l_scom_buffer.insert<53, 4, 60, uint64_t>(literal_0b1010 );
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5)
+                    && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10))
+                || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12)) || ((l_chip_id == 0x6)
+                        && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+            {
+                l_scom_buffer.insert<53, 4, 60, uint64_t>(literal_0b1010 );
+            }
 
             if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
             {
+                l_scom_buffer.insert<52, 4, 60, uint64_t>(literal_0b1010 );
+            }
+
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5)
+                    && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10))
+                || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12)) || ((l_chip_id == 0x6)
+                        && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+            {
                 if (l_TGT2_ATTR_CHIP_EC_FEATURE_OBUS_P9NDD1_SPY_NAMES)
                 {
-                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 );
+                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 );
                 }
                 else if (( true ))
                 {
-                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b00011 );
+                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b00011 );
                 }
             }
-            else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21))
-                     || ((l_chip_id == 0x5) && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6)
-                             && (l_chip_ec == 0x10)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12))
-                     || ((l_chip_id == 0x6) && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
             {
                 if (l_TGT2_ATTR_CHIP_EC_FEATURE_OBUS_P9NDD1_SPY_NAMES)
                 {
-                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 );
+                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 );
                 }
                 else if (( true ))
                 {
-                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b00011 );
+                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b00011 );
                 }
             }
 
@@ -2859,31 +2967,43 @@ fapi2::ReturnCode p9_obus_scom(const fapi2::Target<fapi2::TARGET_TYPE_OBUS>& TGT
         {
             FAPI_TRY(fapi2::getScom( TGT0, 0x8000a00709010c3full, l_scom_buffer ));
 
-            l_scom_buffer.insert<53, 4, 60, uint64_t>(literal_0b1010 );
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5)
+                    && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10))
+                || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12)) || ((l_chip_id == 0x6)
+                        && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+            {
+                l_scom_buffer.insert<53, 4, 60, uint64_t>(literal_0b1010 );
+            }
 
             if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
             {
+                l_scom_buffer.insert<52, 4, 60, uint64_t>(literal_0b1010 );
+            }
+
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5)
+                    && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10))
+                || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12)) || ((l_chip_id == 0x6)
+                        && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+            {
                 if (l_TGT2_ATTR_CHIP_EC_FEATURE_OBUS_P9NDD1_SPY_NAMES)
                 {
-                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 );
+                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 );
                 }
                 else if (( true ))
                 {
-                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b00011 );
+                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b00011 );
                 }
             }
-            else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21))
-                     || ((l_chip_id == 0x5) && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6)
-                             && (l_chip_ec == 0x10)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12))
-                     || ((l_chip_id == 0x6) && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
             {
                 if (l_TGT2_ATTR_CHIP_EC_FEATURE_OBUS_P9NDD1_SPY_NAMES)
                 {
-                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 );
+                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 );
                 }
                 else if (( true ))
                 {
-                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b00011 );
+                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b00011 );
                 }
             }
 
@@ -2892,31 +3012,43 @@ fapi2::ReturnCode p9_obus_scom(const fapi2::Target<fapi2::TARGET_TYPE_OBUS>& TGT
         {
             FAPI_TRY(fapi2::getScom( TGT0, 0x8000a00809010c3full, l_scom_buffer ));
 
-            l_scom_buffer.insert<53, 4, 60, uint64_t>(literal_0b1010 );
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5)
+                    && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10))
+                || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12)) || ((l_chip_id == 0x6)
+                        && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+            {
+                l_scom_buffer.insert<53, 4, 60, uint64_t>(literal_0b1010 );
+            }
 
             if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
             {
+                l_scom_buffer.insert<52, 4, 60, uint64_t>(literal_0b1010 );
+            }
+
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5)
+                    && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10))
+                || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12)) || ((l_chip_id == 0x6)
+                        && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+            {
                 if (l_TGT2_ATTR_CHIP_EC_FEATURE_OBUS_P9NDD1_SPY_NAMES)
                 {
-                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 );
+                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 );
                 }
                 else if (( true ))
                 {
-                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b00011 );
+                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b00011 );
                 }
             }
-            else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21))
-                     || ((l_chip_id == 0x5) && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6)
-                             && (l_chip_ec == 0x10)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12))
-                     || ((l_chip_id == 0x6) && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
             {
                 if (l_TGT2_ATTR_CHIP_EC_FEATURE_OBUS_P9NDD1_SPY_NAMES)
                 {
-                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 );
+                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 );
                 }
                 else if (( true ))
                 {
-                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b00011 );
+                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b00011 );
                 }
             }
 
@@ -2925,39 +3057,51 @@ fapi2::ReturnCode p9_obus_scom(const fapi2::Target<fapi2::TARGET_TYPE_OBUS>& TGT
         {
             FAPI_TRY(fapi2::getScom( TGT0, 0x8000a00909010c3full, l_scom_buffer ));
 
-            l_scom_buffer.insert<53, 4, 60, uint64_t>(literal_0b1010 );
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5)
+                    && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10))
+                || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12)) || ((l_chip_id == 0x6)
+                        && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+            {
+                l_scom_buffer.insert<53, 4, 60, uint64_t>(literal_0b1010 );
+            }
 
             if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
             {
+                l_scom_buffer.insert<52, 4, 60, uint64_t>(literal_0b1010 );
+            }
+
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5)
+                    && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10))
+                || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12)) || ((l_chip_id == 0x6)
+                        && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+            {
                 if (l_TGT2_ATTR_CHIP_EC_FEATURE_OBUS_P9NDD1_SPY_NAMES)
                 {
-                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 );
+                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 );
                 }
                 else if ((l_TGT0_ATTR_OPTICS_CONFIG_MODE == fapi2::ENUM_ATTR_OPTICS_CONFIG_MODE_SMP))
                 {
-                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b10100 );
+                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b10100 );
                 }
                 else if (( true ))
                 {
-                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b00011 );
+                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b00011 );
                 }
             }
-            else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21))
-                     || ((l_chip_id == 0x5) && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6)
-                             && (l_chip_ec == 0x10)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12))
-                     || ((l_chip_id == 0x6) && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
             {
                 if (l_TGT2_ATTR_CHIP_EC_FEATURE_OBUS_P9NDD1_SPY_NAMES)
                 {
-                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 );
+                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 );
                 }
                 else if ((l_TGT0_ATTR_OPTICS_CONFIG_MODE == fapi2::ENUM_ATTR_OPTICS_CONFIG_MODE_SMP))
                 {
-                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b10100 );
+                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b10100 );
                 }
                 else if (( true ))
                 {
-                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b00011 );
+                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b00011 );
                 }
             }
 
@@ -2966,31 +3110,43 @@ fapi2::ReturnCode p9_obus_scom(const fapi2::Target<fapi2::TARGET_TYPE_OBUS>& TGT
         {
             FAPI_TRY(fapi2::getScom( TGT0, 0x8000a00a09010c3full, l_scom_buffer ));
 
-            l_scom_buffer.insert<53, 4, 60, uint64_t>(literal_0b1010 );
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5)
+                    && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10))
+                || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12)) || ((l_chip_id == 0x6)
+                        && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+            {
+                l_scom_buffer.insert<53, 4, 60, uint64_t>(literal_0b1010 );
+            }
 
             if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
             {
+                l_scom_buffer.insert<52, 4, 60, uint64_t>(literal_0b1010 );
+            }
+
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5)
+                    && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10))
+                || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12)) || ((l_chip_id == 0x6)
+                        && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+            {
                 if (l_TGT2_ATTR_CHIP_EC_FEATURE_OBUS_P9NDD1_SPY_NAMES)
                 {
-                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 );
+                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 );
                 }
                 else if (( true ))
                 {
-                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b00011 );
+                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b00011 );
                 }
             }
-            else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21))
-                     || ((l_chip_id == 0x5) && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6)
-                             && (l_chip_ec == 0x10)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12))
-                     || ((l_chip_id == 0x6) && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
             {
                 if (l_TGT2_ATTR_CHIP_EC_FEATURE_OBUS_P9NDD1_SPY_NAMES)
                 {
-                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 );
+                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 );
                 }
                 else if (( true ))
                 {
-                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b00011 );
+                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b00011 );
                 }
             }
 
@@ -2999,31 +3155,43 @@ fapi2::ReturnCode p9_obus_scom(const fapi2::Target<fapi2::TARGET_TYPE_OBUS>& TGT
         {
             FAPI_TRY(fapi2::getScom( TGT0, 0x8000a00b09010c3full, l_scom_buffer ));
 
-            l_scom_buffer.insert<53, 4, 60, uint64_t>(literal_0b1010 );
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5)
+                    && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10))
+                || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12)) || ((l_chip_id == 0x6)
+                        && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+            {
+                l_scom_buffer.insert<53, 4, 60, uint64_t>(literal_0b1010 );
+            }
 
             if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
             {
+                l_scom_buffer.insert<52, 4, 60, uint64_t>(literal_0b1010 );
+            }
+
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5)
+                    && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10))
+                || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12)) || ((l_chip_id == 0x6)
+                        && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+            {
                 if (l_TGT2_ATTR_CHIP_EC_FEATURE_OBUS_P9NDD1_SPY_NAMES)
                 {
-                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 );
+                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 );
                 }
                 else if (( true ))
                 {
-                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b00011 );
+                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b00011 );
                 }
             }
-            else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21))
-                     || ((l_chip_id == 0x5) && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6)
-                             && (l_chip_ec == 0x10)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12))
-                     || ((l_chip_id == 0x6) && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
             {
                 if (l_TGT2_ATTR_CHIP_EC_FEATURE_OBUS_P9NDD1_SPY_NAMES)
                 {
-                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 );
+                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 );
                 }
                 else if (( true ))
                 {
-                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b00011 );
+                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b00011 );
                 }
             }
 
@@ -3032,31 +3200,43 @@ fapi2::ReturnCode p9_obus_scom(const fapi2::Target<fapi2::TARGET_TYPE_OBUS>& TGT
         {
             FAPI_TRY(fapi2::getScom( TGT0, 0x8000a00c09010c3full, l_scom_buffer ));
 
-            l_scom_buffer.insert<53, 4, 60, uint64_t>(literal_0b1010 );
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5)
+                    && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10))
+                || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12)) || ((l_chip_id == 0x6)
+                        && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+            {
+                l_scom_buffer.insert<53, 4, 60, uint64_t>(literal_0b1010 );
+            }
 
             if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
             {
+                l_scom_buffer.insert<52, 4, 60, uint64_t>(literal_0b1010 );
+            }
+
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5)
+                    && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10))
+                || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12)) || ((l_chip_id == 0x6)
+                        && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+            {
                 if (l_TGT2_ATTR_CHIP_EC_FEATURE_OBUS_P9NDD1_SPY_NAMES)
                 {
-                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 );
+                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 );
                 }
                 else if (( true ))
                 {
-                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b00011 );
+                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b00011 );
                 }
             }
-            else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21))
-                     || ((l_chip_id == 0x5) && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6)
-                             && (l_chip_ec == 0x10)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12))
-                     || ((l_chip_id == 0x6) && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
             {
                 if (l_TGT2_ATTR_CHIP_EC_FEATURE_OBUS_P9NDD1_SPY_NAMES)
                 {
-                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 );
+                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 );
                 }
                 else if (( true ))
                 {
-                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b00011 );
+                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b00011 );
                 }
             }
 
@@ -3065,31 +3245,43 @@ fapi2::ReturnCode p9_obus_scom(const fapi2::Target<fapi2::TARGET_TYPE_OBUS>& TGT
         {
             FAPI_TRY(fapi2::getScom( TGT0, 0x8000a00d09010c3full, l_scom_buffer ));
 
-            l_scom_buffer.insert<53, 4, 60, uint64_t>(literal_0b1010 );
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5)
+                    && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10))
+                || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12)) || ((l_chip_id == 0x6)
+                        && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+            {
+                l_scom_buffer.insert<53, 4, 60, uint64_t>(literal_0b1010 );
+            }
 
             if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
             {
+                l_scom_buffer.insert<52, 4, 60, uint64_t>(literal_0b1010 );
+            }
+
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5)
+                    && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10))
+                || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12)) || ((l_chip_id == 0x6)
+                        && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+            {
                 if (l_TGT2_ATTR_CHIP_EC_FEATURE_OBUS_P9NDD1_SPY_NAMES)
                 {
-                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 );
+                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 );
                 }
                 else if (( true ))
                 {
-                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b00011 );
+                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b00011 );
                 }
             }
-            else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21))
-                     || ((l_chip_id == 0x5) && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6)
-                             && (l_chip_ec == 0x10)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12))
-                     || ((l_chip_id == 0x6) && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
             {
                 if (l_TGT2_ATTR_CHIP_EC_FEATURE_OBUS_P9NDD1_SPY_NAMES)
                 {
-                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 );
+                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 );
                 }
                 else if (( true ))
                 {
-                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b00011 );
+                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b00011 );
                 }
             }
 
@@ -3098,31 +3290,43 @@ fapi2::ReturnCode p9_obus_scom(const fapi2::Target<fapi2::TARGET_TYPE_OBUS>& TGT
         {
             FAPI_TRY(fapi2::getScom( TGT0, 0x8000a00e09010c3full, l_scom_buffer ));
 
-            l_scom_buffer.insert<53, 4, 60, uint64_t>(literal_0b1010 );
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5)
+                    && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10))
+                || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12)) || ((l_chip_id == 0x6)
+                        && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+            {
+                l_scom_buffer.insert<53, 4, 60, uint64_t>(literal_0b1010 );
+            }
 
             if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
             {
+                l_scom_buffer.insert<52, 4, 60, uint64_t>(literal_0b1010 );
+            }
+
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5)
+                    && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10))
+                || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12)) || ((l_chip_id == 0x6)
+                        && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+            {
                 if (l_TGT2_ATTR_CHIP_EC_FEATURE_OBUS_P9NDD1_SPY_NAMES)
                 {
-                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 );
+                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 );
                 }
                 else if (( true ))
                 {
-                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b00011 );
+                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b00011 );
                 }
             }
-            else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21))
-                     || ((l_chip_id == 0x5) && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6)
-                             && (l_chip_ec == 0x10)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12))
-                     || ((l_chip_id == 0x6) && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
             {
                 if (l_TGT2_ATTR_CHIP_EC_FEATURE_OBUS_P9NDD1_SPY_NAMES)
                 {
-                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 );
+                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 );
                 }
                 else if (( true ))
                 {
-                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b00011 );
+                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b00011 );
                 }
             }
 
@@ -3131,31 +3335,43 @@ fapi2::ReturnCode p9_obus_scom(const fapi2::Target<fapi2::TARGET_TYPE_OBUS>& TGT
         {
             FAPI_TRY(fapi2::getScom( TGT0, 0x8000a00f09010c3full, l_scom_buffer ));
 
-            l_scom_buffer.insert<53, 4, 60, uint64_t>(literal_0b1010 );
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5)
+                    && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10))
+                || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12)) || ((l_chip_id == 0x6)
+                        && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+            {
+                l_scom_buffer.insert<53, 4, 60, uint64_t>(literal_0b1010 );
+            }
 
             if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
             {
+                l_scom_buffer.insert<52, 4, 60, uint64_t>(literal_0b1010 );
+            }
+
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5)
+                    && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10))
+                || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12)) || ((l_chip_id == 0x6)
+                        && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+            {
                 if (l_TGT2_ATTR_CHIP_EC_FEATURE_OBUS_P9NDD1_SPY_NAMES)
                 {
-                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 );
+                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 );
                 }
                 else if (( true ))
                 {
-                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b00011 );
+                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b00011 );
                 }
             }
-            else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21))
-                     || ((l_chip_id == 0x5) && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6)
-                             && (l_chip_ec == 0x10)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12))
-                     || ((l_chip_id == 0x6) && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
             {
                 if (l_TGT2_ATTR_CHIP_EC_FEATURE_OBUS_P9NDD1_SPY_NAMES)
                 {
-                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 );
+                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 );
                 }
                 else if (( true ))
                 {
-                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b00011 );
+                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b00011 );
                 }
             }
 
@@ -3164,31 +3380,43 @@ fapi2::ReturnCode p9_obus_scom(const fapi2::Target<fapi2::TARGET_TYPE_OBUS>& TGT
         {
             FAPI_TRY(fapi2::getScom( TGT0, 0x8000a01009010c3full, l_scom_buffer ));
 
-            l_scom_buffer.insert<53, 4, 60, uint64_t>(literal_0b1010 );
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5)
+                    && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10))
+                || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12)) || ((l_chip_id == 0x6)
+                        && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+            {
+                l_scom_buffer.insert<53, 4, 60, uint64_t>(literal_0b1010 );
+            }
 
             if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
             {
+                l_scom_buffer.insert<52, 4, 60, uint64_t>(literal_0b1010 );
+            }
+
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5)
+                    && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10))
+                || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12)) || ((l_chip_id == 0x6)
+                        && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+            {
                 if (l_TGT2_ATTR_CHIP_EC_FEATURE_OBUS_P9NDD1_SPY_NAMES)
                 {
-                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 );
+                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 );
                 }
                 else if (( true ))
                 {
-                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b00011 );
+                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b00011 );
                 }
             }
-            else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21))
-                     || ((l_chip_id == 0x5) && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6)
-                             && (l_chip_ec == 0x10)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12))
-                     || ((l_chip_id == 0x6) && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
             {
                 if (l_TGT2_ATTR_CHIP_EC_FEATURE_OBUS_P9NDD1_SPY_NAMES)
                 {
-                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 );
+                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 );
                 }
                 else if (( true ))
                 {
-                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b00011 );
+                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b00011 );
                 }
             }
 
@@ -3197,31 +3425,43 @@ fapi2::ReturnCode p9_obus_scom(const fapi2::Target<fapi2::TARGET_TYPE_OBUS>& TGT
         {
             FAPI_TRY(fapi2::getScom( TGT0, 0x8000a01109010c3full, l_scom_buffer ));
 
-            l_scom_buffer.insert<53, 4, 60, uint64_t>(literal_0b1010 );
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5)
+                    && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10))
+                || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12)) || ((l_chip_id == 0x6)
+                        && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+            {
+                l_scom_buffer.insert<53, 4, 60, uint64_t>(literal_0b1010 );
+            }
 
             if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
             {
+                l_scom_buffer.insert<52, 4, 60, uint64_t>(literal_0b1010 );
+            }
+
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5)
+                    && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10))
+                || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12)) || ((l_chip_id == 0x6)
+                        && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+            {
                 if (l_TGT2_ATTR_CHIP_EC_FEATURE_OBUS_P9NDD1_SPY_NAMES)
                 {
-                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 );
+                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 );
                 }
                 else if (( true ))
                 {
-                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b00011 );
+                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b00011 );
                 }
             }
-            else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21))
-                     || ((l_chip_id == 0x5) && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6)
-                             && (l_chip_ec == 0x10)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12))
-                     || ((l_chip_id == 0x6) && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
             {
                 if (l_TGT2_ATTR_CHIP_EC_FEATURE_OBUS_P9NDD1_SPY_NAMES)
                 {
-                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 );
+                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 );
                 }
                 else if (( true ))
                 {
-                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b00011 );
+                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b00011 );
                 }
             }
 
@@ -3230,31 +3470,43 @@ fapi2::ReturnCode p9_obus_scom(const fapi2::Target<fapi2::TARGET_TYPE_OBUS>& TGT
         {
             FAPI_TRY(fapi2::getScom( TGT0, 0x8000a01209010c3full, l_scom_buffer ));
 
-            l_scom_buffer.insert<53, 4, 60, uint64_t>(literal_0b1010 );
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5)
+                    && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10))
+                || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12)) || ((l_chip_id == 0x6)
+                        && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+            {
+                l_scom_buffer.insert<53, 4, 60, uint64_t>(literal_0b1010 );
+            }
 
             if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
             {
+                l_scom_buffer.insert<52, 4, 60, uint64_t>(literal_0b1010 );
+            }
+
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5)
+                    && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10))
+                || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12)) || ((l_chip_id == 0x6)
+                        && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+            {
                 if (l_TGT2_ATTR_CHIP_EC_FEATURE_OBUS_P9NDD1_SPY_NAMES)
                 {
-                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 );
+                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 );
                 }
                 else if (( true ))
                 {
-                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b00011 );
+                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b00011 );
                 }
             }
-            else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21))
-                     || ((l_chip_id == 0x5) && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6)
-                             && (l_chip_ec == 0x10)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12))
-                     || ((l_chip_id == 0x6) && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
             {
                 if (l_TGT2_ATTR_CHIP_EC_FEATURE_OBUS_P9NDD1_SPY_NAMES)
                 {
-                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 );
+                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 );
                 }
                 else if (( true ))
                 {
-                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b00011 );
+                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b00011 );
                 }
             }
 
@@ -3263,31 +3515,43 @@ fapi2::ReturnCode p9_obus_scom(const fapi2::Target<fapi2::TARGET_TYPE_OBUS>& TGT
         {
             FAPI_TRY(fapi2::getScom( TGT0, 0x8000a01309010c3full, l_scom_buffer ));
 
-            l_scom_buffer.insert<53, 4, 60, uint64_t>(literal_0b1010 );
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5)
+                    && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10))
+                || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12)) || ((l_chip_id == 0x6)
+                        && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+            {
+                l_scom_buffer.insert<53, 4, 60, uint64_t>(literal_0b1010 );
+            }
 
             if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
             {
+                l_scom_buffer.insert<52, 4, 60, uint64_t>(literal_0b1010 );
+            }
+
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5)
+                    && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10))
+                || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12)) || ((l_chip_id == 0x6)
+                        && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+            {
                 if (l_TGT2_ATTR_CHIP_EC_FEATURE_OBUS_P9NDD1_SPY_NAMES)
                 {
-                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 );
+                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 );
                 }
                 else if (( true ))
                 {
-                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b00011 );
+                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b00011 );
                 }
             }
-            else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21))
-                     || ((l_chip_id == 0x5) && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6)
-                             && (l_chip_ec == 0x10)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12))
-                     || ((l_chip_id == 0x6) && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
             {
                 if (l_TGT2_ATTR_CHIP_EC_FEATURE_OBUS_P9NDD1_SPY_NAMES)
                 {
-                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 );
+                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 );
                 }
                 else if (( true ))
                 {
-                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b00011 );
+                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b00011 );
                 }
             }
 
@@ -3296,31 +3560,43 @@ fapi2::ReturnCode p9_obus_scom(const fapi2::Target<fapi2::TARGET_TYPE_OBUS>& TGT
         {
             FAPI_TRY(fapi2::getScom( TGT0, 0x8000a01409010c3full, l_scom_buffer ));
 
-            l_scom_buffer.insert<53, 4, 60, uint64_t>(literal_0b1010 );
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5)
+                    && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10))
+                || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12)) || ((l_chip_id == 0x6)
+                        && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+            {
+                l_scom_buffer.insert<53, 4, 60, uint64_t>(literal_0b1010 );
+            }
 
             if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
             {
+                l_scom_buffer.insert<52, 4, 60, uint64_t>(literal_0b1010 );
+            }
+
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5)
+                    && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10))
+                || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12)) || ((l_chip_id == 0x6)
+                        && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+            {
                 if (l_TGT2_ATTR_CHIP_EC_FEATURE_OBUS_P9NDD1_SPY_NAMES)
                 {
-                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 );
+                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 );
                 }
                 else if (( true ))
                 {
-                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b00011 );
+                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b00011 );
                 }
             }
-            else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21))
-                     || ((l_chip_id == 0x5) && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6)
-                             && (l_chip_ec == 0x10)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12))
-                     || ((l_chip_id == 0x6) && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
             {
                 if (l_TGT2_ATTR_CHIP_EC_FEATURE_OBUS_P9NDD1_SPY_NAMES)
                 {
-                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 );
+                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 );
                 }
                 else if (( true ))
                 {
-                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b00011 );
+                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b00011 );
                 }
             }
 
@@ -3329,31 +3605,43 @@ fapi2::ReturnCode p9_obus_scom(const fapi2::Target<fapi2::TARGET_TYPE_OBUS>& TGT
         {
             FAPI_TRY(fapi2::getScom( TGT0, 0x8000a01509010c3full, l_scom_buffer ));
 
-            l_scom_buffer.insert<53, 4, 60, uint64_t>(literal_0b1010 );
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5)
+                    && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10))
+                || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12)) || ((l_chip_id == 0x6)
+                        && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+            {
+                l_scom_buffer.insert<53, 4, 60, uint64_t>(literal_0b1010 );
+            }
 
             if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
             {
+                l_scom_buffer.insert<52, 4, 60, uint64_t>(literal_0b1010 );
+            }
+
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5)
+                    && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10))
+                || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12)) || ((l_chip_id == 0x6)
+                        && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+            {
                 if (l_TGT2_ATTR_CHIP_EC_FEATURE_OBUS_P9NDD1_SPY_NAMES)
                 {
-                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 );
+                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 );
                 }
                 else if (( true ))
                 {
-                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b00011 );
+                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b00011 );
                 }
             }
-            else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21))
-                     || ((l_chip_id == 0x5) && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6)
-                             && (l_chip_ec == 0x10)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12))
-                     || ((l_chip_id == 0x6) && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
             {
                 if (l_TGT2_ATTR_CHIP_EC_FEATURE_OBUS_P9NDD1_SPY_NAMES)
                 {
-                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 );
+                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 );
                 }
                 else if (( true ))
                 {
-                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b00011 );
+                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b00011 );
                 }
             }
 
@@ -3362,31 +3650,43 @@ fapi2::ReturnCode p9_obus_scom(const fapi2::Target<fapi2::TARGET_TYPE_OBUS>& TGT
         {
             FAPI_TRY(fapi2::getScom( TGT0, 0x8000a01609010c3full, l_scom_buffer ));
 
-            l_scom_buffer.insert<53, 4, 60, uint64_t>(literal_0b1010 );
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5)
+                    && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10))
+                || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12)) || ((l_chip_id == 0x6)
+                        && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+            {
+                l_scom_buffer.insert<53, 4, 60, uint64_t>(literal_0b1010 );
+            }
 
             if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
             {
+                l_scom_buffer.insert<52, 4, 60, uint64_t>(literal_0b1010 );
+            }
+
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5)
+                    && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10))
+                || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12)) || ((l_chip_id == 0x6)
+                        && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+            {
                 if (l_TGT2_ATTR_CHIP_EC_FEATURE_OBUS_P9NDD1_SPY_NAMES)
                 {
-                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 );
+                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 );
                 }
                 else if (( true ))
                 {
-                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b00011 );
+                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b00011 );
                 }
             }
-            else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21))
-                     || ((l_chip_id == 0x5) && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6)
-                             && (l_chip_ec == 0x10)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12))
-                     || ((l_chip_id == 0x6) && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
             {
                 if (l_TGT2_ATTR_CHIP_EC_FEATURE_OBUS_P9NDD1_SPY_NAMES)
                 {
-                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 );
+                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 );
                 }
                 else if (( true ))
                 {
-                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b00011 );
+                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b00011 );
                 }
             }
 
@@ -3395,31 +3695,43 @@ fapi2::ReturnCode p9_obus_scom(const fapi2::Target<fapi2::TARGET_TYPE_OBUS>& TGT
         {
             FAPI_TRY(fapi2::getScom( TGT0, 0x8000a01709010c3full, l_scom_buffer ));
 
-            l_scom_buffer.insert<53, 4, 60, uint64_t>(literal_0b1010 );
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5)
+                    && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10))
+                || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12)) || ((l_chip_id == 0x6)
+                        && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+            {
+                l_scom_buffer.insert<53, 4, 60, uint64_t>(literal_0b1010 );
+            }
 
             if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
             {
+                l_scom_buffer.insert<52, 4, 60, uint64_t>(literal_0b1010 );
+            }
+
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5)
+                    && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10))
+                || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12)) || ((l_chip_id == 0x6)
+                        && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+            {
                 if (l_TGT2_ATTR_CHIP_EC_FEATURE_OBUS_P9NDD1_SPY_NAMES)
                 {
-                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 );
+                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 );
                 }
                 else if (( true ))
                 {
-                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b00011 );
+                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b00011 );
                 }
             }
-            else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21))
-                     || ((l_chip_id == 0x5) && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6)
-                             && (l_chip_ec == 0x10)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12))
-                     || ((l_chip_id == 0x6) && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
             {
                 if (l_TGT2_ATTR_CHIP_EC_FEATURE_OBUS_P9NDD1_SPY_NAMES)
                 {
-                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 );
+                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 );
                 }
                 else if (( true ))
                 {
-                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b00011 );
+                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b00011 );
                 }
             }
 
@@ -3836,31 +4148,43 @@ fapi2::ReturnCode p9_obus_scom(const fapi2::Target<fapi2::TARGET_TYPE_OBUS>& TGT
         {
             FAPI_TRY(fapi2::getScom( TGT0, 0x8000c80009010c3full, l_scom_buffer ));
 
-            l_scom_buffer.insert<53, 4, 60, uint64_t>(literal_0b1010 );
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5)
+                    && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10))
+                || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12)) || ((l_chip_id == 0x6)
+                        && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+            {
+                l_scom_buffer.insert<53, 4, 60, uint64_t>(literal_0b1010 );
+            }
 
             if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
             {
+                l_scom_buffer.insert<52, 4, 60, uint64_t>(literal_0b1010 );
+            }
+
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5)
+                    && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10))
+                || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12)) || ((l_chip_id == 0x6)
+                        && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+            {
                 if (l_TGT2_ATTR_CHIP_EC_FEATURE_OBUS_P9NDD1_SPY_NAMES)
                 {
-                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 );
+                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 );
                 }
                 else if (( true ))
                 {
-                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b00011 );
+                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b00011 );
                 }
             }
-            else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21))
-                     || ((l_chip_id == 0x5) && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6)
-                             && (l_chip_ec == 0x10)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12))
-                     || ((l_chip_id == 0x6) && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
             {
                 if (l_TGT2_ATTR_CHIP_EC_FEATURE_OBUS_P9NDD1_SPY_NAMES)
                 {
-                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 );
+                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 );
                 }
                 else if (( true ))
                 {
-                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b00011 );
+                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b00011 );
                 }
             }
 
@@ -3869,31 +4193,43 @@ fapi2::ReturnCode p9_obus_scom(const fapi2::Target<fapi2::TARGET_TYPE_OBUS>& TGT
         {
             FAPI_TRY(fapi2::getScom( TGT0, 0x8000c80109010c3full, l_scom_buffer ));
 
-            l_scom_buffer.insert<53, 4, 60, uint64_t>(literal_0b1010 );
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5)
+                    && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10))
+                || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12)) || ((l_chip_id == 0x6)
+                        && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+            {
+                l_scom_buffer.insert<53, 4, 60, uint64_t>(literal_0b1010 );
+            }
 
             if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
             {
+                l_scom_buffer.insert<52, 4, 60, uint64_t>(literal_0b1010 );
+            }
+
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5)
+                    && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10))
+                || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12)) || ((l_chip_id == 0x6)
+                        && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+            {
                 if (l_TGT2_ATTR_CHIP_EC_FEATURE_OBUS_P9NDD1_SPY_NAMES)
                 {
-                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 );
+                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 );
                 }
                 else if (( true ))
                 {
-                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b00011 );
+                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b00011 );
                 }
             }
-            else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21))
-                     || ((l_chip_id == 0x5) && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6)
-                             && (l_chip_ec == 0x10)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12))
-                     || ((l_chip_id == 0x6) && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
             {
                 if (l_TGT2_ATTR_CHIP_EC_FEATURE_OBUS_P9NDD1_SPY_NAMES)
                 {
-                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 );
+                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 );
                 }
                 else if (( true ))
                 {
-                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b00011 );
+                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b00011 );
                 }
             }
 
@@ -3902,31 +4238,43 @@ fapi2::ReturnCode p9_obus_scom(const fapi2::Target<fapi2::TARGET_TYPE_OBUS>& TGT
         {
             FAPI_TRY(fapi2::getScom( TGT0, 0x8000c80209010c3full, l_scom_buffer ));
 
-            l_scom_buffer.insert<53, 4, 60, uint64_t>(literal_0b1010 );
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5)
+                    && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10))
+                || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12)) || ((l_chip_id == 0x6)
+                        && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+            {
+                l_scom_buffer.insert<53, 4, 60, uint64_t>(literal_0b1010 );
+            }
 
             if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
             {
+                l_scom_buffer.insert<52, 4, 60, uint64_t>(literal_0b1010 );
+            }
+
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5)
+                    && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10))
+                || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12)) || ((l_chip_id == 0x6)
+                        && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+            {
                 if (l_TGT2_ATTR_CHIP_EC_FEATURE_OBUS_P9NDD1_SPY_NAMES)
                 {
-                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 );
+                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 );
                 }
                 else if (( true ))
                 {
-                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b00011 );
+                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b00011 );
                 }
             }
-            else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21))
-                     || ((l_chip_id == 0x5) && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6)
-                             && (l_chip_ec == 0x10)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12))
-                     || ((l_chip_id == 0x6) && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
             {
                 if (l_TGT2_ATTR_CHIP_EC_FEATURE_OBUS_P9NDD1_SPY_NAMES)
                 {
-                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 );
+                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 );
                 }
                 else if (( true ))
                 {
-                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b00011 );
+                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b00011 );
                 }
             }
 
@@ -3935,39 +4283,51 @@ fapi2::ReturnCode p9_obus_scom(const fapi2::Target<fapi2::TARGET_TYPE_OBUS>& TGT
         {
             FAPI_TRY(fapi2::getScom( TGT0, 0x8000c80309010c3full, l_scom_buffer ));
 
-            l_scom_buffer.insert<53, 4, 60, uint64_t>(literal_0b1010 );
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5)
+                    && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10))
+                || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12)) || ((l_chip_id == 0x6)
+                        && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+            {
+                l_scom_buffer.insert<53, 4, 60, uint64_t>(literal_0b1010 );
+            }
 
             if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
             {
+                l_scom_buffer.insert<52, 4, 60, uint64_t>(literal_0b1010 );
+            }
+
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5)
+                    && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10))
+                || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12)) || ((l_chip_id == 0x6)
+                        && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+            {
                 if (l_TGT2_ATTR_CHIP_EC_FEATURE_OBUS_P9NDD1_SPY_NAMES)
                 {
-                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 );
+                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 );
                 }
                 else if ((l_TGT0_ATTR_OPTICS_CONFIG_MODE == fapi2::ENUM_ATTR_OPTICS_CONFIG_MODE_SMP))
                 {
-                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b10100 );
+                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b10100 );
                 }
                 else if (( true ))
                 {
-                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b00011 );
+                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b00011 );
                 }
             }
-            else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21))
-                     || ((l_chip_id == 0x5) && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6)
-                             && (l_chip_ec == 0x10)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12))
-                     || ((l_chip_id == 0x6) && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
             {
                 if (l_TGT2_ATTR_CHIP_EC_FEATURE_OBUS_P9NDD1_SPY_NAMES)
                 {
-                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 );
+                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 );
                 }
                 else if ((l_TGT0_ATTR_OPTICS_CONFIG_MODE == fapi2::ENUM_ATTR_OPTICS_CONFIG_MODE_SMP))
                 {
-                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b10100 );
+                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b10100 );
                 }
                 else if (( true ))
                 {
-                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b00011 );
+                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b00011 );
                 }
             }
 
@@ -3976,31 +4336,43 @@ fapi2::ReturnCode p9_obus_scom(const fapi2::Target<fapi2::TARGET_TYPE_OBUS>& TGT
         {
             FAPI_TRY(fapi2::getScom( TGT0, 0x8000c80409010c3full, l_scom_buffer ));
 
-            l_scom_buffer.insert<53, 4, 60, uint64_t>(literal_0b1010 );
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5)
+                    && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10))
+                || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12)) || ((l_chip_id == 0x6)
+                        && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+            {
+                l_scom_buffer.insert<53, 4, 60, uint64_t>(literal_0b1010 );
+            }
 
             if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
             {
+                l_scom_buffer.insert<52, 4, 60, uint64_t>(literal_0b1010 );
+            }
+
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5)
+                    && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10))
+                || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12)) || ((l_chip_id == 0x6)
+                        && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+            {
                 if (l_TGT2_ATTR_CHIP_EC_FEATURE_OBUS_P9NDD1_SPY_NAMES)
                 {
-                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 );
+                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 );
                 }
                 else if (( true ))
                 {
-                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b00011 );
+                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b00011 );
                 }
             }
-            else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21))
-                     || ((l_chip_id == 0x5) && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6)
-                             && (l_chip_ec == 0x10)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12))
-                     || ((l_chip_id == 0x6) && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
             {
                 if (l_TGT2_ATTR_CHIP_EC_FEATURE_OBUS_P9NDD1_SPY_NAMES)
                 {
-                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 );
+                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 );
                 }
                 else if (( true ))
                 {
-                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b00011 );
+                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b00011 );
                 }
             }
 
@@ -4009,39 +4381,51 @@ fapi2::ReturnCode p9_obus_scom(const fapi2::Target<fapi2::TARGET_TYPE_OBUS>& TGT
         {
             FAPI_TRY(fapi2::getScom( TGT0, 0x8000c80509010c3full, l_scom_buffer ));
 
-            l_scom_buffer.insert<53, 4, 60, uint64_t>(literal_0b1010 );
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5)
+                    && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10))
+                || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12)) || ((l_chip_id == 0x6)
+                        && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+            {
+                l_scom_buffer.insert<53, 4, 60, uint64_t>(literal_0b1010 );
+            }
 
             if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
             {
+                l_scom_buffer.insert<52, 4, 60, uint64_t>(literal_0b1010 );
+            }
+
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5)
+                    && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10))
+                || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12)) || ((l_chip_id == 0x6)
+                        && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+            {
                 if (l_TGT2_ATTR_CHIP_EC_FEATURE_OBUS_P9NDD1_SPY_NAMES)
                 {
-                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 );
+                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 );
                 }
                 else if ((l_TGT0_ATTR_OPTICS_CONFIG_MODE == fapi2::ENUM_ATTR_OPTICS_CONFIG_MODE_SMP))
                 {
-                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b10100 );
+                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b10100 );
                 }
                 else if (( true ))
                 {
-                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b00011 );
+                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b00011 );
                 }
             }
-            else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21))
-                     || ((l_chip_id == 0x5) && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6)
-                             && (l_chip_ec == 0x10)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12))
-                     || ((l_chip_id == 0x6) && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
             {
                 if (l_TGT2_ATTR_CHIP_EC_FEATURE_OBUS_P9NDD1_SPY_NAMES)
                 {
-                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 );
+                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 );
                 }
                 else if ((l_TGT0_ATTR_OPTICS_CONFIG_MODE == fapi2::ENUM_ATTR_OPTICS_CONFIG_MODE_SMP))
                 {
-                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b10100 );
+                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b10100 );
                 }
                 else if (( true ))
                 {
-                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b00011 );
+                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b00011 );
                 }
             }
 
@@ -4050,31 +4434,43 @@ fapi2::ReturnCode p9_obus_scom(const fapi2::Target<fapi2::TARGET_TYPE_OBUS>& TGT
         {
             FAPI_TRY(fapi2::getScom( TGT0, 0x8000c80609010c3full, l_scom_buffer ));
 
-            l_scom_buffer.insert<53, 4, 60, uint64_t>(literal_0b1010 );
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5)
+                    && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10))
+                || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12)) || ((l_chip_id == 0x6)
+                        && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+            {
+                l_scom_buffer.insert<53, 4, 60, uint64_t>(literal_0b1010 );
+            }
 
             if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
             {
+                l_scom_buffer.insert<52, 4, 60, uint64_t>(literal_0b1010 );
+            }
+
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5)
+                    && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10))
+                || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12)) || ((l_chip_id == 0x6)
+                        && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+            {
                 if (l_TGT2_ATTR_CHIP_EC_FEATURE_OBUS_P9NDD1_SPY_NAMES)
                 {
-                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 );
+                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 );
                 }
                 else if (( true ))
                 {
-                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b00011 );
+                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b00011 );
                 }
             }
-            else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21))
-                     || ((l_chip_id == 0x5) && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6)
-                             && (l_chip_ec == 0x10)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12))
-                     || ((l_chip_id == 0x6) && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
             {
                 if (l_TGT2_ATTR_CHIP_EC_FEATURE_OBUS_P9NDD1_SPY_NAMES)
                 {
-                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 );
+                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 );
                 }
                 else if (( true ))
                 {
-                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b00011 );
+                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b00011 );
                 }
             }
 
@@ -4083,31 +4479,43 @@ fapi2::ReturnCode p9_obus_scom(const fapi2::Target<fapi2::TARGET_TYPE_OBUS>& TGT
         {
             FAPI_TRY(fapi2::getScom( TGT0, 0x8000c80709010c3full, l_scom_buffer ));
 
-            l_scom_buffer.insert<53, 4, 60, uint64_t>(literal_0b1010 );
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5)
+                    && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10))
+                || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12)) || ((l_chip_id == 0x6)
+                        && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+            {
+                l_scom_buffer.insert<53, 4, 60, uint64_t>(literal_0b1010 );
+            }
 
             if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
             {
+                l_scom_buffer.insert<52, 4, 60, uint64_t>(literal_0b1010 );
+            }
+
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5)
+                    && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10))
+                || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12)) || ((l_chip_id == 0x6)
+                        && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+            {
                 if (l_TGT2_ATTR_CHIP_EC_FEATURE_OBUS_P9NDD1_SPY_NAMES)
                 {
-                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 );
+                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 );
                 }
                 else if (( true ))
                 {
-                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b00011 );
+                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b00011 );
                 }
             }
-            else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21))
-                     || ((l_chip_id == 0x5) && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6)
-                             && (l_chip_ec == 0x10)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12))
-                     || ((l_chip_id == 0x6) && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
             {
                 if (l_TGT2_ATTR_CHIP_EC_FEATURE_OBUS_P9NDD1_SPY_NAMES)
                 {
-                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 );
+                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 );
                 }
                 else if (( true ))
                 {
-                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b00011 );
+                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b00011 );
                 }
             }
 
@@ -4116,31 +4524,43 @@ fapi2::ReturnCode p9_obus_scom(const fapi2::Target<fapi2::TARGET_TYPE_OBUS>& TGT
         {
             FAPI_TRY(fapi2::getScom( TGT0, 0x8000c80809010c3full, l_scom_buffer ));
 
-            l_scom_buffer.insert<53, 4, 60, uint64_t>(literal_0b1010 );
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5)
+                    && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10))
+                || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12)) || ((l_chip_id == 0x6)
+                        && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+            {
+                l_scom_buffer.insert<53, 4, 60, uint64_t>(literal_0b1010 );
+            }
 
             if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
             {
+                l_scom_buffer.insert<52, 4, 60, uint64_t>(literal_0b1010 );
+            }
+
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5)
+                    && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10))
+                || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12)) || ((l_chip_id == 0x6)
+                        && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+            {
                 if (l_TGT2_ATTR_CHIP_EC_FEATURE_OBUS_P9NDD1_SPY_NAMES)
                 {
-                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 );
+                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 );
                 }
                 else if (( true ))
                 {
-                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b00011 );
+                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b00011 );
                 }
             }
-            else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21))
-                     || ((l_chip_id == 0x5) && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6)
-                             && (l_chip_ec == 0x10)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12))
-                     || ((l_chip_id == 0x6) && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
             {
                 if (l_TGT2_ATTR_CHIP_EC_FEATURE_OBUS_P9NDD1_SPY_NAMES)
                 {
-                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 );
+                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 );
                 }
                 else if (( true ))
                 {
-                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b00011 );
+                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b00011 );
                 }
             }
 
@@ -4149,39 +4569,51 @@ fapi2::ReturnCode p9_obus_scom(const fapi2::Target<fapi2::TARGET_TYPE_OBUS>& TGT
         {
             FAPI_TRY(fapi2::getScom( TGT0, 0x8000c80909010c3full, l_scom_buffer ));
 
-            l_scom_buffer.insert<53, 4, 60, uint64_t>(literal_0b1010 );
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5)
+                    && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10))
+                || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12)) || ((l_chip_id == 0x6)
+                        && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+            {
+                l_scom_buffer.insert<53, 4, 60, uint64_t>(literal_0b1010 );
+            }
 
             if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
             {
+                l_scom_buffer.insert<52, 4, 60, uint64_t>(literal_0b1010 );
+            }
+
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5)
+                    && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10))
+                || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12)) || ((l_chip_id == 0x6)
+                        && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+            {
                 if (l_TGT2_ATTR_CHIP_EC_FEATURE_OBUS_P9NDD1_SPY_NAMES)
                 {
-                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 );
+                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 );
                 }
                 else if ((l_TGT0_ATTR_OPTICS_CONFIG_MODE == fapi2::ENUM_ATTR_OPTICS_CONFIG_MODE_SMP))
                 {
-                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b10100 );
+                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b10100 );
                 }
                 else if (( true ))
                 {
-                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b00011 );
+                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b00011 );
                 }
             }
-            else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21))
-                     || ((l_chip_id == 0x5) && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6)
-                             && (l_chip_ec == 0x10)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12))
-                     || ((l_chip_id == 0x6) && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
             {
                 if (l_TGT2_ATTR_CHIP_EC_FEATURE_OBUS_P9NDD1_SPY_NAMES)
                 {
-                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 );
+                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 );
                 }
                 else if ((l_TGT0_ATTR_OPTICS_CONFIG_MODE == fapi2::ENUM_ATTR_OPTICS_CONFIG_MODE_SMP))
                 {
-                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b10100 );
+                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b10100 );
                 }
                 else if (( true ))
                 {
-                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b00011 );
+                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b00011 );
                 }
             }
 
@@ -4190,31 +4622,43 @@ fapi2::ReturnCode p9_obus_scom(const fapi2::Target<fapi2::TARGET_TYPE_OBUS>& TGT
         {
             FAPI_TRY(fapi2::getScom( TGT0, 0x8000c80a09010c3full, l_scom_buffer ));
 
-            l_scom_buffer.insert<53, 4, 60, uint64_t>(literal_0b1010 );
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5)
+                    && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10))
+                || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12)) || ((l_chip_id == 0x6)
+                        && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+            {
+                l_scom_buffer.insert<53, 4, 60, uint64_t>(literal_0b1010 );
+            }
 
             if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
             {
+                l_scom_buffer.insert<52, 4, 60, uint64_t>(literal_0b1010 );
+            }
+
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5)
+                    && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10))
+                || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12)) || ((l_chip_id == 0x6)
+                        && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+            {
                 if (l_TGT2_ATTR_CHIP_EC_FEATURE_OBUS_P9NDD1_SPY_NAMES)
                 {
-                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 );
+                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 );
                 }
                 else if (( true ))
                 {
-                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b00011 );
+                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b00011 );
                 }
             }
-            else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21))
-                     || ((l_chip_id == 0x5) && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6)
-                             && (l_chip_ec == 0x10)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12))
-                     || ((l_chip_id == 0x6) && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
             {
                 if (l_TGT2_ATTR_CHIP_EC_FEATURE_OBUS_P9NDD1_SPY_NAMES)
                 {
-                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 );
+                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 );
                 }
                 else if (( true ))
                 {
-                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b00011 );
+                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b00011 );
                 }
             }
 
@@ -4223,31 +4667,43 @@ fapi2::ReturnCode p9_obus_scom(const fapi2::Target<fapi2::TARGET_TYPE_OBUS>& TGT
         {
             FAPI_TRY(fapi2::getScom( TGT0, 0x8000c80b09010c3full, l_scom_buffer ));
 
-            l_scom_buffer.insert<53, 4, 60, uint64_t>(literal_0b1010 );
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5)
+                    && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10))
+                || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12)) || ((l_chip_id == 0x6)
+                        && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+            {
+                l_scom_buffer.insert<53, 4, 60, uint64_t>(literal_0b1010 );
+            }
 
             if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
             {
+                l_scom_buffer.insert<52, 4, 60, uint64_t>(literal_0b1010 );
+            }
+
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5)
+                    && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10))
+                || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12)) || ((l_chip_id == 0x6)
+                        && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+            {
                 if (l_TGT2_ATTR_CHIP_EC_FEATURE_OBUS_P9NDD1_SPY_NAMES)
                 {
-                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 );
+                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 );
                 }
                 else if (( true ))
                 {
-                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b00011 );
+                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b00011 );
                 }
             }
-            else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21))
-                     || ((l_chip_id == 0x5) && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6)
-                             && (l_chip_ec == 0x10)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12))
-                     || ((l_chip_id == 0x6) && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
             {
                 if (l_TGT2_ATTR_CHIP_EC_FEATURE_OBUS_P9NDD1_SPY_NAMES)
                 {
-                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 );
+                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 );
                 }
                 else if (( true ))
                 {
-                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b00011 );
+                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b00011 );
                 }
             }
 
@@ -4256,31 +4712,43 @@ fapi2::ReturnCode p9_obus_scom(const fapi2::Target<fapi2::TARGET_TYPE_OBUS>& TGT
         {
             FAPI_TRY(fapi2::getScom( TGT0, 0x8000c80c09010c3full, l_scom_buffer ));
 
-            l_scom_buffer.insert<53, 4, 60, uint64_t>(literal_0b1010 );
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5)
+                    && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10))
+                || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12)) || ((l_chip_id == 0x6)
+                        && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+            {
+                l_scom_buffer.insert<53, 4, 60, uint64_t>(literal_0b1010 );
+            }
 
             if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
             {
+                l_scom_buffer.insert<52, 4, 60, uint64_t>(literal_0b1010 );
+            }
+
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5)
+                    && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10))
+                || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12)) || ((l_chip_id == 0x6)
+                        && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+            {
                 if (l_TGT2_ATTR_CHIP_EC_FEATURE_OBUS_P9NDD1_SPY_NAMES)
                 {
-                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 );
+                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 );
                 }
                 else if (( true ))
                 {
-                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b00011 );
+                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b00011 );
                 }
             }
-            else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21))
-                     || ((l_chip_id == 0x5) && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6)
-                             && (l_chip_ec == 0x10)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12))
-                     || ((l_chip_id == 0x6) && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
             {
                 if (l_TGT2_ATTR_CHIP_EC_FEATURE_OBUS_P9NDD1_SPY_NAMES)
                 {
-                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 );
+                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 );
                 }
                 else if (( true ))
                 {
-                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b00011 );
+                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b00011 );
                 }
             }
 
@@ -4289,31 +4757,43 @@ fapi2::ReturnCode p9_obus_scom(const fapi2::Target<fapi2::TARGET_TYPE_OBUS>& TGT
         {
             FAPI_TRY(fapi2::getScom( TGT0, 0x8000c80d09010c3full, l_scom_buffer ));
 
-            l_scom_buffer.insert<53, 4, 60, uint64_t>(literal_0b1010 );
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5)
+                    && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10))
+                || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12)) || ((l_chip_id == 0x6)
+                        && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+            {
+                l_scom_buffer.insert<53, 4, 60, uint64_t>(literal_0b1010 );
+            }
 
             if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
             {
+                l_scom_buffer.insert<52, 4, 60, uint64_t>(literal_0b1010 );
+            }
+
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5)
+                    && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10))
+                || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12)) || ((l_chip_id == 0x6)
+                        && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+            {
                 if (l_TGT2_ATTR_CHIP_EC_FEATURE_OBUS_P9NDD1_SPY_NAMES)
                 {
-                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 );
+                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 );
                 }
                 else if (( true ))
                 {
-                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b00011 );
+                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b00011 );
                 }
             }
-            else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21))
-                     || ((l_chip_id == 0x5) && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6)
-                             && (l_chip_ec == 0x10)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12))
-                     || ((l_chip_id == 0x6) && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
             {
                 if (l_TGT2_ATTR_CHIP_EC_FEATURE_OBUS_P9NDD1_SPY_NAMES)
                 {
-                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 );
+                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 );
                 }
                 else if (( true ))
                 {
-                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b00011 );
+                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b00011 );
                 }
             }
 
@@ -4322,31 +4802,43 @@ fapi2::ReturnCode p9_obus_scom(const fapi2::Target<fapi2::TARGET_TYPE_OBUS>& TGT
         {
             FAPI_TRY(fapi2::getScom( TGT0, 0x8000c80e09010c3full, l_scom_buffer ));
 
-            l_scom_buffer.insert<53, 4, 60, uint64_t>(literal_0b1010 );
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5)
+                    && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10))
+                || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12)) || ((l_chip_id == 0x6)
+                        && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+            {
+                l_scom_buffer.insert<53, 4, 60, uint64_t>(literal_0b1010 );
+            }
 
             if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
             {
+                l_scom_buffer.insert<52, 4, 60, uint64_t>(literal_0b1010 );
+            }
+
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5)
+                    && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10))
+                || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12)) || ((l_chip_id == 0x6)
+                        && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+            {
                 if (l_TGT2_ATTR_CHIP_EC_FEATURE_OBUS_P9NDD1_SPY_NAMES)
                 {
-                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 );
+                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 );
                 }
                 else if (( true ))
                 {
-                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b00011 );
+                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b00011 );
                 }
             }
-            else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21))
-                     || ((l_chip_id == 0x5) && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6)
-                             && (l_chip_ec == 0x10)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12))
-                     || ((l_chip_id == 0x6) && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
             {
                 if (l_TGT2_ATTR_CHIP_EC_FEATURE_OBUS_P9NDD1_SPY_NAMES)
                 {
-                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 );
+                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 );
                 }
                 else if (( true ))
                 {
-                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b00011 );
+                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b00011 );
                 }
             }
 
@@ -4355,31 +4847,43 @@ fapi2::ReturnCode p9_obus_scom(const fapi2::Target<fapi2::TARGET_TYPE_OBUS>& TGT
         {
             FAPI_TRY(fapi2::getScom( TGT0, 0x8000c80f09010c3full, l_scom_buffer ));
 
-            l_scom_buffer.insert<53, 4, 60, uint64_t>(literal_0b1010 );
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5)
+                    && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10))
+                || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12)) || ((l_chip_id == 0x6)
+                        && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+            {
+                l_scom_buffer.insert<53, 4, 60, uint64_t>(literal_0b1010 );
+            }
 
             if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
             {
+                l_scom_buffer.insert<52, 4, 60, uint64_t>(literal_0b1010 );
+            }
+
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5)
+                    && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10))
+                || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12)) || ((l_chip_id == 0x6)
+                        && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+            {
                 if (l_TGT2_ATTR_CHIP_EC_FEATURE_OBUS_P9NDD1_SPY_NAMES)
                 {
-                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 );
+                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 );
                 }
                 else if (( true ))
                 {
-                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b00011 );
+                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b00011 );
                 }
             }
-            else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21))
-                     || ((l_chip_id == 0x5) && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6)
-                             && (l_chip_ec == 0x10)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12))
-                     || ((l_chip_id == 0x6) && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
             {
                 if (l_TGT2_ATTR_CHIP_EC_FEATURE_OBUS_P9NDD1_SPY_NAMES)
                 {
-                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 );
+                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 );
                 }
                 else if (( true ))
                 {
-                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b00011 );
+                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b00011 );
                 }
             }
 
@@ -4388,31 +4892,43 @@ fapi2::ReturnCode p9_obus_scom(const fapi2::Target<fapi2::TARGET_TYPE_OBUS>& TGT
         {
             FAPI_TRY(fapi2::getScom( TGT0, 0x8000c81009010c3full, l_scom_buffer ));
 
-            l_scom_buffer.insert<53, 4, 60, uint64_t>(literal_0b1010 );
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5)
+                    && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10))
+                || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12)) || ((l_chip_id == 0x6)
+                        && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+            {
+                l_scom_buffer.insert<53, 4, 60, uint64_t>(literal_0b1010 );
+            }
 
             if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
             {
+                l_scom_buffer.insert<52, 4, 60, uint64_t>(literal_0b1010 );
+            }
+
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5)
+                    && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10))
+                || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12)) || ((l_chip_id == 0x6)
+                        && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+            {
                 if (l_TGT2_ATTR_CHIP_EC_FEATURE_OBUS_P9NDD1_SPY_NAMES)
                 {
-                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 );
+                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 );
                 }
                 else if (( true ))
                 {
-                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b00011 );
+                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b00011 );
                 }
             }
-            else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21))
-                     || ((l_chip_id == 0x5) && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6)
-                             && (l_chip_ec == 0x10)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12))
-                     || ((l_chip_id == 0x6) && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
             {
                 if (l_TGT2_ATTR_CHIP_EC_FEATURE_OBUS_P9NDD1_SPY_NAMES)
                 {
-                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 );
+                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 );
                 }
                 else if (( true ))
                 {
-                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b00011 );
+                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b00011 );
                 }
             }
 
@@ -4421,31 +4937,43 @@ fapi2::ReturnCode p9_obus_scom(const fapi2::Target<fapi2::TARGET_TYPE_OBUS>& TGT
         {
             FAPI_TRY(fapi2::getScom( TGT0, 0x8000c81109010c3full, l_scom_buffer ));
 
-            l_scom_buffer.insert<53, 4, 60, uint64_t>(literal_0b1010 );
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5)
+                    && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10))
+                || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12)) || ((l_chip_id == 0x6)
+                        && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+            {
+                l_scom_buffer.insert<53, 4, 60, uint64_t>(literal_0b1010 );
+            }
 
             if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
             {
+                l_scom_buffer.insert<52, 4, 60, uint64_t>(literal_0b1010 );
+            }
+
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5)
+                    && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10))
+                || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12)) || ((l_chip_id == 0x6)
+                        && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+            {
                 if (l_TGT2_ATTR_CHIP_EC_FEATURE_OBUS_P9NDD1_SPY_NAMES)
                 {
-                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 );
+                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 );
                 }
                 else if (( true ))
                 {
-                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b00011 );
+                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b00011 );
                 }
             }
-            else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21))
-                     || ((l_chip_id == 0x5) && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6)
-                             && (l_chip_ec == 0x10)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12))
-                     || ((l_chip_id == 0x6) && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
             {
                 if (l_TGT2_ATTR_CHIP_EC_FEATURE_OBUS_P9NDD1_SPY_NAMES)
                 {
-                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 );
+                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 );
                 }
                 else if (( true ))
                 {
-                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b00011 );
+                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b00011 );
                 }
             }
 
@@ -4454,31 +4982,43 @@ fapi2::ReturnCode p9_obus_scom(const fapi2::Target<fapi2::TARGET_TYPE_OBUS>& TGT
         {
             FAPI_TRY(fapi2::getScom( TGT0, 0x8000c81209010c3full, l_scom_buffer ));
 
-            l_scom_buffer.insert<53, 4, 60, uint64_t>(literal_0b1010 );
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5)
+                    && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10))
+                || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12)) || ((l_chip_id == 0x6)
+                        && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+            {
+                l_scom_buffer.insert<53, 4, 60, uint64_t>(literal_0b1010 );
+            }
 
             if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
             {
+                l_scom_buffer.insert<52, 4, 60, uint64_t>(literal_0b1010 );
+            }
+
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5)
+                    && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10))
+                || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12)) || ((l_chip_id == 0x6)
+                        && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+            {
                 if (l_TGT2_ATTR_CHIP_EC_FEATURE_OBUS_P9NDD1_SPY_NAMES)
                 {
-                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 );
+                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 );
                 }
                 else if (( true ))
                 {
-                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b00011 );
+                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b00011 );
                 }
             }
-            else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21))
-                     || ((l_chip_id == 0x5) && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6)
-                             && (l_chip_ec == 0x10)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12))
-                     || ((l_chip_id == 0x6) && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
             {
                 if (l_TGT2_ATTR_CHIP_EC_FEATURE_OBUS_P9NDD1_SPY_NAMES)
                 {
-                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 );
+                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 );
                 }
                 else if (( true ))
                 {
-                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b00011 );
+                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b00011 );
                 }
             }
 
@@ -4487,31 +5027,43 @@ fapi2::ReturnCode p9_obus_scom(const fapi2::Target<fapi2::TARGET_TYPE_OBUS>& TGT
         {
             FAPI_TRY(fapi2::getScom( TGT0, 0x8000c81309010c3full, l_scom_buffer ));
 
-            l_scom_buffer.insert<53, 4, 60, uint64_t>(literal_0b1010 );
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5)
+                    && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10))
+                || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12)) || ((l_chip_id == 0x6)
+                        && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+            {
+                l_scom_buffer.insert<53, 4, 60, uint64_t>(literal_0b1010 );
+            }
 
             if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
             {
+                l_scom_buffer.insert<52, 4, 60, uint64_t>(literal_0b1010 );
+            }
+
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5)
+                    && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10))
+                || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12)) || ((l_chip_id == 0x6)
+                        && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+            {
                 if (l_TGT2_ATTR_CHIP_EC_FEATURE_OBUS_P9NDD1_SPY_NAMES)
                 {
-                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 );
+                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 );
                 }
                 else if (( true ))
                 {
-                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b00011 );
+                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b00011 );
                 }
             }
-            else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21))
-                     || ((l_chip_id == 0x5) && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6)
-                             && (l_chip_ec == 0x10)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12))
-                     || ((l_chip_id == 0x6) && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
             {
                 if (l_TGT2_ATTR_CHIP_EC_FEATURE_OBUS_P9NDD1_SPY_NAMES)
                 {
-                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 );
+                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 );
                 }
                 else if (( true ))
                 {
-                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b00011 );
+                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b00011 );
                 }
             }
 
@@ -4520,31 +5072,43 @@ fapi2::ReturnCode p9_obus_scom(const fapi2::Target<fapi2::TARGET_TYPE_OBUS>& TGT
         {
             FAPI_TRY(fapi2::getScom( TGT0, 0x8000c81409010c3full, l_scom_buffer ));
 
-            l_scom_buffer.insert<53, 4, 60, uint64_t>(literal_0b1010 );
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5)
+                    && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10))
+                || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12)) || ((l_chip_id == 0x6)
+                        && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+            {
+                l_scom_buffer.insert<53, 4, 60, uint64_t>(literal_0b1010 );
+            }
 
             if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
             {
+                l_scom_buffer.insert<52, 4, 60, uint64_t>(literal_0b1010 );
+            }
+
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5)
+                    && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10))
+                || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12)) || ((l_chip_id == 0x6)
+                        && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+            {
                 if (l_TGT2_ATTR_CHIP_EC_FEATURE_OBUS_P9NDD1_SPY_NAMES)
                 {
-                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 );
+                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 );
                 }
                 else if (( true ))
                 {
-                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b00011 );
+                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b00011 );
                 }
             }
-            else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21))
-                     || ((l_chip_id == 0x5) && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6)
-                             && (l_chip_ec == 0x10)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12))
-                     || ((l_chip_id == 0x6) && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
             {
                 if (l_TGT2_ATTR_CHIP_EC_FEATURE_OBUS_P9NDD1_SPY_NAMES)
                 {
-                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 );
+                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 );
                 }
                 else if (( true ))
                 {
-                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b00011 );
+                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b00011 );
                 }
             }
 
@@ -4553,31 +5117,43 @@ fapi2::ReturnCode p9_obus_scom(const fapi2::Target<fapi2::TARGET_TYPE_OBUS>& TGT
         {
             FAPI_TRY(fapi2::getScom( TGT0, 0x8000c81509010c3full, l_scom_buffer ));
 
-            l_scom_buffer.insert<53, 4, 60, uint64_t>(literal_0b1010 );
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5)
+                    && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10))
+                || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12)) || ((l_chip_id == 0x6)
+                        && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+            {
+                l_scom_buffer.insert<53, 4, 60, uint64_t>(literal_0b1010 );
+            }
 
             if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
             {
+                l_scom_buffer.insert<52, 4, 60, uint64_t>(literal_0b1010 );
+            }
+
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5)
+                    && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10))
+                || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12)) || ((l_chip_id == 0x6)
+                        && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+            {
                 if (l_TGT2_ATTR_CHIP_EC_FEATURE_OBUS_P9NDD1_SPY_NAMES)
                 {
-                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 );
+                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 );
                 }
                 else if (( true ))
                 {
-                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b00011 );
+                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b00011 );
                 }
             }
-            else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21))
-                     || ((l_chip_id == 0x5) && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6)
-                             && (l_chip_ec == 0x10)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12))
-                     || ((l_chip_id == 0x6) && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
             {
                 if (l_TGT2_ATTR_CHIP_EC_FEATURE_OBUS_P9NDD1_SPY_NAMES)
                 {
-                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 );
+                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 );
                 }
                 else if (( true ))
                 {
-                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b00011 );
+                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b00011 );
                 }
             }
 
@@ -4586,31 +5162,43 @@ fapi2::ReturnCode p9_obus_scom(const fapi2::Target<fapi2::TARGET_TYPE_OBUS>& TGT
         {
             FAPI_TRY(fapi2::getScom( TGT0, 0x8000c81609010c3full, l_scom_buffer ));
 
-            l_scom_buffer.insert<53, 4, 60, uint64_t>(literal_0b1010 );
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5)
+                    && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10))
+                || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12)) || ((l_chip_id == 0x6)
+                        && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+            {
+                l_scom_buffer.insert<53, 4, 60, uint64_t>(literal_0b1010 );
+            }
 
             if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
             {
+                l_scom_buffer.insert<52, 4, 60, uint64_t>(literal_0b1010 );
+            }
+
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5)
+                    && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10))
+                || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12)) || ((l_chip_id == 0x6)
+                        && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+            {
                 if (l_TGT2_ATTR_CHIP_EC_FEATURE_OBUS_P9NDD1_SPY_NAMES)
                 {
-                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 );
+                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 );
                 }
                 else if (( true ))
                 {
-                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b00011 );
+                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b00011 );
                 }
             }
-            else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21))
-                     || ((l_chip_id == 0x5) && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6)
-                             && (l_chip_ec == 0x10)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12))
-                     || ((l_chip_id == 0x6) && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
             {
                 if (l_TGT2_ATTR_CHIP_EC_FEATURE_OBUS_P9NDD1_SPY_NAMES)
                 {
-                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 );
+                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 );
                 }
                 else if (( true ))
                 {
-                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b00011 );
+                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b00011 );
                 }
             }
 
@@ -4619,31 +5207,43 @@ fapi2::ReturnCode p9_obus_scom(const fapi2::Target<fapi2::TARGET_TYPE_OBUS>& TGT
         {
             FAPI_TRY(fapi2::getScom( TGT0, 0x8000c81709010c3full, l_scom_buffer ));
 
-            l_scom_buffer.insert<53, 4, 60, uint64_t>(literal_0b1010 );
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5)
+                    && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10))
+                || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12)) || ((l_chip_id == 0x6)
+                        && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+            {
+                l_scom_buffer.insert<53, 4, 60, uint64_t>(literal_0b1010 );
+            }
 
             if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
             {
+                l_scom_buffer.insert<52, 4, 60, uint64_t>(literal_0b1010 );
+            }
+
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5)
+                    && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10))
+                || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12)) || ((l_chip_id == 0x6)
+                        && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+            {
                 if (l_TGT2_ATTR_CHIP_EC_FEATURE_OBUS_P9NDD1_SPY_NAMES)
                 {
-                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 );
+                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 );
                 }
                 else if (( true ))
                 {
-                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b00011 );
+                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b00011 );
                 }
             }
-            else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21))
-                     || ((l_chip_id == 0x5) && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6)
-                             && (l_chip_ec == 0x10)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12))
-                     || ((l_chip_id == 0x6) && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
             {
                 if (l_TGT2_ATTR_CHIP_EC_FEATURE_OBUS_P9NDD1_SPY_NAMES)
                 {
-                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 );
+                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 );
                 }
                 else if (( true ))
                 {
-                    l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b00011 );
+                    l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b00011 );
                 }
             }
 
@@ -5121,40 +5721,94 @@ fapi2::ReturnCode p9_obus_scom(const fapi2::Target<fapi2::TARGET_TYPE_OBUS>& TGT
         {
             FAPI_TRY(fapi2::getScom( TGT0, 0x8008180009010c3full, l_scom_buffer ));
 
-            if (((l_TGT0_ATTR_IO_O_CHANNEL_TYPE == fapi2::ENUM_ATTR_IO_O_CHANNEL_TYPE_BOARD)
-                 && ( ! l_TGT2_ATTR_CHIP_EC_FEATURE_HW422471)))
-            {
-                constexpr auto l_IOO0_IOO_CPLT_RX0_RXCTL_CTL_REGS_RX_CTL_REGS_RX_RECAL_REQ_DL_MASK_OFF = 0x0;
-                l_scom_buffer.insert<54, 1, 63, uint64_t>(l_IOO0_IOO_CPLT_RX0_RXCTL_CTL_REGS_RX_CTL_REGS_RX_RECAL_REQ_DL_MASK_OFF );
-            }
-            else if (((l_TGT0_ATTR_IO_O_CHANNEL_TYPE == fapi2::ENUM_ATTR_IO_O_CHANNEL_TYPE_CABLE)
-                      && ( ! l_TGT2_ATTR_CHIP_EC_FEATURE_HW422471)))
-            {
-                constexpr auto l_IOO0_IOO_CPLT_RX0_RXCTL_CTL_REGS_RX_CTL_REGS_RX_RECAL_REQ_DL_MASK_ON = 0x1;
-                l_scom_buffer.insert<54, 1, 63, uint64_t>(l_IOO0_IOO_CPLT_RX0_RXCTL_CTL_REGS_RX_CTL_REGS_RX_RECAL_REQ_DL_MASK_ON );
-            }
-            else if (( true ))
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5)
+                    && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10))
+                || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12)) || ((l_chip_id == 0x6)
+                        && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
             {
-                constexpr auto l_IOO0_IOO_CPLT_RX0_RXCTL_CTL_REGS_RX_CTL_REGS_RX_RECAL_REQ_DL_MASK_OFF = 0x0;
-                l_scom_buffer.insert<54, 1, 63, uint64_t>(l_IOO0_IOO_CPLT_RX0_RXCTL_CTL_REGS_RX_CTL_REGS_RX_RECAL_REQ_DL_MASK_OFF );
+                if (((l_TGT0_ATTR_IO_O_CHANNEL_TYPE == fapi2::ENUM_ATTR_IO_O_CHANNEL_TYPE_BOARD)
+                     && ( ! l_TGT2_ATTR_CHIP_EC_FEATURE_HW422471)))
+                {
+                    constexpr auto l_IOO0_IOO_CPLT_RX0_RXCTL_CTL_REGS_RX_CTL_REGS_RX_RECAL_REQ_DL_MASK_OFF = 0x0;
+                    l_scom_buffer.insert<54, 1, 63, uint64_t>(l_IOO0_IOO_CPLT_RX0_RXCTL_CTL_REGS_RX_CTL_REGS_RX_RECAL_REQ_DL_MASK_OFF );
+                }
+                else if (((l_TGT0_ATTR_IO_O_CHANNEL_TYPE == fapi2::ENUM_ATTR_IO_O_CHANNEL_TYPE_CABLE)
+                          && ( ! l_TGT2_ATTR_CHIP_EC_FEATURE_HW422471)))
+                {
+                    constexpr auto l_IOO0_IOO_CPLT_RX0_RXCTL_CTL_REGS_RX_CTL_REGS_RX_RECAL_REQ_DL_MASK_ON = 0x1;
+                    l_scom_buffer.insert<54, 1, 63, uint64_t>(l_IOO0_IOO_CPLT_RX0_RXCTL_CTL_REGS_RX_CTL_REGS_RX_RECAL_REQ_DL_MASK_ON );
+                }
+                else if (( true ))
+                {
+                    constexpr auto l_IOO0_IOO_CPLT_RX0_RXCTL_CTL_REGS_RX_CTL_REGS_RX_RECAL_REQ_DL_MASK_OFF = 0x0;
+                    l_scom_buffer.insert<54, 1, 63, uint64_t>(l_IOO0_IOO_CPLT_RX0_RXCTL_CTL_REGS_RX_CTL_REGS_RX_RECAL_REQ_DL_MASK_OFF );
+                }
             }
 
-            if (((l_TGT0_ATTR_IO_O_CHANNEL_TYPE == fapi2::ENUM_ATTR_IO_O_CHANNEL_TYPE_BOARD)
-                 && ( ! l_TGT2_ATTR_CHIP_EC_FEATURE_HW422471_HW446964)))
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
             {
-                constexpr auto l_IOO0_IOO_CPLT_RX0_RXCTL_CTL_REGS_RX_CTL_REGS_RX_RECAL_ABORT_DL_MASK_OFF = 0x0;
-                l_scom_buffer.insert<57, 1, 63, uint64_t>(l_IOO0_IOO_CPLT_RX0_RXCTL_CTL_REGS_RX_CTL_REGS_RX_RECAL_ABORT_DL_MASK_OFF );
+                if (((l_TGT0_ATTR_IO_O_CHANNEL_TYPE == fapi2::ENUM_ATTR_IO_O_CHANNEL_TYPE_BOARD)
+                     && ( ! l_TGT2_ATTR_CHIP_EC_FEATURE_HW422471)))
+                {
+                    constexpr auto l_IOO0_IOO_CPLT_RX0_RXCTL_CTL_REGS_RX_CTL_REGS_RX_RECAL_REQ_DL_MASK_OFF = 0x0;
+                    l_scom_buffer.insert<55, 1, 63, uint64_t>(l_IOO0_IOO_CPLT_RX0_RXCTL_CTL_REGS_RX_CTL_REGS_RX_RECAL_REQ_DL_MASK_OFF );
+                }
+                else if (((l_TGT0_ATTR_IO_O_CHANNEL_TYPE == fapi2::ENUM_ATTR_IO_O_CHANNEL_TYPE_CABLE)
+                          && ( ! l_TGT2_ATTR_CHIP_EC_FEATURE_HW422471)))
+                {
+                    constexpr auto l_IOO0_IOO_CPLT_RX0_RXCTL_CTL_REGS_RX_CTL_REGS_RX_RECAL_REQ_DL_MASK_ON = 0x1;
+                    l_scom_buffer.insert<55, 1, 63, uint64_t>(l_IOO0_IOO_CPLT_RX0_RXCTL_CTL_REGS_RX_CTL_REGS_RX_RECAL_REQ_DL_MASK_ON );
+                }
+                else if (( true ))
+                {
+                    constexpr auto l_IOO0_IOO_CPLT_RX0_RXCTL_CTL_REGS_RX_CTL_REGS_RX_RECAL_REQ_DL_MASK_OFF = 0x0;
+                    l_scom_buffer.insert<55, 1, 63, uint64_t>(l_IOO0_IOO_CPLT_RX0_RXCTL_CTL_REGS_RX_CTL_REGS_RX_RECAL_REQ_DL_MASK_OFF );
+                }
             }
-            else if (((l_TGT0_ATTR_IO_O_CHANNEL_TYPE == fapi2::ENUM_ATTR_IO_O_CHANNEL_TYPE_CABLE)
-                      && ( ! l_TGT2_ATTR_CHIP_EC_FEATURE_HW422471_HW446964)))
+
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5)
+                    && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10))
+                || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12)) || ((l_chip_id == 0x6)
+                        && (l_chip_ec == 0x13)) || ((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
             {
-                constexpr auto l_IOO0_IOO_CPLT_RX0_RXCTL_CTL_REGS_RX_CTL_REGS_RX_RECAL_ABORT_DL_MASK_ON = 0x1;
-                l_scom_buffer.insert<57, 1, 63, uint64_t>(l_IOO0_IOO_CPLT_RX0_RXCTL_CTL_REGS_RX_CTL_REGS_RX_RECAL_ABORT_DL_MASK_ON );
+                if (((l_TGT0_ATTR_IO_O_CHANNEL_TYPE == fapi2::ENUM_ATTR_IO_O_CHANNEL_TYPE_BOARD)
+                     && ( ! l_TGT2_ATTR_CHIP_EC_FEATURE_HW422471_HW446964)))
+                {
+                    constexpr auto l_IOO0_IOO_CPLT_RX0_RXCTL_CTL_REGS_RX_CTL_REGS_RX_RECAL_ABORT_DL_MASK_OFF = 0x0;
+                    l_scom_buffer.insert<57, 1, 63, uint64_t>(l_IOO0_IOO_CPLT_RX0_RXCTL_CTL_REGS_RX_CTL_REGS_RX_RECAL_ABORT_DL_MASK_OFF );
+                }
+                else if (((l_TGT0_ATTR_IO_O_CHANNEL_TYPE == fapi2::ENUM_ATTR_IO_O_CHANNEL_TYPE_CABLE)
+                          && ( ! l_TGT2_ATTR_CHIP_EC_FEATURE_HW422471_HW446964)))
+                {
+                    constexpr auto l_IOO0_IOO_CPLT_RX0_RXCTL_CTL_REGS_RX_CTL_REGS_RX_RECAL_ABORT_DL_MASK_ON = 0x1;
+                    l_scom_buffer.insert<57, 1, 63, uint64_t>(l_IOO0_IOO_CPLT_RX0_RXCTL_CTL_REGS_RX_CTL_REGS_RX_RECAL_ABORT_DL_MASK_ON );
+                }
+                else if (( true ))
+                {
+                    constexpr auto l_IOO0_IOO_CPLT_RX0_RXCTL_CTL_REGS_RX_CTL_REGS_RX_RECAL_ABORT_DL_MASK_OFF = 0x0;
+                    l_scom_buffer.insert<57, 1, 63, uint64_t>(l_IOO0_IOO_CPLT_RX0_RXCTL_CTL_REGS_RX_CTL_REGS_RX_RECAL_ABORT_DL_MASK_OFF );
+                }
             }
-            else if (( true ))
+
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
             {
-                constexpr auto l_IOO0_IOO_CPLT_RX0_RXCTL_CTL_REGS_RX_CTL_REGS_RX_RECAL_ABORT_DL_MASK_OFF = 0x0;
-                l_scom_buffer.insert<57, 1, 63, uint64_t>(l_IOO0_IOO_CPLT_RX0_RXCTL_CTL_REGS_RX_CTL_REGS_RX_RECAL_ABORT_DL_MASK_OFF );
+                if (((l_TGT0_ATTR_IO_O_CHANNEL_TYPE == fapi2::ENUM_ATTR_IO_O_CHANNEL_TYPE_BOARD)
+                     && ( ! l_TGT2_ATTR_CHIP_EC_FEATURE_HW422471_HW446964)))
+                {
+                    constexpr auto l_IOO0_IOO_CPLT_RX0_RXCTL_CTL_REGS_RX_CTL_REGS_RX_RECAL_ABORT_DL_MASK_OFF = 0x0;
+                    l_scom_buffer.insert<58, 1, 63, uint64_t>(l_IOO0_IOO_CPLT_RX0_RXCTL_CTL_REGS_RX_CTL_REGS_RX_RECAL_ABORT_DL_MASK_OFF );
+                }
+                else if (((l_TGT0_ATTR_IO_O_CHANNEL_TYPE == fapi2::ENUM_ATTR_IO_O_CHANNEL_TYPE_CABLE)
+                          && ( ! l_TGT2_ATTR_CHIP_EC_FEATURE_HW422471_HW446964)))
+                {
+                    constexpr auto l_IOO0_IOO_CPLT_RX0_RXCTL_CTL_REGS_RX_CTL_REGS_RX_RECAL_ABORT_DL_MASK_ON = 0x1;
+                    l_scom_buffer.insert<58, 1, 63, uint64_t>(l_IOO0_IOO_CPLT_RX0_RXCTL_CTL_REGS_RX_CTL_REGS_RX_RECAL_ABORT_DL_MASK_ON );
+                }
+                else if (( true ))
+                {
+                    constexpr auto l_IOO0_IOO_CPLT_RX0_RXCTL_CTL_REGS_RX_CTL_REGS_RX_RECAL_ABORT_DL_MASK_OFF = 0x0;
+                    l_scom_buffer.insert<58, 1, 63, uint64_t>(l_IOO0_IOO_CPLT_RX0_RXCTL_CTL_REGS_RX_CTL_REGS_RX_RECAL_ABORT_DL_MASK_OFF );
+                }
             }
 
             if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
diff --git a/src/import/chips/p9/procedures/hwp/initfiles/p9n_ddrphy_scom.C b/src/import/chips/p9/procedures/hwp/initfiles/p9n_ddrphy_scom.C
index 5e007d476..622ff81d8 100644
--- a/src/import/chips/p9/procedures/hwp/initfiles/p9n_ddrphy_scom.C
+++ b/src/import/chips/p9/procedures/hwp/initfiles/p9n_ddrphy_scom.C
@@ -150,10 +150,24 @@ fapi2::ReturnCode p9n_ddrphy_scom(const fapi2::Target<fapi2::TARGET_TYPE_MCA>& T
         {
             FAPI_TRY(fapi2::getScom( TGT0, 0x8000002a0701103full, l_scom_buffer ));
 
-            if (( true ))
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
+            {
+                if (( true ))
+                {
+                    l_scom_buffer.insert<48, 12, 48, uint64_t>(literal_0x6740 );
+                    l_scom_buffer.insert<62, 2, 62, uint64_t>(literal_0x6740 );
+                }
+            }
+
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5)
+                    && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) )
             {
-                l_scom_buffer.insert<48, 12, 48, uint64_t>(literal_0x6740 );
-                l_scom_buffer.insert<62, 2, 62, uint64_t>(literal_0x6740 );
+                if (( true ))
+                {
+                    l_scom_buffer.insert<48, 3, 48, uint64_t>(literal_0x6740 );
+                    l_scom_buffer.insert<52, 8, 52, uint64_t>(literal_0x6740 );
+                    l_scom_buffer.insert<62, 2, 62, uint64_t>(literal_0x6740 );
+                }
             }
 
             FAPI_TRY(fapi2::putScom(TGT0, 0x8000002a0701103full, l_scom_buffer));
@@ -161,10 +175,24 @@ fapi2::ReturnCode p9n_ddrphy_scom(const fapi2::Target<fapi2::TARGET_TYPE_MCA>& T
         {
             FAPI_TRY(fapi2::getScom( TGT0, 0x8000002b0701103full, l_scom_buffer ));
 
-            if (( true ))
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
+            {
+                if (( true ))
+                {
+                    l_scom_buffer.insert<48, 12, 48, uint64_t>(literal_0x6740 );
+                    l_scom_buffer.insert<62, 2, 62, uint64_t>(literal_0x6740 );
+                }
+            }
+
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5)
+                    && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) )
             {
-                l_scom_buffer.insert<48, 12, 48, uint64_t>(literal_0x6740 );
-                l_scom_buffer.insert<62, 2, 62, uint64_t>(literal_0x6740 );
+                if (( true ))
+                {
+                    l_scom_buffer.insert<48, 3, 48, uint64_t>(literal_0x6740 );
+                    l_scom_buffer.insert<52, 8, 52, uint64_t>(literal_0x6740 );
+                    l_scom_buffer.insert<62, 2, 62, uint64_t>(literal_0x6740 );
+                }
             }
 
             FAPI_TRY(fapi2::putScom(TGT0, 0x8000002b0701103full, l_scom_buffer));
@@ -210,9 +238,21 @@ fapi2::ReturnCode p9n_ddrphy_scom(const fapi2::Target<fapi2::TARGET_TYPE_MCA>& T
         {
             FAPI_TRY(fapi2::getScom( TGT0, 0x800000750701103full, l_scom_buffer ));
 
-            if (( true ))
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
             {
-                l_scom_buffer.insert<48, 12, 48, uint64_t>(literal_0x4000 );
+                if (( true ))
+                {
+                    l_scom_buffer.insert<48, 12, 48, uint64_t>(literal_0x4000 );
+                }
+            }
+
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5)
+                    && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) )
+            {
+                if (( true ))
+                {
+                    l_scom_buffer.insert<48, 5, 48, uint64_t>(literal_0x4000 );
+                }
             }
 
             FAPI_TRY(fapi2::putScom(TGT0, 0x800000750701103full, l_scom_buffer));
@@ -471,10 +511,24 @@ fapi2::ReturnCode p9n_ddrphy_scom(const fapi2::Target<fapi2::TARGET_TYPE_MCA>& T
         {
             FAPI_TRY(fapi2::getScom( TGT0, 0x8000042a0701103full, l_scom_buffer ));
 
-            if (( true ))
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
+            {
+                if (( true ))
+                {
+                    l_scom_buffer.insert<48, 12, 48, uint64_t>(literal_0x6740 );
+                    l_scom_buffer.insert<62, 2, 62, uint64_t>(literal_0x6740 );
+                }
+            }
+
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5)
+                    && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) )
             {
-                l_scom_buffer.insert<48, 12, 48, uint64_t>(literal_0x6740 );
-                l_scom_buffer.insert<62, 2, 62, uint64_t>(literal_0x6740 );
+                if (( true ))
+                {
+                    l_scom_buffer.insert<48, 3, 48, uint64_t>(literal_0x6740 );
+                    l_scom_buffer.insert<52, 8, 52, uint64_t>(literal_0x6740 );
+                    l_scom_buffer.insert<62, 2, 62, uint64_t>(literal_0x6740 );
+                }
             }
 
             FAPI_TRY(fapi2::putScom(TGT0, 0x8000042a0701103full, l_scom_buffer));
@@ -482,10 +536,24 @@ fapi2::ReturnCode p9n_ddrphy_scom(const fapi2::Target<fapi2::TARGET_TYPE_MCA>& T
         {
             FAPI_TRY(fapi2::getScom( TGT0, 0x8000042b0701103full, l_scom_buffer ));
 
-            if (( true ))
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
             {
-                l_scom_buffer.insert<48, 12, 48, uint64_t>(literal_0x6740 );
-                l_scom_buffer.insert<62, 2, 62, uint64_t>(literal_0x6740 );
+                if (( true ))
+                {
+                    l_scom_buffer.insert<48, 12, 48, uint64_t>(literal_0x6740 );
+                    l_scom_buffer.insert<62, 2, 62, uint64_t>(literal_0x6740 );
+                }
+            }
+
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5)
+                    && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) )
+            {
+                if (( true ))
+                {
+                    l_scom_buffer.insert<48, 3, 48, uint64_t>(literal_0x6740 );
+                    l_scom_buffer.insert<52, 8, 52, uint64_t>(literal_0x6740 );
+                    l_scom_buffer.insert<62, 2, 62, uint64_t>(literal_0x6740 );
+                }
             }
 
             FAPI_TRY(fapi2::putScom(TGT0, 0x8000042b0701103full, l_scom_buffer));
@@ -531,9 +599,21 @@ fapi2::ReturnCode p9n_ddrphy_scom(const fapi2::Target<fapi2::TARGET_TYPE_MCA>& T
         {
             FAPI_TRY(fapi2::getScom( TGT0, 0x800004750701103full, l_scom_buffer ));
 
-            if (( true ))
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
+            {
+                if (( true ))
+                {
+                    l_scom_buffer.insert<48, 12, 48, uint64_t>(literal_0x4000 );
+                }
+            }
+
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5)
+                    && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) )
             {
-                l_scom_buffer.insert<48, 12, 48, uint64_t>(literal_0x4000 );
+                if (( true ))
+                {
+                    l_scom_buffer.insert<48, 5, 48, uint64_t>(literal_0x4000 );
+                }
             }
 
             FAPI_TRY(fapi2::putScom(TGT0, 0x800004750701103full, l_scom_buffer));
@@ -792,10 +872,24 @@ fapi2::ReturnCode p9n_ddrphy_scom(const fapi2::Target<fapi2::TARGET_TYPE_MCA>& T
         {
             FAPI_TRY(fapi2::getScom( TGT0, 0x8000082a0701103full, l_scom_buffer ));
 
-            if (( true ))
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
             {
-                l_scom_buffer.insert<48, 12, 48, uint64_t>(literal_0x6740 );
-                l_scom_buffer.insert<62, 2, 62, uint64_t>(literal_0x6740 );
+                if (( true ))
+                {
+                    l_scom_buffer.insert<48, 12, 48, uint64_t>(literal_0x6740 );
+                    l_scom_buffer.insert<62, 2, 62, uint64_t>(literal_0x6740 );
+                }
+            }
+
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5)
+                    && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) )
+            {
+                if (( true ))
+                {
+                    l_scom_buffer.insert<48, 3, 48, uint64_t>(literal_0x6740 );
+                    l_scom_buffer.insert<52, 8, 52, uint64_t>(literal_0x6740 );
+                    l_scom_buffer.insert<62, 2, 62, uint64_t>(literal_0x6740 );
+                }
             }
 
             FAPI_TRY(fapi2::putScom(TGT0, 0x8000082a0701103full, l_scom_buffer));
@@ -803,10 +897,24 @@ fapi2::ReturnCode p9n_ddrphy_scom(const fapi2::Target<fapi2::TARGET_TYPE_MCA>& T
         {
             FAPI_TRY(fapi2::getScom( TGT0, 0x8000082b0701103full, l_scom_buffer ));
 
-            if (( true ))
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
             {
-                l_scom_buffer.insert<48, 12, 48, uint64_t>(literal_0x6740 );
-                l_scom_buffer.insert<62, 2, 62, uint64_t>(literal_0x6740 );
+                if (( true ))
+                {
+                    l_scom_buffer.insert<48, 12, 48, uint64_t>(literal_0x6740 );
+                    l_scom_buffer.insert<62, 2, 62, uint64_t>(literal_0x6740 );
+                }
+            }
+
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5)
+                    && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) )
+            {
+                if (( true ))
+                {
+                    l_scom_buffer.insert<48, 3, 48, uint64_t>(literal_0x6740 );
+                    l_scom_buffer.insert<52, 8, 52, uint64_t>(literal_0x6740 );
+                    l_scom_buffer.insert<62, 2, 62, uint64_t>(literal_0x6740 );
+                }
             }
 
             FAPI_TRY(fapi2::putScom(TGT0, 0x8000082b0701103full, l_scom_buffer));
@@ -852,9 +960,21 @@ fapi2::ReturnCode p9n_ddrphy_scom(const fapi2::Target<fapi2::TARGET_TYPE_MCA>& T
         {
             FAPI_TRY(fapi2::getScom( TGT0, 0x800008750701103full, l_scom_buffer ));
 
-            if (( true ))
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
             {
-                l_scom_buffer.insert<48, 12, 48, uint64_t>(literal_0x4000 );
+                if (( true ))
+                {
+                    l_scom_buffer.insert<48, 12, 48, uint64_t>(literal_0x4000 );
+                }
+            }
+
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5)
+                    && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) )
+            {
+                if (( true ))
+                {
+                    l_scom_buffer.insert<48, 5, 48, uint64_t>(literal_0x4000 );
+                }
             }
 
             FAPI_TRY(fapi2::putScom(TGT0, 0x800008750701103full, l_scom_buffer));
@@ -1113,10 +1233,24 @@ fapi2::ReturnCode p9n_ddrphy_scom(const fapi2::Target<fapi2::TARGET_TYPE_MCA>& T
         {
             FAPI_TRY(fapi2::getScom( TGT0, 0x80000c2a0701103full, l_scom_buffer ));
 
-            if (( true ))
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
+            {
+                if (( true ))
+                {
+                    l_scom_buffer.insert<48, 12, 48, uint64_t>(literal_0x6740 );
+                    l_scom_buffer.insert<62, 2, 62, uint64_t>(literal_0x6740 );
+                }
+            }
+
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5)
+                    && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) )
             {
-                l_scom_buffer.insert<48, 12, 48, uint64_t>(literal_0x6740 );
-                l_scom_buffer.insert<62, 2, 62, uint64_t>(literal_0x6740 );
+                if (( true ))
+                {
+                    l_scom_buffer.insert<48, 3, 48, uint64_t>(literal_0x6740 );
+                    l_scom_buffer.insert<52, 8, 52, uint64_t>(literal_0x6740 );
+                    l_scom_buffer.insert<62, 2, 62, uint64_t>(literal_0x6740 );
+                }
             }
 
             FAPI_TRY(fapi2::putScom(TGT0, 0x80000c2a0701103full, l_scom_buffer));
@@ -1124,10 +1258,24 @@ fapi2::ReturnCode p9n_ddrphy_scom(const fapi2::Target<fapi2::TARGET_TYPE_MCA>& T
         {
             FAPI_TRY(fapi2::getScom( TGT0, 0x80000c2b0701103full, l_scom_buffer ));
 
-            if (( true ))
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
             {
-                l_scom_buffer.insert<48, 12, 48, uint64_t>(literal_0x6740 );
-                l_scom_buffer.insert<62, 2, 62, uint64_t>(literal_0x6740 );
+                if (( true ))
+                {
+                    l_scom_buffer.insert<48, 12, 48, uint64_t>(literal_0x6740 );
+                    l_scom_buffer.insert<62, 2, 62, uint64_t>(literal_0x6740 );
+                }
+            }
+
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5)
+                    && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) )
+            {
+                if (( true ))
+                {
+                    l_scom_buffer.insert<48, 3, 48, uint64_t>(literal_0x6740 );
+                    l_scom_buffer.insert<52, 8, 52, uint64_t>(literal_0x6740 );
+                    l_scom_buffer.insert<62, 2, 62, uint64_t>(literal_0x6740 );
+                }
             }
 
             FAPI_TRY(fapi2::putScom(TGT0, 0x80000c2b0701103full, l_scom_buffer));
@@ -1173,9 +1321,21 @@ fapi2::ReturnCode p9n_ddrphy_scom(const fapi2::Target<fapi2::TARGET_TYPE_MCA>& T
         {
             FAPI_TRY(fapi2::getScom( TGT0, 0x80000c750701103full, l_scom_buffer ));
 
-            if (( true ))
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
             {
-                l_scom_buffer.insert<48, 12, 48, uint64_t>(literal_0x4000 );
+                if (( true ))
+                {
+                    l_scom_buffer.insert<48, 12, 48, uint64_t>(literal_0x4000 );
+                }
+            }
+
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5)
+                    && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) )
+            {
+                if (( true ))
+                {
+                    l_scom_buffer.insert<48, 5, 48, uint64_t>(literal_0x4000 );
+                }
             }
 
             FAPI_TRY(fapi2::putScom(TGT0, 0x80000c750701103full, l_scom_buffer));
@@ -1434,10 +1594,24 @@ fapi2::ReturnCode p9n_ddrphy_scom(const fapi2::Target<fapi2::TARGET_TYPE_MCA>& T
         {
             FAPI_TRY(fapi2::getScom( TGT0, 0x8000102a0701103full, l_scom_buffer ));
 
-            if (( true ))
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
+            {
+                if (( true ))
+                {
+                    l_scom_buffer.insert<48, 12, 48, uint64_t>(literal_0x6740 );
+                    l_scom_buffer.insert<62, 2, 62, uint64_t>(literal_0x6740 );
+                }
+            }
+
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5)
+                    && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) )
             {
-                l_scom_buffer.insert<48, 12, 48, uint64_t>(literal_0x6740 );
-                l_scom_buffer.insert<62, 2, 62, uint64_t>(literal_0x6740 );
+                if (( true ))
+                {
+                    l_scom_buffer.insert<48, 3, 48, uint64_t>(literal_0x6740 );
+                    l_scom_buffer.insert<52, 8, 52, uint64_t>(literal_0x6740 );
+                    l_scom_buffer.insert<62, 2, 62, uint64_t>(literal_0x6740 );
+                }
             }
 
             FAPI_TRY(fapi2::putScom(TGT0, 0x8000102a0701103full, l_scom_buffer));
@@ -1445,10 +1619,24 @@ fapi2::ReturnCode p9n_ddrphy_scom(const fapi2::Target<fapi2::TARGET_TYPE_MCA>& T
         {
             FAPI_TRY(fapi2::getScom( TGT0, 0x8000102b0701103full, l_scom_buffer ));
 
-            if (( true ))
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
+            {
+                if (( true ))
+                {
+                    l_scom_buffer.insert<48, 12, 48, uint64_t>(literal_0x6740 );
+                    l_scom_buffer.insert<62, 2, 62, uint64_t>(literal_0x6740 );
+                }
+            }
+
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5)
+                    && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) )
             {
-                l_scom_buffer.insert<48, 12, 48, uint64_t>(literal_0x6740 );
-                l_scom_buffer.insert<62, 2, 62, uint64_t>(literal_0x6740 );
+                if (( true ))
+                {
+                    l_scom_buffer.insert<48, 3, 48, uint64_t>(literal_0x6740 );
+                    l_scom_buffer.insert<52, 8, 52, uint64_t>(literal_0x6740 );
+                    l_scom_buffer.insert<62, 2, 62, uint64_t>(literal_0x6740 );
+                }
             }
 
             FAPI_TRY(fapi2::putScom(TGT0, 0x8000102b0701103full, l_scom_buffer));
@@ -1494,9 +1682,21 @@ fapi2::ReturnCode p9n_ddrphy_scom(const fapi2::Target<fapi2::TARGET_TYPE_MCA>& T
         {
             FAPI_TRY(fapi2::getScom( TGT0, 0x800010750701103full, l_scom_buffer ));
 
-            if (( true ))
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
             {
-                l_scom_buffer.insert<48, 12, 48, uint64_t>(literal_0x4000 );
+                if (( true ))
+                {
+                    l_scom_buffer.insert<48, 12, 48, uint64_t>(literal_0x4000 );
+                }
+            }
+
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5)
+                    && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) )
+            {
+                if (( true ))
+                {
+                    l_scom_buffer.insert<48, 5, 48, uint64_t>(literal_0x4000 );
+                }
             }
 
             FAPI_TRY(fapi2::putScom(TGT0, 0x800010750701103full, l_scom_buffer));
@@ -1754,10 +1954,24 @@ fapi2::ReturnCode p9n_ddrphy_scom(const fapi2::Target<fapi2::TARGET_TYPE_MCA>& T
         {
             FAPI_TRY(fapi2::getScom( TGT0, 0x8000803d0701103full, l_scom_buffer ));
 
-            if (( true ))
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
+            {
+                if (( true ))
+                {
+                    l_scom_buffer.insert<48, 12, 48, uint64_t>(literal_0x6740 );
+                    l_scom_buffer.insert<63, 1, 63, uint64_t>(literal_0x6740 );
+                }
+            }
+
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5)
+                    && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) )
             {
-                l_scom_buffer.insert<48, 12, 48, uint64_t>(literal_0x6740 );
-                l_scom_buffer.insert<63, 1, 63, uint64_t>(literal_0x6740 );
+                if (( true ))
+                {
+                    l_scom_buffer.insert<48, 3, 48, uint64_t>(literal_0x6740 );
+                    l_scom_buffer.insert<52, 8, 52, uint64_t>(literal_0x6740 );
+                    l_scom_buffer.insert<63, 1, 63, uint64_t>(literal_0x6740 );
+                }
             }
 
             FAPI_TRY(fapi2::putScom(TGT0, 0x8000803d0701103full, l_scom_buffer));
@@ -1785,10 +1999,24 @@ fapi2::ReturnCode p9n_ddrphy_scom(const fapi2::Target<fapi2::TARGET_TYPE_MCA>& T
         {
             FAPI_TRY(fapi2::getScom( TGT0, 0x8000843d0701103full, l_scom_buffer ));
 
-            if (( true ))
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
             {
-                l_scom_buffer.insert<48, 12, 48, uint64_t>(literal_0x6740 );
-                l_scom_buffer.insert<63, 1, 63, uint64_t>(literal_0x6740 );
+                if (( true ))
+                {
+                    l_scom_buffer.insert<48, 12, 48, uint64_t>(literal_0x6740 );
+                    l_scom_buffer.insert<63, 1, 63, uint64_t>(literal_0x6740 );
+                }
+            }
+
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5)
+                    && (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) )
+            {
+                if (( true ))
+                {
+                    l_scom_buffer.insert<48, 3, 48, uint64_t>(literal_0x6740 );
+                    l_scom_buffer.insert<52, 8, 52, uint64_t>(literal_0x6740 );
+                    l_scom_buffer.insert<63, 1, 63, uint64_t>(literal_0x6740 );
+                }
             }
 
             FAPI_TRY(fapi2::putScom(TGT0, 0x8000843d0701103full, l_scom_buffer));